cloud-web-corejs 1.0.54-dev.663 → 1.0.54-dev.665

package/package.json

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

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

@@ -687,9 +687,9 @@ export default {
     handleShowButtonsColumnChange: function (e) {
       if (e) {
         var t = this.designer.formWidget.getSelectedWidgetRef();
-        t
-          && t.refreshLayout
-          && this.$nextTick(function () {
+        t &&
+          t.refreshLayout &&
+          this.$nextTick(function () {
             t.refreshLayout();
           });
       }
@@ -702,8 +702,8 @@ export default {
       this.optionModel.operationButtons.map(function (n, o) {
         n.name === e && o !== t && (i = !0);
       }),
-        i
-          && (this.$message.error(
+        i &&
+          (this.$message.error(
             this.i18nt("designer.setting.operationButtonDuplicatedNameError")
           ),
           (this.optionModel.operationButtons[t].name = this.oldButtonName));
@@ -744,9 +744,9 @@ export default {
     },
     refreshTableLayout: function () {
       var e = this.designer.formWidget.getSelectedWidgetRef();
-      e
-        && e.refreshLayout
-        && this.$nextTick(function () {
+      e &&
+        e.refreshLayout &&
+        this.$nextTick(function () {
           e.refreshLayout();
         });
     },
@@ -768,13 +768,7 @@ export default {
       }
     },
     changeFormatS(row) {
-      let columnWidgetConfig = this.getColumnWidgetConfig(row, true);
-      let { columnSelectedWidget, columnEditFields } = columnWidgetConfig;
-      if (columnSelectedWidget) {
-        row.columnOption = columnSelectedWidget.options;
-      } else {
-        row.columnOption = {};
-      }
+      row.widget = this.designer.createColumnWidget(row, false) || null;
       if (row.formatS == "editDelete" || row.formatS == "editButton") {
         row.width = 47;
         row.prop = null;
@@ -788,72 +782,13 @@ export default {
         row.sortable = true;
       }
     },
-    getColumnWidgetConfig(row, isChange) {
-      let formatS = row.formatS;
-      let columnSelectedWidget = null;
-      let columnEditFields = null;
-
-      let type = this.columnFormatMap[row.formatS];
-
-      if (type) {
-        columnSelectedWidget = this.$baseLodash.cloneDeep(
-          this.designer.getFieldWidgetByType(type)
-        );
-        let tmpId = generateId();
-        let idVal = row.prop ? row.prop : type + tmpId;
-        columnSelectedWidget.id = idVal;
-        columnSelectedWidget.options.name = idVal;
-        if (
-          !isChange
-          && row.columnOption
-          && Object.keys(row.columnOption).length
-        ) {
-          row.columnOption.required = row.required || false;
-          columnSelectedWidget.options = row.columnOption;
-        } else {
-          columnSelectedWidget.options.required = row.required || false;
-          row.columnOption = columnSelectedWidget.options;
-        }
-        columnSelectedWidget.options.name = row.prop;
-        columnSelectedWidget.options.label = row.label;
-        columnSelectedWidget.options.labelHidden = true;
-      }
-      return { columnSelectedWidget, columnEditFields };
-    },
-    openFormatConfigDialog(row, index) {
-      let option = row.columnOption;
-      let selectedWidget;
-      let columnWidgetConfig = this.getColumnWidgetConfig(row);
-      let { columnSelectedWidget, columnEditFields } = columnWidgetConfig;
-      if (columnSelectedWidget) {
-        option = columnSelectedWidget.options;
-        selectedWidget = columnSelectedWidget;
-      } else {
-        option = {};
-        selectedWidget = {};
-      }
-
-      let columnOption = this.$baseLodash.cloneDeep(option);
-      row.columnOption = columnOption;
-      this.operateIndex = index;
-
-      this.openWidgetPropertyDialog({
-        row: row,
-        columnSelectedWidget: selectedWidget,
-        tableColumns: this.optionModel.tableColumns,
-        index: index,
-        columnEditFields: columnEditFields,
-        callback: (columnOption) => {
-          this.confirmFormatConfigDialog(columnOption);
-        },
-      });
-    },
-    confirmFormatConfigDialog(columnOption) {
+    confirmFormatConfigDialog(columnSelectedWidget) {
+      const options = columnSelectedWidget.options;
       let row = this.optionModel.tableColumns[this.operateIndex];
-      row.columnOption = columnOption;
-      row.prop = columnOption.name;
-      row.label = columnOption.label;
-      row.required = columnOption.required;
+      row.widget = columnSelectedWidget;
+      row.prop = options.name;
+      row.label = options.label;
+      row.required = options.required;
     },
     openFieldTreeDialog() {
       this.treeData = [
@@ -923,8 +858,8 @@ export default {
       this.treeData.forEach((item1) => {
         item1.children.forEach((item2) => {
           if (
-            fields.includes(item2.name)
-            && !defaultCheckedKeys.includes(item2.name)
+            fields.includes(item2.name) &&
+            !defaultCheckedKeys.includes(item2.name)
           ) {
             defaultCheckedKeys.push(item2.name);
           }
@@ -968,10 +903,10 @@ export default {
       this.showTableConfigDialog = true;
     },
     downloadExcel() {
-      let defaultUrl
-        = "http://file.sc.5mall.com/download/repo1/b/mk1/2024/12/13/b2aea548-a9a8-4dca-bba7-8d9c6134ebe3.xlsx";
-      let xformImportTemplateFile
-        = setttingConfig.xformImportTemplateFile || defaultUrl;
+      let defaultUrl =
+        "http://file.sc.5mall.com/download/repo1/b/mk1/2024/12/13/b2aea548-a9a8-4dca-bba7-8d9c6134ebe3.xlsx";
+      let xformImportTemplateFile =
+        setttingConfig.xformImportTemplateFile || defaultUrl;
       if (!xformImportTemplateFile) return;
       this.$commonFileUtil.downloadFile(
         xformImportTemplateFile,

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

@@ -615,7 +615,7 @@
               <el-option value="#ea5353" label="红"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label-width="0">
+          <el-form-item label-width="0" class="form-item-full">
             <el-divider class="custom-divider">{{
               i18nt("designer.setting.customLabelIcon")
             }}</el-divider>
@@ -624,12 +624,19 @@
             <icon-picker v-model="rowData.labelIconClass"></icon-picker>
           </el-form-item>
           <el-form-item :label="i18nt('designer.setting.labelIconPosition')">
-            <el-select v-model="rowData.labelIconPosition" clearable>
-              <el-option label="front" value="front"></el-option>
-              <el-option label="rear" value="rear"></el-option>
+            <el-select
+              v-model="rowData.labelIconPosition"
+              clearable
+              placeholder="默认后面"
+            >
+              <el-option label="前面" value="front"></el-option>
+              <el-option label="后面" value="rear"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item :label="i18nt('designer.setting.labelTooltip')">
+          <el-form-item
+            :label="i18nt('designer.setting.labelTooltip')"
+            class="form-item-full"
+          >
             <el-input
               type="text"
               v-model="rowData.labelTooltip"
@@ -1035,19 +1042,17 @@ export default {
             return;
           }
           if (key === "columnOption") {
-            cloned.columnOption = row.widget
-              ? row.widget.options
-              : val !== null && typeof val === "object"
-              ? deepClone(val)
-              : val;
+            if (!row.widget) {
+              cloned.columnOption =
+                val !== null && typeof val === "object" ? deepClone(val) : val;
+            }
             return;
           }
           if (key === "editColumnOption") {
-            cloned.editColumnOption = row.editWidget
-              ? row.editWidget.options
-              : val !== null && typeof val === "object"
-              ? deepClone(val)
-              : val;
+            if (!row.editWidget) {
+              cloned.editColumnOption =
+                val !== null && typeof val === "object" ? deepClone(val) : val;
+            }
             return;
           }
           if (val !== null && typeof val === "object") {
@@ -1066,12 +1071,6 @@ export default {
         if (row.editWidget && !cloned.editWidget) {
           cloned.editWidget = row.editWidget;
         }
-        if (row.widget) {
-          cloned.columnOption = row.widget.options;
-        }
-        if (row.editWidget) {
-          cloned.editColumnOption = row.editWidget.options;
-        }
         return cloned;
       };
       return columns.map(cloneRow);
@@ -1112,18 +1111,6 @@ export default {
             next.widgetList = orig.widgetList;
           }
         }
-        if (next.widget) {
-          next.columnOption = next.widget.options;
-        } else if (orig && orig.widget) {
-          next.widget = orig.widget;
-          next.columnOption = orig.widget.options;
-        }
-        if (next.editWidget) {
-          next.editColumnOption = next.editWidget.options;
-        } else if (orig && orig.editWidget) {
-          next.editWidget = orig.editWidget;
-          next.editColumnOption = orig.editWidget.options;
-        }
         if (next.children && next.children.length) {
           next.children = this.restoreColumnWidgetRefs(
             next.children,
@@ -1196,8 +1183,6 @@ export default {
       const source = this.optionModel.tableColumns || [];
       this.sourceTableColumnsSnapshot = source;
       this.tableData = this.cloneTableColumnsForEdit(source);
-      debugger;
-      let a = 1;
     },
     colSubmit() {
       this.dialogVisible = !1;
@@ -1338,7 +1323,7 @@ export default {
         rowEditShow: null,
         utcTransformEnabled: false,
         labelIconClass: null,
-        labelIconPosition: "front",
+        labelIconPosition: "rear",
         labelTooltip: null,
         // treeNode: false,
       };
@@ -1553,17 +1538,12 @@ 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 attachmentPrefix = this.designer.getAttachmentPrefix();
       let columnSelectedWidget = this.designer.createColumnWidget(row, isEdit);
       if (!isEdit) {
-        //格式化类型
         if (columnSelectedWidget) {
-          row.columnOption = columnSelectedWidget.options;
           row.widget = columnSelectedWidget;
         } else {
-          row.columnOption = {};
           row.widget = null;
         }
         row.utcTransformEnabled = false;
@@ -1573,12 +1553,9 @@ export default {
           columnSelectedWidget.options.keyName = row.prop;
           columnSelectedWidget.options.keyNameSuffix = suffix;
         }
-        //编辑插槽类型
         if (columnSelectedWidget) {
-          row.columnOption = columnSelectedWidget.options;
           row.editWidget = columnSelectedWidget;
         } else {
-          row.editColumnOption = {};
           row.editWidget = null;
         }
       }
@@ -1589,7 +1566,6 @@ export default {
           row.label = null;
           row.sortable = false;
           row.width = 150;
-          row.columnOption = {};
           row.widget = null;
         } else if (isButtontCell) {
           if (row.formatS == "dropdown") {
@@ -1638,100 +1614,79 @@ export default {
       let type = this.columnFormatMap[formatS];
 
       if (type) {
-        const existingWidget = isEdit ? row.editWidget : row.widget;
-        if (!isChange && existingWidget) {
-          columnSelectedWidget = this.$baseLodash.cloneDeep(existingWidget);
-        } else {
-          columnSelectedWidget = this.designer.copyNewFieldWidget(
-            this.designer.getFieldWidgetByType(type)
-          );
-        }
-        let columnOption;
-        if (!isEdit) {
-          columnOption = row.columnOption;
-        } else {
-          columnOption = row.editColumnOption;
-        }
-        if (!isChange && existingWidget) {
-          columnOption = columnSelectedWidget.options;
-          columnOption.required = row.required || false;
-          if ("editDelete" == formatS) {
-            columnOption.hiddenByWf = columnOption.hiddenByWf ?? true;
-            columnOption.prefixIcon =
-              columnOption.prefixIcon || "el-icon-delete";
-          } else if ("editButton" == formatS) {
-            columnOption.prefixIcon = columnOption.prefixIcon || "el-icon-edit";
-          }
-        } else if (
-          !isChange &&
-          columnOption &&
-          Object.keys(columnOption).length
-        ) {
-          columnOption.required = row.required || false;
-          columnSelectedWidget.options = columnOption;
-          if ("editDelete" == formatS) {
-            columnSelectedWidget.options.hiddenByWf =
-              columnSelectedWidget.options.hiddenByWf ?? true;
-            columnSelectedWidget.options.prefixIcon =
-              columnSelectedWidget.options.prefixIcon || "el-icon-delete";
-          } else if ("editButton" == formatS) {
-            columnSelectedWidget.options.prefixIcon =
-              columnSelectedWidget.options.prefixIcon || "el-icon-edit";
-          }
-        } else {
-          columnSelectedWidget.options.required = row.required || false;
-
+        const applyNewWidgetDefaults = (widget) => {
+          widget.options.required = row.required || false;
           if ("editDelete" == formatS) {
-            columnSelectedWidget.options.prefixIcon = "el-icon-delete";
-            columnSelectedWidget.options.label = "删除";
-            columnSelectedWidget.options.labelHidden = true;
-            columnSelectedWidget.options.hiddenByWf = true;
-            columnSelectedWidget.options.onClick =
+            widget.options.prefixIcon = "el-icon-delete";
+            widget.options.label = "删除";
+            widget.options.labelHidden = true;
+            widget.options.hiddenByWf = true;
+            widget.options.onClick =
               "let tableParam = this.tableParam;\nlet tableRef = this.getWidgetRef(this.parentWidget.options.name);\ntableRef.deleteRow(tableParam.row,tableParam.rowIndex);";
           } else if ("editButton" == formatS) {
-            columnSelectedWidget.options.prefixIcon = "el-icon-edit";
-            columnSelectedWidget.options.label = "查看";
-            columnSelectedWidget.options.labelHidden = true;
-            columnSelectedWidget.options.onClick =
+            widget.options.prefixIcon = "el-icon-edit";
+            widget.options.label = "查看";
+            widget.options.labelHidden = true;
+            widget.options.onClick =
               "let tableParam = this.tableParam;\nlet tableRef = this.getWidgetRef(this.parentWidget.options.name);\ntableRef.openEditDialog(tableParam.row)";
           } else if ("addSiblingEditRow" == formatS) {
-            columnSelectedWidget.options.prefixIcon = "el-icon-plus";
-            columnSelectedWidget.options.label = "新增兄弟节点";
-            columnSelectedWidget.options.labelHidden = false;
-            columnSelectedWidget.options.onClick =
+            widget.options.prefixIcon = "el-icon-plus";
+            widget.options.label = "新增兄弟节点";
+            widget.options.labelHidden = false;
+            widget.options.onClick =
               "let tableParam = this.tableParam;\nthis.getParentTarget().addSiblingTreeRow(null,tableParam);";
           } else if ("addChildTreeRow" == formatS) {
-            columnSelectedWidget.options.prefixIcon = "el-icon-plus";
-            columnSelectedWidget.options.label = "新增子节点";
-            columnSelectedWidget.options.labelHidden = false;
-            columnSelectedWidget.options.onClick =
+            widget.options.prefixIcon = "el-icon-plus";
+            widget.options.label = "新增子节点";
+            widget.options.labelHidden = false;
+            widget.options.onClick =
               "let tableParam = this.tableParam;\nthis.getParentTarget().addChildTreeRow(null,tableParam);";
           } else if ("moveUpRow" == formatS) {
-            // columnSelectedWidget.options.prefixIcon = "el-icon-plus";
-            columnSelectedWidget.options.label = "↑上移";
-            columnSelectedWidget.options.labelHidden = false;
-            columnSelectedWidget.options.onClick =
+            widget.options.label = "↑上移";
+            widget.options.labelHidden = false;
+            widget.options.onClick =
               "let tableParam = this.tableParam;\nthis.getParentTarget().moveUpRow(tableParam);";
           } else if ("moveDownRow" == formatS) {
-            // columnSelectedWidget.options.prefixIcon = "el-icon-plus";
-            columnSelectedWidget.options.label = "↓下移";
-            columnSelectedWidget.options.labelHidden = false;
-            columnSelectedWidget.options.onClick =
+            widget.options.label = "↓下移";
+            widget.options.labelHidden = false;
+            widget.options.onClick =
               "let tableParam = this.tableParam;\nthis.getParentTarget().moveDownRow(tableParam);";
           } else if ("removeTreeRow" == formatS) {
-            columnSelectedWidget.options.prefixIcon = "el-icon-delete";
-            columnSelectedWidget.options.label = "删除";
-            columnSelectedWidget.options.labelHidden = true;
-            columnSelectedWidget.options.onClick =
+            widget.options.prefixIcon = "el-icon-delete";
+            widget.options.label = "删除";
+            widget.options.labelHidden = true;
+            widget.options.onClick =
               "let tableParam = this.tableParam;\nthis.getParentTarget().removeTreeRow(tableParam);";
           }
+        };
 
-          columnOption = columnSelectedWidget.options;
+        if (!isChange) {
+          const sourceWidget = this.designer.getColumnWidget(row, isEdit);
+          if (sourceWidget) {
+            columnSelectedWidget = this.$baseLodash.cloneDeep(sourceWidget);
+            columnSelectedWidget.options.required = row.required || false;
+            if ("editDelete" == formatS) {
+              columnSelectedWidget.options.hiddenByWf =
+                columnSelectedWidget.options.hiddenByWf ?? true;
+              columnSelectedWidget.options.prefixIcon =
+                columnSelectedWidget.options.prefixIcon || "el-icon-delete";
+            } else if ("editButton" == formatS) {
+              columnSelectedWidget.options.prefixIcon =
+                columnSelectedWidget.options.prefixIcon || "el-icon-edit";
+            }
+          } else {
+            columnSelectedWidget = this.designer.copyNewFieldWidget(
+              this.designer.getFieldWidgetByType(type)
+            );
+            applyNewWidgetDefaults(columnSelectedWidget);
+          }
+        } else {
+          columnSelectedWidget = this.designer.copyNewFieldWidget(
+            this.designer.getFieldWidgetByType(type)
+          );
+          applyNewWidgetDefaults(columnSelectedWidget);
         }
 
-        // columnSelectedWidget.options.name = isEdit? (type + row.columnId) : row.prop;
-        // columnSelectedWidget.options.name = type + row.columnId;
-        // columnSelectedWidget.options.name = row.prop;
         if (columnSelectedWidget.options.hasOwnProperty("keyName")) {
           columnSelectedWidget.options.keyName = row.prop;
           columnSelectedWidget.options.keyNameEnabled = true;
@@ -1750,8 +1705,6 @@ export default {
       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;
@@ -1847,12 +1800,8 @@ export default {
         tableColumns: this.tableData,
         index: index,
         columnEditFields,
-        callback: (columnOption) => {
-          this.confirmFormatConfigDialog(
-            columnOption,
-            row,
-            columnSelectedWidget
-          );
+        callback: (confirmedWidget) => {
+          this.confirmFormatConfigDialog(confirmedWidget, row);
         },
       });
     },
@@ -1860,35 +1809,15 @@ export default {
       let o = options.name;
       return (options.keyNameEnabled && options.keyName) || o;
     },
-    confirmFormatConfigDialog(columnOption, row, columnSelectedWidget) {
-      // let row = this.tableData[this.operateIndex];
-      row.columnOption = columnOption;
-
-      if (row.widget) {
-        row.widget.options = columnOption;
-        if (columnSelectedWidget && columnSelectedWidget.widgetList) {
-          row.widget.widgetList = this.$baseLodash.cloneDeep(
-            columnSelectedWidget.widgetList
-          );
-        }
-      } else {
-        let type = this.columnFormatMap[row.formatS];
-        let fieldWidget = this.designer.createColumnWidget(row, false);
-        fieldWidget.options = columnOption;
-        if (columnSelectedWidget && columnSelectedWidget.widgetList) {
-          fieldWidget.widgetList = this.$baseLodash.cloneDeep(
-            columnSelectedWidget.widgetList
-          );
-        }
-        row.widget = fieldWidget;
-        this.$forceUpdate();
-      }
+    confirmFormatConfigDialog(columnSelectedWidget, row) {
+      row.widget = columnSelectedWidget;
+      const options = columnSelectedWidget.options;
 
       let isButtontCell = this.getIsButtontCell(row.formatS);
       if (!isButtontCell) {
-        row.prop = this.getFieldKeyNameByOptions(columnOption);
-        row.label = columnOption.label;
-        row.required = columnOption.required;
+        row.prop = this.getFieldKeyNameByOptions(options);
+        row.label = options.label;
+        row.required = options.required;
       }
     },
     openEditFormatConfigDialog(row, index) {
@@ -1908,43 +1837,13 @@ export default {
         columnSelectedWidget,
         index: index,
         columnEditFields,
-        callback: (columnOption) => {
-          this.confirmEditFormatConfigDialog(
-            columnOption,
-            row,
-            columnSelectedWidget
-          );
+        callback: (confirmedWidget) => {
+          this.confirmEditFormatConfigDialog(confirmedWidget, row);
         },
       });
     },
-    confirmEditFormatConfigDialog(columnOption, row, columnSelectedWidget) {
-      // let row = this.tableData[this.operateIndex];
-      row.editColumnOption = columnOption;
-      // row.editWidget.options = columnOption;
-
-      if (row.editWidget) {
-        row.editWidget.options = columnOption;
-        if (columnSelectedWidget && columnSelectedWidget.widgetList) {
-          row.editWidget.widgetList = this.$baseLodash.cloneDeep(
-            columnSelectedWidget.widgetList
-          );
-        }
-      } else {
-        let type = this.columnFormatMap[row.editFormatS];
-        let fieldWidget = this.designer.createColumnWidget(row, true);
-        fieldWidget.options = columnOption;
-        if (columnSelectedWidget && columnSelectedWidget.widgetList) {
-          fieldWidget.widgetList = this.$baseLodash.cloneDeep(
-            columnSelectedWidget.widgetList
-          );
-        }
-        row.editWidget = fieldWidget;
-        this.$forceUpdate();
-      }
-
-      /*row.prop = columnOption.name;
-      row.label = columnOption.label;
-      row.required = columnOption.required;*/
+    confirmEditFormatConfigDialog(columnSelectedWidget, row) {
+      row.editWidget = columnSelectedWidget;
     },
     openTableColumnConfigDialog(row, index) {
       this.operateIndex = index;
@@ -1962,7 +1861,6 @@ export default {
       this.showTableColumnConfigDialog = true;
     },
     saveTableColumnConfigDialog() {
-      // let row = this.tableData[this.operateIndex];
       let row = this.currentTableColumn;
       const codeHints = this.$refs.ecEditor.getEditorAnnotations();
       let syntaxErrorFlag = false;
@@ -2011,25 +1909,15 @@ export default {
           )
         : null;
 
-      if (newWidget.formItemFlag) {
-        if (row.widget) {
-          if (row.widget.options[key] !== undefined)
-            row.widget.options[key] = value;
-        }
-        if (row.columnOption) {
-          if (row.columnOption[key] !== undefined)
-            row.columnOption[key] = value;
+      if (newWidget && newWidget.formItemFlag && row.widget) {
+        if (row.widget.options[key] !== undefined) {
+          row.widget.options[key] = value;
         }
       }
 
-      if (newWidget.formItemFlag) {
-        if (row.editWidget) {
-          if (row.editWidget.options[key] !== undefined)
-            row.editWidget.options[key] = value;
-        }
-        if (row.editColumnOption) {
-          if (row.editColumnOption[key] !== undefined)
-            row.editColumnOption[key] = value;
+      if (newEditWidget && newEditWidget.formItemFlag && row.editWidget) {
+        if (row.editWidget.options[key] !== undefined) {
+          row.editWidget.options[key] = value;
         }
       }
     },
@@ -2043,11 +1931,9 @@ export default {
       Object.assign(this.editRowData, this.rowData);
       if (this.rowData.widget) {
         this.editRowData.widget = this.rowData.widget;
-        this.editRowData.columnOption = this.rowData.widget.options;
       }
       if (this.rowData.editWidget) {
         this.editRowData.editWidget = this.rowData.editWidget;
-        this.editRowData.editColumnOption = this.rowData.editWidget.options;
       }
       if (this.rowData.widgetList && this.rowData.widgetList.length) {
         this.editRowData.widgetList = this.rowData.widgetList;
@@ -2096,5 +1982,23 @@ export default {
 .table-column-row-edit-cont {
   padding-bottom: 8px;
   box-sizing: border-box;
+
+  ::v-deep .form-m2 {
+    height: auto;
+    overflow: visible;
+
+    .form-item-full {
+      width: calc(100% - 20px) !important;
+      display: block;
+    }
+
+    .form-item-full .el-input {
+      width: 100% !important;
+    }
+  }
+
+  ::v-deep .custom-divider.el-divider--horizontal {
+    margin: 10px 0;
+  }
 }
 </style>

package/src/components/xform/form-designer/setting-panel/property-editor/container-list-h5/list-h5-editor.vue

@@ -668,13 +668,7 @@ export default {
       }
     },
     changeFormatS(row) {
-      let columnWidgetConfig = this.getColumnWidgetConfig(row, true);
-      let {columnSelectedWidget, columnEditFields} = columnWidgetConfig;
-      if (columnSelectedWidget) {
-        row.columnOption = columnSelectedWidget.options;
-      } else {
-        row.columnOption = {}
-      }
+      row.widget = this.designer.createColumnWidget(row, false) || null;
       if (row.formatS == 'editDelete' || row.formatS == 'editButton') {
         row.width = 47;
         row.prop = null;
@@ -689,24 +683,32 @@ export default {
       }
     },
     getColumnWidgetConfig(row, isChange) {
-      let formatS = row.formatS
       let columnSelectedWidget = null;
       let columnEditFields = null;
 
       let type = this.columnFormatMap[row.formatS];
 
       if (type) {
-        columnSelectedWidget = this.$baseLodash.cloneDeep(this.designer.getFieldWidgetByType(type));
-        let tmpId = generateId();
-        let idVal = row.prop ? row.prop : (type + tmpId);
-        columnSelectedWidget.id = idVal;
-        columnSelectedWidget.options.name = idVal;
-        if (!isChange && row.columnOption && Object.keys(row.columnOption).length) {
-          row.columnOption.required = row.required || false;
-          columnSelectedWidget.options = row.columnOption;
+        if (!isChange) {
+          const sourceWidget = this.designer.getColumnWidget(row, false);
+          if (sourceWidget) {
+            columnSelectedWidget = this.$baseLodash.cloneDeep(sourceWidget);
+            columnSelectedWidget.options.required = row.required || false;
+          } else {
+            columnSelectedWidget = this.$baseLodash.cloneDeep(this.designer.getFieldWidgetByType(type));
+            let tmpId = generateId();
+            let idVal = row.prop ? row.prop : (type + tmpId);
+            columnSelectedWidget.id = idVal;
+            columnSelectedWidget.options.name = idVal;
+            columnSelectedWidget.options.required = row.required || false;
+          }
         } else {
+          columnSelectedWidget = this.$baseLodash.cloneDeep(this.designer.getFieldWidgetByType(type));
+          let tmpId = generateId();
+          let idVal = row.prop ? row.prop : (type + tmpId);
+          columnSelectedWidget.id = idVal;
+          columnSelectedWidget.options.name = idVal;
           columnSelectedWidget.options.required = row.required || false;
-          row.columnOption = columnSelectedWidget.options;
         }
         columnSelectedWidget.options.name = row.prop;
         columnSelectedWidget.options.label = row.label;
@@ -716,38 +718,32 @@ export default {
       return {columnSelectedWidget, columnEditFields};
     },
     openFormatConfigDialog(row, index) {
-      let option = row.columnOption;
-      let selectedWidget;
-      let columnWidgetConfig = this.getColumnWidgetConfig(row);
-      let {columnSelectedWidget, columnEditFields} = columnWidgetConfig;
-      if (columnSelectedWidget) {
-        option = columnSelectedWidget.options;
-        selectedWidget = columnSelectedWidget;
-      } else {
-        option = {}
-        selectedWidget = {};
+      const {columnSelectedWidget, columnEditFields} = this.getColumnWidgetConfig(row);
+      if (!columnSelectedWidget) {
+        return;
       }
-
-      let columnOption = this.$baseLodash.cloneDeep(option);
-      row.columnOption = columnOption;
+      columnSelectedWidget.options = this.$baseLodash.cloneDeep(
+        columnSelectedWidget.options
+      );
       this.operateIndex = index;
 
       this.openWidgetPropertyDialog({
         row: row,
-        columnSelectedWidget: selectedWidget,
+        columnSelectedWidget,
         index: index,
         columnEditFields: columnEditFields,
-        callback: (columnOption) => {
-          this.confirmFormatConfigDialog(columnOption);
+        callback: (confirmedWidget) => {
+          this.confirmFormatConfigDialog(confirmedWidget);
         }
       })
     },
-    confirmFormatConfigDialog(columnOption) {
+    confirmFormatConfigDialog(columnSelectedWidget) {
+      const options = columnSelectedWidget.options;
       let row = this.optionModel.tableColumns[this.operateIndex];
-      row.columnOption = columnOption;
-      row.prop = columnOption.name;
-      row.label = columnOption.label;
-      row.required = columnOption.required;
+      row.widget = columnSelectedWidget;
+      row.prop = options.name;
+      row.label = options.label;
+      row.required = options.required;
     },
     openFieldTreeDialog() {
       this.treeData = [{

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

@@ -107,8 +107,8 @@ export default {
     openEditFormatConfigDialog(fieldWidget, index) {
       this.openWidgetPropertyDialog({
         columnSelectedWidget: deepClone(fieldWidget),
-        callback: (columnOption) => {
-          fieldWidget.options = columnOption;
+        callback: (columnSelectedWidget) => {
+          fieldWidget.options = columnSelectedWidget.options;
         },
       });
     },

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

@@ -26,8 +26,8 @@ export default {
   data() {
     return {
       labelIconPosition: [
-        { label: "front", value: "front" },
-        { label: "rear", value: "rear" },
+        { label: "前面", value: "front" },
+        { label: "后面", value: "rear" },
       ],
     };
   },

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

@@ -315,9 +315,8 @@ export default {
         columnSelectedWidget: widget,
         // index: index,
         // columnEditFields: columnEditFields,
-        callback: (columnOption) => {
-          widget.options = columnOption
-          // this.confirmFormatConfigDialog(columnOption, row);
+        callback: (columnSelectedWidget) => {
+          widget.options = columnSelectedWidget.options;
         },
       });
     },

package/src/components/xform/form-designer/setting-panel/widgetPropertyDialogMixin.js

@@ -63,10 +63,10 @@ export default {
       }
       const dialog = this.widgetPropertyDialogs[index];
       if (invokeCallback && dialog.formatConfig && dialog.formatConfig.callback) {
-        const columnOption = this.$baseLodash.cloneDeep(
-          dialog.columnSelectedWidget.options
+        const columnSelectedWidget = this.$baseLodash.cloneDeep(
+          dialog.columnSelectedWidget
         );
-        dialog.formatConfig.callback(columnOption);
+        dialog.formatConfig.callback(columnSelectedWidget);
       }
       this.widgetPropertyDialogs.splice(index, 1);
       if (this.activePropertyDialogId === id) {

package/src/components/xform/form-render/container-item/data-table-mixin.js

@@ -799,22 +799,6 @@ modules = {
       };
 
       const addColumProperty = (col, t) => {
-        /*let columnOption;
-        let widget;
-        let columnWidgetConfig = this.getColumnWidgetConfig(t);
-        let {columnSelectedWidget, columnEditFields} = columnWidgetConfig;
-        if (columnSelectedWidget) {
-          widget = columnSelectedWidget;
-          columnOption = widget.options;
-        } else {
-          columnOption = {};
-        }
-
-        let {columnSelectedWidget: editWidget} = this.getColumnWidgetConfig(
-          t,
-          true
-        );*/
-
         let widget = t.widget ?? null;
         let editWidget = t.editWidget ?? null;
         let columnOption = {};
@@ -828,9 +812,10 @@ modules = {
           required: t.required || false,
           columnConfig: t,
           editWidget,
-          utcTransformEnabled: widget || editWidget
-            ? !!columnOption.utcTransformEnabled
-            : this.isColumnLevelUtcFormat(t.formatS)
+          utcTransformEnabled:
+            widget || editWidget
+              ? !!columnOption.utcTransformEnabled
+              : this.isColumnLevelUtcFormat(t.formatS)
               ? !!t.utcTransformEnabled
               : false,
         };
@@ -908,7 +893,9 @@ modules = {
                     if (Array.isArray(displayVal)) {
                       return displayVal
                         .map((item) =>
-                          typeof item === "string" ? item.substring(0, 10) : item
+                          typeof item === "string"
+                            ? item.substring(0, 10)
+                            : item
                         )
                         .join(",");
                     } else {
@@ -965,25 +952,6 @@ modules = {
         newColumns.push(col);
       });
 
-      /* let tableConfig = this.tableConfig;
-      let flag = tableConfig?.config?.toolbarConfig?.custom !== false;
-      if (
-        baseRefUtil.tableConfig &&
-        baseRefUtil.tableConfig.className === "list-table" &&
-        flag
-      ) {
-        if (tableColumns.length) {
-          let tableColumn = tableColumns[tableColumns.length - 1];
-          if (tableColumn.fixed !== "right") {
-            newColumns.push({
-              width: 47,
-              title: "",
-              fixed: "right",
-              sortable: false,
-            });
-          }
-        }
-      } */
       this.rowWidgetList = rowWidgetList;
       return this.$baseLodash.cloneDeep(newColumns);
     },
@@ -1290,9 +1258,6 @@ modules = {
             let editWidget = item.editWidget;
             if (editWidget && editWidget.options.required) {
               let formField = this.getFieldKeyName(editWidget);
-              /* editRules[formField] = [
-                { required: true, message: `[${editWidget.options.label}]不能为空` }
-              ]; */
             }
           }
         });
@@ -2220,118 +2185,10 @@ modules = {
         let newData = this.createNewTableData();
         tableRows.push(newData);
       }
-      // this.formModel[this.fieldKeyName] = this.$baseLodash(this.fieldModel)
-      // this.fieldModel = tableRows
       this.setValue(tableRows);
       this.$nextTick(() => {
         this.handleWbs();
       });
-      // $grid.loadData(tableRows);
-    },
-    getColumnWidgetConfig(row, isEdit) {
-      let formatS = isEdit ? row.editFormatS : row.formatS;
-      let formRef = this.getFormRef();
-      let columnSelectedWidget = null;
-      let columnEditFields = null;
-
-      let type = columnFormatMap[formatS];
-
-      if (type) {
-        columnSelectedWidget = this.$baseLodash.cloneDeep(
-          formRef.getFieldWidgetByType(type)
-        );
-        let tmpId = generateId();
-        let idVal = row.prop ? row.prop : type + tmpId;
-        /*
-        columnSelectedWidget.id = idVal;*/
-        /*if(isEdit){
-          columnSelectedWidget.id = "edit_"+row.columnId;
-        }else{
-          columnSelectedWidget.id = row.columnId;
-        }*/
-        // columnSelectedWidget.id = row.columnId;
-
-        columnSelectedWidget.options.name = idVal;
-
-        let columnOption;
-        if (!isEdit) {
-          columnOption = row.columnOption;
-        } else {
-          columnOption = row.editColumnOption;
-        }
-
-        if (columnOption && Object.keys(columnOption).length) {
-          columnOption.required = row.required || false;
-          columnSelectedWidget.options = columnOption;
-          if ("editDelete" === formatS) {
-            columnSelectedWidget.options.hiddenByWf =
-              columnSelectedWidget.options.hiddenByWf ?? true;
-            columnSelectedWidget.options.prefixIcon =
-              columnSelectedWidget.options.prefixIcon || "el-icon-delete";
-          } else if ("editButton" === formatS) {
-            columnSelectedWidget.options.prefixIcon =
-              columnSelectedWidget.options.prefixIcon || "el-icon-edit";
-          }
-        } else {
-          columnSelectedWidget.options.required = row.required || false;
-          if ("editDelete" === formatS) {
-            columnSelectedWidget.options.prefixIcon = "el-icon-delete";
-            columnSelectedWidget.options.label = "删除";
-            columnSelectedWidget.options.labelHidden = true;
-            columnSelectedWidget.options.hiddenByWf = true;
-            columnSelectedWidget.options.onClick =
-              "let tableParam = this.tableParam;\nlet tableRef = this.getWidgetRef(this.parentWidget.options.name);\ntableRef.deleteRow(tableParam.row,tableParam.rowIndex);";
-          } else if ("editButton" === formatS) {
-            columnSelectedWidget.options.prefixIcon = "el-icon-edit";
-            columnSelectedWidget.options.label = "查看";
-            columnSelectedWidget.options.labelHidden = true;
-            columnSelectedWidget.options.onClick =
-              "let tableParam = this.tableParam;\nlet tableRef = this.getWidgetRef(this.parentWidget.options.name);\ntableRef.openEditDialog(tableParam.row)";
-          } else if ("addSiblingEditRow" === formatS) {
-            columnSelectedWidget.options.prefixIcon = "el-icon-plus";
-            columnSelectedWidget.options.label = "新增兄弟节点";
-            columnSelectedWidget.options.labelHidden = false;
-            columnSelectedWidget.options.onClick =
-              "let tableParam = this.tableParam;\nthis.getParentTarget().addSiblingTreeRow(null,tableParam);";
-          } else if ("addChildTreeRow" === formatS) {
-            columnSelectedWidget.options.prefixIcon = "el-icon-plus";
-            columnSelectedWidget.options.label = "新增子节点";
-            columnSelectedWidget.options.labelHidden = false;
-            columnSelectedWidget.options.onClick =
-              "let tableParam = this.tableParam;\nthis.getParentTarget().addChildTreeRow(null,tableParam);";
-          } else if ("moveUpRow" === formatS) {
-            // columnSelectedWidget.options.prefixIcon = "el-icon-plus";
-            columnSelectedWidget.options.label = "↑上移";
-            columnSelectedWidget.options.labelHidden = false;
-            columnSelectedWidget.options.onClick =
-              "let tableParam = this.tableParam;\nthis.getParentTarget().moveUpRow(tableParam);";
-          } else if ("moveDownRow" === formatS) {
-            // columnSelectedWidget.options.prefixIcon = "el-icon-plus";
-            columnSelectedWidget.options.label = "↓下移";
-            columnSelectedWidget.options.labelHidden = false;
-            columnSelectedWidget.options.onClick =
-              "let tableParam = this.tableParam;\nthis.getParentTarget().moveDownRow(tableParam);";
-          } else if ("removeTreeRow" === formatS) {
-            columnSelectedWidget.options.prefixIcon = "el-icon-delete";
-            columnSelectedWidget.options.label = "删除";
-            columnSelectedWidget.options.labelHidden = true;
-            columnSelectedWidget.options.onClick =
-              "let tableParam = this.tableParam;\nthis.getParentTarget().removeTreeRow(tableParam);";
-          }
-          columnOption = columnSelectedWidget.options;
-        }
-        if (columnSelectedWidget.options.hasOwnProperty("keyName")) {
-          columnSelectedWidget.options.keyName = row.prop;
-          columnSelectedWidget.options.keyNameEnabled = true;
-        } else {
-          columnSelectedWidget.options.name = row.prop;
-        }
-        if (type !== "button" && type !== "a-link") {
-          columnSelectedWidget.options.label = row.label;
-          columnSelectedWidget.options.labelHidden = true;
-        }
-      }
-      return { columnSelectedWidget, columnEditFields };
     },
     getColumnProp2(fieldWidget, obj) {
       let isQueryTable = this.widget.options.isQueryTable || false;

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

@@ -49,7 +49,7 @@ export function applyColumnLabelIcon(col, columnConfig) {
   }
 
   const iconClass = columnConfig.labelIconClass;
-  const position = columnConfig.labelIconPosition || "front";
+  const position = columnConfig.labelIconPosition || "rear";
   const tooltip = columnConfig.labelTooltip;
   const required = !!columnConfig.required;
   const title = col.title;