Merge branch 'main' into wangjue-verify-comp

vbenjs · Sep 20, 2024 · be9de9f · be9de9f
2 parents c1d7916 + c72747c
commit be9de9f
Show file tree

Hide file tree

Showing 78 changed files with 2,163 additions and 1,370 deletions.
diff --git a/apps/backend-mock/package.json b/apps/backend-mock/package.json
@@ -10,11 +10,11 @@
  "start": "nitro dev"
  },
  "dependencies": {
- "jsonwebtoken": "^9.0.2",
- "nitropack": "^2.9.7"
+ "jsonwebtoken": "catalog:",
+ "nitropack": "catalog:"
  },
  "devDependencies": {
- "@types/jsonwebtoken": "^9.0.7",
- "h3": "^1.12.0"
+ "@types/jsonwebtoken": "catalog:",
+ "h3": "catalog:"
  }
 }
diff --git a/apps/web-antd/package.json b/apps/web-antd/package.json
@@ -40,11 +40,11 @@
  "@vben/styles": "workspace:*",
  "@vben/types": "workspace:*",
  "@vben/utils": "workspace:*",
- "@vueuse/core": "^11.1.0",
- "ant-design-vue": "^4.2.4",
- "dayjs": "^1.11.13",
- "pinia": "2.2.2",
- "vue": "^3.5.6",
- "vue-router": "^4.4.5"
+ "@vueuse/core": "catalog:",
+ "ant-design-vue": "catalog:",
+ "dayjs": "catalog:",
+ "pinia": "catalog:",
+ "vue": "catalog:",
+ "vue-router": "catalog:"
  }
 }
diff --git a/apps/web-antd/src/adapter/form.ts b/apps/web-antd/src/adapter/form.ts
@@ -103,6 +103,12 @@ setupVbenForm<FormComponentType>({
  }
  return true;
  },
+ selectRequired: (value, _params, ctx) => {
+ if (value === undefined || value === null) {
+ return $t('formRules.selectRequired', [ctx.label]);
+ }
+ return true;
+ },
  },
 });
 

diff --git a/apps/web-antd/src/store/auth.ts b/apps/web-antd/src/store/auth.ts
@@ -76,7 +76,11 @@ export const useAuthStore = defineStore('auth', () => {
  }
 
  async function logout(redirect: boolean = true) {
- await logoutApi();
+ try {
+ await logoutApi();
+ } catch {
+ // 不做任何处理
+ }
  resetAllStores();
  accessStore.setLoginExpired(false);
 

diff --git a/apps/web-ele/package.json b/apps/web-ele/package.json
@@ -40,14 +40,14 @@
  "@vben/styles": "workspace:*",
  "@vben/types": "workspace:*",
  "@vben/utils": "workspace:*",
- "@vueuse/core": "^11.1.0",
- "dayjs": "^1.11.13",
- "element-plus": "^2.8.3",
- "pinia": "2.2.2",
- "vue": "^3.5.6",
- "vue-router": "^4.4.5"
+ "@vueuse/core": "catalog:",
+ "dayjs": "catalog:",
+ "element-plus": "catalog:",
+ "pinia": "catalog:",
+ "vue": "catalog:",
+ "vue-router": "catalog:"
  },
  "devDependencies": {
- "unplugin-element-plus": "^0.8.0"
+ "unplugin-element-plus": "catalog:"
  }
 }
diff --git a/apps/web-ele/src/adapter/form.ts b/apps/web-ele/src/adapter/form.ts
@@ -78,6 +78,12 @@ setupVbenForm<FormComponentType>({
  }
  return true;
  },
+ selectRequired: (value, _params, ctx) => {
+ if (value === undefined || value === null) {
+ return $t('formRules.selectRequired', [ctx.label]);
+ }
+ return true;
+ },
  },
 });
 

diff --git a/apps/web-ele/src/store/auth.ts b/apps/web-ele/src/store/auth.ts
@@ -77,7 +77,11 @@ export const useAuthStore = defineStore('auth', () => {
  }
 
  async function logout(redirect: boolean = true) {
- await logoutApi();
+ try {
+ await logoutApi();
+ } catch {
+ // 不做任何处理
+ }
  resetAllStores();
  accessStore.setLoginExpired(false);
 

diff --git a/apps/web-naive/package.json b/apps/web-naive/package.json
@@ -40,10 +40,10 @@
  "@vben/styles": "workspace:*",
  "@vben/types": "workspace:*",
  "@vben/utils": "workspace:*",
- "@vueuse/core": "^11.1.0",
- "naive-ui": "^2.39.0",
- "pinia": "2.2.2",
- "vue": "^3.5.6",
- "vue-router": "^4.4.5"
+ "@vueuse/core": "catalog:",
+ "naive-ui": "catalog:",
+ "pinia": "catalog:",
+ "vue": "catalog:",
+ "vue-router": "catalog:"
  }
 }
diff --git a/apps/web-naive/src/adapter/form.ts b/apps/web-naive/src/adapter/form.ts
@@ -87,6 +87,12 @@ setupVbenForm<FormComponentType>({
  }
  return true;
  },
+ selectRequired: (value, _params, ctx) => {
+ if (value === undefined || value === null) {
+ return $t('formRules.selectRequired', [ctx.label]);
+ }
+ return true;
+ },
  },
 });
 

diff --git a/apps/web-naive/src/store/auth.ts b/apps/web-naive/src/store/auth.ts
@@ -77,7 +77,11 @@ export const useAuthStore = defineStore('auth', () => {
  }
 
  async function logout(redirect: boolean = true) {
- await logoutApi();
+ try {
+ await logoutApi();
+ } catch {
+ // 不做任何处理
+ }
  resetAllStores();
  accessStore.setLoginExpired(false);
 

diff --git a/docs/package.json b/docs/package.json
@@ -11,16 +11,16 @@
  "@vben-core/shadcn-ui": "workspace:*",
  "@vben/common-ui": "workspace:*",
  "@vben/styles": "workspace:*",
- "lucide-vue-next": "^0.441.0",
- "medium-zoom": "^1.1.0",
- "radix-vue": "^1.9.5",
- "vitepress-plugin-group-icons": "^1.2.4"
+ "lucide-vue-next": "catalog:",
+ "medium-zoom": "catalog:",
+ "radix-vue": "catalog:",
+ "vitepress-plugin-group-icons": "catalog:"
  },
  "devDependencies": {
- "@nolebase/vitepress-plugin-git-changelog": "^2.5.0",
+ "@nolebase/vitepress-plugin-git-changelog": "catalog:",
  "@vben/vite-config": "workspace:*",
- "@vite-pwa/vitepress": "^0.5.3",
- "vitepress": "^1.3.4",
- "vue": "^3.5.6"
+ "@vite-pwa/vitepress": "catalog:",
+ "vitepress": "catalog:",
+ "vue": "catalog:"
  }
 }
diff --git a/docs/src/components/common-ui/vben-drawer.md b/docs/src/components/common-ui/vben-drawer.md
@@ -6,6 +6,14 @@ outline: deep
 
 框架提供的抽屉组件，支持`自动高度`、`loading`等功能。
 
+> 如果文档内没有参数说明，可以尝试在在线示例内寻找
+
+::: info 写在前面
+
+如果你觉得现有组件的封装不够理想，或者不完全符合你的需求，大可以直接使用原生组件，亦或亲手封装一个适合的组件。框架提供的组件并非束缚，使用与否，完全取决于你的需求与自由。
+
+:::
+
 ## 基础用法
 
 使用 `useVbenDrawer` 创建最基础的模态框。

diff --git a/docs/src/components/common-ui/vben-modal.md b/docs/src/components/common-ui/vben-modal.md
@@ -6,6 +6,14 @@ outline: deep
 
 框架提供的模态框组件，支持`拖拽`、`全屏`、`自动高度`、`loading`等功能。
 
+> 如果文档内没有参数说明，可以尝试在在线示例内寻找
+
+::: info 写在前面
+
+如果你觉得现有组件的封装不够理想，或者不完全符合你的需求，大可以直接使用原生组件，亦或亲手封装一个适合的组件。框架提供的组件并非束缚，使用与否，完全取决于你的需求与自由。
+
+:::
+
 ## 基础用法
 
 使用 `useVbenModal` 创建最基础的模态框。

diff --git a/docs/src/components/introduction.md b/docs/src/components/introduction.md
@@ -2,7 +2,7 @@
 
 ::: info README
 
-该文档介绍的是框架组件的使用方法、属性、事件等。如果你觉得组件封装的不好，或者不符合你的需求，你可以直接使用原生的组件，或者自己封装一个组件，不需要拘泥于框架提供的组件。我们只是提供了一些常用的组件，方便你快速开发。是否使用，取决于你的需求。
+该文档介绍的是框架组件的使用方法、属性、事件等。如果你觉得现有组件的封装不够理想，或者不完全符合你的需求，大可以直接使用原生组件，亦或亲手封装一个适合的组件。框架提供的组件并非束缚，使用与否，完全取决于你的需求与自由。
 
 :::
 

diff --git a/internal/lint-configs/commitlint-config/package.json b/internal/lint-configs/commitlint-config/package.json
@@ -23,11 +23,11 @@
  }
  },
  "dependencies": {
- "@commitlint/cli": "^19.5.0",
- "@commitlint/config-conventional": "^19.5.0",
+ "@commitlint/cli": "catalog:",
+ "@commitlint/config-conventional": "catalog:",
  "@vben/node-utils": "workspace:*",
- "commitlint-plugin-function-rules": "^4.0.0",
- "cz-git": "^1.9.4",
- "czg": "^1.9.4"
+ "commitlint-plugin-function-rules": "catalog:",
+ "cz-git": "catalog:",
+ "czg": "catalog:"
  }
 }
diff --git a/internal/lint-configs/eslint-config/package.json b/internal/lint-configs/eslint-config/package.json
@@ -27,31 +27,30 @@
  }
  },
  "dependencies": {
- "eslint-config-turbo": "^2.1.2",
- "eslint-plugin-command": "^0.2.5",
- "eslint-plugin-import-x": "^4.2.1"
+ "eslint-config-turbo": "catalog:",
+ "eslint-plugin-command": "catalog:",
+ "eslint-plugin-import-x": "catalog:"
  },
  "devDependencies": {
- "@eslint/js": "^9.10.0",
- "@types/eslint": "^9.6.1",
- "@typescript-eslint/eslint-plugin": "^8.6.0",
- "@typescript-eslint/parser": "^8.6.0",
- "eslint": "^9.10.0",
- "eslint-config-prettier": "^9.1.0",
- "eslint-plugin-eslint-comments": "^3.2.0",
- "eslint-plugin-jsdoc": "^50.2.3",
- "eslint-plugin-jsonc": "^2.16.0",
- "eslint-plugin-n": "^17.10.3",
- "eslint-plugin-no-only-tests": "^3.3.0",
- "eslint-plugin-perfectionist": "^3.6.0",
- "eslint-plugin-prettier": "^5.2.1",
- "eslint-plugin-regexp": "^2.6.0",
- "eslint-plugin-unicorn": "^55.0.0",
- "eslint-plugin-unused-imports": "^4.1.4",
- "eslint-plugin-vitest": "^0.5.4",
- "eslint-plugin-vue": "^9.28.0",
- "globals": "^15.9.0",
- "jsonc-eslint-parser": "^2.4.0",
- "vue-eslint-parser": "^9.4.3"
+ "@eslint/js": "catalog:",
+ "@types/eslint": "catalog:",
+ "@typescript-eslint/eslint-plugin": "catalog:",
+ "@typescript-eslint/parser": "catalog:",
+ "eslint": "catalog:",
+ "eslint-plugin-eslint-comments": "catalog:",
+ "eslint-plugin-jsdoc": "catalog:",
+ "eslint-plugin-jsonc": "catalog:",
+ "eslint-plugin-n": "catalog:",
+ "eslint-plugin-no-only-tests": "catalog:",
+ "eslint-plugin-perfectionist": "catalog:",
+ "eslint-plugin-prettier": "catalog:",
+ "eslint-plugin-regexp": "catalog:",
+ "eslint-plugin-unicorn": "catalog:",
+ "eslint-plugin-unused-imports": "catalog:",
+ "eslint-plugin-vitest": "catalog:",
+ "eslint-plugin-vue": "catalog:",
+ "globals": "catalog:",
+ "jsonc-eslint-parser": "catalog:",
+ "vue-eslint-parser": "catalog:"
  }
 }
diff --git a/internal/lint-configs/prettier-config/package.json b/internal/lint-configs/prettier-config/package.json
@@ -22,7 +22,7 @@
  }
  },
  "dependencies": {
- "prettier": "^3.3.3",
- "prettier-plugin-tailwindcss": "^0.6.6"
+ "prettier": "catalog:",
+ "prettier-plugin-tailwindcss": "catalog:"
  }
 }
diff --git a/internal/lint-configs/stylelint-config/package.json b/internal/lint-configs/stylelint-config/package.json
@@ -23,21 +23,21 @@
  }
  },
  "dependencies": {
- "@stylistic/stylelint-plugin": "^3.0.1",
- "stylelint-config-recess-order": "^5.1.0",
- "stylelint-scss": "^6.6.0"
+ "@stylistic/stylelint-plugin": "catalog:",
+ "stylelint-config-recess-order": "catalog:",
+ "stylelint-scss": "catalog:"
  },
  "devDependencies": {
- "postcss": "^8.4.47",
- "postcss-html": "^1.7.0",
- "postcss-scss": "^4.0.9",
- "prettier": "^3.3.3",
- "stylelint": "^16.9.0",
- "stylelint-config-recommended": "^14.0.1",
- "stylelint-config-recommended-scss": "^14.1.0",
- "stylelint-config-recommended-vue": "^1.5.0",
- "stylelint-config-standard": "^36.0.1",
- "stylelint-order": "^6.0.4",
- "stylelint-prettier": "^5.0.2"
+ "postcss": "catalog:",
+ "postcss-html": "catalog:",
+ "postcss-scss": "catalog:",
+ "prettier": "catalog:",
+ "stylelint": "catalog:",
+ "stylelint-config-recommended": "catalog:",
+ "stylelint-config-recommended-scss": "catalog:",
+ "stylelint-config-recommended-vue": "catalog:",
+ "stylelint-config-standard": "catalog:",
+ "stylelint-order": "catalog:",
+ "stylelint-prettier": "catalog:"
  }
 }
diff --git a/internal/node-utils/package.json b/internal/node-utils/package.json
@@ -28,20 +28,20 @@
  }
  },
  "dependencies": {
- "@changesets/git": "^3.0.1",
- "@manypkg/get-packages": "^2.2.2",
- "chalk": "^5.3.0",
- "consola": "^3.2.3",
- "dayjs": "^1.11.13",
- "execa": "^9.4.0",
- "find-up": "^7.0.0",
- "nanoid": "^5.0.7",
- "ora": "^8.1.0",
- "pkg-types": "^1.2.0",
- "prettier": "^3.3.3",
- "rimraf": "^6.0.1"
+ "@changesets/git": "catalog:",
+ "@manypkg/get-packages": "catalog:",
+ "chalk": "catalog:",
+ "consola": "catalog:",
+ "dayjs": "catalog:",
+ "execa": "catalog:",
+ "find-up": "catalog:",
+ "nanoid": "catalog:",
+ "ora": "catalog:",
+ "pkg-types": "catalog:",
+ "prettier": "catalog:",
+ "rimraf": "catalog:"
  },
  "devDependencies": {
- "@types/chalk": "^2.2.0"
+ "@types/chalk": "catalog:"
  }
 }