vxe-table 3.23.5 → 3.23.6

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

@@ -30,24 +30,16 @@ function updatePopupStyle($xeTable) {
     column,
     targetEl
   } = filterStore;
-  if (!column || !targetEl) {
+  if (!column) {
     return $xeTable.$nextTick();
   }
   const tableEl = $xeTable.$refs.refElem;
-  const {
-    scrollTop,
-    scrollLeft,
-    visibleHeight,
-    visibleWidth
-  } = (0, _dom.getDomNode)();
   const filterOpts = $xeTable.computeFilterOpts;
   const {
     maxHeight: customMaxHeight,
     transfer,
     zIndex
   } = filterOpts;
-  const currEl = targetEl;
-  const tableRect = tableEl.getBoundingClientRect();
   const filterRender = column ? column.filterRender : null;
   const compConf = filterRender && (0, _utils.isEnableConf)(filterRender) ? renderer.get(filterRender.name) : null;
   const headerScrollElem = (0, _util.getRefElem)(elemStore['main-header-scroll']);
@@ -59,63 +51,83 @@ function updatePopupStyle($xeTable) {
   if (!filterWrapperElem) {
     return $xeTable.$nextTick();
   }
-  const btnRect = currEl.getBoundingClientRect();
   const filterHeadElem = filterWrapperElem.querySelector('.vxe-table--filter-header');
   const filterFootElem = filterWrapperElem.querySelector('.vxe-table--filter-footer');
-  const filterWidth = filterWrapperElem.offsetWidth;
-  const centerWidth = currEl ? filterWidth / 2 : (filterWidth - column.renderWidth) / 2;
-  let left = 0;
-  let top = 0;
-  let maxHeight = 0;
   /**
    * 是否显示筛选按钮图标
    * 如果不存在图标，则相对单元格居中显示
    */
-  if (transfer) {
-    left = btnRect.left - centerWidth + scrollLeft;
-    top = btnRect.top + currEl.clientHeight + scrollTop;
-    maxHeight = Math.min(Math.max(tableRect.height, Math.floor(visibleHeight / 2)), Math.max(80, visibleHeight - top - (filterHeadElem ? filterHeadElem.clientHeight : 0) - (filterFootElem ? filterFootElem.clientHeight : 0) - 28));
-    if (left < 16) {
-      left = 16;
-    } else if (left > visibleWidth - filterWidth - 16) {
-      left = visibleWidth - filterWidth - 16;
+  const handleStyle = () => {
+    /**
+     * 是否显示筛选按钮图标
+     * 如果不存在图标，则相对单元格居中显示
+     */
+    let currEl = targetEl;
+    if (!targetEl) {
+      const headerWrapperElem = (0, _util.getRefElem)(elemStore[`${column.fixed || 'main'}-header-wrapper`] || elemStore['main-header-wrapper']);
+      const colEl = headerWrapperElem ? headerWrapperElem.querySelector(`.vxe-header--column.${column.id}`) : null;
+      if (colEl) {
+        currEl = colEl;
+      }
     }
-  } else {
-    left = btnRect.left - tableRect.left - centerWidth;
-    top = btnRect.top - tableRect.top + currEl.clientHeight;
-    maxHeight = Math.max(40, tableEl.clientHeight - top - (filterHeadElem ? filterHeadElem.clientHeight : 0) - (filterFootElem ? filterFootElem.clientHeight : 0) - 14);
-    if (left < 1) {
-      left = 1;
-    } else if (left > tableEl.clientWidth - filterWidth - 1) {
-      left = tableEl.clientWidth - filterWidth - 1;
+    if (!currEl) {
+      return $xeTable.$nextTick();
     }
-    if ($xeGGWrapper) {
-      const wrapperEl = $xeGGWrapper.$refs.refElem;
-      if (wrapperEl) {
-        const wrapperRect = wrapperEl.getBoundingClientRect();
-        top += tableRect.top - wrapperRect.top;
+    const btnRect = currEl.getBoundingClientRect();
+    const tableRect = tableEl.getBoundingClientRect();
+    let left = 0;
+    let top = 0;
+    let maxHeight = 0;
+    let panelStyle = {};
+    if (transfer) {
+      const ppObj = (0, _dom.updatePanelPlacement)(currEl, filterWrapperElem, {
+        defaultPlacement: 'bottom',
+        isMinWidth: false,
+        teleportTo: transfer
+      });
+      panelStyle = ppObj.style;
+    } else {
+      const filterWidth = filterWrapperElem.offsetWidth;
+      const centerWidth = targetEl ? filterWidth / 2 : (filterWidth - column.renderWidth) / 2;
+      maxHeight = Math.max(40, tableEl.clientHeight - top - (filterHeadElem ? filterHeadElem.clientHeight : 0) - (filterFootElem ? filterFootElem.clientHeight : 0) - 14);
+      left = btnRect.left - tableRect.left - centerWidth;
+      top = btnRect.top - tableRect.top + currEl.clientHeight;
+      if (left < 1) {
+        left = 1;
+      } else if (left > tableEl.clientWidth - filterWidth - 1) {
+        left = tableEl.clientWidth - filterWidth - 1;
+      }
+      if ($xeGGWrapper) {
+        const wrapperEl = $xeGGWrapper.$refs.refElem;
+        if (wrapperEl) {
+          const wrapperRect = wrapperEl.getBoundingClientRect();
+          top += tableRect.top - wrapperRect.top;
+        }
       }
+      panelStyle = {
+        top: (0, _dom.toCssUnit)(top),
+        left: (0, _dom.toCssUnit)(left)
+      };
     }
-  }
-  const fStys = {
-    top: (0, _dom.toCssUnit)(top),
-    left: (0, _dom.toCssUnit)(left)
-  };
-  if (zIndex) {
-    fStys.zIndex = zIndex;
-  }
-  filterStore.style = fStys;
-  // 筛选面板是自适应表格高度
-  if (compConf ? !compConf.tableFilterAutoHeight : false) {
-    maxHeight = 0;
-  } else {
-    if (customMaxHeight) {
-      maxHeight = customMaxHeight > maxHeight ? maxHeight : customMaxHeight;
+    if (zIndex) {
+      panelStyle.zIndex = zIndex;
     }
-  }
-  // 判断面板不能大于表格高度
-  filterStore.maxHeight = maxHeight;
-  return $xeTable.$nextTick();
+    filterStore.style = panelStyle;
+    // 筛选面板是自适应表格高度
+    if (compConf ? !compConf.tableFilterAutoHeight : false) {
+      maxHeight = 0;
+    } else {
+      if (customMaxHeight) {
+        maxHeight = customMaxHeight > maxHeight ? maxHeight : customMaxHeight;
+      }
+    }
+    // 判断面板不能大于表格高度
+    filterStore.maxHeight = maxHeight;
+  };
+  handleStyle();
+  return $xeTable.$nextTick().then(() => {
+    handleStyle();
+  });
 }
 var _default = exports.default = {
   methods: {
@@ -223,14 +235,13 @@ var _default = exports.default = {
       if (filterStore.column === column && filterStore.visible) {
         filterStore.visible = false;
       } else {
-        const currEl = btnEl || colEl;
         $xeTable.handleFilterOptions(column);
         internalData._currFilterParams = params;
-        filterStore.targetEl = currEl;
+        filterStore.targetEl = btnEl;
         filterStore.style = null;
         filterStore.visible = true;
         initStore.filter = true;
-        $xeTable.$nextTick(() => {
+        $xeTable.$nextTick().then(() => {
           updatePopupStyle($xeTable);
         });
       }

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

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../../ui"),_util=require("../../src/util"),_dom=require("../../../ui/src/dom"),_utils=require("../../../ui/src/utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let renderer=_ui.VxeUI.renderer,sourceType="table";function updatePopupStyle(e){var i=e.$xeGrid||e.$xeGantt,r=e.filterStore,n=e.elemStore,{column:a,targetEl:o}=r;if(a&&o){var s=e.$refs.refElem,{scrollTop:u,scrollLeft:h,visibleHeight:d,visibleWidth:c}=(0,_dom.getDomNode)(),{maxHeight:f,transfer:m,zIndex:p}=e.computeFilterOpts,F=s.getBoundingClientRect(),v=a?a.filterRender:null,v=v&&(0,_utils.isEnableConf)(v)?renderer.get(v.name):null;if((0,_util.getRefElem)(n["main-header-scroll"])){n=e.$refs.refTableFilter,n=n?n.$el:null;if(n){var _=o.getBoundingClientRect(),C=n.querySelector(".vxe-table--filter-header"),x=n.querySelector(".vxe-table--filter-footer"),n=n.offsetWidth,a=o?n/2:(n-a.renderWidth)/2;let e=0,t=0,l=0;m?(e=_.left-a+h,t=_.top+o.clientHeight+u,l=Math.min(Math.max(F.height,Math.floor(d/2)),Math.max(80,d-t-(C?C.clientHeight:0)-(x?x.clientHeight:0)-28)),e<16?e=16:e>c-n-16&&(e=c-n-16)):(e=_.left-F.left-a,t=_.top-F.top+o.clientHeight,l=Math.max(40,s.clientHeight-t-(C?C.clientHeight:0)-(x?x.clientHeight:0)-14),e<1?e=1:e>s.clientWidth-n-1&&(e=s.clientWidth-n-1),i&&(m=i.$refs.refElem)&&(h=m.getBoundingClientRect(),t+=F.top-h.top));u={top:(0,_dom.toCssUnit)(t),left:(0,_dom.toCssUnit)(e)};p&&(u.zIndex=p),r.style=u,v&&!v.tableFilterAutoHeight?l=0:f&&(l=f>l?l:f),r.maxHeight=l}}}return e.$nextTick()}var _default=exports.default={methods:{_openFilter(e){let n=this,a=n.$xeGrid,o=n.$xeGantt,s=(0,_util.handleFieldOrColumn)(this,e);if(s&&s.filters){let e=this.elemStore,{fixed:i,filters:r}=s;return n.scrollToColumn(s).then(()=>{var t=e[`${i||"main"}-header-wrapper`]||e["main-header-wrapper"];if(t){var l=t.querySelector(`.vxe-header--column.${s.id} .vxe-cell--filter`);if(l)(0,_dom.triggerEvent)(l,"click");else{l=t.querySelector(".vxe-header--column."+s.id);if(l){let e=null;r&&(e=r[0]);t={$table:n,$grid:a,$gantt:o,$rowIndex:-1,column:s,columnIndex:n.getColumnIndex(s),$columnIndex:n.getVMColumnIndex(s),_columnIndex:n.getVTColumnIndex(s),firstFilterOption:e,fixed:i,source:sourceType,type:"header"};n.handleOpenFilterColumn(new Event("click"),null,l,s,t)}}}})}return n.$nextTick()},_setFilter(e,t,l){var i=this,r=i.filterStore,e=(0,_util.handleFieldOrColumn)(i,e);if(e&&e.filters){if(e.filters=(0,_util.toFilters)(t||[],e.id),l)return i.handleColumnConfirmFilter(e,null);r.visible&&i.handleFilterOptions(e)}return i.$nextTick()},checkFilterOptions(){var e=this.filterStore,t=e.column;t&&(t=t.filters||[],e.isAllSelected=t.every(e=>e._checked),e.isIndeterminate=!e.isAllSelected&&t.some(e=>e._checked))},handleOpenFilterColumn(e,t,l,i,r){let n=this;var a=n,o=n,{initStore:a,filterStore:s}=a;s.column===i&&s.visible?s.visible=!1:(t=t||l,n.handleFilterOptions(i),o._currFilterParams=r,s.targetEl=t,s.style=null,s.visible=!0,a.filter=!0,n.$nextTick(()=>{updatePopupStyle(n)})),n.dispatchEvent("filter-visible",{column:i,field:i.field,property:i.field,filterList:n.getCheckedFilters(),visible:s.visible},e)},triggerFilterEvent(e,t,l){var i=this.elemStore,r=t.fixed,r=(0,_util.getRefElem)(i[`${r||"main"}-header-wrapper`]||i["main-header-wrapper"]),i=e.currentTarget,r=r?r.querySelector(".vxe-header--column."+t.id):null;this.handleOpenFilterColumn(e,i,r||i,t,l)},handleFilterChangeRadioOption(e,t,l){var i=this.filterStore,i=i.column;i&&((i.filters||[]).forEach(e=>{e._checked=!1}),l._checked=t,this.checkFilterOptions(),this.handleFilterConfirmFilter(e,i))},handleFilterChangeMultipleOption(e,t,l){l._checked=t,this.checkFilterOptions()},handleFilterChangeOption(e,t,l){var i=this.filterStore,r=this.fullColumnIdData;let n=i.column;n||(r=r[l._colId])&&(n=r.column,i.column=n),n&&(n.filterMultiple?this.handleFilterChangeMultipleOption(e,t,l):this.handleFilterChangeRadioOption(e,t,l))},handleFilterConfirmFilter(e,t){t&&((t.filters||[]).forEach(e=>{e.checked=e._checked}),this.confirmFilterEvent(e,t))},_saveFilter(e){return e&&(e=(0,_util.handleFieldOrColumn)(this,e),this.handleFilterConfirmFilter(null,e)),this.$nextTick()},_saveFilterByEvent(e,t){return t&&(t=(0,_util.handleFieldOrColumn)(this,t),this.handleFilterConfirmFilter(e,t)),this.$nextTick()},_resetFilter(e){return e&&(e=(0,_util.handleFieldOrColumn)(this,e),this.handleFilterResetFilter(null,e)),this.$nextTick()},_resetFilterByEvent(e,t){return t&&(t=(0,_util.handleFieldOrColumn)(this,t),this.handleFilterResetFilter(e,t)),this.$nextTick()},_saveFilterPanel(){var e=this.filterStore;return this.handleFilterConfirmFilter(null,e.column||null),this.$nextTick()},_saveFilterPanelByEvent(e){var t=this.filterStore;return this.handleFilterConfirmFilter(e,t.column||null),this.$nextTick()},_resetFilterPanel(){var e=this.filterStore;return this.handleFilterResetFilter(null,e.column||null),this.$nextTick()},_resetFilterPanelByEvent(e){var t=this.filterStore;return this.handleFilterResetFilter(e,t.column||null),this.$nextTick()},_getCheckedFilters(){var e=this.tableFullColumn;let n=[];return e.forEach(e=>{var{field:t,filters:l}=e,l=l||[];let i=[],r=[];l&&(l.forEach(e=>{e.checked&&(i.push(e.value),r.push(e.data))}),i.length)&&n.push({column:e,field:t,property:t,values:i,datas:r})}),n},handleColumnConfirmFilter(e,t){let l=this;var i=l;let r=l;i=i.mouseConfig;let{scrollXLoad:n,scrollYLoad:a}=r;var o=l.computeFilterOpts,s=l.computeMouseOpts,{field:u,filters:h}=e;let d=[],c=[];(h||[]).forEach(e=>{e.checked&&(d.push(e.value),c.push(e.data))});h=l.getCheckedFilters(),e={$table:l,$event:t,column:e,field:u,property:u,values:d,datas:c,filters:h,filterList:h};return o.remote||(l.handleTableData(!0),l.checkSelectionStatus()),i&&s.area&&l.handleFilterEvent&&l.handleFilterEvent(t,e),t&&l.dispatchEvent("filter-change",e,t),l.closeFilter(),l.updateFooter().then(()=>{var{scrollXLoad:e,scrollYLoad:t}=r;if(n||e||a||t)return(n||e)&&l.updateScrollXSpace(),(a||t)&&l.updateScrollYSpace(),l.refreshScroll()}).then(()=>(l.updateCellAreas(),l.recalculate(!0))).then(()=>{setTimeout(()=>l.recalculate(),50)})},confirmFilterEvent(e,t){t&&this.handleColumnConfirmFilter(t,e)},handleClearFilter(e){if(e){var{filters:l,filterRender:i}=e;if(l){i=(0,_utils.isEnableConf)(i)?renderer.get(i.name):null;let t=e.filterResetMethod||(i?i.tableFilterResetMethod||i.filterResetMethod:null);l.forEach(e=>{e._checked=!1,e.checked=!1,t||(e.data=_xeUtils.default.clone(e.resetValue,!0))}),t&&t({options:l,column:e,$table:this})}}},handleFilterResetFilter(e,t){t&&(this.handleClearFilter(t),this.confirmFilterEvent(e,t),e)&&this.dispatchEvent("clear-filter",{filterList:[]},e)},handleFilterStyle(){var e=this.filterStore;return e.visible?updatePopupStyle(this):this.$nextTick()},_clearFilter(e){var t=this,l=t.filterStore,i=t.tableFullColumn;let r;return e?(r=(0,_util.handleFieldOrColumn)(t,e))&&t.handleClearFilter(r):i.forEach(t.handleClearFilter),e&&r===l.column||Object.assign(l,{isAllSelected:!1,isIndeterminate:!1,style:null,options:[],column:null,multiple:!1,visible:!1}),t.updateData()},_updateFilterOptionStatus(e,t){return e._checked=t,e.checked=t,this.$nextTick()}}};
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../../ui"),_util=require("../../src/util"),_dom=require("../../../ui/src/dom"),_utils=require("../../../ui/src/utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let renderer=_ui.VxeUI.renderer,sourceType="table";function updatePopupStyle(s){let h=s.$xeGrid||s.$xeGantt,d=s.filterStore,c=s.elemStore,{column:f,targetEl:m}=d;if(!f)return s.$nextTick();let p=s.$refs.refElem,{maxHeight:F,transfer:v,zIndex:_}=s.computeFilterOpts;var e=f?f.filterRender:null;let x=e&&(0,_utils.isEnableConf)(e)?renderer.get(e.name):null;if(!(0,_util.getRefElem)(c["main-header-scroll"]))return s.$nextTick();e=s.$refs.refTableFilter;let C=e?e.$el:null;if(!C)return s.$nextTick();let g=C.querySelector(".vxe-table--filter-header"),k=C.querySelector(".vxe-table--filter-footer"),t=()=>{let e=m;if(m||(i=(i=(0,_util.getRefElem)(c[`${f.fixed||"main"}-header-wrapper`]||c["main-header-wrapper"]))?i.querySelector(".vxe-header--column."+f.id):null)&&(e=i),!e)return s.$nextTick();var t,l,i=e.getBoundingClientRect(),r=p.getBoundingClientRect();let n=0,a=0,u=0,o={};o=v?(0,_dom.updatePanelPlacement)(e,C,{defaultPlacement:"bottom",isMinWidth:!1,teleportTo:v}).style:(t=C.offsetWidth,l=m?t/2:(t-f.renderWidth)/2,u=Math.max(40,p.clientHeight-a-(g?g.clientHeight:0)-(k?k.clientHeight:0)-14),n=i.left-r.left-l,a=i.top-r.top+e.clientHeight,n<1?n=1:n>p.clientWidth-t-1&&(n=p.clientWidth-t-1),h&&(l=h.$refs.refElem)&&(i=l.getBoundingClientRect(),a+=r.top-i.top),{top:(0,_dom.toCssUnit)(a),left:(0,_dom.toCssUnit)(n)}),_&&(o.zIndex=_),d.style=o,x&&!x.tableFilterAutoHeight?u=0:F&&(u=F>u?u:F),d.maxHeight=u};return t(),s.$nextTick().then(()=>{t()})}var _default=exports.default={methods:{_openFilter(e){let n=this,a=n.$xeGrid,u=n.$xeGantt,o=(0,_util.handleFieldOrColumn)(this,e);if(o&&o.filters){let e=this.elemStore,{fixed:i,filters:r}=o;return n.scrollToColumn(o).then(()=>{var t=e[`${i||"main"}-header-wrapper`]||e["main-header-wrapper"];if(t){var l=t.querySelector(`.vxe-header--column.${o.id} .vxe-cell--filter`);if(l)(0,_dom.triggerEvent)(l,"click");else{l=t.querySelector(".vxe-header--column."+o.id);if(l){let e=null;r&&(e=r[0]);t={$table:n,$grid:a,$gantt:u,$rowIndex:-1,column:o,columnIndex:n.getColumnIndex(o),$columnIndex:n.getVMColumnIndex(o),_columnIndex:n.getVTColumnIndex(o),firstFilterOption:e,fixed:i,source:sourceType,type:"header"};n.handleOpenFilterColumn(new Event("click"),null,l,o,t)}}}})}return n.$nextTick()},_setFilter(e,t,l){var i=this,r=i.filterStore,e=(0,_util.handleFieldOrColumn)(i,e);if(e&&e.filters){if(e.filters=(0,_util.toFilters)(t||[],e.id),l)return i.handleColumnConfirmFilter(e,null);r.visible&&i.handleFilterOptions(e)}return i.$nextTick()},checkFilterOptions(){var e=this.filterStore,t=e.column;t&&(t=t.filters||[],e.isAllSelected=t.every(e=>e._checked),e.isIndeterminate=!e.isAllSelected&&t.some(e=>e._checked))},handleOpenFilterColumn(e,t,l,i,r){let n=this;var a=n,u=n,{initStore:a,filterStore:o}=a;o.column===i&&o.visible?o.visible=!1:(n.handleFilterOptions(i),u._currFilterParams=r,o.targetEl=t,o.style=null,o.visible=!0,a.filter=!0,n.$nextTick().then(()=>{updatePopupStyle(n)})),n.dispatchEvent("filter-visible",{column:i,field:i.field,property:i.field,filterList:n.getCheckedFilters(),visible:o.visible},e)},triggerFilterEvent(e,t,l){var i=this.elemStore,r=t.fixed,r=(0,_util.getRefElem)(i[`${r||"main"}-header-wrapper`]||i["main-header-wrapper"]),i=e.currentTarget,r=r?r.querySelector(".vxe-header--column."+t.id):null;this.handleOpenFilterColumn(e,i,r||i,t,l)},handleFilterChangeRadioOption(e,t,l){var i=this.filterStore,i=i.column;i&&((i.filters||[]).forEach(e=>{e._checked=!1}),l._checked=t,this.checkFilterOptions(),this.handleFilterConfirmFilter(e,i))},handleFilterChangeMultipleOption(e,t,l){l._checked=t,this.checkFilterOptions()},handleFilterChangeOption(e,t,l){var i=this.filterStore,r=this.fullColumnIdData;let n=i.column;n||(r=r[l._colId])&&(n=r.column,i.column=n),n&&(n.filterMultiple?this.handleFilterChangeMultipleOption(e,t,l):this.handleFilterChangeRadioOption(e,t,l))},handleFilterConfirmFilter(e,t){t&&((t.filters||[]).forEach(e=>{e.checked=e._checked}),this.confirmFilterEvent(e,t))},_saveFilter(e){return e&&(e=(0,_util.handleFieldOrColumn)(this,e),this.handleFilterConfirmFilter(null,e)),this.$nextTick()},_saveFilterByEvent(e,t){return t&&(t=(0,_util.handleFieldOrColumn)(this,t),this.handleFilterConfirmFilter(e,t)),this.$nextTick()},_resetFilter(e){return e&&(e=(0,_util.handleFieldOrColumn)(this,e),this.handleFilterResetFilter(null,e)),this.$nextTick()},_resetFilterByEvent(e,t){return t&&(t=(0,_util.handleFieldOrColumn)(this,t),this.handleFilterResetFilter(e,t)),this.$nextTick()},_saveFilterPanel(){var e=this.filterStore;return this.handleFilterConfirmFilter(null,e.column||null),this.$nextTick()},_saveFilterPanelByEvent(e){var t=this.filterStore;return this.handleFilterConfirmFilter(e,t.column||null),this.$nextTick()},_resetFilterPanel(){var e=this.filterStore;return this.handleFilterResetFilter(null,e.column||null),this.$nextTick()},_resetFilterPanelByEvent(e){var t=this.filterStore;return this.handleFilterResetFilter(e,t.column||null),this.$nextTick()},_getCheckedFilters(){var e=this.tableFullColumn;let n=[];return e.forEach(e=>{var{field:t,filters:l}=e,l=l||[];let i=[],r=[];l&&(l.forEach(e=>{e.checked&&(i.push(e.value),r.push(e.data))}),i.length)&&n.push({column:e,field:t,property:t,values:i,datas:r})}),n},handleColumnConfirmFilter(e,t){let l=this;var i=l;let r=l;i=i.mouseConfig;let{scrollXLoad:n,scrollYLoad:a}=r;var u=l.computeFilterOpts,o=l.computeMouseOpts,{field:s,filters:h}=e;let d=[],c=[];(h||[]).forEach(e=>{e.checked&&(d.push(e.value),c.push(e.data))});h=l.getCheckedFilters(),e={$table:l,$event:t,column:e,field:s,property:s,values:d,datas:c,filters:h,filterList:h};return u.remote||(l.handleTableData(!0),l.checkSelectionStatus()),i&&o.area&&l.handleFilterEvent&&l.handleFilterEvent(t,e),t&&l.dispatchEvent("filter-change",e,t),l.closeFilter(),l.updateFooter().then(()=>{var{scrollXLoad:e,scrollYLoad:t}=r;if(n||e||a||t)return(n||e)&&l.updateScrollXSpace(),(a||t)&&l.updateScrollYSpace(),l.refreshScroll()}).then(()=>(l.updateCellAreas(),l.recalculate(!0))).then(()=>{setTimeout(()=>l.recalculate(),50)})},confirmFilterEvent(e,t){t&&this.handleColumnConfirmFilter(t,e)},handleClearFilter(e){if(e){var{filters:l,filterRender:i}=e;if(l){i=(0,_utils.isEnableConf)(i)?renderer.get(i.name):null;let t=e.filterResetMethod||(i?i.tableFilterResetMethod||i.filterResetMethod:null);l.forEach(e=>{e._checked=!1,e.checked=!1,t||(e.data=_xeUtils.default.clone(e.resetValue,!0))}),t&&t({options:l,column:e,$table:this})}}},handleFilterResetFilter(e,t){t&&(this.handleClearFilter(t),this.confirmFilterEvent(e,t),e)&&this.dispatchEvent("clear-filter",{filterList:[]},e)},handleFilterStyle(){var e=this.filterStore;return e.visible?updatePopupStyle(this):this.$nextTick()},_clearFilter(e){var t=this,l=t.filterStore,i=t.tableFullColumn;let r;return e?(r=(0,_util.handleFieldOrColumn)(t,e))&&t.handleClearFilter(r):i.forEach(t.handleClearFilter),e&&r===l.column||Object.assign(l,{isAllSelected:!1,isIndeterminate:!1,style:null,options:[],column:null,multiple:!1,visible:!1}),t.updateData()},_updateFilterOptionStatus(e,t){return e._checked=t,e.checked=t,this.$nextTick()}}};

package/lib/table/module/keyboard/mixin.js

@@ -447,17 +447,14 @@ var _default = exports.default = {
     // 处理当前列方向键移动
     moveCurrentColumn(isLeftArrow, isRightArrow, evnt) {
       const $xeTable = this;
-      const reactData = $xeTable;
       const internalData = $xeTable;
       const {
-        currentColumn
-      } = reactData;
-      const {
+        currentCol,
         visibleColumn
       } = internalData;
       let targetCol = null;
-      if (currentColumn) {
-        const _columnIndex = $xeTable.getVTColumnIndex(currentColumn);
+      if (currentCol) {
+        const _columnIndex = $xeTable.getVTColumnIndex(currentCol);
         if (isLeftArrow && _columnIndex > 0) {
           targetCol = visibleColumn[_columnIndex - 1];
         } else if (isRightArrow && _columnIndex < visibleColumn.length - 1) {

package/lib/table/module/keyboard/mixin.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_util=require("../../src/util"),_dom=require("../../../ui/src/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function getCheckboxRangeRows(t,e,l,o,n,r,i){var u=t.showOverflow,{fullAllDataRowIdData:c,isResizeCellHeight:s}=t,d=t.computeRowOpts,h=t.computeCellOpts,g=t.computeDefaultRowHeight,l=l.row;let a=0,m=[],C=0;var p=0<i,w=t.scrollYLoad,v=t.afterFullData;if(C=p?r+i:n.height-r+Math.abs(i),w){n=t.getVTRowIndex(l);if(!(s||h.height||d.height)&&u)m=p?v.slice(n,n+Math.ceil(C/g)):v.slice(n-Math.floor(C/g),n+1);else if(p)for(let e=n;e<v.length;e++){var f=v[e],x=c[t.getRowid(f)]||{};if(a+=x.resizeHeight||h.height||d.height||x.height||g,m.push(f),a>C)return m}else for(let e=n;0<=e;e--){var R=v[e],b=c[t.getRowid(R)]||{};if(a+=b.resizeHeight||h.height||d.height||b.height||g,m.push(R),a>C)return m}}else for(var I=p?"next":"previous";o&&a<C;){var E=t.getRowNode(o);E&&(m.push(E.item),a+=o.offsetHeight,o=o[I+"ElementSibling"])}return m}function handleMoveSelected(e,t,l,o,n,r,i){var{afterFullData:u,visibleColumn:c}=e;let s=Object.assign({},l);var{row:l,column:d}=s,l=e.getVTRowIndex(l),h=e.getVTColumnIndex(d),g=e.$refs.refTableBody,g=g?g.$el:null,g=g?g.clientWidth:0;let a=o||r||d.renderWidth<g;return o&&0<=h||r&&h<=c.length-1?a=!1:t.preventDefault(),n&&0<l?(s.rowIndex=l-1,s.row=u[s.rowIndex]):i&&l<u.length-1?(s.rowIndex=l+1,s.row=u[s.rowIndex]):o&&h?(s.columnIndex=h-1,s.column=c[s.columnIndex]):r&&h<c.length-1&&(s.columnIndex=h+1,s.column=c[s.columnIndex]),e.scrollToRow(s.row,s.column,{colAlign:a}).then(()=>{s.cell=e.getCellElement(s.row,s.column),e.handleSelected(s,t)}),s}function handleCheckboxRangeEvent(S,e,M){var t=S.elemStore,l=(0,_util.getRefElem)(t["main-body-scroll"]),o=(0,_util.getRefElem)(t["left-body-scroll"]),t=(0,_util.getRefElem)(t["right-body-scroll"]),{column:n,cell:r}=M;if("checkbox"===n.type){let O=l;if(o&&"left"===n.fixed?O=o:t&&"right"===n.fixed&&(O=t),O){l=O.getBoundingClientRect();let t=S.$refs.refElem,u=e.clientX,c=e.clientY,s=O.querySelector(".vxe-table--checkbox-range"),d=r.parentNode,h=S.getCheckboxRecords(),g=[],a=1,m=e.clientY-l.y+O.scrollTop,C=e.clientX-l.x+O.scrollLeft,p=O.scrollTop,i=d.offsetHeight,w=d.getBoundingClientRect(),v=c-w.y,f=null,x=!1,R=1,b=(e,t)=>{S.dispatchEvent("checkbox-range-"+e,{records:()=>S.getCheckboxRecords(),reserves:()=>S.getCheckboxReserveRecords()},t)},I=e=>{var{clientX:t,clientY:l}=e,t=t-u,l=l-c+(O.scrollTop-p);let o=Math.abs(l),n=Math.abs(t),r=m,i=C;l<a?(r+=l)<a&&(r=a,o=m):o=Math.min(o,O.scrollHeight-m-a),t<a?(i+=t,n>C&&(i=a,n=C)):n=Math.min(n,O.clientWidth-C-a),s.style.height=o+"px",s.style.width=n+"px",s.style.left=i+"px",s.style.top=r+"px",s.style.display="block";t=getCheckboxRangeRows(S,e,M,d,w,v,l<a?-o:o);10<o&&t.length!==g.length&&(l=(0,_dom.hasControlKey)(e),g=t,l?t.forEach(e=>{S.handleBatchSelectRows([e],-1===h.indexOf(e))}):(S.setAllCheckboxRow(!1),S.handleCheckedCheckboxRow(t,!0,!1)),b("change",e))},E=()=>{clearTimeout(f),f=null},T=r=>{E(),f=setTimeout(()=>{var e,t,l,o,n;f&&({scrollLeft:e,scrollTop:t,clientHeight:l,scrollHeight:o}=O,n=Math.ceil(50*R/i),x?t+l<o?(S.scrollTo(e,t+n),T(r),I(r)):E():t?(S.scrollTo(e,t-n),T(r),I(r)):E())},50)};(0,_dom.addClass)(t,"drag--range"),document.onmousemove=e=>{e.preventDefault(),e.stopPropagation();var t=e.clientY,l=(0,_dom.getAbsolutePos)(O).boundingTop;t<l?(x=!1,R=l-t,f||T(e)):t>l+O.clientHeight?(x=!0,R=t-l-O.clientHeight,f||T(e)):f&&E(),I(e)},document.onmouseup=e=>{E(),(0,_dom.removeClass)(t,"drag--range"),s.removeAttribute("style"),document.onmousemove=null,document.onmouseup=null,b("end",e)},b("start",e)}}}var _default=exports.default={methods:{moveTabSelected(e,t,l){let o=this;var n=o.editConfig,{afterFullData:r,visibleColumn:i}=o,u=o.computeEditOpts,c=o.computeRowOpts,s=o.computeCurrentRowOpts,d=o.computeColumnOpts,h=o.computeCurrentColumnOpts;let g,a,m,C=Object.assign({},e);var e=o.getVTRowIndex(C.row),p=o.getVTColumnIndex(C.column),t=(l.preventDefault(),t?p<=0?0<e&&(a=e-1,g=r[a],m=i.length-1):m=p-1:p>=i.length-1?e<r.length-1&&(a=e+1,g=r[a],m=0):m=p+1,i[m]);t&&(g?(C.rowIndex=a,C.row=g):C.rowIndex=e,C.columnIndex=m,C.column=t,C.cell=o.getCellElement(C.row,C.column),c.isCurrent&&s.isFollowSelected&&o.triggerCurrentRowEvent(l,C),d.isCurrent&&h.isFollowSelected&&o.triggerCurrentColumnEvent(l,C),n?"click"!==u.trigger&&"dblclick"!==u.trigger||("row"===u.mode?o.handleEdit(C,l):o.scrollToRow(C.row,C.column).then(()=>{o.handleSelected(C,l)})):o.scrollToRow(C.row,C.column).then(()=>{o.handleSelected(C,l)}))},moveCurrentRow(e,t,l){let o=this;var n=o.treeConfig;let{afterFullData:r,currentRow:i}=o;var u=o.computeTreeOpts,u=u.children||u.childrenField;let c;if(i?n?({index:n,items:u}=_xeUtils.default.findTree(r,e=>e===i,{children:u}),e&&0<n?c=u[n-1]:t&&n<u.length-1&&(c=u[n+1])):(u=o.getVTRowIndex(i),e&&0<u?c=r[u-1]:t&&u<r.length-1&&(c=r[u+1])):c=r[0],c){l.preventDefault();let e={$table:o,row:c,rowIndex:o.getRowIndex(c),$rowIndex:o.getVMRowIndex(c)};o.scrollToRow(c).then(()=>o.triggerCurrentRowEvent(l,e))}},moveCurrentColumn(e,t,l){let o=this;var n=o.currentColumn,r=o.visibleColumn;let i=null;if(n?(n=o.getVTColumnIndex(n),e&&0<n?i=r[n-1]:t&&n<r.length-1&&(i=r[n+1])):i=r[0],i){l.preventDefault();let e={$table:o,column:i,columnIndex:o.getColumnIndex(i),$columnIndex:o.getVMColumnIndex(i)};o.scrollToColumn(i).then(()=>o.triggerCurrentColumnEvent(l,e))}},moveArrowSelected(e,t,l,o,n,r){var i=this,{highlightCurrentRow:u,highlightCurrentColumn:c}=i,s=i.computeRowOpts,d=i.computeCurrentRowOpts,h=i.computeColumnOpts,g=i.computeCurrentColumnOpts,e=handleMoveSelected(i,r,e,t,l,o,n);(s.isCurrent||u)&&(d.isFollowSelected?i.triggerCurrentRowEvent(r,e):(l||n)&&(s.isCurrent||u)&&i.moveCurrentRow(l,n,r)),(h.isCurrent||c)&&(g.isFollowSelected?i.triggerCurrentColumnEvent(r,e):(t||o)&&(h.isCurrent||c)&&i.moveCurrentColumn(t,o,r))},moveEnterSelected(e,t,l,o,n,r){var i=this,{highlightCurrentRow:u,highlightCurrentColumn:c}=i,s=i.computeRowOpts,d=i.computeCurrentRowOpts,h=i.computeColumnOpts,g=i.computeCurrentColumnOpts,e=handleMoveSelected(i,r,e,t,l,o,n);(s.isCurrent||u)&&d.isFollowSelected&&i.triggerCurrentRowEvent(r,e),(h.isCurrent||c)&&g.isFollowSelected&&i.triggerCurrentColumnEvent(r,e)},moveSelected(e,t,l,o,n,r){handleMoveSelected(this,r,e,t,l,o,n)},handleCellMousedownEvent(e,t){var l=this,{editConfig:o,checkboxConfig:n,mouseConfig:r}=l,i=l.computeCheckboxOpts,u=l.computeMouseOpts,c=l.computeEditOpts;if(r&&u.area&&l.triggerClAreaMnEvent)return l.triggerClAreaMnEvent(e,t);n&&i.range&&handleCheckboxRangeEvent(l,e,t),r&&u.selected&&(o&&"cell"!==c.mode||l.handleSelected(t,e))}}};
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_util=require("../../src/util"),_dom=require("../../../ui/src/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function getCheckboxRangeRows(t,e,l,o,r,n,i){var u=t.showOverflow,{fullAllDataRowIdData:c,isResizeCellHeight:s}=t,d=t.computeRowOpts,h=t.computeCellOpts,g=t.computeDefaultRowHeight,l=l.row;let a=0,m=[],C=0;var p=0<i,w=t.scrollYLoad,v=t.afterFullData;if(C=p?n+i:r.height-n+Math.abs(i),w){r=t.getVTRowIndex(l);if(!(s||h.height||d.height)&&u)m=p?v.slice(r,r+Math.ceil(C/g)):v.slice(r-Math.floor(C/g),r+1);else if(p)for(let e=r;e<v.length;e++){var f=v[e],x=c[t.getRowid(f)]||{};if(a+=x.resizeHeight||h.height||d.height||x.height||g,m.push(f),a>C)return m}else for(let e=r;0<=e;e--){var R=v[e],b=c[t.getRowid(R)]||{};if(a+=b.resizeHeight||h.height||d.height||b.height||g,m.push(R),a>C)return m}}else for(var I=p?"next":"previous";o&&a<C;){var E=t.getRowNode(o);E&&(m.push(E.item),a+=o.offsetHeight,o=o[I+"ElementSibling"])}return m}function handleMoveSelected(e,t,l,o,r,n,i){var{afterFullData:u,visibleColumn:c}=e;let s=Object.assign({},l);var{row:l,column:d}=s,l=e.getVTRowIndex(l),h=e.getVTColumnIndex(d),g=e.$refs.refTableBody,g=g?g.$el:null,g=g?g.clientWidth:0;let a=o||n||d.renderWidth<g;return o&&0<=h||n&&h<=c.length-1?a=!1:t.preventDefault(),r&&0<l?(s.rowIndex=l-1,s.row=u[s.rowIndex]):i&&l<u.length-1?(s.rowIndex=l+1,s.row=u[s.rowIndex]):o&&h?(s.columnIndex=h-1,s.column=c[s.columnIndex]):n&&h<c.length-1&&(s.columnIndex=h+1,s.column=c[s.columnIndex]),e.scrollToRow(s.row,s.column,{colAlign:a}).then(()=>{s.cell=e.getCellElement(s.row,s.column),e.handleSelected(s,t)}),s}function handleCheckboxRangeEvent(S,e,M){var t=S.elemStore,l=(0,_util.getRefElem)(t["main-body-scroll"]),o=(0,_util.getRefElem)(t["left-body-scroll"]),t=(0,_util.getRefElem)(t["right-body-scroll"]),{column:r,cell:n}=M;if("checkbox"===r.type){let O=l;if(o&&"left"===r.fixed?O=o:t&&"right"===r.fixed&&(O=t),O){l=O.getBoundingClientRect();let t=S.$refs.refElem,u=e.clientX,c=e.clientY,s=O.querySelector(".vxe-table--checkbox-range"),d=n.parentNode,h=S.getCheckboxRecords(),g=[],a=1,m=e.clientY-l.y+O.scrollTop,C=e.clientX-l.x+O.scrollLeft,p=O.scrollTop,i=d.offsetHeight,w=d.getBoundingClientRect(),v=c-w.y,f=null,x=!1,R=1,b=(e,t)=>{S.dispatchEvent("checkbox-range-"+e,{records:()=>S.getCheckboxRecords(),reserves:()=>S.getCheckboxReserveRecords()},t)},I=e=>{var{clientX:t,clientY:l}=e,t=t-u,l=l-c+(O.scrollTop-p);let o=Math.abs(l),r=Math.abs(t),n=m,i=C;l<a?(n+=l)<a&&(n=a,o=m):o=Math.min(o,O.scrollHeight-m-a),t<a?(i+=t,r>C&&(i=a,r=C)):r=Math.min(r,O.clientWidth-C-a),s.style.height=o+"px",s.style.width=r+"px",s.style.left=i+"px",s.style.top=n+"px",s.style.display="block";t=getCheckboxRangeRows(S,e,M,d,w,v,l<a?-o:o);10<o&&t.length!==g.length&&(l=(0,_dom.hasControlKey)(e),g=t,l?t.forEach(e=>{S.handleBatchSelectRows([e],-1===h.indexOf(e))}):(S.setAllCheckboxRow(!1),S.handleCheckedCheckboxRow(t,!0,!1)),b("change",e))},E=()=>{clearTimeout(f),f=null},T=n=>{E(),f=setTimeout(()=>{var e,t,l,o,r;f&&({scrollLeft:e,scrollTop:t,clientHeight:l,scrollHeight:o}=O,r=Math.ceil(50*R/i),x?t+l<o?(S.scrollTo(e,t+r),T(n),I(n)):E():t?(S.scrollTo(e,t-r),T(n),I(n)):E())},50)};(0,_dom.addClass)(t,"drag--range"),document.onmousemove=e=>{e.preventDefault(),e.stopPropagation();var t=e.clientY,l=(0,_dom.getAbsolutePos)(O).boundingTop;t<l?(x=!1,R=l-t,f||T(e)):t>l+O.clientHeight?(x=!0,R=t-l-O.clientHeight,f||T(e)):f&&E(),I(e)},document.onmouseup=e=>{E(),(0,_dom.removeClass)(t,"drag--range"),s.removeAttribute("style"),document.onmousemove=null,document.onmouseup=null,b("end",e)},b("start",e)}}}var _default=exports.default={methods:{moveTabSelected(e,t,l){let o=this;var r=o.editConfig,{afterFullData:n,visibleColumn:i}=o,u=o.computeEditOpts,c=o.computeRowOpts,s=o.computeCurrentRowOpts,d=o.computeColumnOpts,h=o.computeCurrentColumnOpts;let g,a,m,C=Object.assign({},e);var e=o.getVTRowIndex(C.row),p=o.getVTColumnIndex(C.column),t=(l.preventDefault(),t?p<=0?0<e&&(a=e-1,g=n[a],m=i.length-1):m=p-1:p>=i.length-1?e<n.length-1&&(a=e+1,g=n[a],m=0):m=p+1,i[m]);t&&(g?(C.rowIndex=a,C.row=g):C.rowIndex=e,C.columnIndex=m,C.column=t,C.cell=o.getCellElement(C.row,C.column),c.isCurrent&&s.isFollowSelected&&o.triggerCurrentRowEvent(l,C),d.isCurrent&&h.isFollowSelected&&o.triggerCurrentColumnEvent(l,C),r?"click"!==u.trigger&&"dblclick"!==u.trigger||("row"===u.mode?o.handleEdit(C,l):o.scrollToRow(C.row,C.column).then(()=>{o.handleSelected(C,l)})):o.scrollToRow(C.row,C.column).then(()=>{o.handleSelected(C,l)}))},moveCurrentRow(e,t,l){let o=this;var r=o.treeConfig;let{afterFullData:n,currentRow:i}=o;var u=o.computeTreeOpts,u=u.children||u.childrenField;let c;if(i?r?({index:r,items:u}=_xeUtils.default.findTree(n,e=>e===i,{children:u}),e&&0<r?c=u[r-1]:t&&r<u.length-1&&(c=u[r+1])):(u=o.getVTRowIndex(i),e&&0<u?c=n[u-1]:t&&u<n.length-1&&(c=n[u+1])):c=n[0],c){l.preventDefault();let e={$table:o,row:c,rowIndex:o.getRowIndex(c),$rowIndex:o.getVMRowIndex(c)};o.scrollToRow(c).then(()=>o.triggerCurrentRowEvent(l,e))}},moveCurrentColumn(e,t,l){let o=this;var{currentCol:r,visibleColumn:n}=o;let i=null;if(r?(r=o.getVTColumnIndex(r),e&&0<r?i=n[r-1]:t&&r<n.length-1&&(i=n[r+1])):i=n[0],i){l.preventDefault();let e={$table:o,column:i,columnIndex:o.getColumnIndex(i),$columnIndex:o.getVMColumnIndex(i)};o.scrollToColumn(i).then(()=>o.triggerCurrentColumnEvent(l,e))}},moveArrowSelected(e,t,l,o,r,n){var i=this,{highlightCurrentRow:u,highlightCurrentColumn:c}=i,s=i.computeRowOpts,d=i.computeCurrentRowOpts,h=i.computeColumnOpts,g=i.computeCurrentColumnOpts,e=handleMoveSelected(i,n,e,t,l,o,r);(s.isCurrent||u)&&(d.isFollowSelected?i.triggerCurrentRowEvent(n,e):(l||r)&&(s.isCurrent||u)&&i.moveCurrentRow(l,r,n)),(h.isCurrent||c)&&(g.isFollowSelected?i.triggerCurrentColumnEvent(n,e):(t||o)&&(h.isCurrent||c)&&i.moveCurrentColumn(t,o,n))},moveEnterSelected(e,t,l,o,r,n){var i=this,{highlightCurrentRow:u,highlightCurrentColumn:c}=i,s=i.computeRowOpts,d=i.computeCurrentRowOpts,h=i.computeColumnOpts,g=i.computeCurrentColumnOpts,e=handleMoveSelected(i,n,e,t,l,o,r);(s.isCurrent||u)&&d.isFollowSelected&&i.triggerCurrentRowEvent(n,e),(h.isCurrent||c)&&g.isFollowSelected&&i.triggerCurrentColumnEvent(n,e)},moveSelected(e,t,l,o,r,n){handleMoveSelected(this,n,e,t,l,o,r)},handleCellMousedownEvent(e,t){var l=this,{editConfig:o,checkboxConfig:r,mouseConfig:n}=l,i=l.computeCheckboxOpts,u=l.computeMouseOpts,c=l.computeEditOpts;if(n&&u.area&&l.triggerClAreaMnEvent)return l.triggerClAreaMnEvent(e,t);r&&i.range&&handleCheckboxRangeEvent(l,e,t),n&&u.selected&&(o&&"cell"!==c.mode||l.handleSelected(t,e))}}};

package/lib/table/src/body.js

@@ -125,7 +125,6 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
     dragRow,
     overflowX,
     overflowY,
-    currentColumn,
     scrollXLoad,
     scrollYLoad,
     mergeBodyFlag,
@@ -134,7 +133,8 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
     resizeWidthFlag,
     editStore,
     isAllOverflow,
-    validErrorMaps
+    validErrorMaps,
+    currColFlag
   } = tableReactData;
   const {
     fullAllDataRowIdData,
@@ -145,7 +145,8 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
     mergeBodyList,
     scrollXStore,
     scrollYStore,
-    keepUpdateFieldMaps
+    keepUpdateFieldMaps,
+    currentCol
   } = tableInternalData;
   const cellOpts = $xeTable.computeCellOpts;
   const validOpts = $xeTable.computeValidOpts;
@@ -520,7 +521,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
       'col--active': editConfig && isEdit && actived.row === row && (actived.column === column || editOpts.mode === 'row'),
       'col--valid-error': !!errorValidItem,
       'show--valid-bg': errorValidItem && validOpts.showErrorBackground,
-      'col--current': currentColumn === column
+      'col--current': currColFlag && currentCol === column
     }, (0, _utils.getClass)(compCellClassName, cellParams), (0, _utils.getClass)(className, cellParams), (0, _utils.getClass)(allCellClassName, cellParams)],
     key: columnKey || scrollXLoad || scrollYLoad || columnOpts.useKey || rowOpts.useKey || columnOpts.drag ? column.id : $columnIndex,
     attrs: tdAttrs,

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

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_comp=require("../../ui/src/comp"),_utils=require("../../ui/src/utils"),_util=require("./util"),_dom=require("../../ui/src/dom"),_vn=require("../../ui/src/vn");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getI18n,renderer,renderEmptyElement}=_ui.VxeUI,sourceType="table",renderType="body",isVMScrollProcess=e=>{var l=e.delayHover,t=e.isDragResize,e=e.lastSTime;return!!(t||e&&Date.now()<e+l)};function renderLine(o,i,a,s,d){var n=s.column,c=i.treeConfig,p=i.computeCellOpts,u=i.computeRowOpts,g=i.computeDefaultRowHeight,x=i.computeTreeOpts,{slots:n,treeNode:m}=n,v=i.fullAllDataRowIdData;if(c&&m&&(x.showLine||x.line)){if(n&&n.line)return i.callSlot(n.line,s,o);c=v[a];let e=0,l=null,t=null,r="";return(c&&(e=c.level,l=c.items[c.treeIndex-1],t=c.parent),e||x.showRootLine)?(l?(m=v[(0,_util.getRowid)(i,l)]||{},r=`${m.lineHeight||0}px`):e&&t&&(n=v[(0,_util.getRowid)(i,t)]||{},r=`calc(-1em + ${Math.floor(d/2+(0,_util.getCellRestHeight)(n,p,u,g)/2)}px)`),[o("div",{key:"tl",class:"vxe-tree--line-wrapper"},[o("div",{class:"vxe-tree--line",style:{height:r,bottom:`-${Math.floor(d/2)}px`,left:`calc(${e*x.indent}px + 1em)`}})])]):[]}return[]}function renderTdColumn(e,l,z,t,r,A,q,o,F,L,i,a,V,U,s){var d=l.$xeGrid,N=l.$xeGantt,{columnKey:G,resizable:n,showOverflow:c,border:W,height:p,treeConfig:X,cellClassName:Y,cellStyle:j,align:P,spanMethod:K,mouseConfig:J,editConfig:Q,editRules:u,tooltipConfig:g,padding:x}=l,{tableData:Z,tableColumn:ee,dragRow:le,overflowX:te,overflowY:re,currentColumn:oe,scrollXLoad:ie,scrollYLoad:ae,mergeBodyFlag:se,calcCellHeightFlag:m,resizeHeightFlag:v,resizeWidthFlag:de,editStore:ne,isAllOverflow:ce,validErrorMaps:w}=l,{fullAllDataRowIdData:pe,fullColumnIdData:h,mergeBodyCellMaps:ue,visibleColumn:ge,afterFullData:xe,mergeBodyList:me,scrollXStore:ve,scrollYStore:we,keepUpdateFieldMaps:he}=l,f=l.computeCellOpts,y=l.computeValidOpts,b=l.computeCheckboxOpts,fe=l.computeEditOpts,ye=l.computeTooltipOpts,be=l.computeVirtualXOpts,Ce=l.computeVirtualYOpts,{isAllColumnDrag:_e,isAllRowDrag:Re}=l.resizableOpts,C=l.computeRowOpts,_=l.computeRowDragOpts,Ee=l.computeDefaultRowHeight,m=m?f.height||C.height:0,{disabledMethod:R,isCrossDrag:Se,isPeerDrag:$e}=_,De=l.computeColumnOpts,Oe=l.computeMouseOpts,Ie=l.computeCellOffsetWidth,Te=l.computeAreaOpts.selectCellToRow,{field:ke,type:Be,cellRender:E,editRender:Me,align:He,showOverflow:ze,className:Ae,treeNode:qe,rowResize:Fe,padding:S,verticalAlign:$,slots:Le}=a,{verticalAlign:D,minHeight:Ve,maxHeight:Ue}=f,ne=ne.actived,Ne=pe[t]||{},O=a.id,h=h[O]||{},E=Me||E,E=E?renderer.get(E.name):null,Ge=E?E.tableCellClassName||E.cellClassName:null,We=E?E.tableCellStyle||E.cellStyle:"";let Xe=ye.showAll;var Ye=h.index,h=h._index,Me=(0,_utils.isEnableConf)(Me),v=v?Ne.resizeHeight:0;let I=te&&(r?a.fixed!==r:!!a.fixed);var S=(0,_utils.getDefaultConfig)(S,null===x?f.padding:x),x=!0===S,je=!!S&&(x||!1!==S.top),Pe=!!S&&(x||!1!==S.bottom),Ke=!!S&&(x||!1!==S.left),x=!!S&&(x||!1!==S.right),S=(0,_utils.getDefaultConfig)(ze,c),ze="ellipsis"===S;let T="title"===S,k=!0===S?"tooltip"===ye.mode:"tooltip"===S;c=ce||T||k||ze,ye=_xeUtils.default.isBoolean(a.resizable)?a.resizable:De.resizable||n,S=!!m,n=0<v;let Je;m={},v=He||(E?E.tableCellAlign:"")||P,He=_xeUtils.default.eqNull($)?D:$,E=w[t+":"+O],P=u&&y.showErrorMessage&&("default"===y.message?p||1<Z.length:"inline"===y.message),D={colid:O};let B={$table:l,$grid:d,$gantt:N,isEdit:!1,seq:z,rowid:t,row:o,rowIndex:F,$rowIndex:L,_rowIndex:i,column:a,columnIndex:Ye,$columnIndex:V,_columnIndex:h,fixed:r,source:sourceType,type:renderType,isHidden:!!I,level:q,visibleData:xe,data:Z,items:s},M=!1,Qe=!1,H=((M=C.drag?"row"===_.trigger||a.dragSort&&"cell"===_.trigger:M)&&(Qe=!(!R||!R(B))),(T||k||Xe||g)&&(m.mouseover=e=>{isVMScrollProcess(l)||(T?(0,_dom.updateCellTitle)(e.currentTarget,a):(k||Xe)&&l.triggerBodyTooltipEvent(e,B)),l.dispatchEvent("cell-mouseenter",Object.assign({cell:e.currentTarget},B),e)}),(k||Xe||g)&&(m.mouseleave=e=>{isVMScrollProcess(l)||(k||Xe)&&l.handleTargetLeaveEvent(e),l.dispatchEvent("cell-mouseleave",Object.assign({cell:e.currentTarget},B),e)}),(M||b.range||J)&&(m.mousedown=e=>{l.triggerCellMousedownEvent(e,B)}),M&&(m.mouseup=l.triggerCellMouseupEvent),m.click=e=>{l.triggerCellClickEvent(e,B)},!(m.dblclick=e=>{l.triggerCellDblclickEvent(e,B)})),Ze=1,el=1;if(se&&me.length){$=ue[i+":"+h];if($){var{rowspan:w,colspan:u}=$;if(!w||!u)return renderEmptyElement(l);1<w&&(H=!0,el=w,D.rowspan=w),1<u&&(H=!0,Ze=u,D.colspan=u)}}else if(K){var{rowspan:p=1,colspan:d=1}=K(B)||{};if(!p||!d)return renderEmptyElement(l);1<p&&(H=!0,el=p,D.rowspan=p),1<d&&(H=!0,Ze=d,D.colspan=d)}!(I=I&&H&&(1<D.colspan||1<D.rowspan)?!1:I)&&Q&&(fe.showStatus||fe.showUpdateStatus)&&he[ke]&&(Je=l.isUpdateByRow(o,ke));N=!c&&(ae||ie);let ll=(0,_util.getCellRestHeight)(Ne,f,C,Ee);z=V===U.length-1,F=!a.resizeWidth&&("auto"===a.minWidth||"auto"===a.width);let tl=!1;H||le&&(0,_util.getRowid)(l,le)===t||(re&&ae&&!X&&16<Z.length&&!Ce.immediate&&(i<we.visibleStartIndex-we.preloadSize||i>we.visibleEndIndex+we.preloadSize)||te&&ie&&10<ee.length&&!be.immediate&&!a.fixed&&(h<ve.visibleStartIndex-ve.preloadSize||h>ve.visibleEndIndex+ve.preloadSize))&&(tl=!0),1<el&&(L=xe[i+el-1])&&(s=pe[(0,_util.getRowid)(l,L)])&&(ll+=s.oTop+(0,_util.getCellRestHeight)(s,f,C,Ee)-Ne.oTop-(0,_util.getCellRestHeight)(Ne,f,C,Ee));_={};if(Ue&&(_.maxHeight=Ue+"px"),c&&de){let l=0;if(1<Ze)for(let e=1;e<Ze;e++){var rl=ge[Ye+e];rl&&(l+=rl.renderWidth)}_.width=a.renderWidth+l-Ie+"px"}ae||ie||c||S||n?_.height=ll+"px":_.minHeight=ll+"px",Ve&&(_.minHeight=Ve+"px");R=[];I&&ce?R.push(e("div",{key:"tc",class:["vxe-cell",{"c--title":T,"c--tooltip":k,"c--ellipsis":ze}],style:_})):(X&&R.push(...renderLine(e,l,t,B,ll)),g=[],tl||g.push(e("div",{attrs:{colid:O,rowid:t},class:"vxe-cell--wrapper vxe-body-cell--wrapper"},a.renderCell(e,B))),R.push(e("div",{key:"tc",class:["vxe-cell",{"c--title":T,"c--tooltip":k,"c--ellipsis":ze}],style:_,attrs:{title:T?l.getCellLabel(o,a):null}},g)),P&&E&&(b=E.rule,se=Le?Le.valid:null,me=Object.assign(Object.assign(Object.assign({},B),E),{rule:E}),R.push(e("div",{key:"tcv",class:["vxe-cell--valid-error-tip",(0,_utils.getClass)(y.className,E)],style:b&&b.maxWidth?{width:b.maxWidth+"px"}:void 0},[e("div",{class:"vxe-cell--valid-error-wrapper vxe-cell--valid-error-theme-"+(y.theme||"normal")},[se?l.callSlot(se,me,e):[e("span",{class:"vxe-cell--valid-error-msg"},E.content)]])]))));let ol=!1;return J&&Oe.area&&!h&&Te&&(ol=!0),!I&&ye&&_e&&R.push(e("div",{key:"tcc",class:["vxe-cell--col-resizable",{"is--line":!W||"none"===W}],on:{mousedown:e=>l.handleColResizeMousedownEvent(e,r,B),dblclick:e=>l.handleColResizeDblclickEvent(e,B)}})),(Fe||Re)&&C.resizable&&R.push(e("div",{key:"tcr",class:"vxe-cell--row-resizable",on:{mousedown:e=>l.handleRowResizeMousedownEvent(e,B),dblclick:e=>l.handleRowResizeDblclickEvent(e,B)}})),e("td",{class:["vxe-table--column vxe-body--column",O,He?"col--vertical-"+He:"",v?"col--"+v:"",Be?"col--"+Be:"",{"col--last":z,"col--tree-node":qe,"col--edit":Me,"col--ellipsis":c,"col--cs-height":S,"col--rs-height":n,"col--to-row":ol,"col--auto-height":N,"col--max-height":Ue,"fixed--width":!F,"fixed--hidden":I,"is--pg-top":je,"is--pg-bottom":Pe,"is--pg-left":Ke,"is--pg-right":x,"is--progress":I&&ce||tl,"is--drag-cell":M&&(Se||$e||!q),"is--drag-disabled":Qe,"col--dirty":Je,"col--active":Q&&Me&&ne.row===o&&(ne.column===a||"row"===fe.mode),"col--valid-error":!!E,"show--valid-bg":E&&y.showErrorBackground,"col--current":oe===a},(0,_utils.getClass)(Ge,B),(0,_utils.getClass)(Ae,B),(0,_utils.getClass)(Y,B)],key:G||ie||ae||De.useKey||C.useKey||De.drag?a.id:V,attrs:D,style:Object.assign({},_xeUtils.default.isFunction(We)?We(B):We,_xeUtils.default.isFunction(j)?j(B):j),on:m},A&&I?[]:R)}function renderRows(v,w,h,f,y,b){let C=w.$parent;var e=C,l=C,t=C;let _=C.$xeGrid,R=C.$xeGantt,{stripe:E,rowKey:S,highlightHoverRow:$,rowClassName:D,rowStyle:O,editConfig:I,treeConfig:T}=e,{hasFixedColumn:k,treeExpandedFlag:B,scrollYLoad:M,isAllOverflow:H,rowExpandedFlag:z,expandColumn:A,selectRadioRow:q,pendingRowFlag:F,rowExpandHeightFlag:L,isRowGroupStatus:V}=l,{fullAllDataRowIdData:P,fullColumnIdData:K,treeExpandedMaps:J,pendingRowMaps:Q,rowExpandedMaps:Z,currentRow:U}=t,ee=C.computeCheckboxOpts,le=C.computeRadioOpts,N=C.computeTreeOpts,G=C.computeEditOpts,W=C.computeRowOpts,te=C.computeColumnOpts,{transform:X,seqMode:Y}=N,re=N.children||N.childrenField,j=[],oe=(0,_util.createHandleGetRowId)(C).handleGetRowId,ie=T||V;return y.forEach((r,o)=>{var i={};let a=oe(r);var s=P[a]||{};let d=o,n=0,c=-1,p=-1;var u=V&&r.isAggregate,g=((W.isHover||$)&&(i.mouseover=e=>{isVMScrollProcess(C)||C.triggerHoverEvent(e,{row:r,rowIndex:d})},i.mouseleave=()=>{isVMScrollProcess(C)||C.clearHoverRow()}),s&&(d=s.index,p=s._index,n=s.level,c=s.seq,u||T&&X&&"increasing"===Y?c=s._index+1:T&&"fixed"===Y&&(c=s._tIndex+1)),{$table:C,seq:c,rowid:a,fixed:h,type:renderType,level:n,row:r,rowIndex:d,$rowIndex:o,_rowIndex:p}),x=A&&!!z&&!!Z[a];let e=!1,l=[],t=!1;I&&(t=C.isInsertByRow(r)),!T||M||X||(l=r[re],e=!!B&&l&&0<l.length&&!!J[a]),!W.drag||V||T&&!X||(i.dragstart=C.handleRowDragDragstartEvent,i.dragend=C.handleRowDragDragendEvent,i.dragover=C.handleRowDragDragoverEvent);var u=["vxe-body--row",ie?"row--level-"+n:"",{"row--stripe":E&&(p+1)%2==0,"is--new":t,"is--expand-row":x,"is--expand-tree":e,"row--new":t&&(G.showStatus||G.showInsertStatus),"row--radio":le.highlight&&q===r,"row--checked":ee.highlight&&C.isCheckedByCheckboxRow(r),"row--pending":!!F&&!!Q[a],"row--group":u,"row--current":U&&a===(0,_util.getRowid)(C,U)},D?_xeUtils.default.isFunction(D)?D(g):D:""],m=b.map((e,l)=>renderTdColumn(v,C,c,a,h,f,n,r,d,o,p,e,l,b,y));if(j.push(v("tr",{class:u,attrs:{rowid:a},style:O?_xeUtils.default.isFunction(O)?O(g):O:void 0,key:S||W.useKey||W.drag||te.drag||V||T?a:o,on:i},m)),x){var{height:u,padding:g,mode:i}=C.computeExpandOpts;if("fixed"===i){m=s.expandHeight;let e=0;L&&(m||u)&&(e=(m||u||0)+1),j.push(v("tr",{class:"vxe-body--row-expanded-place",key:"expand_"+a,attrs:{rowid:a}},[v("td",{class:"vxe-body--row-expanded-place-column",attrs:{colspan:b.length},style:{height:e+"px"}})]))}else{x={},i=(u&&(x.height=u+"px"),T&&(x.paddingLeft=n*N.indent+30+"px"),A||{}).showOverflow,s=A.id,m=K[s]||{},s=_xeUtils.default.eqNull(i)?H:i;let e=-1,l=-1,t=-1;m&&(e=m.index,l=m.$index,t=m._index);i={$grid:_,$table:C,$gantt:R,seq:c,column:A,columnIndex:e,$columnIndex:l,_columnIndex:t,fixed:h,source:sourceType,type:renderType,level:n,row:r,rowid:a,rowIndex:d,$rowIndex:o,_rowIndex:p,isHidden:!1,isEdit:!1,visibleData:[],data:[],items:[]};j.push(v("tr",{class:["vxe-body--expanded-row",{"is--padding":g}],key:"expand_"+a},[v("td",{class:["vxe-body--expanded-column",{"fixed--hidden":h&&!k,"col--ellipsis":s}],attrs:{colspan:b.length}},[v("div",{class:["vxe-body--expanded-cell",{"is--ellipsis":u}],style:x},[A.renderData(v,i)])])]))}}e&&j.push(...renderRows(v,w,h,f,l,b))}),j}var _default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeTableBody",props:{tableData:Array,tableColumn:Array,fixedColumn:Array,fixedType:{type:String,default:""}},mounted(){var e=this,l=e.fixedType,t=e.$parent.elemStore,l=`${l||"main"}-body-`;t[l+"wrapper"]=e.$refs.refElem,t[l+"scroll"]=e.$refs.refBodyScroll,t[l+"table"]=e.$refs.refBodyTable,t[l+"colgroup"]=e.$refs.refBodyColgroup,t[l+"list"]=e.$refs.refBodyTBody,t[l+"xSpace"]=e.$refs.refBodyXSpace,t[l+"ySpace"]=e.$refs.refBodyYSpace,t[l+"emptyBlock"]=e.$refs.refBodyEmptyBlock},destroyed(){var e=this.fixedType,l=this.$parent.elemStore,e=`${e||"main"}-body-`;l[e+"wrapper"]=null,l[e+"scroll"]=null,l[e+"table"]=null,l[e+"colgroup"]=null,l[e+"list"]=null,l[e+"xSpace"]=null,l[e+"ySpace"]=null,l[e+"emptyBlock"]=null},render(t){let l=this.$parent;var e=l,r=l,o=l,i=l.$xeGrid,a=l.$xeGantt,s=l.$scopedSlots,d=l.xID;let{fixedColumn:n,fixedType:c,tableColumn:p}=this;var u=e.mouseConfig,{isGroup:r,tableData:g,isColLoading:x,overflowX:m,scrollXLoad:v,scrollYLoad:w,dragRow:h,dragCol:f}=r,{visibleColumn:o,fullAllDataRowIdData:y,fullColumnIdData:b}=o,C=l.computeEmptyOpts,_=l.computeMouseOpts;let R=g,E=p;g=l.computeIsBodyRenderOptimize;x||!c&&m||(E=o),c&&g&&(E=n||[]),w&&h&&2<R.length&&(x=y[(0,_util.getRowid)(l,h)])&&(m=x._index,o=R[0],w=R[R.length-1],x=y[(0,_util.getRowid)(l,o)],o=y[(0,_util.getRowid)(l,w)],x)&&o&&(y=x._index,w=o._index,m<y?R=[h].concat(R):w<m&&(R=R.concat([h]))),c||r||v&&f&&2<E.length&&(x=b[f.id])&&(o=x._index,y=E[0],w=E[E.length-1],m=b[y.id],h=b[w.id],m)&&h&&(r=m._index,v=h._index,o<r?E=[f].concat(E):v<o&&(E=E.concat([f])));let S;x=s?s.empty:null,y={$table:l,$grid:i,$gantt:a};return S=x?x.call(l,y):(w=(b=C.name?renderer.get(C.name):null)?b.renderTableEmpty||b.renderTableEmptyView||b.renderEmpty:null)?(0,_vn.getSlotVNs)(w.call(l,t,C,y)):e.emptyText||getI18n("vxe.table.emptyText"),t("div",{ref:"refElem",class:["vxe-table--body-wrapper",c?`fixed-${c}--wrapper`:"body--wrapper"],attrs:{xid:d}},[t("div",{ref:"refBodyScroll",class:"vxe-table--body-inner-wrapper",on:{scroll(e){l.triggerBodyScrollEvent(e,c)}}},[c?renderEmptyElement(l):t("div",{ref:"refBodyXSpace",class:"vxe-body--x-space"}),t("div",{ref:"refBodyYSpace",class:"vxe-body--y-space"}),t("table",{ref:"refBodyTable",class:"vxe-table--body",attrs:{xid:d,cellspacing:0,cellpadding:0,border:0,xvm:g?"1":null}},[t("colgroup",{ref:"refBodyColgroup"},E.map((e,l)=>t("col",{attrs:{name:e.id},key:l,style:{width:e.renderWidth+"px"}}))),t("tbody",{ref:"refBodyTBody"},renderRows(t,this,c,g,R,E))]),t("div",{class:"vxe-table--checkbox-range"}),u&&_.area?t("div",{class:"vxe-table--cell-area",attrs:{xid:d}},[t("span",{class:"vxe-table--cell-main-area"},_.extension?[t("span",{class:"vxe-table--cell-main-area-btn",on:{mousedown(e){l.triggerCellAreaExtendMousedownEvent&&l.triggerCellAreaExtendMousedownEvent(e,{$table:l,fixed:c,type:renderType})}}})]:null),t("span",{class:"vxe-table--cell-clip-area"}),t("span",{class:"vxe-table--cell-extend-area"}),t("span",{class:"vxe-table--cell-multi-area"}),t("span",{class:"vxe-table--cell-active-area"}),t("span",{class:"vxe-table--cell-row-status-area"})]):renderEmptyElement(l),c?renderEmptyElement(l):t("div",{class:"vxe-table--empty-block",ref:"emptyBlock"},[t("div",{class:"vxe-table--empty-content"},S)])])])}});
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_comp=require("../../ui/src/comp"),_utils=require("../../ui/src/utils"),_util=require("./util"),_dom=require("../../ui/src/dom"),_vn=require("../../ui/src/vn");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getI18n,renderer,renderEmptyElement}=_ui.VxeUI,sourceType="table",renderType="body",isVMScrollProcess=e=>{var l=e.delayHover,t=e.isDragResize,e=e.lastSTime;return!!(t||e&&Date.now()<e+l)};function renderLine(o,i,a,s,d){var n=s.column,c=i.treeConfig,p=i.computeCellOpts,u=i.computeRowOpts,g=i.computeDefaultRowHeight,x=i.computeTreeOpts,{slots:n,treeNode:m}=n,v=i.fullAllDataRowIdData;if(c&&m&&(x.showLine||x.line)){if(n&&n.line)return i.callSlot(n.line,s,o);c=v[a];let e=0,l=null,t=null,r="";return(c&&(e=c.level,l=c.items[c.treeIndex-1],t=c.parent),e||x.showRootLine)?(l?(m=v[(0,_util.getRowid)(i,l)]||{},r=`${m.lineHeight||0}px`):e&&t&&(n=v[(0,_util.getRowid)(i,t)]||{},r=`calc(-1em + ${Math.floor(d/2+(0,_util.getCellRestHeight)(n,p,u,g)/2)}px)`),[o("div",{key:"tl",class:"vxe-tree--line-wrapper"},[o("div",{class:"vxe-tree--line",style:{height:r,bottom:`-${Math.floor(d/2)}px`,left:`calc(${e*x.indent}px + 1em)`}})])]):[]}return[]}function renderTdColumn(e,l,z,t,r,A,F,o,q,L,i,a,V,U,s){var d=l.$xeGrid,N=l.$xeGantt,{columnKey:G,resizable:n,showOverflow:c,border:W,height:p,treeConfig:X,cellClassName:Y,cellStyle:j,align:P,spanMethod:K,mouseConfig:J,editConfig:Q,editRules:u,tooltipConfig:g,padding:x}=l,{tableData:Z,tableColumn:ee,dragRow:le,overflowX:te,overflowY:re,scrollXLoad:oe,scrollYLoad:ie,mergeBodyFlag:ae,calcCellHeightFlag:m,resizeHeightFlag:v,resizeWidthFlag:se,editStore:de,isAllOverflow:ne,validErrorMaps:w,currColFlag:ce}=l,{fullAllDataRowIdData:pe,fullColumnIdData:h,mergeBodyCellMaps:ue,visibleColumn:ge,afterFullData:xe,mergeBodyList:me,scrollXStore:ve,scrollYStore:we,keepUpdateFieldMaps:he,currentCol:fe}=l,f=l.computeCellOpts,y=l.computeValidOpts,b=l.computeCheckboxOpts,ye=l.computeEditOpts,be=l.computeTooltipOpts,Ce=l.computeVirtualXOpts,_e=l.computeVirtualYOpts,{isAllColumnDrag:Re,isAllRowDrag:Ee}=l.resizableOpts,C=l.computeRowOpts,_=l.computeRowDragOpts,Se=l.computeDefaultRowHeight,m=m?f.height||C.height:0,{disabledMethod:R,isCrossDrag:$e,isPeerDrag:De}=_,Oe=l.computeColumnOpts,Ie=l.computeMouseOpts,Te=l.computeCellOffsetWidth,ke=l.computeAreaOpts.selectCellToRow,{field:Be,type:Me,cellRender:E,editRender:He,align:ze,showOverflow:Ae,className:Fe,treeNode:qe,rowResize:Le,padding:S,verticalAlign:$,slots:Ve}=a,{verticalAlign:D,minHeight:Ue,maxHeight:Ne}=f,de=de.actived,Ge=pe[t]||{},O=a.id,h=h[O]||{},E=He||E,E=E?renderer.get(E.name):null,We=E?E.tableCellClassName||E.cellClassName:null,Xe=E?E.tableCellStyle||E.cellStyle:"";let Ye=be.showAll;var je=h.index,h=h._index,He=(0,_utils.isEnableConf)(He),v=v?Ge.resizeHeight:0;let I=te&&(r?a.fixed!==r:!!a.fixed);var S=(0,_utils.getDefaultConfig)(S,null===x?f.padding:x),x=!0===S,Pe=!!S&&(x||!1!==S.top),Ke=!!S&&(x||!1!==S.bottom),Je=!!S&&(x||!1!==S.left),x=!!S&&(x||!1!==S.right),S=(0,_utils.getDefaultConfig)(Ae,c),Ae="ellipsis"===S;let T="title"===S,k=!0===S?"tooltip"===be.mode:"tooltip"===S;c=ne||T||k||Ae,be=_xeUtils.default.isBoolean(a.resizable)?a.resizable:Oe.resizable||n,S=!!m,n=0<v;let Qe;m={},v=ze||(E?E.tableCellAlign:"")||P,ze=_xeUtils.default.eqNull($)?D:$,E=w[t+":"+O],P=u&&y.showErrorMessage&&("default"===y.message?p||1<Z.length:"inline"===y.message),D={colid:O};let B={$table:l,$grid:d,$gantt:N,isEdit:!1,seq:z,rowid:t,row:o,rowIndex:q,$rowIndex:L,_rowIndex:i,column:a,columnIndex:je,$columnIndex:V,_columnIndex:h,fixed:r,source:sourceType,type:renderType,isHidden:!!I,level:F,visibleData:xe,data:Z,items:s},M=!1,Ze=!1,H=((M=C.drag?"row"===_.trigger||a.dragSort&&"cell"===_.trigger:M)&&(Ze=!(!R||!R(B))),(T||k||Ye||g)&&(m.mouseover=e=>{isVMScrollProcess(l)||(T?(0,_dom.updateCellTitle)(e.currentTarget,a):(k||Ye)&&l.triggerBodyTooltipEvent(e,B)),l.dispatchEvent("cell-mouseenter",Object.assign({cell:e.currentTarget},B),e)}),(k||Ye||g)&&(m.mouseleave=e=>{isVMScrollProcess(l)||(k||Ye)&&l.handleTargetLeaveEvent(e),l.dispatchEvent("cell-mouseleave",Object.assign({cell:e.currentTarget},B),e)}),(M||b.range||J)&&(m.mousedown=e=>{l.triggerCellMousedownEvent(e,B)}),M&&(m.mouseup=l.triggerCellMouseupEvent),m.click=e=>{l.triggerCellClickEvent(e,B)},!(m.dblclick=e=>{l.triggerCellDblclickEvent(e,B)})),el=1,ll=1;if(ae&&me.length){$=ue[i+":"+h];if($){var{rowspan:w,colspan:u}=$;if(!w||!u)return renderEmptyElement(l);1<w&&(H=!0,ll=w,D.rowspan=w),1<u&&(H=!0,el=u,D.colspan=u)}}else if(K){var{rowspan:p=1,colspan:d=1}=K(B)||{};if(!p||!d)return renderEmptyElement(l);1<p&&(H=!0,ll=p,D.rowspan=p),1<d&&(H=!0,el=d,D.colspan=d)}!(I=I&&H&&(1<D.colspan||1<D.rowspan)?!1:I)&&Q&&(ye.showStatus||ye.showUpdateStatus)&&he[Be]&&(Qe=l.isUpdateByRow(o,Be));N=!c&&(ie||oe);let tl=(0,_util.getCellRestHeight)(Ge,f,C,Se);z=V===U.length-1,q=!a.resizeWidth&&("auto"===a.minWidth||"auto"===a.width);let rl=!1;H||le&&(0,_util.getRowid)(l,le)===t||(re&&ie&&!X&&16<Z.length&&!_e.immediate&&(i<we.visibleStartIndex-we.preloadSize||i>we.visibleEndIndex+we.preloadSize)||te&&oe&&10<ee.length&&!Ce.immediate&&!a.fixed&&(h<ve.visibleStartIndex-ve.preloadSize||h>ve.visibleEndIndex+ve.preloadSize))&&(rl=!0),1<ll&&(L=xe[i+ll-1])&&(s=pe[(0,_util.getRowid)(l,L)])&&(tl+=s.oTop+(0,_util.getCellRestHeight)(s,f,C,Se)-Ge.oTop-(0,_util.getCellRestHeight)(Ge,f,C,Se));_={};if(Ne&&(_.maxHeight=Ne+"px"),c&&se){let l=0;if(1<el)for(let e=1;e<el;e++){var ol=ge[je+e];ol&&(l+=ol.renderWidth)}_.width=a.renderWidth+l-Te+"px"}ie||oe||c||S||n?_.height=tl+"px":_.minHeight=tl+"px",Ue&&(_.minHeight=Ue+"px");R=[];I&&ne?R.push(e("div",{key:"tc",class:["vxe-cell",{"c--title":T,"c--tooltip":k,"c--ellipsis":Ae}],style:_})):(X&&R.push(...renderLine(e,l,t,B,tl)),g=[],rl||g.push(e("div",{attrs:{colid:O,rowid:t},class:"vxe-cell--wrapper vxe-body-cell--wrapper"},a.renderCell(e,B))),R.push(e("div",{key:"tc",class:["vxe-cell",{"c--title":T,"c--tooltip":k,"c--ellipsis":Ae}],style:_,attrs:{title:T?l.getCellLabel(o,a):null}},g)),P&&E&&(b=E.rule,ae=Ve?Ve.valid:null,me=Object.assign(Object.assign(Object.assign({},B),E),{rule:E}),R.push(e("div",{key:"tcv",class:["vxe-cell--valid-error-tip",(0,_utils.getClass)(y.className,E)],style:b&&b.maxWidth?{width:b.maxWidth+"px"}:void 0},[e("div",{class:"vxe-cell--valid-error-wrapper vxe-cell--valid-error-theme-"+(y.theme||"normal")},[ae?l.callSlot(ae,me,e):[e("span",{class:"vxe-cell--valid-error-msg"},E.content)]])]))));let il=!1;return J&&Ie.area&&!h&&ke&&(il=!0),!I&&be&&Re&&R.push(e("div",{key:"tcc",class:["vxe-cell--col-resizable",{"is--line":!W||"none"===W}],on:{mousedown:e=>l.handleColResizeMousedownEvent(e,r,B),dblclick:e=>l.handleColResizeDblclickEvent(e,B)}})),(Le||Ee)&&C.resizable&&R.push(e("div",{key:"tcr",class:"vxe-cell--row-resizable",on:{mousedown:e=>l.handleRowResizeMousedownEvent(e,B),dblclick:e=>l.handleRowResizeDblclickEvent(e,B)}})),e("td",{class:["vxe-table--column vxe-body--column",O,ze?"col--vertical-"+ze:"",v?"col--"+v:"",Me?"col--"+Me:"",{"col--last":z,"col--tree-node":qe,"col--edit":He,"col--ellipsis":c,"col--cs-height":S,"col--rs-height":n,"col--to-row":il,"col--auto-height":N,"col--max-height":Ne,"fixed--width":!q,"fixed--hidden":I,"is--pg-top":Pe,"is--pg-bottom":Ke,"is--pg-left":Je,"is--pg-right":x,"is--progress":I&&ne||rl,"is--drag-cell":M&&($e||De||!F),"is--drag-disabled":Ze,"col--dirty":Qe,"col--active":Q&&He&&de.row===o&&(de.column===a||"row"===ye.mode),"col--valid-error":!!E,"show--valid-bg":E&&y.showErrorBackground,"col--current":ce&&fe===a},(0,_utils.getClass)(We,B),(0,_utils.getClass)(Fe,B),(0,_utils.getClass)(Y,B)],key:G||oe||ie||Oe.useKey||C.useKey||Oe.drag?a.id:V,attrs:D,style:Object.assign({},_xeUtils.default.isFunction(Xe)?Xe(B):Xe,_xeUtils.default.isFunction(j)?j(B):j),on:m},A&&I?[]:R)}function renderRows(v,w,h,f,y,b){let C=w.$parent;var e=C,l=C,t=C;let _=C.$xeGrid,R=C.$xeGantt,{stripe:E,rowKey:S,highlightHoverRow:$,rowClassName:D,rowStyle:O,editConfig:I,treeConfig:T}=e,{hasFixedColumn:k,treeExpandedFlag:B,scrollYLoad:M,isAllOverflow:H,rowExpandedFlag:z,expandColumn:A,selectRadioRow:F,pendingRowFlag:q,rowExpandHeightFlag:L,isRowGroupStatus:V}=l,{fullAllDataRowIdData:P,fullColumnIdData:K,treeExpandedMaps:J,pendingRowMaps:Q,rowExpandedMaps:Z,currentRow:U}=t,ee=C.computeCheckboxOpts,le=C.computeRadioOpts,N=C.computeTreeOpts,G=C.computeEditOpts,W=C.computeRowOpts,te=C.computeColumnOpts,{transform:X,seqMode:Y}=N,re=N.children||N.childrenField,j=[],oe=(0,_util.createHandleGetRowId)(C).handleGetRowId,ie=T||V;return y.forEach((r,o)=>{var i={};let a=oe(r);var s=P[a]||{};let d=o,n=0,c=-1,p=-1;var u=V&&r.isAggregate,g=((W.isHover||$)&&(i.mouseover=e=>{isVMScrollProcess(C)||C.triggerHoverEvent(e,{row:r,rowIndex:d})},i.mouseleave=()=>{isVMScrollProcess(C)||C.clearHoverRow()}),s&&(d=s.index,p=s._index,n=s.level,c=s.seq,u||T&&X&&"increasing"===Y?c=s._index+1:T&&"fixed"===Y&&(c=s._tIndex+1)),{$table:C,seq:c,rowid:a,fixed:h,type:renderType,level:n,row:r,rowIndex:d,$rowIndex:o,_rowIndex:p}),x=A&&!!z&&!!Z[a];let e=!1,l=[],t=!1;I&&(t=C.isInsertByRow(r)),!T||M||X||(l=r[re],e=!!B&&l&&0<l.length&&!!J[a]),!W.drag||V||T&&!X||(i.dragstart=C.handleRowDragDragstartEvent,i.dragend=C.handleRowDragDragendEvent,i.dragover=C.handleRowDragDragoverEvent);var u=["vxe-body--row",ie?"row--level-"+n:"",{"row--stripe":E&&(p+1)%2==0,"is--new":t,"is--expand-row":x,"is--expand-tree":e,"row--new":t&&(G.showStatus||G.showInsertStatus),"row--radio":le.highlight&&F===r,"row--checked":ee.highlight&&C.isCheckedByCheckboxRow(r),"row--pending":!!q&&!!Q[a],"row--group":u,"row--current":U&&a===(0,_util.getRowid)(C,U)},D?_xeUtils.default.isFunction(D)?D(g):D:""],m=b.map((e,l)=>renderTdColumn(v,C,c,a,h,f,n,r,d,o,p,e,l,b,y));if(j.push(v("tr",{class:u,attrs:{rowid:a},style:O?_xeUtils.default.isFunction(O)?O(g):O:void 0,key:S||W.useKey||W.drag||te.drag||V||T?a:o,on:i},m)),x){var{height:u,padding:g,mode:i}=C.computeExpandOpts;if("fixed"===i){m=s.expandHeight;let e=0;L&&(m||u)&&(e=(m||u||0)+1),j.push(v("tr",{class:"vxe-body--row-expanded-place",key:"expand_"+a,attrs:{rowid:a}},[v("td",{class:"vxe-body--row-expanded-place-column",attrs:{colspan:b.length},style:{height:e+"px"}})]))}else{x={},i=(u&&(x.height=u+"px"),T&&(x.paddingLeft=n*N.indent+30+"px"),A||{}).showOverflow,s=A.id,m=K[s]||{},s=_xeUtils.default.eqNull(i)?H:i;let e=-1,l=-1,t=-1;m&&(e=m.index,l=m.$index,t=m._index);i={$grid:_,$table:C,$gantt:R,seq:c,column:A,columnIndex:e,$columnIndex:l,_columnIndex:t,fixed:h,source:sourceType,type:renderType,level:n,row:r,rowid:a,rowIndex:d,$rowIndex:o,_rowIndex:p,isHidden:!1,isEdit:!1,visibleData:[],data:[],items:[]};j.push(v("tr",{class:["vxe-body--expanded-row",{"is--padding":g}],key:"expand_"+a},[v("td",{class:["vxe-body--expanded-column",{"fixed--hidden":h&&!k,"col--ellipsis":s}],attrs:{colspan:b.length}},[v("div",{class:["vxe-body--expanded-cell",{"is--ellipsis":u}],style:x},[A.renderData(v,i)])])]))}}e&&j.push(...renderRows(v,w,h,f,l,b))}),j}var _default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeTableBody",props:{tableData:Array,tableColumn:Array,fixedColumn:Array,fixedType:{type:String,default:""}},mounted(){var e=this,l=e.fixedType,t=e.$parent.elemStore,l=`${l||"main"}-body-`;t[l+"wrapper"]=e.$refs.refElem,t[l+"scroll"]=e.$refs.refBodyScroll,t[l+"table"]=e.$refs.refBodyTable,t[l+"colgroup"]=e.$refs.refBodyColgroup,t[l+"list"]=e.$refs.refBodyTBody,t[l+"xSpace"]=e.$refs.refBodyXSpace,t[l+"ySpace"]=e.$refs.refBodyYSpace,t[l+"emptyBlock"]=e.$refs.refBodyEmptyBlock},destroyed(){var e=this.fixedType,l=this.$parent.elemStore,e=`${e||"main"}-body-`;l[e+"wrapper"]=null,l[e+"scroll"]=null,l[e+"table"]=null,l[e+"colgroup"]=null,l[e+"list"]=null,l[e+"xSpace"]=null,l[e+"ySpace"]=null,l[e+"emptyBlock"]=null},render(t){let l=this.$parent;var e=l,r=l,o=l,i=l.$xeGrid,a=l.$xeGantt,s=l.$scopedSlots,d=l.xID;let{fixedColumn:n,fixedType:c,tableColumn:p}=this;var u=e.mouseConfig,{isGroup:r,tableData:g,isColLoading:x,overflowX:m,scrollXLoad:v,scrollYLoad:w,dragRow:h,dragCol:f}=r,{visibleColumn:o,fullAllDataRowIdData:y,fullColumnIdData:b}=o,C=l.computeEmptyOpts,_=l.computeMouseOpts;let R=g,E=p;g=l.computeIsBodyRenderOptimize;x||!c&&m||(E=o),c&&g&&(E=n||[]),w&&h&&2<R.length&&(x=y[(0,_util.getRowid)(l,h)])&&(m=x._index,o=R[0],w=R[R.length-1],x=y[(0,_util.getRowid)(l,o)],o=y[(0,_util.getRowid)(l,w)],x)&&o&&(y=x._index,w=o._index,m<y?R=[h].concat(R):w<m&&(R=R.concat([h]))),c||r||v&&f&&2<E.length&&(x=b[f.id])&&(o=x._index,y=E[0],w=E[E.length-1],m=b[y.id],h=b[w.id],m)&&h&&(r=m._index,v=h._index,o<r?E=[f].concat(E):v<o&&(E=E.concat([f])));let S;x=s?s.empty:null,y={$table:l,$grid:i,$gantt:a};return S=x?x.call(l,y):(w=(b=C.name?renderer.get(C.name):null)?b.renderTableEmpty||b.renderTableEmptyView||b.renderEmpty:null)?(0,_vn.getSlotVNs)(w.call(l,t,C,y)):e.emptyText||getI18n("vxe.table.emptyText"),t("div",{ref:"refElem",class:["vxe-table--body-wrapper",c?`fixed-${c}--wrapper`:"body--wrapper"],attrs:{xid:d}},[t("div",{ref:"refBodyScroll",class:"vxe-table--body-inner-wrapper",on:{scroll(e){l.triggerBodyScrollEvent(e,c)}}},[c?renderEmptyElement(l):t("div",{ref:"refBodyXSpace",class:"vxe-body--x-space"}),t("div",{ref:"refBodyYSpace",class:"vxe-body--y-space"}),t("table",{ref:"refBodyTable",class:"vxe-table--body",attrs:{xid:d,cellspacing:0,cellpadding:0,border:0,xvm:g?"1":null}},[t("colgroup",{ref:"refBodyColgroup"},E.map((e,l)=>t("col",{attrs:{name:e.id},key:l,style:{width:e.renderWidth+"px"}}))),t("tbody",{ref:"refBodyTBody"},renderRows(t,this,c,g,R,E))]),t("div",{class:"vxe-table--checkbox-range"}),u&&_.area?t("div",{class:"vxe-table--cell-area",attrs:{xid:d}},[t("span",{class:"vxe-table--cell-main-area"},_.extension?[t("span",{class:"vxe-table--cell-main-area-btn",on:{mousedown(e){l.triggerCellAreaExtendMousedownEvent&&l.triggerCellAreaExtendMousedownEvent(e,{$table:l,fixed:c,type:renderType})}}})]:null),t("span",{class:"vxe-table--cell-clip-area"}),t("span",{class:"vxe-table--cell-extend-area"}),t("span",{class:"vxe-table--cell-multi-area"}),t("span",{class:"vxe-table--cell-active-area"}),t("span",{class:"vxe-table--cell-row-status-area"})]):renderEmptyElement(l),c?renderEmptyElement(l):t("div",{class:"vxe-table--empty-block",ref:"emptyBlock"},[t("div",{class:"vxe-table--empty-content"},S)])])])}});

package/lib/table/src/footer.js

@@ -43,14 +43,15 @@ function renderRows(h, _vm, isOptimizeMode, tableColumn, footerTableData, row, $
     scrollXLoad,
     scrollYLoad,
     overflowX,
-    currentColumn,
-    mergeFootFlag
+    mergeFootFlag,
+    currColFlag
   } = tableReactData;
   const {
     fullColumnIdData,
     mergeFooterList,
     mergeFooterCellMaps,
-    scrollXStore
+    scrollXStore,
+    currentCol
   } = tableInternalData;
   const virtualXOpts = $xeTable.computeVirtualXOpts;
   const footerTooltipOpts = $xeTable.computeFooterTooltipOpts;
@@ -203,7 +204,7 @@ function renderRows(h, _vm, isOptimizeMode, tableColumn, footerTableData, row, $
         'is--pg-left': isCellPaddingLeft,
         'is--pg-right': isCellPaddingRight,
         'col--ellipsis': hasEllipsis,
-        'col--current': currentColumn === column
+        'col--current': currColFlag && currentCol === column
       }, (0, _utils.getClass)(footerClassName, cellParams), (0, _utils.getClass)(footerCellClassName, cellParams)],
       attrs,
       style: footerCellStyle ? _xeUtils.default.isFunction(footerCellStyle) ? footerCellStyle(cellParams) : footerCellStyle : undefined,

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

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_comp=require("../../ui/src/comp"),_utils=require("../../ui/src/utils"),_dom=require("../../ui/src/dom"),_util=require("./util");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let sourceType="table",renderType="footer",{renderer,renderEmptyElement}=_ui.VxeUI;function renderRows(T,e,$,I,S,E,D,z){let R=e.$parent;var l=R,t=R,r=R;let O=R.$xeGrid,k=R.$xeGantt,A=e.fixedType,{resizable:q,border:X,footerCellClassName:L,footerCellStyle:U,footerAlign:H,footerSpanMethod:M,align:V,columnKey:G,showFooterOverflow:N}=l,{scrollXLoad:W,scrollYLoad:K,overflowX:j,currentColumn:B,mergeFootFlag:P}=t,{fullColumnIdData:Y,mergeFooterList:J,mergeFooterCellMaps:re,scrollXStore:Q}=r,oe=R.computeVirtualXOpts,Z=R.computeFooterTooltipOpts,ie=R.resizableOpts.isAllColumnDrag,ee=R.computeColumnOpts;e=R.computeDefaultRowHeight;let ae=R.computeCellOpts,le=R.computeFooterCellOpts,te=(0,_util.getCalcHeight)(le.height)||e;return I.map((l,e)=>{var{type:t,showFooterOverflow:r,footerAlign:o,align:i,footerClassName:a,editRender:n,cellRender:s}=l,d=l.id,u=Y[d]||{},n=n||s,s=n?renderer.get(n.name):null;let p=Z.showAll;var n=j&&(A?l.fixed!==A:!!l.fixed),c=(0,_utils.getDefaultConfig)(le.padding,ae.padding),f=!0===c,m=!!c&&(f||!1!==c.top),x=!!c&&(f||!1!==c.bottom),g=!!c&&(f||!1!==c.left),f=!!c&&(f||!1!==c.right),c=(0,_utils.getDefaultConfig)(r,N),r=o||(s?s.tableFooterCellAlign:"")||H||i||(s?s.tableCellAlign:"")||V,o="ellipsis"===(!0===c?Z.mode:c);let v="title"===(!0===c?Z.mode:c),b="tooltip"===(!0===c?Z.mode:c);var i=v||b||o,s=_xeUtils.default.isBoolean(l.resizable)?l.resizable:ee.resizable||q,c={colid:d},y={},w=u.index,u=u._index,C=u;let h={source:sourceType,$table:R,$grid:O,$gantt:k,row:E,rowIndex:z,_rowIndex:z,$rowIndex:D,column:l,columnIndex:w,$columnIndex:e,_columnIndex:u,itemIndex:C,items:E,fixed:A,type:renderType,data:S},_=((v||b||p)&&(y.mouseenter=e=>{v?(0,_dom.updateCellTitle)(e.currentTarget,l):(b||p)&&R.triggerFooterTooltipEvent(e,h)}),(b||p)&&(y.mouseleave=e=>{(b||p)&&R.handleTargetLeaveEvent(e)}),y.click=e=>{R.triggerFooterCellClickEvent(e,h)},!(y.dblclick=e=>{R.triggerFooterCellDblclickEvent(e,h)}));if(P&&J.length){w=re[z+":"+u];if(w){var{rowspan:C,colspan:w}=w;if(!C||!w)return null;1<C&&(_=!0,c.rowspan=C),1<w&&(_=!0,c.colspan=w)}}else if(M){var{rowspan:C=1,colspan:w=1}=M(h)||{};if(!C||!w)return null;1<C&&(c.rowspan=C),1<w&&(c.colspan=w)}C=e===I.length-1,w=!l.resizeWidth&&("auto"===l.minWidth||"auto"===l.width);let F=!1;$&&j&&!_&&W&&10<I.length&&!l.fixed&&!oe.immediate&&(u<Q.visibleStartIndex-Q.preloadSize||u>Q.visibleEndIndex+Q.preloadSize)&&(F=!0);u={};return i?u.height=te+"px":u.minHeight=te+"px",T("td",{class:["vxe-table--column vxe-footer--column",l.id,{["col--"+r]:r,["col--"+t]:t,"col--last":C,"fixed--width":!w,"fixed--hidden":n,"is--pg-top":m,"is--pg-bottom":x,"is--pg-left":g,"is--pg-right":f,"col--ellipsis":i,"col--current":B===l},(0,_utils.getClass)(a,h),(0,_utils.getClass)(L,h)],attrs:c,style:U?_xeUtils.default.isFunction(U)?U(h):U:void 0,on:y,key:G||W||K||ee.useKey||ee.drag?l.id:e},[T("div",{class:["vxe-cell",{"c--title":v,"c--tooltip":b,"c--ellipsis":o}],style:u},F?[]:[T("div",{attrs:{colid:d},class:"vxe-cell--wrapper vxe-footer-cell--wrapper"},l.renderFooter(T,h))]),!n&&s&&ie?T("div",{class:["vxe-cell--col-resizable",{"is--line":!X||"none"===X}],on:{mousedown:e=>R.handleColResizeMousedownEvent(e,A,h),dblclick:e=>R.handleColResizeDblclickEvent(e,h)}}):renderEmptyElement(R)])})}function renderHeads(r,o,i,a){let n=o.$parent;var e=n;let{fixedType:s,footerTableData:d}=o,{footerRowClassName:u,footerRowStyle:p}=e;return d.map((e,l)=>{var t=l,t={$table:n,row:e,rowIndex:l,_rowIndex:l,$rowIndex:t,fixed:s,type:renderType};return r("tr",{key:l,class:["vxe-footer--row",u?_xeUtils.default.isFunction(u)?u(t):u:""],style:p?_xeUtils.default.isFunction(p)?p(t):p:void 0},renderRows(r,o,i,a,d,e,l,l))})}var _default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeTableFooter",props:{footerTableData:{type:Array,default:()=>[]},tableColumn:{type:Array,default:()=>[]},fixedColumn:{type:Array,default:()=>[]},fixedType:{type:String,default:null}},mounted(){var e=this,l=e.fixedType,t=e.$parent.elemStore,l=`${l||"main"}-footer-`;t[l+"wrapper"]=e.$refs.refElem,t[l+"scroll"]=e.$refs.refFooterScroll,t[l+"table"]=e.$refs.refFooterTable,t[l+"colgroup"]=e.$refs.refFooterColgroup,t[l+"list"]=e.$refs.refFooterTFoot,t[l+"xSpace"]=e.$refs.refFooterXSpace},destroyed(){var e=this.fixedType,l=this.$parent.elemStore,e=`${e||"main"}-footer-`;l[e+"wrapper"]=null,l[e+"scroll"]=null,l[e+"table"]=null,l[e+"colgroup"]=null,l[e+"list"]=null,l[e+"xSpace"]=null},render(t){let l=this.$parent;var e=l,r=l,o=l.xID;let{fixedType:i,fixedColumn:a,tableColumn:n}=this;var{visibleColumn:r,fullColumnIdData:s}=r,{isGroup:e,isColLoading:d,overflowX:u,scrollXLoad:p,dragCol:c}=e;let f=n;var m=l.computeIsFooterRenderOptimize;return m&&(d||!i&&u)||(f=r),i&&m&&(f=a||[]),i||e||p&&c&&2<f.length&&(d=s[c.id])&&(u=d._index,r=f[0],e=f[f.length-1],p=s[r.id],d=s[e.id],p)&&d&&(r=p._index,s=d._index,u<r?f=[c].concat(f):s<u&&(f=f.concat([c]))),t("div",{ref:"refElem",class:["vxe-table--footer-wrapper",i?`fixed-${i}--wrapper`:"body--wrapper"],attrs:{xid:o}},[t("div",{ref:"refFooterScroll",class:"vxe-table--footer-inner-wrapper",on:{scroll(e){l.triggerFooterScrollEvent(e,i)}}},[i?renderEmptyElement(l):t("div",{ref:"refFooterXSpace",class:"vxe-body--x-space"}),t("table",{ref:"refFooterTable",class:"vxe-table--footer",attrs:{xid:o,cellspacing:0,cellpadding:0,border:0,xvm:m?"1":null}},[t("colgroup",{ref:"refFooterColgroup"},f.map((e,l)=>t("col",{attrs:{name:e.id},key:l,style:{width:e.renderWidth+"px"}}))),t("tfoot",{ref:"refFooterTFoot"},renderHeads(t,this,m,f))])])])}});
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_comp=require("../../ui/src/comp"),_utils=require("../../ui/src/utils"),_dom=require("../../ui/src/dom"),_util=require("./util");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let sourceType="table",renderType="footer",{renderer,renderEmptyElement}=_ui.VxeUI;function renderRows(T,e,$,I,S,E,D,z){let R=e.$parent;var l=R,r=R,t=R;let O=R.$xeGrid,k=R.$xeGantt,A=e.fixedType,{resizable:q,border:X,footerCellClassName:L,footerCellStyle:U,footerAlign:H,footerSpanMethod:M,align:V,columnKey:G,showFooterOverflow:N}=l,{scrollXLoad:W,scrollYLoad:K,overflowX:j,mergeFootFlag:B,currColFlag:P}=r,{fullColumnIdData:Y,mergeFooterList:J,mergeFooterCellMaps:te,scrollXStore:Q,currentCol:oe}=t,ie=R.computeVirtualXOpts,Z=R.computeFooterTooltipOpts,ae=R.resizableOpts.isAllColumnDrag,ee=R.computeColumnOpts;e=R.computeDefaultRowHeight;let ne=R.computeCellOpts,le=R.computeFooterCellOpts,re=(0,_util.getCalcHeight)(le.height)||e;return I.map((l,e)=>{var{type:r,showFooterOverflow:t,footerAlign:o,align:i,footerClassName:a,editRender:n,cellRender:s}=l,d=l.id,u=Y[d]||{},n=n||s,s=n?renderer.get(n.name):null;let p=Z.showAll;var n=j&&(A?l.fixed!==A:!!l.fixed),c=(0,_utils.getDefaultConfig)(le.padding,ne.padding),f=!0===c,m=!!c&&(f||!1!==c.top),x=!!c&&(f||!1!==c.bottom),g=!!c&&(f||!1!==c.left),f=!!c&&(f||!1!==c.right),c=(0,_utils.getDefaultConfig)(t,N),t=o||(s?s.tableFooterCellAlign:"")||H||i||(s?s.tableCellAlign:"")||V,o="ellipsis"===(!0===c?Z.mode:c);let v="title"===(!0===c?Z.mode:c),b="tooltip"===(!0===c?Z.mode:c);var i=v||b||o,s=_xeUtils.default.isBoolean(l.resizable)?l.resizable:ee.resizable||q,c={colid:d},y={},w=u.index,u=u._index,C=u;let h={source:sourceType,$table:R,$grid:O,$gantt:k,row:E,rowIndex:z,_rowIndex:z,$rowIndex:D,column:l,columnIndex:w,$columnIndex:e,_columnIndex:u,itemIndex:C,items:E,fixed:A,type:renderType,data:S},F=((v||b||p)&&(y.mouseenter=e=>{v?(0,_dom.updateCellTitle)(e.currentTarget,l):(b||p)&&R.triggerFooterTooltipEvent(e,h)}),(b||p)&&(y.mouseleave=e=>{(b||p)&&R.handleTargetLeaveEvent(e)}),y.click=e=>{R.triggerFooterCellClickEvent(e,h)},!(y.dblclick=e=>{R.triggerFooterCellDblclickEvent(e,h)}));if(B&&J.length){w=te[z+":"+u];if(w){var{rowspan:C,colspan:w}=w;if(!C||!w)return null;1<C&&(F=!0,c.rowspan=C),1<w&&(F=!0,c.colspan=w)}}else if(M){var{rowspan:C=1,colspan:w=1}=M(h)||{};if(!C||!w)return null;1<C&&(c.rowspan=C),1<w&&(c.colspan=w)}C=e===I.length-1,w=!l.resizeWidth&&("auto"===l.minWidth||"auto"===l.width);let _=!1;$&&j&&!F&&W&&10<I.length&&!l.fixed&&!ie.immediate&&(u<Q.visibleStartIndex-Q.preloadSize||u>Q.visibleEndIndex+Q.preloadSize)&&(_=!0);u={};return i?u.height=re+"px":u.minHeight=re+"px",T("td",{class:["vxe-table--column vxe-footer--column",l.id,{["col--"+t]:t,["col--"+r]:r,"col--last":C,"fixed--width":!w,"fixed--hidden":n,"is--pg-top":m,"is--pg-bottom":x,"is--pg-left":g,"is--pg-right":f,"col--ellipsis":i,"col--current":P&&oe===l},(0,_utils.getClass)(a,h),(0,_utils.getClass)(L,h)],attrs:c,style:U?_xeUtils.default.isFunction(U)?U(h):U:void 0,on:y,key:G||W||K||ee.useKey||ee.drag?l.id:e},[T("div",{class:["vxe-cell",{"c--title":v,"c--tooltip":b,"c--ellipsis":o}],style:u},_?[]:[T("div",{attrs:{colid:d},class:"vxe-cell--wrapper vxe-footer-cell--wrapper"},l.renderFooter(T,h))]),!n&&s&&ae?T("div",{class:["vxe-cell--col-resizable",{"is--line":!X||"none"===X}],on:{mousedown:e=>R.handleColResizeMousedownEvent(e,A,h),dblclick:e=>R.handleColResizeDblclickEvent(e,h)}}):renderEmptyElement(R)])})}function renderHeads(t,o,i,a){let n=o.$parent;var e=n;let{fixedType:s,footerTableData:d}=o,{footerRowClassName:u,footerRowStyle:p}=e;return d.map((e,l)=>{var r=l,r={$table:n,row:e,rowIndex:l,_rowIndex:l,$rowIndex:r,fixed:s,type:renderType};return t("tr",{key:l,class:["vxe-footer--row",u?_xeUtils.default.isFunction(u)?u(r):u:""],style:p?_xeUtils.default.isFunction(p)?p(r):p:void 0},renderRows(t,o,i,a,d,e,l,l))})}var _default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeTableFooter",props:{footerTableData:{type:Array,default:()=>[]},tableColumn:{type:Array,default:()=>[]},fixedColumn:{type:Array,default:()=>[]},fixedType:{type:String,default:null}},mounted(){var e=this,l=e.fixedType,r=e.$parent.elemStore,l=`${l||"main"}-footer-`;r[l+"wrapper"]=e.$refs.refElem,r[l+"scroll"]=e.$refs.refFooterScroll,r[l+"table"]=e.$refs.refFooterTable,r[l+"colgroup"]=e.$refs.refFooterColgroup,r[l+"list"]=e.$refs.refFooterTFoot,r[l+"xSpace"]=e.$refs.refFooterXSpace},destroyed(){var e=this.fixedType,l=this.$parent.elemStore,e=`${e||"main"}-footer-`;l[e+"wrapper"]=null,l[e+"scroll"]=null,l[e+"table"]=null,l[e+"colgroup"]=null,l[e+"list"]=null,l[e+"xSpace"]=null},render(r){let l=this.$parent;var e=l,t=l,o=l.xID;let{fixedType:i,fixedColumn:a,tableColumn:n}=this;var{visibleColumn:t,fullColumnIdData:s}=t,{isGroup:e,isColLoading:d,overflowX:u,scrollXLoad:p,dragCol:c}=e;let f=n;var m=l.computeIsFooterRenderOptimize;return m&&(d||!i&&u)||(f=t),i&&m&&(f=a||[]),i||e||p&&c&&2<f.length&&(d=s[c.id])&&(u=d._index,t=f[0],e=f[f.length-1],p=s[t.id],d=s[e.id],p)&&d&&(t=p._index,s=d._index,u<t?f=[c].concat(f):s<u&&(f=f.concat([c]))),r("div",{ref:"refElem",class:["vxe-table--footer-wrapper",i?`fixed-${i}--wrapper`:"body--wrapper"],attrs:{xid:o}},[r("div",{ref:"refFooterScroll",class:"vxe-table--footer-inner-wrapper",on:{scroll(e){l.triggerFooterScrollEvent(e,i)}}},[i?renderEmptyElement(l):r("div",{ref:"refFooterXSpace",class:"vxe-body--x-space"}),r("table",{ref:"refFooterTable",class:"vxe-table--footer",attrs:{xid:o,cellspacing:0,cellpadding:0,border:0,xvm:m?"1":null}},[r("colgroup",{ref:"refFooterColgroup"},f.map((e,l)=>r("col",{attrs:{name:e.id},key:l,style:{width:e.renderWidth+"px"}}))),r("tfoot",{ref:"refFooterTFoot"},renderHeads(r,this,m,f))])])])}});

package/lib/table/src/header.js

@@ -40,19 +40,20 @@ function renderRows(h, _vm, isGroup, isOptimizeMode, headerGroups, _rowIndex, co
     mouseConfig
   } = tableProps;
   const {
-    currentColumn,
     dragCol,
     scrollXLoad,
     scrollYLoad,
     overflowX,
     mergeHeadFlag,
-    tableColumn
+    tableColumn,
+    currColFlag
   } = tableReactData;
   const {
     fullColumnIdData,
     scrollXStore,
     mergeHeaderList,
-    mergeHeaderCellMaps
+    mergeHeaderCellMaps,
+    currentCol
   } = tableInternalData;
   const virtualXOpts = $xeTable.computeVirtualXOpts;
   const columnOpts = $xeTable.computeColumnOpts;
@@ -221,7 +222,7 @@ function renderRows(h, _vm, isGroup, isOptimizeMode, headerGroups, _rowIndex, co
         'is--filter-active': hasFilter,
         'is--drag-active': columnOpts.drag && !column.fixed && !isDisabledDrag && (isCrossDrag || isPeerDrag || !column.parentId),
         'is--drag-disabled': columnOpts.drag && isDisabledDrag,
-        'col--current': currentColumn === column
+        'col--current': currColFlag && currentCol === column
       }, (0, _utils.getClass)(headerClassName, cellParams), (0, _utils.getClass)(headerCellClassName, cellParams)],
       attrs: thAttrs,
       style: headerCellStyle ? _xeUtils.default.isFunction(headerCellStyle) ? headerCellStyle(cellParams) : headerCellStyle : undefined,
@@ -269,11 +270,12 @@ function renderFilterRows(h, _vm, isOptimizeMode, cols) {
     align: allAlign
   } = tableProps;
   const {
-    currentColumn,
-    overflowX
+    overflowX,
+    currColFlag
   } = tableReactData;
   const {
-    fullColumnIdData
+    fullColumnIdData,
+    currentCol
   } = tableInternalData;
   const headerTooltipOpts = $xeTable.computeHeaderTooltipOpts;
   const cellOpts = $xeTable.computeCellOpts;
@@ -356,7 +358,7 @@ function renderFilterRows(h, _vm, isOptimizeMode, cols) {
         'fixed--width': !isAutoCellWidth,
         'is--padding': isPadding,
         'is--sortable': column.sortable,
-        'col--current': currentColumn === column
+        'col--current': currColFlag && currentCol === column
       }],
       key: colid,
       attrs: thAttrs

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

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_comp=require("../../ui/src/comp"),_utils=require("../../ui/src/utils"),_util=require("./util"),_vn=require("../../ui/src/vn");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{renderer,renderEmptyElement}=_ui.VxeUI,sourceType="table",renderType="header";function renderRows(S,e,I,R,l,O,F){let k=e.$parent,z=k.$xeGrid,A=k.$xeGantt;var r=k,t=k,a=k;let q=e.fixedType,{resizable:G,columnKey:U,showCustomHeader:X,headerCellClassName:M,headerCellStyle:N,showHeaderOverflow:W,headerAlign:L,align:V,mouseConfig:B}=r,{currentColumn:K,dragCol:P,scrollXLoad:j,scrollYLoad:Y,overflowX:J,mergeHeadFlag:Q,tableColumn:de}=t,{fullColumnIdData:oe,scrollXStore:Z,mergeHeaderList:ne,mergeHeaderCellMaps:se}=a,ce=k.computeVirtualXOpts,ee=k.computeColumnOpts,le=k.computeColumnDragOpts,ue=k.computeHeaderTooltipOpts,pe=k.computeCellOpts;e=k.computeDefaultRowHeight;let re=k.computeHeaderCellOpts,te=(0,_util.getCalcHeight)(re.height)||e,{disabledMethod:ae,isCrossDrag:me,isPeerDrag:ge}=le,ie=O===l.length-1;return F.map((e,l)=>{var{type:r,showHeaderOverflow:t,headerAlign:a,align:i,filters:d,headerClassName:o,editRender:n,cellRender:s}=e,c=e.id,u=oe[c]||{},n=n||s,s=n?renderer.get(n.name):null,n=e.children&&e.children.length,p=J&&!n&&(q?e.fixed!==q:!!e.fixed),m=(0,_utils.getDefaultConfig)(re.padding,pe.padding),g=!0===m,f=!!m&&(g||!1!==m.top),x=!!m&&(g||!1!==m.bottom),h=!!m&&(g||!1!==m.left),g=!!m&&(g||!1!==m.right),m=(0,_utils.getDefaultConfig)(t,W),t=a||(s?s.tableHeaderCellAlign:"")||L||i||(s?s.tableCellAlign:"")||V,a="ellipsis"===m,i="title"===m,s=!0===m?"tooltip"===ue.mode:"tooltip"===m,m=i||s||a;let v=!1,C=null;d&&(C=d[0],v=d.some(e=>e.checked));var b=u.index,u=X?l:u._index;let w={$table:k,$grid:z,$gantt:A,rowIndex:O,_rowIndex:O,$rowIndex:O,column:e,columnIndex:b,$columnIndex:l,_columnIndex:u,firstFilterOption:C,fixed:q,source:sourceType,type:renderType,isHidden:p,hasFilter:v};b={colid:c};let H=!1;if(X||(b.colspan=1<e.colSpan?e.colSpan:null,b.rowspan=1<e.rowSpan?e.rowSpan:null),Q&&ne.length&&(X||ie)){var y=se[O+":"+(X?l:u)];if(y){var{rowspan:y,colspan:_}=y;if(!y||!_)return null;1<y&&(H=!0,b.rowspan=y),1<_&&(H=!0,b.colspan=_)}}y={click:e=>k.triggerHeaderCellClickEvent(e,w),dblclick:e=>k.triggerHeaderCellDblclickEvent(e,w)},_=ee.drag&&"cell"===le.trigger;let $=!1;_&&($=!(!ae||!ae(w))),(B||_)&&(y.mousedown=e=>k.triggerHeaderCellMousedownEvent(e,w)),ee.drag&&(y.dragstart=k.handleHeaderCellDragDragstartEvent,y.dragend=k.handleHeaderCellDragDragendEvent,y.dragover=k.handleHeaderCellDragDragoverEvent,_)&&(y.mouseup=k.handleHeaderCellDragMouseupEvent);var _=l===F.length-1,T=_xeUtils.default.isBoolean(e.resizable)?e.resizable:ee.resizable||G,D=!e.resizeWidth&&("auto"===e.minWidth||"auto"===e.width);let E=!1;!R||!J||I||H||P&&P.id===c||j&&10<de.length&&!e.fixed&&!ce.immediate&&(u<Z.visibleStartIndex-Z.preloadSize||u>Z.visibleEndIndex+Z.preloadSize)&&(E=!0);u={};if(m?u.height=te+"px":u.minHeight=te+"px",!X&&n&&!ie){let l=0;_xeUtils.default.eachTree(e.children,e=>{!e.visible||e.children&&e.children.length||(l+=e.renderWidth)}),u.width=l+"px"}return S("th",{class:["vxe-table--column vxe-header--column",c,p?"fixed--hidden":"fixed--visible",{["col--"+t]:t,["col--"+r]:r,"col--last":_,"col--fixed":e.fixed,"col--group":n,"col--ellipsis":m,"fixed--width":!D,"is--pg-top":f,"is--pg-bottom":x,"is--pg-left":h,"is--pg-right":g,"is--sortable":e.sortable,"col--filter":!!d,"is--filter-active":v,"is--drag-active":ee.drag&&!e.fixed&&!$&&(me||ge||!e.parentId),"is--drag-disabled":ee.drag&&$,"col--current":K===e},(0,_utils.getClass)(o,w),(0,_utils.getClass)(M,w)],attrs:b,style:N?_xeUtils.default.isFunction(N)?N(w):N:void 0,on:y,key:X?""+c+l:U||j||Y||ee.useKey||ee.drag||n?c:l},[S("div",{class:["vxe-cell",{"c--title":i,"c--tooltip":s,"c--ellipsis":a}],style:u},E||R&&p?[]:[S("div",{attrs:{colid:c},class:"vxe-cell--wrapper vxe-header-cell--wrapper"},e.renderHeader(S,w))]),p||!T||X&&!ie?renderEmptyElement(k):S("div",{class:"vxe-cell--col-resizable",on:{mousedown:e=>k.handleColResizeMousedownEvent(e,q,w),dblclick:e=>k.handleColResizeDblclickEvent(e,w)}})])})}function renderFilterRows(w,e,H,y){let _=e.$parent,$=_.$xeGrid,T=_.$xeGantt;var l=_,r=_,t=_;let D=e.fixedType,{showHeaderOverflow:E,headerAlign:S,align:I}=l,{currentColumn:R,overflowX:O}=r,F=t.fullColumnIdData,k=_.computeHeaderTooltipOpts,z=_.computeCellOpts;e=_.computeDefaultRowHeight;let A=_.computeHeaderCellOpts,q=_.computeFloatingFilterOpts.cellClassName,G=(0,_util.getCalcHeight)(A.height)||e;return y.map((e,l)=>{var{type:r,showHeaderOverflow:t,headerAlign:a,align:i,filters:d,editRender:o,cellRender:n,floatingFilters:s,filterRender:c,slots:u}=e,p=e.id,m=F[p]||{},o=o||n,n=o?renderer.get(o.name):null,o=(0,_utils.isEnableConf)(c)?renderer.get(c.name):null,o=o?o.renderTableFloatingFilter:null,u=u?u.floatingFilter||u["floating-filter"]:null,g=O&&(D?e.fixed!==D:!!e.fixed),f=(_xeUtils.default.isBoolean(A.padding)?A:z).padding,t=_xeUtils.default.eqNull(t)?E:t,a=a||(n?n.tableHeaderCellAlign:"")||S||i||(n?n.tableCellAlign:"")||I,i="ellipsis"===(!0===t?k.mode:t),n="title"===(!0===t?k.mode:t),t="tooltip"===(!0===t?k.mode:t),x=n||t||i;let h=!1,v=null;d&&(v=d[0],h=d.some(e=>e.checked));var d=m.index,m=m._index,d={$table:_,$grid:$,$gantt:T,column:e,columnIndex:d,$columnIndex:l,_columnIndex:m,option:v,fixed:D,source:sourceType,type:renderType,isHidden:g,hasFilter:h},m={colid:p},l=l===y.length-1,C=!e.resizeWidth&&("auto"===e.minWidth||"auto"===e.width),b={};return x?b.height=G+"px":b.minHeight=G+"px",w("th",{class:["vxe-table--column vxe-header--column is--floating-filters",p,g?"fixed--hidden":"fixed--visible",{["col--"+a]:a,["col--"+r]:r,"col--last":l,"col--fixed":e.fixed,"col--ellipsis":x,"fixed--width":!C,"is--padding":f,"is--sortable":e.sortable,"col--current":R===e}],key:p,attrs:m},[w("div",{class:["vxe-cell",""+(q||""),{"c--title":n,"c--tooltip":t,"c--ellipsis":i}],style:b},H&&g&&!s?[]:[w("div",{attrs:{colid:p},class:"vxe-cell--wrapper vxe-header-cell--wrapper"},u?_.callSlot(u,d,w):o&&v?(0,_vn.getSlotVNs)(o.call(_,w,c,d)):[])])])})}function renderHeads(t,a,i,d,o,e){let n=a.$parent;var l=n;let s=a.fixedType,{headerRowClassName:c,headerRowStyle:u}=l;var l=n.computeFloatingFilterOpts,r=o.map((e,l)=>{var r={$table:n,rowIndex:l,_rowIndex:l,$rowIndex:l,fixed:s,type:renderType};return t("tr",{key:l,class:["vxe-header--row",c?_xeUtils.default.isFunction(c)?c(r):c:""],style:u?_xeUtils.default.isFunction(u)?u(r):u:void 0},renderRows(t,a,i,d,o,l,e))});return l.enabled&&r.push(t("tr",{key:"ff",class:["vxe-header--row is--floating-filters",""+(l.rowClassName||"")]},renderFilterRows(t,a,d,e))),r}var _default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeTableHeader",props:{tableData:Array,tableColumn:Array,tableGroupColumn:Array,fixedColumn:Array,fixedType:{type:String,default:null}},data(){return{headerColumn:[]}},watch:{tableColumn(){this.uploadColumn()}},created(){this.uploadColumn()},mounted(){var e=this,l=e.fixedType,r=e.$parent.elemStore,l=`${l||"main"}-header-`;r[l+"wrapper"]=e.$refs.refElem,r[l+"scroll"]=e.$refs.refHeaderScroll,r[l+"table"]=e.$refs.refHeaderTable,r[l+"colgroup"]=e.$refs.refHeaderColgroup,r[l+"list"]=e.$refs.refHeaderTHead,r[l+"xSpace"]=e.$refs.refHeaderXSpace,r[l+"repair"]=e.$refs.refHeaderBorderRepair},destroyed(){var e=this.fixedType,l=this.$parent.elemStore,e=`${e||"main"}-header-`;l[e+"wrapper"]=null,l[e+"scroll"]=null,l[e+"table"]=null,l[e+"colgroup"]=null,l[e+"list"]=null,l[e+"xSpace"]=null,l[e+"repair"]=null},render(r){let l=this.$parent;var e=l,t=l,a=l,i=l.xID;let{fixedType:d,fixedColumn:o,tableColumn:n}=this;var s=this.headerColumn,e=e.mouseConfig,{isGroup:t,isColLoading:c,overflowX:u,scrollXLoad:p,dragCol:m}=t,{visibleColumn:a,fullColumnIdData:g}=a,f=l.computeMouseOpts;let x=s,h=n;s=l.computeIsHeaderRenderOptimize;return t?h=a:(s&&(c||!d&&u)||(h=a),d&&s&&(h=o||[]),x=[h]),d||t||p&&m&&2<h.length&&(c=g[m.id])&&(u=c._index,a=h[0],p=h[h.length-1],c=g[a.id],a=g[p.id],c)&&a&&(g=c._index,p=a._index,u<g?(h=[m].concat(h),x=[[m].concat(x[0])].concat(x.slice(1))):p<u&&(h=h.concat([m]),x=[x[0].concat([m])].concat(x.slice(1)))),r("div",{ref:"refElem",class:["vxe-table--header-wrapper",d?`fixed-${d}--wrapper`:"body--wrapper"],attrs:{xid:i}},[r("div",{ref:"refHeaderScroll",class:"vxe-table--header-inner-wrapper",on:{scroll(e){l.triggerHeaderScrollEvent(e,d)}}},[d?renderEmptyElement(l):r("div",{ref:"refHeaderXSpace",class:"vxe-body--x-space"}),r("table",{ref:"refHeaderTable",class:"vxe-table--header",attrs:{xid:i,cellspacing:0,cellpadding:0,border:0,xvm:s?"1":null}},[r("colgroup",{ref:"refHeaderColgroup"},h.map((e,l)=>r("col",{attrs:{name:e.id},key:l,style:{width:e.renderWidth+"px"}}))),r("thead",{ref:"refHeaderTHead"},renderHeads(r,this,t,s,x,h))]),e&&f.area?r("div",{class:"vxe-table--cell-area",attrs:{xid:i}},[r("span",{class:"vxe-table--cell-main-area"}),r("span",{class:"vxe-table--cell-clip-area"}),r("span",{class:"vxe-table--cell-extend-area"}),r("span",{class:"vxe-table--cell-multi-area"}),r("span",{class:"vxe-table--cell-active-area"}),r("span",{class:"vxe-table--cell-col-status-area"})]):renderEmptyElement(l)])])},methods:{uploadColumn(){let e=this.$parent;var l=e,r=e,l=l.showCustomHeader;let{collectColumn:t,visibleColumn:a}=e;var i=this.tableGroupColumn,r=r.isGroup;let d=r?(0,_util.convertHeaderColumnToRows)(i):[],o=[];l&&1<d.length&&(o=(0,_util.convertHeaderToGridRows)(d),d=o),this.headerColumn=d,e.$nextTick(()=>{e.dispatchEvent("columns-change",{visibleColgroups:o,collectColumn:t,visibleColumn:a},null)})}}});
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_comp=require("../../ui/src/comp"),_utils=require("../../ui/src/utils"),_util=require("./util"),_vn=require("../../ui/src/vn");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{renderer,renderEmptyElement}=_ui.VxeUI,sourceType="table",renderType="header";function renderRows(S,e,I,R,l,F,O){let k=e.$parent,z=k.$xeGrid,A=k.$xeGantt;var r=k,t=k,a=k;let q=e.fixedType,{resizable:G,columnKey:U,showCustomHeader:X,headerCellClassName:M,headerCellStyle:N,showHeaderOverflow:W,headerAlign:L,align:V,mouseConfig:B}=r,{dragCol:K,scrollXLoad:P,scrollYLoad:j,overflowX:Y,mergeHeadFlag:J,tableColumn:Q,currColFlag:de}=t,{fullColumnIdData:oe,scrollXStore:Z,mergeHeaderList:ne,mergeHeaderCellMaps:se,currentCol:ce}=a,ue=k.computeVirtualXOpts,ee=k.computeColumnOpts,le=k.computeColumnDragOpts,pe=k.computeHeaderTooltipOpts,ge=k.computeCellOpts;e=k.computeDefaultRowHeight;let re=k.computeHeaderCellOpts,te=(0,_util.getCalcHeight)(re.height)||e,{disabledMethod:ae,isCrossDrag:fe,isPeerDrag:me}=le,ie=F===l.length-1;return O.map((e,l)=>{var{type:r,showHeaderOverflow:t,headerAlign:a,align:i,filters:d,headerClassName:o,editRender:n,cellRender:s}=e,c=e.id,u=oe[c]||{},n=n||s,s=n?renderer.get(n.name):null,n=e.children&&e.children.length,p=Y&&!n&&(q?e.fixed!==q:!!e.fixed),g=(0,_utils.getDefaultConfig)(re.padding,ge.padding),f=!0===g,m=!!g&&(f||!1!==g.top),x=!!g&&(f||!1!==g.bottom),h=!!g&&(f||!1!==g.left),f=!!g&&(f||!1!==g.right),g=(0,_utils.getDefaultConfig)(t,W),t=a||(s?s.tableHeaderCellAlign:"")||L||i||(s?s.tableCellAlign:"")||V,a="ellipsis"===g,i="title"===g,s=!0===g?"tooltip"===pe.mode:"tooltip"===g,g=i||s||a;let v=!1,C=null;d&&(C=d[0],v=d.some(e=>e.checked));var b=u.index,u=X?l:u._index;let w={$table:k,$grid:z,$gantt:A,rowIndex:F,_rowIndex:F,$rowIndex:F,column:e,columnIndex:b,$columnIndex:l,_columnIndex:u,firstFilterOption:C,fixed:q,source:sourceType,type:renderType,isHidden:p,hasFilter:v};b={colid:c};let H=!1;if(X||(b.colspan=1<e.colSpan?e.colSpan:null,b.rowspan=1<e.rowSpan?e.rowSpan:null),J&&ne.length&&(X||ie)){var y=se[F+":"+(X?l:u)];if(y){var{rowspan:y,colspan:_}=y;if(!y||!_)return null;1<y&&(H=!0,b.rowspan=y),1<_&&(H=!0,b.colspan=_)}}y={click:e=>k.triggerHeaderCellClickEvent(e,w),dblclick:e=>k.triggerHeaderCellDblclickEvent(e,w)},_=ee.drag&&"cell"===le.trigger;let $=!1;_&&($=!(!ae||!ae(w))),(B||_)&&(y.mousedown=e=>k.triggerHeaderCellMousedownEvent(e,w)),ee.drag&&(y.dragstart=k.handleHeaderCellDragDragstartEvent,y.dragend=k.handleHeaderCellDragDragendEvent,y.dragover=k.handleHeaderCellDragDragoverEvent,_)&&(y.mouseup=k.handleHeaderCellDragMouseupEvent);var _=l===O.length-1,T=_xeUtils.default.isBoolean(e.resizable)?e.resizable:ee.resizable||G,D=!e.resizeWidth&&("auto"===e.minWidth||"auto"===e.width);let E=!1;!R||!Y||I||H||K&&K.id===c||P&&10<Q.length&&!e.fixed&&!ue.immediate&&(u<Z.visibleStartIndex-Z.preloadSize||u>Z.visibleEndIndex+Z.preloadSize)&&(E=!0);u={};if(g?u.height=te+"px":u.minHeight=te+"px",!X&&n&&!ie){let l=0;_xeUtils.default.eachTree(e.children,e=>{!e.visible||e.children&&e.children.length||(l+=e.renderWidth)}),u.width=l+"px"}return S("th",{class:["vxe-table--column vxe-header--column",c,p?"fixed--hidden":"fixed--visible",{["col--"+t]:t,["col--"+r]:r,"col--last":_,"col--fixed":e.fixed,"col--group":n,"col--ellipsis":g,"fixed--width":!D,"is--pg-top":m,"is--pg-bottom":x,"is--pg-left":h,"is--pg-right":f,"is--sortable":e.sortable,"col--filter":!!d,"is--filter-active":v,"is--drag-active":ee.drag&&!e.fixed&&!$&&(fe||me||!e.parentId),"is--drag-disabled":ee.drag&&$,"col--current":de&&ce===e},(0,_utils.getClass)(o,w),(0,_utils.getClass)(M,w)],attrs:b,style:N?_xeUtils.default.isFunction(N)?N(w):N:void 0,on:y,key:X?""+c+l:U||P||j||ee.useKey||ee.drag||n?c:l},[S("div",{class:["vxe-cell",{"c--title":i,"c--tooltip":s,"c--ellipsis":a}],style:u},E||R&&p?[]:[S("div",{attrs:{colid:c},class:"vxe-cell--wrapper vxe-header-cell--wrapper"},e.renderHeader(S,w))]),p||!T||X&&!ie?renderEmptyElement(k):S("div",{class:"vxe-cell--col-resizable",on:{mousedown:e=>k.handleColResizeMousedownEvent(e,q,w),dblclick:e=>k.handleColResizeDblclickEvent(e,w)}})])})}function renderFilterRows(w,e,H,y){let _=e.$parent,$=_.$xeGrid,T=_.$xeGantt;var l=_,r=_,t=_;let D=e.fixedType,{showHeaderOverflow:E,headerAlign:S,align:I}=l,{overflowX:R,currColFlag:F}=r,{fullColumnIdData:O,currentCol:k}=t,z=_.computeHeaderTooltipOpts,A=_.computeCellOpts;e=_.computeDefaultRowHeight;let q=_.computeHeaderCellOpts,G=_.computeFloatingFilterOpts.cellClassName,U=(0,_util.getCalcHeight)(q.height)||e;return y.map((e,l)=>{var{type:r,showHeaderOverflow:t,headerAlign:a,align:i,filters:d,editRender:o,cellRender:n,floatingFilters:s,filterRender:c,slots:u}=e,p=e.id,g=O[p]||{},o=o||n,n=o?renderer.get(o.name):null,o=(0,_utils.isEnableConf)(c)?renderer.get(c.name):null,o=o?o.renderTableFloatingFilter:null,u=u?u.floatingFilter||u["floating-filter"]:null,f=R&&(D?e.fixed!==D:!!e.fixed),m=(_xeUtils.default.isBoolean(q.padding)?q:A).padding,t=_xeUtils.default.eqNull(t)?E:t,a=a||(n?n.tableHeaderCellAlign:"")||S||i||(n?n.tableCellAlign:"")||I,i="ellipsis"===(!0===t?z.mode:t),n="title"===(!0===t?z.mode:t),t="tooltip"===(!0===t?z.mode:t),x=n||t||i;let h=!1,v=null;d&&(v=d[0],h=d.some(e=>e.checked));var d=g.index,g=g._index,d={$table:_,$grid:$,$gantt:T,column:e,columnIndex:d,$columnIndex:l,_columnIndex:g,option:v,fixed:D,source:sourceType,type:renderType,isHidden:f,hasFilter:h},g={colid:p},l=l===y.length-1,C=!e.resizeWidth&&("auto"===e.minWidth||"auto"===e.width),b={};return x?b.height=U+"px":b.minHeight=U+"px",w("th",{class:["vxe-table--column vxe-header--column is--floating-filters",p,f?"fixed--hidden":"fixed--visible",{["col--"+a]:a,["col--"+r]:r,"col--last":l,"col--fixed":e.fixed,"col--ellipsis":x,"fixed--width":!C,"is--padding":m,"is--sortable":e.sortable,"col--current":F&&k===e}],key:p,attrs:g},[w("div",{class:["vxe-cell",""+(G||""),{"c--title":n,"c--tooltip":t,"c--ellipsis":i}],style:b},H&&f&&!s?[]:[w("div",{attrs:{colid:p},class:"vxe-cell--wrapper vxe-header-cell--wrapper"},u?_.callSlot(u,d,w):o&&v?(0,_vn.getSlotVNs)(o.call(_,w,c,d)):[])])])})}function renderHeads(t,a,i,d,o,e){let n=a.$parent;var l=n;let s=a.fixedType,{headerRowClassName:c,headerRowStyle:u}=l;var l=n.computeFloatingFilterOpts,r=o.map((e,l)=>{var r={$table:n,rowIndex:l,_rowIndex:l,$rowIndex:l,fixed:s,type:renderType};return t("tr",{key:l,class:["vxe-header--row",c?_xeUtils.default.isFunction(c)?c(r):c:""],style:u?_xeUtils.default.isFunction(u)?u(r):u:void 0},renderRows(t,a,i,d,o,l,e))});return l.enabled&&r.push(t("tr",{key:"ff",class:["vxe-header--row is--floating-filters",""+(l.rowClassName||"")]},renderFilterRows(t,a,d,e))),r}var _default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeTableHeader",props:{tableData:Array,tableColumn:Array,tableGroupColumn:Array,fixedColumn:Array,fixedType:{type:String,default:null}},data(){return{headerColumn:[]}},watch:{tableColumn(){this.uploadColumn()}},created(){this.uploadColumn()},mounted(){var e=this,l=e.fixedType,r=e.$parent.elemStore,l=`${l||"main"}-header-`;r[l+"wrapper"]=e.$refs.refElem,r[l+"scroll"]=e.$refs.refHeaderScroll,r[l+"table"]=e.$refs.refHeaderTable,r[l+"colgroup"]=e.$refs.refHeaderColgroup,r[l+"list"]=e.$refs.refHeaderTHead,r[l+"xSpace"]=e.$refs.refHeaderXSpace,r[l+"repair"]=e.$refs.refHeaderBorderRepair},destroyed(){var e=this.fixedType,l=this.$parent.elemStore,e=`${e||"main"}-header-`;l[e+"wrapper"]=null,l[e+"scroll"]=null,l[e+"table"]=null,l[e+"colgroup"]=null,l[e+"list"]=null,l[e+"xSpace"]=null,l[e+"repair"]=null},render(r){let l=this.$parent;var e=l,t=l,a=l,i=l.xID;let{fixedType:d,fixedColumn:o,tableColumn:n}=this;var s=this.headerColumn,e=e.mouseConfig,{isGroup:t,isColLoading:c,overflowX:u,scrollXLoad:p,dragCol:g}=t,{visibleColumn:a,fullColumnIdData:f}=a,m=l.computeMouseOpts;let x=s,h=n;s=l.computeIsHeaderRenderOptimize;return t?h=a:(s&&(c||!d&&u)||(h=a),d&&s&&(h=o||[]),x=[h]),d||t||p&&g&&2<h.length&&(c=f[g.id])&&(u=c._index,a=h[0],p=h[h.length-1],c=f[a.id],a=f[p.id],c)&&a&&(f=c._index,p=a._index,u<f?(h=[g].concat(h),x=[[g].concat(x[0])].concat(x.slice(1))):p<u&&(h=h.concat([g]),x=[x[0].concat([g])].concat(x.slice(1)))),r("div",{ref:"refElem",class:["vxe-table--header-wrapper",d?`fixed-${d}--wrapper`:"body--wrapper"],attrs:{xid:i}},[r("div",{ref:"refHeaderScroll",class:"vxe-table--header-inner-wrapper",on:{scroll(e){l.triggerHeaderScrollEvent(e,d)}}},[d?renderEmptyElement(l):r("div",{ref:"refHeaderXSpace",class:"vxe-body--x-space"}),r("table",{ref:"refHeaderTable",class:"vxe-table--header",attrs:{xid:i,cellspacing:0,cellpadding:0,border:0,xvm:s?"1":null}},[r("colgroup",{ref:"refHeaderColgroup"},h.map((e,l)=>r("col",{attrs:{name:e.id},key:l,style:{width:e.renderWidth+"px"}}))),r("thead",{ref:"refHeaderTHead"},renderHeads(r,this,t,s,x,h))]),e&&m.area?r("div",{class:"vxe-table--cell-area",attrs:{xid:i}},[r("span",{class:"vxe-table--cell-main-area"}),r("span",{class:"vxe-table--cell-clip-area"}),r("span",{class:"vxe-table--cell-extend-area"}),r("span",{class:"vxe-table--cell-multi-area"}),r("span",{class:"vxe-table--cell-active-area"}),r("span",{class:"vxe-table--cell-col-status-area"})]):renderEmptyElement(l)])])},methods:{uploadColumn(){let e=this.$parent;var l=e,r=e,l=l.showCustomHeader;let{collectColumn:t,visibleColumn:a}=e;var i=this.tableGroupColumn,r=r.isGroup;let d=r?(0,_util.convertHeaderColumnToRows)(i):[],o=[];l&&1<d.length&&(o=(0,_util.convertHeaderToGridRows)(d),d=o),this.headerColumn=d,e.$nextTick(()=>{e.dispatchEvent("columns-change",{visibleColgroups:o,collectColumn:t,visibleColumn:a},null)})}}});