imatrix-ui 2.9.37-dw → 2.9.39-dw

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imatrix-ui",
-  "version": "2.9.37-dw",
+  "version": "2.9.39-dw",
   "description": "前端组件库：表格、表单、组织结构树等",
   "main": "lib/super-ui.umd.min.js",
   "private": false,
@@ -34,9 +34,9 @@
     "element-ui": "2.15.3",
     "eslint": "5.16.0",
     "eslint-plugin-vue": "5.2.2",
-    "node-sass": "4.12.0",
     "nprogress": "^0.2.0",
-    "sass-loader": "^7.1.0",
+    "sass": "^1.49.8",
+    "sass-loader": "^10.0.2",
     "sessionstorage": "^0.1.0",
     "vue": "^2.6.10",
     "vue-cli-plugin-element": "^1.0.1",

package/packages/rich-editor/index.vue

@@ -112,7 +112,7 @@ export default {
     },
     toolbar: {
       type: [String, Array],
-      default: ' undo redo | formatselect fontsizeselect bold italic strikethrough underline hr forecolor backcolor | image |  ' +
+      default: ' undo redo | formatselect fontsizeselect bold italic strikethrough underline hr forecolor backcolor| link | image |  ' +
       '  lineheight   bullist numlist table | print fullscreen  preview  '
     }
   },

package/src/i18n/langs/cn.js

@@ -72,10 +72,12 @@ const cn = {
     fileUpload: '文件上传',
     selectYear: '选择年',
     search: '查询',
-    forbiddenException: '您没有权限访问该资源',
+    forbiddenException: '您没有权限访问',
     theButtonIsNotBoundToAResource: '该按钮未绑定资源,请先绑定资源',
     asyncExport: '正在异步导出，请等待消息通知!',
-    selectedWorkingGroup: '已选工作组'
+    selectedWorkingGroup: '已选工作组',
+    forbiddenExceptionLinkUrl: '请点击进行权限申请',
+    forbiddenExceptionLinkUser: '如有疑问请联系'
   },
   // 列表组件
   superGrid: {

package/src/i18n/langs/en.js

@@ -72,10 +72,12 @@ const en = {
     fileUpload: 'File Upload',
     selectYear: 'Select Year',
     search: 'Search',
-    forbiddenException: 'You do not have permission to access this resource',
+    forbiddenException: 'You do not have permission to access',
     theButtonIsNotBoundToAResource: 'The button is not bound to a resource, Bind the resource first',
     asyncExport: 'Asynchronous export, please wait for message notification!',
-    selectedWorkingGroup: 'Selected working group'
+    selectedWorkingGroup: 'Selected working group',
+    forbiddenExceptionLinkUrl: 'please click to apply',
+    forbiddenExceptionLinkUser: 'if you have any questions,please contact'
   },
   superGrid: {
     columnConfig: 'Column Config',

package/src/store/modules/user.js

@@ -1,7 +1,7 @@
 import ssoService from '../../api/sso-service'
-import { setToken, removeToken, setUsername, getUsername, removeUsername, setCurrentUser, removeCurrentUser, removePublishControl, setLanguage, removeLanguage, removeAllLanguages } from '../../utils/auth'
+import { setToken, setUsername, getUsername, removeUsername, setCurrentUser, removeCurrentUser, setLanguage, clearPermission } from '../../utils/auth'
 
-import { removePermissions, getPermissions, setPermissions, getMenus, setMenus, removeMenus } from '../../utils/permissionAuth'
+import { getPermissions, setPermissions, getMenus, setMenus, removeAllSystemPermissions } from '../../utils/permissionAuth'
 import { isPlateSys } from '../../utils/common-util'
 
 const user = {
@@ -26,6 +26,8 @@ const user = {
   actions: {
     // 登录
     login({ commit }, userInfo) {
+      // 登录时先清除缓存的登录信息和权限信息
+      clearPermission()
       const username = userInfo.username.trim()
       return new Promise((resolve, reject) => {
         ssoService.login(username, userInfo.password, userInfo.language).then(data => {
@@ -48,6 +50,8 @@ const user = {
     loginWithCookieToken({ commit }, loginName) {
       return new Promise((resolve, reject) => {
         if (loginName) {
+          // 登录时清除缓存的资源
+          removeAllSystemPermissions()
           // setToken(tokenInfo.jwt)
           // commit('setToken', tokenInfo.jwt)
           ssoService.getCurrentUserPermissionsBySystem(loginName).then(permissions => {
@@ -94,19 +98,9 @@ const user = {
       return new Promise((resolve, reject) => {
         ssoService.logout(state.token).then((data) => {
           commit('setToken', '')
-          removeToken()
-          removeLanguage()
-          removeAllLanguages()
 
           commit('setName', '')
-          removeUsername()
-          removeCurrentUser()
-
-          removePermissions()
-
-          removeMenus()
-
-          removePublishControl()
+          clearPermission()
 
           resolve(data)
         }).catch(error => {
@@ -119,18 +113,9 @@ const user = {
     clearToken({ commit }) {
       return new Promise(resolve => {
         commit('setToken', '')
-        removeToken()
-        removeLanguage()
-        removeAllLanguages()
 
         commit('setName', '')
-        removeUsername()
-        removeCurrentUser()
-
-        removePermissions()
-
-        removeMenus()
-
+        clearPermission()
         resolve()
       })
     },

package/src/styles/theme/dark-blue/element-variables.scss

@@ -3,5 +3,5 @@
 .dark-blue {
   /* 改变 icon 字体路径变量，必需 */
   $--font-path: '~element-ui/lib/theme-chalk/fonts';
-  @import "~element-ui/packages/theme-chalk/src/index";
+  // @import "~element-ui/packages/theme-chalk/src/index";
 }

package/src/utils/auth.js

@@ -1,5 +1,7 @@
 import authApi from './auth-api'
 
+import { removeAllSystemPermissions } from './permissionAuth'
+
 export function getToken() {
   return authApi.getToken()
 }
@@ -60,7 +62,7 @@ export function removeSessionCache(key) {
   authApi.removeSessionCache(key)
 }
 
-export function removePublishControl() {
+function removePublishControl() {
   authApi.removePublishControl()
 }
 
@@ -72,7 +74,7 @@ export function setLanguage(language) {
   authApi.setLanguage(language)
 }
 
-export function removeLanguage() {
+function removeLanguage() {
   authApi.removeLanguage()
 }
 
@@ -84,6 +86,18 @@ export function setAllLanguages(langs) {
   authApi.setAllLanguages(langs)
 }
 
-export function removeAllLanguages() {
+function removeAllLanguages() {
   authApi.removeAllLanguages()
 }
+// 清空token时需要清除的缓存信息
+export function clearPermission() {
+  removeToken()
+  removeLanguage()
+  removeAllLanguages()
+
+  removeUsername()
+  removeCurrentUser()
+
+  removeAllSystemPermissions()
+  removePublishControl()
+}

package/src/utils/permissionAuth.js

@@ -1,8 +1,8 @@
-import sessionStorage from 'sessionstorage'
 import Vue from 'vue'
 
 const permissionKey = 'PERMISSION-'
 const permissionMenuKey = 'PERMISSION_MENU-'
+const permissionAllSystemKey = 'PERMISSION_All_SYSTSEM_KEY'
 export function getSystemCode() {
   let systemCode
   if (Vue.prototype.customSystem) {
@@ -21,7 +21,7 @@ export function getSystemCode() {
 
 export function getPermissions() {
   const systemCode = getSystemCode()
-  const permissions = sessionStorage.getItem(permissionKey + systemCode)
+  const permissions = localStorage.getItem(permissionKey + systemCode)
   if (permissions) {
     return JSON.parse(permissions)
   }
@@ -35,26 +35,17 @@ export function setPermissions(permissions) {
     const permission = permissions[i].replace(/\./g, '__')
     permissionObjs[permission] = true
   }
-  sessionStorage.setItem(permissionKey + systemCode, JSON.stringify(permissionObjs))
+  const key = permissionKey + systemCode
+  localStorage.setItem(key, JSON.stringify(permissionObjs))
+  setPermissionAllSystemKey(key)
   return permissionObjs
 }
 
-export function removePermissions() {
-  const systemCode = getSystemCode()
-  sessionStorage.removeItem(permissionKey + systemCode)
-  for (var i = 0; i < sessionStorage.length; i++) {
-    var key = sessionStorage.key(i)
-    if (key.indexOf(permissionKey) >= 0) {
-      sessionStorage.removeItem(key)
-    }
-  }
-}
-
 export function getMenus(systemCode) {
   if (!systemCode) {
     systemCode = getSystemCode()
   }
-  const permissions = sessionStorage.getItem(permissionMenuKey + systemCode)
+  const permissions = localStorage.getItem(permissionMenuKey + systemCode)
   if (permissions) {
     return JSON.parse(permissions)
   }
@@ -66,21 +57,49 @@ export function setMenus(menus, systemCode) {
     if (!systemCode) {
       systemCode = getSystemCode()
     }
-    sessionStorage.setItem(permissionMenuKey + systemCode, JSON.stringify(menus))
+    const key = permissionMenuKey + systemCode
+    localStorage.setItem(key, JSON.stringify(menus))
+    setPermissionAllSystemKey(key)
     return menus
   }
 }
 
-export function removeMenus(systemCode) {
-  if (!systemCode) {
-    systemCode = getSystemCode()
+function setPermissionAllSystemKey(systemPermissionKey) {
+  const permissionAllSystems = getPermissionAllSystemKey()
+  if (permissionAllSystems.indexOf(systemPermissionKey) < 0) {
+    permissionAllSystems.push(systemPermissionKey)
   }
-  sessionStorage.removeItem(permissionMenuKey + systemCode)
-  for (var i = 0; i < sessionStorage.length; i++) {
-    var key = sessionStorage.key(i)
-    if (key.indexOf(permissionMenuKey) >= 0) {
-      sessionStorage.removeItem(key)
-    }
+  localStorage.setItem(permissionAllSystemKey, permissionAllSystems.join(','))
+}
+
+function getPermissionAllSystemKey() {
+  let permissionAllSystems = localStorage.getItem(permissionAllSystemKey)
+  if (permissionAllSystems) {
+    permissionAllSystems = permissionAllSystems.split(',')
+  }
+  if (!permissionAllSystems) {
+    permissionAllSystems = []
   }
+  return permissionAllSystems
+}
+
+function removePermissionSystemKey() {
+  localStorage.removeItem(permissionAllSystemKey)
 }
 
+function rtrim(str) { // 删除右边的空格
+  return str.replace(/(\s*$)/g, '')
+}
+
+// 删除缓存的资源和菜单
+export function removeAllSystemPermissions() {
+  const systemCode = getSystemCode()
+  localStorage.removeItem(permissionKey + systemCode)
+  localStorage.removeItem(permissionMenuKey + systemCode)
+  const permissionAllSystems = getPermissionAllSystemKey()
+  permissionAllSystems.forEach(key => {
+    key = rtrim(key)
+    localStorage.removeItem(key)
+  })
+  removePermissionSystemKey()
+}

package/src/utils/request.js

@@ -9,7 +9,6 @@ import {
 import store from '../store'
 import checkPermission from './permission'
 import Vue from 'vue'
-import { h } from 'vue'
 import {
   getI18n
 } from './util'
@@ -84,29 +83,42 @@ service.interceptors.response.use(
         }
       } else if (error.response.status === 403) {
         // ForbiddenException(403) 403没权限
-        let message = getI18n().t('imatrixUIMessage.forbiddenException')
+        // 您没有权限访问
+        const message = getI18n().t('imatrixUIMessage.forbiddenException')
         let vnode
         if (Vue.prototype.forbiddenUser || Vue.prototype.forbiddenLinkUrl) {
-          if (Vue.prototype.forbiddenUser) {
-            message = message + '.' + Vue.prototype.forbiddenUser + '.'
-          }
+          vnode = '<p><span>' + message + '</span>'
+          // 请点击进行权限申请
+          const forbiddenExceptionLinkUrlMsg = getI18n().t('imatrixUIMessage.forbiddenExceptionLinkUrl')
           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)
-            ])
+            vnode += ',<a href="#" style="color: #1800ff;font-weight: bold;text-decoration:underline" onclick="window.open(\'' + Vue.prototype.forbiddenLinkUrl + '\')">' + forbiddenExceptionLinkUrlMsg + '</a>'
+          }
+          if (Vue.prototype.forbiddenUser) {
+            // 如有疑问请联系
+            const forbiddenExceptionLinkUserMsg = getI18n().t('imatrixUIMessage.forbiddenExceptionLinkUser')
+            vnode += '<span>'
+            const forbiddenUserHtml = ',' + forbiddenExceptionLinkUserMsg + '<span style="color: #1800ff;"> ' + Vue.prototype.forbiddenUser + '</span>'
+            let contactUrlHtml
+            if (!window._clickForbiddenUser) {
+              contactUrlHtml = forbiddenUserHtml
+            } else {
+              // index.html中添加如下代码，绑定用户点击事件
+            //   <script>
+            //   window._clickForbiddenUser=function(linkUser) {
+            //     alert(linkUser)
+            //   }
+            // </script>
+              contactUrlHtml = '<a href="#"  onclick="window._clickForbiddenUser(\'' + Vue.prototype.forbiddenUser + '\');return false">' + forbiddenUserHtml + '</a>'
+            }
+            vnode += '</span>'
+            vnode += contactUrlHtml
           }
+          vnode += '</p>'
         }
         if (vnode) {
           Message({
             showClose: true,
+            dangerouslyUseHTMLString: true,
             message: vnode,
             type: 'error',
             duration: 10 * 1000