vxe-table 3.11.34 → 3.11.35

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.11.34";
+const version = "3.11.35";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2325,6 +2325,7 @@ core_.VxeUI.setConfig({
     filterConfig: {
       // remote: false,
       // filterMethod: null,
+      // destroyOnClose: false,
       showIcon: true
     },
     treeConfig: {
@@ -2792,7 +2793,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.11.34"}`;
+const log_version = `table v${"3.11.35"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -8057,7 +8058,7 @@ const Methods = {
         rceTimeout
       } = internalData;
       const el = $xeTable.$refs.refElem;
-      if (!el || !el.clientWidth) {
+      if (el && el.clientWidth) {
         $xeTable.autoCellWidth();
       }
       if (rceTimeout) {
@@ -12293,7 +12294,7 @@ const Methods = {
     const rowRest = fullAllDataRowIdData[getRowid($xeTable, row)];
     return rowRest && !!rowRest.treeLoaded;
   },
-  clearTreeExpandLoaded(row) {
+  clearTreeExpandLoaded(rows) {
     const $xeTable = this;
     const {
       treeOpts,
@@ -12301,16 +12302,22 @@ const Methods = {
       fullAllDataRowIdData
     } = this;
     const {
-      transform,
-      lazy
+      transform
     } = treeOpts;
-    const rowid = getRowid($xeTable, row);
-    const rowRest = fullAllDataRowIdData[rowid];
-    if (lazy && rowRest) {
-      rowRest.treeLoaded = false;
-      if (treeExpandedMaps[rowid]) {
-        delete treeExpandedMaps[rowid];
+    if (rows) {
+      if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rows)) {
+        rows = [rows];
       }
+      rows.forEach(row => {
+        const rowid = getRowid($xeTable, row);
+        const rowRest = fullAllDataRowIdData[rowid];
+        if (rowRest) {
+          rowRest.treeLoaded = false;
+          if (treeExpandedMaps[rowid]) {
+            delete treeExpandedMaps[rowid];
+          }
+        }
+      });
     }
     if (transform) {
       this.handleVirtualTreeToList();
@@ -17027,28 +17034,34 @@ const {
     }
   },
   render(h) {
+    const $xeTable = this.$parent;
     const {
-      $parent: $xetable,
       filterStore
     } = this;
     const {
       args,
+      visible,
+      multiple,
       column
     } = filterStore;
     const filterRender = column ? column.filterRender : null;
     const compConf = isEnableConf(filterRender) ? panel_renderer.get(filterRender.name) : null;
     const filterClassName = compConf ? compConf.tableFilterClassName || compConf.filterClassName : '';
+    const filterOpts = $xeTable.computeFilterOpts;
+    const {
+      destroyOnClose
+    } = filterOpts;
     return h('div', {
       class: ['vxe-table--filter-wrapper', 'filter--prevent-default', compConf && compConf.className ? compConf.className : '', getClass(filterClassName, Object.assign({
         $panel: this,
-        $table: $xetable
+        $table: $xeTable
       }, args)), {
-        'is--animat': $xetable.animat,
-        'is--multiple': filterStore.multiple,
-        'is--active': filterStore.visible
+        'is--animat': $xeTable.animat,
+        'is--multiple': multiple,
+        'is--active': visible
       }],
       style: filterStore.style
-    }, filterStore.visible && column ? this.renderOptions(h, filterRender, compConf).concat(this.renderFooter(h)) : []);
+    }, filterStore.visible && (destroyOnClose ? visible : true) && column ? this.renderOptions(h, filterRender, compConf).concat(this.renderFooter(h)) : []);
   },
   methods: {
     renderOptions(h, filterRender, compConf) {