@juzhenfe/page-model 3.9.38 → 3.9.39

package/dist/components/table/constructor.d.ts

@@ -99,6 +99,10 @@ export default class TableManager extends IManager {
      * 当前聚焦的单元格
      */
     focusCellKey: string;
+    /**
+     * 当前聚焦的列
+     */
+    focusEl: PageModel.TableBaseItem;
     /**
      * 移除当前单元格聚焦
      */
@@ -107,6 +111,10 @@ export default class TableManager extends IManager {
      * document点击事件
      */
     documentClickHandler: (e: MouseEvent) => void;
+    /**
+     * 移除单元格外点击事件
+     */
+    removeCellOutClickEvent(): void;
     /**
      * 单元格外点击，清理选中
      */
@@ -214,4 +222,5 @@ export default class TableManager extends IManager {
     updateScrollTop(top: any): void;
     scrollLeft: number;
     updateScrollLeft(left: any): void;
+    destroy(): void;
 }

package/dist/index.es.js

@@ -1003,6 +1003,8 @@ class IManager extends Reflections {
   updateStaticData(data) {
     this.staticData = data;
   }
+  destroy() {
+  }
 }
 class TopTabsManager extends IManager {
   constructor() {
@@ -6416,6 +6418,9 @@ const _PageModelManager = class extends Reflections {
     this.loadingInstance && this.loadingInstance.close();
   }
   destroy() {
+    this.children.forEach((item) => {
+      item.destroy();
+    });
     this.destroyReflect();
   }
 };
@@ -6824,6 +6829,7 @@ class TableManager extends IManager {
     __publicField(this, "randomRowKey", null);
     __publicField(this, "totalEls", []);
     __publicField(this, "focusCellKey");
+    __publicField(this, "focusEl");
     __publicField(this, "documentClickHandler");
     __publicField(this, "radioData", null);
     __publicField(this, "currentRenderTableEls");
@@ -7056,10 +7062,13 @@ class TableManager extends IManager {
       this.focusCellKey = null;
     }
   }
-  bindCellOutClickEvent() {
+  removeCellOutClickEvent() {
     if (this.documentClickHandler) {
       document.removeEventListener("click", this.documentClickHandler);
     }
+  }
+  bindCellOutClickEvent() {
+    this.removeCellOutClickEvent();
     const handler = (e) => {
       if (!this.focusCellKey) {
         return;
@@ -7067,8 +7076,14 @@ class TableManager extends IManager {
       const clickElement = e.target;
       let isInCurrentCell = false;
       let loopElement = clickElement;
+      let poperClass = "";
+      if (this.focusEl.editData.triggerPoperClassName) {
+        poperClass = this.focusEl.editData.triggerPoperClassName;
+      } else {
+        poperClass = this.focusEl.editData.eType;
+      }
       while (loopElement) {
-        if (loopElement.getAttribute("cell-key") === this.focusCellKey) {
+        if (loopElement.getAttribute("cell-key") === this.focusCellKey || loopElement.className && poperClass && typeof loopElement.className === "string" && loopElement.className.includes(poperClass)) {
           isInCurrentCell = true;
           break;
         }
@@ -7117,6 +7132,7 @@ class TableManager extends IManager {
         this.blurCell();
       }
       cell.id = this.focusCellKey = cellKey;
+      this.focusEl = tableEl;
       this.focusCell(cell);
     }.bind(this);
     this.bindCellOutClickEvent();
@@ -7127,14 +7143,15 @@ class TableManager extends IManager {
     const cellEle = document.querySelector(`#${cellKey}`);
     cellEle.setAttribute("data-edit", "true");
     setTimeout(() => {
-      var _a;
-      (_a = cellEle.querySelector("input")) == null ? void 0 : _a.click();
-    });
+      var _a, _b;
+      (_a = cellEle.querySelector("input")) == null ? void 0 : _a.focus();
+      (_b = cellEle.querySelector("input")) == null ? void 0 : _b.click();
+    }, 0);
   }
   closeCellEditing(cellKey) {
     this.editableOpen.set(cellKey, false);
     const cellEle = document.querySelector(`#${this.focusCellKey}`);
-    cellEle.setAttribute("data-edit", "false");
+    cellEle && cellEle.setAttribute("data-edit", "false");
   }
   saveRowData(cellKey, data) {
     this.editableData.set(cellKey, JSON.stringify(data));
@@ -7460,6 +7477,9 @@ class TableManager extends IManager {
   updateScrollLeft(left) {
     this.scrollLeft = left;
   }
+  destroy() {
+    this.removeCellOutClickEvent();
+  }
 }
 const _sfc_main$q = defineComponent({
   name: "TableCellRenderer",
@@ -14948,7 +14968,7 @@ const defineEditableTable = function(config) {
   return reactive(config);
 };
 const name = "@juzhenfe/page-model";
-const version = "3.9.38";
+const version = "3.9.39";
 const types = "dist/main.d.ts";
 const main = "dist/index.umd.js";
 const keywords = [