cloud-web-corejs 1.0.163 → 1.0.165

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.163",
+  "version": "1.0.165",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",
@@ -25,6 +25,7 @@
     "copy-webpack-plugin": "5.1.2",
     "core-js": "^3.8.3",
     "dayjs": "^1.11.13",
+    "dhtmlx-gantt": "^7.1.13",
     "element-ui": "^2.15.14",
     "html2canvas": "^1.4.1",
     "js-base64": "^3.7.7",

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 {
@@ -45,15 +49,18 @@ export default {
     openEditTab(row, param, option) {
       let paneKeyName = this.paneKeyName;
       let tab = this.tabs.find((tab) => tab.data[paneKeyName] === row[paneKeyName]);
+      let tabParam = option?.tabParam || {};
+      let dataId = row ? row[paneKeyName] : null;
+      let newTab = {
+        data: row,
+        showContent: false,
+        dataId: dataId,
+        param,
+        ...tabParam,
+      };
+      debugger;
       if (!tab) {
-        let tabParam = option?.tabParam || {};
-        tab = {
-          data: row,
-          showContent: false,
-          dataId: row[paneKeyName],
-          param,
-          ...tabParam,
-        };
+        tab = newTab;
         if (this.tabs.length >= 30) {
           this.tabs.splice(0, 1, tab);
         } else {
@@ -63,21 +70,31 @@ export default {
           let paneName = this.getCurrentPaneName();
           tab.paneName = paneName;
         });
+      } else {
+        Object.assign(tab, newTab);
       }
-      this.activeName = row[paneKeyName] + "";
+      let tabNameEnable = this.tabNameEnable;
+      this.activeName = row ? (tabNameEnable ? tab.tabName : row[paneKeyName] + "") : "";
       tab.showContent = false;
       setTimeout(() => {
         tab.showContent = true;
       }, 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";
         }