Commit 33b2365f6e645edf2a6c1cf38596aaec52b35df6

Authored by vben
1 parent 23eba274

fix: some color error

CHANGELOG.zh_CN.md
@@ -2,10 +2,11 @@ @@ -2,10 +2,11 @@
2 2
3 ### 🐛 Bug Fixes 3 ### 🐛 Bug Fixes
4 4
5 -- 修复菜单在 hmr 时数据被置空  
6 - 修复 Upload 组件 maxNumber 失效问题 5 - 修复 Upload 组件 maxNumber 失效问题
7 - 修复打包 sourcemap 报错 6 - 修复打包 sourcemap 报错
  7 +- 修复代码 debugger 位置显示错误
8 - 修复 mock 插件 post 请求错误问题 8 - 修复 mock 插件 post 请求错误问题
  9 +- 修复部分主题颜色值错误
9 10
10 ### 🎫 Chores 11 ### 🎫 Chores
11 12
build/config/themeConfig.ts
@@ -80,15 +80,13 @@ export function generateModifyVars() { @@ -80,15 +80,13 @@ export function generateModifyVars() {
80 const primaryColorObj: Record<string, string> = {}; 80 const primaryColorObj: Record<string, string> = {};
81 81
82 for (let index = 0; index < 10; index++) { 82 for (let index = 0; index < 10; index++) {
83 - primaryColorObj[`primary-${index}`] = palettes[index]; 83 + primaryColorObj[`primary-${index + 1}`] = palettes[index];
84 } 84 }
85 85
86 return { 86 return {
87 'primary-color': primary, 87 'primary-color': primary,
88 ...primaryColorObj, 88 ...primaryColorObj,
89 'info-color': primary, 89 'info-color': primary,
90 - 'alert-info-bg-color': palettes[0],  
91 - 'alert-info-border-color': palettes[2],  
92 'processing-color': primary, 90 'processing-color': primary,
93 'success-color': '#55D187', // Success color 91 'success-color': '#55D187', // Success color
94 'error-color': '#ED6F6F', // False color 92 'error-color': '#ED6F6F', // False color
package.json
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 }, 21 },
22 "dependencies": { 22 "dependencies": {
23 "@iconify/iconify": "^2.0.0-rc.6", 23 "@iconify/iconify": "^2.0.0-rc.6",
24 - "@vueuse/core": "^4.0.12", 24 + "@vueuse/core": "^4.1.0",
25 "ant-design-vue": "2.0.0", 25 "ant-design-vue": "2.0.0",
26 "apexcharts": "^3.24.0", 26 "apexcharts": "^3.24.0",
27 "axios": "^0.21.1", 27 "axios": "^0.21.1",
@@ -95,12 +95,12 @@ @@ -95,12 +95,12 @@
95 "typescript": "^4.1.3", 95 "typescript": "^4.1.3",
96 "vite": "2.0.0-beta.65", 96 "vite": "2.0.0-beta.65",
97 "vite-plugin-html": "^2.0.0", 97 "vite-plugin-html": "^2.0.0",
98 - "vite-plugin-imagemin": "^0.2.2",  
99 - "vite-plugin-mock": "^2.1.1", 98 + "vite-plugin-imagemin": "^0.2.4",
  99 + "vite-plugin-mock": "^2.1.2",
100 "vite-plugin-purge-icons": "^0.6.0", 100 "vite-plugin-purge-icons": "^0.6.0",
101 - "vite-plugin-pwa": "^0.4.4",  
102 - "vite-plugin-style-import": "^0.7.0",  
103 - "vite-plugin-theme": "^0.4.0", 101 + "vite-plugin-pwa": "^0.4.6",
  102 + "vite-plugin-style-import": "^0.7.1",
  103 + "vite-plugin-theme": "^0.4.1",
104 "vue-eslint-parser": "^7.4.1", 104 "vue-eslint-parser": "^7.4.1",
105 "yargs": "^16.2.0" 105 "yargs": "^16.2.0"
106 }, 106 },
src/App.vue
@@ -27,7 +27,6 @@ @@ -27,7 +27,6 @@
27 27
28 // Initialize vuex internal system configuration 28 // Initialize vuex internal system configuration
29 initAppConfigStore(); 29 initAppConfigStore();
30 -  
31 // Create a lock screen monitor 30 // Create a lock screen monitor
32 const lockEvent = useLockPage(); 31 const lockEvent = useLockPage();
33 32
src/components/Menu/src/BasicMenu.vue
@@ -122,9 +122,6 @@ @@ -122,9 +122,6 @@
122 watch( 122 watch(
123 () => props.items, 123 () => props.items,
124 () => { 124 () => {
125 - if (import.meta.hot && props.items.length === 0) {  
126 - return;  
127 - }  
128 handleMenuChange(); 125 handleMenuChange();
129 } 126 }
130 ); 127 );
src/components/SimpleMenu/src/components/menu.less
@@ -83,7 +83,7 @@ @@ -83,7 +83,7 @@
83 &-selected { 83 &-selected {
84 z-index: 2; 84 z-index: 2;
85 color: @primary-color; 85 color: @primary-color;
86 - background: fade(@primary-color, 8); 86 + background: fade(@primary-color, 10);
87 87
88 .light-border(); 88 .light-border();
89 } 89 }
@@ -226,7 +226,7 @@ @@ -226,7 +226,7 @@
226 &-active:not(.@{menu-prefix-cls}-submenu) { 226 &-active:not(.@{menu-prefix-cls}-submenu) {
227 z-index: 2; 227 z-index: 2;
228 color: @primary-color; 228 color: @primary-color;
229 - background: fade(@primary-color, 8); 229 + background: fade(@primary-color, 10);
230 230
231 .light-border(); 231 .light-border();
232 } 232 }
@@ -239,7 +239,7 @@ @@ -239,7 +239,7 @@
239 > li.@{menu-prefix-cls}-item-active, 239 > li.@{menu-prefix-cls}-item-active,
240 .@{menu-prefix-cls}-submenu-active { 240 .@{menu-prefix-cls}-submenu-active {
241 position: relative; 241 position: relative;
242 - background: fade(@primary-color, 3); 242 + background: fade(@primary-color, 5);
243 243
244 &::after { 244 &::after {
245 display: none; 245 display: none;
vite.config.ts
@@ -46,7 +46,6 @@ export default ({ command, mode }: ConfigEnv): UserConfig =&gt; { @@ -46,7 +46,6 @@ export default ({ command, mode }: ConfigEnv): UserConfig =&gt; {
46 }, 46 },
47 47
48 build: { 48 build: {
49 - // sourcemap: true,  
50 polyfillDynamicImport: VITE_LEGACY, 49 polyfillDynamicImport: VITE_LEGACY,
51 terserOptions: { 50 terserOptions: {
52 compress: { 51 compress: {
yarn.lock
@@ -2068,18 +2068,18 @@ @@ -2068,18 +2068,18 @@
2068 vscode-languageserver-textdocument "^1.0.1" 2068 vscode-languageserver-textdocument "^1.0.1"
2069 vscode-uri "^2.1.2" 2069 vscode-uri "^2.1.2"
2070 2070
2071 -"@vueuse/core@^4.0.12":  
2072 - version "4.0.12"  
2073 - resolved "https://registry.npmjs.org/@vueuse/core/-/core-4.0.12.tgz#e6273feee1373c16d408b94be9382fa945c494a8"  
2074 - integrity sha512-0pAEWyUP6HAqJ6Qzbybfpa8fNVdERMizrgjQI8vRe8+Fu5Ge5a8M2aLYCrdrLNxV6DsEZJ0bUFeTWb3aUnbxUA== 2071 +"@vueuse/core@^4.1.0":
  2072 + version "4.1.0"
  2073 + resolved "https://registry.npmjs.org/@vueuse/core/-/core-4.1.0.tgz#041ea810403433d9156e3903a45fc9ad83106b15"
  2074 + integrity sha512-rcMceTJS6zDd5UOQr6bxhvqEsOitMNPlXAfTf0AJ9CaXs3ALAhtAyisGZCwZfHE5/Cid3Qy8bl3yWJwmrCOJSA==
2075 dependencies: 2075 dependencies:
2076 - "@vueuse/shared" "4.0.12" 2076 + "@vueuse/shared" "4.1.0"
2077 vue-demi latest 2077 vue-demi latest
2078 2078
2079 -"@vueuse/shared@4.0.12":  
2080 - version "4.0.12"  
2081 - resolved "https://registry.npmjs.org/@vueuse/shared/-/shared-4.0.12.tgz#fe42215a0cc60afcda2dcbfbdd73a4dd780647ec"  
2082 - integrity sha512-t5Amxc3BIwi+M2mI0iy9yHKe5plYJUMbxpIBuMDR953J5s12ewRe3s8MLvQdlhAiNN8FTh9CBKU+mfdNgbWauw== 2079 +"@vueuse/shared@4.1.0":
  2080 + version "4.1.0"
  2081 + resolved "https://registry.npmjs.org/@vueuse/shared/-/shared-4.1.0.tgz#60d2a7b2d43173657816ae27dbb76d46dde480f4"
  2082 + integrity sha512-E0g3MGu2RKLjPm6+EEsl93Q8+SDt1FDBnnzLz0iiUjpdo8KmHM6ivcGNe58B44/fNi9p+y0db53fubT0d/XJJQ==
2083 dependencies: 2083 dependencies:
2084 vue-demi latest 2084 vue-demi latest
2085 2085
@@ -9192,10 +9192,10 @@ vite-plugin-html@^2.0.0: @@ -9192,10 +9192,10 @@ vite-plugin-html@^2.0.0:
9192 fs-extra "^9.1.0" 9192 fs-extra "^9.1.0"
9193 html-minifier-terser "^5.1.1" 9193 html-minifier-terser "^5.1.1"
9194 9194
9195 -vite-plugin-imagemin@^0.2.2:  
9196 - version "0.2.2"  
9197 - resolved "https://registry.npmjs.org/vite-plugin-imagemin/-/vite-plugin-imagemin-0.2.2.tgz#e85c5956f787f1c636f40af449f1b064c919149f"  
9198 - integrity sha512-bEf5kznbWFo7wxaJ0G9e0WQ4/Ce6FtNxwoMt2w+9SoIxPAraP/etQ/L+rnLuuiKwl2L22YrPoS2hWa4XxMK5Rw== 9195 +vite-plugin-imagemin@^0.2.4:
  9196 + version "0.2.4"
  9197 + resolved "https://registry.npmjs.org/vite-plugin-imagemin/-/vite-plugin-imagemin-0.2.4.tgz#c44f7a39d84b8a0af8468b90505a147fd5297b67"
  9198 + integrity sha512-7VQwm2mip/JNp0oTqVOLZ+eo7ijZT5wP3AZF3PwJErZ48iT02PcDbC1Ij00Q2zoFPbtMkAuEbcLh1vK5C1m+pQ==
9199 dependencies: 9199 dependencies:
9200 "@types/imagemin" "^7.0.0" 9200 "@types/imagemin" "^7.0.0"
9201 "@types/imagemin-gifsicle" "^7.0.0" 9201 "@types/imagemin-gifsicle" "^7.0.0"
@@ -9214,10 +9214,10 @@ vite-plugin-imagemin@^0.2.2: @@ -9214,10 +9214,10 @@ vite-plugin-imagemin@^0.2.2:
9214 imagemin-svgo "^8.0.0" 9214 imagemin-svgo "^8.0.0"
9215 imagemin-webp "^6.0.0" 9215 imagemin-webp "^6.0.0"
9216 9216
9217 -vite-plugin-mock@^2.1.1:  
9218 - version "2.1.1"  
9219 - resolved "https://registry.npmjs.org/vite-plugin-mock/-/vite-plugin-mock-2.1.1.tgz#162f1ca93bed22c3f371997b394228e67e156fee"  
9220 - integrity sha512-FFgKA9dNBmaodWSRxsKU5s7Ls9gtSCBvnEDZ6R9bTgswkv4yTTvpbFb3Vh2bKdfJgv9fTU1A33vTcfz0EgLCMg== 9217 +vite-plugin-mock@^2.1.2:
  9218 + version "2.1.2"
  9219 + resolved "https://registry.npmjs.org/vite-plugin-mock/-/vite-plugin-mock-2.1.2.tgz#a66d65947d565862395a0a181cb210b0076db9cc"
  9220 + integrity sha512-b/YoQyBQhuyXOm/30bfVOKKBD7N50nw/5xTyyIXOTsry8LOPa5AZR9/2s2zPTioMeb63Ey4vga6CG8E2Tj8XVg==
9221 dependencies: 9221 dependencies:
9222 "@rollup/plugin-node-resolve" "^11.1.1" 9222 "@rollup/plugin-node-resolve" "^11.1.1"
9223 "@types/mockjs" "^1.0.3" 9223 "@types/mockjs" "^1.0.3"
@@ -9241,30 +9241,30 @@ vite-plugin-purge-icons@^0.6.0: @@ -9241,30 +9241,30 @@ vite-plugin-purge-icons@^0.6.0:
9241 "@purge-icons/generated" "^0.6.0" 9241 "@purge-icons/generated" "^0.6.0"
9242 rollup-plugin-purge-icons "^0.6.0" 9242 rollup-plugin-purge-icons "^0.6.0"
9243 9243
9244 -vite-plugin-pwa@^0.4.4:  
9245 - version "0.4.4"  
9246 - resolved "https://registry.npmjs.org/vite-plugin-pwa/-/vite-plugin-pwa-0.4.4.tgz#58624cd049aa0ca30b84523e9f24e6f1a435d7b1"  
9247 - integrity sha512-GboCS5XJYHtCYjmU2XU0C8VTccYstJOX8m2Qy1izoUA5YendhjQRByjj9EYTgvh+ImsoXW6gHkMK2eR+AsCFDg== 9244 +vite-plugin-pwa@^0.4.6:
  9245 + version "0.4.6"
  9246 + resolved "https://registry.npmjs.org/vite-plugin-pwa/-/vite-plugin-pwa-0.4.6.tgz#e759b7840211f83cae367d306654da505cecbceb"
  9247 + integrity sha512-3LonumSG4EcH9FT61d7wWouHkCmEciy3RPfvt25b835HMx9gb2Dt71t140+85Z5d+uANMSguC3miBnnGzagAMA==
9248 dependencies: 9248 dependencies:
9249 debug "^4.3.2" 9249 debug "^4.3.2"
9250 fast-glob "^3.2.5" 9250 fast-glob "^3.2.5"
9251 pretty-bytes "^5.5.0" 9251 pretty-bytes "^5.5.0"
9252 workbox-build "^6.1.0" 9252 workbox-build "^6.1.0"
9253 9253
9254 -vite-plugin-style-import@^0.7.0:  
9255 - version "0.7.0"  
9256 - resolved "https://registry.npmjs.org/vite-plugin-style-import/-/vite-plugin-style-import-0.7.0.tgz#fbaa5444cad1efbc52fae533f1584d5f75a3ae06"  
9257 - integrity sha512-VOx2vXGja4fpJgmFhP3oJzRp5BPDzU3zOvLHNjILVadQP3UfZYXUAR6UxmbrR8I+3PjnrDDMrOdDzsVwplL7aQ== 9254 +vite-plugin-style-import@^0.7.1:
  9255 + version "0.7.1"
  9256 + resolved "https://registry.npmjs.org/vite-plugin-style-import/-/vite-plugin-style-import-0.7.1.tgz#f55949f6821937a7027c4afa8f6ce4c0b6ef9609"
  9257 + integrity sha512-Nr2PH8i8i9GIQhQRkipwYTYKur+/1mkCrMi4sXbMLcoUsz7wq7uZ1c3XcXA8B0Au3lZm+AKN3KiUrDD4Evx9EQ==
9258 dependencies: 9258 dependencies:
9259 "@rollup/pluginutils" "^4.1.0" 9259 "@rollup/pluginutils" "^4.1.0"
9260 change-case "^4.1.2" 9260 change-case "^4.1.2"
9261 es-module-lexer "^0.3.26" 9261 es-module-lexer "^0.3.26"
9262 magic-string "^0.25.7" 9262 magic-string "^0.25.7"
9263 9263
9264 -vite-plugin-theme@^0.4.0:  
9265 - version "0.4.0"  
9266 - resolved "https://registry.npmjs.org/vite-plugin-theme/-/vite-plugin-theme-0.4.0.tgz#4fcee86e775ef181771698bc07f1467cd5aac3c0"  
9267 - integrity sha512-TB2urU0YmDmbrSjRcb+JoRds95aoi7nocxbxie3dFbvKRu3qicpUvCWGqIu5//EcvMLUzBvvu+KdvUb9omy6mw== 9264 +vite-plugin-theme@^0.4.1:
  9265 + version "0.4.1"
  9266 + resolved "https://registry.npmjs.org/vite-plugin-theme/-/vite-plugin-theme-0.4.1.tgz#02157947d1954ef59e3747e1b4f7d002b6b3f7cd"
  9267 + integrity sha512-ap0NpgBAKOdKQD1zW5P56sYPTJc6DO9FtXsrnOjXtxQ2gb2qKuRAnVV5+UFuO/Mgjh2QyuN9AnT5ANwGTjl0og==
9268 dependencies: 9268 dependencies:
9269 "@types/tinycolor2" "^1.4.2" 9269 "@types/tinycolor2" "^1.4.2"
9270 clean-css "^4.2.3" 9270 clean-css "^4.2.3"