imatrix-ui 2.9.38-dw → 2.9.39-dw

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imatrix-ui",
-  "version": "2.9.38-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/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/request.js

@@ -83,15 +83,37 @@ 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 = '<p><span>' + message + '</span><a href="#" style="color: #409EFF" onclick="window.open(\'' + Vue.prototype.forbiddenLinkUrl + '\')">' + Vue.prototype.forbiddenLinkUrl + '</a></p>'
+            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({