From 33b2365f6e645edf2a6c1cf38596aaec52b35df6 Mon Sep 17 00:00:00 2001 From: vben Date: Sun, 7 Feb 2021 22:38:18 +0800 Subject: [PATCH] fix: some color error --- CHANGELOG.zh_CN.md | 3 +- build/config/themeConfig.ts | 4 +- package.json | 12 ++-- src/App.vue | 1 - src/components/Menu/src/BasicMenu.vue | 3 - .../SimpleMenu/src/components/menu.less | 6 +- vite.config.ts | 1 - yarn.lock | 58 +++++++++---------- 8 files changed, 41 insertions(+), 47 deletions(-) diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md index 278a0785..e7e6ee4d 100644 --- a/CHANGELOG.zh_CN.md +++ b/CHANGELOG.zh_CN.md @@ -2,10 +2,11 @@ ### 🐛 Bug Fixes -- 修复菜单在 hmr 时数据被置空 - 修复 Upload 组件 maxNumber 失效问题 - 修复打包 sourcemap 报错 +- 修复代码 debugger 位置显示错误 - 修复 mock 插件 post 请求错误问题 +- 修复部分主题颜色值错误 ### 🎫 Chores diff --git a/build/config/themeConfig.ts b/build/config/themeConfig.ts index 40b96bc5..31efc9c3 100644 --- a/build/config/themeConfig.ts +++ b/build/config/themeConfig.ts @@ -80,15 +80,13 @@ export function generateModifyVars() { const primaryColorObj: Record = {}; for (let index = 0; index < 10; index++) { - primaryColorObj[`primary-${index}`] = palettes[index]; + primaryColorObj[`primary-${index + 1}`] = palettes[index]; } return { 'primary-color': primary, ...primaryColorObj, 'info-color': primary, - 'alert-info-bg-color': palettes[0], - 'alert-info-border-color': palettes[2], 'processing-color': primary, 'success-color': '#55D187', // Success color 'error-color': '#ED6F6F', // False color diff --git a/package.json b/package.json index 75dc534d..5f311609 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ }, "dependencies": { "@iconify/iconify": "^2.0.0-rc.6", - "@vueuse/core": "^4.0.12", + "@vueuse/core": "^4.1.0", "ant-design-vue": "2.0.0", "apexcharts": "^3.24.0", "axios": "^0.21.1", @@ -95,12 +95,12 @@ "typescript": "^4.1.3", "vite": "2.0.0-beta.65", "vite-plugin-html": "^2.0.0", - "vite-plugin-imagemin": "^0.2.2", - "vite-plugin-mock": "^2.1.1", + "vite-plugin-imagemin": "^0.2.4", + "vite-plugin-mock": "^2.1.2", "vite-plugin-purge-icons": "^0.6.0", - "vite-plugin-pwa": "^0.4.4", - "vite-plugin-style-import": "^0.7.0", - "vite-plugin-theme": "^0.4.0", + "vite-plugin-pwa": "^0.4.6", + "vite-plugin-style-import": "^0.7.1", + "vite-plugin-theme": "^0.4.1", "vue-eslint-parser": "^7.4.1", "yargs": "^16.2.0" }, diff --git a/src/App.vue b/src/App.vue index ffd40d00..7c69069c 100644 --- a/src/App.vue +++ b/src/App.vue @@ -27,7 +27,6 @@ // Initialize vuex internal system configuration initAppConfigStore(); - // Create a lock screen monitor const lockEvent = useLockPage(); diff --git a/src/components/Menu/src/BasicMenu.vue b/src/components/Menu/src/BasicMenu.vue index 302b79e2..0d429224 100644 --- a/src/components/Menu/src/BasicMenu.vue +++ b/src/components/Menu/src/BasicMenu.vue @@ -122,9 +122,6 @@ watch( () => props.items, () => { - if (import.meta.hot && props.items.length === 0) { - return; - } handleMenuChange(); } ); diff --git a/src/components/SimpleMenu/src/components/menu.less b/src/components/SimpleMenu/src/components/menu.less index cb4fc391..dce754cd 100644 --- a/src/components/SimpleMenu/src/components/menu.less +++ b/src/components/SimpleMenu/src/components/menu.less @@ -83,7 +83,7 @@ &-selected { z-index: 2; color: @primary-color; - background: fade(@primary-color, 8); + background: fade(@primary-color, 10); .light-border(); } @@ -226,7 +226,7 @@ &-active:not(.@{menu-prefix-cls}-submenu) { z-index: 2; color: @primary-color; - background: fade(@primary-color, 8); + background: fade(@primary-color, 10); .light-border(); } @@ -239,7 +239,7 @@ > li.@{menu-prefix-cls}-item-active, .@{menu-prefix-cls}-submenu-active { position: relative; - background: fade(@primary-color, 3); + background: fade(@primary-color, 5); &::after { display: none; diff --git a/vite.config.ts b/vite.config.ts index 9add50c6..cc8c33c8 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -46,7 +46,6 @@ export default ({ command, mode }: ConfigEnv): UserConfig => { }, build: { - // sourcemap: true, polyfillDynamicImport: VITE_LEGACY, terserOptions: { compress: { diff --git a/yarn.lock b/yarn.lock index 3b58f36a..838de8eb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2068,18 +2068,18 @@ vscode-languageserver-textdocument "^1.0.1" vscode-uri "^2.1.2" -"@vueuse/core@^4.0.12": - version "4.0.12" - resolved "https://registry.npmjs.org/@vueuse/core/-/core-4.0.12.tgz#e6273feee1373c16d408b94be9382fa945c494a8" - integrity sha512-0pAEWyUP6HAqJ6Qzbybfpa8fNVdERMizrgjQI8vRe8+Fu5Ge5a8M2aLYCrdrLNxV6DsEZJ0bUFeTWb3aUnbxUA== +"@vueuse/core@^4.1.0": + version "4.1.0" + resolved "https://registry.npmjs.org/@vueuse/core/-/core-4.1.0.tgz#041ea810403433d9156e3903a45fc9ad83106b15" + integrity sha512-rcMceTJS6zDd5UOQr6bxhvqEsOitMNPlXAfTf0AJ9CaXs3ALAhtAyisGZCwZfHE5/Cid3Qy8bl3yWJwmrCOJSA== dependencies: - "@vueuse/shared" "4.0.12" + "@vueuse/shared" "4.1.0" vue-demi latest -"@vueuse/shared@4.0.12": - version "4.0.12" - resolved "https://registry.npmjs.org/@vueuse/shared/-/shared-4.0.12.tgz#fe42215a0cc60afcda2dcbfbdd73a4dd780647ec" - integrity sha512-t5Amxc3BIwi+M2mI0iy9yHKe5plYJUMbxpIBuMDR953J5s12ewRe3s8MLvQdlhAiNN8FTh9CBKU+mfdNgbWauw== +"@vueuse/shared@4.1.0": + version "4.1.0" + resolved "https://registry.npmjs.org/@vueuse/shared/-/shared-4.1.0.tgz#60d2a7b2d43173657816ae27dbb76d46dde480f4" + integrity sha512-E0g3MGu2RKLjPm6+EEsl93Q8+SDt1FDBnnzLz0iiUjpdo8KmHM6ivcGNe58B44/fNi9p+y0db53fubT0d/XJJQ== dependencies: vue-demi latest @@ -9192,10 +9192,10 @@ vite-plugin-html@^2.0.0: fs-extra "^9.1.0" html-minifier-terser "^5.1.1" -vite-plugin-imagemin@^0.2.2: - version "0.2.2" - resolved "https://registry.npmjs.org/vite-plugin-imagemin/-/vite-plugin-imagemin-0.2.2.tgz#e85c5956f787f1c636f40af449f1b064c919149f" - integrity sha512-bEf5kznbWFo7wxaJ0G9e0WQ4/Ce6FtNxwoMt2w+9SoIxPAraP/etQ/L+rnLuuiKwl2L22YrPoS2hWa4XxMK5Rw== +vite-plugin-imagemin@^0.2.4: + version "0.2.4" + resolved "https://registry.npmjs.org/vite-plugin-imagemin/-/vite-plugin-imagemin-0.2.4.tgz#c44f7a39d84b8a0af8468b90505a147fd5297b67" + integrity sha512-7VQwm2mip/JNp0oTqVOLZ+eo7ijZT5wP3AZF3PwJErZ48iT02PcDbC1Ij00Q2zoFPbtMkAuEbcLh1vK5C1m+pQ== dependencies: "@types/imagemin" "^7.0.0" "@types/imagemin-gifsicle" "^7.0.0" @@ -9214,10 +9214,10 @@ vite-plugin-imagemin@^0.2.2: imagemin-svgo "^8.0.0" imagemin-webp "^6.0.0" -vite-plugin-mock@^2.1.1: - version "2.1.1" - resolved "https://registry.npmjs.org/vite-plugin-mock/-/vite-plugin-mock-2.1.1.tgz#162f1ca93bed22c3f371997b394228e67e156fee" - integrity sha512-FFgKA9dNBmaodWSRxsKU5s7Ls9gtSCBvnEDZ6R9bTgswkv4yTTvpbFb3Vh2bKdfJgv9fTU1A33vTcfz0EgLCMg== +vite-plugin-mock@^2.1.2: + version "2.1.2" + resolved "https://registry.npmjs.org/vite-plugin-mock/-/vite-plugin-mock-2.1.2.tgz#a66d65947d565862395a0a181cb210b0076db9cc" + integrity sha512-b/YoQyBQhuyXOm/30bfVOKKBD7N50nw/5xTyyIXOTsry8LOPa5AZR9/2s2zPTioMeb63Ey4vga6CG8E2Tj8XVg== dependencies: "@rollup/plugin-node-resolve" "^11.1.1" "@types/mockjs" "^1.0.3" @@ -9241,30 +9241,30 @@ vite-plugin-purge-icons@^0.6.0: "@purge-icons/generated" "^0.6.0" rollup-plugin-purge-icons "^0.6.0" -vite-plugin-pwa@^0.4.4: - version "0.4.4" - resolved "https://registry.npmjs.org/vite-plugin-pwa/-/vite-plugin-pwa-0.4.4.tgz#58624cd049aa0ca30b84523e9f24e6f1a435d7b1" - integrity sha512-GboCS5XJYHtCYjmU2XU0C8VTccYstJOX8m2Qy1izoUA5YendhjQRByjj9EYTgvh+ImsoXW6gHkMK2eR+AsCFDg== +vite-plugin-pwa@^0.4.6: + version "0.4.6" + resolved "https://registry.npmjs.org/vite-plugin-pwa/-/vite-plugin-pwa-0.4.6.tgz#e759b7840211f83cae367d306654da505cecbceb" + integrity sha512-3LonumSG4EcH9FT61d7wWouHkCmEciy3RPfvt25b835HMx9gb2Dt71t140+85Z5d+uANMSguC3miBnnGzagAMA== dependencies: debug "^4.3.2" fast-glob "^3.2.5" pretty-bytes "^5.5.0" workbox-build "^6.1.0" -vite-plugin-style-import@^0.7.0: - version "0.7.0" - resolved "https://registry.npmjs.org/vite-plugin-style-import/-/vite-plugin-style-import-0.7.0.tgz#fbaa5444cad1efbc52fae533f1584d5f75a3ae06" - integrity sha512-VOx2vXGja4fpJgmFhP3oJzRp5BPDzU3zOvLHNjILVadQP3UfZYXUAR6UxmbrR8I+3PjnrDDMrOdDzsVwplL7aQ== +vite-plugin-style-import@^0.7.1: + version "0.7.1" + resolved "https://registry.npmjs.org/vite-plugin-style-import/-/vite-plugin-style-import-0.7.1.tgz#f55949f6821937a7027c4afa8f6ce4c0b6ef9609" + integrity sha512-Nr2PH8i8i9GIQhQRkipwYTYKur+/1mkCrMi4sXbMLcoUsz7wq7uZ1c3XcXA8B0Au3lZm+AKN3KiUrDD4Evx9EQ== dependencies: "@rollup/pluginutils" "^4.1.0" change-case "^4.1.2" es-module-lexer "^0.3.26" magic-string "^0.25.7" -vite-plugin-theme@^0.4.0: - version "0.4.0" - resolved "https://registry.npmjs.org/vite-plugin-theme/-/vite-plugin-theme-0.4.0.tgz#4fcee86e775ef181771698bc07f1467cd5aac3c0" - integrity sha512-TB2urU0YmDmbrSjRcb+JoRds95aoi7nocxbxie3dFbvKRu3qicpUvCWGqIu5//EcvMLUzBvvu+KdvUb9omy6mw== +vite-plugin-theme@^0.4.1: + version "0.4.1" + resolved "https://registry.npmjs.org/vite-plugin-theme/-/vite-plugin-theme-0.4.1.tgz#02157947d1954ef59e3747e1b4f7d002b6b3f7cd" + integrity sha512-ap0NpgBAKOdKQD1zW5P56sYPTJc6DO9FtXsrnOjXtxQ2gb2qKuRAnVV5+UFuO/Mgjh2QyuN9AnT5ANwGTjl0og== dependencies: "@types/tinycolor2" "^1.4.2" clean-css "^4.2.3" -- GitLab