by2025/admin-vben5
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin

Browse Source
This commit is contained in:
dap 2024-10-19 09:46:56 +08:00
commit b2268b03e7
46 changed files with 77 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/web-ele/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@vben/web-ele",
"version": "5.4.0",
"version": "5.4.1",
"homepage": "https://vben.pro",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

5
apps/web-ele/src/api/request.ts
View File

@ -74,11 +74,12 @@ function createRequestClient(baseURL: string) {
fulfilled: (response) => {
const { data: responseData, status } = response;
const { code, data, message: msg } = responseData;
const { code, data } = responseData;
if (status >= 200 && status < 400 && code === 0) {
return data;
}
throw new Error(`Error ${status}: ${msg}`);
const error = { response };
throw error;
},
});

2
apps/web-naive/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@vben/web-naive",
"version": "5.4.0",
"version": "5.4.1",
"homepage": "https://vben.pro",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

5
apps/web-naive/src/api/request.ts
View File

@ -73,11 +73,12 @@ function createRequestClient(baseURL: string) {
fulfilled: (response) => {
const { data: responseData, status } = response;
const { code, data, message: msg } = responseData;
const { code, data } = responseData;
if (status >= 200 && status < 400 && code === 0) {
return data;
}
throw new Error(`Error ${status}: ${msg}`);
const error = { response };
throw error;
},
});

2
docs/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@vben/docs",
"version": "5.4.0",
"version": "5.4.1",
"private": true,
"scripts": {
"build": "vitepress build",

5
docs/src/en/guide/essentials/server.md
View File

@ -233,12 +233,13 @@ function createRequestClient(baseURL: string) {
fulfilled: (response) => {
const { data: responseData, status } = response;
const { code, data, message: msg } = responseData;
const { code, data } = responseData;
if (status >= 200 && status < 400 && code === 0) {
return data;
}
throw new Error(`Error ${status}: ${msg}`);
const error = { response };
throw error;
},
});

5
docs/src/guide/essentials/server.md
View File

@ -236,12 +236,13 @@ function createRequestClient(baseURL: string) {
fulfilled: (response) => {
const { data: responseData, status } = response;
const { code, data, message: msg } = responseData;
const { code, data } = responseData;
if (status >= 200 && status < 400 && code === 0) {
return data;
}
throw new Error(`Error ${status}: ${msg}`);
const error = { response };
throw error;
},
});

2
internal/lint-configs/commitlint-config/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@vben/commitlint-config",
"version": "5.4.0",
"version": "5.4.1",
"private": true,
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",

2
internal/lint-configs/stylelint-config/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@vben/stylelint-config",
"version": "5.4.0",
"version": "5.4.1",
"private": true,
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",

2
internal/node-utils/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@vben/node-utils",
"version": "5.4.0",
"version": "5.4.1",
"private": true,
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",

2
internal/tailwind-config/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@vben/tailwind-config",
"version": "5.4.0",
"version": "5.4.1",
"private": true,
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",

2
internal/tsconfig/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@vben/tsconfig",
"version": "5.4.0",
"version": "5.4.1",
"private": true,
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",

2
internal/vite-config/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@vben/vite-config",
"version": "5.4.0",
"version": "5.4.1",
"private": true,
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",

4
package.json
View File

@ -1,6 +1,6 @@
{
"name": "vben-admin-pro",
"version": "5.4.0",
"version": "5.4.1",
"private": true,
"keywords": [
"monorepo",
@ -99,7 +99,7 @@
"node": ">=20.10.0",
"pnpm": ">=9.5.0"
},
"packageManager": "pnpm@9.12.1",
"packageManager": "pnpm@9.12.2",
"pnpm": {
"peerDependencyRules": {
"allowedVersions": {

2
packages/@core/base/design/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@vben-core/design",
"version": "5.4.0",
"version": "5.4.1",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/@core/base/icons/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@vben-core/icons",
"version": "5.4.0",
"version": "5.4.1",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/@core/base/shared/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@vben-core/shared",
"version": "5.4.0",
"version": "5.4.1",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/@core/base/typings/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@vben-core/typings",
"version": "5.4.0",
"version": "5.4.1",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/@core/composables/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@vben-core/composables",
"version": "5.4.0",
"version": "5.4.1",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/@core/preferences/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@vben-core/preferences",
"version": "5.4.0",
"version": "5.4.1",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/@core/ui-kit/form-ui/src/form-render/form-field.vue
View File

@ -281,7 +281,7 @@ function autofocus() {
'mr-2 flex-shrink-0 justify-end': !isVertical,
'flex-row': isVertical,
},
!isVertical && labelClass,
labelClass,
)
"
:help="help"

2
packages/@core/ui-kit/layout-ui/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@vben-core/layout-ui",
"version": "5.4.0",
"version": "5.4.1",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/@core/ui-kit/menu-ui/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@vben-core/menu-ui",
"version": "5.4.0",
"version": "5.4.1",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/@core/ui-kit/shadcn-ui/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@vben-core/shadcn-ui",
"version": "5.4.0",
"version": "5.4.1",
"#main": "./dist/index.mjs",
"#module": "./dist/index.mjs",
"homepage": "https://github.com/vbenjs/vue-vben-admin",

2
packages/@core/ui-kit/tabs-ui/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@vben-core/tabs-ui",
"version": "5.4.0",
"version": "5.4.1",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/constants/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@vben/constants",
"version": "5.4.0",
"version": "5.4.1",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/effects/access/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@vben/access",
"version": "5.4.0",
"version": "5.4.1",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/effects/common-ui/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@vben/common-ui",
"version": "5.4.0",
"version": "5.4.1",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

12
packages/effects/common-ui/src/ui/fallback/fallback.vue
View File

@ -48,12 +48,12 @@ const titleText = computed(() => {
case '500': {
return $t('fallback.internalError');
}
case 'offline': {
return $t('fallback.offlineError');
}
case 'coming-soon': {
return $t('fallback.comingSoon');
}
case 'offline': {
return $t('fallback.offlineError');
}
default: {
return '';
}
@ -94,12 +94,12 @@ const fallbackIcon = computed(() => {
case '500': {
return Icon500;
}
case 'offline': {
return IconOffline;
}
case 'coming-soon': {
return IconHello;
}
case 'offline': {
return IconOffline;
}
default: {
return null;
}

2
packages/effects/hooks/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@vben/hooks",
"version": "5.4.0",
"version": "5.4.1",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/effects/layouts/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@vben/layouts",
"version": "5.4.0",
"version": "5.4.1",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/effects/plugins/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@vben/plugins",
"version": "5.4.0",
"version": "5.4.1",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/effects/request/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@vben/request",
"version": "5.4.0",
"version": "5.4.1",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/icons/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@vben/icons",
"version": "5.4.0",
"version": "5.4.1",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/locales/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@vben/locales",
"version": "5.4.0",
"version": "5.4.1",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/preferences/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@vben/preferences",
"version": "5.4.0",
"version": "5.4.1",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/stores/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@vben/stores",
"version": "5.4.0",
"version": "5.4.1",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/styles/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@vben/styles",
"version": "5.4.0",
"version": "5.4.1",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/types/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@vben/types",
"version": "5.4.0",
"version": "5.4.1",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
packages/utils/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@vben/utils",
"version": "5.4.0",
"version": "5.4.1",
"homepage": "https://github.com/vbenjs/vue-vben-admin",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

2
playground/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@vben/playground",
"version": "5.4.0",
"version": "5.4.1",
"homepage": "https://vben.pro",
"bugs": "https://github.com/vbenjs/vue-vben-admin/issues",
"repository": {

5
playground/src/api/request.ts
View File

@ -74,12 +74,13 @@ function createRequestClient(baseURL: string) {
fulfilled: (response) => {
const { data: responseData, status } = response;
const { code, data, message: msg } = responseData;
const { code, data } = responseData;
if (status >= 200 && status < 400 && code === 0) {
return data;
}
throw new Error(`Error ${status}: ${msg}`);
const error = { response };
throw error;
},
});

26
pnpm-workspace.yaml
View File

@ -22,7 +22,7 @@ catalog:
'@ctrl/tinycolor': ^4.1.0
'@eslint/js': ^9.12.0
'@faker-js/faker': ^9.0.3
'@iconify/json': ^2.2.260
'@iconify/json': ^2.2.261
'@iconify/tailwind': ^1.1.3
'@iconify/vue': ^4.1.2
'@intlify/core-base': ^10.0.4
@ -43,13 +43,13 @@ catalog:
'@types/html-minifier-terser': ^7.0.2
'@types/jsonwebtoken': ^9.0.7
'@types/lodash.clonedeep': ^4.5.9
'@types/node': ^22.7.5
'@types/node': ^22.7.6
'@types/nprogress': ^0.2.3
'@types/postcss-import': ^14.0.3
'@types/qrcode': ^1.5.5
'@types/sortablejs': ^1.15.8
'@typescript-eslint/eslint-plugin': ^8.9.0
'@typescript-eslint/parser': ^8.9.0
'@typescript-eslint/eslint-plugin': ^8.10.0
'@typescript-eslint/parser': ^8.10.0
'@vee-validate/zod': ^4.13.2
'@vite-pwa/vitepress': ^0.5.3
'@vitejs/plugin-vue': ^5.1.4
@ -73,7 +73,7 @@ catalog:
commitlint-plugin-function-rules: ^4.0.0
consola: ^3.2.3
cross-env: ^7.0.3
cspell: ^8.15.2
cspell: ^8.15.4
cssnano: ^7.0.6
cz-git: ^1.10.1
czg: ^1.10.1
@ -82,24 +82,24 @@ catalog:
depcheck: ^1.4.7
dotenv: ^16.4.5
echarts: ^5.5.1
element-plus: ^2.8.5
element-plus: ^2.8.6
eslint: ^9.12.0
eslint-config-turbo: ^2.1.3
eslint-plugin-command: ^0.2.6
eslint-plugin-eslint-comments: ^3.2.0
eslint-plugin-import-x: ^4.3.1
eslint-plugin-jsdoc: ^50.4.1
eslint-plugin-jsdoc: ^50.4.3
eslint-plugin-jsonc: ^2.16.0
eslint-plugin-n: ^17.11.1
eslint-plugin-no-only-tests: ^3.3.0
eslint-plugin-perfectionist: ^3.9.0
eslint-plugin-perfectionist: ^3.9.1
eslint-plugin-prettier: ^5.2.1
eslint-plugin-regexp: ^2.6.0
eslint-plugin-unicorn: ^56.0.0
eslint-plugin-unused-imports: ^4.1.4
eslint-plugin-vitest: ^0.5.4
eslint-plugin-vue: ^9.29.0
execa: ^9.4.0
execa: ^9.4.1
find-up: ^7.0.0
get-port: ^7.1.0
globals: ^15.11.0
@ -138,7 +138,7 @@ catalog:
rimraf: ^6.0.1
rollup: ^4.24.0
rollup-plugin-visualizer: ^5.12.0
sass: ^1.79.5
sass: ^1.80.2
sortablejs: ^1.15.3
stylelint: ^16.10.0
stylelint-config-recess-order: ^5.1.1
@ -148,7 +148,7 @@ catalog:
stylelint-config-standard: ^36.0.1
stylelint-order: ^6.0.4
stylelint-prettier: ^5.0.2
stylelint-scss: ^6.7.0
stylelint-scss: ^6.8.1
tailwind-merge: ^2.5.4
tailwindcss: ^3.4.14
tailwindcss-animate: ^1.0.7
@ -165,7 +165,7 @@ catalog:
vite-plugin-lazy-import: ^1.0.7
vite-plugin-lib-inject-css: ^2.1.1
vite-plugin-pwa: ^0.20.5
vite-plugin-vue-devtools: ^7.4.6
vite-plugin-vue-devtools: ^7.5.2
vitepress: ^1.4.1
vitepress-plugin-group-icons: ^1.3.0
vitest: ^2.1.3
@ -174,7 +174,7 @@ catalog:
vue-i18n: ^10.0.4
vue-router: ^4.4.5
vue-tsc: ^2.1.6
vxe-pc-ui: ^4.2.20
vxe-pc-ui: ^4.2.24
vxe-table: ^4.7.86
watermark-js-plus: ^1.5.7
zod: ^3.23.8

2
scripts/turbo-run/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@vben/turbo-run",
"version": "5.4.0",
"version": "5.4.1",
"private": true,
"license": "MIT",
"type": "module",

2
scripts/vsh/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@vben/vsh",
"version": "5.4.0",
"version": "5.4.1",
"private": true,
"license": "MIT",
"type": "module",

8
scripts/vsh/src/publint/index.ts
View File

@ -143,15 +143,15 @@ function printResult(
break;
}
case 'suggestion': {
suggestionsCount++;
break;
}
case 'warning': {
warningCount++;
break;
}
case 'suggestion': {
suggestionsCount++;
break;
}
// No default
}
const ruleUrl = `https://publint.dev/rules#${message.code.toLocaleLowerCase()}`;