imatrix-ui 2.7.98-dw → 2.8.1-dw

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imatrix-ui",
-  "version": "2.7.98-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

@@ -88,10 +88,14 @@ export default {
     },
     getMyFirstMenu(menus) {
       if (menus && menus.length > 0) {
-        let shouldSelectMenu = this.getFirstMenuWithCookie(menus)
+        let shouldSelectMenu = this.getFirstMenu(menus)
         if (!shouldSelectMenu) {
-          shouldSelectMenu = this.getFirstMenu(menus)
+          shouldSelectMenu = this.getFirstMenuWithCookie(menus)
         }
+        // 默认不展示第一个有权限的菜单了，可以去掉下面的代码
+        // if (!shouldSelectMenu) {
+        //   shouldSelectMenu = this.getSelectMenuWithFirstMenu(menus[0])
+        // }
         return shouldSelectMenu
       }
     },
@@ -106,29 +110,24 @@ export default {
             break
           }
         }
-        if (!shouldSelectMenu) {
-          // 如果没有获得默认选中的菜单，则默认选中第一个菜单
-          shouldSelectMenu = this.getSelectMenuWithFirstMenu(menus[0])
-        }
         return shouldSelectMenu
       }
     },
     getShouldSelectMenu(menu) {
-      if (menu) {
-        console.log('dsc--getShouldSelectMenu--this.$route=', this.$route)
+      console.log('dsc--getShouldSelectMenu--this.$route=', this.$route)
+      const currentMenuCode = this.$route.query ? this.$route.query._menuCode : null
+      if (menu && currentMenuCode) {
         let shouldSelectMenu
         const children = menu.children
-        const currentRoute = this.$route.path
         if (children && children.length > 0) {
           shouldSelectMenu = this.getFirstMenu(children)
-        } else if (menu.fullPath && menu.fullPath === currentRoute) {
+        } else if (menu.code && menu.code === currentMenuCode) {
           shouldSelectMenu = menu
         }
         return shouldSelectMenu
       }
     },
     getSelectMenuWithFirstMenu(menu) {
-      console.log('dsc--getSelectMenuWithFirstMenu--this.$route=', this.$route)
       if (menu) {
         let shouldSelectMenu
         const children = menu.children
@@ -142,7 +141,7 @@ export default {
     },
     getFirstMenuWithCookie(menus) {
       if (menus && menus.length > 0) {
-        const cookieMenu = Cookies.set('selectMenu')
+        const cookieMenu = Cookies.get('selectMenu')
         if (cookieMenu) {
         //   // 表示缓存中存储了menu，格式为：/dsc/菜单编码~~pageCode
           const prefix = '/dsc/'

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

@@ -1,9 +1,21 @@
 <template>
-  <el-tabs v-model="activeIndex" class="nav-tab menu-tab-container" closable @tab-remove="closeSelectedTag">
-    <el-tab-pane v-for="tag in openTab" :key="tag.code" :label="tag.name" :name="tag.code">
-      <iframe ref="tabMainContent" :src="getFullPath(tag)" class="tab-main-content" name="tab-main-content" frameborder="0" />
-    </el-tab-pane>
-  </el-tabs>
+  <div>
+    <el-tabs v-if="openTab && openTab.length > 0" v-model="activeIndex" class="nav-tab menu-tab-container" closable @tab-remove="closeSelectedTag">
+      <el-tab-pane v-for="tag in openTab" :key="tag.code" :label="tag.name" :name="tag.code">
+        <iframe ref="tabMainContent" :src="getFullPath(tag)" class="tab-main-content" name="tab-main-content" frameborder="0" />
+      </el-tab-pane>
+    </el-tabs>
+    <div class="default-page-tip">
+      <div class="default-page-tip-msg">
+        <div class="default-page-tip-item">
+          {{ defaultPageTipCn }}
+        </div>
+        <div class="default-page-tip-item">
+          {{ defaultPageTipEn }}
+        </div>
+      </div>
+    </div>
+  </div>
 </template>
 <style rel="stylesheet/scss" lang="scss" scoped>
 iframe.tab-main-content{
@@ -12,11 +24,24 @@ iframe.tab-main-content{
 }
 </style>
 <script>
+import Vue from 'vue'
 import { mapGetters } from 'vuex'
 export default {
   name: 'TabContent',
   data() {
+    let defaultPageTip = Vue.prototype.defaultPageTip
+    if (!defaultPageTip) {
+      defaultPageTip = '欢迎访问质量管理系统/Welcome to Quality Management System'
+    }
+    let defaultPageTipCn = defaultPageTip
+    let defaultPageTipEn
+    if (defaultPageTip && defaultPageTip.indexOf('/') > 0) {
+      defaultPageTipCn = defaultPageTip.substring(0, defaultPageTip.lastIndexOf('/'))
+      defaultPageTipEn = defaultPageTip.substring(defaultPageTip.lastIndexOf('/') + 1)
+    }
     return {
+      defaultPageTipCn,
+      defaultPageTipEn
     }
   },
   computed: {
@@ -101,4 +126,20 @@ export default {
 .menu-tab-container .el-tabs__content{
   padding: 0;
 }
+.default-page-tip {
+  width: 100%;
+  height: 100%;
+  background: #f7f7f8;
+}
+.default-page-tip-msg {
+  padding-top: 25%;
+  padding-bottom: 30%;
+  font-size: 24px;
+  font-weight: 600;
+  text-align: center;
+  color: gray;
+}
+.default-page-tip-item {
+  padding-top: 10px;
+}
 </style>