diff --git a/yudao-ui-admin/package.json b/yudao-ui-admin/package.json index c16997fc0..738ac509f 100644 --- a/yudao-ui-admin/package.json +++ b/yudao-ui-admin/package.json @@ -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", diff --git a/yudao-ui-admin/src/components/TopNav/index.vue b/yudao-ui-admin/src/components/TopNav/index.vue index 98c4afe84..02ca003d2 100644 --- a/yudao-ui-admin/src/components/TopNav/index.vue +++ b/yudao-ui-admin/src/components/TopNav/index.vue @@ -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) { diff --git a/yudao-ui-admin/src/views/system/user/index.vue b/yudao-ui-admin/src/views/system/user/index.vue index 064f0bcf1..5c3bb1655 100644 --- a/yudao-ui-admin/src/views/system/user/index.vue +++ b/yudao-ui-admin/src/views/system/user/index.vue @@ -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: { // 更多操作 diff --git a/yudao-ui-admin/yarn.lock b/yudao-ui-admin/yarn.lock index 73a3fce0f..0293cba48 100644 --- a/yudao-ui-admin/yarn.lock +++ b/yudao-ui-admin/yarn.lock @@ -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"