cloud-web-corejs 1.0.54-dev.205 → 1.0.54-dev.206

package/package.json

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

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

@@ -93,7 +93,8 @@ modules = {
     formTemplates: {type: Array, default: null},
     testOptionData: {type: Object, default: null},
     readonly: Boolean,
-    columnFlag: Boolean
+    columnFlag: Boolean,
+    sourceData:Object
   },
   data() {
     return {
@@ -158,7 +159,8 @@ modules = {
       getHasWf: () => false,
       readonly:this.readonly,
       columnFlag:this.columnFlag,
-      widgetKeyNameMap:{}
+      widgetKeyNameMap:{},
+      sourceData:this.sourceData
     };
   },
   created() {

package/src/components/xform/form-designer/setting-panel/property-editor/container-data-table/columnRenderDialog.vue

@@ -6,7 +6,7 @@
     <el-tabs v-model="formDesTabs" type="card" class="tab-boxOnly" :stretch="true">
       <el-tab-pane :label="$t1('设计器')" name="first">
         <designer ref="designer" :formTemplate="formTemplate" @customConfirm="customConfirm" :columnFlag="true"
-                  :widgetList="widgetList"></designer>
+                  :widgetList="widgetList" :sourceData="sourceData"></designer>
       </el-tab-pane>
     </el-tabs>
     <el-button class="isFullIcon" v-if="!isFullscreen" @click="handleFullscreen">
@@ -27,7 +27,8 @@
 import PopupManager from 'element-ui/src/utils/popup/popup-manager.js'
 export default {
   props: {
-    column: Object
+    column: Object,
+    sourceData:Object
   },
   components: {
     designer: () => import("@base/views/user/form/vform/designer.vue"),

package/src/components/xform/form-designer/setting-panel/property-editor/container-data-table/table-column-dialog.vue

@@ -341,7 +341,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <columnRenderDialog :column="currentTableColumn" v-if="showColumnRenderDialog"
+      <columnRenderDialog :column="currentTableColumn" :sourceData="sourceData" v-if="showColumnRenderDialog"
                           :visiable.sync="showColumnRenderDialog"
                           @confirm="confirmWidgetRenderDialog"></columnRenderDialog>
     </div>
@@ -499,7 +499,7 @@
 <script>
 import i18n from "../../../../../../components/xform/utils/i18n";
 import Sortable from "sortablejs";
-import {generateId} from "../../../../../../components/xform/utils/util";
+import {generateId, loopHandleWidget,deepClone} from "../../../../../../components/xform/utils/util";
 import columnRenderDialog from "./columnRenderDialog.vue"
 import {businessFields} from "@base/components/xform/form-designer/widget-panel/widgetsConfig";
 
@@ -750,6 +750,7 @@ export default {
       showRenderDialogFlag: !1,
       renderJson: "",
       currentTableColumn: null,
+      sourceData: null,
 
       hideAfter: 1500,
       openDelay: 500,
@@ -850,8 +851,9 @@ export default {
       this.optionModel.tableColumns = this.tableData;
       this.closeHandle();
     },
-    openWidgetRenderDialog(row) {
+    openWidgetRenderDialog(row, sourceData) {
       this.currentTableColumn = row;
+      this.sourceData = sourceData;
 
       // this.widgetList =
 
@@ -1314,9 +1316,57 @@ export default {
       }
       return {columnSelectedWidget, columnEditFields};
     },
+    findColumnByColumnId(columnList, columnId) {
+      let result = null
+      if (columnList) {
+        let column = columnList.find(item => item.columnId == columnId);
+        if (!column) {
+
+        }
+        for (let column of columnList) {
+          if (column.columnId == columnId) {
+            result = column;
+            break
+          } else if (column.children && column.children.length) {
+            let subColumn = this.findColumnByColumnId(column.children, children)
+            if (subColumn) {
+              result = subColumn;
+              break
+            }
+          }
+
+        }
+      }
+      return result;
+    },
     openFormatConfigDialog(row, index) {
       if (row.formatS == 'widgetRender') {
-        this.openWidgetRenderDialog(row);
+        let formWidgetList = deepClone(this.designer.widgetList);
+        let tableData = deepClone(this.tableData);
+        let columnId = row.columnId;
+
+        let dataTableName = this.optionModel.name;
+
+
+        let targetColumn = null;
+        loopHandleWidget(formWidgetList, (item) => {
+          if (item.options.name == dataTableName) {
+            item.options.tableColumns = tableData;
+            targetColumn = this.findColumnByColumnId(item.options.tableColumns, columnId)
+          }
+        });
+        let getWidgetList = (subWidgetList = []) =>{
+          targetColumn.widgetList = this.$baseLodash.cloneDeep(subWidgetList);
+          return formWidgetList;
+        }
+        let sourceData = {
+          formWidgetList,
+          dataTableName,
+          columnId,
+          getWidgetList
+        }
+
+        this.openWidgetRenderDialog(row, sourceData);
         return
       }
 

package/src/components/xform/form-designer/setting-panel/property-editor/formula-editor.vue

@@ -215,6 +215,7 @@ export default {
     optionModel: Object,
     tableColumns: Array
   },
+  inject:["columnFlag","sourceData"],
   computed: {
     formulaForView() {
       const matchResult = this.optionModel.formula.match(FORMULA_REG_EXP);
@@ -327,7 +328,6 @@ export default {
 
     traverseFieldWidgetsOfTableDataWidget(widget, callback) {
       if (widget.type == "data-table") {
-        debugger
         let loopDo = (t) => {
           if (t.children && t.children.length) {
             t.children.forEach((item) => {
@@ -358,11 +358,22 @@ export default {
     handleTableConfigData(widget, callback) {
       callback(widget);
     },
+    getTargetWidgetList(){
+      let widgetList = this.designer.widgetList;
+      if(this.columnFlag){
+        let sourceData = this.sourceData;
+        let formWidgetList = sourceData.getWidgetList(widgetList)
+        widgetList = formWidgetList;
+      }
+      return widgetList;
+    },
     loadFieldListToTree() {
       this.fieldTreeData.length = 0; //先清空
 
-      const allFields = getAllFieldWidgets(this.designer.widgetList);
-      const allContainers = getAllContainerWidgets(this.designer.widgetList);
+      let widgetList = this.getTargetWidgetList();
+
+      const allFields = getAllFieldWidgets(widgetList);
+      const allContainers = getAllContainerWidgets(widgetList);
 
       const subFormArray = [];
       let sfFieldArray = [];
@@ -391,7 +402,9 @@ export default {
               tmpFieldArray.push(fw);
             }
           };
-          this.traverseFieldWidgetsOfTableDataWidget(con.container, fwHandler);
+
+          // this.traverseFieldWidgetsOfTableDataWidget(con.container, fwHandler);
+          traverseFieldWidgetsOfContainer(con.container, fwHandler);
           subFormFieldMap[con.container.options.name] = tmpFieldArray;
           sfFieldArray = sfFieldArray.concat(tmpFieldArray);
         }
@@ -546,7 +559,8 @@ export default {
 
         const fieldId = firstPart.substring(2, firstPart.length);
         const fieldSchema = getFieldWidgetById(
-          this.designer.widgetList,
+          // this.designer.widgetList,
+          this.getTargetWidgetList(),
           fieldId,
           false
         );
@@ -569,12 +583,16 @@ export default {
     editFormula() {
       this.fieldTreeData.length = 0;
       // 初始化字段树
-      this.designer.widgetList.forEach((wItem) => {
-        if (this.optionModel.name !== wItem.id) {
-          //this.buildTreeNodeOfWidget(wItem, this.fieldTreeData);
-          this.loadFieldListToTree();
-        }
-      });
+      if(this.columnFlag){
+        this.loadFieldListToTree();
+      }else{
+        this.designer.widgetList.forEach((wItem) => {
+          if (this.optionModel.name !== wItem.id) {
+            //this.buildTreeNodeOfWidget(wItem, this.fieldTreeData);
+            this.loadFieldListToTree();
+          }
+        });
+      }
 
       console.log("设计器字段===>", this.fieldTreeData);
 

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

@@ -218,7 +218,6 @@ export function replaceFieldsAndFunctionsOfFormula(VFR, formulaFieldRef) {
             console.error('Invalid formula!')
           }
         } else {
-          debugger
           /* 在主表单字段的计算公式中使用子表单字段，应将子表单所有记录同字段的值代入！！ */
           const subFormValue = VFR.formDataModel[subFormNameOfField]
           let allSubFieldValues = ''

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

@@ -392,9 +392,12 @@ export function traverseFieldWidgetsOfContainer(
         handleWidgetForTraverse(column.widget, handler, staticWidgetsIncluded);
       }
       if (column.widgetList) {
-        loopHandleWidget(column.widgetList, (cw) => {
+        column.widgetList.forEach((cw) => {
           handleWidgetForTraverse(cw, handler, staticWidgetsIncluded);
         });
+        /*loopHandleWidget(column.widgetList, (cw) => {
+          handleWidgetForTraverse(cw, handler, staticWidgetsIncluded);
+        });*/
       }
     }
   } else if (con.category === "container") {

package/src/views/user/form/vform/designer.vue

@@ -14,6 +14,8 @@
         v-if="showDesinger"
         :readonly="readonly"
         :columnFlag="columnFlag"
+        :sourceData="sourceData"
+        sourceData:="sourceData"
         @customConfirm="customConfirm"
       />
     </div><!--
@@ -41,6 +43,7 @@ export default {
     formTemplate: Object,
     widgetList: Array,
     columnFlag: Boolean,
+    sourceData:Object
   },
   components: {
     VFormDesigner