agilebuilder-ui 1.1.35-sit3 → 1.1.35

package/src/utils/util.js

@@ -3,24 +3,24 @@ import { executeExpression } from './calculator/calculator-util'
 import { getLangByShort } from './common-util'
 
 export function getI18n() {
-  let myI18n = window.$i18n
-  if (!myI18n) {
-    myI18n = i18n
-  }
-  if (!window.$locale) {
-    i18n.locale = 'cn'
-  } else {
-    i18n.locale = window.$locale
-  }
-  return myI18n.global
+    let myI18n = window.$i18n
+    if (!myI18n) {
+        myI18n = i18n
+    }
+    if (!window.$locale) {
+        i18n.locale = 'cn'
+    } else {
+        i18n.locale = window.$locale
+    }
+    return myI18n.global
 }
 
 export function getLanguageWithLocale() {
-  let currentLocale = window.$locale
-  if (!currentLocale || currentLocale === 'zh') {
-    currentLocale = 'cn'
-  }
-  return getLangByShort(currentLocale)
+    let currentLocale = window.$locale
+    if (!currentLocale || currentLocale === 'zh') {
+        currentLocale = 'cn'
+    }
+    return getLangByShort(currentLocale)
 }
 
 /**
@@ -31,45 +31,45 @@ export function getLanguageWithLocale() {
  * @returns
  */
 export function findOptionsByDynamicDataSource(
-  dynamicSourceCode,
-  searchText,
-  entity,
-  additionalParameterStr,
-  searchParam
+    dynamicSourceCode,
+    searchText,
+    entity,
+    additionalParameterStr,
+    searchParam
 ) {
-  return new Promise((resolve, reject) => {
-    findDynamicDataSourceByCode(dynamicSourceCode, searchText, entity, additionalParameterStr, searchParam)
-      .then((dynamicDataSourceDto) => {
-        let options = []
-        if (dynamicDataSourceDto && dynamicDataSourceDto.options) {
-          const setOptions = dynamicDataSourceDto.options
-          let valueAttribute
-          if (dynamicDataSourceDto.valueAttribute) {
-            valueAttribute = dynamicDataSourceDto.valueAttribute
-          }
-          if (!valueAttribute || valueAttribute === '[label]') {
-            valueAttribute = '_label_'
-          }
-          setOptions.forEach((item) => {
-            // 值
-            const value = item[valueAttribute]
-            // 显示的标签
-            const label = item['_label_']
-            options.push({
-              label,
-              value
+    return new Promise((resolve, reject) => {
+        findDynamicDataSourceByCode(dynamicSourceCode, searchText, entity, additionalParameterStr, searchParam)
+            .then((dynamicDataSourceDto) => {
+                let options = []
+                if (dynamicDataSourceDto && dynamicDataSourceDto.options) {
+                    const setOptions = dynamicDataSourceDto.options
+                    let valueAttribute
+                    if (dynamicDataSourceDto.valueAttribute) {
+                        valueAttribute = dynamicDataSourceDto.valueAttribute
+                    }
+                    if (!valueAttribute || valueAttribute === '[label]') {
+                        valueAttribute = '_label_'
+                    }
+                    setOptions.forEach((item) => {
+                        // 值
+                        const value = item[valueAttribute]
+                        // 显示的标签
+                        const label = item['_label_']
+                        options.push({
+                            label,
+                            value
+                        })
+                    })
+                }
+                if (!options) {
+                    options = []
+                }
+                resolve(options)
             })
-          })
-        }
-        if (!options) {
-          options = []
-        }
-        resolve(options)
-      })
-      .catch((error) => {
-        reject(error)
-      })
-  })
+            .catch((error) => {
+                reject(error)
+            })
+    })
 }
 
 /**
@@ -80,84 +80,84 @@ export function findOptionsByDynamicDataSource(
  * @returns
  */
 export function findDynamicDataSourceByCode(
-  dynamicSourceCode,
-  searchText,
-  entity,
-  additionalParameterStr,
-  searchParam
-) {
-  let watchAttrValue
-  let parentEntity
-  let listCode
-  let formCode
-  let tableName
-  if (searchParam) {
-    watchAttrValue = searchParam.watchAttrValue
-    if (watchAttrValue === undefined || watchAttrValue === null) {
-      watchAttrValue = ''
-    }
-    parentEntity = searchParam.parent
-    listCode = searchParam._listCode
-    formCode = searchParam._formCode
-    tableName = searchParam._tableName
-  }
-  const params = {
+    dynamicSourceCode,
     searchText,
-    watchAttrValue,
-    parent: parentEntity
-  }
-  if (additionalParameterStr && typeof additionalParameterStr === 'object') {
-    params.additionalParamMap = additionalParameterStr
-  } else if (additionalParameterStr && typeof additionalParameterStr === 'string') {
-    params.additionalParamMap = JSON.parse(additionalParameterStr)
-  }
-  if (params.additionalParamMap === undefined) {
-    params.additionalParamMap = {}
-  }
-  if (listCode) {
-    params.additionalParamMap._listCode = listCode
-  }
-  if (formCode) {
-    params.additionalParamMap._formCode = formCode
-  }
-  if (tableName) {
-    params.additionalParamMap._tableName = tableName
-  }
-  if (entity && entity !== null) {
-    params.entity = entity
-  }
-  const backendUrl = window.$vueApp.config.globalProperties.baseURL
-
-  return new Promise((resolve, reject) => {
-    // 页面设计不请求动态数据源
-    if (
-      window.$vueApp.config.globalProperties.systemCode !== undefined &&
-      window.$vueApp.config.globalProperties.systemCode === 'agilebuilder'
-    ) {
-      resolve()
-    } else {
-      window.$vueApp.config.globalProperties.$http
-        .post(backendUrl + '/common/dynamic-data-source/' + dynamicSourceCode, params)
-        .then((result) => {
-          if (result.backendUrl) {
-            // result.backendUrl表示需要使用动态数据源所属的系统路径重新获得一次数据
-            window.$vueApp.config.globalProperties.$http
-              .post(result.backendUrl + '/common/dynamic-data-source/' + dynamicSourceCode, params)
-              .then((finallyResult) => {
-                resolve(finallyResult)
-              })
-              .catch((error) => {
-                reject(error)
-              })
-          } else {
-            resolve(result)
-          }
-        })
-        .catch((error) => {
-          reject(error)
-        })
+    entity,
+    additionalParameterStr,
+    searchParam
+) {
+    let watchAttrValue
+    let parentEntity
+    let listCode
+    let formCode
+    let tableName
+    if (searchParam) {
+        watchAttrValue = searchParam.watchAttrValue
+        if (watchAttrValue === undefined || watchAttrValue === null) {
+            watchAttrValue = ''
+        }
+        parentEntity = searchParam.parent
+        listCode = searchParam._listCode
+        formCode = searchParam._formCode
+        tableName = searchParam._tableName
     }
-  })
+    const params = {
+        searchText,
+        watchAttrValue,
+        parent: parentEntity
+    }
+    if (additionalParameterStr && typeof additionalParameterStr === 'object') {
+        params.additionalParamMap = additionalParameterStr
+    } else if (additionalParameterStr && typeof additionalParameterStr === 'string') {
+        params.additionalParamMap = JSON.parse(additionalParameterStr)
+    }
+    if (params.additionalParamMap === undefined) {
+        params.additionalParamMap = {}
+    }
+    if (listCode) {
+        params.additionalParamMap._listCode = listCode
+    }
+    if (formCode) {
+        params.additionalParamMap._formCode = formCode
+    }
+    if (tableName) {
+        params.additionalParamMap._tableName = tableName
+    }
+    if (entity && entity !== null) {
+        params.entity = entity
+    }
+    const backendUrl = window.$vueApp.config.globalProperties.baseURL
+
+    return new Promise((resolve, reject) => {
+        // 页面设计不请求动态数据源
+        if (
+            window.$vueApp.config.globalProperties.systemCode !== undefined &&
+            window.$vueApp.config.globalProperties.systemCode === 'agilebuilder'
+        ) {
+            resolve()
+        } else {
+            window.$vueApp.config.globalProperties.$http
+                .post(backendUrl + '/common/dynamic-data-source/' + dynamicSourceCode, params)
+                .then((result) => {
+                    if (result.backendUrl) {
+                        // result.backendUrl表示需要使用动态数据源所属的系统路径重新获得一次数据
+                        window.$vueApp.config.globalProperties.$http
+                            .post(result.backendUrl + '/common/dynamic-data-source/' + dynamicSourceCode, params)
+                            .then((finallyResult) => {
+                                resolve(finallyResult)
+                            })
+                            .catch((error) => {
+                                reject(error)
+                            })
+                    } else {
+                        resolve(result)
+                    }
+                })
+                .catch((error) => {
+                    reject(error)
+                })
+        }
+    })
 }
 
 /**
@@ -171,233 +171,233 @@ export function findDynamicDataSourceByCode(
  * @returns
  */
 export function analysisCondition(
-  conditionListJson,
-  entity,
-  additionalParameter,
-  contextParameter,
-  isSql,
-  tableName,
-  parentFormData,
-  pageContext
-) {
-  // console.log('analysisCondition判断条件conditionListJson', conditionListJson)
-  // console.log('analysisCondition判断条件entity', entity)
-  // console.log('analysisCondition判断条件additionalParameter', additionalParameter)
-  // console.log('analysisCondition判断条件contextParameter', contextParameter)
-  // console.log('analysisCondition判断条件isSql', isSql)
-  // console.log('analysisCondition判断条件tableName', tableName)
-  // console.log('analysisCondition判断条件parentFormData', parentFormData)
-  if (conditionListJson === undefined || conditionListJson === '' || conditionListJson === null) {
-    // 如果条件不存在，则默认返回true
-    return true
-  }
-  if (typeof isSql === 'undefined' || isSql === null) {
-    // 默认是定制开发时
-    isSql = false
-  }
-  // 页面附加参数
-  let additionalParameterMap = {}
-  if (additionalParameter && typeof additionalParameter === 'string' && additionalParameter !== '') {
-    additionalParameterMap = JSON.parse(additionalParameter)
-  } else if (additionalParameter && typeof additionalParameter === 'object') {
-    additionalParameterMap = additionalParameter
-  }
-  // 环境变量，例如：当前用户id、当前用户登录名等
-  let contextParameterMap = {}
-  if (contextParameter && typeof contextParameter === 'string' && contextParameter !== '') {
-    contextParameterMap = JSON.parse(contextParameter)
-  } else if (contextParameter && typeof contextParameter === 'object') {
-    contextParameterMap = contextParameter
-  }
-  let conditionList = []
-  if (conditionListJson && typeof conditionListJson === 'string' && conditionListJson !== '') {
-    // conditionList = eval('('+conditionListJson+')')
-    conditionList = JSON.parse(conditionListJson)
-  } else if (conditionListJson && Array.isArray(conditionListJson)) {
-    conditionList = conditionListJson
-  }
-  return parseCondition(
+    conditionListJson,
     entity,
-    conditionList,
+    additionalParameter,
+    contextParameter,
     isSql,
     tableName,
-    additionalParameterMap,
-    contextParameterMap,
     parentFormData,
     pageContext
-  )
+) {
+    // console.log('analysisCondition判断条件conditionListJson', conditionListJson)
+    // console.log('analysisCondition判断条件entity', entity)
+    // console.log('analysisCondition判断条件additionalParameter', additionalParameter)
+    // console.log('analysisCondition判断条件contextParameter', contextParameter)
+    // console.log('analysisCondition判断条件isSql', isSql)
+    // console.log('analysisCondition判断条件tableName', tableName)
+    // console.log('analysisCondition判断条件parentFormData', parentFormData)
+    if (conditionListJson === undefined || conditionListJson === '' || conditionListJson === null) {
+        // 如果条件不存在，则默认返回true
+        return true
+    }
+    if (typeof isSql === 'undefined' || isSql === null) {
+        // 默认是定制开发时
+        isSql = false
+    }
+    // 页面附加参数
+    let additionalParameterMap = {}
+    if (additionalParameter && typeof additionalParameter === 'string' && additionalParameter !== '') {
+        additionalParameterMap = JSON.parse(additionalParameter)
+    } else if (additionalParameter && typeof additionalParameter === 'object') {
+        additionalParameterMap = additionalParameter
+    }
+    // 环境变量，例如：当前用户id、当前用户登录名等
+    let contextParameterMap = {}
+    if (contextParameter && typeof contextParameter === 'string' && contextParameter !== '') {
+        contextParameterMap = JSON.parse(contextParameter)
+    } else if (contextParameter && typeof contextParameter === 'object') {
+        contextParameterMap = contextParameter
+    }
+    let conditionList = []
+    if (conditionListJson && typeof conditionListJson === 'string' && conditionListJson !== '') {
+        // conditionList = eval('('+conditionListJson+')')
+        conditionList = JSON.parse(conditionListJson)
+    } else if (conditionListJson && Array.isArray(conditionListJson)) {
+        conditionList = conditionListJson
+    }
+    return parseCondition(
+        entity,
+        conditionList,
+        isSql,
+        tableName,
+        additionalParameterMap,
+        contextParameterMap,
+        parentFormData,
+        pageContext
+    )
 }
 
 function parseCondition(
-  entity,
-  conditionList,
-  isSql,
-  tableName,
-  additionalParamMap,
-  contextParameterMap,
-  parentFormData,
-  pageContext
+    entity,
+    conditionList,
+    isSql,
+    tableName,
+    additionalParamMap,
+    contextParameterMap,
+    parentFormData,
+    pageContext
 ) {
-  if (conditionList === undefined || conditionList === null || conditionList.length === 0) {
-    // 表示没有设置条件，默认是true
-    return true
-  }
-  // 条件封装的表达式
-  let conditions = ''
-  for (let i = 0; i < conditionList.length; i++) {
-    const condition = conditionList[i]
-    let propName = condition.propName
-    let propDbName = condition.propDbName
-    if ((!propName || propName === '') && (!propDbName || propDbName === '')) {
-      // 没有属性和字段名表示是无效的条件
-      continue
-    }
-    let leftValue
-    if (isSql && propDbName) {
-      if (propDbName.indexOf('parent_+_') !== -1) {
-        propDbName = propDbName.replace('parent_+_', '')
-        // 再获取属于那张表
-        const propDbNameArr = propDbName.split('_+_')
-        propDbName = propDbNameArr[1]
-        leftValue = getValue(parentFormData, propDbName, isSql)
-      } else {
-        leftValue = getValue(entity, propDbName, isSql)
-      }
-      if (leftValue === undefined || leftValue === null) {
-        if (tableName && propDbName.toLowerCase().startsWith(tableName.toLowerCase() + '.')) {
-          // 表示是当前表的字段
-          const myProp = propDbName.substring(propDbName.indexOf('.'))
-          leftValue = getValue(entity, myProp, isSql)
+    if (conditionList === undefined || conditionList === null || conditionList.length === 0) {
+        // 表示没有设置条件，默认是true
+        return true
+    }
+    // 条件封装的表达式
+    let conditions = ''
+    for (let i = 0; i < conditionList.length; i++) {
+        const condition = conditionList[i]
+        let propName = condition.propName
+        let propDbName = condition.propDbName
+        if ((!propName || propName === '') && (!propDbName || propDbName === '')) {
+            // 没有属性和字段名表示是无效的条件
+            continue
         }
-      }
-    } else {
-      if (propName.indexOf('parent_+_') !== -1) {
-        propName = propName.replace('parent_+_', '')
-        const propNameArr = propName.split('_+_')
-        propName = propNameArr[1]
-        leftValue = getValue(parentFormData, propName, isSql)
-      } else {
-        leftValue = getValue(entity, propName, isSql)
-      }
-      if (propDbName && (leftValue === undefined || leftValue === null)) {
-        leftValue = getValue(entity, propDbName, isSql)
-      }
-    }
-    const operator = condition.operator
-    const propValue = condition.propValue
-    const dataType = condition.dataType
-    const variableIsNullStr = condition.variableIsNull
-    // 解析单个条件的值
-    // 判断value类型
-    let value
-    if (pageContext) {
-      value = getPropValueNew(propValue, pageContext)
-    } else {
-      value = getPropValue(propValue, entity, additionalParamMap, contextParameterMap)
-    }
-    if (variableIsNullStr && variableIsNullStr === 'null') {
-      if (value === undefined || value === '') {
-        value = null
-      }
-    }
-    let conditionResult = executeExpression(leftValue, operator, value, dataType)
-    const leftBracket = condition.leftBracket
-    const rightBracket = condition.rightBracket
-    let joinSign = condition.joinSign
-    if (leftBracket && leftBracket !== null && leftBracket !== '') {
-      conditions = conditions + leftBracket
-      conditions = conditions + ' '
-      // conditions.append(leftBracket).append(' ')
-    }
-    if (variableIsNullStr && variableIsNullStr !== 'null') {
-      if (value === undefined || value === null || value + '' === '') {
-        if (variableIsNullStr === '1=1') {
-          conditionResult = true
+        let leftValue
+        if (isSql && propDbName) {
+            if (propDbName.indexOf('parent_+_') !== -1) {
+                propDbName = propDbName.replace('parent_+_', '')
+                // 再获取属于那张表
+                const propDbNameArr = propDbName.split('_+_')
+                propDbName = propDbNameArr[1]
+                leftValue = getValue(parentFormData, propDbName, isSql)
+            } else {
+                leftValue = getValue(entity, propDbName, isSql)
+            }
+            if (leftValue === undefined || leftValue === null) {
+                if (tableName && propDbName.toLowerCase().startsWith(tableName.toLowerCase() + '.')) {
+                    // 表示是当前表的字段
+                    const myProp = propDbName.substring(propDbName.indexOf('.'))
+                    leftValue = getValue(entity, myProp, isSql)
+                }
+            }
         } else {
-          conditionResult = false
+            if (propName.indexOf('parent_+_') !== -1) {
+                propName = propName.replace('parent_+_', '')
+                const propNameArr = propName.split('_+_')
+                propName = propNameArr[1]
+                leftValue = getValue(parentFormData, propName, isSql)
+            } else {
+                leftValue = getValue(entity, propName, isSql)
+            }
+            if (propDbName && (leftValue === undefined || leftValue === null)) {
+                leftValue = getValue(entity, propDbName, isSql)
+            }
         }
-      }
-    }
-    conditions += conditionResult + ' '
-    if (rightBracket && rightBracket !== null && rightBracket !== '') {
-      conditions = conditions + rightBracket
-      conditions = conditions + ' '
-      // conditions.append(rightBracket).append(' ')
-    }
-    if (i < conditionList.length - 1) {
-      // 最后一个不拼接“连接符”
-      if (joinSign && joinSign !== null && joinSign !== '') {
-        const joinSignIgnoreCase = joinSign.toLowerCase()
-        if (joinSignIgnoreCase === 'and') {
-          joinSign = joinSignIgnoreCase.replace('and', '&&')
-        } else if (joinSignIgnoreCase === 'or') {
-          joinSign = joinSignIgnoreCase.replace('or', '||')
+        const operator = condition.operator
+        const propValue = condition.propValue
+        const dataType = condition.dataType
+        const variableIsNullStr = condition.variableIsNull
+        // 解析单个条件的值
+        // 判断value类型
+        let value
+        if (pageContext) {
+            value = getPropValueNew(propValue, pageContext)
+        } else {
+            value = getPropValue(propValue, entity, additionalParamMap, contextParameterMap)
         }
-        conditions += joinSign + ' '
-      }
-    }
-  }
-  console.log('parseCondition----conditions=', conditions)
-  if (conditions) {
-    // eslint-disable-next-line no-eval
-    return eval('(' + conditions + ')')
-  } else {
-    return true
-  }
+        if (variableIsNullStr && variableIsNullStr === 'null') {
+            if (value === undefined || value === '') {
+                value = null
+            }
+        }
+        let conditionResult = executeExpression(leftValue, operator, value, dataType)
+        const leftBracket = condition.leftBracket
+        const rightBracket = condition.rightBracket
+        let joinSign = condition.joinSign
+        if (leftBracket && leftBracket !== null && leftBracket !== '') {
+            conditions = conditions + leftBracket
+            conditions = conditions + ' '
+            // conditions.append(leftBracket).append(' ')
+        }
+        if (variableIsNullStr && variableIsNullStr !== 'null') {
+            if (value === undefined || value === null || value + '' === '') {
+                if (variableIsNullStr === '1=1') {
+                    conditionResult = true
+                } else {
+                    conditionResult = false
+                }
+            }
+        }
+        conditions += conditionResult + ' '
+        if (rightBracket && rightBracket !== null && rightBracket !== '') {
+            conditions = conditions + rightBracket
+            conditions = conditions + ' '
+            // conditions.append(rightBracket).append(' ')
+        }
+        if (i < conditionList.length - 1) {
+            // 最后一个不拼接“连接符”
+            if (joinSign && joinSign !== null && joinSign !== '') {
+                const joinSignIgnoreCase = joinSign.toLowerCase()
+                if (joinSignIgnoreCase === 'and') {
+                    joinSign = joinSignIgnoreCase.replace('and', '&&')
+                } else if (joinSignIgnoreCase === 'or') {
+                    joinSign = joinSignIgnoreCase.replace('or', '||')
+                }
+                conditions += joinSign + ' '
+            }
+        }
+    }
+    console.log('parseCondition----conditions=', conditions)
+    if (conditions) {
+        // eslint-disable-next-line no-eval
+        return eval('(' + conditions + ')')
+    } else {
+        return true
+    }
 }
 
 const REPLACE_DOT = '__'
 
 function getValue(entityData, fieldName, isSql) {
-  let value = null
-  if (entityData && entityData !== null) {
-    if (fieldName && fieldName !== null) {
-      value = getValueByField(entityData, fieldName)
-      if (value === undefined || value === null) {
-        if (isSql) {
-          if (value === undefined || value == null) {
-            if (fieldName.indexOf('.') > 0) {
-              // 将“.”替换为'__',列表组件中的entity中如果是'.'，传过来的实体信息中的字段属性会是“__”
-              fieldName = fieldName.replace('.', REPLACE_DOT)
-              value = getValueByField(entityData, fieldName)
+    let value = null
+    if (entityData && entityData !== null) {
+        if (fieldName && fieldName !== null) {
+            value = getValueByField(entityData, fieldName)
+            if (value === undefined || value === null) {
+                if (isSql) {
+                    if (value === undefined || value == null) {
+                        if (fieldName.indexOf('.') > 0) {
+                            // 将“.”替换为'__',列表组件中的entity中如果是'.'，传过来的实体信息中的字段属性会是“__”
+                            fieldName = fieldName.replace('.', REPLACE_DOT)
+                            value = getValueByField(entityData, fieldName)
+                        }
+                    }
+                }
             }
-          }
         }
-      }
     }
-  }
-  return value
+    return value
 }
 
 export function getValueByField(entityData, fieldName) {
-  if (entityData && entityData !== null) {
-    let value
-    if (fieldName.indexOf('.') > 0) {
-      // 表示是子表字段
-      value = getSubEntityValue(entityData, fieldName)
-    } else {
-      value = entityData[fieldName.toUpperCase()]
-      if (value === undefined) {
-        value = entityData[fieldName.toLowerCase()]
-      }
+    if (entityData && entityData !== null) {
+        let value
+        if (fieldName.indexOf('.') > 0) {
+            // 表示是子表字段
+            value = getSubEntityValue(entityData, fieldName)
+        } else {
+            value = entityData[fieldName.toUpperCase()]
+            if (value === undefined) {
+                value = entityData[fieldName.toLowerCase()]
+            }
+        }
+        return value
     }
-    return value
-  }
 }
 
 function getSubEntityValue(entityData, fieldName) {
-  let value = null
-  let subEntityData = entityData
-  const fieldNames = fieldName.split('\\.')
-  for (let i = 0; i < fieldNames.length; i++) {
-    const field = fieldNames[i]
-    if (i === fieldNames.length) {
-      value = getSubEntityFieldValue(subEntityData, field)
-    } else {
-      subEntityData = getSubEntityFieldValue(subEntityData, field)
+    let value = null
+    let subEntityData = entityData
+    const fieldNames = fieldName.split('\\.')
+    for (let i = 0; i < fieldNames.length; i++) {
+        const field = fieldNames[i]
+        if (i === fieldNames.length) {
+            value = getSubEntityFieldValue(subEntityData, field)
+        } else {
+            subEntityData = getSubEntityFieldValue(subEntityData, field)
+        }
     }
-  }
-  return value
+    return value
 }
 
 /**
@@ -408,18 +408,18 @@ function getSubEntityValue(entityData, fieldName) {
  * @return
  */
 function getSubEntityFieldValue(subEntityData, fieldName) {
-  if (subEntityData === undefined || subEntityData === null) {
-    return null
-  }
-  return subEntityData[fieldName]
+    if (subEntityData === undefined || subEntityData === null) {
+        return null
+    }
+    return subEntityData[fieldName]
 }
 
 function getContextValue(contextParameterMap, propValue) {
-  let value = getLastNDate(propValue)
-  if (contextParameterMap) {
-    value = contextParameterMap[propValue]
-  }
-  return value
+    let value = getLastNDate(propValue)
+    if (contextParameterMap) {
+        value = contextParameterMap[propValue]
+    }
+    return value
 }
 /**
  * 获得最近n天的开始日期和结束日期集合
@@ -427,33 +427,33 @@ function getContextValue(contextParameterMap, propValue) {
  * @returns [startDate,endDate]，例如：[2024/2/26 00:00:00,2023/3/3 23:59:59]
  */
 export function getLastNDate(propValue) {
-  let value
-  if (propValue && propValue === 'currentTime') {
-    // 当前时间
-    value = new Date()
-  }
-  if (propValue && propValue === 'currentWeek') {
-    // 本周
-    value = getCurrentWeek()
-  }
-  if (propValue && propValue === 'currentMonth') {
-    // 本月
-    value = getCurrentMonth()
-  }
-  if (propValue && propValue === 'currentQuarter') {
-    // 本季度
-    value = getCurrentQuarter()
-  }
-  if (propValue && propValue === 'currentYear') {
-    // 本年
-    value = getCurrentYear()
-  }
-  if (propValue && propValue.indexOf('lastNDay') >= 0) {
-    // 最近n天 lastNDay:n，例如：lastNDay:5，表示最近5天
-    const n = propValue.substring(propValue.indexOf(':') + 1)
-    value = getLastNDay(parseInt(n))
-  }
-  return value
+    let value
+    if (propValue && propValue === 'currentTime') {
+        // 当前时间
+        value = new Date()
+    }
+    if (propValue && propValue === 'currentWeek') {
+        // 本周
+        value = getCurrentWeek()
+    }
+    if (propValue && propValue === 'currentMonth') {
+        // 本月
+        value = getCurrentMonth()
+    }
+    if (propValue && propValue === 'currentQuarter') {
+        // 本季度
+        value = getCurrentQuarter()
+    }
+    if (propValue && propValue === 'currentYear') {
+        // 本年
+        value = getCurrentYear()
+    }
+    if (propValue && propValue.indexOf('lastNDay') >= 0) {
+        // 最近n天 lastNDay:n，例如：lastNDay:5，表示最近5天
+        const n = propValue.substring(propValue.indexOf(':') + 1)
+        value = getLastNDay(parseInt(n))
+    }
+    return value
 }
 /**
  * 获得当前周的周一和周日的的日期
@@ -461,17 +461,17 @@ export function getLastNDate(propValue) {
  * @returns
  */
 function getCurrentWeek() {
-  const new_Date = new Date() //获取本周一周日期
-  const timesStamp = new_Date.getTime()
-  const currenDay = new_Date.getDay()
-  // 周一
-  const monday = new Date(timesStamp + 24 * 60 * 60 * 1000 * (0 - ((currenDay + 6) % 7)))
-  // 周日
-  const sunday = new Date(timesStamp + 24 * 60 * 60 * 1000 * (6 - ((currenDay + 6) % 7)))
-  const startDate = monday.toLocaleDateString() + ' ' + monday.toLocaleTimeString()
-  const endDate = sunday.toLocaleDateString() + ' ' + sunday.toLocaleTimeString()
-  console.log(`getCurrentMonth从 ${startDate} 开始，到 ${endDate} 结束`)
-  return [monday, sunday]
+    const new_Date = new Date() //获取本周一周日期
+    const timesStamp = new_Date.getTime()
+    const currenDay = new_Date.getDay()
+    // 周一
+    const monday = new Date(timesStamp + 24 * 60 * 60 * 1000 * (0 - ((currenDay + 6) % 7)))
+    // 周日
+    const sunday = new Date(timesStamp + 24 * 60 * 60 * 1000 * (6 - ((currenDay + 6) % 7)))
+    const startDate = monday.toLocaleDateString() + ' ' + monday.toLocaleTimeString()
+    const endDate = sunday.toLocaleDateString() + ' ' + sunday.toLocaleTimeString()
+    console.log(`getCurrentMonth从 ${startDate} 开始，到 ${endDate} 结束`)
+    return [monday, sunday]
 }
 /**
  *  获得当前月第1天和最后1天的日期
@@ -479,33 +479,33 @@ function getCurrentWeek() {
  * @returns [xxx,xxx]
  */
 function getCurrentMonth() {
-  // 创建一个新的Date对象，表示当前时间
-  const currentDate = new Date()
-
-  // 获取当前年份和月份
-  const year = currentDate.getFullYear() // 获取完整的四位年份
-  const month = currentDate.getMonth() + 1 // getMonth返回值范围为0-11，因此加上1得到真正的月份
-
-  // 设置起始日期为本月第一天
-  currentDate.setDate(1)
-
-  // 将起始日期格式化成字符串形式（YYYY-MM-DD）
-  const startDateStr = `${year}/${month < 10 ? '0' : ''}${month}/01`
-
-  // 设置结束日期为下个月第一天的前一天
-  currentDate.setMonth(currentDate.getMonth() + 2)
-  currentDate.setDate(0)
-
-  // 将结束日期格式化成字符串形式（YYYY-MM-DD）
-  const endDateStr = `${currentDate.getFullYear()}/${currentDate.getMonth() < 9 ? '0' : ''}${
-    currentDate.getMonth() + 1
-  }/01`
-  const startDate11 = new Date(Date.parse(startDateStr))
-  const endDate11 = new Date(new Date(Date.parse(endDateStr)).getTime() - 1000)
-  const startDate = startDate11.toLocaleDateString() + ' ' + startDate11.toLocaleTimeString()
-  const endDate = endDate11.toLocaleDateString() + ' ' + endDate11.toLocaleTimeString()
-  console.log(`getCurrentMonth从 ${startDate} 开始，到 ${endDate} 结束`)
-  return [startDate11, endDate11]
+    // 创建一个新的Date对象，表示当前时间
+    const currentDate = new Date()
+
+    // 获取当前年份和月份
+    const year = currentDate.getFullYear() // 获取完整的四位年份
+    const month = currentDate.getMonth() + 1 // getMonth返回值范围为0-11，因此加上1得到真正的月份
+
+    // 设置起始日期为本月第一天
+    currentDate.setDate(1)
+
+    // 将起始日期格式化成字符串形式（YYYY-MM-DD）
+    const startDateStr = `${year}/${month < 10 ? '0' : ''}${month}/01`
+
+    // 设置结束日期为下个月第一天的前一天
+    currentDate.setMonth(currentDate.getMonth() + 2)
+    currentDate.setDate(0)
+
+    // 将结束日期格式化成字符串形式（YYYY-MM-DD）
+    const endDateStr = `${currentDate.getFullYear()}/${currentDate.getMonth() < 9 ? '0' : ''}${
+        currentDate.getMonth() + 1
+    }/01`
+    const startDate11 = new Date(Date.parse(startDateStr))
+    const endDate11 = new Date(new Date(Date.parse(endDateStr)).getTime() - 1000)
+    const startDate = startDate11.toLocaleDateString() + ' ' + startDate11.toLocaleTimeString()
+    const endDate = endDate11.toLocaleDateString() + ' ' + endDate11.toLocaleTimeString()
+    console.log(`getCurrentMonth从 ${startDate} 开始，到 ${endDate} 结束`)
+    return [startDate11, endDate11]
 }
 /**
  * 获得当前季度第1天和最后一天的日期
@@ -513,26 +513,26 @@ function getCurrentMonth() {
  * @returns
  */
 function getCurrentQuarter() {
-  const currentDate = new Date()
-  const quarterStartIndex = (currentDate.getMonth() + 3) % 12
-  let firstDayOfQuarter // 存放第一天的Date对象
-  if (currentDate.getMonth() < quarterStartIndex + 2) {
-    firstDayOfQuarter = new Date(currentDate.getFullYear(), quarterStartIndex, 1)
-  } else {
-    firstDayOfQuarter = new Date(currentDate.getFullYear() + 1, quarterStartIndex, 1)
-  }
-
-  let lastDayOfQuarter // 存放最后一天的Date对象
-  if (firstDayOfQuarter.getMonth() === 11) {
-    lastDayOfQuarter = new Date(firstDayOfQuarter.getFullYear() + 1, 0, 0)
-  } else {
-    lastDayOfQuarter = new Date(firstDayOfQuarter.getFullYear(), firstDayOfQuarter.getMonth() + 3, 0)
-  }
-  lastDayOfQuarter = new Date(lastDayOfQuarter.getTime() + 24 * 60 * 60 * 1000 - 1000)
-  const startDate = firstDayOfQuarter.toLocaleDateString() + ' ' + firstDayOfQuarter.toLocaleTimeString()
-  const endDate = lastDayOfQuarter.toLocaleDateString() + ' ' + lastDayOfQuarter.toLocaleTimeString()
-  console.log(`getCurrentQuarter从 ${startDate} 开始，到 ${endDate} 结束`)
-  return [firstDayOfQuarter, lastDayOfQuarter]
+    const currentDate = new Date()
+    const quarterStartIndex = (currentDate.getMonth() + 3) % 12
+    let firstDayOfQuarter // 存放第一天的Date对象
+    if (currentDate.getMonth() < quarterStartIndex + 2) {
+        firstDayOfQuarter = new Date(currentDate.getFullYear(), quarterStartIndex, 1)
+    } else {
+        firstDayOfQuarter = new Date(currentDate.getFullYear() + 1, quarterStartIndex, 1)
+    }
+
+    let lastDayOfQuarter // 存放最后一天的Date对象
+    if (firstDayOfQuarter.getMonth() === 11) {
+        lastDayOfQuarter = new Date(firstDayOfQuarter.getFullYear() + 1, 0, 0)
+    } else {
+        lastDayOfQuarter = new Date(firstDayOfQuarter.getFullYear(), firstDayOfQuarter.getMonth() + 3, 0)
+    }
+    lastDayOfQuarter = new Date(lastDayOfQuarter.getTime() + 24 * 60 * 60 * 1000 - 1000)
+    const startDate = firstDayOfQuarter.toLocaleDateString() + ' ' + firstDayOfQuarter.toLocaleTimeString()
+    const endDate = lastDayOfQuarter.toLocaleDateString() + ' ' + lastDayOfQuarter.toLocaleTimeString()
+    console.log(`getCurrentQuarter从 ${startDate} 开始，到 ${endDate} 结束`)
+    return [firstDayOfQuarter, lastDayOfQuarter]
 }
 /**
  * 获得本年的第1天和最后一天的日期
@@ -540,21 +540,21 @@ function getCurrentQuarter() {
  * @returns
  */
 function getCurrentYear() {
-  // 创建一个新的日期对象
-  const currentYear = new Date().getFullYear() // 获取当前年份
-
-  // 设置为当前年的1月1号（第一天）
-  let firstDayOfCurrentYear = new Date(currentYear, 0)
-  firstDayOfCurrentYear.setMonth(0, 1) // 将月份设置为0表示1月
-
-  // 设置为下一年的12月31号（最后一天）
-  let lastDayOfCurrentYear = new Date(currentYear + 1, 0)
-  lastDayOfCurrentYear = lastDayOfCurrentYear.getTime() - 1000
-  lastDayOfCurrentYear = new Date(lastDayOfCurrentYear)
-  const startDate = firstDayOfCurrentYear.toLocaleDateString() + ' ' + firstDayOfCurrentYear.toLocaleTimeString()
-  const endDate = lastDayOfCurrentYear.toLocaleDateString() + ' ' + lastDayOfCurrentYear.toLocaleTimeString()
-  console.log(`getCurrentYear从 ${startDate} 开始，到 ${endDate} 结束`)
-  return [firstDayOfCurrentYear, lastDayOfCurrentYear]
+    // 创建一个新的日期对象
+    const currentYear = new Date().getFullYear() // 获取当前年份
+
+    // 设置为当前年的1月1号（第一天）
+    let firstDayOfCurrentYear = new Date(currentYear, 0)
+    firstDayOfCurrentYear.setMonth(0, 1) // 将月份设置为0表示1月
+
+    // 设置为下一年的12月31号（最后一天）
+    let lastDayOfCurrentYear = new Date(currentYear + 1, 0)
+    lastDayOfCurrentYear = lastDayOfCurrentYear.getTime() - 1000
+    lastDayOfCurrentYear = new Date(lastDayOfCurrentYear)
+    const startDate = firstDayOfCurrentYear.toLocaleDateString() + ' ' + firstDayOfCurrentYear.toLocaleTimeString()
+    const endDate = lastDayOfCurrentYear.toLocaleDateString() + ' ' + lastDayOfCurrentYear.toLocaleTimeString()
+    console.log(`getCurrentYear从 ${startDate} 开始，到 ${endDate} 结束`)
+    return [firstDayOfCurrentYear, lastDayOfCurrentYear]
 }
 /**
  * 获得最近n天的日期[n天前,当前日期]。
@@ -562,163 +562,157 @@ function getCurrentYear() {
  * @param {} n
  */
 function getLastNDay(n) {
-  let currentDate = new Date() // 创建一个表示今天的Date对象
-  let year = currentDate.getFullYear() // 获取完整的四位年份
-  let month = currentDate.getMonth() + 1 // getMonth返回值范围为0-11，因此加上1得到真正的月份
-  let date = currentDate.getDate() // getMonth返回值范围为0-11，因此加上1得到真正的月份
-  let startDateStr = `${year}/${month < 10 ? '0' : ''}${month}/${date}`
-  currentDate = new Date(Date.parse(startDateStr))
-  currentDate.setDate(currentDate.getDate() + 1)
-  currentDate = new Date(currentDate.getTime() - 1000)
-
-  let lastNDay = new Date() // 创建一个表示今天的Date对象
-  lastNDay.setDate(lastNDay.getDate() - (n - 1))
-  const lastNYear = lastNDay.getFullYear() // 获取完整的四位年份
-  const lastNMonth = lastNDay.getMonth() + 1 // getMonth返回值范围为0-11，因此加上1得到真正的月份
-  const lastNDate = lastNDay.getDate() // getMonth返回值范围为0-11，因此加上1得到真正的月份
-  const endtDateStr = `${lastNYear}/${lastNMonth < 10 ? '0' : ''}${lastNMonth}/${lastNDate}`
-  lastNDay = new Date(Date.parse(endtDateStr))
-
-  const startDate = lastNDay.toLocaleDateString() + ' ' + lastNDay.toLocaleTimeString()
-  const endDate = currentDate.toLocaleDateString() + ' ' + currentDate.toLocaleTimeString()
-  console.log(`getLastNDay从 ${startDate} 开始，到 ${endDate} 结束`)
-  retur[(lastNDay, currentDate)]
+    let currentDate = new Date() // 创建一个表示今天的Date对象
+    let year = currentDate.getFullYear() // 获取完整的四位年份
+    let month = currentDate.getMonth() + 1 // getMonth返回值范围为0-11，因此加上1得到真正的月份
+    let date = currentDate.getDate() // getMonth返回值范围为0-11，因此加上1得到真正的月份
+    let startDateStr = `${year}/${month < 10 ? '0' : ''}${month}/${date}`
+    currentDate = new Date(Date.parse(startDateStr))
+    currentDate.setDate(currentDate.getDate() + 1)
+    currentDate = new Date(currentDate.getTime() - 1000)
+
+    let lastNDay = new Date() // 创建一个表示今天的Date对象
+    lastNDay.setDate(lastNDay.getDate() - (n - 1))
+    const lastNYear = lastNDay.getFullYear() // 获取完整的四位年份
+    const lastNMonth = lastNDay.getMonth() + 1 // getMonth返回值范围为0-11，因此加上1得到真正的月份
+    const lastNDate = lastNDay.getDate() // getMonth返回值范围为0-11，因此加上1得到真正的月份
+    const endtDateStr = `${lastNYear}/${lastNMonth < 10 ? '0' : ''}${lastNMonth}/${lastNDate}`
+    lastNDay = new Date(Date.parse(endtDateStr))
+
+    const startDate = lastNDay.toLocaleDateString() + ' ' + lastNDay.toLocaleTimeString()
+    const endDate = currentDate.toLocaleDateString() + ' ' + currentDate.toLocaleTimeString()
+    console.log(`getLastNDay从 ${startDate} 开始，到 ${endDate} 结束`)
+    retur[(lastNDay, currentDate)]
 }
 export function getPropValue(
-  propValue,
-  entity,
-  additionalParamMap,
-  contextParameterMap,
-  parentEntity,
-  subEntity,
-  task
+    propValue,
+    entity,
+    additionalParamMap,
+    contextParameterMap,
+    parentEntity,
+    subEntity,
+    task
 ) {
-  const pageContext = {
-    entity: {
-      data: entity,
-      context: contextParameterMap,
-      request: additionalParamMap,
-      parent: parentEntity,
-      row: subEntity,
-      task: task
-    }
-  }
-  return getPropValueNew(propValue, pageContext)
+    const pageContext = {
+        entity: {
+            data: entity,
+            context: contextParameterMap,
+            request: additionalParamMap,
+            parent: parentEntity,
+            row: subEntity,
+            task: task
+        }
+    }
+    return getPropValueNew(propValue, pageContext)
 }
 
 function getAdditionalParamMap(pageContext) {
-  if (pageContext && pageContext.entity) {
-    let additionalParamMap = pageContext.entity.page
-    if (!additionalParamMap) {
-      additionalParamMap = {}
-    }
-    const requestMap = pageContext.entity.request
-    if (requestMap) {
-      Object.assign(additionalParamMap, requestMap)
+    if (pageContext && pageContext.entity) {
+        let additionalParamMap = pageContext.entity.page
+        if (!additionalParamMap) {
+            additionalParamMap = {}
+        }
+        const requestMap = pageContext.entity.request
+        if (requestMap) {
+            Object.assign(additionalParamMap, requestMap)
+        }
+        return additionalParamMap
     }
-    return additionalParamMap
-  }
 }
 
-export function getPropValueNew(propValue, pageContext, row) {
-  let value = null
-  if (propValue && propValue !== null && propValue !== '') {
-    const entity = pageContext && pageContext.entity ? pageContext.entity.data : null
-    const additionalParamMap = getAdditionalParamMap(pageContext)
-    const contextParameterMap = pageContext && pageContext.entity ? pageContext.entity.context : null
-    const parentEntity =
-      pageContext && pageContext.entity
-        ? pageContext.entity.parent
-          ? pageContext.entity.parent
-          : pageContext.entity.data
-        : null
-    const subEntity = pageContext && pageContext.entity ? pageContext.entity.row : null
-    const task = pageContext && pageContext.entity ? pageContext.entity.task : null
-    const system = pageContext && pageContext.entity ? pageContext.entity.system : null
-    if (propValue === 'null') {
-      value = null
-    } else if (propValue.startsWith('${row.')) {
-      // 处理表格行数据 ${row.fieldName}
-      if (row) {
-        const propName = propValue.replace('${row.', '').replace('}', '')
-        value = getEntityFieldValue(row, propName)
-      }
-    } else if (
-      propValue.includes('${context.') ||
-      propValue.includes('${request.') ||
-      propValue.includes('${obj.') ||
-      propValue.includes('${data.')
-    ) {
-      // 填写的固定值
-      if (propValue.includes('${context.')) {
-        propValue = propValue.replace('${context.', '').replace('}', '')
-        value = getContextValue(contextParameterMap, propValue)
-      } else if (propValue.includes('${request.') && propValue !== '${request.term}') {
-        // ${request.term}表示页面中手动输入的值
-        propValue = propValue.replace('${request.', '').replace('}', '')
-        if (
-          additionalParamMap &&
-          additionalParamMap != null &&
-          Object.keys(additionalParamMap).indexOf(propValue) >= 0 &&
-          additionalParamMap[propValue] &&
-          additionalParamMap[propValue] !== null
+export function getPropValueNew(propValue, pageContext) {
+    let value = null
+    if (propValue && propValue !== null && propValue !== '') {
+        const entity = pageContext && pageContext.entity ? pageContext.entity.data : null
+        const additionalParamMap = getAdditionalParamMap(pageContext)
+        const contextParameterMap = pageContext && pageContext.entity ? pageContext.entity.context : null
+        const parentEntity =
+            pageContext && pageContext.entity
+                ? pageContext.entity.parent
+                    ? pageContext.entity.parent
+                    : pageContext.entity.data
+                : null
+        const subEntity = pageContext && pageContext.entity ? pageContext.entity.row : null
+        const task = pageContext && pageContext.entity ? pageContext.entity.task : null
+        const system = pageContext && pageContext.entity ? pageContext.entity.system : null
+        if (propValue === 'null') {
+            value = null
+        } else if (
+            propValue.includes('${context.') ||
+            propValue.includes('${request.') ||
+            propValue.includes('${obj.') ||
+            propValue.includes('${data.')
         ) {
-          value = additionalParamMap[propValue]
-        } else {
-          value = null
-        }
-      } else if (propValue.includes('${obj.')) {
-        if (entity === undefined || entity == null) {
-          value = null
-        } else {
-          const propName = propValue.replace('${obj.', '').replace('}', '')
-          value = getEntityFieldValue(entity, propName)
-        }
-      } else if (propValue.includes('${data.')) {
-        if (entity === undefined || entity == null) {
-          value = null
+            // 填写的固定值
+            if (propValue.includes('${context.')) {
+                propValue = propValue.replace('${context.', '').replace('}', '')
+                value = getContextValue(contextParameterMap, propValue)
+            } else if (propValue.includes('${request.') && propValue !== '${request.term}') {
+                // ${request.term}表示页面中手动输入的值
+                propValue = propValue.replace('${request.', '').replace('}', '')
+                if (
+                    additionalParamMap &&
+                    additionalParamMap != null &&
+                    Object.keys(additionalParamMap).indexOf(propValue) >= 0 &&
+                    additionalParamMap[propValue] &&
+                    additionalParamMap[propValue] !== null
+                ) {
+                    value = additionalParamMap[propValue]
+                } else {
+                    value = null
+                }
+            } else if (propValue.includes('${obj.')) {
+                if (entity === undefined || entity == null) {
+                    value = null
+                } else {
+                    const propName = propValue.replace('${obj.', '').replace('}', '')
+                    value = getEntityFieldValue(entity, propName)
+                }
+            } else if (propValue.includes('${data.')) {
+                if (entity === undefined || entity == null) {
+                    value = null
+                } else {
+                    const propName = propValue.replace('${data.', '').replace('}', '')
+                    value = getEntityFieldValue(entity, propName)
+                }
+            }
+        } else if (propValue.includes('${parent.')) {
+            if (parentEntity === undefined || parentEntity == null) {
+                value = null
+            } else {
+                const propName = propValue.replace('${parent.', '').replace('}', '')
+                value = getEntityFieldValue(parentEntity, propName)
+            }
+        } else if (propValue.includes('${system.')) {
+            if (system === undefined || system == null) {
+                value = null
+            } else {
+                const propName = propValue.replace('${system.', '').replace('}', '')
+                value = getEntityFieldValue(system, propName)
+            }
+        } else if (propValue.includes('${task.')) {
+            if (task === undefined || task == null) {
+                value = null
+            } else {
+                const propName = propValue.replace('${task.', '').replace('}', '')
+                value = getEntityFieldValue(task, propName)
+            }
+        } else if (propValue.includes('${subObj.')) {
+            if (subEntity === undefined || subEntity == null) {
+                value = null
+            } else {
+                const propName = propValue.replace('${subObj.', '').replace('}', '')
+                value = getEntityFieldValue(subEntity, propName)
+            }
+        } else if (propValue.includes('${input.')) {
+            value = propValue.replace('${input.', '').replace('}', '')
+        } else if (propValue.includes('${fixed.')) {
+            value = propValue.replace('${fixed.', '').replace('}', '')
         } else {
-          const propName = propValue.replace('${data.', '').replace('}', '')
-          value = getEntityFieldValue(entity, propName)
+            value = propValue
         }
-      }
-    } else if (propValue.includes('${parent.')) {
-      if (parentEntity === undefined || parentEntity == null) {
-        value = null
-      } else {
-        const propName = propValue.replace('${parent.', '').replace('}', '')
-        value = getEntityFieldValue(parentEntity, propName)
-      }
-    } else if (propValue.includes('${system.')) {
-      if (system === undefined || system == null) {
-        value = null
-      } else {
-        const propName = propValue.replace('${system.', '').replace('}', '')
-        value = getEntityFieldValue(system, propName)
-      }
-    } else if (propValue.includes('${task.')) {
-      if (task === undefined || task == null) {
-        value = null
-      } else {
-        const propName = propValue.replace('${task.', '').replace('}', '')
-        value = getEntityFieldValue(task, propName)
-      }
-    } else if (propValue.includes('${subObj.')) {
-      if (subEntity === undefined || subEntity == null) {
-        value = null
-      } else {
-        const propName = propValue.replace('${subObj.', '').replace('}', '')
-        value = getEntityFieldValue(subEntity, propName)
-      }
-    } else if (propValue.includes('${input.')) {
-      value = propValue.replace('${input.', '').replace('}', '')
-    } else if (propValue.includes('${fixed.')) {
-      value = propValue.replace('${fixed.', '').replace('}', '')
-    } else {
-      value = propValue
     }
-  }
-  return value
+    return value
 }
 
 /**
@@ -730,26 +724,26 @@ export function getPropValueNew(propValue, pageContext, row) {
  * @returns
  */
 export function analysisValue(conditionValue, entity, additionalParameter, contextParameter, pageContext) {
-  if (!conditionValue) {
-    return
-  }
-  let label = ''
-  const split = conditionValue.split('-#-#')
-  if (split != null && split.length > 0) {
-    split.forEach((item) => {
-      let value
-      if (pageContext) {
-        value = getPropValueNew(item, pageContext, entity)
-      } else {
-        value = getPropValue(item, entity, additionalParameter, contextParameter)
-      }
-      if (!value || value === null) {
-        value = ''
-      }
-      label += value
-    })
-  }
-  return label
+    if (!conditionValue) {
+        return
+    }
+    let label = ''
+    const split = conditionValue.split('-#-#')
+    if (split != null && split.length > 0) {
+        split.forEach((item) => {
+            let value
+            if (pageContext) {
+                value = getPropValueNew(item, pageContext)
+            } else {
+                value = getPropValue(item, entity, additionalParameter, contextParameter)
+            }
+            if (!value || value === null) {
+                value = ''
+            }
+            label += value
+        })
+    }
+    return label
 }
 
 /**
@@ -759,29 +753,29 @@ export function analysisValue(conditionValue, entity, additionalParameter, conte
  * @param {*} value
  */
 export function setEntityFieldValue(entity, prop, value) {
-  if (prop && entity) {
-    if (prop && prop.indexOf('.') > 0) {
-      const parentObj = getParentObjectUtil(prop, entity)
-      if (parentObj) {
-        const subProp = prop.substring(prop.lastIndexOf('.') + 1)
-        if (parentObj[subProp] === undefined) {
-          // 动态对象属性赋值，防止属性不存在，导致属性无法赋值问题
-          parentObj[prop.substring(prop.lastIndexOf('.') + 1)] = value
+    if (prop && entity) {
+        if (prop && prop.indexOf('.') > 0) {
+            const parentObj = getParentObjectUtil(prop, entity)
+            if (parentObj) {
+                const subProp = prop.substring(prop.lastIndexOf('.') + 1)
+                if (parentObj[subProp] === undefined) {
+                    // 动态对象属性赋值，防止属性不存在，导致属性无法赋值问题
+                    parentObj[prop.substring(prop.lastIndexOf('.') + 1)] = value
+                } else {
+                    // 静态对象属性赋值，提高性能
+                    parentObj[subProp] = value
+                }
+            }
         } else {
-          // 静态对象属性赋值，提高性能
-          parentObj[subProp] = value
+            if (entity[prop] === undefined || entity[prop] === null) {
+                // 动态对象属性赋值，防止属性不存在，导致属性无法赋值问题
+                entity[prop] = value
+            } else {
+                // 静态对象属性赋值，提高性能
+                entity[prop] = value
+            }
         }
-      }
-    } else {
-      if (entity[prop] === undefined || entity[prop] === null) {
-        // 动态对象属性赋值，防止属性不存在，导致属性无法赋值问题
-        entity[prop] = value
-      } else {
-        // 静态对象属性赋值，提高性能
-        entity[prop] = value
-      }
-    }
-  }
+    }
 }
 
 /**
@@ -791,13 +785,13 @@ export function setEntityFieldValue(entity, prop, value) {
  * @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]
-  }
+    if (prop && prop.indexOf('.') > 0) {
+        const parentOjbect = getParentObjectUtil(prop, entity)
+        const modelName = prop.substring(prop.lastIndexOf('.') + 1)
+        return parentOjbect[modelName]
+    } else {
+        return entity[prop]
+    }
 }
 
 /**
@@ -807,71 +801,71 @@ export function getEntityFieldValueWithOutCase(entity, prop) {
  * @returns
  */
 export function getEntityFieldValue(entity, prop, isLowerCase) {
-  if (!prop) {
-    return null
-  }
-  let value = getEntityFieldValueWithCase(entity, prop)
-  if (value === undefined || value === null) {
-    // 兼容mysql数据库
-    value = getEntityFieldValueWithCase(entity, prop.toLowerCase())
-  }
-  if (value === undefined || (value === null && isLowerCase === undefined)) {
-    // 兼容oracle数据库
-    value = getEntityFieldValueWithCase(entity, prop.toUpperCase())
-  }
-  return value
+    if (!prop) {
+        return null
+    }
+    let value = getEntityFieldValueWithCase(entity, prop)
+    if (value === undefined || value === null) {
+        // 兼容mysql数据库
+        value = getEntityFieldValueWithCase(entity, prop.toLowerCase())
+    }
+    if (value === undefined || (value === null && isLowerCase === undefined)) {
+        // 兼容oracle数据库
+        value = getEntityFieldValueWithCase(entity, prop.toUpperCase())
+    }
+    return value
 }
 
 function getEntityFieldValueWithCase(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]
-  }
+    if (prop && prop.indexOf('.') > 0) {
+        const parentOjbect = getParentObjectUtil(prop, entity)
+        const modelName = prop.substring(prop.lastIndexOf('.') + 1)
+        return parentOjbect[modelName]
+    } else {
+        return entity[prop]
+    }
 }
 
 export function getParentObjectUtil(prop, entity) {
-  const nestedProp = prop.split('.')
-  // 属性只有一个时父对象就是models
-  if (nestedProp.length === 1) {
-    return entity
-  } else {
-    let parentObject
-    // 属性超过2个时先找到最后一层属性的父对象
-    for (let i = 0; i < nestedProp.length - 1; i++) {
-      if (i === 0) {
-        parentObject = getParentModelProp(nestedProp[i], entity)
-      } else {
-        parentObject = getParentModelProp(nestedProp[i], parentObject)
-      }
-    }
-    return parentObject
-  }
+    const nestedProp = prop.split('.')
+    // 属性只有一个时父对象就是models
+    if (nestedProp.length === 1) {
+        return entity
+    } else {
+        let parentObject
+        // 属性超过2个时先找到最后一层属性的父对象
+        for (let i = 0; i < nestedProp.length - 1; i++) {
+            if (i === 0) {
+                parentObject = getParentModelProp(nestedProp[i], entity)
+            } else {
+                parentObject = getParentModelProp(nestedProp[i], parentObject)
+            }
+        }
+        return parentObject
+    }
 }
 
 function getParentModelProp(prop, parentObj) {
-  let myPparentObject = getParentModelPropWithCase(prop, parentObj)
-  if (myPparentObject === undefined) {
-    // 兼容mysql数据库
-    myPparentObject = getParentModelPropWithCase(prop.toLowerCase(), parentObj)
-  }
-  if (myPparentObject === undefined) {
-    // 兼容oracle数据库
-    myPparentObject = getParentModelPropWithCase(prop.toUpperCase(), parentObj)
-  }
-  return myPparentObject
+    let myPparentObject = getParentModelPropWithCase(prop, parentObj)
+    if (myPparentObject === undefined) {
+        // 兼容mysql数据库
+        myPparentObject = getParentModelPropWithCase(prop.toLowerCase(), parentObj)
+    }
+    if (myPparentObject === undefined) {
+        // 兼容oracle数据库
+        myPparentObject = getParentModelPropWithCase(prop.toUpperCase(), parentObj)
+    }
+    return myPparentObject
 }
 
 function getParentModelPropWithCase(prop, parentObj) {
-  if (!parentObj) {
-    parentObj = {}
-  }
-  if (!parentObj[prop] && !parentObj[prop.toUpperCase()]) {
-    parentObj[prop] = {}
-  }
-  return parentObj[prop]
+    if (!parentObj) {
+        parentObj = {}
+    }
+    if (!parentObj[prop] && !parentObj[prop.toUpperCase()]) {
+        parentObj[prop] = {}
+    }
+    return parentObj[prop]
 }
 
 /**
@@ -880,53 +874,53 @@ function getParentModelPropWithCase(prop, parentObj) {
  * @returns
  */
 export function findSystemInfoByCode(systemCode) {
-  return new Promise((resolve, reject) => {
-    if (!systemCode) {
-      systemCode = window.$vueApp.config.globalProperties.systemCode
-    }
-
-    window.$vueApp.config.globalProperties.$http
-      .get(window.$vueApp.config.globalProperties.baseAPI + '/component/business-systems/' + systemCode)
-      .then((system) => {
-        if (system) {
-          resolve({
-            zh_CN: system.name,
-            en_US: system.enName,
-            frontendUrl: system.frontendUrl
-          })
-        } else {
-          resolve('系统:' + systemCode + '不存在')
+    return new Promise((resolve, reject) => {
+        if (!systemCode) {
+            systemCode = window.$vueApp.config.globalProperties.systemCode
         }
-      })
-      .catch((error) => {
-        reject(error)
-      })
-  })
+
+        window.$vueApp.config.globalProperties.$http
+            .get(window.$vueApp.config.globalProperties.baseAPI + '/component/business-systems/' + systemCode)
+            .then((system) => {
+                if (system) {
+                    resolve({
+                        zh_CN: system.name,
+                        en_US: system.enName,
+                        frontendUrl: system.frontendUrl
+                    })
+                } else {
+                    resolve('系统:' + systemCode + '不存在')
+                }
+            })
+            .catch((error) => {
+                reject(error)
+            })
+    })
 }
 
 export function getPropNameWhenJoinTable(prop, isJoinTable, tableName) {
-  if (prop && isJoinTable !== undefined && isJoinTable === true) {
-    // 关联表时将点改成下划线，如果没点，则表示是主表字段，拼接主表tableName，因为列表组件中是这样处理的
-    const replaceDot = '__'
-    if (prop.indexOf('.') > 0) {
-      prop = prop.replace('.', replaceDot)
-    } else {
-      if (tableName && tableName !== null && tableName !== '' && prop.indexOf(tableName + replaceDot) < 0) {
-        // 如果属性名没有拼接表名才需要拼接
-        prop = tableName + replaceDot + prop
-      }
+    if (prop && isJoinTable !== undefined && isJoinTable === true) {
+        // 关联表时将点改成下划线，如果没点，则表示是主表字段，拼接主表tableName，因为列表组件中是这样处理的
+        const replaceDot = '__'
+        if (prop.indexOf('.') > 0) {
+            prop = prop.replace('.', replaceDot)
+        } else {
+            if (tableName && tableName !== null && tableName !== '' && prop.indexOf(tableName + replaceDot) < 0) {
+                // 如果属性名没有拼接表名才需要拼接
+                prop = tableName + replaceDot + prop
+            }
+        }
     }
-  }
-  return prop
+    return prop
 }
 
 export function isImage(fileName) {
-  // const fileType = fileName.substring(fileName.lastIndexOf('.'), fileName.length).toLowerCase()
-  // const imageTypes = ['.jpg', '.JPG', '.png', '.bmp', '.BMP', '.jpeg', '.gif', '.psd', '.tif', '.tga', '.svg', '.eps']
-  // const index = imageTypes.indexOf(fileType)
-  if (fileName && /\.(jpg|JPG|jpeg|JPEG|png|PNG|gif|GIF|bmp|BMP|psd|PSD|tif|TIF)$/.test(fileName)) {
-    return true
-  } else {
-    return false
-  }
+    // const fileType = fileName.substring(fileName.lastIndexOf('.'), fileName.length).toLowerCase()
+    // const imageTypes = ['.jpg', '.JPG', '.png', '.bmp', '.BMP', '.jpeg', '.gif', '.psd', '.tif', '.tga', '.svg', '.eps']
+    // const index = imageTypes.indexOf(fileType)
+    if (fileName && /\.(jpg|JPG|jpeg|JPEG|png|PNG|gif|GIF|bmp|BMP|psd|PSD|tif|TIF)$/.test(fileName)) {
+        return true
+    } else {
+        return false
+    }
 }