agilebuilder-ui 1.0.92 → 1.0.93-temp2

package/src/utils/util.js

@@ -4,7 +4,7 @@ import { getLangByShort } from './common-util'
 
 export function getI18n() {
     let myI18n = window.$i18n
-    if(!myI18n){
+    if (!myI18n) {
         myI18n = i18n
     }
     if (!window.$locale) {
@@ -38,13 +38,7 @@ export function findOptionsByDynamicDataSource(
     searchParam
 ) {
     return new Promise((resolve, reject) => {
-        findDynamicDataSourceByCode(
-            dynamicSourceCode,
-            searchText,
-            entity,
-            additionalParameterStr,
-            searchParam
-        )
+        findDynamicDataSourceByCode(dynamicSourceCode, searchText, entity, additionalParameterStr, searchParam)
             .then((dynamicDataSourceDto) => {
                 let options = []
                 if (dynamicDataSourceDto && dynamicDataSourceDto.options) {
@@ -63,7 +57,7 @@ export function findOptionsByDynamicDataSource(
                         const label = item['_label_']
                         options.push({
                             label,
-                            value,
+                            value
                         })
                     })
                 }
@@ -111,11 +105,10 @@ export function findDynamicDataSourceByCode(
         searchText,
         watchAttrValue,
         parent: parentEntity
-
     }
-    if (additionalParameterStr && typeof (additionalParameterStr) === 'object') {
+    if (additionalParameterStr && typeof additionalParameterStr === 'object') {
         params.additionalParamMap = additionalParameterStr
-    } else if (additionalParameterStr && typeof (additionalParameterStr) === 'string') {
+    } else if (additionalParameterStr && typeof additionalParameterStr === 'string') {
         params.additionalParamMap = JSON.parse(additionalParameterStr)
     }
     if (params.additionalParamMap === undefined) {
@@ -137,23 +130,32 @@ export function findDynamicDataSourceByCode(
 
     return new Promise((resolve, reject) => {
         // 页面设计不请求动态数据源
-        if (window.$vueApp.config.globalProperties.systemCode !== undefined && window.$vueApp.config.globalProperties.systemCode === 'agilebuilder') {
+        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)
-            })
+            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)
+                })
         }
     })
 }
@@ -185,11 +187,7 @@ export function analysisCondition(
     // console.log('analysisCondition判断条件isSql', isSql)
     // console.log('analysisCondition判断条件tableName', tableName)
     // console.log('analysisCondition判断条件parentFormData', parentFormData)
-    if (
-        conditionListJson === undefined ||
-        conditionListJson === '' ||
-        conditionListJson === null
-    ) {
+    if (conditionListJson === undefined || conditionListJson === '' || conditionListJson === null) {
         // 如果条件不存在，则默认返回true
         return true
     }
@@ -199,32 +197,20 @@ export function analysisCondition(
     }
     // 页面附加参数
     let additionalParameterMap = {}
-    if (
-        additionalParameter &&
-        typeof additionalParameter === 'string' &&
-        additionalParameter !== ''
-    ) {
+    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 !== ''
-    ) {
+    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 !== ''
-    ) {
+    if (conditionListJson && typeof conditionListJson === 'string' && conditionListJson !== '') {
         // conditionList = eval('('+conditionListJson+')')
         conditionList = JSON.parse(conditionListJson)
     } else if (conditionListJson && Array.isArray(conditionListJson)) {
@@ -252,11 +238,7 @@ function parseCondition(
     parentFormData,
     pageContext
 ) {
-    if (
-        conditionList === undefined ||
-        conditionList === null ||
-        conditionList.length === 0
-    ) {
+    if (conditionList === undefined || conditionList === null || conditionList.length === 0) {
         // 表示没有设置条件，默认是true
         return true
     }
@@ -282,10 +264,7 @@ function parseCondition(
                 leftValue = getValue(entity, propDbName, isSql)
             }
             if (leftValue === undefined || leftValue === null) {
-                if (
-                    tableName &&
-                    propDbName.toLowerCase().startsWith(tableName.toLowerCase() + '.')
-                ) {
+                if (tableName && propDbName.toLowerCase().startsWith(tableName.toLowerCase() + '.')) {
                     // 表示是当前表的字段
                     const myProp = propDbName.substring(propDbName.indexOf('.'))
                     leftValue = getValue(entity, myProp, isSql)
@@ -311,27 +290,17 @@ function parseCondition(
         // 解析单个条件的值
         // 判断value类型
         let value
-        if(pageContext){
+        if (pageContext) {
             value = getPropValueNew(propValue, pageContext)
         } else {
-            value = getPropValue(
-                propValue,
-                entity,
-                additionalParamMap,
-                contextParameterMap
-            )
+            value = getPropValue(propValue, entity, additionalParamMap, contextParameterMap)
         }
         if (variableIsNullStr && variableIsNullStr === 'null') {
             if (value === undefined || value === '') {
                 value = null
             }
         }
-        let conditionResult = executeExpression(
-            leftValue,
-            operator,
-            value,
-            dataType
-        )
+        let conditionResult = executeExpression(leftValue, operator, value, dataType)
         const leftBracket = condition.leftBracket
         const rightBracket = condition.rightBracket
         let joinSign = condition.joinSign
@@ -459,33 +428,27 @@ function getContextValue(contextParameterMap, propValue) {
  */
 export function getLastNDate(propValue) {
     let value
-    if (propValue &&
-        propValue === 'currentTime') {
+    if (propValue && propValue === 'currentTime') {
         // 当前时间
         value = new Date()
     }
-    if (propValue &&
-        propValue === 'currentWeek') {
+    if (propValue && propValue === 'currentWeek') {
         // 本周
         value = getCurrentWeek()
     }
-    if (propValue &&
-        propValue === 'currentMonth') {
+    if (propValue && propValue === 'currentMonth') {
         // 本月
         value = getCurrentMonth()
     }
-    if (propValue &&
-        propValue === 'currentQuarter') {
+    if (propValue && propValue === 'currentQuarter') {
         // 本季度
         value = getCurrentQuarter()
     }
-    if (propValue &&
-        propValue === 'currentYear') {
+    if (propValue && propValue === 'currentYear') {
         // 本年
         value = getCurrentYear()
     }
-    if (propValue &&
-        propValue.indexOf('lastNDay') >= 0) {
+    if (propValue && propValue.indexOf('lastNDay') >= 0) {
         // 最近n天 lastNDay:n，例如：lastNDay:5，表示最近5天
         const n = propValue.substring(propValue.indexOf(':') + 1)
         value = getLastNDay(parseInt(n))
@@ -495,19 +458,19 @@ export function getLastNDate(propValue) {
 /**
  * 获得当前周的周一和周日的的日期
  * 例如：[2024/2/26 00:00:00,2023/3/3 23:59:59]
- * @returns 
+ * @returns
  */
 function getCurrentWeek() {
     const new_Date = new Date() //获取本周一周日期
-    const timesStamp = new_Date.getTime();
-    const currenDay = new_Date.getDay();
+    const timesStamp = new_Date.getTime()
+    const currenDay = new_Date.getDay()
     // 周一
-    const monday = new Date(timesStamp + 24 * 60 * 60 * 1000 * (0 - (currenDay + 6) % 7))
+    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} 结束`);
+    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]
 }
 /**
@@ -517,107 +480,109 @@ function getCurrentWeek() {
  */
 function getCurrentMonth() {
     // 创建一个新的Date对象，表示当前时间
-    const currentDate = new Date();
+    const currentDate = new Date()
 
     // 获取当前年份和月份
-    const year = currentDate.getFullYear(); // 获取完整的四位年份
-    const month = currentDate.getMonth() + 1; // getMonth返回值范围为0-11，因此加上1得到真正的月份
+    const year = currentDate.getFullYear() // 获取完整的四位年份
+    const month = currentDate.getMonth() + 1 // getMonth返回值范围为0-11，因此加上1得到真正的月份
 
     // 设置起始日期为本月第一天
-    currentDate.setDate(1);
+    currentDate.setDate(1)
 
     // 将起始日期格式化成字符串形式（YYYY-MM-DD）
-    const startDateStr = `${year}/${month < 10 ? '0' : ''}${month}/01`;
+    const startDateStr = `${year}/${month < 10 ? '0' : ''}${month}/01`
 
     // 设置结束日期为下个月第一天的前一天
-    currentDate.setMonth(currentDate.getMonth() + 2);
-    currentDate.setDate(0);
+    currentDate.setMonth(currentDate.getMonth() + 2)
+    currentDate.setDate(0)
 
     // 将结束日期格式化成字符串形式（YYYY-MM-DD）
-    const endDateStr = `${currentDate.getFullYear()}/${currentDate.getMonth() < 9 ? '0' : ''}${(currentDate.getMonth() + 1)}/01`;
+    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} 结束`);
+    const startDate = startDate11.toLocaleDateString() + ' ' + startDate11.toLocaleTimeString()
+    const endDate = endDate11.toLocaleDateString() + ' ' + endDate11.toLocaleTimeString()
+    console.log(`getCurrentMonth从 ${startDate} 开始，到 ${endDate} 结束`)
     return [startDate11, endDate11]
 }
 /**
  * 获得当前季度第1天和最后一天的日期
  * 例如：[2023/1/1 00:00:00,2023/3/31 23:59:59]
- * @returns 
+ * @returns
  */
 function getCurrentQuarter() {
-    const currentDate = new Date();
-    const quarterStartIndex = (currentDate.getMonth() + 3) % 12;
-    let firstDayOfQuarter; // 存放第一天的Date对象
+    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);
+        firstDayOfQuarter = new Date(currentDate.getFullYear(), quarterStartIndex, 1)
     } else {
-        firstDayOfQuarter = new Date(currentDate.getFullYear() + 1, quarterStartIndex, 1);
+        firstDayOfQuarter = new Date(currentDate.getFullYear() + 1, quarterStartIndex, 1)
     }
 
-    let lastDayOfQuarter; // 存放最后一天的Date对象
+    let lastDayOfQuarter // 存放最后一天的Date对象
     if (firstDayOfQuarter.getMonth() === 11) {
-        lastDayOfQuarter = new Date(firstDayOfQuarter.getFullYear() + 1, 0, 0);
+        lastDayOfQuarter = new Date(firstDayOfQuarter.getFullYear() + 1, 0, 0)
     } else {
-        lastDayOfQuarter = new Date(firstDayOfQuarter.getFullYear(), firstDayOfQuarter.getMonth() + 3, 0);
+        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} 结束`);
+    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天和最后一天的日期
  * 例如：[2023/1/1 00:00:00,2023/12/31 23:59:59]
- * @returns 
+ * @returns
  */
 function getCurrentYear() {
     // 创建一个新的日期对象
-    const currentYear = new Date().getFullYear(); // 获取当前年份
+    const currentYear = new Date().getFullYear() // 获取当前年份
 
     // 设置为当前年的1月1号（第一天）
-    let firstDayOfCurrentYear = new Date(currentYear, 0);
-    firstDayOfCurrentYear.setMonth(0, 1); // 将月份设置为0表示1月
+    let firstDayOfCurrentYear = new Date(currentYear, 0)
+    firstDayOfCurrentYear.setMonth(0, 1) // 将月份设置为0表示1月
 
     // 设置为下一年的12月31号（最后一天）
-    let lastDayOfCurrentYear = new Date(currentYear + 1, 0);
+    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} 结束`);
+    const startDate = firstDayOfCurrentYear.toLocaleDateString() + ' ' + firstDayOfCurrentYear.toLocaleTimeString()
+    const endDate = lastDayOfCurrentYear.toLocaleDateString() + ' ' + lastDayOfCurrentYear.toLocaleTimeString()
+    console.log(`getCurrentYear从 ${startDate} 开始，到 ${endDate} 结束`)
     return [firstDayOfCurrentYear, lastDayOfCurrentYear]
 }
 /**
  * 获得最近n天的日期[n天前,当前日期]。
  * 例如：[2024/2/25 00:00:00,2024/2/29 23:59:59]
- * @param {} n 
+ * @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}`;
+    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}`;
+    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]
+    const startDate = lastNDay.toLocaleDateString() + ' ' + lastNDay.toLocaleTimeString()
+    const endDate = currentDate.toLocaleDateString() + ' ' + currentDate.toLocaleTimeString()
+    console.log(`getLastNDay从 ${startDate} 开始，到 ${endDate} 结束`)
+    retur[(lastNDay, currentDate)]
 }
 export function getPropValue(
     propValue,
@@ -628,53 +593,61 @@ export function getPropValue(
     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)
-      }
-      return additionalParamMap
-    }
-  }
-
-  export function 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)
+        }
+        return additionalParamMap
+    }
+}
+
+export function getPropValueNew(propValue, pageContext) {
     let value = null
     if (propValue && propValue !== null && propValue !== '') {
-        const entity = pageContext && pageContext.entity?pageContext.entity.data:null
+        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
+        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('${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}'
-            ) {
+            } else if (propValue.includes('${request.') && propValue !== '${request.term}') {
                 // ${request.term}表示页面中手动输入的值
                 propValue = propValue.replace('${request.', '').replace('}', '')
                 if (
@@ -710,7 +683,7 @@ function getAdditionalParamMap(pageContext){
                 const propName = propValue.replace('${parent.', '').replace('}', '')
                 value = getEntityFieldValue(parentEntity, propName)
             }
-        }else if (propValue.includes('${system.')) {
+        } else if (propValue.includes('${system.')) {
             if (system === undefined || system == null) {
                 value = null
             } else {
@@ -731,7 +704,7 @@ function getAdditionalParamMap(pageContext){
                 const propName = propValue.replace('${subObj.', '').replace('}', '')
                 value = getEntityFieldValue(subEntity, propName)
             }
-        }else if (propValue.includes('${input.') ) {
+        } else if (propValue.includes('${input.')) {
             value = propValue.replace('${input.', '').replace('}', '')
         } else if (propValue.includes('${fixed.')) {
             value = propValue.replace('${fixed.', '').replace('}', '')
@@ -750,13 +723,7 @@ function getAdditionalParamMap(pageContext){
  * @param {*} contextParameter
  * @returns
  */
-export function analysisValue(
-    conditionValue,
-    entity,
-    additionalParameter,
-    contextParameter,
-    pageContext
-) {
+export function analysisValue(conditionValue, entity, additionalParameter, contextParameter, pageContext) {
     if (!conditionValue) {
         return
     }
@@ -765,18 +732,10 @@ export function analysisValue(
     if (split != null && split.length > 0) {
         split.forEach((item) => {
             let value
-            if(pageContext){
-                value = getPropValueNew(
-                    item,
-                    pageContext
-                )
+            if (pageContext) {
+                value = getPropValueNew(item, pageContext)
             } else {
-                value = getPropValue(
-                    item,
-                    entity,
-                    additionalParameter,
-                    contextParameter
-                )
+                value = getPropValue(item, entity, additionalParameter, contextParameter)
             }
             if (!value || value === null) {
                 value = ''
@@ -842,6 +801,9 @@ 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数据库
@@ -918,17 +880,13 @@ export function findSystemInfoByCode(systemCode) {
         }
 
         window.$vueApp.config.globalProperties.$http
-            .get(
-                window.$vueApp.config.globalProperties.baseAPI +
-                '/component/business-systems/' +
-                systemCode
-            )
+            .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,
+                        frontendUrl: system.frontendUrl
                     })
                 } else {
                     resolve('系统:' + systemCode + '不存在')
@@ -947,12 +905,7 @@ export function getPropNameWhenJoinTable(prop, isJoinTable, tableName) {
         if (prop.indexOf('.') > 0) {
             prop = prop.replace('.', replaceDot)
         } else {
-            if (
-                tableName &&
-                tableName !== null &&
-                tableName !== '' &&
-                prop.indexOf(tableName + replaceDot) < 0
-            ) {
+            if (tableName && tableName !== null && tableName !== '' && prop.indexOf(tableName + replaceDot) < 0) {
                 // 如果属性名没有拼接表名才需要拼接
                 prop = tableName + replaceDot + prop
             }
@@ -965,11 +918,7 @@ 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
-        )
-    ) {
+    if (fileName && /\.(jpg|JPG|jpeg|JPEG|png|PNG|gif|GIF|bmp|BMP|psd|PSD|tif|TIF)$/.test(fileName)) {
         return true
     } else {
         return false