imatrix-ui 2.9.35-dw → 2.9.37-dw

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imatrix-ui",
-  "version": "2.9.35-dw",
+  "version": "2.9.37-dw",
   "description": "前端组件库：表格、表单、组织结构树等",
   "main": "lib/super-ui.umd.min.js",
   "private": false,

package/src/permission.js

@@ -10,8 +10,8 @@ import Vue from 'vue'
 const whiteList = ['/login', '/update-password', '/forget-password', '/reset-password', '/redirect'] // 不重定向白名单
 router.beforeEach((to, from, next) => {
   NProgress.start()
-  console.log('router.beforeEach-to=', to)
-  console.log('router.beforeEach-from=', from)
+  // console.log('router.beforeEach-to=', to)
+  // console.log('router.beforeEach-from=', from)
   // console.log('router.beforeEach-to.path=', to.path)
   let token = getToken()
   // console.log('router.beforeEach-to.query.JWT=', to.query.JWT)
@@ -43,17 +43,17 @@ router.beforeEach((to, from, next) => {
   } else {
     isNeedMenu = true
   }
-  console.log('iMatrix-router.beforeEach2-isNeedMenu==', isNeedMenu)
+  // console.log('iMatrix-router.beforeEach2-isNeedMenu==', isNeedMenu)
   // console.log('router.beforeEach-getToken()=', token)
   if ((['/update-password', '/forget-password', '/reset-password', '/redirect'].indexOf(to.path) === -1 || store.getters.whiteList.indexOf(to.path) !== -1) && token) {
     if (to.path === '/login') {
       next({ path: '/', query: to.query })
       NProgress.done() // if current page is dashboard will not trigger	afterEach hook, so manually handle it
     } else {
-      console.log('router.beforeEach-to.path!=login')
+      // console.log('router.beforeEach-to.path!=login')
       if (store.getters.name === '') {
         // 表示刷新了页面（例如点击了一级菜单）后，会重新走该方法
-        console.log('router.beforeEach-store.getters.name === ""')
+        // console.log('router.beforeEach-store.getters.name === ""')
         store.dispatch('isLoginTimeOut').then((result) => {
           if (result === true) {
             store.dispatch('clearToken').then(() => {
@@ -62,15 +62,15 @@ router.beforeEach((to, from, next) => {
             })
           } else {
             store.dispatch('getCurrentUser').then(user => {
-              console.log('router.beforeEach-getCurrentUser')
+              // console.log('router.beforeEach-getCurrentUser')
               return store.dispatch('getCurrentUserPermissions', user.loginName)
             }).then(permissions => {
-              console.log('router.beforeEach-getCurrentUserPermissions-result==')
+              // console.log('router.beforeEach-getCurrentUserPermissions-result==')
               return store.dispatch('generateRoutes', permissions)
             }).then(() => {
               if (isNeedMenu) {
                 // 需要显示左侧菜单
-                console.log('iMatrix-router.beforeEach2-getPermissionMenus')
+                // console.log('iMatrix-router.beforeEach2-getPermissionMenus')
                 return store.dispatch('getPermissionMenus', Vue.prototype.currentSystem)
               } else {
                 return new Promise((resolve, reject) => {
@@ -79,12 +79,12 @@ router.beforeEach((to, from, next) => {
               }
             }).then(() => {
               // 根据roles权限生成可访问的路由表
-              console.log('router.beforeEach-generateRoutes==to=', to, ',from=', from)
+              // console.log('router.beforeEach-generateRoutes==to=', to, ',from=', from)
               router.addRoutes(store.getters.protectedRouters) // 动态添加可访问路由表
               // 404等错误路由一定要放到受权限保护的路由之后
               router.addRoutes(errorRouterMap)
               // sessionStorage.setItem(new Date().getTime() + '-name=null-from~~toPath', from.path + '~~' + to.path)
-              console.log('router.beforeEach-generateRoutes==to.path=', to.path)
+              // console.log('router.beforeEach-generateRoutes==to.path=', to.path)
               next({ ...to, replace: true })
             }).catch((err) => {
               store.dispatch('clearToken').then(() => {
@@ -101,14 +101,14 @@ router.beforeEach((to, from, next) => {
         })
       } else {
         // sessionStorage.setItem(new Date().getTime() + '-name!==null-from~~toPath', from.path + '~~' + to.path)
-        console.log('router.beforeEach-store.getters.name ==', store.getters.name)
+        // console.log('router.beforeEach-store.getters.name ==', store.getters.name)
         if (isNeedMenu) {
           // 需要显示左侧菜单
           let systemCode = Vue.prototype.currentSystem
           if (!systemCode && to.query && to.query.customSystem) {
             systemCode = to.query.customSystem
           }
-          console.log('iMatrix-router.beforeEach33-getPermissionMenus,Vue.prototype.currentSystem=', Vue.prototype.currentSystem, 'systemCode=', systemCode)
+          // console.log('iMatrix-router.beforeEach33-getPermissionMenus,Vue.prototype.currentSystem=', Vue.prototype.currentSystem, 'systemCode=', systemCode)
           return store.dispatch('getPermissionMenus', systemCode).then(() => {
             next()
           })

package/src/utils/request.js

@@ -9,6 +9,7 @@ import {
 import store from '../store'
 import checkPermission from './permission'
 import Vue from 'vue'
+import { h } from 'vue'
 import {
   getI18n
 } from './util'
@@ -83,13 +84,41 @@ service.interceptors.response.use(
         }
       } else if (error.response.status === 403) {
         // ForbiddenException(403) 403没权限
-        const message = getI18n().t('imatrixUIMessage.forbiddenException')
-        Message({
-          showClose: true,
-          message: message,
-          type: 'error',
-          duration: 5 * 1000
-        })
+        let message = getI18n().t('imatrixUIMessage.forbiddenException')
+        let vnode
+        if (Vue.prototype.forbiddenUser || Vue.prototype.forbiddenLinkUrl) {
+          if (Vue.prototype.forbiddenUser) {
+            message = message + '.' + Vue.prototype.forbiddenUser + '.'
+          }
+          if (Vue.prototype.forbiddenLinkUrl) {
+            vnode = h('p', null, [
+              h('span', null, message),
+              h('a', {
+                style: 'color: #409EFF',
+                href: '#',
+                on: {
+                  click: (event) => {
+                    window.open(Vue.prototype.forbiddenLinkUrl)
+                  }
+                }}, Vue.prototype.forbiddenLinkUrl)
+            ])
+          }
+        }
+        if (vnode) {
+          Message({
+            showClose: true,
+            message: vnode,
+            type: 'error',
+            duration: 10 * 1000
+          })
+        } else {
+          Message({
+            showClose: true,
+            message: message,
+            type: 'error',
+            duration: 5 * 1000
+          })
+        }
         return Promise.reject(error)
       } else if (error.response.status === 400 || error.response.status === 406 || error.response.status === 404) {
         // BadRequestException(400) || BusinessException(406)  || ResourceNotFoundException(404)

package/src/views/dsc-component/tabs/tab-content.vue

@@ -86,11 +86,23 @@ export default {
         let src
         let params = ''
         if (tag.routeQuery) {
+          const orgParams = []
+          const orgPath = tag.routeQuery['src']
+          if (orgPath && orgPath.indexOf('?') > 0) {
+            const orgParamsStr = orgPath.substring(orgPath.indexOf('?') + 1)
+            const orgParamsArr = orgParamsStr.split('&')
+            orgParamsArr.forEach(item => {
+              orgParams.push(item.substring(0, item.indexOf('=')))
+            })
+          }
           for (const key in tag.routeQuery) {
             if (key === 'src') {
               src = tag.routeQuery[key]
             } else {
-              params += key + '=' + tag.routeQuery[key] + '&'
+              if (orgParams.indexOf(key) < 0) {
+                // 表示原参数中没有该参数，则拼接该参数
+                params += key + '=' + tag.routeQuery[key] + '&'
+              }
             }
           }
         }