vxe-table 3.17.0-beta.4 → 3.17.0-beta.6

package/es/table/module/filter/mixin.js

@@ -32,12 +32,18 @@ export default {
          */
         _setFilter(fieldOrColumn, options, isUpdate) {
             const $xeTable = this;
-            const column = handleFieldOrColumn(this, fieldOrColumn);
+            const reactData = $xeTable;
+            const { filterStore } = reactData;
+            const column = handleFieldOrColumn($xeTable, fieldOrColumn);
             if (column && column.filters) {
                 column.filters = toFilters(options || []);
                 if (isUpdate) {
-                    // 已废弃，即将去掉事件触发 new Event('click') -> null
-                    return $xeTable.handleColumnConfirmFilter(column, new Event('click'));
+                    return $xeTable.handleColumnConfirmFilter(column, null);
+                }
+                else {
+                    if (filterStore.visible) {
+                        $xeTable.handleFilterOptions(column);
+                    }
                 }
             }
             return $xeTable.$nextTick();
@@ -77,27 +83,9 @@ export default {
                     const { transfer } = filterOpts;
                     const tableRect = el.getBoundingClientRect();
                     const btnElem = evnt.currentTarget;
-                    const { filters, filterMultiple, filterRender } = column;
-                    const compConf = isEnableConf(filterRender) ? renderer.get(filterRender.name) : null;
-                    const frMethod = column.filterRecoverMethod || (compConf ? (compConf.tableFilterRecoverMethod || compConf.filterRecoverMethod) : null);
+                    $xeTable.handleFilterOptions(column);
                     internalData._currFilterParams = params;
-                    Object.assign(filterStore, {
-                        multiple: filterMultiple,
-                        options: filters,
-                        column,
-                        style: null
-                    });
-                    // 复原状态
-                    filterStore.options.forEach((option) => {
-                        const { _checked, checked } = option;
-                        option._checked = checked;
-                        if (!checked && _checked !== checked) {
-                            if (frMethod) {
-                                frMethod({ option, column, $table: $xeTable });
-                            }
-                        }
-                    });
-                    this.checkFilterOptions();
+                    filterStore.style = null;
                     filterStore.visible = true;
                     initStore.filter = true;
                     $xeTable.$nextTick(() => {

package/es/table/module/keyboard/mixin.js

@@ -352,8 +352,8 @@ export default {
         handleCellMousedownEvent(evnt, params) {
             const $xeTable = this;
             const { editConfig, editOpts, handleSelected, checkboxConfig, checkboxOpts, mouseConfig, mouseOpts } = this;
-            if (mouseConfig && mouseOpts.area && $xeTable.triggerCellAreaMousednEvent) {
-                return $xeTable.triggerCellAreaMousednEvent(evnt, params);
+            if (mouseConfig && mouseOpts.area && $xeTable.triggerCellAreaModownEvent) {
+                return $xeTable.triggerCellAreaModownEvent(evnt, params);
             }
             else {
                 if (checkboxConfig && checkboxOpts.range) {

package/es/table/src/methods.js

@@ -1511,20 +1511,18 @@ const handleDefaultTreeExpand = ($xeTable) => {
     const internalData = $xeTable;
     const { treeConfig } = props;
     if (treeConfig) {
-        const { tableFullData } = internalData;
+        const { fullAllDataRowIdData } = internalData;
         const treeOpts = $xeTable.computeTreeOpts;
         const { expandAll, expandRowKeys } = treeOpts;
-        const childrenField = treeOpts.children || treeOpts.childrenField;
         if (expandAll) {
             $xeTable.setAllTreeExpand(true);
         }
         else if (expandRowKeys) {
             const defExpandeds = [];
-            const rowkey = getRowkey($xeTable);
             expandRowKeys.forEach((rowid) => {
-                const matchObj = XEUtils.findTree(tableFullData, item => rowid === XEUtils.get(item, rowkey), { children: childrenField });
-                if (matchObj) {
-                    defExpandeds.push(matchObj.item);
+                const rowRest = fullAllDataRowIdData[rowid];
+                if (rowRest) {
+                    defExpandeds.push(rowRest.row);
                 }
             });
             $xeTable.setTreeExpand(defExpandeds, true);
@@ -5170,6 +5168,28 @@ const Methods = {
     handleRefreshColumnQueue() {
         this.reColumnFlag++;
     },
+    handleFilterOptions(column) {
+        const $xeTable = this;
+        const reactData = $xeTable;
+        const { filterStore } = reactData;
+        const { filters, filterMultiple, filterRender } = column;
+        const compConf = isEnableConf(filterRender) ? renderer.get(filterRender.name) : null;
+        const frMethod = column.filterRecoverMethod || (compConf ? (compConf.tableFilterRecoverMethod || compConf.filterRecoverMethod) : null);
+        filterStore.multiple = filterMultiple;
+        filterStore.options = filters;
+        filterStore.column = column;
+        // 复原状态
+        filterStore.options.forEach((option) => {
+            const { _checked, checked } = option;
+            option._checked = checked;
+            if (!checked && _checked !== checked) {
+                if (frMethod) {
+                    frMethod({ option, column, $table: $xeTable });
+                }
+            }
+        });
+        $xeTable.checkFilterOptions();
+    },
     /**
      * 刷新列配置
      */
@@ -7729,8 +7749,8 @@ const Methods = {
                 $xeTable.handleHeaderCellDragMousedownEvent(evnt, params);
             }
         }
-        if (!triggerDrag && mouseConfig && mouseOpts.area && $xeTable.handleHeaderCellAreaEvent) {
-            $xeTable.handleHeaderCellAreaEvent(evnt, Object.assign({ cell, triggerSort, triggerFilter }, params));
+        if (!triggerDrag && mouseConfig && mouseOpts.area && $xeTable.handleHeaderCellAreaModownEvent) {
+            $xeTable.handleHeaderCellAreaModownEvent(evnt, Object.assign({ cell, triggerSort, triggerFilter }, params));
         }
         $xeTable.focus();
         if ($xeTable.closeMenu) {
@@ -8797,12 +8817,19 @@ const Methods = {
     },
     setFilterByEvent(evnt, fieldOrColumn, options, isUpdate) {
         const $xeTable = this;
+        const reactData = $xeTable;
+        const { filterStore } = reactData;
         const column = handleFieldOrColumn($xeTable, fieldOrColumn);
         if (column && column.filters) {
             column.filters = toFilters(options || []);
             if (isUpdate) {
                 return $xeTable.handleColumnConfirmFilter(column, evnt);
             }
+            else {
+                if (filterStore.visible) {
+                    $xeTable.handleFilterOptions(column);
+                }
+            }
         }
         return $xeTable.$nextTick();
     },

package/es/table/src/table.js

@@ -1572,7 +1572,7 @@ export default {
         if (rowOpts.height && !this.showOverflow) {
             warnLog('vxe.error.notProp', ['table.show-overflow']);
         }
-        if (!$xeTable.triggerCellAreaMousednEvent) {
+        if (!$xeTable.triggerCellAreaModownEvent) {
             if (props.areaConfig) {
                 warnLog('vxe.error.notProp', ['area-config']);
             }

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.17.0-beta.4";
+export const version = "3.17.0-beta.6";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"3.17.0-beta.4"}`;
+const version = `table v${"3.17.0-beta.6"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -2002,7 +2002,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.17.0-beta.4";
+const version = "3.17.0-beta.6";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2667,7 +2667,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.17.0-beta.4"}`;
+const log_version = `table v${"3.17.0-beta.6"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -7098,25 +7098,21 @@ const handleDefaultTreeExpand = $xeTable => {
   } = props;
   if (treeConfig) {
     const {
-      tableFullData
+      fullAllDataRowIdData
     } = internalData;
     const treeOpts = $xeTable.computeTreeOpts;
     const {
       expandAll,
       expandRowKeys
     } = treeOpts;
-    const childrenField = treeOpts.children || treeOpts.childrenField;
     if (expandAll) {
       $xeTable.setAllTreeExpand(true);
     } else if (expandRowKeys) {
       const defExpandeds = [];
-      const rowkey = getRowkey($xeTable);
       expandRowKeys.forEach(rowid => {
-        const matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(tableFullData, item => rowid === external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(item, rowkey), {
-          children: childrenField
-        });
-        if (matchObj) {
-          defExpandeds.push(matchObj.item);
+        const rowRest = fullAllDataRowIdData[rowid];
+        if (rowRest) {
+          defExpandeds.push(rowRest.row);
         }
       });
       $xeTable.setTreeExpand(defExpandeds, true);
@@ -11286,6 +11282,41 @@ const Methods = {
   handleRefreshColumnQueue() {
     this.reColumnFlag++;
   },
+  handleFilterOptions(column) {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const {
+      filterStore
+    } = reactData;
+    const {
+      filters,
+      filterMultiple,
+      filterRender
+    } = column;
+    const compConf = isEnableConf(filterRender) ? methods_renderer.get(filterRender.name) : null;
+    const frMethod = column.filterRecoverMethod || (compConf ? compConf.tableFilterRecoverMethod || compConf.filterRecoverMethod : null);
+    filterStore.multiple = filterMultiple;
+    filterStore.options = filters;
+    filterStore.column = column;
+    // 复原状态
+    filterStore.options.forEach(option => {
+      const {
+        _checked,
+        checked
+      } = option;
+      option._checked = checked;
+      if (!checked && _checked !== checked) {
+        if (frMethod) {
+          frMethod({
+            option,
+            column,
+            $table: $xeTable
+          });
+        }
+      }
+    });
+    $xeTable.checkFilterOptions();
+  },
   /**
    * 刷新列配置
    */
@@ -14294,8 +14325,8 @@ const Methods = {
         $xeTable.handleHeaderCellDragMousedownEvent(evnt, params);
       }
     }
-    if (!triggerDrag && mouseConfig && mouseOpts.area && $xeTable.handleHeaderCellAreaEvent) {
-      $xeTable.handleHeaderCellAreaEvent(evnt, Object.assign({
+    if (!triggerDrag && mouseConfig && mouseOpts.area && $xeTable.handleHeaderCellAreaModownEvent) {
+      $xeTable.handleHeaderCellAreaModownEvent(evnt, Object.assign({
         cell,
         triggerSort,
         triggerFilter
@@ -15495,11 +15526,19 @@ const Methods = {
   },
   setFilterByEvent(evnt, fieldOrColumn, options, isUpdate) {
     const $xeTable = this;
+    const reactData = $xeTable;
+    const {
+      filterStore
+    } = reactData;
     const column = handleFieldOrColumn($xeTable, fieldOrColumn);
     if (column && column.filters) {
       column.filters = toFilters(options || []);
       if (isUpdate) {
         return $xeTable.handleColumnConfirmFilter(column, evnt);
+      } else {
+        if (filterStore.visible) {
+          $xeTable.handleFilterOptions(column);
+        }
       }
     }
     return $xeTable.$nextTick();
@@ -22332,12 +22371,19 @@ const {
      */
     _setFilter(fieldOrColumn, options, isUpdate) {
       const $xeTable = this;
-      const column = handleFieldOrColumn(this, fieldOrColumn);
+      const reactData = $xeTable;
+      const {
+        filterStore
+      } = reactData;
+      const column = handleFieldOrColumn($xeTable, fieldOrColumn);
       if (column && column.filters) {
         column.filters = toFilters(options || []);
         if (isUpdate) {
-          // 已废弃，即将去掉事件触发 new Event('click') -> null
-          return $xeTable.handleColumnConfirmFilter(column, new Event('click'));
+          return $xeTable.handleColumnConfirmFilter(column, null);
+        } else {
+          if (filterStore.visible) {
+            $xeTable.handleFilterOptions(column);
+          }
         }
       }
       return $xeTable.$nextTick();
@@ -22391,38 +22437,9 @@ const {
           } = filterOpts;
           const tableRect = el.getBoundingClientRect();
           const btnElem = evnt.currentTarget;
-          const {
-            filters,
-            filterMultiple,
-            filterRender
-          } = column;
-          const compConf = isEnableConf(filterRender) ? mixin_renderer.get(filterRender.name) : null;
-          const frMethod = column.filterRecoverMethod || (compConf ? compConf.tableFilterRecoverMethod || compConf.filterRecoverMethod : null);
+          $xeTable.handleFilterOptions(column);
           internalData._currFilterParams = params;
-          Object.assign(filterStore, {
-            multiple: filterMultiple,
-            options: filters,
-            column,
-            style: null
-          });
-          // 复原状态
-          filterStore.options.forEach(option => {
-            const {
-              _checked,
-              checked
-            } = option;
-            option._checked = checked;
-            if (!checked && _checked !== checked) {
-              if (frMethod) {
-                frMethod({
-                  option,
-                  column,
-                  $table: $xeTable
-                });
-              }
-            }
-          });
-          this.checkFilterOptions();
+          filterStore.style = null;
           filterStore.visible = true;
           initStore.filter = true;
           $xeTable.$nextTick(() => {
@@ -26604,8 +26621,8 @@ function handleMoveSelected($xeTable, evnt, args, isLeftArrow, isUpArrow, isRigh
         mouseConfig,
         mouseOpts
       } = this;
-      if (mouseConfig && mouseOpts.area && $xeTable.triggerCellAreaMousednEvent) {
-        return $xeTable.triggerCellAreaMousednEvent(evnt, params);
+      if (mouseConfig && mouseOpts.area && $xeTable.triggerCellAreaModownEvent) {
+        return $xeTable.triggerCellAreaModownEvent(evnt, params);
       } else {
         if (checkboxConfig && checkboxOpts.range) {
           this.handleCheckboxRangeEvent(evnt, params);
@@ -29548,7 +29565,7 @@ function renderBody(h, $xeTable) {
     if (rowOpts.height && !this.showOverflow) {
       warnLog('vxe.error.notProp', ['table.show-overflow']);
     }
-    if (!$xeTable.triggerCellAreaMousednEvent) {
+    if (!$xeTable.triggerCellAreaModownEvent) {
       if (props.areaConfig) {
         warnLog('vxe.error.notProp', ['area-config']);
       }
@@ -34256,7 +34273,8 @@ const Toolbar = VxeToolbar;
       treeCrossDrag: '只能拖拽第一层级',
       treeDragChild: '父级不能拖拽到自己的子级中',
       reqPlugin: '扩展插件未安装 "{1}" https://vxeui.com/other{0}/#/{1}/install',
-      errMaxRow: '超过支持的最大数据量 {0} 行，这可能会导致出现错误'
+      errMaxRow: '超过支持的最大数据量 {0} 行，这可能会导致出现错误',
+      useNew: '{0} 已经不建议使用，请使用新的方式 {1}'
     },
     table: {
       emptyText: '暂无数据',