vxe-table 4.7.54 → 4.7.56

package/es/ui/index.js

@@ -1,8 +1,8 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.7.54";
+export const version = "4.7.56";
 VxeUI.version = version;
-VxeUI.tableVersion = "4.7.54";
+VxeUI.tableVersion = "4.7.56";
 VxeUI.setConfig({
     emptyCell: '　',
     table: {

package/es/ui/src/log.js

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

package/lib/index.umd.js

@@ -1951,9 +1951,9 @@ function eqEmptyValue(cellValue) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "4.7.54";
+const version = "4.7.56";
 core_.VxeUI.version = version;
-core_.VxeUI.tableVersion = "4.7.54";
+core_.VxeUI.tableVersion = "4.7.56";
 core_.VxeUI.setConfig({
   emptyCell: '　',
   table: {
@@ -2331,7 +2331,7 @@ var es_array_push = __webpack_require__(4114);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.7.54"}`;
+const log_version = `table v${"4.7.56"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -2499,7 +2499,10 @@ class ColumnInfo {
     return getFuncText(this.title || (this.type === 'seq' ? columnInfo_getI18n('vxe.table.seqTitle') : ''));
   }
   getKey() {
-    return this.field || (this.type ? `type=${this.type}` : null);
+    const {
+      type
+    } = this;
+    return this.field || (type ? `type=${type}` : null);
   }
   update(name, value) {
     // 不支持直接修改的属性
@@ -2960,7 +2963,7 @@ function watchColumn($xeTable, props, column) {
     });
   });
 }
-function assemColumn($xeTable, elem, column, colgroup) {
+function assembleColumn($xeTable, elem, column, colgroup) {
   const {
     reactData
   } = $xeTable;
@@ -4421,7 +4424,7 @@ const columnProps = {
     };
     watchColumn($xeTable, props, column);
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.onMounted)(() => {
-      assemColumn($xeTable, refElem.value, column, parentColgroup);
+      assembleColumn($xeTable, refElem.value, column, parentColgroup);
     });
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.onUnmounted)(() => {
       destroyColumn($xeTable, column);
@@ -4472,7 +4475,7 @@ const Column = VxeColumn;
     column.children = [];
     watchColumn($xeTable, props, column);
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.onMounted)(() => {
-      assemColumn($xeTable, refElem.value, column, parentColgroup);
+      assembleColumn($xeTable, refElem.value, column, parentColgroup);
     });
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.onUnmounted)(() => {
       destroyColumn($xeTable, column);
@@ -7329,25 +7332,11 @@ const {
      *************************/
     // 确认筛选
     const confirmFilter = evnt => {
-      const {
-        filterStore
-      } = props;
-      filterStore.options.forEach(option => {
-        option.checked = option._checked;
-      });
-      $xeTable.confirmFilterEvent(evnt);
+      $xeTable.handleFilterConfirmFilter(evnt);
     };
     // （单选）筛选发生改变
     const changeRadioOption = (evnt, checked, item) => {
-      const {
-        filterStore
-      } = props;
-      filterStore.options.forEach(option => {
-        option._checked = false;
-      });
-      item._checked = checked;
-      $xeTable.checkFilterOptions();
-      confirmFilter(evnt);
+      $xeTable.handleFilterChangeRadioOption(evnt, checked, item);
     };
     /**
      * 重置筛选
@@ -7355,27 +7344,15 @@ const {
      * @param {Event} evnt 事件
      */
     const resetFilter = evnt => {
-      const {
-        filterStore
-      } = props;
-      $xeTable.handleClearFilter(filterStore.column);
-      $xeTable.confirmFilterEvent(evnt);
+      $xeTable.handleFilterResetFilter(evnt);
     };
     // （多选）筛选发生改变
     const changeMultipleOption = (evnt, checked, item) => {
-      item._checked = checked;
-      $xeTable.checkFilterOptions();
+      $xeTable.handleFilterChangeMultipleOption(evnt, checked, item);
     };
     // 筛选发生改变
     const changeOption = (evnt, checked, item) => {
-      const {
-        filterStore
-      } = props;
-      if (filterStore.multiple) {
-        changeMultipleOption(evnt, checked, item);
-      } else {
-        changeRadioOption(evnt, checked, item);
-      }
+      $xeTable.handleFilterChangeOption(evnt, checked, item);
     };
     const changeAllOption = (evnt, checked) => {
       const {
@@ -11544,7 +11521,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           });
           row[childrenField] = rows;
           if (transform) {
-            row[mapChildrenField] = rows;
+            row[mapChildrenField] = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(rows, false);
           }
           updateAfterDataIndex();
           return rows;
@@ -16444,7 +16421,7 @@ const {
   renderer: hook_renderer,
   hooks: hook_hooks
 } = core_.VxeUI;
-const tableFilterMethodKeys = ['setFilter', 'clearFilter', 'getCheckedFilters'];
+const tableFilterMethodKeys = ['openFilter', 'setFilter', 'clearFilter', 'getCheckedFilters', 'updateFilterOptionStatus'];
 hook_hooks.add('tableFilterModule', {
   setupTable($xeTable) {
     const {
@@ -16461,6 +16438,45 @@ hook_hooks.add('tableFilterModule', {
       computeFilterOpts,
       computeMouseOpts
     } = $xeTable.getComputeMaps();
+    // 确认筛选
+    const confirmFilter = evnt => {
+      const {
+        filterStore
+      } = reactData;
+      filterStore.options.forEach(option => {
+        option.checked = option._checked;
+      });
+      $xeTable.confirmFilterEvent(evnt);
+    };
+    // （单选）筛选发生改变
+    const changeRadioOption = (evnt, checked, item) => {
+      const {
+        filterStore
+      } = reactData;
+      filterStore.options.forEach(option => {
+        option._checked = false;
+      });
+      item._checked = checked;
+      $xeTable.checkFilterOptions();
+      confirmFilter(evnt);
+    };
+    // （多选）筛选发生改变
+    const changeMultipleOption = (evnt, checked, item) => {
+      item._checked = checked;
+      $xeTable.checkFilterOptions();
+    };
+    /**
+     * 重置筛选
+     * 当筛选面板中的重置按钮被按下时触发
+     * @param {Event} evnt 事件
+     */
+    const resetFilter = evnt => {
+      const {
+        filterStore
+      } = reactData;
+      $xeTable.handleClearFilter(filterStore.column);
+      $xeTable.confirmFilterEvent(evnt);
+    };
     const filterPrivateMethods = {
       checkFilterOptions() {
         const {
@@ -16688,7 +16704,22 @@ hook_hooks.add('tableFilterModule', {
           // 存在滚动行为未结束情况
           setTimeout(() => $xeTable.recalculate(), 50);
         });
-      }
+      },
+      handleFilterChangeRadioOption: changeRadioOption,
+      handleFilterChangeMultipleOption: changeMultipleOption,
+      // 筛选发生改变
+      handleFilterChangeOption(evnt, checked, item) {
+        const {
+          filterStore
+        } = reactData;
+        if (filterStore.multiple) {
+          changeMultipleOption(evnt, checked, item);
+        } else {
+          changeRadioOption(evnt, checked, item);
+        }
+      },
+      handleFilterConfirmFilter: confirmFilter,
+      handleFilterResetFilter: resetFilter
     };
     const filterMethods = {
       /**
@@ -16796,6 +16827,11 @@ hook_hooks.add('tableFilterModule', {
           }
         });
         return filterList;
+      },
+      updateFilterOptionStatus(item, checked) {
+        item._checked = checked;
+        item.checked = checked;
+        return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
       }
     };
     return {
@@ -21557,6 +21593,18 @@ function handleFilterMethod({
   /* eslint-disable eqeqeq */
   return cellValue == data;
 }
+function handleInputFilterMethod({
+  option,
+  row,
+  column
+}) {
+  const {
+    data
+  } = option;
+  const cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.property);
+  /* eslint-disable eqeqeq */
+  return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toValueString(cellValue).indexOf(data) > -1;
+}
 function nativeSelectEditRender(renderOpts, params) {
   return [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('select', {
     class: 'vxe-default-select',
@@ -21714,7 +21762,7 @@ render_renderer.mixin({
     renderEdit: nativeEditRender,
     renderDefault: nativeEditRender,
     renderFilter: nativeFilterRender,
-    defaultFilterMethod: handleFilterMethod
+    defaultFilterMethod: handleInputFilterMethod
   },
   textarea: {
     autofocus: 'textarea',
@@ -21773,7 +21821,7 @@ render_renderer.mixin({
     },
     renderDefault: defaultEditRender,
     renderFilter: defaultFilterRender,
-    defaultFilterMethod: handleFilterMethod
+    defaultFilterMethod: handleInputFilterMethod
   },
   VxeNumberInput: {
     autofocus: '.vxe-number-input--inner',
@@ -21799,7 +21847,7 @@ render_renderer.mixin({
     },
     renderDefault: defaultEditRender,
     renderFilter: defaultFilterRender,
-    defaultFilterMethod: handleFilterMethod
+    defaultFilterMethod: handleInputFilterMethod
   },
   VxeDatePicker: {
     autofocus: '.vxe-date-picker--inner',
@@ -21935,7 +21983,7 @@ render_renderer.mixin({
     },
     renderDefault: oldEditRender,
     renderFilter: oldFilterRender,
-    defaultFilterMethod: handleFilterMethod
+    defaultFilterMethod: handleInputFilterMethod
   },
   $textarea: {
     autofocus: '.vxe-textarea--inner'