vxe-table 4.4.2-beta.8 → 4.4.3

package/lib/table/src/column.js

@@ -121,7 +121,7 @@ var _default = (0, _vue.defineComponent)({
     var column = _cell.default.createColumn($xetable, props);
     column.slots = slots;
     (0, _vue.provide)('$xegrid', null);
-    (0, _util.watchColumn)(props, column);
+    (0, _util.watchColumn)($xetable, props, column);
     (0, _vue.onMounted)(function () {
       (0, _util.assemColumn)($xetable, refElem.value, column, colgroup);
     });

package/lib/table/src/column.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=exports.columnProps=void 0;var _vue=require("vue"),_util=require("../../table/src/util"),_cell=_interopRequireDefault(require("../../table/src/cell"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var columnProps={colId:[String,Number],type:String,field:String,title:String,width:[Number,String],minWidth:[Number,String],maxWidth:[Number,String],resizable:{type:Boolean,default:null},fixed:String,align:String,headerAlign:String,footerAlign:String,showOverflow:{type:[Boolean,String],default:null},showHeaderOverflow:{type:[Boolean,String],default:null},showFooterOverflow:{type:[Boolean,String],default:null},className:[String,Function],headerClassName:[String,Function],footerClassName:[String,Function],formatter:[Function,Array,String],sortable:Boolean,sortBy:[String,Function],sortType:String,filters:{type:Array,default:null},filterMultiple:{type:Boolean,default:!0},filterMethod:Function,filterResetMethod:Function,filterRecoverMethod:Function,filterRender:Object,treeNode:Boolean,visible:{type:Boolean,default:null},exportMethod:Function,footerExportMethod:Function,titleHelp:Object,titlePrefix:Object,cellType:String,cellRender:Object,editRender:Object,contentRender:Object,params:Object},_default=(exports.columnProps=columnProps,(0,_vue.defineComponent)({name:"VxeColumn",props:columnProps,setup:function(e,t){var t=t.slots,n=(0,_vue.ref)(),r=(0,_vue.inject)("$xetable",{}),l=(0,_vue.inject)("xecolgroup",null),o=_cell.default.createColumn(r,e);o.slots=t,(0,_vue.provide)("$xegrid",null),(0,_util.watchColumn)(e,o),(0,_vue.onMounted)(function(){(0,_util.assemColumn)(r,n.value,o,l)}),(0,_vue.onUnmounted)(function(){(0,_util.destroyColumn)(r,o)});return function(){return(0,_vue.h)("div",{ref:n})}}}));exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=exports.columnProps=void 0;var _vue=require("vue"),_util=require("../../table/src/util"),_cell=_interopRequireDefault(require("../../table/src/cell"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var columnProps={colId:[String,Number],type:String,field:String,title:String,width:[Number,String],minWidth:[Number,String],maxWidth:[Number,String],resizable:{type:Boolean,default:null},fixed:String,align:String,headerAlign:String,footerAlign:String,showOverflow:{type:[Boolean,String],default:null},showHeaderOverflow:{type:[Boolean,String],default:null},showFooterOverflow:{type:[Boolean,String],default:null},className:[String,Function],headerClassName:[String,Function],footerClassName:[String,Function],formatter:[Function,Array,String],sortable:Boolean,sortBy:[String,Function],sortType:String,filters:{type:Array,default:null},filterMultiple:{type:Boolean,default:!0},filterMethod:Function,filterResetMethod:Function,filterRecoverMethod:Function,filterRender:Object,treeNode:Boolean,visible:{type:Boolean,default:null},exportMethod:Function,footerExportMethod:Function,titleHelp:Object,titlePrefix:Object,cellType:String,cellRender:Object,editRender:Object,contentRender:Object,params:Object},_default=(exports.columnProps=columnProps,(0,_vue.defineComponent)({name:"VxeColumn",props:columnProps,setup:function(e,t){var t=t.slots,n=(0,_vue.ref)(),r=(0,_vue.inject)("$xetable",{}),l=(0,_vue.inject)("xecolgroup",null),o=_cell.default.createColumn(r,e);o.slots=t,(0,_vue.provide)("$xegrid",null),(0,_util.watchColumn)(r,e,o),(0,_vue.onMounted)(function(){(0,_util.assemColumn)(r,n.value,o,l)}),(0,_vue.onUnmounted)(function(){(0,_util.destroyColumn)(r,o)});return function(){return(0,_vue.h)("div",{ref:n})}}}));exports.default=_default;

package/lib/table/src/columnInfo.js

@@ -147,7 +147,7 @@ var ColumnInfo = /** @class */function () {
     return this.field || (this.type ? "type=".concat(this.type) : null);
   };
   ColumnInfo.prototype.update = function (name, value) {
-    // 不支持双向的属性
+    // 不支持直接修改的属性
     if (name !== 'filters') {
       if (name === 'field') {
         // 兼容旧属性

package/lib/table/src/group.js

@@ -29,7 +29,7 @@ var _default = (0, _vue.defineComponent)({
     column.children = [];
     (0, _vue.provide)('xecolgroup', xecolumn);
     (0, _vue.provide)('$xegrid', null);
-    (0, _util.watchColumn)(props, column);
+    (0, _util.watchColumn)($xetable, props, column);
     (0, _vue.onMounted)(function () {
       (0, _util.assemColumn)($xetable, refElem.value, column, colgroup);
     });

package/lib/table/src/group.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_column=require("./column"),_util=require("../../table/src/util"),_cell=_interopRequireDefault(require("../../table/src/cell"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var _default=(0,_vue.defineComponent)({name:"VxeColgroup",props:_column.columnProps,setup:function(e,u){var l=u.slots,t=(0,_vue.ref)(),r=(0,_vue.inject)("$xetable",{}),o=(0,_vue.inject)("xecolgroup",null),n=_cell.default.createColumn(r,e),u={},i=(l.header&&(u.header=l.header),{column:n});n.slots=u,n.children=[],(0,_vue.provide)("xecolgroup",i),(0,_vue.provide)("$xegrid",null),(0,_util.watchColumn)(e,n),(0,_vue.onMounted)(function(){(0,_util.assemColumn)(r,t.value,n,o)}),(0,_vue.onUnmounted)(function(){(0,_util.destroyColumn)(r,n)});return function(){return(0,_vue.h)("div",{ref:t},l.default?l.default():[])}}});exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_column=require("./column"),_util=require("../../table/src/util"),_cell=_interopRequireDefault(require("../../table/src/cell"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var _default=(0,_vue.defineComponent)({name:"VxeColgroup",props:_column.columnProps,setup:function(e,u){var l=u.slots,t=(0,_vue.ref)(),r=(0,_vue.inject)("$xetable",{}),o=(0,_vue.inject)("xecolgroup",null),n=_cell.default.createColumn(r,e),u={},i=(l.header&&(u.header=l.header),{column:n});n.slots=u,n.children=[],(0,_vue.provide)("xecolgroup",i),(0,_vue.provide)("$xegrid",null),(0,_util.watchColumn)(r,e,n),(0,_vue.onMounted)(function(){(0,_util.assemColumn)(r,t.value,n,o)}),(0,_vue.onUnmounted)(function(){(0,_util.destroyColumn)(r,n)});return function(){return(0,_vue.h)("div",{ref:t},l.default?l.default():[])}}});exports.default=_default;

package/lib/table/src/table.js

@@ -120,6 +120,10 @@ var _default = (0, _vue.defineComponent)({
       mergeList: [],
       // 合并表尾数据的对象集
       mergeFooterList: [],
+      // 刷新列标识，当列筛选被改变时，触发表格刷新数据
+      upDataFlag: 0,
+      // 刷新列标识，当列的特定属性被改变时，触发表格刷新列
+      reColumnFlag: 0,
       // 初始化标识
       initStore: {
         filter: false,
@@ -1631,7 +1635,7 @@ var _default = (0, _vue.defineComponent)({
             var emptyBlockElem = emptyBlockRef ? emptyBlockRef.value : null;
             if ((0, _dom.isNodeElement)(wrapperElem)) {
               if (customMaxHeight) {
-                wrapperElem.style.maxHeight = "".concat(fixedType ? customMaxHeight - headerHeight - (showFooter ? 0 : scrollbarHeight) : customMaxHeight - headerHeight, "px");
+                wrapperElem.style.maxHeight = "".concat(fixedType ? customMaxHeight - headerHeight - (showFooter ? 0 : scrollbarHeight) : customMaxHeight - headerHeight - footerHeight, "px");
               } else {
                 if (customHeight > 0) {
                   wrapperElem.style.height = "".concat(fixedType ? (customHeight > 0 ? customHeight - headerHeight - footerHeight : tableHeight) - (showFooter ? 0 : scrollbarHeight) : customHeight - headerHeight - footerHeight, "px");
@@ -5426,6 +5430,12 @@ var _default = (0, _vue.defineComponent)({
         tablePrivateMethods.analyColumnWidth();
         return tableMethods.refreshColumn();
       },
+      handleUpdateDataQueue: function () {
+        reactData.upDataFlag++;
+      },
+      handleRefreshColumnQueue: function () {
+        reactData.reColumnFlag++;
+      },
       preventEvent: function (evnt, type, args, next, end) {
         var evntList = _vXETable.VXETable.interceptor.get(type);
         var rest;
@@ -6508,6 +6518,20 @@ var _default = (0, _vue.defineComponent)({
     (0, _vue.watch)(tableColumnFlag, function () {
       tablePrivateMethods.analyColumnWidth();
     });
+    (0, _vue.watch)(function () {
+      return reactData.upDataFlag;
+    }, function () {
+      (0, _vue.nextTick)(function () {
+        tableMethods.updateData();
+      });
+    });
+    (0, _vue.watch)(function () {
+      return reactData.reColumnFlag;
+    }, function () {
+      (0, _vue.nextTick)(function () {
+        tableMethods.refreshColumn();
+      });
+    });
     (0, _vue.watch)(function () {
       return props.showHeader;
     }, function () {