!29 style

Merge pull request !29 from xingyu/feat/v4.0

index.html

@@ -4,7 +4,10 @@
     <meta charset="UTF-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
     <meta name="renderer" content="webkit" />
-    <meta name="viewport" content="width=device-width,initial-scale=1.0" />
+    <meta
+      name="viewport"
+      content="width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=0"
+    />
     <title>%VITE_GLOB_APP_TITLE%</title>
     <link rel="icon" href="/favicon.ico" />
   </head>
@@ -69,7 +72,8 @@
         .app-loading .app-loading-logo {
           display: block;
           width: 90px;
-          margin: 0 auto 20px;
+          margin: 0 auto;
+          margin-bottom: 20px;
         }
 
         .dot {

package.json

@@ -108,8 +108,8 @@
     "esno": "^0.17.0",
     "fs-extra": "^11.1.1",
     "husky": "^8.0.3",
-    "inquirer": "^9.2.9",
+    "inquirer": "^9.2.10",
-    "less": "^4.1.3",
+    "less": "^4.2.0",
     "lint-staged": "^13.2.3",
     "picocolors": "^1.0.0",
     "postcss": "^8.4.27",
@@ -117,7 +117,7 @@
     "postcss-less": "^6.0.0",
     "prettier": "^3.0.1",
     "rimraf": "^5.0.1",
-    "rollup": "^3.27.1",
+    "rollup": "^3.27.2",
     "rollup-plugin-visualizer": "^5.9.2",
     "stylelint": "^15.10.2",
     "stylelint-config-recess-order": "^4.3.0",

pnpm-lock.yaml

@@ -188,11 +188,11 @@ devDependencies:
     specifier: ^8.0.3
     version: 8.0.3
   inquirer:
-    specifier: ^9.2.9
+    specifier: ^9.2.10
-    version: 9.2.9
+    version: 9.2.10
   less:
-    specifier: ^4.1.3
+    specifier: ^4.2.0
-    version: 4.1.3
+    version: 4.2.0
   lint-staged:
     specifier: ^13.2.3
     version: 13.2.3
@@ -215,11 +215,11 @@ devDependencies:
     specifier: ^5.0.1
     version: 5.0.1
   rollup:
-    specifier: ^3.27.1
+    specifier: ^3.27.2
-    version: 3.27.1
+    version: 3.27.2
   rollup-plugin-visualizer:
     specifier: ^5.9.2
-    version: 5.9.2(rollup@3.27.1)
+    version: 5.9.2(rollup@3.27.2)
   stylelint:
     specifier: ^15.10.2
     version: 15.10.2
@@ -249,10 +249,10 @@ devDependencies:
     version: 5.1.6
   unocss:
     specifier: ^0.54.1
-    version: 0.54.1(postcss@8.4.27)(rollup@3.27.1)(vite@4.4.8)
+    version: 0.54.1(postcss@8.4.27)(rollup@3.27.2)(vite@4.4.8)
   vite:
     specifier: ^4.4.8
-    version: 4.4.8(@types/node@20.4.5)(less@4.1.3)(terser@5.19.2)
+    version: 4.4.8(@types/node@20.4.5)(less@4.2.0)(terser@5.19.2)
   vite-plugin-compression:
     specifier: ^0.5.1
     version: 0.5.1(vite@4.4.8)
@@ -273,7 +273,7 @@ devDependencies:
     version: 2.0.1(vite@4.4.8)
   vite-vue-plugin-html:
     specifier: ^1.0.2
-    version: 1.0.2(rollup@3.27.1)(vite@4.4.8)
+    version: 1.0.2(rollup@3.27.2)(vite@4.4.8)
   vue-eslint-parser:
     specifier: ^9.3.1
     version: 9.3.1(eslint@8.46.0)
@@ -563,7 +563,7 @@ packages:
       '@babel/helper-plugin-utils': 7.20.2
       debug: 4.3.4
       lodash.debounce: 4.0.8
-      resolve: 1.22.2
+      resolve: 1.22.3
       semver: 6.3.0
     transitivePeerDependencies:
       - supports-color
@@ -2662,7 +2662,7 @@ packages:
       builtin-modules: 3.3.0
       deepmerge: 4.3.1
       is-module: 1.0.0
-      resolve: 1.22.2
+      resolve: 1.22.3
       rollup: 2.79.1
     dev: true
 
@@ -2688,7 +2688,7 @@ packages:
       rollup: 2.79.1
     dev: true
 
-  /@rollup/pluginutils@5.0.2(rollup@3.27.1):
+  /@rollup/pluginutils@5.0.2(rollup@3.27.2):
     resolution: {integrity: sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
@@ -2700,7 +2700,7 @@ packages:
       '@types/estree': 1.0.0
       estree-walker: 2.0.2
       picomatch: 2.3.1
-      rollup: 3.27.1
+      rollup: 3.27.2
     dev: true
 
   /@simonwep/pickr@1.8.2:
@@ -3127,24 +3127,24 @@ packages:
       eslint-visitor-keys: 3.4.2
     dev: true
 
-  /@unocss/astro@0.54.1(rollup@3.27.1)(vite@4.4.8):
+  /@unocss/astro@0.54.1(rollup@3.27.2)(vite@4.4.8):
     resolution: {integrity: sha512-TeY0ZCgJH/iKdswC83/axrJP+27l3D/VfNMVLvoBSiWN9LDR5V5iZqWq+A0Lqh9AHe4RI5ZaQQe2KS24BjOUeA==}
     dependencies:
       '@unocss/core': 0.54.1
       '@unocss/reset': 0.54.1
-      '@unocss/vite': 0.54.1(rollup@3.27.1)(vite@4.4.8)
+      '@unocss/vite': 0.54.1(rollup@3.27.2)(vite@4.4.8)
     transitivePeerDependencies:
       - rollup
       - vite
     dev: true
 
-  /@unocss/cli@0.54.1(rollup@3.27.1):
+  /@unocss/cli@0.54.1(rollup@3.27.2):
     resolution: {integrity: sha512-yfiRkCoEzuGg5qDl3h4vF4b33mnHhi925COL06X68ti24KbJAZU2ZQmuuyciSMePdf8uk+NWXQSnHg1P9PkaCw==}
     engines: {node: '>=14'}
     hasBin: true
     dependencies:
       '@ampproject/remapping': 2.2.1
-      '@rollup/pluginutils': 5.0.2(rollup@3.27.1)
+      '@rollup/pluginutils': 5.0.2(rollup@3.27.2)
       '@unocss/config': 0.54.1
       '@unocss/core': 0.54.1
       '@unocss/preset-uno': 0.54.1
@@ -3296,13 +3296,13 @@ packages:
       '@unocss/core': 0.54.1
     dev: true
 
-  /@unocss/vite@0.54.1(rollup@3.27.1)(vite@4.4.8):
+  /@unocss/vite@0.54.1(rollup@3.27.2)(vite@4.4.8):
     resolution: {integrity: sha512-HM5kN3FRfXN+TlHvxfN7LJZ41k6KqsHM3l2ez/ImqwKFKCLaQugqDmDDGk0JSiXRNsNDqmTJT+ydTvp16wgTtg==}
     peerDependencies:
       vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0
     dependencies:
       '@ampproject/remapping': 2.2.1
-      '@rollup/pluginutils': 5.0.2(rollup@3.27.1)
+      '@rollup/pluginutils': 5.0.2(rollup@3.27.2)
       '@unocss/config': 0.54.1
       '@unocss/core': 0.54.1
       '@unocss/inspector': 0.54.1
@@ -3311,7 +3311,7 @@ packages:
       chokidar: 3.5.3
       fast-glob: 3.3.1
       magic-string: 0.30.2
-      vite: 4.4.8(@types/node@20.4.5)(less@4.1.3)(terser@5.19.2)
+      vite: 4.4.8(@types/node@20.4.5)(less@4.2.0)(terser@5.19.2)
     transitivePeerDependencies:
       - rollup
     dev: true
@@ -3326,7 +3326,7 @@ packages:
       '@babel/core': 7.21.4
       '@babel/plugin-transform-typescript': 7.21.3(@babel/core@7.21.4)
       '@vue/babel-plugin-jsx': 1.1.1(@babel/core@7.21.4)
-      vite: 4.4.8(@types/node@20.4.5)(less@4.1.3)(terser@5.19.2)
+      vite: 4.4.8(@types/node@20.4.5)(less@4.2.0)(terser@5.19.2)
       vue: 3.3.4
     transitivePeerDependencies:
       - supports-color
@@ -3339,7 +3339,7 @@ packages:
       vite: ^4.0.0
       vue: ^3.2.25
     dependencies:
-      vite: 4.4.8(@types/node@20.4.5)(less@4.1.3)(terser@5.19.2)
+      vite: 4.4.8(@types/node@20.4.5)(less@4.2.0)(terser@5.19.2)
       vue: 3.3.4
     dev: true
 
@@ -4136,8 +4136,8 @@ packages:
       string-width: 5.1.2
     dev: true
 
-  /cli-width@4.0.0:
+  /cli-width@4.1.0:
-    resolution: {integrity: sha512-ZksGS2xpa/bYkNzN3BAw1wEjsLV/ZKOf/CCrJ/QOBsxx6fOARIkwTutxp1XIOIohi6HKmOFjMoK/XaqDVUpEEw==}
+    resolution: {integrity: sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ==}
     engines: {node: '>= 12'}
     dev: true
 
@@ -4976,7 +4976,7 @@ packages:
     dependencies:
       debug: 3.2.7
       is-core-module: 2.12.1
-      resolve: 1.22.2
+      resolve: 1.22.3
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -6086,15 +6086,15 @@ packages:
     resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==}
     dev: true
 
-  /inquirer@9.2.9:
+  /inquirer@9.2.10:
-    resolution: {integrity: sha512-0VXHov2GGwWquYxwxlcIcm3yOHvFb2jh/+HkY8/AUXSTWShpo6QJMlSfHi5Xo74NO40UePBM3rQcI3OkzOF/7A==}
+    resolution: {integrity: sha512-tVVNFIXU8qNHoULiazz612GFl+yqNfjMTbLuViNJE/d860Qxrd3NMrse8dm40VUQLOQeULvaQF8lpAhvysjeyA==}
     engines: {node: '>=14.18.0'}
     dependencies:
       '@ljharb/through': 2.3.9
       ansi-escapes: 4.3.2
       chalk: 5.3.0
       cli-cursor: 3.1.0
-      cli-width: 4.0.0
+      cli-width: 4.1.0
       external-editor: 3.1.0
       figures: 5.0.0
       lodash: 4.17.21
@@ -6630,14 +6630,14 @@ packages:
     resolution: {integrity: sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==}
     dev: true
 
-  /less@4.1.3:
+  /less@4.2.0:
-    resolution: {integrity: sha512-w16Xk/Ta9Hhyei0Gpz9m7VS8F28nieJaL/VyShID7cYvP6IL5oHeL6p4TXSDJqZE/lNv0oJ2pGVjJsRkfwm5FA==}
+    resolution: {integrity: sha512-P3b3HJDBtSzsXUl0im2L7gTO5Ubg8mEN6G8qoTS77iXxXX4Hvu4Qj540PZDvQ8V6DmX6iXo98k7Md0Cm1PrLaA==}
     engines: {node: '>=6'}
     hasBin: true
     dependencies:
       copy-anything: 2.0.6
       parse-node-version: 1.0.1
-      tslib: 2.5.0
+      tslib: 2.6.0
     optionalDependencies:
       errno: 0.1.8
       graceful-fs: 4.2.11
@@ -7240,7 +7240,7 @@ packages:
     resolution: {integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==}
     dependencies:
       hosted-git-info: 2.8.9
-      resolve: 1.22.2
+      resolve: 1.22.3
       semver: 5.7.1
       validate-npm-package-license: 3.0.4
     dev: true
@@ -8098,7 +8098,7 @@ packages:
       terser: 5.19.2
     dev: true
 
-  /rollup-plugin-visualizer@5.9.2(rollup@3.27.1):
+  /rollup-plugin-visualizer@5.9.2(rollup@3.27.2):
     resolution: {integrity: sha512-waHktD5mlWrYFrhOLbti4YgQCn1uR24nYsNuXxg7LkPH8KdTXVWR9DNY1WU0QqokyMixVXJS4J04HNrVTMP01A==}
     engines: {node: '>=14'}
     hasBin: true
@@ -8110,7 +8110,7 @@ packages:
     dependencies:
       open: 8.4.2
       picomatch: 2.3.1
-      rollup: 3.27.1
+      rollup: 3.27.2
       source-map: 0.7.4
       yargs: 17.7.1
     dev: true
@@ -8123,8 +8123,8 @@ packages:
       fsevents: 2.3.2
     dev: true
 
-  /rollup@3.27.1:
+  /rollup@3.27.2:
-    resolution: {integrity: sha512-tXNDFwOkN6C2w5Blj1g6ForKeFw6c1mDu5jxoeDO3/pmYjgt+8yvIFjKzH5FQUq70OKZBkOt0zzv0THXL7vwzQ==}
+    resolution: {integrity: sha512-YGwmHf7h2oUHkVBT248x0yt6vZkYQ3/rvE5iQuVBh3WO8GcJ6BNeOkpoX1yMHIiBm18EMLjBPIoUDkhgnyxGOQ==}
     engines: {node: '>=14.18.0', npm: '>=8.0.0'}
     hasBin: true
     optionalDependencies:
@@ -8145,7 +8145,7 @@ packages:
   /rxjs@7.8.0:
     resolution: {integrity: sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==}
     dependencies:
-      tslib: 2.5.0
+      tslib: 2.6.0
     dev: true
 
   /rxjs@7.8.1:
@@ -8990,10 +8990,6 @@ packages:
     resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==}
     dev: false
 
-  /tslib@2.5.0:
-    resolution: {integrity: sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==}
-    dev: true
-
   /tslib@2.6.0:
     resolution: {integrity: sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA==}
     dev: true
@@ -9151,7 +9147,7 @@ packages:
     engines: {node: '>= 10.0.0'}
     dev: true
 
-  /unocss@0.54.1(postcss@8.4.27)(rollup@3.27.1)(vite@4.4.8):
+  /unocss@0.54.1(postcss@8.4.27)(rollup@3.27.2)(vite@4.4.8):
     resolution: {integrity: sha512-tT2hkDzjf2KV/neYKG/nVYxlpmgn36PGfrT3rE2zk+gaEMU+bU42CisiSkRQ7c2w4d/+zLeCmLz+dj71D8LhFA==}
     engines: {node: '>=14'}
     peerDependencies:
@@ -9160,8 +9156,8 @@ packages:
       '@unocss/webpack':
         optional: true
     dependencies:
-      '@unocss/astro': 0.54.1(rollup@3.27.1)(vite@4.4.8)
+      '@unocss/astro': 0.54.1(rollup@3.27.2)(vite@4.4.8)
-      '@unocss/cli': 0.54.1(rollup@3.27.1)
+      '@unocss/cli': 0.54.1(rollup@3.27.2)
       '@unocss/core': 0.54.1
       '@unocss/extractor-arbitrary-variants': 0.54.1
       '@unocss/postcss': 0.54.1(postcss@8.4.27)
@@ -9179,7 +9175,7 @@ packages:
       '@unocss/transformer-compile-class': 0.54.1
       '@unocss/transformer-directives': 0.54.1
       '@unocss/transformer-variant-group': 0.54.1
-      '@unocss/vite': 0.54.1(rollup@3.27.1)(vite@4.4.8)
+      '@unocss/vite': 0.54.1(rollup@3.27.2)(vite@4.4.8)
     transitivePeerDependencies:
       - postcss
       - rollup
@@ -9261,7 +9257,7 @@ packages:
       chalk: 4.1.2
       debug: 4.3.4
       fs-extra: 10.1.0
-      vite: 4.4.8(@types/node@20.4.5)(less@4.1.3)(terser@5.19.2)
+      vite: 4.4.8(@types/node@20.4.5)(less@4.2.0)(terser@5.19.2)
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -9276,7 +9272,7 @@ packages:
       axios: 1.4.0(debug@4.3.4)
       debug: 4.3.4
       picocolors: 1.0.0
-      vite: 4.4.8(@types/node@20.4.5)(less@4.1.3)(terser@5.19.2)
+      vite: 4.4.8(@types/node@20.4.5)(less@4.2.0)(terser@5.19.2)
     transitivePeerDependencies:
       - encoding
       - supports-color
@@ -9291,7 +9287,7 @@ packages:
       picocolors: 1.0.0
       progress: 2.0.3
       rd: 2.0.1
-      vite: 4.4.8(@types/node@20.4.5)(less@4.1.3)(terser@5.19.2)
+      vite: 4.4.8(@types/node@20.4.5)(less@4.2.0)(terser@5.19.2)
     dev: true
 
   /vite-plugin-purge-icons@0.9.2(vite@4.4.8):
@@ -9303,7 +9299,7 @@ packages:
       '@purge-icons/core': 0.9.1
       '@purge-icons/generated': 0.9.0
       rollup-plugin-purge-icons: 0.9.1
-      vite: 4.4.8(@types/node@20.4.5)(less@4.1.3)(terser@5.19.2)
+      vite: 4.4.8(@types/node@20.4.5)(less@4.2.0)(terser@5.19.2)
     transitivePeerDependencies:
       - encoding
       - supports-color
@@ -9320,7 +9316,7 @@ packages:
       debug: 4.3.4
       fast-glob: 3.2.12
       pretty-bytes: 6.1.0
-      vite: 4.4.8(@types/node@20.4.5)(less@4.1.3)(terser@5.19.2)
+      vite: 4.4.8(@types/node@20.4.5)(less@4.2.0)(terser@5.19.2)
       workbox-build: 7.0.0
       workbox-window: 7.0.0
     transitivePeerDependencies:
@@ -9340,17 +9336,17 @@ packages:
       pathe: 0.2.0
       svg-baker: 1.7.0
       svgo: 2.8.0
-      vite: 4.4.8(@types/node@20.4.5)(less@4.1.3)(terser@5.19.2)
+      vite: 4.4.8(@types/node@20.4.5)(less@4.2.0)(terser@5.19.2)
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /vite-vue-plugin-html@1.0.2(rollup@3.27.1)(vite@4.4.8):
+  /vite-vue-plugin-html@1.0.2(rollup@3.27.2)(vite@4.4.8):
     resolution: {integrity: sha512-MADzWRhKRXQDefI2ttVukx5NMMh+Wh9S2bhmXW4Kce4F4IfTgy5dain6KYZvS5NtqMXiTj/bURPpdaAxwrQ9DA==}
     peerDependencies:
       vite: '>=4.2.0'
     dependencies:
-      '@rollup/pluginutils': 5.0.2(rollup@3.27.1)
+      '@rollup/pluginutils': 5.0.2(rollup@3.27.2)
       colorette: 2.0.20
       connect-history-api-fallback: 2.0.0
       consola: 3.1.0
@@ -9362,12 +9358,12 @@ packages:
       html-minifier-terser: 7.2.0
       node-html-parser: 6.1.5
       pathe: 1.1.1
-      vite: 4.4.8(@types/node@20.4.5)(less@4.1.3)(terser@5.19.2)
+      vite: 4.4.8(@types/node@20.4.5)(less@4.2.0)(terser@5.19.2)
     transitivePeerDependencies:
       - rollup
     dev: true
 
-  /vite@4.4.8(@types/node@20.4.5)(less@4.1.3)(terser@5.19.2):
+  /vite@4.4.8(@types/node@20.4.5)(less@4.2.0)(terser@5.19.2):
     resolution: {integrity: sha512-LONawOUUjxQridNWGQlNizfKH89qPigK36XhMI7COMGztz8KNY0JHim7/xDd71CZwGT4HtSRgI7Hy+RlhG0Gvg==}
     engines: {node: ^14.18.0 || >=16.0.0}
     hasBin: true
@@ -9397,9 +9393,9 @@ packages:
     dependencies:
       '@types/node': 20.4.5
       esbuild: 0.18.16
-      less: 4.1.3
+      less: 4.2.0
       postcss: 8.4.27
-      rollup: 3.27.1
+      rollup: 3.27.2
       terser: 5.19.2
     optionalDependencies:
       fsevents: 2.3.2

src/components/Application/src/search/AppSearchModal.vue

@@ -221,7 +221,7 @@ function handleClose() {
       padding-left: 14px;
       margin-top: 8px;
       font-size: 14px;
-      color: @text-color-base;
+      // color: @text-color-base;
       cursor: pointer;
       background-color: var(--component-background);
       border-radius: 4px;

src/components/Basic/src/BasicHelp.vue

@@ -96,7 +96,6 @@ export default defineComponent({
   display: inline-block;
   margin-left: 6px;
   font-size: 14px;
-  color: @text-color-help-dark;
   cursor: pointer;
 
   &__wrap {

src/components/Basic/src/BasicTitle.vue

@@ -50,7 +50,6 @@ const getClass = computed(() => [
   font-size: 16px;
   font-weight: 500;
   line-height: 24px;
-  // color: @text-color-base;
   cursor: pointer;
   user-select: none;
 

src/components/Button/src/BasicButton.vue

@@ -1,11 +1,11 @@
-<script lang="ts" setup extends="Button">
+<script lang="ts" setup>
 import { Button } from 'ant-design-vue'
 import { computed, unref } from 'vue'
 import { buttonProps } from './props'
 import { Icon } from '@/components/Icon'
 import { useAttrs } from '@/hooks/core/useAttrs'
 
-defineOptions({ name: 'AButton', indeterminate: false })
+defineOptions({ name: 'AButton', extends: Button, indeterminate: false })
 
 const props = defineProps(buttonProps)
 // get component class

src/components/ContextMenu/src/ContextMenu.vue

@@ -159,7 +159,7 @@ export default defineComponent({
     }
 
     &:not(.ant-menu-item-disabled):hover {
-      color: @text-color-base;
+      color: @text-color;
       background-color: @item-hover-bg;
     }
   }

src/components/IFrame/src/IFrame.vue

@@ -1,4 +1,4 @@
-<script setup lang="ts">
+<script lang="ts" setup>
 import { onMounted, ref } from 'vue'
 import { propTypes } from '@/utils/propTypes'
 

src/components/Page/src/PageWrapper.vue

@@ -109,7 +109,14 @@ watch(
 
 <template>
   <div ref="wrapperRef" :class="getClass">
-    <PageHeader v-if="getShowHeader" v-bind="omit($attrs, 'class')" ref="headerRef" :ghost="ghost" :title="title">
+    <PageHeader
+      v-if="getShowHeader"
+      v-bind="omit($attrs, 'class')"
+      ref="headerRef"
+      style="margin: 1rem; border-radius: 1rem;"
+      :ghost="ghost"
+      :title="title"
+    >
       <template #default>
         <template v-if="content">
           {{ content }}
@@ -143,12 +150,14 @@ watch(
   position: relative;
 
   .@{prefix-cls}-content {
-    margin: 12px;
+    margin: 1rem;
+    border-radius: 1rem;
   }
 
   .ant-page-header {
     &:empty {
-      padding: 0;
+      margin: 1rem;
+      border-radius: 1rem;
     }
   }
 

src/components/SimpleMenu/src/components/MenuItem.vue

@@ -40,7 +40,7 @@ const getClass = computed(() => {
 
 const getCollapse = computed(() => unref(getParentRootMenu)?.props.collapse)
 
-const showTooptip = computed(() => {
+const showToptip = computed(() => {
   return unref(getParentMenu)?.type.name === 'Menu' && unref(getCollapse) && slots.title
 })
 
@@ -85,7 +85,7 @@ watch(
 
 <template>
   <li :class="getClass" :style="getCollapse ? {} : getItemStyle" @click.stop="handleClickItem">
-    <Tooltip v-if="showTooptip" placement="right">
+    <Tooltip v-if="showToptip" placement="right">
       <template #title>
         <slot name="title" />
       </template>

src/components/SimpleMenu/src/components/menu.less

@@ -68,7 +68,7 @@
     &-light {
       .@{menu-prefix-cls}-item,
       .@{menu-prefix-cls}-submenu-title {
-        color: @text-color-base;
+        color: @text-color;
 
         &-selected {
           z-index: 2;
@@ -88,7 +88,7 @@
     padding: 0;
     margin: 0;
     font-size: @font-size-base;
-    color: @text-color-base;
+    color: @text-color;
     list-style: none;
     outline: none;
 
@@ -232,6 +232,7 @@
       color: @menu-dark-subsidiary-color;
       &-active:not(.@{menu-prefix-cls}-submenu) {
         color: #fff !important;
+        background-color: #0b55a4;
       }
 
       &:hover {

src/components/Table/src/components/settings/FullScreenSetting.vue

@@ -1,10 +1,12 @@
-<script lang="ts" setup nmae="FullScreenSetting">
+<script lang="ts" setup>
 import { Tooltip } from 'ant-design-vue'
 import { FullscreenExitOutlined, FullscreenOutlined } from '@ant-design/icons-vue'
 import { useFullscreen } from '@vueuse/core'
 import { useTableContext } from '../../hooks/useTableContext'
 import { useI18n } from '@/hooks/web/useI18n'
 
+defineOptions({ name: 'FullScreenSetting' })
+
 const table = useTableContext()
 const { t } = useI18n()
 const { toggle, isFullscreen } = useFullscreen(table.wrapRef)

src/design/color.less

@@ -18,15 +18,7 @@ html {
 
 @content-bg: #f4f7f9;
 
-@text-color: fade(@black, 85%);
+@text-color: var(--text-color);
-
-@text-color-secondary: fade(@black, 45%);
-
-@text-color-inverse: @white;
-
-@icon-color: inherit;
-
-@icon-color-hover: fade(@black, 75%);
 
 @component-background: #fff;
 
@@ -49,33 +41,6 @@ html {
 // }
 @iconify-bg-color: #5551;
 
-// =================================
-// ==============border-color=======
-// =================================
-@border-color-base: #fff;
-
-// Dark-dark
-@border-color-dark: #b6b7b9;
-
-// Dark-light
-@border-color-shallow-dark: #cececd;
-
-// Light-dark
-@border-color-light: @border-color-base;
-
-// =================================
-// ==============message==============
-// =================================
-
-// success-bg-color
-@success-background-color: #f1f9ec;
-// info-bg-color
-@info-background-color: #e8eff8;
-// warn-bg-color
-@warning-background-color: #fdf6ed;
-// danger-bg-color
-@danger-background-color: #fef0f0;
-
 // =================================
 // ==============Header=============
 // =================================
@@ -100,46 +65,3 @@ html {
 // trigger
 @trigger-dark-hover-bg-color: rgba(255, 255, 255, 0.2);
 @trigger-dark-bg-color: rgba(255, 255, 255, 0.1);
-
-// =================================
-// ==============tree============
-// =================================
-// tree item hover background
-@tree-hover-background-color: #f5f7fa;
-// tree item hover font color
-@tree-hover-font-color: #f5f7fa;
-
-// =================================
-// ==============link============
-// =================================
-// =================================
-// ==============Text color-=============
-// =================================
-
-// Main text color
-@text-color-base: @text-color;
-
-// Label color
-@text-color-call-out: #606266;
-
-// Auxiliary information color-dark
-@text-color-help-dark: #909399;
-
-// =================================
-// ==============breadcrumb=========
-// =================================
-@breadcrumb-item-normal-color: #999;
-// =================================
-// ==============button=============
-// =================================
-
-@button-ghost-color: @white;
-@button-ghost-hover-color: lighten(@white, 10%);
-@button-ghost-hover-bg-color: #e1ebf6;
-@button-ghost-active-color: darken(@white, 10%);
-
-@button-cancel-color: @text-color-call-out;
-
-@button-cancel-bg-color: @white;
-@button-cancel-border-color: @border-color-shallow-dark;
-

src/design/public.less

@@ -21,9 +21,8 @@
 }
 
 ::-webkit-scrollbar-thumb {
-  // background: rgba(0, 0, 0, 0.6);
+  background: rgb(0 0 0 60%);
   background-color: rgb(144 147 153 / 30%);
-  // background-color: rgba(144, 147, 153, 0.3);
   border-radius: 2px;
   box-shadow: inset 0 0 6px rgb(0 0 0 / 20%);
 }

src/layouts/default/header/components/Breadcrumb.vue

@@ -159,7 +159,7 @@ function getIcon(route) {
 
   &--light {
     .ant-breadcrumb-link {
-      color: @breadcrumb-item-normal-color;
+      color: #999;
 
       a {
         color: rgb(0 0 0 / 65%);
@@ -167,7 +167,7 @@ function getIcon(route) {
     }
 
     .ant-breadcrumb-separator {
-      color: @breadcrumb-item-normal-color;
+      color: #999;
     }
   }
 

src/layouts/default/header/components/user-dropdown/index.vue

@@ -1,4 +1,4 @@
-<script setup lang="ts" name="UserDropdown">
+<script lang="ts" setup>
 import { Dropdown, Menu, MenuDivider } from 'ant-design-vue'
 import type { MenuInfo } from 'ant-design-vue/lib/menu/src/interface'
 import { computed } from 'vue'
@@ -14,6 +14,8 @@ import { openWindow } from '@/utils'
 import { useGo } from '@/hooks/web/usePage'
 import { createAsyncComponent } from '@/utils/factory/createAsyncComponent'
 
+defineOptions({ name: 'UserDropdown' })
+
 defineProps({
   theme: propTypes.oneOf(['dark', 'light']),
 })
@@ -135,7 +137,7 @@ function handleMenuClick(e: MenuInfo) {
     }
 
     .@{prefix-cls}__name {
-      color: @text-color-base;
+      color: @text-color;
     }
 
     .@{prefix-cls}__desc {

src/layouts/default/header/index.less

@@ -141,7 +141,7 @@
     border-left: 1px solid @header-light-bottom-border-color;
 
     .@{header-prefix-cls}-logo {
-      color: @text-color-base;
+      color: @text-color;
 
       &:hover {
         background-color: @header-light-bg-hover-color;
@@ -150,7 +150,7 @@
 
     .@{header-prefix-cls}-action {
       &__item {
-        color: @text-color-base;
+        color: @text-color;
 
         .app-iconify {
           padding: 0 10px;
@@ -164,7 +164,7 @@
 
       &-icon,
       span[role="img"] {
-        color: @text-color-base;
+        color: @text-color;
       }
     }
   }

src/layouts/default/sider/LayoutSider.vue

@@ -132,7 +132,7 @@ const getTrigger = h(LayoutTrigger)
     // box-shadow: 2px 0 8px 0 rgba(29, 35, 41, 0.05);
 
     .ant-layout-sider-trigger {
-      color: @text-color-base;
+      color: @text-color;
       border-top: 1px solid var(--border-color);
     }
   }

src/layouts/default/tabs/index.less

@@ -13,7 +13,7 @@
   .ant-tabs.ant-tabs-card {
     .ant-tabs-nav {
       height: @multiple-height;
-      padding-left: 10px;
+      // padding-left: 10px;
       margin: 0;
       background-color: var(--component-background);
       border: 0;
@@ -28,7 +28,7 @@
         position: relative;
         z-index: 1;
         height: @multiple-height;
-        padding: 0 16px;
+        padding: 0 6px;
         margin: 0 -14px 0 0 !important;
         line-height: @multiple-height;
         color: var(--text-color);
@@ -45,7 +45,7 @@
 
         &:hover {
           z-index: 2;
-          padding: 0 22px;
+          padding: 0 12px;
 
           .ant-tabs-tab-remove .anticon-close {
             opacity: 1;
@@ -85,38 +85,43 @@
           }
         }
 
-        // > div {
+        > div {
-        //   display: flex;
+          display: flex;
-        //   justify-content: center;
+          align-items: center;
-        //   align-items: center;
+          justify-content: center;
-        // }
+        }
 
         svg {
-          fill: @text-color-base;
+          fill: @text-color;
         }
 
         &:first-child {
-          padding: 0 16px !important;
+          padding: 0 6px !important;
         }
 
         &:active {
-          padding: 0 16px !important;
+          padding: 0 6px !important;
         }
       }
 
       .ant-tabs-tab-active {
         position: relative;
         z-index: 3;
-        padding: 0 16px;
+        padding: 0 6px;
         font-weight: inherit;
-        background: #d4ebff;
+        background: #004b89;
         border: 0;
 
+        .ant-tabs-tab-btn {
+          color: #fff;
+        }
+
         .ant-tabs-tab-remove .anticon-close {
           opacity: 1;
 
           svg {
             width: 0.6em;
+            fill: #fff;
           }
         }
 
@@ -130,7 +135,7 @@
       padding: 0 6px;
 
       .ant-tabs-tab {
-        margin-right: -20px !important;
+        margin-right: -6px !important;
       }
     }
   }
@@ -175,7 +180,7 @@
       border-left: 1px solid var(--border-color);
 
       &:hover {
-        color: @text-color-base;
+        color: @text-color;
       }
 
       span[role="img"] {

src/layouts/default/tabs/index.vue

@@ -23,8 +23,6 @@ import { listenerRouteChange } from '@/logics/mitt/routeChange'
 
 defineOptions({ name: 'MultipleTabs' })
 
-const TabPane = Tabs.TabPane
-
 const affixTextList = initAffixTabs()
 const activeKeyRef = ref('')
 
@@ -101,11 +99,11 @@ function handleEdit(targetKey: string) {
       @edit="handleEdit"
     >
       <template v-for="item in getTabsState" :key="item.query ? item.fullPath : item.path">
-        <TabPane :closable="!(item && item.meta && item.meta.affix)">
+        <Tabs.TabPane :closable="!(item && item.meta && item.meta.affix)">
           <template #tab>
             <TabContent :tab-item="item" />
           </template>
-        </TabPane>
+        </Tabs.TabPane>
       </template>
 
       <template v-if="getShowRedo || getShowQuick" #rightExtra>

src/store/modules/app.ts

@@ -2,6 +2,7 @@ import { defineStore } from 'pinia'
 import { theme as antdTheme } from 'ant-design-vue/es'
 import type { ThemeConfig } from 'ant-design-vue/es/config-provider/context'
 import { reactive } from 'vue'
+import { primaryColor } from '../../../build/config/themeConfig'
 import type { AppSizeType, HeaderSetting, MenuSetting, MultiTabsSetting, ProjectConfig, TransitionSetting } from '@/types/config'
 import type { BeforeMiniState } from '@/types/store'
 
@@ -91,7 +92,7 @@ export const useAppStore = defineStore('app', {
           colorBgContainer: '#fff',
           colorPrimary: color || (this.projectConfig
             ? this.projectConfig.themeColor
-            : '#1890ff'),
+            : primaryColor),
         },
         components: {},
       })
@@ -103,7 +104,7 @@ export const useAppStore = defineStore('app', {
             colorBgContainer: 'rgb(36, 37, 37)',
             colorPrimary: color || (this.projectConfig
               ? this.projectConfig.themeColor
-              : '#1890ff'),
+              : primaryColor),
           },
           components: {},
         }
@@ -126,6 +127,8 @@ export const useAppStore = defineStore('app', {
     },
 
     setMenuSetting(setting: Partial<MenuSetting>): void {
+      if (!this.projectConfig)
+        return
       this.projectConfig.menuSetting = deepMerge(this.projectConfig.menuSetting, setting)
       Persistent.setLocal(PROJ_CFG_KEY, this.projectConfig)
     },

src/views/base/lock/LockPage.vue

@@ -1,4 +1,4 @@
-<script setup lang="ts">
+<script lang="ts" setup>
 import { computed, ref } from 'vue'
 import { Input } from 'ant-design-vue'
 import { LockOutlined } from '@ant-design/icons-vue'

src/views/base/login/SessionTimeoutLogin.vue

@@ -50,6 +50,6 @@ onBeforeUnmount(() => {
   z-index: 9999999;
   width: 100%;
   height: 100%;
-  background: @component-background;
+  background: var(--component-background);
 }
 </style>

src/views/base/login/sso.vue

@@ -195,7 +195,7 @@ html[data-theme='dark'] {
 
   .ant-divider-inner-text {
     font-size: 12px;
-    color: @text-color-secondary;
+    color: var(--text-color-secondary);
   }
 }
 </style>

src/views/base/profile/AccountBind.vue

@@ -1,4 +1,4 @@
-<script setup lang="ts">
+<script lang="ts" setup>
 import { List } from 'ant-design-vue'
 import { onMounted } from 'vue'
 import { accountBindList } from './data'
@@ -6,9 +6,6 @@ import { Icon } from '@/components/Icon'
 import { CollapseContainer } from '@/components/Container/index'
 import { getUserProfileApi } from '@/api/base/profile'
 
-const ListItem = List.Item
-const ListItemMeta = List.Item.Meta
-
 async function init() {
   const userInfo = await getUserProfileApi()
   // TODO
@@ -16,7 +13,7 @@ async function init() {
     if (userInfo.socialUsers) {
       for (const j in userInfo.socialUsers) {
         if (accountBindList[i].key === userInfo.socialUsers[j].type) {
-          accountBindList[i].title = '已綁定'
+          accountBindList[i].title = '已绑定'
           break
         }
       }
@@ -32,8 +29,8 @@ onMounted(async () => {
   <CollapseContainer title="账号绑定" :can-expan="false">
     <List>
       <template v-for="item in accountBindList" :key="item.key">
-        <ListItem>
+        <List.Item>
-          <ListItemMeta>
+          <List.Item.Meta>
             <template #avatar>
               <Icon v-if="item.avatar" class="avatar" :icon="item.avatar" :color="item.color" />
             </template>
@@ -46,8 +43,8 @@ onMounted(async () => {
             <template #description>
               <div>{{ item.description }}</div>
             </template>
-          </ListItemMeta>
+          </List.Item.Meta>
-        </ListItem>
+        </List.Item>
       </template>
     </List>
   </CollapseContainer>

src/views/base/profile/BaseSetting.vue

@@ -1,4 +1,4 @@
-<script setup lang="ts">
+<script lang="ts" setup>
 import { Button, Col, Row } from 'ant-design-vue'
 import { computed, onMounted } from 'vue'
 import { baseSetschemas } from './data'

src/views/base/profile/MsgNotify.vue

@@ -1,4 +1,4 @@
-<script setup lang="ts">
+<script lang="ts" setup>
 import { List, Switch } from 'ant-design-vue'
 import { msgNotifyList } from './data'
 import { CollapseContainer } from '@/components/Container/index'

src/views/base/profile/SecureSetting.vue

@@ -1,4 +1,4 @@
-<script setup lang="ts">
+<script lang="ts" setup>
 import { List } from 'ant-design-vue'
 import { secureSettingList } from './data'
 import PasswordModal from './PasswordModal.vue'

src/views/base/profile/index.vue

@@ -1,4 +1,4 @@
-<script setup lang="ts">
+<script lang="ts" setup>
 import { TabPane, Tabs } from 'ant-design-vue'
 import { ref } from 'vue'
 import { settingList } from './data'

src/views/infra/apiAccessLog/AccessLogModal.vue

@@ -1,4 +1,4 @@
-<script setup lang="ts">
+<script lang="ts" setup>
 import { ref } from 'vue'
 import { infoSchema } from './apiAccessLog.data'
 import { BasicModal, useModalInner } from '@/components/Modal'

src/views/infra/apiErrorLog/ErrorLogModal.vue

@@ -1,4 +1,4 @@
-<script setup lang="ts">
+<script lang="ts" setup>
 import { ref } from 'vue'
 import { infoSchema } from './apiErrorLog.data'
 import { BasicModal, useModalInner } from '@/components/Modal'

src/views/infra/server/index.vue

@@ -1,7 +1,9 @@
-<script setup lang="ts" name="InfraServer">
+<script lang="ts" setup>
 import { ref } from 'vue'
 import { IFrame } from '@/components/IFrame'
 
+defineOptions({ name: 'InfraServer' })
+
 const src = ref(`${import.meta.env.VITE_GLOB_BASE_URL}/admin/applications`)
 </script>
 

src/views/infra/skywalking/index.vue

@@ -1,7 +1,9 @@
-<script setup lang="ts" name="InfraSkywalking">
+<script lang="ts" setup>
 import { ref } from 'vue'
 import { IFrame } from '@/components/IFrame'
 
+defineOptions({ name: 'InfraSkywalking' })
+
 const src = ref('http://skywalking.shop.iocoder.cn')
 </script>
 

src/views/infra/swagger/index.vue

@@ -1,7 +1,9 @@
-<script setup lang="ts" name="InfraSwagger">
+<script lang="ts" setup>
 import { ref } from 'vue'
 import { IFrame } from '@/components/IFrame'
 
+defineOptions({ name: 'InfraSwagger' })
+
 // knife4j
 // const src = ref(import.meta.env.VITE_GLOB_BASE_URL + '/doc.html')
 const src = ref(`${import.meta.env.VITE_GLOB_BASE_URL}/swagger-ui`)

src/views/report/goview/index.vue

@@ -1,7 +1,9 @@
-<script setup lang="ts" name="ReportGoview">
+<script lang="ts" setup>
 import { ref } from 'vue'
 import { IFrame } from '@/components/IFrame'
 
+defineOptions({ name: 'ReportGoview' })
+
 const src = ref('http://127.0.0.1:3000')
 </script>
 

src/views/report/jmreport/index.vue

@@ -1,8 +1,10 @@
-<script setup lang="ts" name="ReportJmreport">
+<script lang="ts" setup>
 import { ref } from 'vue'
 import { IFrame } from '@/components/IFrame'
 import { getAccessToken } from '@/utils/auth'
 
+defineOptions({ name: 'ReportJmreport' })
+
 const src = ref(`${import.meta.env.VITE_GLOB_BASE_URL}/jmreport/list?token=${getAccessToken()}`)
 </script>
 

src/views/system/mail/log/MailLogModal.vue

@@ -1,4 +1,4 @@
-<script setup lang="ts">
+<script lang="ts" setup>
 import { ref } from 'vue'
 import { logSchema } from './mailLog.data'
 import { BasicModal, useModalInner } from '@/components/Modal'

src/views/system/mail/template/SendMailModal.vue

@@ -1,4 +1,4 @@
-<script setup lang="ts">
+<script lang="ts" setup>
 import { baseSendSchemas, keyPrefix } from './template.data'
 import { BasicModal, useModalInner } from '@/components/Modal'
 import type { FormSchema } from '@/components/Form'

src/views/system/notify/components/MessageInfoModal.vue

@@ -1,4 +1,4 @@
-<script setup lang="ts">
+<script lang="ts" setup>
 import { ref } from 'vue'
 import type { MessageInfo } from './message.data'
 import { infoSchema } from './message.data'

src/views/system/notify/template/SendNotifyModal.vue

@@ -1,4 +1,4 @@
-<script setup lang="ts">
+<script lang="ts" setup>
 import { reactive, ref } from 'vue'
 import { baseSendSchemas } from './template.data'
 import { BasicModal, useModalInner } from '@/components/Modal'

src/views/system/sms/template/SendSmsModal.vue

@@ -1,4 +1,4 @@
-<script setup lang="ts">
+<script lang="ts" setup>
 import { reactive, ref } from 'vue'
 import { baseSendSchemas } from './smsTemplate.data'
 import { BasicModal, useModalInner } from '@/components/Modal'