vxe-table 3.6.14-beta.5 → 3.6.14

package/lib/index.umd.js

@@ -12452,7 +12452,7 @@ var ColumnInfo = /*#__PURE__*/function () {
   }, {
     key: "update",
     value: function update(name, value) {
-      // 不支持双向的属性
+      // 不支持直接修改的属性
       if (name !== 'filters') {
         if (name === 'field') {
           // 兼容旧属性
@@ -17349,6 +17349,12 @@ var Methods = {
       localStorage.setItem(resizableStorageKey, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toJSONString(columnWidthStorageMap));
     }
   },
+  handleUpdateDataQueue: function handleUpdateDataQueue() {
+    this.upDataFlag++;
+  },
+  handleRefreshColumnQueue: function handleRefreshColumnQueue() {
+    this.reColumnFlag++;
+  },
   /**
    * 刷新列配置
    */
@@ -21648,6 +21654,10 @@ function handleUupdateResize(_vm) {
         "import": false,
         "export": false
       },
+      // 刷新列标识，当列筛选被改变时，触发表格刷新数据
+      upDataFlag: 0,
+      // 刷新列标识，当列的特定属性被改变时，触发表格刷新列
+      reColumnFlag: 0,
       // 当前选中的筛选列
       filterStore: {
         isAllSelected: false,
@@ -21979,63 +21989,75 @@ function handleUupdateResize(_vm) {
     tableColumn: function tableColumn() {
       this.analyColumnWidth();
     },
-    showHeader: function showHeader() {
+    upDataFlag: function upDataFlag() {
       var _this2 = this;
+      this.$nextTick().then(function () {
+        return _this2.updateData();
+      });
+    },
+    reColumnFlag: function reColumnFlag() {
+      var _this3 = this;
+      this.$nextTick().then(function () {
+        return _this3.refreshColumn();
+      });
+    },
+    showHeader: function showHeader() {
+      var _this4 = this;
       this.$nextTick(function () {
-        _this2.recalculate(true).then(function () {
-          return _this2.refreshScroll();
+        _this4.recalculate(true).then(function () {
+          return _this4.refreshScroll();
         });
       });
     },
     showFooter: function showFooter() {
-      var _this3 = this;
+      var _this5 = this;
       this.$nextTick(function () {
-        _this3.recalculate(true).then(function () {
-          return _this3.refreshScroll();
+        _this5.recalculate(true).then(function () {
+          return _this5.refreshScroll();
         });
       });
     },
     height: function height() {
-      var _this4 = this;
+      var _this6 = this;
       this.$nextTick(function () {
-        return _this4.recalculate(true);
+        return _this6.recalculate(true);
       });
     },
     maxHeight: function maxHeight() {
-      var _this5 = this;
+      var _this7 = this;
       this.$nextTick(function () {
-        return _this5.recalculate(true);
+        return _this7.recalculate(true);
       });
     },
     syncResize: function syncResize(value) {
-      var _this6 = this;
+      var _this8 = this;
       if (value) {
         handleUupdateResize(this);
         this.$nextTick(function () {
-          handleUupdateResize(_this6);
+          handleUupdateResize(_this8);
           setTimeout(function () {
-            return handleUupdateResize(_this6);
+            return handleUupdateResize(_this8);
           });
         });
       }
     },
     mergeCells: function mergeCells(value) {
-      var _this7 = this;
+      var _this9 = this;
       this.clearMergeCells();
       this.$nextTick(function () {
-        return _this7.setMergeCells(value);
+        return _this9.setMergeCells(value);
       });
     },
     mergeFooterItems: function mergeFooterItems(value) {
-      var _this8 = this;
+      var _this10 = this;
       this.clearMergeFooterItems();
       this.$nextTick(function () {
-        return _this8.setMergeFooterItems(value);
+        return _this10.setMergeFooterItems(value);
       });
     }
   },
   created: function created() {
-    var _this9 = this;
+    var _this11 = this;
     var _Object$assign = Object.assign(this, {
         tZindex: 0,
         elemStore: {},
@@ -22112,12 +22134,12 @@ function handleUupdateResize(_vm) {
     });
     this.loadTableData(data).then(function () {
       if (data && data.length) {
-        _this9.inited = true;
-        _this9.initStatus = true;
-        _this9.handleLoadDefaults();
-        _this9.handleInitDefaults();
+        _this11.inited = true;
+        _this11.initStatus = true;
+        _this11.handleLoadDefaults();
+        _this11.handleInitDefaults();
       }
-      _this9.updateStyle();
+      _this11.updateStyle();
     });
     GlobalEvent.on(this, 'paste', this.handleGlobalPasteEvent);
     GlobalEvent.on(this, 'copy', this.handleGlobalCopyEvent);
@@ -22131,16 +22153,16 @@ function handleUupdateResize(_vm) {
     this.preventEvent(null, 'created');
   },
   mounted: function mounted() {
-    var _this10 = this;
+    var _this12 = this;
     if (false) { var $listeners; }
     if (this.autoResize) {
       var resizeObserver = createResizeEvent(this.resizeOpts.refreshDelay ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().throttle(function () {
-        _this10.recalculate(true);
+        _this12.recalculate(true);
       }, this.resizeOpts.refreshDelay, {
         leading: true,
         trailing: true
       }) : function () {
-        _this10.recalculate(true);
+        _this12.recalculate(true);
       });
       resizeObserver.observe(this.$el);
       resizeObserver.observe(this.getParentElem());
@@ -22149,9 +22171,9 @@ function handleUupdateResize(_vm) {
     this.preventEvent(null, 'mounted');
   },
   activated: function activated() {
-    var _this11 = this;
+    var _this13 = this;
     this.recalculate().then(function () {
-      return _this11.refreshScroll();
+      return _this13.refreshScroll();
     });
     this.preventEvent(null, 'activated');
   },
@@ -22691,8 +22713,8 @@ var Table = Object.assign(table, {
      */
     _setFilter: function _setFilter(fieldOrColumn, options) {
       var column = handleFieldOrColumn(this, fieldOrColumn);
-      if (column && column.filters && options) {
-        column.filters = toFilters(options);
+      if (column && column.filters) {
+        column.filters = toFilters(options || []);
       }
       return this.$nextTick();
     },
@@ -32820,6 +32842,7 @@ var Footer = Object.assign(footer, {
 
 
 
+
 var column_props = {
   // 列唯一主键
   colId: [String, Number],
@@ -32932,6 +32955,14 @@ var column_watch = {};
 Object.keys(column_props).forEach(function (name) {
   column_watch[name] = function (value) {
     this.columnConfig.update(name, value);
+    if (this.$xetable) {
+      if (name === 'filters') {
+        this.$xetable.setFilter(this.columnConfig, value);
+        this.$xetable.handleUpdateDataQueue();
+      } else if (['visible', 'fixed', 'width', 'minWidth', 'maxWidth'].includes(name)) {
+        this.$xetable.handleRefreshColumnQueue();
+      }
+    }
   };
 });
 /* harmony default export */ const column = ({