cloud-web-corejs 1.0.54-dev.391 → 1.0.54-dev.393

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.391",
+  "version": "1.0.54-dev.393",
   "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/utils/formula-util.js

@@ -198,7 +198,10 @@ export function baseReplaceFieldsAndFunctionsOfFormula(VFR, formulaFieldRef, for
       let fieldRef = VFR.getWidgetRef(fieldSchema.options.name)
       if (!!fieldRef) {
         //是否要考虑字符串值的替换？？
-        resultFormula = resultFormula.replace(mi, fieldRef.getValue())
+        // resultFormula = resultFormula.replace(mi, fieldRef.getValue())
+        let fieldKeyName = getFieldKeyName(fieldSchema)
+        let value = fieldRef.formModel[fieldKeyName];
+        resultFormula = resultFormula.replace(mi, value)
       } else {  //getWidgetRef找不到，则可能是子表单字段
         const subFormNameOfField = VFR.getSubFormNameOfWidget(fieldSchema.options.name)
         if (!!formulaFieldRef.subFormItemFlag || formulaFieldRef.tableParam || row) {