diff --git a/.github/labeler.yml b/.github/labeler.yml deleted file mode 100644 index 7cef0938..00000000 --- a/.github/labeler.yml +++ /dev/null @@ -1,16 +0,0 @@ -# Add 'feature' label to any PR where the head branch name starts with `feature` or has a `feature` section in the name -feature: - - head-branch: ["^feat", "feat"] - -bug: - - head-branch: ["^fix", "fix"] - -chore: - - head-branch: ["^chore", "chore"] - -perf: - - head-branch: ["^perf", "perf"] - -documentation: - - changed-files: - - any-glob-to-any-file: ["**/*.md", "docs/**"] diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml deleted file mode 100644 index 2ecf030d..00000000 --- a/.github/workflows/labeler.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: PR Labeler - -on: - pull_request: - types: [opened, edited, synchronize] - -jobs: - label: - permissions: - contents: read - pull-requests: write - runs-on: ubuntu-latest - if: github.actor != 'dependabot[bot]' && !contains(github.event.head_commit.message, '[skip ci]') - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Label PR based on title or file changes - uses: actions/labeler@v5 - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - configuration-path: .github/labeler.yml diff --git a/.vscode/launch.json b/.vscode/launch.json index 3b4e323c..7740e810 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -9,7 +9,7 @@ "url": "http://localhost:5555", "env": { "NODE_ENV": "development" }, "sourceMaps": true, - "webRoot": "${workspaceFolder}/playground/src" + "webRoot": "${workspaceFolder}" }, { "type": "chrome", @@ -18,7 +18,7 @@ "url": "http://localhost:5666", "env": { "NODE_ENV": "development" }, "sourceMaps": true, - "webRoot": "${workspaceFolder}/apps/web-antd/src" + "webRoot": "${workspaceFolder}" }, { "type": "chrome", @@ -27,7 +27,7 @@ "url": "http://localhost:5777", "env": { "NODE_ENV": "development" }, "sourceMaps": true, - "webRoot": "${workspaceFolder}/apps/web-ele/src" + "webRoot": "${workspaceFolder}" }, { "type": "chrome", @@ -36,7 +36,7 @@ "url": "http://localhost:5888", "env": { "NODE_ENV": "development" }, "sourceMaps": true, - "webRoot": "${workspaceFolder}/apps/web-naive/src" + "webRoot": "${workspaceFolder}" } ] } diff --git a/apps/web-antd/src/views/dashboard/workspace/index.vue b/apps/web-antd/src/views/dashboard/workspace/index.vue index c8ae0273..b84ceebb 100644 --- a/apps/web-antd/src/views/dashboard/workspace/index.vue +++ b/apps/web-antd/src/views/dashboard/workspace/index.vue @@ -214,7 +214,11 @@ const trendItems: WorkbenchTrendItem[] = [
- + diff --git a/docs/src/en/guide/in-depth/theme.md b/docs/src/en/guide/in-depth/theme.md index 6202a13a..95a9e478 100644 --- a/docs/src/en/guide/in-depth/theme.md +++ b/docs/src/en/guide/in-depth/theme.md @@ -36,7 +36,7 @@ You can check the list below to understand all the available variables. --background: 0 0% 100%; /* Main area background color */ - --background-deep: 210 11.11% 96.47%; + --background-deep: 216 20.11% 95.47%; --foreground: 210 6% 21%; /* Background color for */ @@ -111,7 +111,7 @@ You can check the list below to understand all the available variables. /* menu */ --sidebar: 0 0% 100%; - --sidebar-deep: 210 11.11% 96.47%; + --sidebar-deep: 216 20.11% 95.47%; --menu: var(--sidebar); /* header */ @@ -330,7 +330,7 @@ type BuiltinThemeType = --background: 0 0% 100%; /* Main area background color */ - --background-deep: 210 11.11% 96.47%; + --background-deep: 216 20.11% 95.47%; --foreground: 222 84% 5%; /* Background color for */ diff --git a/docs/src/guide/in-depth/theme.md b/docs/src/guide/in-depth/theme.md index 523b41f6..28364615 100644 --- a/docs/src/guide/in-depth/theme.md +++ b/docs/src/guide/in-depth/theme.md @@ -36,7 +36,7 @@ css 变量内的颜色，必须使用 `hsl` 格式，如 `0 0% 100%`，不需要 --background: 0 0% 100%; /* 主体区域背景色 */ - --background-deep: 210 11.11% 96.47%; + --background-deep: 216 20.11% 95.47%; --foreground: 210 6% 21%; /* Background color for */ @@ -111,7 +111,7 @@ css 变量内的颜色，必须使用 `hsl` 格式，如 `0 0% 100%`，不需要 /* menu */ --sidebar: 0 0% 100%; - --sidebar-deep: 210 11.11% 96.47%; + --sidebar-deep: 216 20.11% 95.47%; --menu: var(--sidebar); /* header */ @@ -330,7 +330,7 @@ type BuiltinThemeType = --background: 0 0% 100%; /* 主体区域背景色 */ - --background-deep: 210 11.11% 96.47%; + --background-deep: 216 20.11% 95.47%; --foreground: 222 84% 5%; /* Background color for */ diff --git a/internal/lint-configs/eslint-config/package.json b/internal/lint-configs/eslint-config/package.json index fda7dc43..6ee4c1c5 100644 --- a/internal/lint-configs/eslint-config/package.json +++ b/internal/lint-configs/eslint-config/package.json @@ -29,7 +29,7 @@ "dependencies": { "eslint-config-turbo": "^2.1.0", "eslint-plugin-command": "^0.2.3", - "eslint-plugin-import-x": "^4.1.0" + "eslint-plugin-import-x": "^4.1.1" }, "devDependencies": { "@eslint/js": "^9.9.1", diff --git a/internal/vite-config/package.json b/internal/vite-config/package.json index 7db17dff..fcb054b1 100644 --- a/internal/vite-config/package.json +++ b/internal/vite-config/package.json @@ -36,18 +36,18 @@ "nitropack": "^2.9.7", "resolve.exports": "^2.0.2", "vite-plugin-lib-inject-css": "^2.1.1", - "vite-plugin-pwa": "^0.20.1", + "vite-plugin-pwa": "^0.20.2", "vite-plugin-vue-devtools": "^7.3.9" }, "devDependencies": { "@types/archiver": "^6.0.2", "@types/html-minifier-terser": "^7.0.2", "@vben/node-utils": "workspace:*", - "@vitejs/plugin-vue": "^5.1.2", + "@vitejs/plugin-vue": "^5.1.3", "@vitejs/plugin-vue-jsx": "^4.0.1", "dayjs": "^1.11.13", "dotenv": "^16.4.5", - "rollup": "^4.21.1", + "rollup": "^4.21.2", "rollup-plugin-visualizer": "^5.12.0", "sass": "^1.77.8", "vite": "^5.4.2", diff --git a/package.json b/package.json index 101bf18e..22371898 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "@vben/turbo-run": "workspace:*", "@vben/vite-config": "workspace:*", "@vben/vsh": "workspace:*", - "@vitejs/plugin-vue": "^5.1.2", + "@vitejs/plugin-vue": "^5.1.3", "@vitejs/plugin-vue-jsx": "^4.0.1", "@vue/test-utils": "^2.4.6", "autoprefixer": "^10.4.20", @@ -93,7 +93,7 @@ "vite": "^5.4.2", "vitest": "^2.0.5", "vue": "^3.4.38", - "vue-tsc": "^2.0.29" + "vue-tsc": "^2.1.2" }, "engines": { "node": ">=20", diff --git a/packages/@core/base/design/src/css/global.css b/packages/@core/base/design/src/css/global.css index aaa52280..8c2baf11 100644 --- a/packages/@core/base/design/src/css/global.css +++ b/packages/@core/base/design/src/css/global.css @@ -136,7 +136,7 @@ } .card-box { - @apply bg-card text-card-foreground border-border rounded-xl border shadow; + @apply bg-card text-card-foreground border-border rounded-xl border; } } diff --git a/packages/@core/base/design/src/design-tokens/default/index.css b/packages/@core/base/design/src/design-tokens/default/index.css index 99411180..6d54bd63 100644 --- a/packages/@core/base/design/src/design-tokens/default/index.css +++ b/packages/@core/base/design/src/design-tokens/default/index.css @@ -7,7 +7,7 @@ --background: 0 0% 100%; /* 主体区域背景色 */ - --background-deep: 210 11.11% 96.47%; + --background-deep: 216 20.11% 95.47%; --foreground: 210 6% 21%; /* Background color for */ @@ -77,7 +77,7 @@ /* ============= custom ============= */ /* 遮罩颜色 */ - --overlay: 0 0% 0% / 30%; + --overlay: 0 0% 0% / 45%; /* 基本文字大小 */ --font-size-base: 16px; diff --git a/packages/@core/preferences/src/config.ts b/packages/@core/preferences/src/config.ts index 044ef385..cee8ca72 100644 --- a/packages/@core/preferences/src/config.ts +++ b/packages/@core/preferences/src/config.ts @@ -70,12 +70,12 @@ const defaultPreferences: Preferences = { expandOnHover: true, extraCollapse: true, hidden: false, - width: 230, + width: 224, }, tabbar: { dragable: true, enable: true, - height: 36, + height: 38, keepAlive: true, persist: true, showIcon: true, diff --git a/packages/@core/ui-kit/layout-ui/src/vben-layout.vue b/packages/@core/ui-kit/layout-ui/src/vben-layout.vue index 7fd4dd77..6418f170 100644 --- a/packages/@core/ui-kit/layout-ui/src/vben-layout.vue +++ b/packages/@core/ui-kit/layout-ui/src/vben-layout.vue @@ -50,7 +50,7 @@ const props = withDefaults(defineProps(), { sidebarWidth: 180, sideCollapseWidth: 60, tabbarEnable: true, - tabbarHeight: 36, + tabbarHeight: 40, zIndex: 200, }); diff --git a/packages/@core/ui-kit/popup-ui/src/modal/modal.vue b/packages/@core/ui-kit/popup-ui/src/modal/modal.vue index eb2e6bf2..7082882d 100644 --- a/packages/@core/ui-kit/popup-ui/src/modal/modal.vue +++ b/packages/@core/ui-kit/popup-ui/src/modal/modal.vue @@ -153,7 +153,7 @@ function pointerDownOutside(e: Event) { { 'left-0 top-0 size-full max-h-full !translate-x-0 !translate-y-0': shouldFullscreen, - 'top-1/2 -translate-y-1/2': centered && !shouldFullscreen, + 'top-1/2 !-translate-y-1/2': centered && !shouldFullscreen, 'duration-300': !dragging, }, ) diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/avatar/avatar.vue b/packages/@core/ui-kit/shadcn-ui/src/components/avatar/avatar.vue index e42326db..1c310c44 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/components/avatar/avatar.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/components/avatar/avatar.vue @@ -28,12 +28,12 @@ const props = withDefaults(defineProps(), { }); const text = computed(() => { - return props.alt.slice(0, 2).toUpperCase(); + return props.alt.slice(-2).toUpperCase(); });