vxe-table 4.21.4 → 4.21.6

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

@@ -42,24 +42,16 @@ hooks.add('tableFilterModule', {
         column,
         targetEl
       } = filterStore;
-      if (!column || !targetEl) {
+      if (!column) {
         return (0, _vue.nextTick)();
       }
       const tableEl = refElem.value;
-      const {
-        scrollTop,
-        scrollLeft,
-        visibleHeight,
-        visibleWidth
-      } = (0, _dom.getDomNode)();
       const filterOpts = computeFilterOpts.value;
       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']);
@@ -71,63 +63,79 @@ hooks.add('tableFilterModule', {
       if (!filterWrapperElem) {
         return (0, _vue.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 (0, _vue.nextTick)();
         }
-        if ($xeGGWrapper) {
-          const wrapperEl = $xeGGWrapper.getRefMaps().refElem.value;
-          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;
+          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 ($xeGGWrapper) {
+            const wrapperEl = $xeGGWrapper.getRefMaps().refElem.value;
+            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 (0, _vue.nextTick)();
+        filterStore.style = panelStyle;
+        // 筛选面板是自适应表格高度
+        if (compConf ? !compConf.tableFilterAutoHeight : false) {
+          maxHeight = 0;
+        } else {
+          if (customMaxHeight) {
+            maxHeight = customMaxHeight > maxHeight ? maxHeight : customMaxHeight;
+          }
+        }
+        // 判断面板不能大于表格高度
+        filterStore.maxHeight = maxHeight;
+      };
+      handleStyle();
+      return (0, _vue.nextTick)().then(() => {
+        handleStyle();
+      });
     };
     const filterPrivateMethods = {
       checkFilterOptions() {
@@ -151,15 +159,14 @@ hooks.add('tableFilterModule', {
         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;
         }
-        (0, _vue.nextTick)(() => {
+        (0, _vue.nextTick)().then(() => {
           updatePopupStyle();
         });
         $xeTable.dispatchEvent('filter-visible', {

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

@@ -1 +1 @@
-var _vue=require("vue"),_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,hooks}=_ui.VxeUI,tableFilterMethodKeys=["openFilter","setFilter","clearFilter","saveFilter","saveFilterByEvent","saveFilterPanel","saveFilterPanelByEvent","resetFilter","resetFilterByEvent","resetFilterPanel","resetFilterPanelByEvent","getCheckedFilters","updateFilterOptionStatus"],sourceType="table";hooks.add("tableFilterModule",{setupTable(s){let a=s.xeGrid,u=s.xeGantt,C=a||u,{props:h,reactData:x,internalData:k}=s,{refElem:e,refTableFilter:t}=s.getRefMaps(),{computeFilterOpts:E,computeMouseOpts:f}=s.getComputeMaps(),o=()=>{var r=x.filterStore,i=k.elemStore,{column:n,targetEl:a}=r;if(n&&a){var u=e.value,{scrollTop:o,scrollLeft:d,visibleHeight:c,visibleWidth:s}=(0,_dom.getDomNode)(),{maxHeight:h,transfer:f,zIndex:v}=E.value,F=u.getBoundingClientRect(),m=n?n.filterRender:null,m=m&&(0,_utils.isEnableConf)(m)?renderer.get(m.name):null;if((0,_util.getRefElem)(i["main-header-scroll"])){i=t.value,i=i?i.getRefMaps().refElem.value:null;if(i){var p=a.getBoundingClientRect(),g=i.querySelector(".vxe-table--filter-header"),_=i.querySelector(".vxe-table--filter-footer"),i=i.offsetWidth,n=a?i/2:(i-n.renderWidth)/2;let e=0,t=0,l=0;f?(e=p.left-n+d,t=p.top+a.clientHeight+o,l=Math.min(Math.max(F.height,Math.floor(c/2)),Math.max(80,c-t-(g?g.clientHeight:0)-(_?_.clientHeight:0)-28)),e<16?e=16:e>s-i-16&&(e=s-i-16)):(e=p.left-F.left-n,t=p.top-F.top+a.clientHeight,l=Math.max(40,u.clientHeight-t-(g?g.clientHeight:0)-(_?_.clientHeight:0)-14),e<1?e=1:e>u.clientWidth-i-1&&(e=u.clientWidth-i-1),C&&(f=C.getRefMaps().refElem.value)&&(d=f.getBoundingClientRect(),t+=F.top-d.top));o={top:(0,_dom.toCssUnit)(t),left:(0,_dom.toCssUnit)(e)};v&&(o.zIndex=v),r.style=o,m&&!m.tableFilterAutoHeight?l=0:h&&(l=h>l?l:h),r.maxHeight=l}}}return(0,_vue.nextTick)()};var l={checkFilterOptions(){var e=x.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,r,i){var{initStore:n,filterStore:a}=x;a.column===r&&a.visible?a.visible=!1:(t=t||l,s.handleFilterOptions(r),k._currFilterParams=i,a.targetEl=t,a.style=null,a.visible=!0,n.filter=!0),(0,_vue.nextTick)(()=>{o()}),s.dispatchEvent("filter-visible",{column:r,field:r.field,property:r.field,filterList:s.getCheckedFilters(),visible:a.visible},e)},triggerFilterEvent(e,t,l){var r=k.elemStore,i=t.fixed,i=(0,_util.getRefElem)(r[`${i||"main"}-header-wrapper`]||r["main-header-wrapper"]),r=e.currentTarget,i=i?i.querySelector(".vxe-header--column."+t.id):null;s.handleOpenFilterColumn(e,r,i||r,t,l)},handleClearFilter(e){if(e){var{filters:l,filterRender:r}=e;if(l){r=(0,_utils.isEnableConf)(r)?renderer.get(r.name):null;let t=e.filterResetMethod||(r?r.tableFilterResetMethod||r.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:s})}}},handleColumnConfirmFilter(e,t){var l=h.mouseConfig;let{scrollXLoad:r,scrollYLoad:i}=x;var n=E.value,a=f.value,{field:u,filters:o}=e;let d=[],c=[];(o||[]).forEach(e=>{e.checked&&(d.push(e.value),c.push(e.data))});o=s.getCheckedFilters(),e={$table:s,$event:t,column:e,field:u,property:u,values:d,datas:c,filters:o,filterList:o};return n.remote||(s.handleTableData(!0),s.checkSelectionStatus()),l&&a.area&&s.handleFilterEvent&&s.handleFilterEvent(t,e),t&&s.dispatchEvent("filter-change",e,t),s.closeFilter(),s.updateFooter().then(()=>{var{scrollXLoad:e,scrollYLoad:t}=x;if(r||e||i||t)return(r||e)&&s.updateScrollXSpace(),(i||t)&&s.updateScrollYSpace(),s.refreshScroll()}).then(()=>(s.updateCellAreas(),s.recalculate(!0))).then(()=>{setTimeout(()=>s.recalculate(),50)})},confirmFilterEvent(e,t){t&&s.handleColumnConfirmFilter(t,e)},handleFilterChangeRadioOption(e,t,l){var r=x.filterStore,r=r.column;r&&((r.filters||[]).forEach(e=>{e._checked=!1}),l._checked=t,s.checkFilterOptions(),s.handleFilterConfirmFilter(e,r))},handleFilterChangeMultipleOption(e,t,l){l._checked=t,s.checkFilterOptions()},handleFilterChangeOption(e,t,l){var r=x.filterStore,i=k.fullColumnIdData;let n=r.column;n||(i=i[l._colId])&&(n=i.column,r.column=n),n&&(n.filterMultiple?s.handleFilterChangeMultipleOption(e,t,l):s.handleFilterChangeRadioOption(e,t,l))},handleFilterConfirmFilter(e,t){t&&((t.filters||[]).forEach(e=>{e.checked=e._checked}),s.confirmFilterEvent(e,t))},handleFilterResetFilter(e,t){t&&(s.handleClearFilter(t),s.confirmFilterEvent(e,t),e)&&s.dispatchEvent("clear-filter",{filterList:[]},e)},handleFilterStyle(){var e=x.filterStore;return(e.visible?o:(0,_vue.nextTick))()}};return Object.assign(Object.assign({},{openFilter(e){let n=(0,_util.handleFieldOrColumn)(s,e);if(n&&n.filters){let e=k.elemStore,{fixed:r,filters:i}=n;return s.scrollToColumn(n).then(()=>{var t=(0,_util.getRefElem)(e[`${r||"main"}-header-wrapper`]||e["main-header-wrapper"]);if(t){var l=t.querySelector(`.vxe-header--column.${n.id} .vxe-cell--filter`);if(l)(0,_dom.triggerEvent)(l,"click");else{l=t.querySelector(".vxe-header--column."+n.id);if(l){let e=null;i&&(e=i[0]);t={$table:s,$grid:a,$gantt:u,$rowIndex:-1,column:n,columnIndex:s.getColumnIndex(n),$columnIndex:s.getVMColumnIndex(n),_columnIndex:s.getVTColumnIndex(n),firstFilterOption:e,fixed:r,source:sourceType,type:"header"};s.handleOpenFilterColumn(new Event("click"),null,l,n,t)}}}})}return(0,_vue.nextTick)()},setFilter(e,t,l){var r=x.filterStore,e=(0,_util.handleFieldOrColumn)(s,e);if(e&&e.filters){if(e.filters=(0,_util.toFilters)(t||[],e.id),l)return s.handleColumnConfirmFilter(e,null);r.visible&&s.handleFilterOptions(e)}return(0,_vue.nextTick)()},clearFilter(e){var t=x.filterStore,l=k.tableFullColumn,r=E.value;let i;return e?(i=(0,_util.handleFieldOrColumn)(s,e))&&s.handleClearFilter(i):l.forEach(s.handleClearFilter),e&&i===t.column||Object.assign(t,{isAllSelected:!1,isIndeterminate:!1,style:null,options:[],column:null,multiple:!1,visible:!1}),r.remote?(0,_vue.nextTick)():s.updateData()},saveFilter(e){return e&&(e=(0,_util.handleFieldOrColumn)(s,e),s.handleFilterConfirmFilter(null,e)),(0,_vue.nextTick)()},saveFilterByEvent(e,t){return t&&(t=(0,_util.handleFieldOrColumn)(s,t),s.handleFilterConfirmFilter(e,t)),(0,_vue.nextTick)()},resetFilter(e){return e&&(e=(0,_util.handleFieldOrColumn)(s,e),s.handleFilterResetFilter(null,e)),(0,_vue.nextTick)()},resetFilterByEvent(e,t){return t&&(t=(0,_util.handleFieldOrColumn)(s,t),s.handleFilterResetFilter(e,t)),(0,_vue.nextTick)()},saveFilterPanel(){var e=x.filterStore;return s.handleFilterConfirmFilter(null,e.column||null),(0,_vue.nextTick)()},saveFilterPanelByEvent(e){var t=x.filterStore;return s.handleFilterConfirmFilter(e,t.column||null),(0,_vue.nextTick)()},resetFilterPanel(){var e=x.filterStore;return s.handleFilterResetFilter(null,e.column||null),(0,_vue.nextTick)()},resetFilterPanelByEvent(e){var t=x.filterStore;return s.handleFilterResetFilter(e,t.column||null),(0,_vue.nextTick)()},getCheckedFilters(){var e=k.tableFullColumn;let n=[];return e.forEach(e=>{var{field:t,filters:l}=e,l=l||[];let r=[],i=[];l&&(l.forEach(e=>{e.checked&&(r.push(e.value),i.push(e.data))}),r.length)&&n.push({column:e,field:t,property:t,values:r,datas:i})}),n},updateFilterOptionStatus(e,t){return e._checked=t,e.checked=t,(0,_vue.nextTick)()}}),l)},setupGrid(e){return e.extendTableMethods(tableFilterMethodKeys)},setupGantt(e){return e.extendTableMethods(tableFilterMethodKeys)}});
+var _vue=require("vue"),_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,hooks}=_ui.VxeUI,tableFilterMethodKeys=["openFilter","setFilter","clearFilter","saveFilter","saveFilterByEvent","saveFilterPanel","saveFilterPanelByEvent","resetFilter","resetFilterByEvent","resetFilterPanel","resetFilterPanelByEvent","getCheckedFilters","updateFilterOptionStatus"],sourceType="table";hooks.add("tableFilterModule",{setupTable(s){let a=s.xeGrid,u=s.xeGantt,x=a||u,{props:h,reactData:k,internalData:o}=s,{refElem:l,refTableFilter:r}=s.getRefMaps(),{computeFilterOpts:E,computeMouseOpts:f}=s.getComputeMaps(),d=()=>{let d=k.filterStore,c=o.elemStore,{column:s,targetEl:h}=d;if(!s)return(0,_vue.nextTick)();let f=l.value;let{maxHeight:v,transfer:m,zIndex:F}=E.value;var e=s?s.filterRender:null;let p=e&&(0,_utils.isEnableConf)(e)?renderer.get(e.name):null;if(!(0,_util.getRefElem)(c["main-header-scroll"]))return(0,_vue.nextTick)();e=r.value;let _=e?e.getRefMaps().refElem.value:null;if(!_)return(0,_vue.nextTick)();let C=_.querySelector(".vxe-table--filter-header"),g=_.querySelector(".vxe-table--filter-footer"),t=()=>{let e=h;if(h||(r=(r=(0,_util.getRefElem)(c[`${s.fixed||"main"}-header-wrapper`]||c["main-header-wrapper"]))?r.querySelector(".vxe-header--column."+s.id):null)&&(e=r),!e)return(0,_vue.nextTick)();var t,l,r=e.getBoundingClientRect(),i=f.getBoundingClientRect();let n=0,a=0,u=0,o={};o=m?(0,_dom.updatePanelPlacement)(e,_,{defaultPlacement:"bottom",isMinWidth:!1,teleportTo:m}).style:(t=_.offsetWidth,l=h?t/2:(t-s.renderWidth)/2,n=r.left-i.left-l,a=r.top-i.top+e.clientHeight,u=Math.max(40,f.clientHeight-a-(C?C.clientHeight:0)-(g?g.clientHeight:0)-14),n<1?n=1:n>f.clientWidth-t-1&&(n=f.clientWidth-t-1),x&&(l=x.getRefMaps().refElem.value)&&(r=l.getBoundingClientRect(),a+=i.top-r.top),{top:(0,_dom.toCssUnit)(a),left:(0,_dom.toCssUnit)(n)}),F&&(o.zIndex=F),d.style=o,p&&!p.tableFilterAutoHeight?u=0:v&&(u=v>u?u:v),d.maxHeight=u};return t(),(0,_vue.nextTick)().then(()=>{t()})};var e={checkFilterOptions(){var e=k.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,r,i){var{initStore:n,filterStore:a}=k;a.column===r&&a.visible?a.visible=!1:(s.handleFilterOptions(r),o._currFilterParams=i,a.targetEl=t,a.style=null,a.visible=!0,n.filter=!0),(0,_vue.nextTick)().then(()=>{d()}),s.dispatchEvent("filter-visible",{column:r,field:r.field,property:r.field,filterList:s.getCheckedFilters(),visible:a.visible},e)},triggerFilterEvent(e,t,l){var r=o.elemStore,i=t.fixed,i=(0,_util.getRefElem)(r[`${i||"main"}-header-wrapper`]||r["main-header-wrapper"]),r=e.currentTarget,i=i?i.querySelector(".vxe-header--column."+t.id):null;s.handleOpenFilterColumn(e,r,i||r,t,l)},handleClearFilter(e){if(e){var{filters:l,filterRender:r}=e;if(l){r=(0,_utils.isEnableConf)(r)?renderer.get(r.name):null;let t=e.filterResetMethod||(r?r.tableFilterResetMethod||r.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:s})}}},handleColumnConfirmFilter(e,t){var l=h.mouseConfig;let{scrollXLoad:r,scrollYLoad:i}=k;var n=E.value,a=f.value,{field:u,filters:o}=e;let d=[],c=[];(o||[]).forEach(e=>{e.checked&&(d.push(e.value),c.push(e.data))});o=s.getCheckedFilters(),e={$table:s,$event:t,column:e,field:u,property:u,values:d,datas:c,filters:o,filterList:o};return n.remote||(s.handleTableData(!0),s.checkSelectionStatus()),l&&a.area&&s.handleFilterEvent&&s.handleFilterEvent(t,e),t&&s.dispatchEvent("filter-change",e,t),s.closeFilter(),s.updateFooter().then(()=>{var{scrollXLoad:e,scrollYLoad:t}=k;if(r||e||i||t)return(r||e)&&s.updateScrollXSpace(),(i||t)&&s.updateScrollYSpace(),s.refreshScroll()}).then(()=>(s.updateCellAreas(),s.recalculate(!0))).then(()=>{setTimeout(()=>s.recalculate(),50)})},confirmFilterEvent(e,t){t&&s.handleColumnConfirmFilter(t,e)},handleFilterChangeRadioOption(e,t,l){var r=k.filterStore,r=r.column;r&&((r.filters||[]).forEach(e=>{e._checked=!1}),l._checked=t,s.checkFilterOptions(),s.handleFilterConfirmFilter(e,r))},handleFilterChangeMultipleOption(e,t,l){l._checked=t,s.checkFilterOptions()},handleFilterChangeOption(e,t,l){var r=k.filterStore,i=o.fullColumnIdData;let n=r.column;n||(i=i[l._colId])&&(n=i.column,r.column=n),n&&(n.filterMultiple?s.handleFilterChangeMultipleOption(e,t,l):s.handleFilterChangeRadioOption(e,t,l))},handleFilterConfirmFilter(e,t){t&&((t.filters||[]).forEach(e=>{e.checked=e._checked}),s.confirmFilterEvent(e,t))},handleFilterResetFilter(e,t){t&&(s.handleClearFilter(t),s.confirmFilterEvent(e,t),e)&&s.dispatchEvent("clear-filter",{filterList:[]},e)},handleFilterStyle(){var e=k.filterStore;return(e.visible?d:(0,_vue.nextTick))()}};return Object.assign(Object.assign({},{openFilter(e){let n=(0,_util.handleFieldOrColumn)(s,e);if(n&&n.filters){let e=o.elemStore,{fixed:r,filters:i}=n;return s.scrollToColumn(n).then(()=>{var t=(0,_util.getRefElem)(e[`${r||"main"}-header-wrapper`]||e["main-header-wrapper"]);if(t){var l=t.querySelector(`.vxe-header--column.${n.id} .vxe-cell--filter`);if(l)(0,_dom.triggerEvent)(l,"click");else{l=t.querySelector(".vxe-header--column."+n.id);if(l){let e=null;i&&(e=i[0]);t={$table:s,$grid:a,$gantt:u,$rowIndex:-1,column:n,columnIndex:s.getColumnIndex(n),$columnIndex:s.getVMColumnIndex(n),_columnIndex:s.getVTColumnIndex(n),firstFilterOption:e,fixed:r,source:sourceType,type:"header"};s.handleOpenFilterColumn(new Event("click"),null,l,n,t)}}}})}return(0,_vue.nextTick)()},setFilter(e,t,l){var r=k.filterStore,e=(0,_util.handleFieldOrColumn)(s,e);if(e&&e.filters){if(e.filters=(0,_util.toFilters)(t||[],e.id),l)return s.handleColumnConfirmFilter(e,null);r.visible&&s.handleFilterOptions(e)}return(0,_vue.nextTick)()},clearFilter(e){var t=k.filterStore,l=o.tableFullColumn,r=E.value;let i;return e?(i=(0,_util.handleFieldOrColumn)(s,e))&&s.handleClearFilter(i):l.forEach(s.handleClearFilter),e&&i===t.column||Object.assign(t,{isAllSelected:!1,isIndeterminate:!1,style:null,options:[],column:null,multiple:!1,visible:!1}),r.remote?(0,_vue.nextTick)():s.updateData()},saveFilter(e){return e&&(e=(0,_util.handleFieldOrColumn)(s,e),s.handleFilterConfirmFilter(null,e)),(0,_vue.nextTick)()},saveFilterByEvent(e,t){return t&&(t=(0,_util.handleFieldOrColumn)(s,t),s.handleFilterConfirmFilter(e,t)),(0,_vue.nextTick)()},resetFilter(e){return e&&(e=(0,_util.handleFieldOrColumn)(s,e),s.handleFilterResetFilter(null,e)),(0,_vue.nextTick)()},resetFilterByEvent(e,t){return t&&(t=(0,_util.handleFieldOrColumn)(s,t),s.handleFilterResetFilter(e,t)),(0,_vue.nextTick)()},saveFilterPanel(){var e=k.filterStore;return s.handleFilterConfirmFilter(null,e.column||null),(0,_vue.nextTick)()},saveFilterPanelByEvent(e){var t=k.filterStore;return s.handleFilterConfirmFilter(e,t.column||null),(0,_vue.nextTick)()},resetFilterPanel(){var e=k.filterStore;return s.handleFilterResetFilter(null,e.column||null),(0,_vue.nextTick)()},resetFilterPanelByEvent(e){var t=k.filterStore;return s.handleFilterResetFilter(e,t.column||null),(0,_vue.nextTick)()},getCheckedFilters(){var e=o.tableFullColumn;let n=[];return e.forEach(e=>{var{field:t,filters:l}=e,l=l||[];let r=[],i=[];l&&(l.forEach(e=>{e.checked&&(r.push(e.value),i.push(e.data))}),r.length)&&n.push({column:e,field:t,property:t,values:r,datas:i})}),n},updateFilterOptionStatus(e,t){return e._checked=t,e.checked=t,(0,_vue.nextTick)()}}),e)},setupGrid(e){return e.extendTableMethods(tableFilterMethodKeys)},setupGantt(e){return e.extendTableMethods(tableFilterMethodKeys)}});

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

@@ -480,14 +480,12 @@ hooks.add('tableKeyboardModule', {
       // 处理当前列方向键移动
       moveCurrentColumn(isLeftArrow, isRightArrow, evnt) {
         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/hook.min.js

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

package/lib/table/src/body.js

@@ -168,7 +168,6 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         dragRow,
         overflowX,
         overflowY,
-        currentColumn,
         scrollXLoad,
         scrollYLoad,
         mergeBodyFlag,
@@ -177,7 +176,8 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         resizeWidthFlag,
         editStore,
         isAllOverflow,
-        validErrorMaps
+        validErrorMaps,
+        currColFlag
       } = tableReactData;
       const {
         fullAllDataRowIdData,
@@ -188,7 +188,8 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         mergeBodyList,
         scrollXStore,
         scrollYStore,
-        keepUpdateFieldMaps
+        keepUpdateFieldMaps,
+        currentCol
       } = tableInternalData;
       const cellOpts = computeCellOpts.value;
       const validOpts = computeValidOpts.value;
@@ -556,7 +557,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
           '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, _dom.getPropClass)(compCellClassName, cellParams), (0, _dom.getPropClass)(className, cellParams), (0, _dom.getPropClass)(allCellClassName, cellParams)],
         key: columnKey || scrollXLoad || scrollYLoad || columnOpts.useKey || rowOpts.useKey || columnOpts.drag ? colid : $columnIndex
       }, tdAttrs), {

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

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

package/lib/table/src/footer.js

@@ -83,14 +83,15 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         scrollXLoad,
         scrollYLoad,
         overflowX,
-        currentColumn,
-        mergeFootFlag
+        mergeFootFlag,
+        currColFlag
       } = tableReactData;
       const {
         fullColumnIdData,
         mergeFooterList,
         mergeFooterCellMaps,
-        scrollXStore
+        scrollXStore,
+        currentCol
       } = tableInternalData;
       const virtualXOpts = computeVirtualXOpts.value;
       const footerTooltipOpts = computeFooterTooltipOpts.value;
@@ -243,7 +244,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
             'is--pg-left': isCellPaddingLeft,
             'is--pg-right': isCellPaddingRight,
             'col--ellipsis': hasEllipsis,
-            'col--current': currentColumn === column
+            'col--current': currColFlag && currentCol === column
           }, (0, _dom.getPropClass)(footerClassName, cellParams), (0, _dom.getPropClass)(footerCellClassName, cellParams)]
         }, attrs), {
           style: footerCellStyle ? _xeUtils.default.isFunction(footerCellStyle) ? footerCellStyle(cellParams) : footerCellStyle : null

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

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

package/lib/table/src/header.js

@@ -105,19 +105,20 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         mouseConfig
       } = tableProps;
       const {
-        currentColumn,
         dragCol,
         scrollXLoad,
         scrollYLoad,
         overflowX,
         mergeHeadFlag,
-        tableColumn
+        tableColumn,
+        currColFlag
       } = tableReactData;
       const {
         fullColumnIdData,
         scrollXStore,
         mergeHeaderList,
-        mergeHeaderCellMaps
+        mergeHeaderCellMaps,
+        currentCol
       } = tableInternalData;
       const virtualXOpts = computeVirtualXOpts.value;
       const columnOpts = computeColumnOpts.value;
@@ -285,7 +286,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
             '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
           }, headerClassName ? _xeUtils.default.isFunction(headerClassName) ? headerClassName(cellParams) : headerClassName : '', headerCellClassName ? _xeUtils.default.isFunction(headerCellClassName) ? headerCellClassName(cellParams) : headerCellClassName : ''],
           style: headerCellStyle ? _xeUtils.default.isFunction(headerCellStyle) ? headerCellStyle(cellParams) : headerCellStyle : null
         }, thAttrs), thOns), {
@@ -323,11 +324,12 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
         align: allAlign
       } = tableProps;
       const {
-        currentColumn,
-        overflowX
+        overflowX,
+        currColFlag
       } = tableReactData;
       const {
-        fullColumnIdData
+        fullColumnIdData,
+        currentCol
       } = tableInternalData;
       const headerTooltipOpts = computeHeaderTooltipOpts.value;
       const cellOpts = computeCellOpts.value;
@@ -410,7 +412,7 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
             'fixed--width': !isAutoCellWidth,
             'is--padding': isPadding,
             'is--sortable': column.sortable,
-            'col--current': currentColumn === column
+            'col--current': currColFlag && currentCol === column
           }],
           key: colid
         }, thAttrs), [(0, _vue.h)('div', {

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

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