'admin-22.03.04:更新版本v2.0.2,更新内容查看根目录CHANGELOG.md'

This commit is contained in:
lyt 2022-03-04 12:39:54 +08:00
parent 49c5eaf1bc
commit 8c216f6e94
6 changed files with 41 additions and 20 deletions

View File

@ -2,6 +2,17 @@
🎉🎉🔥 `vue-next-admin` 基于 vue3.x 、Typescript、vite、Element plus 等适配手机、平板、pc 的后台开源免费模板库vue2.x 请切换 vue-prev-admin 分支) 🎉🎉🔥 `vue-next-admin` 基于 vue3.x 、Typescript、vite、Element plus 等适配手机、平板、pc 的后台开源免费模板库vue2.x 请切换 vue-prev-admin 分支)
## 2.0.2
`2022.03.04`
- 🌟 更新 依赖更新最新版本
- 🎯 优化 Alert 提示添加边框
- 🎯 优化 功能 / 数字滚动 演示界面
- 🐞 修复 全局主题按钮颜色 :active 问题
- 🐞 修复 Dropdown 下拉菜单样式问题
- 🐞 修复 SvgIcon 图标组件动态切换时报警告问题,[SvgIcon 改变 name 时可能导致图像不显示](https://gitee.com/lyt-top/vue-next-admin/issues/I4VGE0),感谢@axcc1234
## 2.0.1 ## 2.0.1
`2022.02.25` `2022.02.25`

View File

@ -1,6 +1,6 @@
{ {
"name": "vue-next-admin", "name": "vue-next-admin",
"version": "2.0.1", "version": "2.0.2",
"description": "vue3 vite next admin template", "description": "vue3 vite next admin template",
"author": "lyt_20201208", "author": "lyt_20201208",
"license": "MIT", "license": "MIT",
@ -10,14 +10,14 @@
"lint-fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/" "lint-fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/"
}, },
"dependencies": { "dependencies": {
"@element-plus/icons-vue": "^0.2.7", "@element-plus/icons-vue": "^1.0.0",
"axios": "^0.26.0", "axios": "^0.26.0",
"countup.js": "^2.0.8", "countup.js": "^2.1.0",
"cropperjs": "^1.5.12", "cropperjs": "^1.5.12",
"echarts": "^5.3.0", "echarts": "^5.3.0",
"echarts-gl": "^2.0.8", "echarts-gl": "^2.0.9",
"echarts-wordcloud": "^2.0.0", "echarts-wordcloud": "^2.0.0",
"element-plus": "^2.0.3", "element-plus": "^2.0.4",
"jsplumb": "^2.15.6", "jsplumb": "^2.15.6",
"mitt": "^3.0.0", "mitt": "^3.0.0",
"nprogress": "^0.2.0", "nprogress": "^0.2.0",
@ -30,7 +30,7 @@
"vue-clipboard3": "^1.0.1", "vue-clipboard3": "^1.0.1",
"vue-grid-layout": "^3.0.0-beta1", "vue-grid-layout": "^3.0.0-beta1",
"vue-i18n": "^9.1.9", "vue-i18n": "^9.1.9",
"vue-router": "^4.0.12", "vue-router": "^4.0.13",
"vuex": "^4.0.2", "vuex": "^4.0.2",
"wangeditor": "^4.7.12" "wangeditor": "^4.7.12"
}, },
@ -38,18 +38,18 @@
"@types/node": "^17.0.21", "@types/node": "^17.0.21",
"@types/nprogress": "^0.2.0", "@types/nprogress": "^0.2.0",
"@types/sortablejs": "^1.10.7", "@types/sortablejs": "^1.10.7",
"@typescript-eslint/eslint-plugin": "^5.12.1", "@typescript-eslint/eslint-plugin": "^5.13.0",
"@typescript-eslint/parser": "^5.12.1", "@typescript-eslint/parser": "^5.13.0",
"@vitejs/plugin-vue": "^2.2.2", "@vitejs/plugin-vue": "^2.2.4",
"@vue/compiler-sfc": "^3.2.31", "@vue/compiler-sfc": "^3.2.31",
"dotenv": "^16.0.0", "dotenv": "^16.0.0",
"eslint": "^8.9.0", "eslint": "^8.10.0",
"eslint-plugin-vue": "^8.5.0", "eslint-plugin-vue": "^8.5.0",
"prettier": "^2.5.1", "prettier": "^2.5.1",
"sass": "^1.49.9", "sass": "^1.49.9",
"sass-loader": "^12.6.0", "sass-loader": "^12.6.0",
"typescript": "^4.5.5", "typescript": "^4.6.2",
"vite": "^2.8.4", "vite": "^2.8.6",
"vue-eslint-parser": "^8.3.0" "vue-eslint-parser": "^8.3.0"
}, },
"browserslist": [ "browserslist": [

View File

@ -31,9 +31,10 @@ export default {
const linesString: any[] = ['https', 'http', '/src', '/assets', import.meta.env.VITE_PUBLIC_PATH]; const linesString: any[] = ['https', 'http', '/src', '/assets', import.meta.env.VITE_PUBLIC_PATH];
const onLineStyle: string = `font-size: ${props.size}px;color: ${props.color}`; const onLineStyle: string = `font-size: ${props.size}px;color: ${props.color}`;
const localsStyle: string = `width: ${props.size}px;height: ${props.size}px`; const localsStyle: string = `width: ${props.size}px;height: ${props.size}px`;
const eleSetStyle = { class: 'el-icon', style: onLineStyle };
// //
if (props.name?.startsWith('ele-')) return () => h('i', { class: 'el-icon', style: onLineStyle }, [h(resolveComponent(props.name))]); if (props.name?.startsWith('ele-')) return () => h('i', eleSetStyle, [props.name === 'ele-' ? '' : h(resolveComponent(props.name))]);
else if (linesString.find((str) => props.name?.startsWith(str))) return () => h('img', { src: props.name, style: localsStyle }); else if (linesString.find((str) => props.name?.startsWith(str))) return () => h('img', { src: props.name, style: localsStyle });
else return () => h('i', { class: props.name, style: onLineStyle }); else return () => h('i', { class: props.name, style: onLineStyle });
}, },

View File

@ -400,7 +400,7 @@
<script lang="ts"> <script lang="ts">
import { nextTick, onUnmounted, onMounted, getCurrentInstance, defineComponent, computed, reactive, toRefs } from 'vue'; import { nextTick, onUnmounted, onMounted, getCurrentInstance, defineComponent, computed, reactive, toRefs } from 'vue';
import { useStore } from '/@/store/index'; import { useStore } from '/@/store/index';
import { getLightColor } from '/@/utils/theme'; import { getLightColor, getDarkColor } from '/@/utils/theme';
import { verifyAndSpace } from '/@/utils/toolsValidate'; import { verifyAndSpace } from '/@/utils/toolsValidate';
import { Local } from '/@/utils/storage'; import { Local } from '/@/utils/storage';
import Watermark from '/@/utils/wartermark'; import Watermark from '/@/utils/wartermark';
@ -421,7 +421,10 @@ export default defineComponent({
}); });
// 1 // 1
const onColorPickerChange = () => { const onColorPickerChange = () => {
//
document.documentElement.style.setProperty('--el-color-primary-dark-2', `${getDarkColor(getThemeConfig.value.primary, 0.1)}`);
document.documentElement.style.setProperty('--el-color-primary', getThemeConfig.value.primary); document.documentElement.style.setProperty('--el-color-primary', getThemeConfig.value.primary);
//
for (let i = 1; i <= 9; i++) { for (let i = 1; i <= 9; i++) {
document.documentElement.style.setProperty(`--el-color-primary-light-${i}`, `${getLightColor(getThemeConfig.value.primary, i / 10)}`); document.documentElement.style.setProperty(`--el-color-primary-light-${i}`, `${getLightColor(getThemeConfig.value.primary, i / 10)}`);
} }
@ -520,7 +523,7 @@ export default defineComponent({
setLocalThemeConfig(); setLocalThemeConfig();
}; };
// 4 --> // 4 -->
const onWartermarkTextInput = (val: string) => { const onWartermarkTextInput = (val: any) => {
getThemeConfig.value.wartermarkText = verifyAndSpace(val); getThemeConfig.value.wartermarkText = verifyAndSpace(val);
if (getThemeConfig.value.wartermarkText === '') return false; if (getThemeConfig.value.wartermarkText === '') return false;
if (getThemeConfig.value.isWartermark) Watermark.set(getThemeConfig.value.wartermarkText); if (getThemeConfig.value.isWartermark) Watermark.set(getThemeConfig.value.wartermarkText);

View File

@ -34,6 +34,9 @@
/* Alert 警告 /* Alert 警告
------------------------------- */ ------------------------------- */
.el-alert {
border: 1px solid;
}
.el-alert__title { .el-alert__title {
word-break: break-all; word-break: break-all;
} }
@ -141,6 +144,9 @@
/* Dropdown 下拉菜单 /* Dropdown 下拉菜单
------------------------------- */ ------------------------------- */
.el-dropdown-menu {
list-style: none !important; /*修复 Dropdown 下拉菜单样式问题 2022.03.04*/
}
.el-dropdown-menu .el-dropdown-menu__item { .el-dropdown-menu .el-dropdown-menu__item {
white-space: nowrap; white-space: nowrap;
} }

View File

@ -50,7 +50,7 @@ export default defineComponent({
tip: '在场人数', tip: '在场人数',
tipNum: '911', tipNum: '911',
color: '--el-color-primary', color: '--el-color-primary',
iconColor: '#F86C6B', iconColor: '#ffcb47',
icon: 'iconfont icon-jinridaiban', icon: 'iconfont icon-jinridaiban',
}, },
{ {
@ -59,7 +59,7 @@ export default defineComponent({
tip: '使用中', tip: '使用中',
tipNum: '611', tipNum: '611',
color: '--el-color-success', color: '--el-color-success',
iconColor: '#92A1F4', iconColor: '#70cf41',
icon: 'iconfont icon-AIshiyanshi', icon: 'iconfont icon-AIshiyanshi',
}, },
{ {
@ -67,8 +67,8 @@ export default defineComponent({
titleNum: '123', titleNum: '123',
tip: '通过人数', tip: '通过人数',
tipNum: '911', tipNum: '911',
color: '#FEBB50', color: '--el-color-warning',
iconColor: '--el-color-warning', iconColor: '#dfae64',
icon: 'iconfont icon-shenqingkaiban', icon: 'iconfont icon-shenqingkaiban',
}, },
{ {
@ -77,7 +77,7 @@ export default defineComponent({
tip: '销售数', tip: '销售数',
tipNum: '911', tipNum: '911',
color: '--el-color-danger', color: '--el-color-danger',
iconColor: '#1dbcd5', iconColor: '#e56565',
icon: 'iconfont icon-ditu', icon: 'iconfont icon-ditu',
}, },
], ],