diff --git a/.env b/.env index 562258abd..d9f3a7812 100644 --- a/.env +++ b/.env @@ -3,7 +3,7 @@ VITE_PORT = 8848 # title VITE_TITLE = vue-pure-admin # version -VITE_VERSION = 2.1.0 +VITE_VERSION = 2.6.0 # open VITE_OPEN = false diff --git a/.env.development b/.env.development index 562258abd..d9f3a7812 100644 --- a/.env.development +++ b/.env.development @@ -3,7 +3,7 @@ VITE_PORT = 8848 # title VITE_TITLE = vue-pure-admin # version -VITE_VERSION = 2.1.0 +VITE_VERSION = 2.6.0 # open VITE_OPEN = false diff --git a/.gitignore b/.gitignore index 8ac3d20fb..653107ae3 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ dist-ssr *.local .eslintcache +yarn.lock npm-debug.log* .pnpm-error.log* .pnpm-debug.log diff --git a/CHANGELOG.en_US.md b/CHANGELOG.en_US.md index 8c235e326..800ef9aca 100644 --- a/CHANGELOG.en_US.md +++ b/CHANGELOG.en_US.md @@ -1,3 +1,16 @@ +# 2.6.0(2021-11-10) + +### 🎫 Feat + +- Refactored navigation theme color, supports multiple color schemes +- Refactored login page, illustration style + +### 🍏 Perf + +- Optimize the navigation style +- Eliminate strong navigation dependence on vxe-table +- Synchronously update element-plus, replace Font Icon with SVG Icon + # 2.1.0(2021-10-14) ### 🎫 Feat diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c235e326..800ef9aca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,16 @@ +# 2.6.0(2021-11-10) + +### 🎫 Feat + +- Refactored navigation theme color, supports multiple color schemes +- Refactored login page, illustration style + +### 🍏 Perf + +- Optimize the navigation style +- Eliminate strong navigation dependence on vxe-table +- Synchronously update element-plus, replace Font Icon with SVG Icon + # 2.1.0(2021-10-14) ### 🎫 Feat diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md index abe8cfdd7..ec54e7bb2 100644 --- a/CHANGELOG.zh_CN.md +++ b/CHANGELOG.zh_CN.md @@ -1,3 +1,16 @@ +# 2.6.0(2021-11-10) + +### 🎫 Feat + +- 重构导航主题色，支持多种配色 +- 重构登录页，插画风格 + +### 🍏 Perf + +- 优化导航样式 +- 剔除导航强依赖 vxe-table +- 同步更新 element-plus，使用 SVG Icon 替换 Font Icon + # 2.1.0(2021-10-14) ### 🎫 Feat diff --git a/mock/asyncRoutes.ts b/mock/asyncRoutes.ts index c7c7ab4ca..977cbcdf7 100644 --- a/mock/asyncRoutes.ts +++ b/mock/asyncRoutes.ts @@ -7,7 +7,7 @@ const systemRouter = { name: "system", redirect: "/system/user", meta: { - icon: "el-icon-setting", + icon: "Setting", title: "message.hssysManagement", showLink: true, rank: 6 @@ -38,7 +38,7 @@ const permissionRouter = { redirect: "/permission/page", meta: { title: "message.permission", - icon: "el-icon-lollipop", + icon: "Lollipop", showLink: true, rank: 3 }, diff --git a/package.json b/package.json index 8bdf8e61f..eda91b150 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue-pure-admin", - "version": "2.1.0", + "version": "2.6.0", "private": true, "engines": { "node": ">= 16", @@ -29,6 +29,7 @@ ], "dependencies": { "@amap/amap-jsapi-loader": "^1.0.1", + "@element-plus/icons": "^0.0.11", "@logicflow/core": "0.7.1", "@logicflow/extension": "0.7.1", "@vueuse/core": "^6.7.1", @@ -39,7 +40,7 @@ "cropperjs": "^1.5.11", "dayjs": "^1.10.7", "echarts": "^5.2.1", - "element-plus": "1.1.0-beta.24", + "element-plus": "1.2.0-beta.3", "element-resize-detector": "^1.2.3", "font-awesome": "^4.7.0", "lodash-es": "^4.17.21", @@ -76,11 +77,12 @@ "@types/nprogress": "0.2.0", "@typescript-eslint/eslint-plugin": "4.31.0", "@typescript-eslint/parser": "4.31.0", - "@vitejs/plugin-vue": "1.6.0", - "@vitejs/plugin-vue-jsx": "1.1.7", + "@vitejs/plugin-vue": "^1.9.4", + "@vitejs/plugin-vue-jsx": "^1.2.0", "@vue/compiler-sfc": "^3.2.21", "@vue/eslint-config-prettier": "6.0.0", "@vue/eslint-config-typescript": "7.0.0", + "@zougt/vite-plugin-theme-preprocessor": "^1.3.10", "autoprefixer": "10.2.4", "babel-plugin-transform-remove-console": "6.9.4", "chalk": "2.4.2", @@ -95,8 +97,8 @@ "prettier": "2.3.2", "pretty-quick": "3.1.1", "rimraf": "3.0.2", - "sass": "1.32.8", - "sass-loader": "12.1.0", + "sass": "^1.43.4", + "sass-loader": "^12.3.0", "stylelint": "13.13.1", "stylelint-config-prettier": "8.0.2", "stylelint-config-standard": "22.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 70eadcb10..a526a8620 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,6 +4,7 @@ specifiers: "@amap/amap-jsapi-loader": ^1.0.1 "@commitlint/cli": 13.1.0 "@commitlint/config-conventional": 13.1.0 + "@element-plus/icons": ^0.0.11 "@logicflow/core": 0.7.1 "@logicflow/extension": 0.7.1 "@types/element-resize-detector": 1.1.3 @@ -12,13 +13,14 @@ specifiers: "@types/nprogress": 0.2.0 "@typescript-eslint/eslint-plugin": 4.31.0 "@typescript-eslint/parser": 4.31.0 - "@vitejs/plugin-vue": 1.6.0 - "@vitejs/plugin-vue-jsx": 1.1.7 + "@vitejs/plugin-vue": ^1.9.4 + "@vitejs/plugin-vue-jsx": ^1.2.0 "@vue/compiler-sfc": ^3.2.21 "@vue/eslint-config-prettier": 6.0.0 "@vue/eslint-config-typescript": 7.0.0 "@vueuse/core": ^6.7.1 "@vueuse/motion": ^2.0.0-beta.4 + "@zougt/vite-plugin-theme-preprocessor": ^1.3.10 animate.css: ^4.1.1 autoprefixer: 10.2.4 await-to-js: ^3.0.0 @@ -29,7 +31,7 @@ specifiers: cross-env: 7.0.3 dayjs: ^1.10.7 echarts: ^5.2.1 - element-plus: 1.1.0-beta.24 + element-plus: 1.2.0-beta.3 element-resize-detector: ^1.2.3 eslint: 7.30.0 eslint-plugin-prettier: 3.4.0 @@ -52,8 +54,8 @@ specifiers: resize-observer-polyfill: ^1.5.1 responsive-storage: ^1.0.11 rimraf: 3.0.2 - sass: 1.32.8 - sass-loader: 12.1.0 + sass: ^1.43.4 + sass-loader: ^12.3.0 sortablejs: 1.13.0 stylelint: 13.13.1 stylelint-config-prettier: 8.0.2 @@ -82,6 +84,7 @@ specifiers: dependencies: "@amap/amap-jsapi-loader": 1.0.1 + "@element-plus/icons": 0.0.11 "@logicflow/core": 0.7.1 "@logicflow/extension": 0.7.1 "@vueuse/core": 6.7.5_vue@3.2.21 @@ -92,7 +95,7 @@ dependencies: cropperjs: 1.5.12 dayjs: 1.10.7 echarts: 5.2.2 - element-plus: 1.1.0-beta.24_vue@3.2.21 + element-plus: 1.2.0-beta.3_vue@3.2.21 element-resize-detector: 1.2.3 font-awesome: 4.7.0 lodash-es: 4.17.21 @@ -129,11 +132,12 @@ devDependencies: "@types/nprogress": 0.2.0 "@typescript-eslint/eslint-plugin": 4.31.0_f4e6dc0776b3600ef484e3c64a523136 "@typescript-eslint/parser": 4.31.0_eslint@7.30.0+typescript@4.4.2 - "@vitejs/plugin-vue": 1.6.0_@vue+compiler-sfc@3.2.21 - "@vitejs/plugin-vue-jsx": 1.1.7 + "@vitejs/plugin-vue": 1.9.4_vite@2.6.14 + "@vitejs/plugin-vue-jsx": 1.2.0 "@vue/compiler-sfc": 3.2.21 "@vue/eslint-config-prettier": 6.0.0_82e4252401b0cc5be86f7c2133946f49 "@vue/eslint-config-typescript": 7.0.0_e03d82996bd4a66fb128f33523d782ea + "@zougt/vite-plugin-theme-preprocessor": 1.3.10_sass@1.43.4 autoprefixer: 10.2.4_postcss@8.2.6 babel-plugin-transform-remove-console: 6.9.4 chalk: 2.4.2 @@ -148,17 +152,17 @@ devDependencies: prettier: 2.3.2 pretty-quick: 3.1.1_prettier@2.3.2 rimraf: 3.0.2 - sass: 1.32.8 - sass-loader: 12.1.0_sass@1.32.8 + sass: 1.43.4 + sass-loader: 12.3.0_sass@1.43.4 stylelint: 13.13.1 stylelint-config-prettier: 8.0.2_stylelint@13.13.1 stylelint-config-standard: 22.0.0_stylelint@13.13.1 stylelint-order: 4.1.0_stylelint@13.13.1 typescript: 4.4.2 - unplugin-element-plus: 0.1.3_vite@2.6.13+vue@3.2.21 - vite: 2.6.13_sass@1.32.8 - vite-plugin-mock: 2.9.6_mockjs@1.1.0+vite@2.6.13 - vite-plugin-style-import: 1.3.0_vite@2.6.13 + unplugin-element-plus: 0.1.3_vite@2.6.14+vue@3.2.21 + vite: 2.6.14_sass@1.43.4 + vite-plugin-mock: 2.9.6_mockjs@1.1.0+vite@2.6.14 + vite-plugin-style-import: 1.3.0_vite@2.6.14 vite-svg-loader: 2.2.0 vue-eslint-parser: 7.10.0_eslint@7.30.0 @@ -1259,10 +1263,10 @@ packages: eslint-visitor-keys: 2.1.0 dev: true - /@vitejs/plugin-vue-jsx/1.1.7: + /@vitejs/plugin-vue-jsx/1.2.0: resolution: { - integrity: sha512-lomCrTZ/LXUk8L+1fBX4dpW+L/S7qY4+pzS5BRG2NuLpjo26Efh4yb8nDkYM7b8COS3ea7otis0SsqD8vGOSlg== + integrity: sha512-Y4Er2bn8bHNiUziJizcVT1yQKTq6oOJeBrKkxvjo2yKT/RTSK1ZlkP/qnzchxxuBkx0tYG4Aaxbb9xuVnNNDEA== } engines: { node: ">=12.0.0" } dependencies: @@ -1276,16 +1280,16 @@ packages: - supports-color dev: true - /@vitejs/plugin-vue/1.6.0_@vue+compiler-sfc@3.2.21: + /@vitejs/plugin-vue/1.9.4_vite@2.6.14: resolution: { - integrity: sha512-n3i8htn8pTg9M+kM3cnEfsPZx/6ngInlTroth6fA1LQTJq5aTVQ8ggaE5pPoAy9vCgHPtcaXMzwpldhqRAkebQ== + integrity: sha512-0CZqaCoChriPTTtGkERy1LGPcYjGFpi2uYRhBPIkqJqUGV5JnJFhQAgh6oH9j5XZHfrRaisX8W0xSpO4T7S78A== } engines: { node: ">=12.0.0" } peerDependencies: - "@vue/compiler-sfc": ^3.2.6 + vite: ^2.5.10 dependencies: - "@vue/compiler-sfc": 3.2.21 + vite: 2.6.14_sass@1.43.4 dev: true /@vue/babel-helper-vue-transform-on/1.0.2: @@ -1466,25 +1470,6 @@ packages: integrity: sha512-5EQmIPK6gw4UVYUbM959B0uPsJ58+xoMESCZs3N89XyvJ9e+fX4pqEPrOGV8OroIk3SbEvJcC+eYc8BH9JQrHA== } - /@vueuse/core/6.1.0_vue@3.2.21: - resolution: - { - integrity: sha512-6KienU5QOWKuDqvHytep14274IGKyLlACzXjifOrgDQMkqvWZIUnDhpckT/1+O8n8DN59d5wzzICZI/2sfGCyg== - } - peerDependencies: - "@vue/composition-api": ^1.1.0 - vue: ^2.6.0 || ^3.2.0 - peerDependenciesMeta: - "@vue/composition-api": - optional: true - vue: - optional: true - dependencies: - "@vueuse/shared": 6.1.0_vue@3.2.21 - vue: 3.2.21 - vue-demi: 0.12.1_vue@3.2.21 - dev: false - /@vueuse/core/6.7.5_vue@3.2.21: resolution: { @@ -1522,24 +1507,6 @@ packages: vue-demi: 0.12.1_vue@3.2.21 dev: false - /@vueuse/shared/6.1.0_vue@3.2.21: - resolution: - { - integrity: sha512-teW0TUQryGnEprHeOI6oH8NPVJBirknxksEiNCtdEjIi8W7JSTg8JPO+e1XlGI6ly24NDlDXUDYaHJayiaXjuw== - } - peerDependencies: - "@vue/composition-api": ^1.1.0 - vue: ^2.6.0 || ^3.2.0 - peerDependenciesMeta: - "@vue/composition-api": - optional: true - vue: - optional: true - dependencies: - vue: 3.2.21 - vue-demi: 0.12.1_vue@3.2.21 - dev: false - /@vueuse/shared/6.7.5_vue@3.2.21: resolution: { @@ -1558,6 +1525,36 @@ packages: vue-demi: 0.12.1_vue@3.2.21 dev: false + /@zougt/some-loader-utils/1.3.4_sass@1.43.4: + resolution: + { + integrity: sha512-HjlSsEVcpuDrOlUXRMZzLdoWvWAdhign3uNhuSBd4ydfoOnWBRcWNBWyt5ZvIT+CcqIRLli4LfQ3K6xSJxc6NA== + } + engines: { node: ">= 10.13.0" } + peerDependencies: + less: ^3.13.1 || ^4.1.1 + sass: ^1.32.8 + dependencies: + parse-color: 1.0.0 + postcss: 8.3.11 + sass: 1.43.4 + dev: true + + /@zougt/vite-plugin-theme-preprocessor/1.3.10_sass@1.43.4: + resolution: + { + integrity: sha512-HHSTUYBv3quM8yRv57RJoDWqSm9cn9njCFk3ziSY+MALr7WT2uD5AmSnH9QBMVIU5jRcyPiuF3zDKbh8bifI+A== + } + engines: { node: ">= 12.0.0" } + dependencies: + "@zougt/some-loader-utils": 1.3.4_sass@1.43.4 + fs-extra: 9.1.0 + string-hash: 1.1.3 + transitivePeerDependencies: + - less + - sass + dev: true + /JSONStream/1.3.5: resolution: { @@ -1756,6 +1753,14 @@ packages: } dev: false + /at-least-node/1.0.0: + resolution: + { + integrity: sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== + } + engines: { node: ">= 4.0.0" } + dev: true + /autoprefixer/10.2.4_postcss@8.2.6: resolution: { @@ -2112,6 +2117,10 @@ packages: engines: { node: ">=0.8" } dev: true + /color-convert/0.5.3: + resolution: { integrity: sha1-vbbGnOZg+t/+CwAHzER+G59ygr0= } + dev: true + /color-convert/1.9.3: resolution: { @@ -2624,23 +2633,22 @@ packages: } dev: true - /element-plus/1.1.0-beta.24_vue@3.2.21: + /element-plus/1.2.0-beta.3_vue@3.2.21: resolution: { - integrity: sha512-dmo61e/D6mwJVacMhxOMSPb5sZPt/FPsuQQfsOs1kJWkhGDmTlny/sZvgIQr1z0zh3pjlJadGAlNS+0nySPMmw== + integrity: sha512-vvUxR3uL2k9K+WCWz/98hq4uPQ6jvfGf0hfzWvao7pySJkNQq9DtRPC6/4/zUceA/J6Y2Yo3xSbR19JRCwurRw== } peerDependencies: vue: ^3.2.0 dependencies: "@element-plus/icons": 0.0.11 "@popperjs/core": 2.10.2 - "@vueuse/core": 6.1.0_vue@3.2.21 + "@vueuse/core": 6.7.5_vue@3.2.21 async-validator: 4.0.7 dayjs: 1.10.7 lodash: 4.17.21 - memoize-one: 5.2.1 + memoize-one: 6.0.0 normalize-wheel-es: 1.1.1 - resize-observer-polyfill: 1.5.1 vue: 3.2.21 transitivePeerDependencies: - "@vue/composition-api" @@ -3511,6 +3519,19 @@ packages: universalify: 0.1.2 dev: false + /fs-extra/9.1.0: + resolution: + { + integrity: sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== + } + engines: { node: ">=10" } + dependencies: + at-least-node: 1.0.0 + graceful-fs: 4.2.8 + jsonfile: 6.1.0 + universalify: 2.0.0 + dev: true + /fs.realpath/1.0.0: resolution: { integrity: sha1-FQStJSMVjKpA20onh8sBQRmU6k8= } dev: true @@ -4461,10 +4482,10 @@ packages: } dev: true - /memoize-one/5.2.1: + /memoize-one/6.0.0: resolution: { - integrity: sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q== + integrity: sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw== } dev: false @@ -4880,6 +4901,12 @@ packages: callsites: 3.1.0 dev: true + /parse-color/1.0.0: + resolution: { integrity: sha1-e3SLlag/A/FqlPU15S1/PZRlhhk= } + dependencies: + color-convert: 0.5.3 + dev: true + /parse-entities/2.0.0: resolution: { @@ -5563,10 +5590,10 @@ packages: } dev: true - /sass-loader/12.1.0_sass@1.32.8: + /sass-loader/12.3.0_sass@1.43.4: resolution: { - integrity: sha512-FVJZ9kxVRYNZTIe2xhw93n3xJNYZADr+q69/s98l9nTCrWASo+DR2Ot0s5xTKQDDEosUkatsGeHxcH4QBp5bSg== + integrity: sha512-6l9qwhdOb7qSrtOu96QQ81LVl8v6Dp9j1w3akOm0aWHyrTYtagDt5+kS32N4yq4hHk3M+rdqoRMH+lIdqvW6HA== } engines: { node: ">= 12.13.0" } peerDependencies: @@ -5584,13 +5611,13 @@ packages: dependencies: klona: 2.0.5 neo-async: 2.6.2 - sass: 1.32.8 + sass: 1.43.4 dev: true - /sass/1.32.8: + /sass/1.43.4: resolution: { - integrity: sha512-Sl6mIeGpzjIUZqvKnKETfMf0iDAswD9TNlv13A7aAF3XZlRPMq4VvJWBC2N2DXbp94MQVdNSFG6LfF/iOXrPHQ== + integrity: sha512-/ptG7KE9lxpGSYiXn7Ar+lKOv37xfWsZRtFYal2QHNigyVQDx685VFT/h7ejVr+R8w7H4tmUgtulsKl5YpveOg== } engines: { node: ">=8.9.0" } hasBin: true @@ -5846,6 +5873,10 @@ packages: engines: { node: ">=0.6.19" } dev: true + /string-hash/1.1.3: + resolution: { integrity: sha1-6Kr8CsGFW0Zmkp7X3RJ1311sgRs= } + dev: true + /string-width/4.2.3: resolution: { @@ -6394,7 +6425,7 @@ packages: engines: { node: ">= 0.8" } dev: true - /unplugin-element-plus/0.1.3_vite@2.6.13+vue@3.2.21: + /unplugin-element-plus/0.1.3_vite@2.6.14+vue@3.2.21: resolution: { integrity: sha512-6GO1tuDIXcoYFkbL26Mrd84oUOgAHShcwn/xma5bwmBN2O0N0s13RbBDsK53vm4hxRKIVuFSSr659BkpmXWm2w== @@ -6405,7 +6436,7 @@ packages: "@rollup/pluginutils": 4.1.1 es-module-lexer: 0.9.3 magic-string: 0.25.7 - unplugin: 0.2.19_vite@2.6.13 + unplugin: 0.2.19_vite@2.6.14 vue: 3.2.21 transitivePeerDependencies: - rollup @@ -6413,7 +6444,7 @@ packages: - webpack dev: true - /unplugin/0.2.19_vite@2.6.13: + /unplugin/0.2.19_vite@2.6.14: resolution: { integrity: sha512-r5PDeBBecir99rhLFp1ftqIkp5afD91anweIlWtF5Ca46FJsn2kQczD93FdFJw79R6HSF5waeYo79bFOQ9GVhQ== @@ -6430,7 +6461,7 @@ packages: webpack: optional: true dependencies: - vite: 2.6.13_sass@1.32.8 + vite: 2.6.14_sass@1.43.4 webpack-virtual-modules: 0.4.3 dev: true @@ -6530,7 +6561,7 @@ packages: vfile-message: 2.0.4 dev: true - /vite-plugin-mock/2.9.6_mockjs@1.1.0+vite@2.6.13: + /vite-plugin-mock/2.9.6_mockjs@1.1.0+vite@2.6.14: resolution: { integrity: sha512-/Rm59oPppe/ncbkSrUuAxIQihlI2YcBmnbR4ST1RA2VzM1C0tEQc1KlbQvnUGhXECAGTaQN2JyasiwXP6EtKgg== @@ -6550,13 +6581,13 @@ packages: fast-glob: 3.2.7 mockjs: 1.1.0 path-to-regexp: 6.2.0 - vite: 2.6.13_sass@1.32.8 + vite: 2.6.14_sass@1.43.4 transitivePeerDependencies: - rollup - supports-color dev: true - /vite-plugin-style-import/1.3.0_vite@2.6.13: + /vite-plugin-style-import/1.3.0_vite@2.6.14: resolution: { integrity: sha512-R3bEQcdhPqL+5CZiMXs9RGKwbBtIHBJmh7ngND3sJjCYbkBe6DGEL6DWGBS7xTaqfH+1mXRfX8lEK0W3PjQSzA== @@ -6569,7 +6600,7 @@ packages: debug: 4.3.2 es-module-lexer: 0.9.3 magic-string: 0.25.7 - vite: 2.6.13_sass@1.32.8 + vite: 2.6.14_sass@1.43.4 transitivePeerDependencies: - supports-color dev: true @@ -6584,10 +6615,10 @@ packages: svgo: 2.8.0 dev: true - /vite/2.6.13_sass@1.32.8: + /vite/2.6.14_sass@1.43.4: resolution: { - integrity: sha512-+tGZ1OxozRirTudl4M3N3UTNJOlxdVo/qBl2IlDEy/ZpTFcskp+k5ncNjayR3bRYTCbqSOFz2JWGN1UmuDMScA== + integrity: sha512-2HA9xGyi+EhY2MXo0+A2dRsqsAG3eFNEVIo12olkWhOmc8LfiM+eMdrXf+Ruje9gdXgvSqjLI9freec1RUM5EA== } engines: { node: ">=12.2.0" } hasBin: true @@ -6607,7 +6638,7 @@ packages: postcss: 8.3.11 resolve: 1.20.0 rollup: 2.59.0 - sass: 1.32.8 + sass: 1.43.4 optionalDependencies: fsevents: 2.3.2 dev: true diff --git a/public/serverConfig.json b/public/serverConfig.json index 23097b9ee..4c2b24090 100644 --- a/public/serverConfig.json +++ b/public/serverConfig.json @@ -1,11 +1,15 @@ { - "Version": "2.0.0", + "Version": "2.6.0", "Title": "PureAdmin", "FixedHeader": true, "HiddenSideBar": false, "KeepAlive": true, "Locale": "zh", - "Layout": "vertical-dark", + "Layout": "vertical", + "Theme": "default", + "Grey": false, + "Weak": false, + "HideTabs": false, "MapConfigure": { "amapKey": "97b3248d1553172e81f168cf94ea667e", "baiduKey": "wTHbkkEweiFqZLKunMIjcrb2RcqNXkhc", diff --git a/src/App.vue b/src/App.vue index 93cc22636..a9d74cfb5 100644 --- a/src/App.vue +++ b/src/App.vue @@ -14,14 +14,8 @@ export default { [ElConfigProvider.name]: ElConfigProvider }, computed: { - // eslint-disable-next-line vue/return-in-computed-property currentLocale() { - switch (this.$storage.locale?.locale) { - case "zh": - return zhCn; - case "en": - return en; - } + return this.$storage.locale?.locale === "zh" ? zhCn : en; } } }; diff --git a/src/api/user.ts b/src/api/user.ts index 8878f6a15..64758b0e8 100644 --- a/src/api/user.ts +++ b/src/api/user.ts @@ -1,7 +1,13 @@ import { http } from "../utils/http"; +interface userType extends Promise { + svg?: string; + code?: number; + info?: object; +} + // 获取验证码 -export const getVerify = () => { +export const getVerify = (): userType => { return http.request("get", "/captcha"); }; diff --git a/src/assets/bg-logo.png b/src/assets/bg-logo.png index b20775611..0029eb5e0 100644 Binary files a/src/assets/bg-logo.png and b/src/assets/bg-logo.png differ diff --git a/src/assets/iconfont/iconfont.ttf b/src/assets/iconfont/iconfont.ttf index 3155199d8..9950e0858 100644 Binary files a/src/assets/iconfont/iconfont.ttf and b/src/assets/iconfont/iconfont.ttf differ diff --git a/src/assets/iconfont/iconfont.woff b/src/assets/iconfont/iconfont.woff index 50f07dfe1..7e29e735e 100644 Binary files a/src/assets/iconfont/iconfont.woff and b/src/assets/iconfont/iconfont.woff differ diff --git a/src/assets/iconfont/iconfont.woff2 b/src/assets/iconfont/iconfont.woff2 index c8449476f..29ba680e3 100644 Binary files a/src/assets/iconfont/iconfont.woff2 and b/src/assets/iconfont/iconfont.woff2 differ diff --git a/src/components/ReMap/src/Amap.vue b/src/components/ReMap/src/Amap.vue index 507d937c9..f696f9796 100644 --- a/src/components/ReMap/src/Amap.vue +++ b/src/components/ReMap/src/Amap.vue @@ -126,14 +126,7 @@ onUnmounted(() => {