mirrors/pig-ui
1
0
Fork 0
mirror of https://gitee.com/log4j/pig-ui.git synced 2024-12-23 05:40:20 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

'admin-22.05.07:优化深色模式等'

Browse Source
This commit is contained in:
lyt 2022-05-07 20:25:52 +08:00
parent 23a0c21f15
commit d6fceb257c
8 changed files with 65 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -32,6 +32,7 @@
- 🐞 修复 `开启 Tagsview 图标` 时，`tagsView 右键菜单关闭` 报错问题 - 🐞 修复 `开启 Tagsview 图标` 时，`tagsView 右键菜单关闭` 报错问题
- 🐞 修复 `router.push` 路径找不到时报错问题，`404、401 界面` 已移入到 `main` 主布局里（之前全屏） - 🐞 修复 `router.push` 路径找不到时报错问题，`404、401 界面` 已移入到 `main` 主布局里（之前全屏）
- 🐞 修复 [全局修改组件大小失效了](https://gitee.com/lyt-top/vue-next-admin/issues/I551RP)，感谢[lg_boy](https://gitee.com/lg_boy) - 🐞 修复 [全局修改组件大小失效了](https://gitee.com/lyt-top/vue-next-admin/issues/I551RP)，感谢[lg_boy](https://gitee.com/lg_boy)
- 🐞 修复 [修改一下配置时，需要每次都清理 `window.localStorage` 浏览器永久缓存，配置才会生效，问题解决#I567R1](https://gitee.com/lyt-top/vue-next-admin/issues/I567R1),感谢[@lanbao123](https://gitee.com/lanbao123)
- 🌈 重构 路由（`/src/router/index.ts`）解决 No match found for location with path "xxx"(前端控制，后端控制未解决) 问题 - 🌈 重构 路由（`/src/router/index.ts`）解决 No match found for location with path "xxx"(前端控制，后端控制未解决) 问题
## 2.0.2 ## 2.0.2

80
package-lock.json generated
View File

@ -21,7 +21,7 @@
"jsplumb": "^2.15.6", "jsplumb": "^2.15.6",
"mitt": "^3.0.0", "mitt": "^3.0.0",
"nprogress": "^0.2.0", "nprogress": "^0.2.0",
"pinia": "^2.0.13", "pinia": "^2.0.14",
"print-js": "^1.6.0", "print-js": "^1.6.0",
"qrcodejs2-fixes": "^0.0.2", "qrcodejs2-fixes": "^0.0.2",
"screenfull": "^6.0.1", "screenfull": "^6.0.1",
@ -42,7 +42,7 @@
"@vitejs/plugin-vue": "^2.3.2", "@vitejs/plugin-vue": "^2.3.2",
"@vue/compiler-sfc": "^3.2.33", "@vue/compiler-sfc": "^3.2.33",
"dotenv": "^16.0.0", "dotenv": "^16.0.0",
"eslint": "^8.14.0", "eslint": "^8.15.0",
"eslint-plugin-vue": "^8.7.1", "eslint-plugin-vue": "^8.7.1",
"prettier": "^2.6.2", "prettier": "^2.6.2",
"sass": "^1.51.0", "sass": "^1.51.0",
@ -95,19 +95,19 @@
} }
}, },
"node_modules/@eslint/eslintrc": { "node_modules/@eslint/eslintrc": {
"version": "1.2.2", "version": "1.2.3",
"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.2.tgz", "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.3.tgz",
"integrity": "sha512-lTVWHs7O2hjBFZunXTZYnYqtB9GakA1lnxIf+gKq2nY5gxkkNi/lQvveW6t8gFdOHTg6nG50Xs95PrLqVpcaLg==", "integrity": "sha512-uGo44hIwoLGNyduRpjdEpovcbMdd+Nv7amtmJxnKmI8xj6yd5LncmSwDa5NgX/41lIFJtkjD6YdVfgEzPfJ5UA==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"ajv": "^6.12.4", "ajv": "^6.12.4",
"debug": "^4.3.2", "debug": "^4.3.2",
"espree": "^9.3.1", "espree": "^9.3.2",
"globals": "^13.9.0", "globals": "^13.9.0",
"ignore": "^5.2.0", "ignore": "^5.2.0",
"import-fresh": "^3.2.1", "import-fresh": "^3.2.1",
"js-yaml": "^4.1.0", "js-yaml": "^4.1.0",
"minimatch": "^3.0.4", "minimatch": "^3.1.2",
"strip-json-comments": "^3.1.1" "strip-json-comments": "^3.1.1"
}, },
"engines": { "engines": {
@ -2276,12 +2276,12 @@
} }
}, },
"node_modules/eslint": { "node_modules/eslint": {
"version": "8.14.0", "version": "8.15.0",
"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.14.0.tgz", "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.15.0.tgz",
"integrity": "sha512-3/CE4aJX7LNEiE3i6FeodHmI/38GZtWCsAtsymScmzYapx8q1nVVb+eLcLSzATmCPXw5pT4TqVs1E0OmxAd9tw==", "integrity": "sha512-GG5USZ1jhCu8HJkzGgeK8/+RGnHaNYZGrGDzUtigK3BsGESW/rs2az23XqE0WVwDxy1VRvvjSSGu5nB0Bu+6SA==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"@eslint/eslintrc": "^1.2.2", "@eslint/eslintrc": "^1.2.3",
"@humanwhocodes/config-array": "^0.9.2", "@humanwhocodes/config-array": "^0.9.2",
"ajv": "^6.10.0", "ajv": "^6.10.0",
"chalk": "^4.0.0", "chalk": "^4.0.0",
@ -2292,7 +2292,7 @@
"eslint-scope": "^7.1.1", "eslint-scope": "^7.1.1",
"eslint-utils": "^3.0.0", "eslint-utils": "^3.0.0",
"eslint-visitor-keys": "^3.3.0", "eslint-visitor-keys": "^3.3.0",
"espree": "^9.3.1", "espree": "^9.3.2",
"esquery": "^1.4.0", "esquery": "^1.4.0",
"esutils": "^2.0.2", "esutils": "^2.0.2",
"fast-deep-equal": "^3.1.3", "fast-deep-equal": "^3.1.3",
@ -2308,7 +2308,7 @@
"json-stable-stringify-without-jsonify": "^1.0.1", "json-stable-stringify-without-jsonify": "^1.0.1",
"levn": "^0.4.1", "levn": "^0.4.1",
"lodash.merge": "^4.6.2", "lodash.merge": "^4.6.2",
"minimatch": "^3.0.4", "minimatch": "^3.1.2",
"natural-compare": "^1.4.0", "natural-compare": "^1.4.0",
"optionator": "^0.9.1", "optionator": "^0.9.1",
"regexpp": "^3.2.0", "regexpp": "^3.2.0",
@ -2419,13 +2419,13 @@
} }
}, },
"node_modules/espree": { "node_modules/espree": {
"version": "9.3.1", "version": "9.3.2",
"resolved": "https://registry.npmjs.org/espree/-/espree-9.3.1.tgz", "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.2.tgz",
"integrity": "sha512-bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ==", "integrity": "sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==",
"dev": true, "dev": true,
"dependencies": { "dependencies": {
"acorn": "^8.7.0", "acorn": "^8.7.1",
"acorn-jsx": "^5.3.1", "acorn-jsx": "^5.3.2",
"eslint-visitor-keys": "^3.3.0" "eslint-visitor-keys": "^3.3.0"
}, },
"engines": { "engines": {
@ -3392,9 +3392,9 @@
} }
}, },
"node_modules/pinia": { "node_modules/pinia": {
"version": "2.0.13", "version": "2.0.14",
"resolved": "https://registry.npmjs.org/pinia/-/pinia-2.0.13.tgz", "resolved": "https://registry.npmjs.org/pinia/-/pinia-2.0.14.tgz",
"integrity": "sha512-B7rSqm1xNpwcPMnqns8/gVBfbbi7lWTByzS6aPZ4JOXSJD4Y531rZHDCoYWBwLyHY/8hWnXljgiXp6rRyrofcw==", "integrity": "sha512-0nPuZR4TetT/WcLN+feMSjWJku3SQU7dBbXC6uw+R6FLQJCsg+/0pzXyD82T1FmAYe0lsx+jnEDQ1BLgkRKlxA==",
"dependencies": { "dependencies": {
"@vue/devtools-api": "^6.1.4", "@vue/devtools-api": "^6.1.4",
"vue-demi": "*" "vue-demi": "*"
@ -4507,19 +4507,19 @@
"requires": {} "requires": {}
}, },
"@eslint/eslintrc": { "@eslint/eslintrc": {
"version": "1.2.2", "version": "1.2.3",
"resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.2.tgz", "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.3.tgz",
"integrity": "sha512-lTVWHs7O2hjBFZunXTZYnYqtB9GakA1lnxIf+gKq2nY5gxkkNi/lQvveW6t8gFdOHTg6nG50Xs95PrLqVpcaLg==", "integrity": "sha512-uGo44hIwoLGNyduRpjdEpovcbMdd+Nv7amtmJxnKmI8xj6yd5LncmSwDa5NgX/41lIFJtkjD6YdVfgEzPfJ5UA==",
"dev": true, "dev": true,
"requires": { "requires": {
"ajv": "^6.12.4", "ajv": "^6.12.4",
"debug": "^4.3.2", "debug": "^4.3.2",
"espree": "^9.3.1", "espree": "^9.3.2",
"globals": "^13.9.0", "globals": "^13.9.0",
"ignore": "^5.2.0", "ignore": "^5.2.0",
"import-fresh": "^3.2.1", "import-fresh": "^3.2.1",
"js-yaml": "^4.1.0", "js-yaml": "^4.1.0",
"minimatch": "^3.0.4", "minimatch": "^3.1.2",
"strip-json-comments": "^3.1.1" "strip-json-comments": "^3.1.1"
} }
}, },
@ -6059,12 +6059,12 @@
"dev": true "dev": true
}, },
"eslint": { "eslint": {
"version": "8.14.0", "version": "8.15.0",
"resolved": "https://registry.npmjs.org/eslint/-/eslint-8.14.0.tgz", "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.15.0.tgz",
"integrity": "sha512-3/CE4aJX7LNEiE3i6FeodHmI/38GZtWCsAtsymScmzYapx8q1nVVb+eLcLSzATmCPXw5pT4TqVs1E0OmxAd9tw==", "integrity": "sha512-GG5USZ1jhCu8HJkzGgeK8/+RGnHaNYZGrGDzUtigK3BsGESW/rs2az23XqE0WVwDxy1VRvvjSSGu5nB0Bu+6SA==",
"dev": true, "dev": true,
"requires": { "requires": {
"@eslint/eslintrc": "^1.2.2", "@eslint/eslintrc": "^1.2.3",
"@humanwhocodes/config-array": "^0.9.2", "@humanwhocodes/config-array": "^0.9.2",
"ajv": "^6.10.0", "ajv": "^6.10.0",
"chalk": "^4.0.0", "chalk": "^4.0.0",
@ -6075,7 +6075,7 @@
"eslint-scope": "^7.1.1", "eslint-scope": "^7.1.1",
"eslint-utils": "^3.0.0", "eslint-utils": "^3.0.0",
"eslint-visitor-keys": "^3.3.0", "eslint-visitor-keys": "^3.3.0",
"espree": "^9.3.1", "espree": "^9.3.2",
"esquery": "^1.4.0", "esquery": "^1.4.0",
"esutils": "^2.0.2", "esutils": "^2.0.2",
"fast-deep-equal": "^3.1.3", "fast-deep-equal": "^3.1.3",
@ -6091,7 +6091,7 @@
"json-stable-stringify-without-jsonify": "^1.0.1", "json-stable-stringify-without-jsonify": "^1.0.1",
"levn": "^0.4.1", "levn": "^0.4.1",
"lodash.merge": "^4.6.2", "lodash.merge": "^4.6.2",
"minimatch": "^3.0.4", "minimatch": "^3.1.2",
"natural-compare": "^1.4.0", "natural-compare": "^1.4.0",
"optionator": "^0.9.1", "optionator": "^0.9.1",
"regexpp": "^3.2.0", "regexpp": "^3.2.0",
@ -6167,13 +6167,13 @@
"dev": true "dev": true
}, },
"espree": { "espree": {
"version": "9.3.1", "version": "9.3.2",
"resolved": "https://registry.npmjs.org/espree/-/espree-9.3.1.tgz", "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.2.tgz",
"integrity": "sha512-bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ==", "integrity": "sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==",
"dev": true, "dev": true,
"requires": { "requires": {
"acorn": "^8.7.0", "acorn": "^8.7.1",
"acorn-jsx": "^5.3.1", "acorn-jsx": "^5.3.2",
"eslint-visitor-keys": "^3.3.0" "eslint-visitor-keys": "^3.3.0"
} }
}, },
@ -6946,9 +6946,9 @@
"dev": true "dev": true
}, },
"pinia": { "pinia": {
"version": "2.0.13", "version": "2.0.14",
"resolved": "https://registry.npmjs.org/pinia/-/pinia-2.0.13.tgz", "resolved": "https://registry.npmjs.org/pinia/-/pinia-2.0.14.tgz",
"integrity": "sha512-B7rSqm1xNpwcPMnqns8/gVBfbbi7lWTByzS6aPZ4JOXSJD4Y531rZHDCoYWBwLyHY/8hWnXljgiXp6rRyrofcw==", "integrity": "sha512-0nPuZR4TetT/WcLN+feMSjWJku3SQU7dBbXC6uw+R6FLQJCsg+/0pzXyD82T1FmAYe0lsx+jnEDQ1BLgkRKlxA==",
"requires": { "requires": {
"@vue/devtools-api": "^6.1.4", "@vue/devtools-api": "^6.1.4",
"vue-demi": "*" "vue-demi": "*"

4
package.json
View File

@ -22,7 +22,7 @@
"jsplumb": "^2.15.6", "jsplumb": "^2.15.6",
"mitt": "^3.0.0", "mitt": "^3.0.0",
"nprogress": "^0.2.0", "nprogress": "^0.2.0",
"pinia": "^2.0.13", "pinia": "^2.0.14",
"print-js": "^1.6.0", "print-js": "^1.6.0",
"qrcodejs2-fixes": "^0.0.2", "qrcodejs2-fixes": "^0.0.2",
"screenfull": "^6.0.1", "screenfull": "^6.0.1",
@ -43,7 +43,7 @@
"@vitejs/plugin-vue": "^2.3.2", "@vitejs/plugin-vue": "^2.3.2",
"@vue/compiler-sfc": "^3.2.33", "@vue/compiler-sfc": "^3.2.33",
"dotenv": "^16.0.0", "dotenv": "^16.0.0",
"eslint": "^8.14.0", "eslint": "^8.15.0",
"eslint-plugin-vue": "^8.7.1", "eslint-plugin-vue": "^8.7.1",
"prettier": "^2.6.2", "prettier": "^2.6.2",
"sass": "^1.51.0", "sass": "^1.51.0",

9
src/App.vue
View File

@ -37,6 +37,10 @@ export default defineComponent({
const getGlobalComponentSize = computed(() => { const getGlobalComponentSize = computed(() => {
return other.globalComponentSize(); return other.globalComponentSize();
}); });
// 获取布局配置信息
const getThemeConfig = computed(() => {
return themeConfig.value;
});
// 布局配置弹窗打开 // 布局配置弹窗打开
const openSetingsDrawer = () => { const openSetingsDrawer = () => {
setingsRef.value.openDrawer(); setingsRef.value.openDrawer();
@ -50,6 +54,11 @@ export default defineComponent({
}); });
// 页面加载时 // 页面加载时
onMounted(() => { onMounted(() => {
// https://gitee.com/lyt-top/vue-next-admin/issues/I567R1，感谢@lanbao123
if (import.meta.env.MODE === 'development') {
Local.remove('themeConfig');
Local.set('themeConfig', getThemeConfig.value);
}
nextTick(() => { nextTick(() => {
// 监听布局配置弹窗点击打开 // 监听布局配置弹窗点击打开
proxy.mittBus.on('openSetingsDrawer', () => { proxy.mittBus.on('openSetingsDrawer', () => {

2
src/layout/lockScreen/index.vue
View File

@ -233,7 +233,7 @@ export default defineComponent({
} }
.layout-lock-screen-img { .layout-lock-screen-img {
@extend .layout-lock-screen-fixed; @extend .layout-lock-screen-fixed;
background-image: url('https://gitee.com/lyt-top/vue-next-admin-images/raw/master/images/03.jpg'); background-image: url('https://img-blog.csdnimg.cn/afa9c317667f47d5bea34b85af45979e.png#pic_center');
background-size: 100% 100%; background-size: 100% 100%;
z-index: 9999991; z-index: 9999991;
} }

2
src/layout/navBars/tagsView/tagsView.vue
View File

@ -626,7 +626,7 @@ export default defineComponent({
line-height: 26px; line-height: 26px;
display: flex; display: flex;
align-items: center; align-items: center;
border: 1px solid #e6e6e6; border: 1px solid var(--el-border-color-lighter);
padding: 0 15px; padding: 0 15px;
margin-right: 5px; margin-right: 5px;
border-radius: 2px; border-radius: 2px;

1
src/stores/themeConfig.ts
View File

@ -3,6 +3,7 @@ import { ThemeConfigStates, ThemeConfigState } from './interface';
/** /**
* 布局配置 * 布局配置
* 修复：https://gitee.com/lyt-top/vue-next-admin/issues/I567R1，感谢@lanbao123
* 2020.05.28 by lyt 优化。开发时配置不生效问题 * 2020.05.28 by lyt 优化。开发时配置不生效问题
* 修改配置时： * 修改配置时：
* 1、需要每次都清理 `window.localStorage` 浏览器永久缓存 * 1、需要每次都清理 `window.localStorage` 浏览器永久缓存

10
src/theme/dark.scss
View File

@ -220,4 +220,14 @@
.layout-columns-aside { .layout-columns-aside {
border-right: 1px solid var(--next-border-columns); border-right: 1px solid var(--next-border-columns);
} }
// tagsView
.tags-style-one {
.is-active {
color: var(--el-text-color-primary) !important;
}
.layout-navbars-tagsview-ul-li:hover {
border-color: var(--el-border-color-lighter) !important;
}
}
} }