imatrix-ui 2.8.0-dw → 2.8.1-dw

package/package.json

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

package/src/i18n/langs/cn.js

@@ -70,7 +70,8 @@ const cn = {
     pleaseInputSearchCondition: '请输入查询条件',
     fileUpload: '文件上传',
     selectYear: '选择年',
-    search: '查询'
+    search: '查询',
+    forbiddenException: '您没有权限访问该资源'
   },
   // 列表组件
   superGrid: {

package/src/i18n/langs/en.js

@@ -70,7 +70,8 @@ const en = {
     pleaseInputSearchCondition: 'Please enter the query criteria',
     fileUpload: 'File Upload',
     selectYear: 'Select Year',
-    search: 'Search'
+    search: 'Search',
+    forbiddenException: 'You do not have permission to access this resource'
   },
   superGrid: {
     columnConfig: 'Column Config',

package/src/styles/theme/gray/index.scss

@@ -81,8 +81,6 @@
 
     .box-card {
       margin: 16px 24px;
-
-      .el-card__body {}
     }
   }
 
@@ -91,9 +89,9 @@
   }
 
   .operation-area-chart {
-    float: right;
     padding-right: 24px;
-    padding-top: 10px;
+    padding-top: 24px;
+    text-align: right;
   }
 
 

package/src/utils/request.js

@@ -79,8 +79,18 @@ service.interceptors.response.use(
             window.location.href = loginUrl
           })
         }
-      } else if (error.response.status === 400 || error.response.status === 406 || error.response.status === 404 || error.response.status === 403) {
-        // BadRequestException(400) || BusinessException(406)  || ResourceNotFoundException(404) || ForbiddenException(403)
+      } 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
+        })
+        return Promise.reject(error)
+      } else if (error.response.status === 400 || error.response.status === 406 || error.response.status === 404) {
+        // BadRequestException(400) || BusinessException(406)  || ResourceNotFoundException(404)
         let message = error.message
         if (message) {
           // 说明是原生的错误，不要显示，显示“请联系管理员”

package/src/views/dsc-component/Sidebar/Item.vue

@@ -29,9 +29,14 @@ export default {
       if (icon.indexOf('fa-') === 0) {
         // 表示以“fa-”开头，使用font-awesome中的图标
         icon = 'fa ' + icon
+        vnodes.push(<div style='display: inline-block;'><i class={icon}/></div>)
+      } else if (icon.indexOf('svg-') === 0) {
+        icon = icon.substring(icon.indexOf('svg-') + 4)
+        vnodes.push(<div style='display: inline-block;'><svg-icon icon-class={icon}/></div>)
+      } else {
+        icon += ' svg-icon'
+        vnodes.push(<div style='display: inline-block;'><i class={icon}/></div>)
       }
-      icon += ' svg-icon'
-      vnodes.push(<div style='display: inline-block;'><i class={icon}/></div>)
     }
 
     if (title) {

package/src/views/dsc-component/Sidebar/index.vue

@@ -93,9 +93,9 @@ export default {
           shouldSelectMenu = this.getFirstMenuWithCookie(menus)
         }
         // 默认不展示第一个有权限的菜单了，可以去掉下面的代码
-        //if (!shouldSelectMenu) {
-        //  shouldSelectMenu = this.getSelectMenuWithFirstMenu(menus[0])
-        //}
+        // if (!shouldSelectMenu) {
+        //   shouldSelectMenu = this.getSelectMenuWithFirstMenu(menus[0])
+        // }
         return shouldSelectMenu
       }
     },