BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 875d792bdda7ae410a179d216a314246d4aa1ec1

Authored by 芋道源码
Committed by Gitee
2 parents 7d0e20be e9814b12

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

Merge pull request !384 from 芋道源码/feature/dev-yunai
Inline Side-by-side
Showing 4 changed files with 12 additions and 10 deletions
yudao-ui-admin/package.json
  View file @875d792
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
49 "core-js": "^3.26.0", 49 "core-js": "^3.26.0",
50 "crypto-js": "^4.0.0", 50 "crypto-js": "^4.0.0",
51 "echarts": "5.4.0", 51 "echarts": "5.4.0",
52 - "element-ui": "2.15.10", 52 + "element-ui": "2.15.12",
53 "file-saver": "2.0.5", 53 "file-saver": "2.0.5",
54 "fuse.js": "6.6.2", 54 "fuse.js": "6.6.2",
55 "highlight.js": "9.18.5", 55 "highlight.js": "9.18.5",
yudao-ui-admin/src/components/TopNav/index.vue
  View file @875d792
@@ -133,7 +133,9 @@ export default { @@ -133,7 +133,9 @@ export default {
133 } else { 133 } else {
134 // 显示左侧联动菜单 134 // 显示左侧联动菜单
135 this.activeRoutes(key); 135 this.activeRoutes(key);
136 - this.$store.dispatch('app/toggleSideBarHide', false); 136 + if (!this.$route.meta.link) {
  137 + this.$store.dispatch('app/toggleSideBarHide', false);
  138 + }
137 } 139 }
138 }, 140 },
139 // 当前激活的路由 141 // 当前激活的路由
@@ -149,7 +151,7 @@ export default { @@ -149,7 +151,7 @@ export default {
149 if(routes.length > 0) { 151 if(routes.length > 0) {
150 this.$store.commit("SET_SIDEBAR_ROUTERS", routes); 152 this.$store.commit("SET_SIDEBAR_ROUTERS", routes);
151 } else { 153 } else {
152 - this.$store.dispatch("app/toggleSideBarHide", true); 154 + this.$store.dispatch('app/toggleSideBarHide', true);
153 } 155 }
154 }, 156 },
155 ishttp(url) { 157 ishttp(url) {
yudao-ui-admin/src/views/system/user/index.vue
  View file @875d792
@@ -364,9 +364,9 @@ export default { @@ -364,9 +364,9 @@ export default {
364 created() { 364 created() {
365 this.getList(); 365 this.getList();
366 this.getTreeselect(); 366 this.getTreeselect();
367 - this.getConfigKey("sys.user.init-password").then(response => {  
368 - this.initPassword = response.msg;  
369 - }); 367 + // this.getConfigKey("sys.user.init-password").then(response => {
  368 + // this.initPassword = response.msg;
  369 + // });
370 }, 370 },
371 methods: { 371 methods: {
372 // 更多操作 372 // 更多操作
yudao-ui-admin/yarn.lock
  View file @875d792
@@ -3999,10 +3999,10 @@ electron-to-chromium@^1.4.251: @@ -3999,10 +3999,10 @@ electron-to-chromium@^1.4.251:
3999 resolved "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz" 3999 resolved "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz"
4000 integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA== 4000 integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==
4001 4001
4002 -element-ui@2.15.10:  
4003 - version "2.15.10"  
4004 - resolved "https://registry.npmmirror.com/element-ui/-/element-ui-2.15.10.tgz"  
4005 - integrity sha512-jmD++mU2wKXbisvx4fxOl2mHaU+HWHTAq/3Wf8x9Bwyu4GdDZPLABb+CGi3DWN6fPqdgRcd74aX39DO+YHObLw== 4002 +element-ui@2.15.12:
  4003 + version "2.15.12"
  4004 + resolved "https://registry.npmmirror.com/element-ui/-/element-ui-2.15.12.tgz#fdde927a54078b17a85541ff7c0f0dad32488b8e"
  4005 + integrity sha512-Y5FMT2BPOindU2GkDEQ5ZKUVxDawKONRNMh2eL3uBx1FOtvUJ+L6IxXLVsNxq4WnaX/UnVNgWXebl7DobygZMg==
4006 dependencies: 4006 dependencies:
4007 async-validator "~1.8.1" 4007 async-validator "~1.8.1"
4008 babel-helper-vue-jsx-merge-props "^2.0.0" 4008 babel-helper-vue-jsx-merge-props "^2.0.0"