cloud-web-corejs 1.0.95 → 1.0.96

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.95",
+  "version": "1.0.96",
   "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/table-column-dialog.vue

@@ -123,7 +123,7 @@
           <template #default="scope">
             <el-select
               v-model="scope.row.formatS"
-              @change="changeFormatS(scope.row)"
+              @change="changeFormatS(scope.row,false)"
               clearable
             >
               <el-option-group
@@ -203,7 +203,7 @@
           <template #default="scope">
             <el-select
               v-model="scope.row.editFormatS"
-              @change="changeFormatS(scope.row)"
+              @change="changeFormatS(scope.row,true)"
               clearable
             >
               <el-option
@@ -1158,55 +1158,71 @@ export default {
       return isButtontCell;
     },
     //drag end
-    changeFormatS(row) {
-      let isButtontCell = this.getIsButtontCell(row.formatS);
-      let columnWidgetConfig = this.getColumnWidgetConfig(row, true);
+    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;
-      if (columnSelectedWidget) {
-        row.columnOption = columnSelectedWidget.options;
-        row.widget = columnSelectedWidget;
-      } else {
-        row.columnOption = {};
-        row.widget = null;
+      if(!isEdit){
+        //格式化类型
+        if (columnSelectedWidget) {
+          row.columnOption = columnSelectedWidget.options;
+          row.widget = columnSelectedWidget;
+        } else {
+          row.columnOption = {};
+          row.widget = null;
+        }
+      }else{
+        //编辑插槽类型
+        if (columnSelectedWidget) {
+          row.columnOption = columnSelectedWidget.options;
+          row.editWidget = columnSelectedWidget;
+        } else {
+          row.editColumnOption = {};
+          row.editWidget = null;
+        }
       }
 
-      if (row.formatS == "editTreeButtonGroup") {
-        row.prop = null;
-        row.label = null;
-        row.sortable = false;
-        row.width = 150;
-      } else if (isButtontCell) {
-        if (row.formatS == "aLink" || row.formatS == "button") {
-          if (!row.width || row.width == 47) row.width = 150;
+      if(!isEdit){
+        if (row.formatS == "editTreeButtonGroup") {
+          row.prop = null;
+          row.label = null;
+          row.sortable = false;
+          row.width = 150;
+        } else if (isButtontCell) {
+          if (row.formatS == "aLink" || row.formatS == "button") {
+            if (!row.width || row.width == 47) row.width = 150;
+          } else {
+            row.width = 47;
+          }
+          row.prop = null;
+          row.label = null;
+          row.sortable = false;
         } else {
-          row.width = 47;
-        }
-        row.prop = null;
-        row.label = null;
-        row.sortable = false;
-      } else {
-        let tmpId = "column" + generateId();
-        if (!row.width || row.width == 47) row.width = 150;
-        if (!row.prop) row.prop = tmpId;
-        if (!row.label) row.label = tmpId;
+          let tmpId = "column" + generateId();
+          if (!row.width || row.width == 47) row.width = 150;
+          if (!row.prop) row.prop = tmpId;
+          if (!row.label) row.label = tmpId;
 
-        if (this.userFields.includes(row.formatS)) {
-          let item = this.businessOptions.find(item => item.value == row.formatS);
-          if (item) {
-            row.prop = item.value;
-            row.label = item.label;
+          if (this.userFields.includes(row.formatS)) {
+            let item = this.businessOptions.find(item => item.value == row.formatS);
+            if (item) {
+              row.prop = item.value;
+              row.label = item.label;
+            }
           }
-        }
 
-        row.sortable = true;
+          row.sortable = true;
 
-        if (row.formatS == "editAttachment") {
-          row.prop = this.designer.createAttachmentKeyName();
-        } else {
-          let attachmentPrefix = this.designer.getAttachmentPrefix();
-          row.prop = row.prop.replaceAll(attachmentPrefix, "");
+          if (row.formatS == "editAttachment") {
+            row.prop = this.designer.createAttachmentKeyName();
+          } else {
+            let attachmentPrefix = this.designer.getAttachmentPrefix();
+            row.prop = row.prop.replaceAll(attachmentPrefix, "");
+          }
         }
       }
+
     },
     getColumnWidgetConfig(row, isChange, isEdit) {
       let formatS = isEdit ? row.editFormatS : row.formatS;
@@ -1406,7 +1422,18 @@ export default {
     confirmFormatConfigDialog(columnOption, row) {
       // let row = this.tableData[this.operateIndex];
       row.columnOption = columnOption;
-      row.widget.options = columnOption;
+
+      if(row.widget){
+        row.widget.options = columnOption;
+      }else{
+        let type = this.columnFormatMap[row.formatS];
+        let fieldWidget = this.designer.copyNewFieldWidget(
+          this.designer.getFieldWidgetByType(type)
+        )
+        fieldWidget.options = columnOption;
+        row.widget = fieldWidget;
+      }
+
       let isButtontCell = this.getIsButtontCell(row.formatS);
       if (!isButtontCell) {
         row.prop = this.getFieldKeyNameByOptions(columnOption);
@@ -1446,7 +1473,19 @@ export default {
     confirmEditFormatConfigDialog(columnOption, row) {
       // let row = this.tableData[this.operateIndex];
       row.editColumnOption = columnOption;
-      row.editWidget.options = columnOption;
+      // row.editWidget.options = columnOption;
+
+      if(row.editWidget){
+        row.editWidget.options = columnOption;
+      }else{
+        let type = this.columnFormatMap[row.editFormatS];
+        let fieldWidget = this.designer.copyNewFieldWidget(
+          this.designer.getFieldWidgetByType(type)
+        )
+        fieldWidget.options = columnOption;
+        row.editWidget = fieldWidget;
+      }
+
       /*row.prop = columnOption.name;
       row.label = columnOption.label;
       row.required = columnOption.required;*/