cloud-web-corejs 1.0.54-dev.457 → 1.0.54-dev.459

package/src/components/vb-tabs/x-tabs.vue

@@ -21,6 +21,10 @@ export default {
       type: String,
       default: () => "id",
     },
+    tabNameEnable: {
+      type: Boolean,
+      default: () => false,
+    },
   },
   data() {
     return {
@@ -75,13 +79,20 @@ export default {
       }, 200);
     },
     removeTab(targetName) {
+      let tabNameEnable = this.tabNameEnable;
       let paneKeyName = this.paneKeyName;
-      let tabIndex = this.tabs.findIndex(
-        (tab) => tab.data[paneKeyName] + "" === targetName
-      );
+      let tabIndex = this.tabs.findIndex((tab) => {
+        if (tabNameEnable) {
+          return tab.tabName === targetName;
+        } else {
+          return tab.data[paneKeyName] + "" === targetName;
+        }
+      });
       if (this.activeName === targetName) {
         if (tabIndex > 0) {
-          this.activeName = this.tabs[tabIndex - 1].data[paneKeyName] + "";
+          this.activeName = tabNameEnable
+            ? tab.tabName
+            : this.tabs[tabIndex - 1].data[paneKeyName] + "";
         } else {
           this.activeName = "second";
         }

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

@@ -10,8 +10,9 @@
   >
     <el-dropdown trigger="hover" v-if="designState" :disabled="field.options.disabled">
       <el-button type="primary" class="button-sty" size="mini">
-        <span>{{ $t1("导出/打印") }}</span
-        ><span class="line"></span> <i class="el-icon-arrow-down el-icon--right"></i>
+        <span>{{ getI18nLabel(field.options.label) }}</span
+        ><span class="line"></span>
+        <i class="el-icon-arrow-down el-icon--right"></i>
       </el-button>
     </el-dropdown>
     <base-input-export
@@ -78,12 +79,17 @@ export default {
       let codes = this.field.options.printItems
         .filter((item) => !!item.code)
         .map((item) => item.code);
+      let label = null;
+      if (this.field.options.customLabelEnabled && this.field.options.label) {
+        label = this.$t1(this.field.options.label);
+      }
       let option = {
         prefix: prefix,
         tableTarget: () => {
           return this.getWidgetRef(this.field.options.printTableRef).getGridTable();
         },
         codes,
+        label,
         // codes: ["USEREXCEL", "USERPDF", "USERPRINT", "USERHIPRINT", "USERJDPRINT", "USERPDDPRINT", "USERVIPPRINT"],
         // ...printOption
       };

package/src/components/xform/form-designer/form-widget/field-widget/print-detail-button-widget.vue

@@ -10,7 +10,7 @@
   >
     <el-dropdown trigger="hover" v-if="designState" :disabled="field.options.disabled">
       <el-button type="primary" class="button-sty" size="mini">
-        <span>{{ $t1("导出/打印") }}</span
+        <span>{{ getI18nLabel(field.options.label) }}</span
         ><span class="line"></span>
         <i class="el-icon-arrow-down el-icon--right"></i>
       </el-button>
@@ -79,9 +79,14 @@ export default {
       let codes = this.field.options.printItems
         .filter((item) => !!item.code)
         .map((item) => item.code);
+      let label = null;
+      if (this.field.options.customLabelEnabled && this.field.options.label) {
+        label = this.$t1(this.field.options.label);
+      }
       let option = {
         prefix: prefix,
         codes,
+        label,
         customCondition: (exportTemplate) => {
           let param = {
             formData: this.formModel,

package/src/components/xform/form-designer/setting-panel/property-editor/field-print-button/print-button-editor.vue

@@ -3,6 +3,9 @@
     <el-form-item label-width="0">
       <el-divider class="custom-divider">打印设置</el-divider>
     </el-form-item>
+    <el-form-item label="启用自定义按钮名称">
+      <el-switch v-model="optionModel.customLabelEnabled"></el-switch>
+    </el-form-item>
     <el-form-item label="表格唯一名称">
       <el-input v-model="optionModel.printTableRef"></el-input>
     </el-form-item>
@@ -15,18 +18,38 @@
     </el-form-item> -->
     <el-form-item label="输出模板编码"></el-form-item>
     <el-form-item label-width="0">
-      <draggable tag="ul" class="draggable-box" :list="optionModel.printItems"
-                 v-bind="{ group: 'optionsGroup', ghostClass: 'ghost', handle: '.drag-option' }">
+      <draggable
+        tag="ul"
+        class="draggable-box"
+        :list="optionModel.printItems"
+        v-bind="{ group: 'optionsGroup', ghostClass: 'ghost', handle: '.drag-option' }"
+      >
         <li v-for="(item, index) in optionModel.printItems" :key="index" class="col-item">
           <i class="el-icon-s-operation drag-option"></i>
-          <el-input v-model="item.code" class="cell-span-input" style="width: 160px !important;"></el-input>
-          <el-button circle plain size="mini" type="danger" @click="deleteItem(index)"
-                     icon="el-icon-minus" class="col-delete-button" style="position: unset;"></el-button>
+          <el-input
+            v-model="item.code"
+            class="cell-span-input"
+            style="width: 160px !important"
+          ></el-input>
+          <el-button
+            circle
+            plain
+            size="mini"
+            type="danger"
+            @click="deleteItem(index)"
+            icon="el-icon-minus"
+            class="col-delete-button"
+            style="position: unset"
+          ></el-button>
         </li>
       </draggable>
       <div>
-        <el-button type="text" @click="addItem" icon="el-icon-circle-plus-outline"
-                   class="add-option">
+        <el-button
+          type="text"
+          @click="addItem"
+          icon="el-icon-circle-plus-outline"
+          class="add-option"
+        >
           新增
         </el-button>
       </div>
@@ -36,9 +59,8 @@
 
 <script>
 import i18n from "../../../../../../components/xform/utils/i18n";
-import eventMixin
-  from "../../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
-import Draggable from 'vuedraggable';
+import eventMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
+import Draggable from "vuedraggable";
 
 export default {
   name: "print-button-editor",
@@ -54,17 +76,17 @@ export default {
   data() {
     return {
       eventParams: [],
-      printConditionParams: ["dataId", "formCode", "exportTemplate"]
+      printConditionParams: ["dataId", "formCode", "exportTemplate"],
     };
   },
   methods: {
     deleteItem(index) {
-      this.optionModel.printItems.splice(index, 1)
+      this.optionModel.printItems.splice(index, 1);
     },
     addItem() {
-      this.optionModel.printItems.push({code: null});
-    }
-  }
+      this.optionModel.printItems.push({ code: null });
+    },
+  },
 };
 </script>
 
@@ -91,4 +113,3 @@ li.ghost {
   width: 100px;
 }
 </style>
-

package/src/components/xform/form-designer/setting-panel/property-editor/field-print-button/print-detail-button-editor.vue

@@ -3,27 +3,53 @@
     <el-form-item label-width="0">
       <el-divider class="custom-divider">详情打印设置</el-divider>
     </el-form-item>
+    <el-form-item label="启用自定义按钮名称">
+      <el-switch v-model="optionModel.customLabelEnabled"></el-switch>
+    </el-form-item>
     <el-form-item label="打印自定义条件参数">
-      <a href="javascript:void(0);" class="a-link link-oneLind"
-         @click="editEventHandler('printCustomCondition', printConditionParams)">
+      <a
+        href="javascript:void(0);"
+        class="a-link link-oneLind"
+        @click="editEventHandler('printCustomCondition', printConditionParams)"
+      >
         <span>{{ optionModel.printCustomCondition }}</span>
         <i class="el-icon-edit"></i>
       </a>
     </el-form-item>
     <el-form-item label="输出模板编码"></el-form-item>
     <el-form-item label-width="0">
-      <draggable tag="ul" class="draggable-box" :list="optionModel.printItems"
-                 v-bind="{ group: 'optionsGroup', ghostClass: 'ghost', handle: '.drag-option' }">
+      <draggable
+        tag="ul"
+        class="draggable-box"
+        :list="optionModel.printItems"
+        v-bind="{ group: 'optionsGroup', ghostClass: 'ghost', handle: '.drag-option' }"
+      >
         <li v-for="(item, index) in optionModel.printItems" :key="index" class="col-item">
           <i class="el-icon-s-operation drag-option"></i>
-          <el-input v-model="item.code" class="cell-span-input" style="width: 160px !important;"></el-input>
-          <el-button circle plain size="mini" type="danger" @click="deleteItem(index)"
-                     icon="el-icon-minus" class="col-delete-button" style="position: unset;"></el-button>
+          <el-input
+            v-model="item.code"
+            class="cell-span-input"
+            style="width: 160px !important"
+          ></el-input>
+          <el-button
+            circle
+            plain
+            size="mini"
+            type="danger"
+            @click="deleteItem(index)"
+            icon="el-icon-minus"
+            class="col-delete-button"
+            style="position: unset"
+          ></el-button>
         </li>
       </draggable>
       <div>
-        <el-button type="text" @click="addItem" icon="el-icon-circle-plus-outline"
-                   class="add-option">
+        <el-button
+          type="text"
+          @click="addItem"
+          icon="el-icon-circle-plus-outline"
+          class="add-option"
+        >
           新增
         </el-button>
       </div>
@@ -33,9 +59,8 @@
 
 <script>
 import i18n from "../../../../../../components/xform/utils/i18n";
-import eventMixin
-  from "../../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
-import Draggable from 'vuedraggable';
+import eventMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
+import Draggable from "vuedraggable";
 
 export default {
   name: "print-detail-button-editor",
@@ -51,17 +76,17 @@ export default {
   data() {
     return {
       eventParams: [],
-      printConditionParams: ["dataId", "formCode", "exportTemplate"]
+      printConditionParams: ["dataId", "formCode", "exportTemplate"],
     };
   },
   methods: {
     deleteItem(index) {
-      this.optionModel.printItems.splice(index, 1)
+      this.optionModel.printItems.splice(index, 1);
     },
     addItem() {
-      this.optionModel.printItems.push({code: null});
-    }
-  }
+      this.optionModel.printItems.push({ code: null });
+    },
+  },
 };
 </script>
 
@@ -88,4 +113,3 @@ li.ghost {
   width: 100px;
 }
 </style>
-

package/src/components/xform/form-designer/widget-panel/widgetsConfig.js

@@ -3147,6 +3147,7 @@ export const advancedFields = [
       ...defaultWfConfig,
       ...defaultWidgetShowRuleConfig,
 
+      customLabelEnabled: false,
       printButtonFlag:1,
       printTableRef: "",
       printItems: [],
@@ -3188,6 +3189,7 @@ export const advancedFields = [
       ...defaultWidgetShowRuleConfig,
 
       printDetailButtonFlag:1,
+      customLabelEnabled: false,
       printItems: [],
       printCustomCondition: "return {\n  id:[dataId]\n}",
 

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

@@ -540,10 +540,20 @@ modules = {
     },
     openEditDialog(row, param, option) {
       let formRef = this.getFormRef();
+      let formConfig = this.formConfig;
+      let formCode = null;
+      if(row?.id){
+        formCode = formConfig.editFormCode;
+      }else{
+        formCode = formConfig.addFormCode || formConfig.editFormCode
+      }
       let parentTarget = formRef.$attrs["parent-target"];
       parentTarget &&
         parentTarget.$attrs.openEditDialog &&
-        parentTarget.$attrs.openEditDialog(row, param, option);
+        parentTarget.$attrs.openEditDialog(row, param, {
+          formCode,
+          ...option
+        });
     },
     importExcel() {},
     getGrid(that, tableRef) {

package/src/views/user/form/view/list.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="containt">
     <template v-if="layoutType == 'PC'">
-      <x-tabs ref="xTabs" v-model="activeName" class="tab-box">
+      <x-tabs ref="xTabs" v-model="activeName" class="tab-box" :tabNameEnable="true">
         <el-tab-pane :label="$t2('常规')" name="first">
           <vFormRender
             ref="edit"
@@ -51,15 +51,15 @@
                   reloadAutoContent(...args);
                 }
               "
-              :openEditDialog="openEditDialog"
+              :openEditDialog="openEditDialog1"
             ></vFormRender>
           </div>
         </el-tab-pane>
         <template #editTab="{ tab, index, reloadTabContent }">
           <el-tab-pane
-            :key="tab.data.id"
-            :label="tab.data[multiTabLabelField]"
-            :name="tab.data.id + ''"
+            :key="tab.tabName"
+            :label="tab.data[tab.tabLabelField]"
+            :name="tab.tabName"
             :closable="true"
           >
             <vFormRender
@@ -214,7 +214,16 @@ export default {
         return;
       }
       let formConfig = this.formJson.formConfig;
-      let multiTabEnabled = formConfig.multiTabEnabled && formConfig.multiTabLabelField;
+      let tabLabelField = option?.multiTabLabelField || formConfig.multiTabLabelField;
+      let multiTabEnabled = false;
+      if (tabLabelField) {
+        if (option?.multiTabEnabled) {
+          multiTabEnabled = true;
+        } else if (formConfig.multiTabEnabled && option?.multiTabEnabled !== false) {
+          multiTabEnabled = true;
+        }
+      }
+
       let dataId = row && row.id ? row.id : null;
       this.dataId = dataId;
       let formCode = null;
@@ -227,6 +236,8 @@ export default {
         this.$refs.xTabs.openEditTab(row, param, {
           tabParam: {
             formCode,
+            tabLabelField,
+            tabName: formCode + row[dataId],
           },
         });
       } else {
@@ -239,6 +250,9 @@ export default {
         this.$openEditView("showEdit");
       }
     },
+    openEditDialog1(row, param, option) {
+      this.openEditDialog(row, param, { multiTabEnabled: false, ...option });
+    },
     openEditH5Dialog(row) {
       this.formCode1 = this.addFormCode;
       this.dataId = row && row.id ? row.id : null;