vxe-table 3.13.8 → 3.13.9

package/lib/table/module/filter/panel.js

@@ -26,12 +26,13 @@ var _default = exports.default = {
     }
   },
   render(h) {
+    const $panel = this;
     const $xeTable = this.$parent;
+    const tableInternalData = $xeTable;
     const {
       filterStore
     } = this;
     const {
-      args,
       visible,
       multiple,
       column
@@ -39,15 +40,16 @@ var _default = exports.default = {
     const filterRender = column ? column.filterRender : null;
     const compConf = (0, _utils.isEnableConf)(filterRender) ? renderer.get(filterRender.name) : null;
     const filterClassName = compConf ? compConf.tableFilterClassName || compConf.filterClassName : '';
+    const params = Object.assign({}, tableInternalData._currFilterParams, {
+      $panel,
+      $table: $xeTable
+    });
     const filterOpts = $xeTable.computeFilterOpts;
     const {
       destroyOnClose
     } = filterOpts;
     return h('div', {
-      class: ['vxe-table--filter-wrapper', 'filter--prevent-default', compConf && compConf.className ? compConf.className : '', (0, _utils.getClass)(filterClassName, Object.assign({
-        $panel: this,
-        $table: $xeTable
-      }, args)), {
+      class: ['vxe-table--filter-wrapper', 'filter--prevent-default', compConf && compConf.className ? compConf.className : '', (0, _utils.getClass)(filterClassName, params), {
         'is--animat': $xeTable.animat,
         'is--multiple': multiple,
         'is--active': visible
@@ -57,32 +59,32 @@ var _default = exports.default = {
   },
   methods: {
     renderOptions(h, filterRender, compConf) {
+      const $panel = this;
+      const $xeTable = this.$parent;
+      const tableInternalData = $xeTable;
       const {
-        $parent: $xetable,
         filterStore
       } = this;
       const {
-        args,
         column,
         multiple,
         maxHeight
       } = filterStore;
       const slots = column ? column.slots : null;
+      const filterSlot = slots ? slots.filter : null;
+      const params = Object.assign({}, tableInternalData._currFilterParams, {
+        $panel,
+        $table: $xeTable
+      });
       const rtFilter = compConf ? compConf.renderTableFilter || compConf.renderFilter : null;
-      if (slots && slots.filter) {
+      if (filterSlot) {
         return [h('div', {
           class: 'vxe-table--filter-template'
-        }, $xetable.callSlot(slots.filter, Object.assign({
-          $panel: this,
-          context: this
-        }, args), h))];
+        }, $xeTable.callSlot(filterSlot, params, h))];
       } else if (rtFilter) {
         return [h('div', {
           class: 'vxe-table--filter-template'
-        }, (0, _vn.getSlotVNs)(rtFilter.call($xetable, h, filterRender, Object.assign({
-          $panel: this,
-          context: this
-        }, args))))];
+        }, (0, _vn.getSlotVNs)(rtFilter.call($xeTable, h, filterRender, params)))];
       }
       const isAllChecked = multiple ? filterStore.isAllSelected : !filterStore.options.some(item => item._checked);
       const isAllIndeterminate = multiple && filterStore.isIndeterminate;
@@ -133,18 +135,16 @@ var _default = exports.default = {
       }))];
     },
     renderFooter(h) {
+      const $xeTable = this.$parent;
       const {
-        $parent: $xetable,
         hasCheckOption,
         filterStore
       } = this;
-      const {
-        filterOpts
-      } = $xetable;
       const {
         column,
         multiple
       } = filterStore;
+      const filterOpts = $xeTable.computeFilterOpts;
       const filterRender = column.filterRender;
       const compConf = (0, _utils.isEnableConf)(filterRender) ? renderer.get(filterRender.name) : null;
       const isDisabled = !hasCheckOption && !filterStore.isAllSelected && !filterStore.isIndeterminate;

package/lib/table/module/filter/panel.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _ui=require("../../../ui"),_utils=require("../../../ui/src/utils"),_vn=require("../../../ui/src/vn");let{getI18n,getIcon,renderer}=_ui.VxeUI;var _default=exports.default={name:"VxeTableFilterPanel",props:{filterStore:Object},computed:{hasCheckOption(){var e=this.filterStore;return e&&e.options.some(e=>e.checked)}},render(e){var t=this.$parent,l=this.filterStore,{args:i,visible:r,multiple:s,column:a}=l,n=a?a.filterRender:null,c=(0,_utils.isEnableConf)(n)?renderer.get(n.name):null,o=c?c.tableFilterClassName||c.filterClassName:"",h=t.computeFilterOpts.destroyOnClose;return e("div",{class:["vxe-table--filter-wrapper","filter--prevent-default",c&&c.className?c.className:"",(0,_utils.getClass)(o,Object.assign({$panel:this,$table:t},i)),{"is--animat":t.animat,"is--multiple":s,"is--active":r}],style:l.style},l.visible&&(!h||r)&&a?this.renderOptions(e,n,c).concat(this.renderFooter(e)):[])},methods:{renderOptions(l,e,t){let{$parent:i,filterStore:r}=this,{args:s,column:a,multiple:n,maxHeight:c}=r;var o=a?a.slots:null,t=t?t.renderTableFilter||t.renderFilter:null;return o&&o.filter?[l("div",{class:"vxe-table--filter-template"},i.callSlot(o.filter,Object.assign({$panel:this,context:this},s),l))]:t?[l("div",{class:"vxe-table--filter-template"},(0,_vn.getSlotVNs)(t.call(i,l,e,Object.assign({$panel:this,context:this},s))))]:(o=n?r.isAllSelected:!r.options.some(e=>e._checked),t=n&&r.isIndeterminate,[l("ul",{class:"vxe-table--filter-header"},[l("li",{class:["vxe-table--filter-option",{"is--checked":o,"is--indeterminate":t}],attrs:{title:getI18n(n?"vxe.table.allTitle":"vxe.table.allFilter")},on:{click:e=>{this.changeAllOption(e,!r.isAllSelected)}}},(n?[l("span",{class:["vxe-checkbox--icon",t?getIcon().TABLE_CHECKBOX_INDETERMINATE:o?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]})]:[]).concat([l("span",{class:"vxe-checkbox--label"},getI18n("vxe.table.allFilter"))]))]),l("ul",{class:"vxe-table--filter-body",style:c?{maxHeight:c+"px"}:{}},r.options.map(t=>{var e=t._checked;return l("li",{class:["vxe-table--filter-option",{"is--checked":e}],attrs:{title:t.label},on:{click:e=>{this.changeOption(e,!t._checked,t)}}},(n?[l("span",{class:["vxe-checkbox--icon",e?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]})]:[]).concat([l("span",{class:"vxe-checkbox--label"},(0,_utils.formatText)(t.label,1))]))}))])},renderFooter(e){var{$parent:t,hasCheckOption:l,filterStore:i}=this,t=t.filterOpts,{column:r,multiple:s}=i,r=r.filterRender,r=(0,_utils.isEnableConf)(r)?renderer.get(r.name):null,l=!l&&!i.isAllSelected&&!i.isIndeterminate;return s&&(!r||!1!==r.showTableFilterFooter&&!1!==r.showFilterFooter&&!1!==r.isFooter)?[e("div",{class:"vxe-table--filter-footer"},[e("button",{class:{"is--disabled":l},attrs:{disabled:l},on:{click:this.confirmFilter}},t.confirmButtonText||getI18n("vxe.table.confirmFilter")),e("button",{on:{click:this.resetFilter}},t.resetButtonText||getI18n("vxe.table.resetFilter"))])]:[]},filterCheckAllEvent(e,t){var l=this.filterStore;l.options.forEach(e=>{e._checked=t,e.checked=t}),l.isAllSelected=t,l.isIndeterminate=!1},changeRadioOption(e,t,l){var{$parent:i,filterStore:r}=this;r.options.forEach(e=>{e._checked=!1}),l._checked=t,i.checkFilterOptions(),this.confirmFilter(e)},changeMultipleOption(e,t,l){var i=this.$parent;l._checked=t,i.checkFilterOptions()},changeAllOption(e,t){this.filterStore.multiple?this.filterCheckAllEvent(e,t):this.resetFilter(e)},changeOption(e,t,l){this.filterStore.multiple?this.changeMultipleOption(e,t,l):this.changeRadioOption(e,t,l)},confirmFilter(e){var t=this.$parent;t.handleFilterConfirmFilter(e)},resetFilter(e){var t=this.$parent;t.handleFilterResetFilter(e)}}};
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _ui=require("../../../ui"),_utils=require("../../../ui/src/utils"),_vn=require("../../../ui/src/vn");let{getI18n,getIcon,renderer}=_ui.VxeUI;var _default=exports.default={name:"VxeTableFilterPanel",props:{filterStore:Object},computed:{hasCheckOption(){var e=this.filterStore;return e&&e.options.some(e=>e.checked)}},render(e){var t=this.$parent,l=t,i=this.filterStore,{visible:r,multiple:s,column:a}=i,n=a?a.filterRender:null,c=(0,_utils.isEnableConf)(n)?renderer.get(n.name):null,o=c?c.tableFilterClassName||c.filterClassName:"",l=Object.assign({},l._currFilterParams,{$panel:this,$table:t}),h=t.computeFilterOpts.destroyOnClose;return e("div",{class:["vxe-table--filter-wrapper","filter--prevent-default",c&&c.className?c.className:"",(0,_utils.getClass)(o,l),{"is--animat":t.animat,"is--multiple":s,"is--active":r}],style:i.style},i.visible&&(!h||r)&&a?this.renderOptions(e,n,c).concat(this.renderFooter(e)):[])},methods:{renderOptions(l,e,t){var i=this.$parent;let r=this.filterStore,{column:s,multiple:a,maxHeight:n}=r;var c=s?s.slots:null,c=c?c.filter:null,o=Object.assign({},i._currFilterParams,{$panel:this,$table:i}),t=t?t.renderTableFilter||t.renderFilter:null;return c?[l("div",{class:"vxe-table--filter-template"},i.callSlot(c,o,l))]:t?[l("div",{class:"vxe-table--filter-template"},(0,_vn.getSlotVNs)(t.call(i,l,e,o)))]:(c=a?r.isAllSelected:!r.options.some(e=>e._checked),t=a&&r.isIndeterminate,[l("ul",{class:"vxe-table--filter-header"},[l("li",{class:["vxe-table--filter-option",{"is--checked":c,"is--indeterminate":t}],attrs:{title:getI18n(a?"vxe.table.allTitle":"vxe.table.allFilter")},on:{click:e=>{this.changeAllOption(e,!r.isAllSelected)}}},(a?[l("span",{class:["vxe-checkbox--icon",t?getIcon().TABLE_CHECKBOX_INDETERMINATE:c?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]})]:[]).concat([l("span",{class:"vxe-checkbox--label"},getI18n("vxe.table.allFilter"))]))]),l("ul",{class:"vxe-table--filter-body",style:n?{maxHeight:n+"px"}:{}},r.options.map(t=>{var e=t._checked;return l("li",{class:["vxe-table--filter-option",{"is--checked":e}],attrs:{title:t.label},on:{click:e=>{this.changeOption(e,!t._checked,t)}}},(a?[l("span",{class:["vxe-checkbox--icon",e?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]})]:[]).concat([l("span",{class:"vxe-checkbox--label"},(0,_utils.formatText)(t.label,1))]))}))])},renderFooter(e){var{hasCheckOption:t,filterStore:l}=this,{column:i,multiple:r}=l,s=this.$parent.computeFilterOpts,i=i.filterRender,i=(0,_utils.isEnableConf)(i)?renderer.get(i.name):null,t=!t&&!l.isAllSelected&&!l.isIndeterminate;return r&&(!i||!1!==i.showTableFilterFooter&&!1!==i.showFilterFooter&&!1!==i.isFooter)?[e("div",{class:"vxe-table--filter-footer"},[e("button",{class:{"is--disabled":t},attrs:{disabled:t},on:{click:this.confirmFilter}},s.confirmButtonText||getI18n("vxe.table.confirmFilter")),e("button",{on:{click:this.resetFilter}},s.resetButtonText||getI18n("vxe.table.resetFilter"))])]:[]},filterCheckAllEvent(e,t){var l=this.filterStore;l.options.forEach(e=>{e._checked=t,e.checked=t}),l.isAllSelected=t,l.isIndeterminate=!1},changeRadioOption(e,t,l){var{$parent:i,filterStore:r}=this;r.options.forEach(e=>{e._checked=!1}),l._checked=t,i.checkFilterOptions(),this.confirmFilter(e)},changeMultipleOption(e,t,l){var i=this.$parent;l._checked=t,i.checkFilterOptions()},changeAllOption(e,t){this.filterStore.multiple?this.filterCheckAllEvent(e,t):this.resetFilter(e)},changeOption(e,t,l){this.filterStore.multiple?this.changeMultipleOption(e,t,l):this.changeRadioOption(e,t,l)},confirmFilter(e){var t=this.$parent;t.handleFilterConfirmFilter(e)},resetFilter(e){var t=this.$parent;t.handleFilterResetFilter(e)}}};

package/lib/table/src/methods.js

@@ -259,7 +259,8 @@ function cacheColumnMap($xeTable) {
       index,
       items,
       parent: parentColumn || null,
-      width: 0
+      width: 0,
+      oLeft: 0
     };
     if (field) {
       if (fullColumnFieldData[field]) {
@@ -1837,6 +1838,21 @@ function handleScrollToRowColumn($xeTable, fieldOrColumn, row) {
   }
   return $xeTable.$nextTick();
 }
+const handleRowExpandReserve = ($xeTable, row, expanded) => {
+  const internalData = $xeTable;
+  const {
+    rowExpandedReserveRowMap
+  } = internalData;
+  const expandOpts = $xeTable.computeExpandOpts;
+  if (expandOpts.reserve) {
+    const rowid = (0, _util.getRowid)($xeTable, row);
+    if (expanded) {
+      rowExpandedReserveRowMap[rowid] = row;
+    } else if (rowExpandedReserveRowMap[rowid]) {
+      delete rowExpandedReserveRowMap[rowid];
+    }
+  }
+};
 // 计算可视渲染相关数据
 function computeScrollLoad($xeTable) {
   const reactData = $xeTable;
@@ -8653,7 +8669,7 @@ const Methods = {
         });
       }
       if (reserve) {
-        validRows.forEach(row => this.handleRowExpandReserve(row, expanded));
+        validRows.forEach(row => handleRowExpandReserve($xeTable, row, expanded));
       }
     }
     this.rowExpandedMaps = rExpandedMaps;
@@ -8688,42 +8704,32 @@ const Methods = {
    */
   clearRowExpand() {
     const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
     const {
-      expandOpts,
       tableFullData
-    } = this;
+    } = internalData;
+    const expandOpts = $xeTable.computeExpandOpts;
     const {
       reserve
     } = expandOpts;
-    const expList = this.getRowExpandRecords();
-    this.rowExpandedMaps = {};
+    const expList = $xeTable.getRowExpandRecords();
+    reactData.rowExpandedMaps = {};
     if (reserve) {
-      tableFullData.forEach(row => this.handleRowExpandReserve(row, false));
+      tableFullData.forEach(row => handleRowExpandReserve($xeTable, row, false));
     }
-    return this.$nextTick().then(() => {
+    return $xeTable.$nextTick().then(() => {
       if (expList.length) {
-        this.recalculate();
+        return $xeTable.recalculate();
       }
-    }).then(() => $xeTable.updateCellAreas());
+    }).then(() => {
+      return $xeTable.updateCellAreas();
+    });
   },
   clearRowExpandReserve() {
     this.rowExpandedReserveRowMap = {};
     return this.$nextTick();
   },
-  handleRowExpandReserve(row, expanded) {
-    const {
-      rowExpandedReserveRowMap,
-      expandOpts
-    } = this;
-    if (expandOpts.reserve) {
-      const rowid = (0, _util.getRowid)(this, row);
-      if (expanded) {
-        rowExpandedReserveRowMap[rowid] = row;
-      } else if (rowExpandedReserveRowMap[rowid]) {
-        delete rowExpandedReserveRowMap[rowid];
-      }
-    }
-  },
   getRowExpandRecords() {
     const rest = [];
     _xeUtils.default.each(this.rowExpandedMaps, item => {