cloud-web-corejs 1.0.54-dev.419 → 1.0.54-dev.420

package/src/components/xform/form-designer/form-widget/field-widget/oplog-widget.vue

@@ -147,6 +147,7 @@ export default {
       this.initData();
     },
     initData(option) {
+      if (this.designState) return;
       let reportTemplate = this.getFormRef().reportTemplate;
       let formCode = reportTemplate.formCode;
       let scriptCode = this.field.options.formScriptCode;

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

@@ -104,9 +104,7 @@
               @change="changeFormatS(scope.row, false)"
               clearable
             >
-              <el-option-group
-                :label="i18nt('designer.setting.customRenderGroup')"
-              >
+              <el-option-group :label="i18nt('designer.setting.customRenderGroup')">
                 <el-option value="render" label="render"></el-option>
               </el-option-group>
               <el-option-group v-for="t in op" :key="t.label" :label="t.label">
@@ -169,12 +167,7 @@
             <el-switch v-model="scope.row.sortable"></el-switch>
           </template>
         </el-table-column>
-        <el-table-column
-          label="编辑更多属性"
-          width="100"
-          align="center"
-          fixed="right"
-        >
+        <el-table-column label="编辑更多属性" width="100" align="center" fixed="right">
           <template #default="scope">
             <el-button
               size="mini"
@@ -288,11 +281,7 @@
       top="7vh"
       :append-to-body="true"
     >
-      <el-alert
-        type="info"
-        :closable="!1"
-        title="function customRender(params,h) {"
-      />
+      <el-alert type="info" :closable="!1" title="function customRender(params,h) {" />
       <code-editor
         ref="dsResultEditor"
         mode="javascript"
@@ -461,9 +450,7 @@
               @change="changeFormatS(rowData, false)"
               clearable
             >
-              <el-option-group
-                :label="i18nt('designer.setting.customRenderGroup')"
-              >
+              <el-option-group :label="i18nt('designer.setting.customRenderGroup')">
                 <el-option value="render" label="render"></el-option>
               </el-option-group>
               <el-option-group v-for="t in op" :key="t.label" :label="t.label">
@@ -484,8 +471,7 @@
               icon="el-icon-edit"
               @click="openFormatConfigDialog(rowData, rowDataIndex)"
               :disabled="
-                !columnFormatMap[rowData.formatS] &&
-                'widgetRender' !== rowData.formatS
+                !columnFormatMap[rowData.formatS] && 'widgetRender' !== rowData.formatS
               "
             ></el-button>
           </el-form-item>
@@ -565,9 +551,7 @@
               plain=""
               round=""
               icon="el-icon-edit"
-              @click="
-                editFormEventHandler(rowData, rowDataIndex, 'footerMethodConfg')
-              "
+              @click="editFormEventHandler(rowData, rowDataIndex, 'footerMethodConfg')"
               :disabled="rowData.footerDataType !== '3'"
             ></el-button>
           </el-form-item>
@@ -583,11 +567,7 @@
         </el-form>
       </div>
       <div class="dialog-footer" slot="footer">
-        <el-button
-          @click="closeRowEditDialog"
-          class="button-sty"
-          icon="el-icon-close"
-        >
+        <el-button @click="closeRowEditDialog" class="button-sty" icon="el-icon-close">
           {{ i18nt("designer.hint.cancel") }}
         </el-button>
         <el-button
@@ -609,7 +589,7 @@ import {
   generateId,
   loopHandleWidget,
   deepClone,
-  columnFormatMap
+  columnFormatMap,
 } from "../../../../../../components/xform/utils/util";
 import columnRenderDialog from "./columnRenderDialog.vue";
 
@@ -871,7 +851,7 @@ export default {
       showFormEventDialogFlag: false,
       formEventHandlerCode: "",
       curEventName: "",
-      curEventRow:null,
+      curEventRow: null,
 
       eventParamsMap: {
         footerMethodConfg: "footerMethodConfg(dataId,formCode,param) {",
@@ -912,21 +892,16 @@ export default {
         });
 
         if (syntaxErrorFlag) {
-          this.$message.error(
-            this.i18nt("designer.setting.syntaxCheckWarning")
-          );
+          this.$message.error(this.i18nt("designer.setting.syntaxCheckWarning"));
           return;
         }
       }
-      this.curEventRow[this.curEventName] =
-        this.formEventHandlerCode;
+      this.curEventRow[this.curEventName] = this.formEventHandlerCode;
       this.showFormEventDialogFlag = false;
     },
     init() {
       setTimeout(() => {
-        this.tableData = this.$baseLodash.cloneDeep(
-          this.optionModel.tableColumns
-        );
+        this.tableData = this.$baseLodash.cloneDeep(this.optionModel.tableColumns);
         this.$nextTick(() => {
           this.rowDrop();
           setTimeout(() => {
@@ -1026,8 +1001,7 @@ export default {
       let newRow = this.generateRow(generateParentId);
       if (children) {
         if (type === "SIBLING") {
-          let addIndex =
-            children.findIndex((item) => item.columnId == row.columnId) + 1;
+          let addIndex = children.findIndex((item) => item.columnId == row.columnId) + 1;
           children.splice(addIndex, 0, newRow);
         } else {
           children.push(newRow);
@@ -1074,9 +1048,7 @@ export default {
       const { parentId, columnId } = row;
       // 根节点直接删除
       if (!parentId) {
-        const delIndex = this.tableData.findIndex(
-          (item) => item.columnId === columnId
-        );
+        const delIndex = this.tableData.findIndex((item) => item.columnId === columnId);
         this.tableData.splice(delIndex, 1);
       } else {
         // 找到父节点，通过父节点删除
@@ -1095,9 +1067,7 @@ export default {
 
         const { children } = parentRow;
 
-        const delIndex = children.findIndex(
-          (item) => item.columnId === columnId
-        );
+        const delIndex = children.findIndex((item) => item.columnId === columnId);
 
         children.splice(delIndex, 1);
       }
@@ -1161,9 +1131,7 @@ export default {
     //数组转树
     arrToTree(arr, parentId) {
       return arr
-        .filter((item) =>
-          !parentId ? !item.parentId : item.parentId === parentId
-        )
+        .filter((item) => (!parentId ? !item.parentId : item.parentId === parentId))
         .map((item) => {
           item.children = this.arrToTree(arr, item.columnId);
           return item;
@@ -1257,7 +1225,8 @@ export default {
       let isButtontCell = this.getIsButtontCell(formatS);
       // let columnWidgetConfig = this.getColumnWidgetConfig(row, true, isEdit);
       // let { columnSelectedWidget, columnEditFields } = columnWidgetConfig;
-      let columnSelectedWidget = this.designer.createColumnWidget(row, isEdit)
+      let attachmentPrefix = this.designer.getAttachmentPrefix();
+      let columnSelectedWidget = this.designer.createColumnWidget(row, isEdit);
       if (!isEdit) {
         //格式化类型
         if (columnSelectedWidget) {
@@ -1268,6 +1237,11 @@ export default {
           row.widget = null;
         }
       } else {
+        if (row.prop && row.prop.startsWith(attachmentPrefix)) {
+          let suffix = row.prop.replace(attachmentPrefix, "");
+          columnSelectedWidget.options.keyName = row.prop;
+          columnSelectedWidget.options.keyNameSuffix = suffix;
+        }
         //编辑插槽类型
         if (columnSelectedWidget) {
           row.columnOption = columnSelectedWidget.options;
@@ -1300,9 +1274,7 @@ export default {
           if (!row.label) row.label = tmpId;
 
           if (this.userFields.includes(row.formatS)) {
-            let item = this.businessOptions.find(
-              (item) => item.value == row.formatS
-            );
+            let item = this.businessOptions.find((item) => item.value == row.formatS);
             if (item) {
               row.prop = item.value;
               row.label = item.label;
@@ -1311,11 +1283,12 @@ export default {
 
           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 (!isEdit) {
+            if (formatS == "editAttachment") {
+              row.prop = columnSelectedWidget.options.keyName;
+            } else {
+              row.prop = row.prop.replaceAll(attachmentPrefix, "");
+            }
           }
         }
       }
@@ -1439,10 +1412,7 @@ export default {
             result = column;
             break;
           } else if (column.children && column.children.length) {
-            let subColumn = this.findColumnByColumnId(
-              column.children,
-              children
-            );
+            let subColumn = this.findColumnByColumnId(column.children, children);
             if (subColumn) {
               result = subColumn;
               break;
@@ -1473,10 +1443,7 @@ export default {
         loopHandleWidget(formWidgetList, (item) => {
           if (item.options.name == dataTableName) {
             item.options.tableColumns = tableData;
-            targetColumn = this.findColumnByColumnId(
-              item.options.tableColumns,
-              columnId
-            );
+            targetColumn = this.findColumnByColumnId(item.options.tableColumns, columnId);
           }
         });
         let getWidgetList = (subWidgetList = []) => {
@@ -1549,7 +1516,6 @@ export default {
       }
     },
     openEditFormatConfigDialog(row, index) {
-
       let selectedWidget = row.editWidget;
       this.operateIndex = index;
 
@@ -1612,9 +1578,7 @@ export default {
         });
 
         if (syntaxErrorFlag) {
-          this.$message.error(
-            this.i18nt("designer.setting.syntaxCheckWarning")
-          );
+          this.$message.error(this.i18nt("designer.setting.syntaxCheckWarning"));
           return;
         }
       }
@@ -1638,25 +1602,19 @@ export default {
       let type1 = this.columnFormatMap[row.formatS];
       let type2 = this.columnFormatMap[row.editFormatS];
       let newWidget = type1
-        ? this.designer.copyNewFieldWidget(
-            this.designer.getFieldWidgetByType(type1)
-          )
+        ? this.designer.copyNewFieldWidget(this.designer.getFieldWidgetByType(type1))
         : null;
 
       let newEditWidget = type2
-        ? this.designer.copyNewFieldWidget(
-            this.designer.getFieldWidgetByType(type2)
-          )
+        ? this.designer.copyNewFieldWidget(this.designer.getFieldWidgetByType(type2))
         : null;
 
       if (newWidget.formItemFlag) {
         if (row.widget) {
-          if (row.widget.options[key] !== undefined)
-            row.widget.options[key] = value;
+          if (row.widget.options[key] !== undefined) row.widget.options[key] = value;
         }
         if (row.columnOption) {
-          if (row.columnOption[key] !== undefined)
-            row.columnOption[key] = value;
+          if (row.columnOption[key] !== undefined) row.columnOption[key] = value;
         }
       }
 
@@ -1666,8 +1624,7 @@ export default {
             row.editWidget.options[key] = value;
         }
         if (row.editColumnOption) {
-          if (row.editColumnOption[key] !== undefined)
-            row.editColumnOption[key] = value;
+          if (row.editColumnOption[key] !== undefined) row.editColumnOption[key] = value;
         }
       }
     },