cloud-web-corejs 1.0.54-dev.414 → 1.0.54-dev.416

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.414",
+  "version": "1.0.54-dev.416",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/xform/utils/formula-util.js

@@ -200,7 +200,7 @@ export function baseReplaceFieldsAndFunctionsOfFormula(VFR, formulaFieldRef, for
         //是否要考虑字符串值的替换？？
         // resultFormula = resultFormula.replace(mi, fieldRef.currentValue)
         let fieldKeyName = getFieldKeyName(fieldSchema)
-        let value = fieldRef.formModel[fieldKeyName];
+        let value = fieldRef.formModel[fieldKeyName]??null;
         resultFormula = resultFormula.replace(mi, value)
       } else {  //getWidgetRef找不到，则可能是子表单字段
         const subFormNameOfField = VFR.getSubFormNameOfWidget(fieldSchema.options.name)
@@ -208,7 +208,7 @@ export function baseReplaceFieldsAndFunctionsOfFormula(VFR, formulaFieldRef, for
           /* 如果当前计算字段是子表单字段，要判断公式中的子表单字段是否和当前计算字段是否属于同一子表单！！ */
           if(row){
             let fieldKeyName = getFieldKeyName(fieldSchema)
-            let value = row[fieldKeyName];
+            let value = row[fieldKeyName]??null;
             resultFormula = resultFormula.replaceAll(mi, value)
             /*
             let subFormRowId = row._X_ROW_KEY
@@ -225,7 +225,7 @@ export function baseReplaceFieldsAndFunctionsOfFormula(VFR, formulaFieldRef, for
             let subFormRowId = formulaFieldRef.tableParam.row._X_ROW_KEY
             fieldRef = VFR.getWidgetRef(fieldSchema.options.name + '_' + subFormRowId)
             if (!!fieldRef) {
-              let value = fieldRef.currentValue;
+              let value = fieldRef.currentValue??null;
               resultFormula = resultFormula.replaceAll(mi, value)
             } else {
               quitFlag = true
@@ -251,7 +251,8 @@ export function baseReplaceFieldsAndFunctionsOfFormula(VFR, formulaFieldRef, for
           // const subFieldName = fieldSchema.options.name
           const subFieldName = fieldKeyName(fieldSchema)
           subFormValue.forEach((vi, idx) => {
-            allSubFieldValues = (idx === 0) ? vi[subFieldName] : allSubFieldValues + ', ' + vi[subFieldName]
+            let val = vi[subFieldName]??null
+            allSubFieldValues = (idx === 0) ? val : allSubFieldValues + ', ' + val
           })
           resultFormula = resultFormula.replaceAll(mi, allSubFieldValues)
         }

package/src/views/user/wf/wfReport/index.vue

@@ -504,7 +504,7 @@ export default {
         url: `/${this.serviceName}/wf_info/listGroupPage`,
         method: "post",
         data: {
-          type: 0,
+          type: 99,
         },
         success: (res) => {
           this.objTypeList = res?.objx?.records || [];