imatrix-ui 2.9.27-dw-tmp2 → 2.9.29-dw

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "imatrix-ui",
3
- "version": "2.9.27-dw-tmp2",
3
+ "version": "2.9.29-dw",
4
4
  "description": "前端组件库:表格、表单、组织结构树等",
5
5
  "main": "lib/super-ui.umd.min.js",
6
6
  "private": false,
package/src/permission.js CHANGED
@@ -104,8 +104,12 @@ router.beforeEach((to, from, next) => {
104
104
  console.log('router.beforeEach-store.getters.name ==', store.getters.name)
105
105
  if (isNeedMenu) {
106
106
  // 需要显示左侧菜单
107
- console.log('iMatrix-router.beforeEach33-getPermissionMenus,Vue.prototype.currentSystem=', Vue.prototype.currentSystem)
108
- return store.dispatch('getPermissionMenus', Vue.prototype.currentSystem).then(() => {
107
+ let systemCode = Vue.prototype.currentSystem
108
+ if (!systemCode && to.query && to.query.customSystem) {
109
+ systemCode = to.query.customSystem
110
+ }
111
+ console.log('iMatrix-router.beforeEach33-getPermissionMenus,Vue.prototype.currentSystem=', Vue.prototype.currentSystem, 'systemCode=', systemCode)
112
+ return store.dispatch('getPermissionMenus', systemCode).then(() => {
109
113
  next()
110
114
  })
111
115
  } else {