cloud-web-corejs 1.0.54-dev.202 → 1.0.54-dev.204

package/src/components/xform/form-render/indexMixin.js

@@ -1125,25 +1125,67 @@ modules = {
           n && n.setDisabled && n.setHidden(t);
         });
     },
-    findWidgetNameInSubForm: function (e) {
-      let t = [],
-        i = null,
-        n = function (t, n) {
-          t.options && t.options.name === e && (i = n.options.name);
-        };
-      if ((baseRefUtil.traverseFieldWidgets(this.widgetList, n), i)) {
-        let o = this.getWidgetRef(i);
-        if (o) {
-          let a = o.getRowIdData();
-          a
-          && a.length > 0
-          && a.forEach(function (i) {
-            t.push(e + '@row' + i);
-          });
+    findWidgetNameInSubForm(widgetName) {
+      let result = []
+      let subFormName = null
+      Object.keys(this.subFormRefList).forEach(sfName => {
+        const fwHandler = (fw) => {
+          if (fw.options.name === widgetName) {
+            subFormName = sfName
+          }
+        }
+
+        const sfRef = this.subFormRefList[sfName]
+        traverseFieldWidgetsOfContainer(sfRef.widget, fwHandler, true)
+      })
+
+      if (!!subFormName) {
+        let subFormRef = this.getWidgetRef(subFormName)
+        if (!!subFormRef) {
+          if(subFormRef.widget.type == "data-table"){
+            let rows = subFormRef.getValue();
+            if(rows){
+              rows.forEach(row => {
+                result.push( widgetName + '_' + row._X_ROW_KEY)
+              })
+            }
+
+          }else{
+            let rowIds = subFormRef.getRowIdData()
+            if (!!rowIds && (rowIds.length > 0)) {
+              rowIds.forEach(rid => {
+                result.push( widgetName + '@row' + rid)
+              })
+            }
+          }
+
         }
       }
-      return t;
+
+      return result
+    },
+
+    findFieldWidgetById(fieldId, staticWidgetsIncluded) {
+      return getFieldWidgetById(this.formJsonObj.widgetList, fieldId, staticWidgetsIncluded)
     },
+
+    getSubFormNameOfWidget(widgetName) {
+      let result = []
+      let subFormName = null
+      Object.keys(this.subFormRefList).forEach(sfName => {
+        const fwHandler = (fw) => {
+          if (fw.options.name === widgetName) {
+            subFormName = sfName
+          }
+        }
+
+        const sfRef = this.subFormRefList[sfName]
+        traverseFieldWidgetsOfContainer(sfRef.widget, fwHandler)
+      })
+
+      return subFormName
+    },
+
     changeLanguage: function (e) {
       baseRefUtil.changeLocale(e);
     },
@@ -2005,6 +2047,13 @@ modules = {
 
       return foundWidget;
     },
+    copyNewFieldWidget(origin) {
+      let newWidget = deepClone(origin);
+      newWidget.type = (newWidget.targetType || newWidget.type);
+      let tempId = generateId();
+      newWidget.id = newWidget.type.replace(/-/g, '') + tempId;
+      return newWidget
+    },
     doScriptAccess(scriptUuid, callback) {
       if (scriptUuid) {
         let scripts = this.formJson.formConfig.scriptList || [];

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

@@ -2,7 +2,7 @@
 import {evalFn, getFieldWidgetById, traverseFieldWidgetsOfContainer} from "@base/components/xform/utils/util";
 import * as formulajs from '@formulajs/formulajs'
 import {EditorView} from "codemirror"
-import {MatchDecorator,Decoration,ViewPlugin,WidgetType} from "@codemirror/view"
+import {MatchDecorator, Decoration, ViewPlugin, WidgetType} from "@codemirror/view"
 import {translate} from "@base/components/xform/utils/i18n";
 
 class PlaceholderWidget extends WidgetType {
@@ -44,9 +44,9 @@ export const FORMULA_REG_EXP = /\{\{(\w+\.[^.]+\.\w+)}}/g
 const placeholderMatcher = new MatchDecorator({
   regexp: /\{\{(.+?)}}/g,
   decoration: (match) =>
-      Decoration.replace({
-        widget: new PlaceholderWidget(match[1])
-      })
+    Decoration.replace({
+      widget: new PlaceholderWidget(match[1])
+    })
 });
 
 
@@ -93,7 +93,8 @@ export const baseTheme = EditorView.baseTheme({
 });
 
 export function calculateFormula(VFR, DSV, formulaJs, formulaFieldRef, changedFieldRef) {
-  if (!!formulaFieldRef.subFormItemFlag && !!changedFieldRef.subFormItemFlag) {
+  if (formulaFieldRef.tableParam) {
+  } else if (!!formulaFieldRef.subFormItemFlag && !!changedFieldRef.subFormItemFlag) {
     /* 子表单字段变化，只能触发子表单同一行字段的计算公式重新计算！！ */
     if (changedFieldRef.subFormRowId !== formulaFieldRef.subFormRowId) {
       return
@@ -129,7 +130,7 @@ export function calculateFormula(VFR, DSV, formulaJs, formulaFieldRef, changedFi
  * @param formula
  * @param VFR
  */
-export function fieldIsUsedInFormula(fieldName, formula, VFR) {
+export function fieldIsUsedInFormula(fieldName, formula, VFR, fieldTarget) {
   const matchResult = formula.match(FORMULA_REG_EXP)
   if (!matchResult) {
     return false
@@ -138,14 +139,14 @@ export function fieldIsUsedInFormula(fieldName, formula, VFR) {
   let foundResult = false
   matchResult.forEach(mi => {
     const thirdPart = mi.split('.')[2]
-    const nodeType = thirdPart.substring(0, thirdPart.length -2)
+    const nodeType = thirdPart.substring(0, thirdPart.length - 2)
     if (nodeType === 'func') {
       return
     }
 
     const firstPart = mi.split('.')[0]
     const fieldId = firstPart.substring(2, firstPart.length)
-    const fieldSchema = getFieldWidgetById(VFR.formJsonObj.widgetList, fieldId, false)
+    let fieldSchema = getFieldWidgetById(VFR.formJsonObj.widgetList, fieldId, false)
     if (!fieldSchema) {
       console.error('The field used by formula not found: ', fieldId)
       console.error('The formula is: ', formula)
@@ -175,7 +176,7 @@ export function replaceFieldsAndFunctionsOfFormula(VFR, formulaFieldRef) {
   let quitFlag = false
   matchResult.forEach(mi => {
     const thirdPart = mi.split('.')[2]
-    const nodeType = thirdPart.substring(0, thirdPart.length -2)
+    const nodeType = thirdPart.substring(0, thirdPart.length - 2)
     if (nodeType === 'func') {
       const funcName = mi.split('.')[1]
       resultFormula = resultFormula.replace(mi, funcName)
@@ -192,9 +193,20 @@ export function replaceFieldsAndFunctionsOfFormula(VFR, formulaFieldRef) {
         resultFormula = resultFormula.replace(mi, fieldRef.getValue())
       } else {  //getWidgetRef找不到，则可能是子表单字段
         const subFormNameOfField = VFR.getSubFormNameOfWidget(fieldSchema.options.name)
-        if (!!formulaFieldRef.subFormItemFlag) {
+        if (!!formulaFieldRef.subFormItemFlag || formulaFieldRef.tableParam) {
           /* 如果当前计算字段是子表单字段，要判断公式中的子表单字段是否和当前计算字段是否属于同一子表单！！ */
-          if (subFormNameOfField === formulaFieldRef.subFormName) {
+
+
+          if (subFormNameOfField === formulaFieldRef?.parentWidget?.options?.name) {
+            let subFormRowId = formulaFieldRef.tableParam.row._X_ROW_KEY
+            fieldRef = VFR.getWidgetRef(fieldSchema.options.name + '_' + subFormRowId)
+            if (!!fieldRef) {
+              resultFormula = resultFormula.replaceAll(mi, fieldRef.getValue())
+            } else {
+              quitFlag = true
+              console.error('Field not found: ' + fieldSchema.options.label)
+            }
+          } else if (subFormNameOfField === formulaFieldRef.subFormName) {
             fieldRef = VFR.getWidgetRef(fieldSchema.options.name + '@row' + formulaFieldRef.subFormRowId)
             if (!!fieldRef) {
               resultFormula = resultFormula.replaceAll(mi, fieldRef.getValue())
@@ -206,10 +218,12 @@ export function replaceFieldsAndFunctionsOfFormula(VFR, formulaFieldRef) {
             console.error('Invalid formula!')
           }
         } else {
+          debugger
           /* 在主表单字段的计算公式中使用子表单字段，应将子表单所有记录同字段的值代入！！ */
           const subFormValue = VFR.formDataModel[subFormNameOfField]
           let allSubFieldValues = ''
-          const subFieldName = fieldSchema.options.name
+          // const subFieldName = fieldSchema.options.name
+          const subFieldName = fieldKeyName(fieldSchema)
           subFormValue.forEach((vi, idx) => {
             allSubFieldValues = (idx === 0) ? vi[subFieldName] : allSubFieldValues + ', ' + vi[subFieldName]
           })
@@ -222,6 +236,13 @@ export function replaceFieldsAndFunctionsOfFormula(VFR, formulaFieldRef) {
   return quitFlag ? null : resultFormula
 }
 
+function fieldKeyName(widget) {
+  let o = widget.options.name;
+  return (
+    (widget.options.keyNameEnabled && widget.options.keyName) || o
+  );
+}
+
 /**
  * 获取字段值
  */