cloud-web-corejs 1.0.54-dev.325 → 1.0.54-dev.327

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

@@ -609,6 +609,7 @@ import {
   generateId,
   loopHandleWidget,
   deepClone,
+  columnFormatMap
 } from "../../../../../../components/xform/utils/util";
 import columnRenderDialog from "./columnRenderDialog.vue";
 
@@ -865,28 +866,7 @@ export default {
       tableData: [], //树形结构数据转的数组
       tableDataArray: [],
       dragSort: null,
-      columnFormatMap: {
-        editInput: "input",
-        editNumber: "number",
-        editDate: "date",
-        editSelect: "select",
-        editSearch: "vabsearch",
-        editAttachment: "baseAttachment",
-        editStatus: "status",
-        aText: "a-text",
-        aLink: "a-link",
-        editDelete: "a-link",
-        editButton: "a-link",
-        button: "button",
-        addSiblingEditRow: "a-link",
-        addChildTreeRow: "a-link",
-        moveUpRow: "a-link",
-        moveDownRow: "a-link",
-        removeTreeRow: "a-link",
-        text: "text",
-        checkbox: "checkbox",
-        radio: "radio",
-      },
+      columnFormatMap,
 
       showFormEventDialogFlag: false,
       formEventHandlerCode: "",
@@ -1275,8 +1255,9 @@ export default {
     changeFormatS(row, isEdit) {
       let formatS = isEdit ? row.editFormatS : row.formatS;
       let isButtontCell = this.getIsButtontCell(formatS);
-      let columnWidgetConfig = this.getColumnWidgetConfig(row, true, isEdit);
-      let { columnSelectedWidget, columnEditFields } = columnWidgetConfig;
+      // let columnWidgetConfig = this.getColumnWidgetConfig(row, true, isEdit);
+      // let { columnSelectedWidget, columnEditFields } = columnWidgetConfig;
+      let columnSelectedWidget = this.designer.createColumnWidget(row, isEdit)
       if (!isEdit) {
         //格式化类型
         if (columnSelectedWidget) {
@@ -1554,11 +1535,10 @@ export default {
         row.widget.options = columnOption;
       } else {
         let type = this.columnFormatMap[row.formatS];
-        let fieldWidget = this.designer.copyNewFieldWidget(
-          this.designer.getFieldWidgetByType(type)
-        );
+        let fieldWidget = this.designer.createColumnWidget(row, false);
         fieldWidget.options = columnOption;
         row.widget = fieldWidget;
+        this.$forceUpdate();
       }
 
       let isButtontCell = this.getIsButtontCell(row.formatS);
@@ -1569,20 +1549,7 @@ export default {
       }
     },
     openEditFormatConfigDialog(row, index) {
-      /*let option = row.columnOption;
-      let selectedWidget;
-      let columnWidgetConfig = this.getColumnWidgetConfig(row, null, true);
-      let {columnSelectedWidget, columnEditFields} = columnWidgetConfig;
-      if (columnSelectedWidget) {
-        option = columnSelectedWidget.options;
-        selectedWidget = columnSelectedWidget;
-      } else {
-        option = {};
-        selectedWidget = {};
-      }
 
-      let columnOption = this.$baseLodash.cloneDeep(option);
-      row.editColumnOption = columnOption;*/
       let selectedWidget = row.editWidget;
       this.operateIndex = index;
 
@@ -1607,11 +1574,10 @@ export default {
         row.editWidget.options = columnOption;
       } else {
         let type = this.columnFormatMap[row.editFormatS];
-        let fieldWidget = this.designer.copyNewFieldWidget(
-          this.designer.getFieldWidgetByType(type)
-        );
+        let fieldWidget = this.designer.createColumnWidget(row, true);
         fieldWidget.options = columnOption;
         row.editWidget = fieldWidget;
+        this.$forceUpdate();
       }
 
       /*row.prop = columnOption.name;