vxe-table 4.4.2-beta.8 → 4.4.3

package/lib/index.umd.js

@@ -2263,7 +2263,7 @@ const GlobalConfig = {
 ;// CONCATENATED MODULE: ./packages/tools/log.ts
 
 function getLog(message, params) {
-  return `[vxe-table v${"4.4.2-beta.7"}] ${conf.i18n(message, params)}`;
+  return `[vxe-table v${"4.4.3"}] ${conf.i18n(message, params)}`;
 }
 function outLog(type) {
   return function (message, params) {
@@ -2535,7 +2535,7 @@ class ColumnInfo {
     return this.field || (this.type ? `type=${this.type}` : null);
   }
   update(name, value) {
-    // 不支持双向的属性
+    // 不支持直接修改的属性
     if (name !== 'filters') {
       if (name === 'field') {
         // 兼容旧属性
@@ -2920,10 +2920,18 @@ function isColumnInfo(column) {
 function createColumn($xetable, options, renderOptions) {
   return isColumnInfo(options) ? options : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.reactive)(new ColumnInfo($xetable, options, renderOptions));
 }
-function watchColumn(props, column) {
+function watchColumn($xetable, props, column) {
   Object.keys(props).forEach(name => {
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(() => props[name], value => {
       column.update(name, value);
+      if ($xetable) {
+        if (name === 'filters') {
+          $xetable.setFilter(column, value);
+          $xetable.handleUpdateDataQueue();
+        } else if (['visible', 'fixed', 'width', 'minWidth', 'maxWidth'].includes(name)) {
+          $xetable.handleRefreshColumnQueue();
+        }
+      }
     });
   });
 }
@@ -4061,7 +4069,7 @@ const config = new VXETableConfig();
 const v = 'v4';
 const VXETable = {
   v,
-  version: "4.4.2-beta.7",
+  version: "4.4.3",
   setup: setup,
   interceptor: interceptor,
   renderer: renderer,
@@ -4580,8 +4588,8 @@ const tableFilterHook = {
        */
       setFilter(fieldOrColumn, options) {
         const column = handleFieldOrColumn($xetable, fieldOrColumn);
-        if (column && column.filters && options) {
-          column.filters = toFilters(options);
+        if (column && column.filters) {
+          column.filters = toFilters(options || []);
         }
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
       },
@@ -16217,7 +16225,7 @@ const columnProps = {
     const column = cell.createColumn($xetable, props);
     column.slots = slots;
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.provide)('$xegrid', null);
-    watchColumn(props, column);
+    watchColumn($xetable, props, column);
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.onMounted)(() => {
       assemColumn($xetable, refElem.value, column, colgroup);
     });
@@ -16273,7 +16281,7 @@ dynamicApp.component('VxeTableColumn', column);
     column.children = [];
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.provide)('xecolgroup', xecolumn);
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.provide)('$xegrid', null);
-    watchColumn(props, column);
+    watchColumn($xetable, props, column);
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.onMounted)(() => {
       assemColumn($xetable, refElem.value, column, colgroup);
     });
@@ -24776,6 +24784,10 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
       mergeList: [],
       // 合并表尾数据的对象集
       mergeFooterList: [],
+      // 刷新列标识，当列筛选被改变时，触发表格刷新数据
+      upDataFlag: 0,
+      // 刷新列标识，当列的特定属性被改变时，触发表格刷新列
+      reColumnFlag: 0,
       // 初始化标识
       initStore: {
         filter: false,
@@ -26359,7 +26371,7 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
             const emptyBlockElem = emptyBlockRef ? emptyBlockRef.value : null;
             if (isNodeElement(wrapperElem)) {
               if (customMaxHeight) {
-                wrapperElem.style.maxHeight = `${fixedType ? customMaxHeight - headerHeight - (showFooter ? 0 : scrollbarHeight) : customMaxHeight - headerHeight}px`;
+                wrapperElem.style.maxHeight = `${fixedType ? customMaxHeight - headerHeight - (showFooter ? 0 : scrollbarHeight) : customMaxHeight - headerHeight - footerHeight}px`;
               } else {
                 if (customHeight > 0) {
                   wrapperElem.style.height = `${fixedType ? (customHeight > 0 ? customHeight - headerHeight - footerHeight : tableHeight) - (showFooter ? 0 : scrollbarHeight) : customHeight - headerHeight - footerHeight}px`;
@@ -30427,6 +30439,12 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
         tablePrivateMethods.analyColumnWidth();
         return tableMethods.refreshColumn();
       },
+      handleUpdateDataQueue() {
+        reactData.upDataFlag++;
+      },
+      handleRefreshColumnQueue() {
+        reactData.reColumnFlag++;
+      },
       preventEvent(evnt, type, args, next, end) {
         const evntList = VXETable.interceptor.get(type);
         let rest;
@@ -31546,6 +31564,16 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(tableColumnFlag, () => {
       tablePrivateMethods.analyColumnWidth();
     });
+    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(() => reactData.upDataFlag, () => {
+      (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
+        tableMethods.updateData();
+      });
+    });
+    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(() => reactData.reColumnFlag, () => {
+      (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
+        tableMethods.refreshColumn();
+      });
+    });
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(() => props.showHeader, () => {
       (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
         tableMethods.recalculate(true).then(() => tableMethods.refreshScroll());