imatrix-ui 2.7.43 → 2.7.46

package/package.json

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

package/src/i18n/langs/cn.js

@@ -100,8 +100,10 @@ const cn = {
     unExport: '不导出',
     whetherToConfirmReset: '是否确认重置?',
     resetSuccessful: '重置成功',
-    dargColumnOrderMessage: '支持拖动改变列顺序',
-    selectAll: '全选'
+    dragColumnOrderMessage: '支持拖动改变列顺序',
+    selectAll: '全选',
+    viewImage: '查看图片',
+    previewTitleWhenNotImg: '非图片格式，使用其它方式预览'
   },
   // 部门树组件
   departmentTree: {

package/src/i18n/langs/en.js

@@ -99,8 +99,10 @@ const en = {
     unExport: 'Not Export',
     whetherToConfirmReset: 'Are you sure you want to reset?',
     resetSuccessful: 'Reset successfully',
-    dargColumnOrderMessage: 'Supports dragging to change column order',
-    selectAll: 'Select All'
+    dragColumnOrderMessage: 'Supports dragging to change column order',
+    selectAll: 'Select All',
+    viewImage: 'View Image',
+    previewTitleWhenNotImg: 'Non picture format, preview in other ways'
   },
   departmentTree: {
 

package/src/utils/common-util.js

@@ -159,3 +159,19 @@ export function getSystemBackendUrl(backendUrl) {
     return getRelativeBaseUrl(backendUrl)
   }
 }
+/**
+ * 是否是平台系统
+ * @param {*} systemCode
+ * @returns
+ */
+export function isPlateSys(systemCode) {
+  if (systemCode && (systemCode === 'iMatrix' || systemCode === 'portal' ||
+      systemCode === 'mms' || systemCode === 'task' ||
+      systemCode === 'wf' || systemCode === 'dc' ||
+      systemCode === 'mc' || systemCode === 'mobile' ||
+      systemCode === 'acs' || systemCode === 'bs')) {
+    return true
+  } else {
+    return false
+  }
+}

package/src/utils/request.js

@@ -1,11 +1,21 @@
 import axios from 'axios'
-import { Message } from 'element-ui'
-import { getToken, removeToken } from './auth'
+import {
+  Message
+} from 'element-ui'
+import {
+  getToken,
+  removeToken
+} from './auth'
 import store from '../store'
 import checkPermission from './permission'
 import Vue from 'vue'
-import { getI18n } from './util'
-import { getRelativeBaseUrl, getLoginUrl } from './common-util'
+import {
+  getI18n
+} from './util'
+import {
+  getRelativeBaseUrl,
+  getLoginUrl
+} from './common-util'
 // 创建axios实例
 const service = axios.create({
   // baseURL: process.env.VUE_APP_BASE_API, // api 的 base_url
@@ -69,8 +79,8 @@ service.interceptors.response.use(
             window.location.href = loginUrl
           })
         }
-      } else if (error.response.status === 400 || error.response.status === 406 || error.response.status === 404) {
-        // BadRequestException(400) || BusinessException(406)  || ResourceNotFoundException(404)
+      } 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)
         let message = error.message
         if (message) {
           // 说明是原生的错误，不要显示，显示“请联系管理员”

package/src/utils/util.js

@@ -183,7 +183,7 @@ function parseCondition(entity, conditionList, isSql, tableName, additionalParam
       } else {
         leftValue = getValue(entity, propName, isSql)
       }
-      if (leftValue === undefined || leftValue === null) {
+      if (propDbName && (leftValue === undefined || leftValue === null)) {
         leftValue = getValue(entity, propDbName, isSql)
       }
     }