From ba4247febdfbf9a7717c4df01a13aaa8f8785a4c Mon Sep 17 00:00:00 2001 From: lyt <1105290566@qq.com> Date: Mon, 25 Apr 2022 19:05:12 +0800 Subject: [PATCH] =?UTF-8?q?'admin-22.04.25:=E4=BC=98=E5=8C=96=E6=B3=A8?= =?UTF-8?q?=E9=87=8A=E5=86=85=E5=AE=B9'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + package-lock.json | 148 ++++++++++++++++++++++++++------- package.json | 6 +- src/stores/keepAliveNames.ts | 5 +- src/stores/requestOldRoutes.ts | 5 +- src/stores/routesList.ts | 7 +- src/stores/tagsViewRoutes.ts | 6 +- src/stores/themeConfig.ts | 4 +- src/stores/userInfo.ts | 5 +- src/theme/app.scss | 3 + src/theme/dark.scss | 3 + src/views/home/index.vue | 6 +- 12 files changed, 157 insertions(+), 42 deletions(-) diff --git a/README.md b/README.md index 234a46e..3abc2ec 100644 --- a/README.md +++ b/README.md @@ -92,6 +92,7 @@ cnpm run build - @熊猫 PandaGoAdmin - @甜蜜蜜 GoPro 平台 - @甜蜜蜜 NiuPi 平台 +- @游子 GFast-V3 #### ❤️ 鸣谢列表 diff --git a/package-lock.json b/package-lock.json index c001b50..1deb850 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34,7 +34,7 @@ "wangeditor": "^4.7.15" }, "devDependencies": { - "@types/node": "^17.0.25", + "@types/node": "^17.0.26", "@types/nprogress": "^0.2.0", "@types/sortablejs": "^1.10.7", "@typescript-eslint/eslint-plugin": "^5.20.0", @@ -42,8 +42,8 @@ "@vitejs/plugin-vue": "^2.3.1", "@vue/compiler-sfc": "^3.2.33", "dotenv": "^16.0.0", - "eslint": "^8.13.0", - "eslint-plugin-vue": "^8.6.0", + "eslint": "^8.14.0", + "eslint-plugin-vue": "^8.7.1", "prettier": "^2.6.2", "sass": "^1.50.1", "sass-loader": "^12.6.0", @@ -107,9 +107,9 @@ } }, "node_modules/@eslint/eslintrc": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.1.tgz", - "integrity": "sha512-bxvbYnBPN1Gibwyp6NrpnFzA3YtRL3BBAyEAFVIpNTm2Rn4Vy87GA5M4aSn3InRrlsbX5N0GW7XIx+U4SAEKdQ==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.2.tgz", + "integrity": "sha512-lTVWHs7O2hjBFZunXTZYnYqtB9GakA1lnxIf+gKq2nY5gxkkNi/lQvveW6t8gFdOHTg6nG50Xs95PrLqVpcaLg==", "dev": true, "dependencies": { "ajv": "^6.12.4", @@ -506,9 +506,9 @@ } }, "node_modules/@types/node": { - "version": "17.0.25", - "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.25.tgz", - "integrity": "sha512-wANk6fBrUwdpY4isjWrKTufkrXdu1D2YHCot2fD/DfWxF5sMrVSA+KN7ydckvaTCh0HiqX9IVl0L5/ZoXg5M7w==", + "version": "17.0.26", + "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.26.tgz", + "integrity": "sha512-z/FG/6DUO7pnze3AE3TBGIjGGKkvCcGcWINe1C7cADY8hKLJPDYpzsNE37uExQ4md5RFtTCvg+M8Mu1Enyeg2A==", "dev": true }, "node_modules/@types/nprogress": { @@ -1225,6 +1225,12 @@ "node": ">=8" } }, + "node_modules/boolbase": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", + "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=", + "dev": true + }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -1455,6 +1461,18 @@ "node": ">= 8" } }, + "node_modules/cssesc": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", + "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", + "dev": true, + "bin": { + "cssesc": "bin/cssesc" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/csstype": { "version": "2.6.20", "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.20.tgz", @@ -1999,12 +2017,12 @@ } }, "node_modules/eslint": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.13.0.tgz", - "integrity": "sha512-D+Xei61eInqauAyTJ6C0q6x9mx7kTUC1KZ0m0LSEexR0V+e94K12LmWX076ZIsldwfQ2RONdaJe0re0TRGQbRQ==", + "version": "8.14.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.14.0.tgz", + "integrity": "sha512-3/CE4aJX7LNEiE3i6FeodHmI/38GZtWCsAtsymScmzYapx8q1nVVb+eLcLSzATmCPXw5pT4TqVs1E0OmxAd9tw==", "dev": true, "dependencies": { - "@eslint/eslintrc": "^1.2.1", + "@eslint/eslintrc": "^1.2.2", "@humanwhocodes/config-array": "^0.9.2", "ajv": "^6.10.0", "chalk": "^4.0.0", @@ -2051,13 +2069,15 @@ } }, "node_modules/eslint-plugin-vue": { - "version": "8.6.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-8.6.0.tgz", - "integrity": "sha512-abXiF2J18n/7ZPy9foSlJyouKf54IqpKlNvNmzhM93N0zs3QUxZG/oBd3tVPOJTKg7SlhBUtPxugpqzNbgGpQQ==", + "version": "8.7.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-8.7.1.tgz", + "integrity": "sha512-28sbtm4l4cOzoO1LtzQPxfxhQABararUb1JtqusQqObJpWX2e/gmVyeYVfepizPFne0Q5cILkYGiBoV36L12Wg==", "dev": true, "dependencies": { "eslint-utils": "^3.0.0", "natural-compare": "^1.4.0", + "nth-check": "^2.0.1", + "postcss-selector-parser": "^6.0.9", "semver": "^7.3.5", "vue-eslint-parser": "^8.0.1" }, @@ -2877,6 +2897,18 @@ "resolved": "https://registry.npmjs.org/nprogress/-/nprogress-0.2.0.tgz", "integrity": "sha1-y480xTIT2JVyP8urkH6UIq28r7E=" }, + "node_modules/nth-check": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz", + "integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==", + "dev": true, + "dependencies": { + "boolbase": "^1.0.0" + }, + "funding": { + "url": "https://github.com/fb55/nth-check?sponsor=1" + } + }, "node_modules/once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -3038,6 +3070,19 @@ "node": "^10 || ^12 || >=14" } }, + "node_modules/postcss-selector-parser": { + "version": "6.0.10", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz", + "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==", + "dev": true, + "dependencies": { + "cssesc": "^3.0.0", + "util-deprecate": "^1.0.2" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/prelude-ls": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", @@ -3654,6 +3699,12 @@ "punycode": "^2.1.0" } }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", + "dev": true + }, "node_modules/v8-compile-cache": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", @@ -3975,9 +4026,9 @@ "requires": {} }, "@eslint/eslintrc": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.1.tgz", - "integrity": "sha512-bxvbYnBPN1Gibwyp6NrpnFzA3YtRL3BBAyEAFVIpNTm2Rn4Vy87GA5M4aSn3InRrlsbX5N0GW7XIx+U4SAEKdQ==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.2.tgz", + "integrity": "sha512-lTVWHs7O2hjBFZunXTZYnYqtB9GakA1lnxIf+gKq2nY5gxkkNi/lQvveW6t8gFdOHTg6nG50Xs95PrLqVpcaLg==", "dev": true, "requires": { "ajv": "^6.12.4", @@ -4289,9 +4340,9 @@ } }, "@types/node": { - "version": "17.0.25", - "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.25.tgz", - "integrity": "sha512-wANk6fBrUwdpY4isjWrKTufkrXdu1D2YHCot2fD/DfWxF5sMrVSA+KN7ydckvaTCh0HiqX9IVl0L5/ZoXg5M7w==", + "version": "17.0.26", + "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.26.tgz", + "integrity": "sha512-z/FG/6DUO7pnze3AE3TBGIjGGKkvCcGcWINe1C7cADY8hKLJPDYpzsNE37uExQ4md5RFtTCvg+M8Mu1Enyeg2A==", "dev": true }, "@types/nprogress": { @@ -4826,6 +4877,12 @@ "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", "dev": true }, + "boolbase": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", + "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=", + "dev": true + }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -4992,6 +5049,12 @@ "which": "^2.0.1" } }, + "cssesc": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", + "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", + "dev": true + }, "csstype": { "version": "2.6.20", "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.20.tgz", @@ -5312,12 +5375,12 @@ "dev": true }, "eslint": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.13.0.tgz", - "integrity": "sha512-D+Xei61eInqauAyTJ6C0q6x9mx7kTUC1KZ0m0LSEexR0V+e94K12LmWX076ZIsldwfQ2RONdaJe0re0TRGQbRQ==", + "version": "8.14.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.14.0.tgz", + "integrity": "sha512-3/CE4aJX7LNEiE3i6FeodHmI/38GZtWCsAtsymScmzYapx8q1nVVb+eLcLSzATmCPXw5pT4TqVs1E0OmxAd9tw==", "dev": true, "requires": { - "@eslint/eslintrc": "^1.2.1", + "@eslint/eslintrc": "^1.2.2", "@humanwhocodes/config-array": "^0.9.2", "ajv": "^6.10.0", "chalk": "^4.0.0", @@ -5373,13 +5436,15 @@ } }, "eslint-plugin-vue": { - "version": "8.6.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-8.6.0.tgz", - "integrity": "sha512-abXiF2J18n/7ZPy9foSlJyouKf54IqpKlNvNmzhM93N0zs3QUxZG/oBd3tVPOJTKg7SlhBUtPxugpqzNbgGpQQ==", + "version": "8.7.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-8.7.1.tgz", + "integrity": "sha512-28sbtm4l4cOzoO1LtzQPxfxhQABararUb1JtqusQqObJpWX2e/gmVyeYVfepizPFne0Q5cILkYGiBoV36L12Wg==", "dev": true, "requires": { "eslint-utils": "^3.0.0", "natural-compare": "^1.4.0", + "nth-check": "^2.0.1", + "postcss-selector-parser": "^6.0.9", "semver": "^7.3.5", "vue-eslint-parser": "^8.0.1" } @@ -5997,6 +6062,15 @@ "resolved": "https://registry.npmjs.org/nprogress/-/nprogress-0.2.0.tgz", "integrity": "sha1-y480xTIT2JVyP8urkH6UIq28r7E=" }, + "nth-check": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz", + "integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==", + "dev": true, + "requires": { + "boolbase": "^1.0.0" + } + }, "once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -6091,6 +6165,16 @@ "source-map-js": "^1.0.2" } }, + "postcss-selector-parser": { + "version": "6.0.10", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz", + "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==", + "dev": true, + "requires": { + "cssesc": "^3.0.0", + "util-deprecate": "^1.0.2" + } + }, "prelude-ls": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", @@ -6476,6 +6560,12 @@ "punycode": "^2.1.0" } }, + "util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", + "dev": true + }, "v8-compile-cache": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", diff --git a/package.json b/package.json index 5087be8..89646b5 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "wangeditor": "^4.7.15" }, "devDependencies": { - "@types/node": "^17.0.25", + "@types/node": "^17.0.26", "@types/nprogress": "^0.2.0", "@types/sortablejs": "^1.10.7", "@typescript-eslint/eslint-plugin": "^5.20.0", @@ -43,8 +43,8 @@ "@vitejs/plugin-vue": "^2.3.1", "@vue/compiler-sfc": "^3.2.33", "dotenv": "^16.0.0", - "eslint": "^8.13.0", - "eslint-plugin-vue": "^8.6.0", + "eslint": "^8.14.0", + "eslint-plugin-vue": "^8.7.1", "prettier": "^2.6.2", "sass": "^1.50.1", "sass-loader": "^12.6.0", diff --git a/src/stores/keepAliveNames.ts b/src/stores/keepAliveNames.ts index 320ba25..8276bc2 100644 --- a/src/stores/keepAliveNames.ts +++ b/src/stores/keepAliveNames.ts @@ -1,7 +1,10 @@ import { defineStore } from 'pinia'; import { KeepAliveNamesState } from './interface'; -// 路由缓存列表 +/** + * 路由缓存列表 + * @methods setCacheKeepAlive 设置要缓存的路由 names + */ export const useKeepALiveNames = defineStore('keepALiveNames', { state: (): KeepAliveNamesState => ({ keepAliveNames: [], diff --git a/src/stores/requestOldRoutes.ts b/src/stores/requestOldRoutes.ts index 1f7c983..31eb3d1 100644 --- a/src/stores/requestOldRoutes.ts +++ b/src/stores/requestOldRoutes.ts @@ -1,7 +1,10 @@ import { defineStore } from 'pinia'; import { RequestOldRoutesState } from './interface'; -// 后端返回原始路由(未处理时) +/** + * 后端返回原始路由(未处理时) + * @methods setCacheKeepAlive 设置接口原始路由数据 + */ export const useRequestOldRoutes = defineStore('requestOldRoutes', { state: (): RequestOldRoutesState => ({ requestOldRoutes: [], diff --git a/src/stores/routesList.ts b/src/stores/routesList.ts index 99fe044..7dd2b28 100644 --- a/src/stores/routesList.ts +++ b/src/stores/routesList.ts @@ -1,7 +1,12 @@ import { defineStore } from 'pinia'; import { RoutesListState } from './interface'; -// 路由列表 +/** + * 路由列表 + * @methods setRoutesList 设置路由数据 + * @methods setColumnsMenuHover 设置分栏布局菜单鼠标移入 boolean + * @methods setColumnsNavHover 设置分栏布局最左侧导航鼠标移入 boolean + */ export const useRoutesList = defineStore('routesList', { state: (): RoutesListState => ({ routesList: [], diff --git a/src/stores/tagsViewRoutes.ts b/src/stores/tagsViewRoutes.ts index 26e2e46..7a5e6f4 100644 --- a/src/stores/tagsViewRoutes.ts +++ b/src/stores/tagsViewRoutes.ts @@ -2,7 +2,11 @@ import { defineStore } from 'pinia'; import { TagsViewRoutesState } from './interface'; import { Session } from '/@/utils/storage'; -// TagsView 路由列表 +/** + * TagsView 路由列表 + * @methods setTagsViewRoutes 设置 TagsView 路由列表 + * @methods setCurrenFullscreen 设置开启/关闭全屏时的 boolean 状态 + */ export const useTagsViewRoutes = defineStore('tagsViewRoutes', { state: (): TagsViewRoutesState => ({ tagsViewRoutes: [], diff --git a/src/stores/themeConfig.ts b/src/stores/themeConfig.ts index 4e566a5..768c776 100644 --- a/src/stores/themeConfig.ts +++ b/src/stores/themeConfig.ts @@ -19,6 +19,8 @@ export const useThemeConfig = defineStore('themeConfig', { */ // 默认 primary 主题颜色 primary: '#409eff', + // 是否开启深色模式 + isIsDark: false, /** * 菜单 / 顶栏 @@ -90,8 +92,6 @@ export const useThemeConfig = defineStore('themeConfig', { isGrayscale: false, // 是否开启色弱模式 isInvert: false, - // 是否开启深色模式 - isIsDark: false, // 是否开启水印 isWartermark: false, // 水印文案 diff --git a/src/stores/userInfo.ts b/src/stores/userInfo.ts index 309c70d..a2e1eb7 100644 --- a/src/stores/userInfo.ts +++ b/src/stores/userInfo.ts @@ -2,7 +2,10 @@ import { defineStore } from 'pinia'; import { UserInfosStates, UserInfosState } from './interface'; import { Session } from '/@/utils/storage'; -// 用户信息 +/** + * 用户信息 + * @methods setUserInfos 设置用户信息 + */ export const useUserInfo = defineStore('userInfo', { state: (): UserInfosStates => ({ userInfos: { diff --git a/src/theme/app.scss b/src/theme/app.scss index 8b6c0ae..4c75296 100644 --- a/src/theme/app.scss +++ b/src/theme/app.scss @@ -13,6 +13,9 @@ --next-bg-color: #f5f5ff; --next-border-color-light: #f1f2f3; --next-color-primary-lighter: #ecf5ff; + --next-color-success-lighter: #f0f9eb; + --next-color-warning-lighter: #fdf6ec; + --next-color-danger-lighter: #fef0f0; --next-color-dark-hover: #0000001a; --next-color-menu-hover: rgba(0, 0, 0, 0.2); --next-color-user-hover: rgba(0, 0, 0, 0.04); diff --git a/src/theme/dark.scss b/src/theme/dark.scss index e409dfc..24fc559 100644 --- a/src/theme/dark.scss +++ b/src/theme/dark.scss @@ -26,6 +26,9 @@ --next-bg-columnsMenuBarColor: var(--next-color-bar) !important; --next-border-color-light: var(--next-border-black) !important; --next-color-primary-lighter: var(--next-color-primary) !important; + --next-color-success-lighter: var(--next-color-primary) !important; + --next-color-warning-lighter: var(--next-color-primary) !important; + --next-color-danger-lighter: var(--next-color-primary) !important; --next-bg-color: var(--next-color-primary) !important; --next-color-dark-hover: var(--next-color-hover) !important; --next-color-menu-hover: var(--next-color-hover-rgba) !important; diff --git a/src/views/home/index.vue b/src/views/home/index.vue index e34e80c..6475fba 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -106,7 +106,7 @@ export default defineComponent({ num3: '月度计划信息', num4: 'iconfont icon-ditu', color1: '#6690F9', - color2: '--el-color-success-light-9', + color2: '--next-color-success-lighter', color3: '--el-color-success', }, { @@ -115,7 +115,7 @@ export default defineComponent({ num3: '年度计划信息', num4: 'iconfont icon-zaosheng', color1: '#6690F9', - color2: '--el-color-warning-light-9', + color2: '--next-color-warning-lighter', color3: '--el-color-warning', }, { @@ -124,7 +124,7 @@ export default defineComponent({ num3: '访问统计信息', num4: 'fa fa-github-alt', color1: '#FF6462', - color2: '--el-color-danger-light-9', + color2: '--next-color-danger-lighter', color3: '--el-color-danger', }, ],