vxe-table 4.7.53 → 4.7.55

package/lib/index.umd.js

@@ -1951,9 +1951,9 @@ function eqEmptyValue(cellValue) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "4.7.53";
+const version = "4.7.55";
 core_.VxeUI.version = version;
-core_.VxeUI.tableVersion = "4.7.53";
+core_.VxeUI.tableVersion = "4.7.55";
 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.53"}`;
+const log_version = `table v${"4.7.55"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -7103,10 +7103,9 @@ const {
             class: 'vxe-table-custom-popup--column-item col--resizable'
           }, [!isChecked || column.children && column.children.length ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', '-') : VxeUIInputComponent ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(VxeUIInputComponent, {
             type: 'integer',
-            min: 40,
             modelValue: column.renderResizeWidth,
             'onUpdate:modelValue'(value) {
-              column.renderResizeWidth = Math.max(40, Number(value));
+              column.renderResizeWidth = Math.max(0, Number(value));
             }
           }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), allowFixed ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('td', {
             class: 'vxe-table-custom-popup--column-item col--fixed'
@@ -7330,25 +7329,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);
     };
     /**
      * 重置筛选
@@ -7356,27 +7341,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 {
@@ -12142,7 +12115,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             const bodyWidth = bodyElem ? bodyElem.clientWidth - 1 : 0;
             rdWidth = Math.floor(colWidth * bodyWidth);
           }
-          column.renderWidth = rdWidth;
+          column.resizeWidth = rdWidth;
+          return tableMethods.refreshColumn();
         }
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
       },
@@ -16444,7 +16418,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 +16435,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 +16701,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 +16824,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 +21590,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 +21759,7 @@ render_renderer.mixin({
     renderEdit: nativeEditRender,
     renderDefault: nativeEditRender,
     renderFilter: nativeFilterRender,
-    defaultFilterMethod: handleFilterMethod
+    defaultFilterMethod: handleInputFilterMethod
   },
   textarea: {
     autofocus: 'textarea',
@@ -21773,7 +21818,7 @@ render_renderer.mixin({
     },
     renderDefault: defaultEditRender,
     renderFilter: defaultFilterRender,
-    defaultFilterMethod: handleFilterMethod
+    defaultFilterMethod: handleInputFilterMethod
   },
   VxeNumberInput: {
     autofocus: '.vxe-number-input--inner',
@@ -21799,7 +21844,7 @@ render_renderer.mixin({
     },
     renderDefault: defaultEditRender,
     renderFilter: defaultFilterRender,
-    defaultFilterMethod: handleFilterMethod
+    defaultFilterMethod: handleInputFilterMethod
   },
   VxeDatePicker: {
     autofocus: '.vxe-date-picker--inner',
@@ -21935,7 +21980,7 @@ render_renderer.mixin({
     },
     renderDefault: oldEditRender,
     renderFilter: oldFilterRender,
-    defaultFilterMethod: handleFilterMethod
+    defaultFilterMethod: handleInputFilterMethod
   },
   $textarea: {
     autofocus: '.vxe-textarea--inner'