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

package/package.json

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

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-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;