cloud-web-corejs 1.0.54-dev.390 → 1.0.54-dev.392

package/package.json

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

package/src/components/xform/form-designer/form-widget/dialog/baseFormulaDialog.vue

@@ -62,6 +62,7 @@
                 :data="fieldTreeData"
                 :filter-node-method="filterNode"
                 @node-click="insertField"
+                default-expand-all
               >
                 <template #default="{ node, data }">
                   <span class="custom-tree-node">
@@ -292,15 +293,6 @@ export default {
     handleTableConfigData(widget, callback) {
       callback(widget);
     },
-    initFields() {
-      let option = this.option;
-      let formCode = option.formCode;
-      if (formCode) {
-        this.getReportTemplate(formCode, () => {
-          this.loadFieldListToTree();
-        });
-      }
-    },
     initHandleFields() {
       let option = this.option;
       let formWidgetNames = option.formWidgetNames || [];
@@ -353,11 +345,11 @@ export default {
         }
       });
     },
-    async getReportTemplate(formCode, callback) {
+    getReportTemplate(formCode, callback) {
       let url, data;
       url = USER_PREFIX + `/formTemplate/getByFormCode`;
       data = { stringOne: formCode };
-      await this.$http({
+      return this.$http({
         // aes: true,
         url: url,
         method: `post`,
@@ -365,7 +357,7 @@ export default {
         isLoading: true,
         // loadingTarget: document.body,
         // modalStrictly: true,
-        success: async (res) => {
+        success: (res) => {
           let formTemplate = res.objx || {};
           this.targetFormTemplate = formTemplate;
           this.targetFormJson = formTemplate.formViewContent
@@ -616,30 +608,37 @@ export default {
 
     // 打开编辑公式弹窗
     editFormula() {
+      this.formula = this.option.formula ?? null;
       this.fieldTreeData.length = 0;
       // 初始化字段树
 
       // this.loadFieldListToTree();
-      this.initFields();
-
-      console.log("设计器字段===>", this.fieldTreeData);
-
-      // 加载当前字段计算公式tags
-      this.refreshFormula();
-      const code = this.formula;
-      this.formulaDialogVisible = true;
-
-      //==== codeMirror 挂载视图 ====
-      this.$nextTick(() => {
-        this.codeMirror = new EditorView({
-          state: EditorState.create({
-            doc: code,
-            extensions: [basicSetup, javascript(), [baseTheme, [], placeholders]],
-          }),
-          parent: this.$refs.cmRef,
+
+      let option = this.option;
+      let formCode = option.formCode;
+      if (formCode) {
+        this.getReportTemplate(formCode, () => {
+          this.loadFieldListToTree();
+          console.log("设计器字段===>", this.fieldTreeData);
+
+          // 加载当前字段计算公式tags
+          this.refreshFormula();
+          const code = this.formula;
+          this.formulaDialogVisible = true;
+
+          //==== codeMirror 挂载视图 ====
+          this.$nextTick(() => {
+            this.codeMirror = new EditorView({
+              state: EditorState.create({
+                doc: code,
+                extensions: [basicSetup, javascript(), [baseTheme, [], placeholders]],
+              }),
+              parent: this.$refs.cmRef,
+            });
+            console.log("编辑器实例==>", this.codeMirror);
+          });
         });
-        console.log("编辑器实例==>", this.codeMirror);
-      });
+      }
     },
 
     // 保存计算公式

package/src/components/xform/form-designer/form-widget/field-widget/gantt-widget.vue

@@ -825,7 +825,6 @@ export default {
 
       // this.setValue(value);
       this.fieldModel = value;
-      // debugger;
       this.$nextTick(() => {
         this.showGantt = true;
       });

package/src/components/xform/mixins/defaultHandle.js

@@ -335,8 +335,8 @@ modules = {
     calculateFormula(formula,data){
       return calculateFormula2(formula, data, this)
     },
-    baseCalculateFormula(formula){
-      return baseCalculateFormula(formula, this)
+    baseCalculateFormula(formula, row){
+      return baseCalculateFormula(this,formula, row)
     }
 
   }

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

@@ -125,8 +125,7 @@ export function calculateFormula(VFR, DSV, formulaJs, formulaFieldRef, changedFi
   return formulaValue
 }
 
-export function baseCalculateFormula(formulaStr, data, that /* VFR, DSV, formulaJs, formulaFieldRef, changedFieldRef */) {
-
+export function baseCalculateFormula(that,formulaStr, row /* VFR, DSV, formulaJs, formulaFieldRef, changedFieldRef */) {
   if(!formulaStr)return
   let formula = formulaStr;
   let VFR = that.getFormRef();
@@ -141,7 +140,7 @@ export function baseCalculateFormula(formulaStr, data, that /* VFR, DSV, formula
     } */
   }
 
-  formula = baseReplaceFieldsAndFunctionsOfFormula(VFR, formulaFieldRef,formula)  //替换字段值
+  formula = baseReplaceFieldsAndFunctionsOfFormula(VFR, formulaFieldRef,formula,row)  //替换字段值
   if (!formula) {
     return
   }
@@ -163,13 +162,18 @@ export function baseCalculateFormula(formulaStr, data, that /* VFR, DSV, formula
   return formulaValue
 }
 
+
+function getFieldKeyName(widget) {
+    let o = widget.options.name;
+    return (widget.options.keyNameEnabled && widget.options.keyName) || o;
+}
 /**
  * 替换计算公式中的字段值
  * @param VFR
  * @param formulaFieldRef
  * @returns {*}
  */
-export function baseReplaceFieldsAndFunctionsOfFormula(VFR, formulaFieldRef, formula) {
+export function baseReplaceFieldsAndFunctionsOfFormula(VFR, formulaFieldRef, formula, row) {
   // let formula = formulaFieldRef.field.options.formula
   const matchResult = formula.match(FORMULA_REG_EXP)
   if (!matchResult) {
@@ -197,15 +201,29 @@ export function baseReplaceFieldsAndFunctionsOfFormula(VFR, formulaFieldRef, for
         resultFormula = resultFormula.replace(mi, fieldRef.getValue())
       } else {  //getWidgetRef找不到，则可能是子表单字段
         const subFormNameOfField = VFR.getSubFormNameOfWidget(fieldSchema.options.name)
-        if (!!formulaFieldRef.subFormItemFlag || formulaFieldRef.tableParam) {
+        if (!!formulaFieldRef.subFormItemFlag || formulaFieldRef.tableParam || row) {
           /* 如果当前计算字段是子表单字段，要判断公式中的子表单字段是否和当前计算字段是否属于同一子表单！！ */
-
-
-          if (subFormNameOfField === formulaFieldRef?.parentWidget?.options?.name) {
+          if(row){
+            let fieldKeyName = getFieldKeyName(fieldSchema)
+            let value = row[fieldKeyName];
+            resultFormula = resultFormula.replaceAll(mi, value)
+            /*
+            let subFormRowId = row._X_ROW_KEY
+            fieldRef = VFR.getWidgetRef(fieldSchema.options.name + '_' + subFormRowId)
+            if (!!fieldRef) {
+              let value = fieldRef.getValue();
+              resultFormula = resultFormula.replaceAll(mi, value)
+            } else {
+              de
+              quitFlag = true
+              console.error('Field not found: ' + fieldSchema.options.label)
+            } */
+          }else 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())
+              let value = fieldRef.getValue();
+              resultFormula = resultFormula.replaceAll(mi, value)
             } else {
               quitFlag = true
               console.error('Field not found: ' + fieldSchema.options.label)