imatrix-ui 2.7.31 → 2.7.32

package/package.json

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

package/src/utils/util.js

@@ -1,6 +1,8 @@
 import i18n from '../i18n/i18n'
 import Vue from 'vue'
-import { executeExpression } from './calculator/calculator-util'
+import {
+  executeExpression
+} from './calculator/calculator-util'
 export function getI18n() {
   if (!window.$locale) {
     i18n.locale = 'cn'
@@ -43,7 +45,10 @@ export function findOptionsByDynamicDataSource(dynamicSourceCode, searchText, en
           const value = item[valueAttribute]
           // 显示的标签
           const label = item['_label_']
-          options.push({ label, value })
+          options.push({
+            label,
+            value
+          })
         })
       }
       if (!options) {
@@ -235,6 +240,7 @@ function parseCondition(entity, conditionList, isSql, tableName, additionalParam
   return eval('(' + conditions + ')')
 }
 const REPLACE_DOT = '__'
+
 function getValue(entityData, fieldName, isSql) {
   let value = null
   if (entityData && entityData !== null) {
@@ -285,12 +291,12 @@ function getSubEntityValue(entityData, fieldName) {
 }
 
 /**
-* 获得关联表字段的值。
-* 处理sql 或 实体情况。
-* @param subEntityData
-* @param fieldName
-* @return
-*/
+ * 获得关联表字段的值。
+ * 处理sql 或 实体情况。
+ * @param subEntityData
+ * @param fieldName
+ * @return
+ */
 function getSubEntityFieldValue(subEntityData, fieldName) {
   if (subEntityData === undefined || subEntityData === null) {
     return null
@@ -383,19 +389,35 @@ export function setEntityFieldValue(entity, prop, value) {
   }
 }
 
+/**
+ * 获得字段的值，不需要处理大小写转换
+ * @param {*} entity
+ * @param {*} prop
+ * @returns
+ */
+export function getEntityFieldValueWithOutCase(entity, prop) {
+  if (prop && prop.indexOf('.') > 0) {
+    const parentOjbect = getParentObjectUtil(prop, entity)
+    const modelName = prop.substring(prop.lastIndexOf('.') + 1)
+    return parentOjbect[modelName]
+  } else {
+    return entity[prop]
+  }
+}
+
 /**
  * 获得实体entity中某属性的值，处理子表对象的情况
  * @param {*} entity
  * @param {*} prop
  * @returns
  */
-export function getEntityFieldValue(entity, prop) {
+export function getEntityFieldValue(entity, prop, isLowerCase) {
   let value = getEntityFieldValueWithCase(entity, prop)
   if (value === undefined) {
     // 兼容mysql数据库
     value = getEntityFieldValueWithCase(entity, prop.toLowerCase())
   }
-  if (value === undefined) {
+  if (value === undefined && isLowerCase === undefined) {
     // 兼容oracle数据库
     value = getEntityFieldValueWithCase(entity, prop.toUpperCase())
   }
@@ -466,7 +488,11 @@ export function findSystemInfoByCode(systemCode) {
 
     Vue.prototype.$http.get(Vue.prototype.baseAPI + '/component/business-systems/' + systemCode).then(system => {
       if (system) {
-        resolve({ zh_CN: system.name, en_US: system.enName, frontendUrl: system.frontendUrl })
+        resolve({
+          zh_CN: system.name,
+          en_US: system.enName,
+          frontendUrl: system.frontendUrl
+        })
       } else {
         resolve('系统:' + systemCode + '不存在')
       }