huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-26 17:21:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

!384 升级 element-ui 到最新版本 2.15.12

Browse Source 
Merge pull request !384 from 芋道源码/feature/dev-yunai
This commit is contained in:
芋道源码 2023-01-25 04:35:55 +00:00 committed by Gitee
commit 875d792bdd
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-ui-admin/package.json
View File

@ -49,7 +49,7 @@
"core-js": "^3.26.0",
"crypto-js": "^4.0.0",
"echarts": "5.4.0",
"element-ui": "2.15.10",
"element-ui": "2.15.12",
"file-saver": "2.0.5",
"fuse.js": "6.6.2",
"highlight.js": "9.18.5",

6
yudao-ui-admin/src/components/TopNav/index.vue
View File

@ -133,7 +133,9 @@ export default {
} else {
// 显示左侧联动菜单
this.activeRoutes(key);
this.$store.dispatch('app/toggleSideBarHide', false);
if (!this.$route.meta.link) {
this.$store.dispatch('app/toggleSideBarHide', false);
}
}
},
// 当前激活的路由
@ -149,7 +151,7 @@ export default {
if(routes.length > 0) {
this.$store.commit("SET_SIDEBAR_ROUTERS", routes);
} else {
this.$store.dispatch("app/toggleSideBarHide", true);
this.$store.dispatch('app/toggleSideBarHide', true);
}
},
ishttp(url) {

6
yudao-ui-admin/src/views/system/user/index.vue
View File

@ -364,9 +364,9 @@ export default {
created() {
this.getList();
this.getTreeselect();
this.getConfigKey("sys.user.init-password").then(response => {
this.initPassword = response.msg;
});
// this.getConfigKey("sys.user.init-password").then(response => {
// this.initPassword = response.msg;
// });
},
methods: {
// 更多操作

8
yudao-ui-admin/yarn.lock
View File

@ -3999,10 +3999,10 @@ electron-to-chromium@^1.4.251:
resolved "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz"
integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==
element-ui@2.15.10:
version "2.15.10"
resolved "https://registry.npmmirror.com/element-ui/-/element-ui-2.15.10.tgz"
integrity sha512-jmD++mU2wKXbisvx4fxOl2mHaU+HWHTAq/3Wf8x9Bwyu4GdDZPLABb+CGi3DWN6fPqdgRcd74aX39DO+YHObLw==
element-ui@2.15.12:
version "2.15.12"
resolved "https://registry.npmmirror.com/element-ui/-/element-ui-2.15.12.tgz#fdde927a54078b17a85541ff7c0f0dad32488b8e"
integrity sha512-Y5FMT2BPOindU2GkDEQ5ZKUVxDawKONRNMh2eL3uBx1FOtvUJ+L6IxXLVsNxq4WnaX/UnVNgWXebl7DobygZMg==
dependencies:
async-validator "~1.8.1"
babel-helper-vue-jsx-merge-props "^2.0.0"