vxe-table 3.10.6 → 3.10.8

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

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _ui=require("../../../ui"),_utils=require("../../../ui/src/utils"),_dom=require("../../../ui/src/dom"),_log=require("../../../ui/src/log"),_xeUtils=_interopRequireDefault(require("xe-utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getI18n,getIcon,renderEmptyElement}=_ui.VxeUI;function updateDropHint(e,t){var o,e=e.$refs,l=e.dragHintElemRef,e=e.bodyElemRef;e&&l&&(o=(e=e.parentNode).getBoundingClientRect(),l.style.display="block",l.style.top=Math.min(e.clientHeight-e.scrollTop-l.clientHeight,t.clientY-o.y)+"px",l.style.left=Math.min(e.clientWidth-e.scrollLeft-l.clientWidth-16,t.clientX-o.x)+"px")}let renderSimplePanel=(d,u)=>{let m=_ui.VxeUI.getComponent("VxeButton");var e=u.$xeTable;let{_e:p,customStore:t,dragColumn:o}=u,{customColumnList:l,customOpts:s,isMaxFixedColumn:v}=e;var i=t.maxHeight;let{checkMethod:x,visibleMethod:g,allowVisible:b,allowSort:h,allowFixed:C,trigger:a,placement:r}=s;var n=s.slots||{},c=n.header,E=n.top,f=n.bottom,_=n.default,n=n.footer;let I=[];var T={},O=("hover"===a&&(T.mouseenter=u.handleWrapperMouseenterEvent,T.mouseleave=u.handleWrapperMouseleaveEvent),t.isAll),k=t.isIndeterminate,y={$table:e,$grid:e.xegrid,columns:l,isAllChecked:O,isAllIndeterminate:k};return _xeUtils.default.eachTree(l,(t,e,o,l,s)=>{if(!g||g({column:t})){var i=t.renderVisible,a=t.halfVisible,r=t.children&&t.children.length,n=(0,_utils.formatText)(t.getTitle(),1);let e=!!x&&!x({column:t});var c=!i;I.push(d("li",{key:t.id,attrs:{colid:t.id},class:["vxe-table-custom--option","level--"+t.level,{"is--hidden":e||c,"is--group":r}],on:{dragstart:u.sortDragstartEvent,dragend:u.sortDragendEvent,dragover:u.sortDragoverEvent}},[b?d("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":i,"is--indeterminate":a,"is--disabled":e}],attrs:{title:getI18n("vxe.custom.setting.colVisible")},on:{click:()=>{e||u.changeCheckboxOption(t)}}},[d("span",{class:["vxe-checkbox--icon",a?getIcon().TABLE_CHECKBOX_INDETERMINATE:i?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]})]):p(),h&&1===t.level?d("div",{class:"vxe-table-custom--sort-option"},[d("span",{class:["vxe-table-custom--sort-btn",{"is--disabled":e||c}],attrs:{title:getI18n("vxe.custom.setting.sortHelpTip")},on:e||c?{}:{mousedown:u.sortMousedownEvent,mouseup:u.sortMouseupEvent}},[d("i",{class:getIcon().TABLE_CUSTOM_SORT})])]):p(),"html"===t.type?d("div",{key:"1",class:"vxe-table-custom--checkbox-label",domProps:{innerHTML:n}}):d("div",{key:"0",class:"vxe-table-custom--checkbox-label",attrs:{title:n}},n),!s&&C?d("div",{class:"vxe-table-custom--fixed-option"},[d(m,{props:{mode:"text",icon:"left"===t.renderFixed?getIcon().TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE:getIcon().TOOLBAR_TOOLS_FIXED_LEFT,status:"left"===t.renderFixed?"primary":"",disabled:e||c||v&&!t.renderFixed,title:getI18n("left"===t.renderFixed?"vxe.toolbar.cancelFixed":"vxe.toolbar.fixedLeft")},on:{click:()=>{u.changeFixedOption(t,"left")}}}),d(m,{props:{mode:"text",icon:"right"===t.renderFixed?getIcon().TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE:getIcon().TOOLBAR_TOOLS_FIXED_RIGHT,status:"right"===t.renderFixed?"primary":"",disabled:e||c||v&&!t.renderFixed,title:getI18n("right"===t.renderFixed?"vxe.toolbar.cancelFixed":"vxe.toolbar.fixedRight")},on:{click:()=>{u.changeFixedOption(t,"right")}}})]):p()]))}}),d("div",{key:"simple",class:["vxe-table-custom-wrapper","placement--"+r,{"is--active":t.visible}],style:i&&!["left","right"].includes(r)?{maxHeight:i+"px"}:{}},t.visible?[d("div",{class:"vxe-table-custom--header"},c?e.callSlot(c,y,d):[d("ul",{class:"vxe-table-custom--panel-list"},[d("li",{class:"vxe-table-custom--option"},[b?d("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":O,"is--indeterminate":k}],attrs:{title:getI18n("vxe.table.allTitle")},on:{click:u.allOptionEvent}},[d("span",{class:["vxe-checkbox--icon",k?getIcon().TABLE_CHECKBOX_INDETERMINATE:O?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]}),d("span",{class:"vxe-checkbox--label"},getI18n("vxe.toolbar.customAll"))]):d("span",{class:"vxe-checkbox--label"},getI18n("vxe.table.customTitle"))])])]),d("div",{ref:"bodyElemRef",class:"vxe-table-custom--body"},[E?d("div",{class:"vxe-table-custom--panel-top"},e.callSlot(E,y,d)):renderEmptyElement(e),_?d("div",{class:"vxe-table-custom--panel-body"},e.callSlot(_,y,d)):d("transition-group",{class:"vxe-table-custom--panel-list",props:{name:"vxe-table-custom--list",tag:"ul"},on:T},I),f?d("div",{class:"vxe-table-custom--panel-bottom"},e.callSlot(f,y,d)):renderEmptyElement(e),d("div",{ref:"dragHintElemRef",class:"vxe-table-custom-popup--drag-hint"},getI18n("vxe.custom.cstmDragTarget",[o&&"html"!==o.type?o.getTitle():""]))]),s.showFooter?d("div",{class:"vxe-table-custom--footer"},n?e.callSlot(n,y,d):[d("div",{class:"vxe-table-custom--footer-buttons"},[d(m,{props:{mode:"text",content:s.resetButtonText||getI18n("vxe.table.customRestore")},on:{click:u.resetCustomEvent}}),s.immediate?d(m,{props:{mode:"text",content:s.closeButtonText||getI18n("vxe.table.customClose")},on:{click:u.cancelCloseEvent}}):d(m,{props:{mode:"text",content:s.resetButtonText||getI18n("vxe.table.customCancel")},on:{click:u.cancelCustomEvent}}),s.immediate?p():d(m,{props:{mode:"text",status:"primary",content:s.confirmButtonText||getI18n("vxe.table.customConfirm")},on:{click:u.confirmCustomEvent}})])]):null]:[])},renderPopupPanel=(d,u)=>{var e=_ui.VxeUI.getComponent("VxeModal");let t=_ui.VxeUI.getComponent("VxeButton"),m=_ui.VxeUI.getComponent("VxeInput"),o=_ui.VxeUI.getComponent("VxeTooltip"),p=u,l=u.$xeTable,{_e:v,customStore:s}=u,{customOpts:i,customColumnList:a,columnOpts:r,isMaxFixedColumn:x}=l,{modalOptions:n,allowVisible:g,allowSort:b,allowFixed:h,allowResizable:C,checkMethod:E,visibleMethod:f}=i,c=r.maxFixedSize;var _=Object.assign({},n),I=i.slots||{};let T=I.header,O=I.top,k=I.bottom,y=I.default,V=I.footer,B=[],H=s.isAll,A=s.isIndeterminate,D={$table:l,$grid:l.xegrid,columns:a,isAllChecked:H,isAllIndeterminate:A};_xeUtils.default.eachTree(a,(t,e,o,l,s)=>{if(!f||f({column:t})){var i=t.renderVisible,a=t.halfVisible,r=(0,_utils.formatText)(t.getTitle(),1),n=t.children&&t.children.length;let e=!!E&&!E({column:t});var c=!i;B.push(d("tr",{key:t.id,attrs:{colid:t.id},class:["vxe-table-custom-popup--row level--"+t.level,{"is--group":n}],on:{dragstart:u.sortDragstartEvent,dragend:u.sortDragendEvent,dragover:u.sortDragoverEvent}},[g?d("td",{class:"vxe-table-custom-popup--column-item col--visible"},[d("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":i,"is--indeterminate":a,"is--disabled":e}],attrs:{title:getI18n("vxe.custom.setting.colVisible")},on:{click:()=>{e||u.changeCheckboxOption(t)}}},[d("span",{class:["vxe-checkbox--icon",a?getIcon().TABLE_CHECKBOX_INDETERMINATE:i?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]})])]):v(),b?d("td",{class:"vxe-table-custom-popup--column-item col--sort"},[1===t.level?d("span",{class:["vxe-table-custom-popup--column-sort-btn",{"is--disabled":e||c}],attrs:{title:getI18n("vxe.custom.setting.sortHelpTip")},on:e||c?{}:{mousedown:u.sortMousedownEvent,mouseup:u.sortMouseupEvent}},[d("i",{class:getIcon().TABLE_CUSTOM_SORT})]):d("span","-")]):v(),d("td",{class:"vxe-table-custom-popup--column-item col--name"},["html"===t.type?d("div",{key:"1",class:"vxe-table-custom-popup--name",domProps:{innerHTML:r}}):d("div",{key:"0",class:"vxe-table-custom-popup--name",attrs:{title:r}},r)]),C?d("td",{class:"vxe-table-custom-popup--column-item col--resizable"},[t.children&&t.children.length?d("span","-"):m?d(m,{props:{type:"integer",disabled:e||c,value:t.renderResizeWidth},on:{modelValue(e){t.renderResizeWidth=Math.max(0,Number(e))}}}):renderEmptyElement(p)]):v(),h?d("td",{class:"vxe-table-custom-popup--column-item col--fixed"},[s?d("span","-"):d("vxe-radio-group",{props:{value:t.renderFixed||"",type:"button",size:"mini",disabled:e||c,options:[{label:getI18n("vxe.custom.setting.fixedLeft"),value:"left",disabled:e||c||x},{label:getI18n("vxe.custom.setting.fixedUnset"),value:"",disabled:e||c},{label:getI18n("vxe.custom.setting.fixedRight"),value:"right",disabled:e||c||x}]},on:{input(e){t.renderFixed=e}}})]):v()]))}});I={default:()=>y?l.callSlot(y,D,d):d("div",{ref:"bodyElemRef",class:"vxe-table-custom-popup--body"},[O?d("div",{class:"vxe-table-custom-popup--table-top"},l.callSlot(O,D,d)):renderEmptyElement(l),d("div",{class:"vxe-table-custom-popup--table-wrapper"},[d("table",{},[d("colgroup",{},[g?d("col",{class:"vxe-table-custom-popup--table-col-seq"}):v(),b?d("col",{class:"vxe-table-custom-popup--table-col-sort"}):v(),d("col",{class:"vxe-table-custom-popup--table-col-title"}),C?d("col",{class:"vxe-table-custom-popup--table-col-width"}):v(),h?d("col",{class:"vxe-table-custom-popup--table-col-fixed"}):v()]),d("thead",{},[d("tr",{},[g?d("th",{},[d("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":H,"is--indeterminate":A}],attrs:{title:getI18n("vxe.table.allTitle")},on:{click:u.allOptionEvent}},[d("span",{class:["vxe-checkbox--icon",A?getIcon().TABLE_CHECKBOX_INDETERMINATE:H?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]}),d("span",{class:"vxe-checkbox--label"},getI18n("vxe.toolbar.customAll"))])]):v(),b?d("th",{},[d("span",{class:"vxe-table-custom-popup--table-sort-help-title"},getI18n("vxe.custom.setting.colSort")),o?d(o,{props:{enterable:!0,content:getI18n("vxe.custom.setting.sortHelpTip"),popupClassName:"vxe-table--ignore-clear"},scopedSlots:{default:()=>d("i",{class:"vxe-table-custom-popup--table-sort-help-icon vxe-icon-question-circle-fill"})}}):renderEmptyElement(p)]):v(),d("th",{},getI18n("vxe.custom.setting.colTitle")),C?d("th",{},getI18n("vxe.custom.setting.colResizable")):v(),h?d("th",{},getI18n("vxe.custom.setting."+(c?"colFixedMax":"colFixed"),[c])):v()])]),d("transition-group",{class:"vxe-table-custom--panel-list",props:{tag:"tbody",name:"vxe-table-custom--list"}},B)])]),k?d("div",{class:"vxe-table-custom-popup--table-bottom"},l.callSlot(k,D,d)):renderEmptyElement(l),d("div",{ref:"dragHintElemRef",class:"vxe-table-custom-popup--drag-hint"},getI18n("vxe.custom.cstmDragTarget",[u.dragColumn?u.dragColumn.getTitle():""]))]),footer:()=>V?l.callSlot(V,D,d):d("div",{class:"vxe-table-custom-popup--footer"},[d(t,{props:{content:i.resetButtonText||getI18n("vxe.custom.cstmRestore")},on:{click:u.resetCustomEvent}}),d(t,{props:{content:i.resetButtonText||getI18n("vxe.custom.cstmCancel")},on:{click:u.cancelCustomEvent}}),d(t,{props:{status:"primary",content:i.confirmButtonText||getI18n("vxe.custom.cstmConfirm")},on:{click:u.confirmCustomEvent}})])};return T&&(I.header=()=>l.callSlot(T,D,d)),e?d(e,{key:"modal",props:{className:["vxe-table-custom-popup-wrapper","vxe-table--ignore-clear",_.className||""].join(" "),value:s.visible,title:_.title||getI18n("vxe.custom.cstmTitle"),width:_.width||Math.min(880,document.documentElement.clientWidth),minWidth:_.minWidth||700,height:_.height||Math.min(680,document.documentElement.clientHeight),minHeight:_.minHeight||400,showZoom:_.showZoom,showMaximize:_.showMaximize,showMinimize:_.showMinimize,mask:_.mask,lockView:_.lockView,resize:_.resize,escClosable:!!_.escClosable,destroyOnClose:!0,showFooter:!0},on:{input(e){s.visible=e}},scopedSlots:I}):renderEmptyElement(p)};var _default=exports.default={name:"VxeTableCustomPanel",props:{customStore:{type:Object,default:()=>({})}},inject:{$xeTable:{default:null},$xetable:{default:null}},data(){return{dragColumn:null}},computed:{},created(){if("development"===process.env.NODE_ENV){let t=_ui.VxeUI.getComponent("VxeModal"),o=_ui.VxeUI.getComponent("VxeDrawer"),l=_ui.VxeUI.getComponent("VxeButton"),s=_ui.VxeUI.getComponent("VxeInput"),i=_ui.VxeUI.getComponent("VxeTooltip"),a=_ui.VxeUI.getComponent("VxeRadioGroup");this.$nextTick(()=>{var e=this.$xetable,e=e.customOpts,e=e.mode;t||(0,_log.errLog)("vxe.error.reqComp",["vxe-modal"]),o||"drawer"!==e||(0,_log.errLog)("vxe.error.reqComp",["vxe-drawer"]),l||(0,_log.errLog)("vxe.error.reqComp",["vxe-button"]),s||(0,_log.errLog)("vxe.error.reqComp",["vxe-input"]),i||(0,_log.errLog)("vxe.error.reqComp",["vxe-tooltip"]),a||(0,_log.errLog)("vxe.error.reqComp",["vxe-radio-group"])})}},render(e){var t=this.$xetable,t=t.customOpts;return(["modal","popup"].includes(""+t.mode)?renderPopupPanel:renderSimplePanel)(e,this)},methods:{handleWrapperMouseenterEvent(e){var{$xetable:t,customStore:o}=this;o.activeWrapper=!0,t.customOpenEvent(e)},handleWrapperMouseleaveEvent(e){let{$xetable:t,customStore:o}=this;o.activeWrapper=!1,setTimeout(()=>{o.activeBtn||o.activeWrapper||t.customCloseEvent(e)},300)},getStoreData(){return{}},confirmCustomEvent({$event:e}){var t=this.$xeTable;t.saveCustom(),t.closeCustom(),t.emitCustomEvent("confirm",e)},cancelCloseEvent({$event:e}){var t=this.$xeTable;t.closeCustom(),t.emitCustomEvent("close",e)},cancelCustomEvent({$event:e}){var t=this.$xeTable;t.cancelCustom(),t.closeCustom(),t.emitCustomEvent("cancel",e)},handleResetCustomEvent(e){var t=this.$xetable;t.resetCustom(!0),t.closeCustom(),t.emitCustomEvent("reset",e)},resetCustomEvent(t){_ui.VxeUI.modal?_ui.VxeUI.modal.confirm({content:getI18n("vxe.custom.cstmConfirmRestore"),className:"vxe-table--ignore-clear",escClosable:!0}).then(e=>{"confirm"===e&&this.handleResetCustomEvent(t)}):this.handleResetCustomEvent(t)},resetPopupCustomEvent(t){_ui.VxeUI.modal?_ui.VxeUI.modal.confirm({content:getI18n("vxe.custom.cstmConfirmRestore"),className:"vxe-table--ignore-clear",escClosable:!0}).then(e=>{"confirm"===e&&this.resetCustomEvent(t)}):this.resetCustomEvent(t)},handleOptionCheck(t){var e=this.$xetable,e=e.customColumnList,e=_xeUtils.default.findTree(e,e=>e===t);e&&e.parent&&(e=e.parent,e.children)&&e.children.length&&(e.visible=e.children.every(e=>e.visible),e.halfVisible=!e.visible&&e.children.some(e=>e.visible||e.halfVisible),this.handleOptionCheck(e))},changeCheckboxOption(e){var t=this.$xetable,o=t.customOpts;let l=!e.renderVisible;o.immediate?(_xeUtils.default.eachTree([e],e=>{e.visible=l,e.renderVisible=l,e.halfVisible=!1}),t.handleCustom(),t.saveCustomStore("update:visible")):_xeUtils.default.eachTree([e],e=>{e.renderVisible=l,e.halfVisible=!1}),this.handleOptionCheck(e),t.checkCustomStatus()},changeFixedOption(e,t){var o=this.$xetable,{isMaxFixedColumn:l,customOpts:s}=o;s.immediate?(e.renderFixed===t?_xeUtils.default.eachTree([e],e=>{e.fixed="",e.renderFixed=""}):l&&!e.renderFixed||_xeUtils.default.eachTree([e],e=>{e.fixed=t,e.renderFixed=t}),o.handleCustom(),o.saveCustomStore("update:fixed")):e.renderFixed===t?_xeUtils.default.eachTree([e],e=>{e.renderFixed=""}):l&&!e.renderFixed||_xeUtils.default.eachTree([e],e=>{e.renderFixed=t})},allOptionEvent(){var e=this.$xetable;e.toggleCustomAllCheckbox()},sortMousedownEvent(e){var t=this.$xetable,o=e.currentTarget.parentNode.parentNode,l=o.getAttribute("colid"),t=t.getColumnById(l);o.draggable=!0,this.dragColumn=t,(0,_dom.addClass)(o,"active--drag-origin"),updateDropHint(this,e)},sortMouseupEvent(e){var e=e.currentTarget.parentNode.parentNode,t=this.$refs.dragHintElemRef;e.draggable=!1,(this.dragColumn=null,_dom.removeClass)(e,"active--drag-origin"),t&&(t.style.display="")},sortDragstartEvent(e){var t=new Image;e.dataTransfer&&e.dataTransfer.setDragImage(t,0,0)},sortDragendEvent(e){var{$xetable:l,prevDropTrEl:s}=this,{customColumnList:i,customOpts:t}=l,e=e.currentTarget,o=this.$refs.dragHintElemRef;if(s){if(s!==e){var a=s.getAttribute("drag-pos"),r=e.getAttribute("colid");let t=l.getColumnById(r);if(!t)return;var r=_xeUtils.default.findIndexOf(i,e=>e.id===t.id),n=s.getAttribute("colid");let o=l.getColumnById(n);if(!o)return;i.splice(r,1);n=_xeUtils.default.findIndexOf(i,e=>e.id===o.id);i.splice(n+("bottom"===a?1:0),0,t)}s.draggable=!1,s.removeAttribute("drag-pos"),(0,_dom.removeClass)(s,"active--drag-target")}this.dragColumn=null,e.draggable=!1,e.removeAttribute("drag-pos"),o&&(o.style.display=""),(0,_dom.removeClass)(e,"active--drag-target"),(0,_dom.removeClass)(e,"active--drag-origin"),t.immediate&&(_xeUtils.default.eachTree(i,(e,t,o,l,s)=>{s||(e.renderSortNumber=t+1)}),l.handleCustom(),l.saveCustomStore("update:sort"))},sortDragoverEvent(e){var{$xetable:t,prevDropTrEl:o}=this,l=e.currentTarget,o=(o!==l&&(0,_dom.removeClass)(o,"active--drag-target"),l.getAttribute("colid")),t=t.getColumnById(o);t&&1===t.level&&(e.preventDefault(),o=e.clientY-l.getBoundingClientRect().y<l.clientHeight/2?"top":"bottom",(0,_dom.addClass)(l,"active--drag-target"),l.setAttribute("drag-pos",o),this.prevDropTrEl=l),updateDropHint(this,e)}}};
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _ui=require("../../../ui"),_utils=require("../../../ui/src/utils"),_dom=require("../../../ui/src/dom"),_log=require("../../../ui/src/log"),_xeUtils=_interopRequireDefault(require("xe-utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getI18n,getIcon,renderEmptyElement}=_ui.VxeUI;function updateDropHint(e,t){var o,e=e.$refs,l=e.dragHintElemRef,e=e.bodyElemRef;e&&l&&(o=(e=e.parentNode).getBoundingClientRect(),l.style.display="block",l.style.top=Math.min(e.clientHeight-e.scrollTop-l.clientHeight,t.clientY-o.y)+"px",l.style.left=Math.min(e.clientWidth-e.scrollLeft-l.clientWidth-16,t.clientX-o.x)+"px")}let renderSimplePanel=(d,u)=>{let m=_ui.VxeUI.getComponent("VxeButton");var e=u.$xeTable;let{_e:p,customStore:t,dragColumn:o}=u,{customColumnList:l,customOpts:s,isMaxFixedColumn:v}=e;var i=t.maxHeight;let{checkMethod:x,visibleMethod:g,allowVisible:b,allowSort:h,allowFixed:C,trigger:a,placement:n}=s;var r=s.slots||{},c=r.header,E=r.top,f=r.bottom,_=r.default,r=r.footer;let I=[];var T={},O=("hover"===a&&(T.mouseenter=u.handleWrapperMouseenterEvent,T.mouseleave=u.handleWrapperMouseleaveEvent),t.isAll),k=t.isIndeterminate,y={$table:e,$grid:e.xegrid,columns:l,isAllChecked:O,isAllIndeterminate:k};return _xeUtils.default.eachTree(l,(t,e,o,l,s)=>{if(!g||g({column:t})){var i=t.renderVisible,a=t.halfVisible,n=t.children&&t.children.length,r=(0,_utils.formatText)(t.getTitle(),1);let e=!!x&&!x({column:t});var c=!i;I.push(d("li",{key:t.id,attrs:{colid:t.id},class:["vxe-table-custom--option","level--"+t.level,{"is--hidden":e||c,"is--group":n}],on:{dragstart:u.sortDragstartEvent,dragend:u.sortDragendEvent,dragover:u.sortDragoverEvent}},[b?d("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":i,"is--indeterminate":a,"is--disabled":e}],attrs:{title:getI18n("vxe.custom.setting.colVisible")},on:{click:()=>{e||u.changeCheckboxOption(t)}}},[d("span",{class:["vxe-checkbox--icon",a?getIcon().TABLE_CHECKBOX_INDETERMINATE:i?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]})]):p(),h&&1===t.level?d("div",{class:"vxe-table-custom--sort-option"},[d("span",{class:["vxe-table-custom--sort-btn",{"is--disabled":e||c}],attrs:{title:getI18n("vxe.custom.setting.sortHelpTip")},on:e||c?{}:{mousedown:u.sortMousedownEvent,mouseup:u.sortMouseupEvent}},[d("i",{class:getIcon().TABLE_CUSTOM_SORT})])]):p(),"html"===t.type?d("div",{key:"1",class:"vxe-table-custom--checkbox-label",domProps:{innerHTML:r}}):d("div",{key:"0",class:"vxe-table-custom--checkbox-label",attrs:{title:r}},r),!s&&C?d("div",{class:"vxe-table-custom--fixed-option"},[d(m,{props:{mode:"text",icon:"left"===t.renderFixed?getIcon().TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE:getIcon().TOOLBAR_TOOLS_FIXED_LEFT,status:"left"===t.renderFixed?"primary":"",disabled:e||c||v&&!t.renderFixed,title:getI18n("left"===t.renderFixed?"vxe.toolbar.cancelFixed":"vxe.toolbar.fixedLeft")},on:{click:()=>{u.changeFixedOption(t,"left")}}}),d(m,{props:{mode:"text",icon:"right"===t.renderFixed?getIcon().TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE:getIcon().TOOLBAR_TOOLS_FIXED_RIGHT,status:"right"===t.renderFixed?"primary":"",disabled:e||c||v&&!t.renderFixed,title:getI18n("right"===t.renderFixed?"vxe.toolbar.cancelFixed":"vxe.toolbar.fixedRight")},on:{click:()=>{u.changeFixedOption(t,"right")}}})]):p()]))}}),d("div",{key:"simple",class:["vxe-table-custom-wrapper","placement--"+n,{"is--active":t.visible}],style:i&&!["left","right"].includes(n)?{maxHeight:i+"px"}:{}},t.visible?[d("div",{class:"vxe-table-custom--header"},c?e.callSlot(c,y,d):[d("ul",{class:"vxe-table-custom--panel-list"},[d("li",{class:"vxe-table-custom--option"},[b?d("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":O,"is--indeterminate":k}],attrs:{title:getI18n("vxe.table.allTitle")},on:{click:u.allOptionEvent}},[d("span",{class:["vxe-checkbox--icon",k?getIcon().TABLE_CHECKBOX_INDETERMINATE:O?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]}),d("span",{class:"vxe-checkbox--label"},getI18n("vxe.toolbar.customAll"))]):d("span",{class:"vxe-checkbox--label"},getI18n("vxe.table.customTitle"))])])]),d("div",{ref:"bodyElemRef",class:"vxe-table-custom--body"},[E?d("div",{class:"vxe-table-custom--panel-top"},e.callSlot(E,y,d)):renderEmptyElement(e),_?d("div",{class:"vxe-table-custom--panel-body"},e.callSlot(_,y,d)):d("transition-group",{class:"vxe-table-custom--panel-list",props:{name:"vxe-table-custom--list",tag:"ul"},on:T},I),f?d("div",{class:"vxe-table-custom--panel-bottom"},e.callSlot(f,y,d)):renderEmptyElement(e),d("div",{ref:"dragHintElemRef",class:"vxe-table-custom-popup--drag-hint"},getI18n("vxe.custom.cstmDragTarget",[o&&"html"!==o.type?o.getTitle():""]))]),s.showFooter?d("div",{class:"vxe-table-custom--footer"},r?e.callSlot(r,y,d):[d("div",{class:"vxe-table-custom--footer-buttons"},[d(m,{props:{mode:"text",content:s.resetButtonText||getI18n("vxe.table.customRestore")},on:{click:u.resetCustomEvent}}),s.immediate?d(m,{props:{mode:"text",content:s.closeButtonText||getI18n("vxe.table.customClose")},on:{click:u.cancelCloseEvent}}):d(m,{props:{mode:"text",content:s.resetButtonText||getI18n("vxe.table.customCancel")},on:{click:u.cancelCustomEvent}}),s.immediate?p():d(m,{props:{mode:"text",status:"primary",content:s.confirmButtonText||getI18n("vxe.table.customConfirm")},on:{click:u.confirmCustomEvent}})])]):null]:[])},renderPopupPanel=(d,u)=>{var e=_ui.VxeUI.getComponent("VxeModal");let t=_ui.VxeUI.getComponent("VxeButton"),m=_ui.VxeUI.getComponent("VxeInput"),o=_ui.VxeUI.getComponent("VxeTooltip"),p=u,v=u.$xeTable,{_e:x,customStore:l}=u,{resizable:g,customOpts:s,customColumnList:i,columnOpts:b,isMaxFixedColumn:h}=v,{modalOptions:a,allowVisible:C,allowSort:E,allowFixed:f,allowResizable:_,checkMethod:I,visibleMethod:T}=s,n=b.maxFixedSize,{minWidth:O,maxWidth:k}=v.computeResizableOpts;var r=Object.assign({},a),c=s.slots||{};let y=c.header,V=c.top,B=c.bottom,H=c.default,A=c.footer,F=[],U=l.isAll,D=l.isIndeterminate,L={$table:v,$grid:v.xegrid,columns:i,isAllChecked:U,isAllIndeterminate:D};_xeUtils.default.eachTree(i,(l,s,e,t,i)=>{if(!T||T({column:l})){let e=0,t=0;_&&(s={$table:v,column:l,columnIndex:s,$columnIndex:s,$rowIndex:-1},O&&(e=_xeUtils.default.toNumber(_xeUtils.default.isFunction(O)?O(s):O)),k)&&(t=_xeUtils.default.toNumber(_xeUtils.default.isFunction(k)?k(s):k));var s=l.renderVisible,a=l.halfVisible,n=(0,_utils.formatText)(l.getTitle(),1),r=l.children&&l.children.length;let o=!!I&&!I({column:l});var c=!s;F.push(d("tr",{key:l.id,attrs:{colid:l.id},class:["vxe-table-custom-popup--row level--"+l.level,{"is--group":r}],on:{dragstart:u.sortDragstartEvent,dragend:u.sortDragendEvent,dragover:u.sortDragoverEvent}},[C?d("td",{class:"vxe-table-custom-popup--column-item col--visible"},[d("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":s,"is--indeterminate":a,"is--disabled":o}],attrs:{title:getI18n("vxe.custom.setting.colVisible")},on:{click:()=>{o||u.changeCheckboxOption(l)}}},[d("span",{class:["vxe-checkbox--icon",a?getIcon().TABLE_CHECKBOX_INDETERMINATE:s?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]})])]):x(),E?d("td",{class:"vxe-table-custom-popup--column-item col--sort"},[1===l.level?d("span",{class:["vxe-table-custom-popup--column-sort-btn",{"is--disabled":o||c}],attrs:{title:getI18n("vxe.custom.setting.sortHelpTip")},on:o||c?{}:{mousedown:u.sortMousedownEvent,mouseup:u.sortMouseupEvent}},[d("i",{class:getIcon().TABLE_CUSTOM_SORT})]):d("span","-")]):x(),d("td",{class:"vxe-table-custom-popup--column-item col--name"},["html"===l.type?d("div",{key:"1",class:"vxe-table-custom-popup--name",domProps:{innerHTML:n}}):d("div",{key:"0",class:"vxe-table-custom-popup--name",attrs:{title:n}},n)]),_?d("td",{class:"vxe-table-custom-popup--column-item col--resizable"},[l.children&&l.children.length||!(_xeUtils.default.isBoolean(l.resizable)?l.resizable:b.resizable||g)?d("span","-"):m?d(m,{props:{type:"integer",disabled:o||c,value:l.renderResizeWidth,min:e||void 0,max:t||void 0},on:{modelValue(e){l.renderResizeWidth=Math.max(0,Number(e))}}}):renderEmptyElement(p)]):x(),f?d("td",{class:"vxe-table-custom-popup--column-item col--fixed"},[i?d("span","-"):d("vxe-radio-group",{props:{value:l.renderFixed||"",type:"button",size:"mini",disabled:o||c,options:[{label:getI18n("vxe.custom.setting.fixedLeft"),value:"left",disabled:o||c||h},{label:getI18n("vxe.custom.setting.fixedUnset"),value:"",disabled:o||c},{label:getI18n("vxe.custom.setting.fixedRight"),value:"right",disabled:o||c||h}]},on:{input(e){l.renderFixed=e}}})]):x()]))}});c={default:()=>H?v.callSlot(H,L,d):d("div",{ref:"bodyElemRef",class:"vxe-table-custom-popup--body"},[V?d("div",{class:"vxe-table-custom-popup--table-top"},v.callSlot(V,L,d)):renderEmptyElement(v),d("div",{class:"vxe-table-custom-popup--table-wrapper"},[d("table",{},[d("colgroup",{},[C?d("col",{class:"vxe-table-custom-popup--table-col-seq"}):x(),E?d("col",{class:"vxe-table-custom-popup--table-col-sort"}):x(),d("col",{class:"vxe-table-custom-popup--table-col-title"}),_?d("col",{class:"vxe-table-custom-popup--table-col-width"}):x(),f?d("col",{class:"vxe-table-custom-popup--table-col-fixed"}):x()]),d("thead",{},[d("tr",{},[C?d("th",{},[d("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":U,"is--indeterminate":D}],attrs:{title:getI18n("vxe.table.allTitle")},on:{click:u.allOptionEvent}},[d("span",{class:["vxe-checkbox--icon",D?getIcon().TABLE_CHECKBOX_INDETERMINATE:U?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]}),d("span",{class:"vxe-checkbox--label"},getI18n("vxe.toolbar.customAll"))])]):x(),E?d("th",{},[d("span",{class:"vxe-table-custom-popup--table-sort-help-title"},getI18n("vxe.custom.setting.colSort")),o?d(o,{props:{enterable:!0,content:getI18n("vxe.custom.setting.sortHelpTip"),popupClassName:"vxe-table--ignore-clear"},scopedSlots:{default:()=>d("i",{class:"vxe-table-custom-popup--table-sort-help-icon vxe-icon-question-circle-fill"})}}):renderEmptyElement(p)]):x(),d("th",{},getI18n("vxe.custom.setting.colTitle")),_?d("th",{},getI18n("vxe.custom.setting.colResizable")):x(),f?d("th",{},getI18n("vxe.custom.setting."+(n?"colFixedMax":"colFixed"),[n])):x()])]),d("transition-group",{class:"vxe-table-custom--panel-list",props:{tag:"tbody",name:"vxe-table-custom--list"}},F)])]),B?d("div",{class:"vxe-table-custom-popup--table-bottom"},v.callSlot(B,L,d)):renderEmptyElement(v),d("div",{ref:"dragHintElemRef",class:"vxe-table-custom-popup--drag-hint"},getI18n("vxe.custom.cstmDragTarget",[u.dragColumn?u.dragColumn.getTitle():""]))]),footer:()=>A?v.callSlot(A,L,d):d("div",{class:"vxe-table-custom-popup--footer"},[d(t,{props:{content:s.resetButtonText||getI18n("vxe.custom.cstmRestore")},on:{click:u.resetCustomEvent}}),d(t,{props:{content:s.resetButtonText||getI18n("vxe.custom.cstmCancel")},on:{click:u.cancelCustomEvent}}),d(t,{props:{status:"primary",content:s.confirmButtonText||getI18n("vxe.custom.cstmConfirm")},on:{click:u.confirmCustomEvent}})])};return y&&(c.header=()=>v.callSlot(y,L,d)),e?d(e,{key:"modal",props:{className:["vxe-table-custom-popup-wrapper","vxe-table--ignore-clear",r.className||""].join(" "),value:l.visible,title:r.title||getI18n("vxe.custom.cstmTitle"),width:r.width||Math.min(880,document.documentElement.clientWidth),minWidth:r.minWidth||700,height:r.height||Math.min(680,document.documentElement.clientHeight),minHeight:r.minHeight||400,showZoom:r.showZoom,showMaximize:r.showMaximize,showMinimize:r.showMinimize,mask:r.mask,lockView:r.lockView,resize:r.resize,escClosable:!!r.escClosable,destroyOnClose:!0,showFooter:!0},on:{input(e){l.visible=e}},scopedSlots:c}):renderEmptyElement(p)};var _default=exports.default={name:"VxeTableCustomPanel",props:{customStore:{type:Object,default:()=>({})}},inject:{$xeTable:{default:null},$xetable:{default:null}},data(){return{dragColumn:null}},computed:{},created(){if("development"===process.env.NODE_ENV){let t=_ui.VxeUI.getComponent("VxeModal"),o=_ui.VxeUI.getComponent("VxeDrawer"),l=_ui.VxeUI.getComponent("VxeButton"),s=_ui.VxeUI.getComponent("VxeNumberInput"),i=_ui.VxeUI.getComponent("VxeTooltip"),a=_ui.VxeUI.getComponent("VxeRadioGroup");this.$nextTick(()=>{var e=this.$xetable,e=e.customOpts,e=e.mode;t||(0,_log.errLog)("vxe.error.reqComp",["vxe-modal"]),o||"drawer"!==e||(0,_log.errLog)("vxe.error.reqComp",["vxe-drawer"]),l||(0,_log.errLog)("vxe.error.reqComp",["vxe-button"]),s||(0,_log.errLog)("vxe.error.reqComp",["vxe-input"]),i||(0,_log.errLog)("vxe.error.reqComp",["vxe-tooltip"]),a||(0,_log.errLog)("vxe.error.reqComp",["vxe-radio-group"])})}},render(e){var t=this.$xetable,t=t.customOpts;return(["modal","popup"].includes(""+t.mode)?renderPopupPanel:renderSimplePanel)(e,this)},methods:{handleWrapperMouseenterEvent(e){var{$xetable:t,customStore:o}=this;o.activeWrapper=!0,t.customOpenEvent(e)},handleWrapperMouseleaveEvent(e){let{$xetable:t,customStore:o}=this;o.activeWrapper=!1,setTimeout(()=>{o.activeBtn||o.activeWrapper||t.customCloseEvent(e)},300)},getStoreData(){return{}},confirmCustomEvent({$event:e}){var t=this.$xeTable;t.saveCustom(),t.closeCustom(),t.emitCustomEvent("confirm",e)},cancelCloseEvent({$event:e}){var t=this.$xeTable;t.closeCustom(),t.emitCustomEvent("close",e)},cancelCustomEvent({$event:e}){var t=this.$xeTable;t.cancelCustom(),t.closeCustom(),t.emitCustomEvent("cancel",e)},handleResetCustomEvent(e){var t=this.$xetable;t.resetCustom(!0),t.closeCustom(),t.emitCustomEvent("reset",e)},resetCustomEvent(t){_ui.VxeUI.modal?_ui.VxeUI.modal.confirm({content:getI18n("vxe.custom.cstmConfirmRestore"),className:"vxe-table--ignore-clear",escClosable:!0}).then(e=>{"confirm"===e&&this.handleResetCustomEvent(t)}):this.handleResetCustomEvent(t)},resetPopupCustomEvent(t){_ui.VxeUI.modal?_ui.VxeUI.modal.confirm({content:getI18n("vxe.custom.cstmConfirmRestore"),className:"vxe-table--ignore-clear",escClosable:!0}).then(e=>{"confirm"===e&&this.resetCustomEvent(t)}):this.resetCustomEvent(t)},handleOptionCheck(t){var e=this.$xetable,e=e.customColumnList,e=_xeUtils.default.findTree(e,e=>e===t);e&&e.parent&&(e=e.parent,e.children)&&e.children.length&&(e.visible=e.children.every(e=>e.visible),e.halfVisible=!e.visible&&e.children.some(e=>e.visible||e.halfVisible),this.handleOptionCheck(e))},changeCheckboxOption(e){var t=this.$xetable,o=t.customOpts;let l=!e.renderVisible;o.immediate?(_xeUtils.default.eachTree([e],e=>{e.visible=l,e.renderVisible=l,e.halfVisible=!1}),t.handleCustom(),t.saveCustomStore("update:visible")):_xeUtils.default.eachTree([e],e=>{e.renderVisible=l,e.halfVisible=!1}),this.handleOptionCheck(e),t.checkCustomStatus()},changeFixedOption(e,t){var o=this.$xetable,{isMaxFixedColumn:l,customOpts:s}=o;s.immediate?(e.renderFixed===t?_xeUtils.default.eachTree([e],e=>{e.fixed="",e.renderFixed=""}):l&&!e.renderFixed||_xeUtils.default.eachTree([e],e=>{e.fixed=t,e.renderFixed=t}),o.handleCustom(),o.saveCustomStore("update:fixed")):e.renderFixed===t?_xeUtils.default.eachTree([e],e=>{e.renderFixed=""}):l&&!e.renderFixed||_xeUtils.default.eachTree([e],e=>{e.renderFixed=t})},allOptionEvent(){var e=this.$xetable;e.toggleCustomAllCheckbox()},sortMousedownEvent(e){var t=this.$xetable,o=e.currentTarget.parentNode.parentNode,l=o.getAttribute("colid"),t=t.getColumnById(l);o.draggable=!0,this.dragColumn=t,(0,_dom.addClass)(o,"active--drag-origin"),updateDropHint(this,e)},sortMouseupEvent(e){var e=e.currentTarget.parentNode.parentNode,t=this.$refs.dragHintElemRef;e.draggable=!1,(this.dragColumn=null,_dom.removeClass)(e,"active--drag-origin"),t&&(t.style.display="")},sortDragstartEvent(e){var t=new Image;e.dataTransfer&&e.dataTransfer.setDragImage(t,0,0)},sortDragendEvent(e){var{$xetable:l,prevDropTrEl:s}=this,{customColumnList:i,customOpts:t}=l,e=e.currentTarget,o=this.$refs.dragHintElemRef;if(s){if(s!==e){var a=s.getAttribute("drag-pos"),n=e.getAttribute("colid");let t=l.getColumnById(n);if(!t)return;var n=_xeUtils.default.findIndexOf(i,e=>e.id===t.id),r=s.getAttribute("colid");let o=l.getColumnById(r);if(!o)return;i.splice(n,1);r=_xeUtils.default.findIndexOf(i,e=>e.id===o.id);i.splice(r+("bottom"===a?1:0),0,t)}s.draggable=!1,s.removeAttribute("drag-pos"),(0,_dom.removeClass)(s,"active--drag-target")}this.dragColumn=null,e.draggable=!1,e.removeAttribute("drag-pos"),o&&(o.style.display=""),(0,_dom.removeClass)(e,"active--drag-target"),(0,_dom.removeClass)(e,"active--drag-origin"),t.immediate&&(_xeUtils.default.eachTree(i,(e,t,o,l,s)=>{s||(e.renderSortNumber=t+1)}),l.handleCustom(),l.saveCustomStore("update:sort"))},sortDragoverEvent(e){var{$xetable:t,prevDropTrEl:o}=this,l=e.currentTarget,o=(o!==l&&(0,_dom.removeClass)(o,"active--drag-target"),l.getAttribute("colid")),t=t.getColumnById(o);t&&1===t.level&&(e.preventDefault(),o=e.clientY-l.getBoundingClientRect().y<l.clientHeight/2?"top":"bottom",(0,_dom.addClass)(l,"active--drag-target"),l.setAttribute("drag-pos",o),this.prevDropTrEl=l),updateDropHint(this,e)}}};

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

@@ -129,7 +129,7 @@ var _default = exports.default = {
       } = this;
       if (validOpts.msgMode === 'single') {
         const keys = Object.keys(validErrMaps);
-        const resMaps = validErrMaps;
+        const resMaps = {};
         if (keys.length) {
           const firstKey = keys[0];
           resMaps[firstKey] = validErrMaps[firstKey];

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

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../../ui"),_utils=require("../../../ui/src/utils"),_dom=require("../../../ui/src/dom"),_util=require("../../src/util"),_log=require("../../../ui/src/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getConfig,validators}=_ui.VxeUI;class Rule{constructor(e){Object.defineProperty(this,"$options",{enumerable:!0,configurable:!0,writable:!0,value:void 0}),Object.assign(this,{$options:e,required:e.required,min:e.min,max:e.max,type:e.type,pattern:e.pattern,validator:e.validator,trigger:e.trigger,maxWidth:e.maxWidth})}get content(){return(0,_utils.getFuncText)(this.$options.content||this.$options.message)}get message(){return this.content}}function validErrorRuleValue(e,t){var{type:e,min:l,max:i,pattern:r}=e,e="number"===e,s=e?_xeUtils.default.toNumber(t):_xeUtils.default.getSize(t);return!(!e||!isNaN(t))||!_xeUtils.default.eqNull(l)&&s<_xeUtils.default.toNumber(l)||!_xeUtils.default.eqNull(i)&&s>_xeUtils.default.toNumber(i)||!(!r||(_xeUtils.default.isRegExp(r)?r:new RegExp(r)).test(t))}var _default=exports.default={methods:{_fullValidate(e,t){return"development"===process.env.NODE_ENV&&_xeUtils.default.isFunction(t)&&(0,_log.warnLog)("vxe.error.notValidators",["fullValidate(rows, callback)","fullValidate(rows)"]),this.beginValidate(e,t,!0)},_validate(e,t){return"development"===process.env.NODE_ENV&&_xeUtils.default.isFunction(t)&&(0,_log.warnLog)("vxe.error.notValidators",["validate(rows, callback)","validate(rows)"]),this.beginValidate(e,t)},handleValidError(t){let l=this.validOpts;return new Promise(e=>{!1===l.autoPos?(this.emitEvent("valid-error",t),e()):this.handleEdit(t,{type:"valid-error",trigger:"call"}).then(()=>{setTimeout(()=>{e(this.showValidTooltip(t))},10)})})},handleErrMsgMode(e){var t,l=this.validOpts;return"single"===l.msgMode?(l=e,(t=Object.keys(e)).length&&(l[t=t[0]]=e[t]),l):e},beginValidate(e,n,r){let d={},{editRules:s,afterFullData:h,visibleColumn:c,treeConfig:l,treeOpts:t}=this;var i=t.children||t.childrenField;let a,o=(!0===e?a=h:e&&(_xeUtils.default.isFunction(e)?n=e:a=_xeUtils.default.isArray(e)?e:[e]),a=a||this.getInsertRecords().concat(this.getUpdateRecords()),[]),u=(this.lastCallTime=Date.now(),this.validRuleErr=!1,this.clearValidate(),{});if(s){let t=this.getColumns();e=i=>{if(r||!this.validRuleErr){let e=[];t.forEach(l=>{!r&&this.validRuleErr||!_xeUtils.default.has(s,l.property)||e.push(this.validCellRules("all",i,l).catch(({rule:e,rules:t})=>{t={rule:e,rules:t,rowIndex:this.getRowIndex(i),row:i,columnIndex:this.getColumnIndex(l),column:l,field:l.property,$table:this};if(d[l.property]||(d[l.property]=[]),u[(0,_util.getRowid)(this,i)+":"+l.id]={column:l,row:i,rule:e,content:e.content},d[l.property].push(t),!r)return this.validRuleErr=!0,Promise.reject(t)}))}),o.push(Promise.all(e))}};return l?_xeUtils.default.eachTree(a,e,{children:i}):a.forEach(e),Promise.all(o).then(()=>{let e=Object.keys(d);return this.validErrorMaps=this.handleErrMsgMode(u),this.$nextTick().then(()=>{if(e.length)return Promise.reject(d[e[0]][0]);n&&n()})}).catch(u=>new Promise((e,t)=>{let l=()=>{this.$nextTick(()=>{n?(n(d),e()):("obsolete"===getConfig().validToReject?t:e)(d)})};var i,r,s,a,o=()=>{u.cell=this.getCellElement(u.row,u.column),(0,_dom.scrollToView)(u.cell),this.handleValidError(u).then(l)};!1===this.validOpts.autoPos?l():(a=u.row,i=u.column,s=h.indexOf(a),r=c.indexOf(i),s=0<s?h[s-1]:a,a=0<r?c[r-1]:i,this.scrollToRow(s,a).then(o))}))}return this.validErrorMaps={},this.$nextTick().then(()=>{n&&n()})},hasCellRules(t,e,l){var i=this.editRules,l=l.property;return!(!l||!i)&&(i=_xeUtils.default.get(i,l))&&_xeUtils.default.find(i,e=>"all"===t||!e.trigger||t===e.trigger)},validCellRules(e,d,h,t){var l=this.editRules,i=h.property;let c=[],g=[];if(i&&l){let n=_xeUtils.default.get(l,i);if(n){let u=_xeUtils.default.isUndefined(t)?_xeUtils.default.get(d,i):t;n.forEach(t=>{let{type:l,trigger:i,required:r,validator:s}=t;if("all"===e||!i||e===i)if(s){var a={cellValue:u,rule:t,rules:n,row:d,rowIndex:this.getRowIndex(d),column:h,columnIndex:this.getColumnIndex(h),field:h.property,$table:this};let e;_xeUtils.default.isString(s)?(o=validators.get(s))?(o=o.tableCellValidatorMethod||o.cellValidatorMethod)?e=o(a):"development"===process.env.NODE_ENV&&(0,_log.warnLog)("vxe.error.notValidators",[s]):"development"===process.env.NODE_ENV&&(0,_log.errLog)("vxe.error.notValidators",[s]):e=s(a),e&&(_xeUtils.default.isError(e)?(this.validRuleErr=!0,c.push(new Rule({type:"custom",trigger:i,content:e.message,rule:new Rule(t)}))):e.catch&&g.push(e.catch(e=>{this.validRuleErr=!0,c.push(new Rule({type:"custom",trigger:i,content:e&&e.message?e.message:t.content||t.message,rule:new Rule(t)}))})))}else{var o="array"===l,a=_xeUtils.default.isArray(u);let e=!0;e=o||a?!a||!u.length:_xeUtils.default.isString(u)?(0,_utils.eqEmptyValue)(u.trim()):(0,_utils.eqEmptyValue)(u),(r?e||validErrorRuleValue(t,u):!e&&validErrorRuleValue(t,u))&&(this.validRuleErr=!0,c.push(new Rule(t)))}})}}return Promise.all(g).then(()=>{var e;if(c.length)return e={rules:c,rule:c[0]},Promise.reject(e)})},_clearValidate(e,t){var{validOpts:l,validErrorMaps:i}=this,r=this.$refs.validTip,e=_xeUtils.default.isArray(e)?e:e?[e]:[];let s=_xeUtils.default.isArray(t)?t:(t?[t]:[]).map(e=>(0,_util.handleFieldOrColumn)(this,e)),a={};if(r&&r.visible&&r.close(),"single"===l.msgMode)this.validErrorMaps={};else{if(e.length&&s.length)a=Object.assign({},i),e.forEach(t=>{s.forEach(e=>{e=(0,_util.getRowid)(this,t)+":"+e.id;a[e]&&delete a[e]})});else if(e.length){let l=e.map(e=>""+(0,_util.getRowid)(this,e));_xeUtils.default.each(i,(e,t)=>{-1<l.indexOf(t.split(":")[0])&&(a[t]=e)})}else if(s.length){let l=s.map(e=>""+e.id);_xeUtils.default.each(i,(e,t)=>{-1<l.indexOf(t.split(":")[1])&&(a[t]=e)})}this.validErrorMaps=a}return this.$nextTick()},triggerValidate(r){let{editConfig:e,editStore:t,editRules:l,editOpts:s,validOpts:i}=this;var a=t.actived;if(l&&"single"===i.msgMode&&(this.validErrorMaps={}),e&&l&&a.row){let{row:t,column:l,cell:i}=a.args;if(this.hasCellRules(r,t,l))return this.validCellRules(r,t,l).then(()=>{"row"===s.mode&&this.clearValidate(t,l)}).catch(({rule:e})=>e.trigger&&r!==e.trigger?Promise.resolve():(e={rule:e,row:t,column:l,cell:i},this.showValidTooltip(e),Promise.reject(e)))}return Promise.resolve()},showValidTooltip(e){var{$refs:t,height:l,validStore:i,validErrorMaps:r,tableData:s,validOpts:a}=this,{rule:o,row:u,column:n,cell:d}=e,t=t.validTip,h=o.content;return i.visible=!0,"single"===a.msgMode?this.validErrorMaps={[(0,_util.getRowid)(this,u)+":"+n.id]:{column:n,row:u,rule:o,content:h}}:this.validErrorMaps=Object.assign({},r,{[(0,_util.getRowid)(this,u)+":"+n.id]:{column:n,row:u,rule:o,content:h}}),this.emitEvent("valid-error",e,null),t&&("tooltip"===a.message||"default"===a.message&&!l&&s.length<2)?t.open(d,h):this.$nextTick()}}};
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../../ui"),_utils=require("../../../ui/src/utils"),_dom=require("../../../ui/src/dom"),_util=require("../../src/util"),_log=require("../../../ui/src/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getConfig,validators}=_ui.VxeUI;class Rule{constructor(e){Object.defineProperty(this,"$options",{enumerable:!0,configurable:!0,writable:!0,value:void 0}),Object.assign(this,{$options:e,required:e.required,min:e.min,max:e.max,type:e.type,pattern:e.pattern,validator:e.validator,trigger:e.trigger,maxWidth:e.maxWidth})}get content(){return(0,_utils.getFuncText)(this.$options.content||this.$options.message)}get message(){return this.content}}function validErrorRuleValue(e,t){var{type:e,min:l,max:i,pattern:r}=e,e="number"===e,s=e?_xeUtils.default.toNumber(t):_xeUtils.default.getSize(t);return!(!e||!isNaN(t))||!_xeUtils.default.eqNull(l)&&s<_xeUtils.default.toNumber(l)||!_xeUtils.default.eqNull(i)&&s>_xeUtils.default.toNumber(i)||!(!r||(_xeUtils.default.isRegExp(r)?r:new RegExp(r)).test(t))}var _default=exports.default={methods:{_fullValidate(e,t){return"development"===process.env.NODE_ENV&&_xeUtils.default.isFunction(t)&&(0,_log.warnLog)("vxe.error.notValidators",["fullValidate(rows, callback)","fullValidate(rows)"]),this.beginValidate(e,t,!0)},_validate(e,t){return"development"===process.env.NODE_ENV&&_xeUtils.default.isFunction(t)&&(0,_log.warnLog)("vxe.error.notValidators",["validate(rows, callback)","validate(rows)"]),this.beginValidate(e,t)},handleValidError(t){let l=this.validOpts;return new Promise(e=>{!1===l.autoPos?(this.emitEvent("valid-error",t),e()):this.handleEdit(t,{type:"valid-error",trigger:"call"}).then(()=>{setTimeout(()=>{e(this.showValidTooltip(t))},10)})})},handleErrMsgMode(e){var t,l=this.validOpts;return"single"===l.msgMode?(l={},(t=Object.keys(e)).length&&(l[t=t[0]]=e[t]),l):e},beginValidate(e,n,r){let d={},{editRules:s,afterFullData:h,visibleColumn:c,treeConfig:l,treeOpts:t}=this;var i=t.children||t.childrenField;let a,o=(!0===e?a=h:e&&(_xeUtils.default.isFunction(e)?n=e:a=_xeUtils.default.isArray(e)?e:[e]),a=a||this.getInsertRecords().concat(this.getUpdateRecords()),[]),u=(this.lastCallTime=Date.now(),this.validRuleErr=!1,this.clearValidate(),{});if(s){let t=this.getColumns();e=i=>{if(r||!this.validRuleErr){let e=[];t.forEach(l=>{!r&&this.validRuleErr||!_xeUtils.default.has(s,l.property)||e.push(this.validCellRules("all",i,l).catch(({rule:e,rules:t})=>{t={rule:e,rules:t,rowIndex:this.getRowIndex(i),row:i,columnIndex:this.getColumnIndex(l),column:l,field:l.property,$table:this};if(d[l.property]||(d[l.property]=[]),u[(0,_util.getRowid)(this,i)+":"+l.id]={column:l,row:i,rule:e,content:e.content},d[l.property].push(t),!r)return this.validRuleErr=!0,Promise.reject(t)}))}),o.push(Promise.all(e))}};return l?_xeUtils.default.eachTree(a,e,{children:i}):a.forEach(e),Promise.all(o).then(()=>{let e=Object.keys(d);return this.validErrorMaps=this.handleErrMsgMode(u),this.$nextTick().then(()=>{if(e.length)return Promise.reject(d[e[0]][0]);n&&n()})}).catch(u=>new Promise((e,t)=>{let l=()=>{this.$nextTick(()=>{n?(n(d),e()):("obsolete"===getConfig().validToReject?t:e)(d)})};var i,r,s,a,o=()=>{u.cell=this.getCellElement(u.row,u.column),(0,_dom.scrollToView)(u.cell),this.handleValidError(u).then(l)};!1===this.validOpts.autoPos?l():(a=u.row,i=u.column,s=h.indexOf(a),r=c.indexOf(i),s=0<s?h[s-1]:a,a=0<r?c[r-1]:i,this.scrollToRow(s,a).then(o))}))}return this.validErrorMaps={},this.$nextTick().then(()=>{n&&n()})},hasCellRules(t,e,l){var i=this.editRules,l=l.property;return!(!l||!i)&&(i=_xeUtils.default.get(i,l))&&_xeUtils.default.find(i,e=>"all"===t||!e.trigger||t===e.trigger)},validCellRules(e,d,h,t){var l=this.editRules,i=h.property;let c=[],g=[];if(i&&l){let n=_xeUtils.default.get(l,i);if(n){let u=_xeUtils.default.isUndefined(t)?_xeUtils.default.get(d,i):t;n.forEach(t=>{let{type:l,trigger:i,required:r,validator:s}=t;if("all"===e||!i||e===i)if(s){var a={cellValue:u,rule:t,rules:n,row:d,rowIndex:this.getRowIndex(d),column:h,columnIndex:this.getColumnIndex(h),field:h.property,$table:this};let e;_xeUtils.default.isString(s)?(o=validators.get(s))?(o=o.tableCellValidatorMethod||o.cellValidatorMethod)?e=o(a):"development"===process.env.NODE_ENV&&(0,_log.warnLog)("vxe.error.notValidators",[s]):"development"===process.env.NODE_ENV&&(0,_log.errLog)("vxe.error.notValidators",[s]):e=s(a),e&&(_xeUtils.default.isError(e)?(this.validRuleErr=!0,c.push(new Rule({type:"custom",trigger:i,content:e.message,rule:new Rule(t)}))):e.catch&&g.push(e.catch(e=>{this.validRuleErr=!0,c.push(new Rule({type:"custom",trigger:i,content:e&&e.message?e.message:t.content||t.message,rule:new Rule(t)}))})))}else{var o="array"===l,a=_xeUtils.default.isArray(u);let e=!0;e=o||a?!a||!u.length:_xeUtils.default.isString(u)?(0,_utils.eqEmptyValue)(u.trim()):(0,_utils.eqEmptyValue)(u),(r?e||validErrorRuleValue(t,u):!e&&validErrorRuleValue(t,u))&&(this.validRuleErr=!0,c.push(new Rule(t)))}})}}return Promise.all(g).then(()=>{var e;if(c.length)return e={rules:c,rule:c[0]},Promise.reject(e)})},_clearValidate(e,t){var{validOpts:l,validErrorMaps:i}=this,r=this.$refs.validTip,e=_xeUtils.default.isArray(e)?e:e?[e]:[];let s=_xeUtils.default.isArray(t)?t:(t?[t]:[]).map(e=>(0,_util.handleFieldOrColumn)(this,e)),a={};if(r&&r.visible&&r.close(),"single"===l.msgMode)this.validErrorMaps={};else{if(e.length&&s.length)a=Object.assign({},i),e.forEach(t=>{s.forEach(e=>{e=(0,_util.getRowid)(this,t)+":"+e.id;a[e]&&delete a[e]})});else if(e.length){let l=e.map(e=>""+(0,_util.getRowid)(this,e));_xeUtils.default.each(i,(e,t)=>{-1<l.indexOf(t.split(":")[0])&&(a[t]=e)})}else if(s.length){let l=s.map(e=>""+e.id);_xeUtils.default.each(i,(e,t)=>{-1<l.indexOf(t.split(":")[1])&&(a[t]=e)})}this.validErrorMaps=a}return this.$nextTick()},triggerValidate(r){let{editConfig:e,editStore:t,editRules:l,editOpts:s,validOpts:i}=this;var a=t.actived;if(l&&"single"===i.msgMode&&(this.validErrorMaps={}),e&&l&&a.row){let{row:t,column:l,cell:i}=a.args;if(this.hasCellRules(r,t,l))return this.validCellRules(r,t,l).then(()=>{"row"===s.mode&&this.clearValidate(t,l)}).catch(({rule:e})=>e.trigger&&r!==e.trigger?Promise.resolve():(e={rule:e,row:t,column:l,cell:i},this.showValidTooltip(e),Promise.reject(e)))}return Promise.resolve()},showValidTooltip(e){var{$refs:t,height:l,validStore:i,validErrorMaps:r,tableData:s,validOpts:a}=this,{rule:o,row:u,column:n,cell:d}=e,t=t.validTip,h=o.content;return i.visible=!0,"single"===a.msgMode?this.validErrorMaps={[(0,_util.getRowid)(this,u)+":"+n.id]:{column:n,row:u,rule:o,content:h}}:this.validErrorMaps=Object.assign({},r,{[(0,_util.getRowid)(this,u)+":"+n.id]:{column:n,row:u,rule:o,content:h}}),this.emitEvent("valid-error",e,null),t&&("tooltip"===a.message||"default"===a.message&&!l&&s.length<2)?t.open(d,h):this.$nextTick()}}};

package/lib/table/src/body.js

@@ -301,13 +301,15 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
       const validSlot = slots ? slots.valid : null;
       const validParams = Object.assign(Object.assign({}, params), errorValidItem);
       tdVNs.push(h('div', {
-        class: ['vxe-cell--valid-error-hint', (0, _utils.getClass)(validOpts.className, errorValidItem)],
+        class: ['vxe-cell--valid-error-tip', (0, _utils.getClass)(validOpts.className, errorValidItem)],
         style: errRule && errRule.maxWidth ? {
           width: `${errRule.maxWidth}px`
         } : null
-      }, validSlot ? $xetable.callSlot(validSlot, validParams, h) : [h('span', {
+      }, [h('div', {
+        class: `vxe-cell--valid-error-wrapper vxe-cell--valid-error-theme-${validOpts.theme || 'normal'}`
+      }, [validSlot ? $xetable.callSlot(validSlot, validParams, h) : [h('span', {
         class: 'vxe-cell--valid-error-msg'
-      }, errorValidItem.content)]));
+      }, errorValidItem.content)]])]));
     }
   }
   let cellHeight = '';

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

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_utils=require("../../ui/src/utils"),_util=require("./util"),_dom=require("../../ui/src/dom"),_vn=require("../../ui/src/vn");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getI18n,renderer}=_ui.VxeUI,renderType="body";function isVMScrollProcess(e){return e._isResize||e.lastScrollTime&&Date.now()<e.lastScrollTime+e.delayHover}function renderLine(e,l,t,r){var{row:o,column:s}=r,{afterFullData:a,treeOpts:i,treeConfig:n,fullAllDataRowIdData:d}=t,{slots:s,treeNode:c}=s,d=d[(0,_util.getRowid)(t,o)];let p=0,u=0,h=[];return d&&(p=d.level,u=d._index,h=d.items),s&&s.line?t.callSlot(s.line,r,e):(d=t.eqRow(a[0],o),n&&c&&(i.showLine||i.line)?[e("div",{class:"vxe-tree--line-wrapper"},[e("div",{class:"vxe-tree--line",style:{height:`${d?1:(0,_util.calcTreeLine)(r,h,u)}px`,left:p*i.indent+(p?2-(0,_util.getOffsetSize)(t):0)+16+"px"}})])]:[])}function renderColumn(e,M,l,t,r,o,s,a,i,n,B,d,c,U,q){var{$listeners:p,fullAllDataRowIdData:N,afterFullData:u,tableData:V,height:h,columnKey:A,overflowX:g,sYOpts:v,scrollYLoad:F,highlightCurrentRow:W,showOverflow:P,isAllOverflow:j,align:z,currentColumn:X,cellClassName:K,cellStyle:w,mergeList:x,spanMethod:G,radioOpts:J,checkboxOpts:m,expandOpts:Q,treeOpts:Z,tooltipOpts:y,mouseConfig:ee,editConfig:f,editOpts:b,editRules:T,validOpts:S,editStore:_,tooltipConfig:le,rowOpts:te,columnOpts:re,validErrorMaps:C}=l,oe=l.computeCellOpts,{type:se,cellRender:ae,editRender:$,align:ie,showOverflow:O,className:ne,treeNode:de,slots:ce}=d,oe=oe.verticalAlign,_=_.actived,v=v.rHeight,R=te.height,E=$||ae,E=E?renderer.get(E.name):null,pe=E?E.tableCellClassName||E.cellClassName:"",ue=E?E.tableCellStyle||E.cellStyle:"";let L=y.showAll||y.enabled;var y=l.getColumnIndex(d),he=l.getVTColumnIndex(d),ge=(0,_utils.isEnableConf)($);let I=o?d.fixed!==o:d.fixed&&g;g=_xeUtils.default.isUndefined(O)||_xeUtils.default.isNull(O)?P:O,O="ellipsis"===g;let D="title"===g,k=!0===g||"tooltip"===g;g=D||k||O;let ve;var Y={},N=N[r],ie=ie||(E?E.tableCellAlign:"")||z,E=C[r+":"+d.id],z=T&&S.showMessage&&("default"===S.message?h||1<V.length:"inline"===S.message),C={colid:d.id};let we=p["cell-mouseenter"],xe=p["cell-mouseleave"];T=$&&f&&"dblclick"===b.trigger;let H={$table:l,$grid:l.$xegrid,isEdit:!1,seq:t,rowid:r,row:a,rowIndex:i,$rowIndex:n,_rowIndex:B,column:d,columnIndex:y,$columnIndex:c,_columnIndex:he,fixed:o,type:renderType,isHidden:I,level:s,visibleData:u,data:V,items:q};if((D||k||L||we||le)&&(Y.mouseenter=e=>{isVMScrollProcess(l)||(D?(0,_dom.updateCellTitle)(e.currentTarget,d):(k||L)&&l.triggerBodyTooltipEvent(e,H),we&&l.emitEvent("cell-mouseenter",Object.assign({cell:e.currentTarget},H),e))}),(k||L||xe||le)&&(Y.mouseleave=e=>{isVMScrollProcess(l)||((k||L)&&l.handleTargetLeaveEvent(e),xe&&l.emitEvent("cell-mouseleave",Object.assign({cell:e.currentTarget},H),e))}),(m.range||ee)&&(Y.mousedown=e=>{l.triggerCellMousedownEvent(e,H)}),(te.isCurrent||W||p["cell-click"]||$&&f||"row"===Q.trigger||"cell"===Q.trigger||"row"===J.trigger||"radio"===d.type&&"cell"===J.trigger||"row"===m.trigger||"checkbox"===d.type&&"cell"===m.trigger||"row"===Z.trigger||d.treeNode&&"cell"===Z.trigger)&&(Y.click=e=>{l.triggerCellClickEvent(e,H)}),(T||p["cell-dblclick"])&&(Y.dblclick=e=>{l.triggerCellDblclickEvent(e,H)}),x.length){h=(0,_util.mergeBodyMethod)(x,B,he);if(h){var{rowspan:t,colspan:r}=h;if(!t||!r)return null;1<t&&(C.rowspan=t),1<r&&(C.colspan=r)}}else if(G){var{rowspan:i=1,colspan:n=1}=G(H)||{};if(!i||!n)return null;1<i&&(C.rowspan=i),1<n&&(C.colspan=n)}!(I=I&&x&&(1<C.colspan||1<C.rowspan)?!1:I)&&f&&($||ae)&&(b.showStatus||b.showUpdateStatus)&&(ve=l.isUpdateByRow(a,d.field));y=[];I&&P&&j?y.push(e("div",{class:["vxe-cell",{"c--title":D,"c--tooltip":k,"c--ellipsis":O}],style:{maxHeight:g&&(v||R)?`${v||R}px`:""}})):(y.push(...renderLine(e,M,l,H),e("div",{class:["vxe-cell",{"c--title":D,"c--tooltip":k,"c--ellipsis":O}],style:{maxHeight:g&&(v||R)?`${v||R}px`:""},attrs:{title:D?l.getCellLabel(a,d):null}},d.renderCell(e,H))),z&&E&&(o=E.rule,s=ce?ce.valid:null,u=Object.assign(Object.assign({},H),E),y.push(e("div",{class:["vxe-cell--valid-error-hint",(0,_utils.getClass)(S.className,E)],style:o&&o.maxWidth?{width:o.maxWidth+"px"}:null},s?l.callSlot(s,u,e):[e("span",{class:"vxe-cell--valid-error-msg"},E.content)]))));let me="";return g&&(v||R)?me=`${v||R}px`:F&&!g&&(me=`${N.height||24}px`),e("td",{class:["vxe-body--column",d.id,{["col--"+ie]:ie,["col--vertical-"+oe]:oe,["col--"+se]:se,"col--last":c===U.length-1,"col--tree-node":de,"col--edit":ge,"col--ellipsis":g,"fixed--hidden":I,"col--dirty":ve,"col--active":f&&ge&&_.row===a&&(_.column===d||"row"===b.mode),"col--valid-error":!!E,"col--current":X===d},(0,_utils.getClass)(pe,H),(0,_utils.getClass)(ne,H),(0,_utils.getClass)(K,H)],key:A||re.useKey||te.useKey?d.id:c,attrs:C,style:Object.assign({height:me},_xeUtils.default.isFunction(ue)?ue(H):ue,_xeUtils.default.isFunction(w)?w(H):w),on:Y},y)}function renderRows(w,x,m,y,f,b){let{stripe:T,rowKey:S,highlightHoverRow:_,rowClassName:C,rowStyle:$,editConfig:O,showOverflow:R,treeConfig:E,treeOpts:L,expandOpts:I,editOpts:D,treeExpandedMaps:k,scrollYLoad:Y,rowExpandedMaps:H,radioOpts:M,checkboxOpts:B,expandColumn:U,hasFixedColumn:q,fullAllDataRowIdData:N,rowOpts:V,pendingRowList:A,pendingRowMaps:F}=m,W=L.children||L.childrenField,P=[];return f.forEach((t,r)=>{var e={};let o,s=m.getVTRowIndex(t),a=(o=m.getRowIndex(t),(V.isHover||_)&&(e.mouseenter=e=>{isVMScrollProcess(m)||m.triggerHoverEvent(e,{row:t,rowIndex:o})},e.mouseleave=()=>{isVMScrollProcess(m)||m.clearHoverRow()}),V.drag&&(e.dragstart=e=>{m.handleRowDragDragstartEvent(e)},e.dragover=e=>{m.handleRowDragDragoverEvent(e)},e.dragend=e=>{m.handleRowDragDragendEvent(e)}),(0,_util.getRowid)(m,t));var l=N[a];let i=l?l.level:0,n=l?l.seq:-1;var d,c,p,l={$table:m,seq:n,rowid:a,fixed:y,type:renderType,level:i,row:t,rowIndex:o,$rowIndex:r},u=U&&!!H[a];let h=!1,g=[],v=!1;O&&(v=m.isInsertByRow(t)),!E||Y||L.transform||(g=t[W],h=g&&g.length&&!!k[a]),P.push(w("tr",{class:["vxe-body--row",E?"row--level-"+i:"",{"row--stripe":T&&(m.getVTRowIndex(t)+1)%2==0,"is--new":v,"is--expand-row":u,"is--expand-tree":h,"row--new":v&&(D.showStatus||D.showInsertStatus),"row--radio":M.highlight&&m.selectRadioRow===t,"row--checked":B.highlight&&m.isCheckedByCheckboxRow(t),"row--pending":A.length&&!!F[a]},C?_xeUtils.default.isFunction(C)?C(l):C:""],attrs:{rowid:a},style:$?_xeUtils.default.isFunction($)?$(l):$:null,key:S||V.useKey||V.drag||E?a:r,on:e},b.map((e,l)=>renderColumn(w,x,m,n,a,y,i,t,o,r,s,e,l,b,f)))),u&&({height:l,padding:u}=I,d={},c=(l&&(d.height=l+"px"),E&&(d.paddingLeft=i*L.indent+30+"px"),U).showOverflow,c=_xeUtils.default.isUndefined(c)||_xeUtils.default.isNull(c)?R:c,p={$table:m,seq:n,column:U,fixed:y,type:renderType,level:i,row:t,rowIndex:o,$rowIndex:r},P.push(w("tr",{class:["vxe-body--expanded-row",{"is--padding":u}],key:"expand_"+a,style:$?_xeUtils.default.isFunction($)?$(p):$:null,on:e},[w("td",{class:{"vxe-body--expanded-column":1,"fixed--hidden":y&&!q,"col--ellipsis":c},attrs:{colspan:b.length}},[w("div",{class:{"vxe-body--expanded-cell":1,"is--ellipsis":l},style:d},[U.renderData(w,p)])])]))),h&&P.push(...renderRows(w,x,m,y,g,b))}),P}var _default=exports.default={name:"VxeTableBody",props:{tableData:Array,tableColumn:Array,fixedColumn:Array,size:String,fixedType:String},data(){return{wheelTime:null,wheelYSize:0,wheelYInterval:0,wheelYTotal:0}},mounted(){var{$parent:e,$el:l,$refs:t,fixedType:r}=this,e=e.elemStore,r=`${r||"main"}-body-`;e[r+"wrapper"]=l,e[r+"table"]=t.table,e[r+"colgroup"]=t.colgroup,e[r+"list"]=t.tbody,e[r+"xSpace"]=t.xSpace,e[r+"ySpace"]=t.ySpace,e[r+"emptyBlock"]=t.emptyBlock},beforeDestroy(){clearTimeout(this.wheelTime)},destroyed(){var{$parent:e,fixedType:l}=this,e=e.elemStore,l=`${l||"main"}-body-`;e[l+"wrapper"]=null,e[l+"table"]=null,e[l+"colgroup"]=null,e[l+"list"]=null,e[l+"xSpace"]=null,e[l+"ySpace"]=null,e[l+"emptyBlock"]=null},render(t){let{_e:e,$parent:l,fixedColumn:r,fixedType:o}=this,{$scopedSlots:s,tId:a,tableData:i,tableColumn:n,visibleColumn:d,expandColumn:c,showOverflow:p,keyboardConfig:u,keyboardOpts:h,mergeList:g,spanMethod:v,scrollXLoad:w,scrollYLoad:x,isAllOverflow:m,emptyOpts:y,mouseConfig:f,mouseOpts:b,sYOpts:T,rowOpts:S,isDragRowMove:_}=l;o&&(n=c||!(w||x||p&&m)||g.length||v||u&&h.isMerge?d:r);let C;var $;return C=s.empty?s.empty.call(this,{$table:l},t):($=($=y.name?renderer.get(y.name):null)?$.renderTableEmpty||$.renderTableEmptyView||$.renderEmpty:null)?(0,_vn.getSlotVNs)($.call(this,t,y,{$table:l})):l.emptyText||getI18n("vxe.table.emptyText"),t("div",{class:["vxe-table--body-wrapper",o?`fixed-${o}--wrapper`:"body--wrapper"],attrs:{xid:a},on:Object.assign({scroll:this.scrollEvent},x&&"wheel"===T.mode?{wheel:this.wheelEvent}:null)},[o?e():t("div",{class:"vxe-body--x-space",ref:"xSpace"}),t("div",{class:"vxe-body--y-space",ref:"ySpace"}),t("table",{class:"vxe-table--body",attrs:{xid:a,cellspacing:0,cellpadding:0,border:0},ref:"table"},[t("colgroup",{ref:"colgroup"},n.map((e,l)=>t("col",{attrs:{name:e.id},key:l}))),S.drag?t("transition-group",{props:{tag:"tbody",name:"vxe-body--row-list"+(_?"":"-disabled")}},renderRows(t,this,l,o,i,n)):t("tbody",{ref:"tbody"},renderRows(t,this,l,o,i,n))]),t("div",{class:"vxe-table--checkbox-range"}),f&&b.area?t("div",{class:"vxe-table--cell-area"},[t("span",{class:"vxe-table--cell-main-area"},b.extension?[t("span",{class:"vxe-table--cell-main-area-btn",on:{mousedown(e){l.triggerCellExtendMousedownEvent(e,{$table:l,fixed:o,type:renderType})}}})]:null),t("span",{class:"vxe-table--cell-copy-area"}),t("span",{class:"vxe-table--cell-extend-area"}),t("span",{class:"vxe-table--cell-multi-area"}),t("span",{class:"vxe-table--cell-active-area"})]):null,o?null:t("div",{class:"vxe-table--empty-block",ref:"emptyBlock"},[t("div",{class:"vxe-table--empty-content"},C)])])},methods:{scrollEvent(e){var{$el:l,$parent:t,fixedType:r}=this,{$refs:o,lastScrollTop:s,lastScrollLeft:a}=t,{tableHeader:i,tableBody:n,leftBody:d,rightBody:c,tableFooter:p}=o,i=i?i.$el:null,p=p?p.$el:null,n=n.$el,d=d?d.$el:null,c=c?c.$el:null,l=l.scrollTop,u=n.scrollLeft,a=u!==a,s=l!==s,h=o.refScrollXHandleElem,o=o.refScrollYHandleElem;o?o.scrollTop=l:s&&(t.lastScrollTop=l,t.lastScrollLeft=u,d&&"left"===r?((0,_dom.setScrollTop)(n,l),(0,_dom.setScrollTop)(c,l)):c&&"right"===r?((0,_dom.setScrollTop)(n,l),(0,_dom.setScrollTop)(d,l)):((0,_dom.setScrollTop)(d,l),(0,_dom.setScrollTop)(c,l)),t.handleScrollEvent(e,s,a,{type:renderType,fixed:r,scrollTop:l,scrollLeft:u})),h?h.scrollLeft=u:a&&(t.lastScrollTop=l,t.lastScrollLeft=u,(0,_dom.setScrollLeft)(i,u),(0,_dom.setScrollLeft)(p,u),t.handleScrollEvent(e,s,a,{type:renderType,fixed:r,scrollTop:l,scrollLeft:u}))},handleWheel(i,n,e,d,c){let p=this.$parent;var{$refs:l,elemStore:t,scrollYLoad:r,scrollXLoad:o}=p,{tableBody:l,leftBody:s,rightBody:a}=l;let u=l.$el,h=s?s.$el:null,g=a?a.$el:null;l=this.isPrevWheelTop===n?Math.max(0,this.wheelYSize-this.wheelYTotal):0,s=t["main-body-ySpace"],a=t["main-body-xSpace"];let v=(r&&s?s:u).clientHeight,w=(o&&a?a:u).clientWidth,x=(this.isPrevWheelTop=n,this.wheelYSize=Math.abs(n?e-l:e+l),this.wheelYInterval=0,this.wheelYTotal=0,clearTimeout(this.wheelTime),()=>{let{fixedType:e,wheelYTotal:l,wheelYSize:t,wheelYInterval:r}=this;var o,s,a;l<t&&(t<(l+=r=Math.max(5,Math.floor(1.5*r)))&&(r-=l-t),{scrollTop:a,clientHeight:o,scrollHeight:s}=u,a=a+r*(n?-1:1),u.scrollTop=a,h&&(h.scrollTop=a),g&&(g.scrollTop=a),(n?a<s-o:0<=a)&&(this.wheelTime=setTimeout(x,10)),this.wheelYTotal=l,this.wheelYInterval=r,p.emitEvent("scroll",{type:renderType,fixed:e,scrollTop:u.scrollTop,scrollLeft:u.scrollLeft,scrollHeight:u.scrollHeight,scrollWidth:u.scrollWidth,bodyHeight:v,bodyWidth:w,isX:d,isY:c},i))});x()},wheelEvent(e){var{deltaY:l,deltaX:t}=e,{$el:r,$parent:o}=this,{$refs:s,highlightHoverRow:a,scrollYLoad:i,lastScrollTop:n,lastScrollLeft:d,rowOpts:c}=o,s=s.tableBody,s=s.$el,p=l<0;(p?r.scrollTop<=0:r.scrollTop>=r.scrollHeight-r.clientHeight)||(r=r.scrollTop+l,t=(s=s.scrollLeft+t)!==d,(d=r!==n)&&(e.preventDefault(),o.lastScrollTop=r,o.lastScrollLeft=s,o.lastScrollTime=Date.now(),(c.isHover||a)&&o.clearHoverRow(),this.handleWheel(e,p,l,t,d),i)&&o.triggerScrollYEvent(e))}}};
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_utils=require("../../ui/src/utils"),_util=require("./util"),_dom=require("../../ui/src/dom"),_vn=require("../../ui/src/vn");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getI18n,renderer}=_ui.VxeUI,renderType="body";function isVMScrollProcess(e){return e._isResize||e.lastScrollTime&&Date.now()<e.lastScrollTime+e.delayHover}function renderLine(e,l,t,r){var{row:o,column:s}=r,{afterFullData:a,treeOpts:i,treeConfig:n,fullAllDataRowIdData:d}=t,{slots:s,treeNode:c}=s,d=d[(0,_util.getRowid)(t,o)];let p=0,u=0,h=[];return d&&(p=d.level,u=d._index,h=d.items),s&&s.line?t.callSlot(s.line,r,e):(d=t.eqRow(a[0],o),n&&c&&(i.showLine||i.line)?[e("div",{class:"vxe-tree--line-wrapper"},[e("div",{class:"vxe-tree--line",style:{height:`${d?1:(0,_util.calcTreeLine)(r,h,u)}px`,left:p*i.indent+(p?2-(0,_util.getOffsetSize)(t):0)+16+"px"}})])]:[])}function renderColumn(e,M,l,t,r,o,s,a,i,n,B,d,c,U,q){var{$listeners:p,fullAllDataRowIdData:N,afterFullData:u,tableData:V,height:h,columnKey:A,overflowX:g,sYOpts:v,scrollYLoad:F,highlightCurrentRow:W,showOverflow:P,isAllOverflow:j,align:z,currentColumn:X,cellClassName:K,cellStyle:w,mergeList:x,spanMethod:G,radioOpts:J,checkboxOpts:m,expandOpts:Q,treeOpts:Z,tooltipOpts:y,mouseConfig:ee,editConfig:f,editOpts:b,editRules:T,validOpts:S,editStore:_,tooltipConfig:le,rowOpts:te,columnOpts:re,validErrorMaps:C}=l,oe=l.computeCellOpts,{type:se,cellRender:ae,editRender:$,align:ie,showOverflow:O,className:ne,treeNode:de,slots:ce}=d,oe=oe.verticalAlign,_=_.actived,v=v.rHeight,R=te.height,E=$||ae,E=E?renderer.get(E.name):null,pe=E?E.tableCellClassName||E.cellClassName:"",ue=E?E.tableCellStyle||E.cellStyle:"";let L=y.showAll||y.enabled;var y=l.getColumnIndex(d),he=l.getVTColumnIndex(d),ge=(0,_utils.isEnableConf)($);let I=o?d.fixed!==o:d.fixed&&g;g=_xeUtils.default.isUndefined(O)||_xeUtils.default.isNull(O)?P:O,O="ellipsis"===g;let D="title"===g,k=!0===g||"tooltip"===g;g=D||k||O;let ve;var Y={},N=N[r],ie=ie||(E?E.tableCellAlign:"")||z,E=C[r+":"+d.id],z=T&&S.showMessage&&("default"===S.message?h||1<V.length:"inline"===S.message),C={colid:d.id};let we=p["cell-mouseenter"],xe=p["cell-mouseleave"];T=$&&f&&"dblclick"===b.trigger;let H={$table:l,$grid:l.$xegrid,isEdit:!1,seq:t,rowid:r,row:a,rowIndex:i,$rowIndex:n,_rowIndex:B,column:d,columnIndex:y,$columnIndex:c,_columnIndex:he,fixed:o,type:renderType,isHidden:I,level:s,visibleData:u,data:V,items:q};if((D||k||L||we||le)&&(Y.mouseenter=e=>{isVMScrollProcess(l)||(D?(0,_dom.updateCellTitle)(e.currentTarget,d):(k||L)&&l.triggerBodyTooltipEvent(e,H),we&&l.emitEvent("cell-mouseenter",Object.assign({cell:e.currentTarget},H),e))}),(k||L||xe||le)&&(Y.mouseleave=e=>{isVMScrollProcess(l)||((k||L)&&l.handleTargetLeaveEvent(e),xe&&l.emitEvent("cell-mouseleave",Object.assign({cell:e.currentTarget},H),e))}),(m.range||ee)&&(Y.mousedown=e=>{l.triggerCellMousedownEvent(e,H)}),(te.isCurrent||W||p["cell-click"]||$&&f||"row"===Q.trigger||"cell"===Q.trigger||"row"===J.trigger||"radio"===d.type&&"cell"===J.trigger||"row"===m.trigger||"checkbox"===d.type&&"cell"===m.trigger||"row"===Z.trigger||d.treeNode&&"cell"===Z.trigger)&&(Y.click=e=>{l.triggerCellClickEvent(e,H)}),(T||p["cell-dblclick"])&&(Y.dblclick=e=>{l.triggerCellDblclickEvent(e,H)}),x.length){h=(0,_util.mergeBodyMethod)(x,B,he);if(h){var{rowspan:t,colspan:r}=h;if(!t||!r)return null;1<t&&(C.rowspan=t),1<r&&(C.colspan=r)}}else if(G){var{rowspan:i=1,colspan:n=1}=G(H)||{};if(!i||!n)return null;1<i&&(C.rowspan=i),1<n&&(C.colspan=n)}!(I=I&&x&&(1<C.colspan||1<C.rowspan)?!1:I)&&f&&($||ae)&&(b.showStatus||b.showUpdateStatus)&&(ve=l.isUpdateByRow(a,d.field));y=[];I&&P&&j?y.push(e("div",{class:["vxe-cell",{"c--title":D,"c--tooltip":k,"c--ellipsis":O}],style:{maxHeight:g&&(v||R)?`${v||R}px`:""}})):(y.push(...renderLine(e,M,l,H),e("div",{class:["vxe-cell",{"c--title":D,"c--tooltip":k,"c--ellipsis":O}],style:{maxHeight:g&&(v||R)?`${v||R}px`:""},attrs:{title:D?l.getCellLabel(a,d):null}},d.renderCell(e,H))),z&&E&&(o=E.rule,s=ce?ce.valid:null,u=Object.assign(Object.assign({},H),E),y.push(e("div",{class:["vxe-cell--valid-error-tip",(0,_utils.getClass)(S.className,E)],style:o&&o.maxWidth?{width:o.maxWidth+"px"}:null},[e("div",{class:"vxe-cell--valid-error-wrapper vxe-cell--valid-error-theme-"+(S.theme||"normal")},[s?l.callSlot(s,u,e):[e("span",{class:"vxe-cell--valid-error-msg"},E.content)]])]))));let me="";return g&&(v||R)?me=`${v||R}px`:F&&!g&&(me=`${N.height||24}px`),e("td",{class:["vxe-body--column",d.id,{["col--"+ie]:ie,["col--vertical-"+oe]:oe,["col--"+se]:se,"col--last":c===U.length-1,"col--tree-node":de,"col--edit":ge,"col--ellipsis":g,"fixed--hidden":I,"col--dirty":ve,"col--active":f&&ge&&_.row===a&&(_.column===d||"row"===b.mode),"col--valid-error":!!E,"col--current":X===d},(0,_utils.getClass)(pe,H),(0,_utils.getClass)(ne,H),(0,_utils.getClass)(K,H)],key:A||re.useKey||te.useKey?d.id:c,attrs:C,style:Object.assign({height:me},_xeUtils.default.isFunction(ue)?ue(H):ue,_xeUtils.default.isFunction(w)?w(H):w),on:Y},y)}function renderRows(w,x,m,y,f,b){let{stripe:T,rowKey:S,highlightHoverRow:_,rowClassName:C,rowStyle:$,editConfig:O,showOverflow:R,treeConfig:E,treeOpts:L,expandOpts:I,editOpts:D,treeExpandedMaps:k,scrollYLoad:Y,rowExpandedMaps:H,radioOpts:M,checkboxOpts:B,expandColumn:U,hasFixedColumn:q,fullAllDataRowIdData:N,rowOpts:V,pendingRowList:A,pendingRowMaps:F}=m,W=L.children||L.childrenField,P=[];return f.forEach((t,r)=>{var e={};let o,s=m.getVTRowIndex(t),a=(o=m.getRowIndex(t),(V.isHover||_)&&(e.mouseenter=e=>{isVMScrollProcess(m)||m.triggerHoverEvent(e,{row:t,rowIndex:o})},e.mouseleave=()=>{isVMScrollProcess(m)||m.clearHoverRow()}),V.drag&&(e.dragstart=e=>{m.handleRowDragDragstartEvent(e)},e.dragover=e=>{m.handleRowDragDragoverEvent(e)},e.dragend=e=>{m.handleRowDragDragendEvent(e)}),(0,_util.getRowid)(m,t));var l=N[a];let i=l?l.level:0,n=l?l.seq:-1;var d,c,p,l={$table:m,seq:n,rowid:a,fixed:y,type:renderType,level:i,row:t,rowIndex:o,$rowIndex:r},u=U&&!!H[a];let h=!1,g=[],v=!1;O&&(v=m.isInsertByRow(t)),!E||Y||L.transform||(g=t[W],h=g&&g.length&&!!k[a]),P.push(w("tr",{class:["vxe-body--row",E?"row--level-"+i:"",{"row--stripe":T&&(m.getVTRowIndex(t)+1)%2==0,"is--new":v,"is--expand-row":u,"is--expand-tree":h,"row--new":v&&(D.showStatus||D.showInsertStatus),"row--radio":M.highlight&&m.selectRadioRow===t,"row--checked":B.highlight&&m.isCheckedByCheckboxRow(t),"row--pending":A.length&&!!F[a]},C?_xeUtils.default.isFunction(C)?C(l):C:""],attrs:{rowid:a},style:$?_xeUtils.default.isFunction($)?$(l):$:null,key:S||V.useKey||V.drag||E?a:r,on:e},b.map((e,l)=>renderColumn(w,x,m,n,a,y,i,t,o,r,s,e,l,b,f)))),u&&({height:l,padding:u}=I,d={},c=(l&&(d.height=l+"px"),E&&(d.paddingLeft=i*L.indent+30+"px"),U).showOverflow,c=_xeUtils.default.isUndefined(c)||_xeUtils.default.isNull(c)?R:c,p={$table:m,seq:n,column:U,fixed:y,type:renderType,level:i,row:t,rowIndex:o,$rowIndex:r},P.push(w("tr",{class:["vxe-body--expanded-row",{"is--padding":u}],key:"expand_"+a,style:$?_xeUtils.default.isFunction($)?$(p):$:null,on:e},[w("td",{class:{"vxe-body--expanded-column":1,"fixed--hidden":y&&!q,"col--ellipsis":c},attrs:{colspan:b.length}},[w("div",{class:{"vxe-body--expanded-cell":1,"is--ellipsis":l},style:d},[U.renderData(w,p)])])]))),h&&P.push(...renderRows(w,x,m,y,g,b))}),P}var _default=exports.default={name:"VxeTableBody",props:{tableData:Array,tableColumn:Array,fixedColumn:Array,size:String,fixedType:String},data(){return{wheelTime:null,wheelYSize:0,wheelYInterval:0,wheelYTotal:0}},mounted(){var{$parent:e,$el:l,$refs:t,fixedType:r}=this,e=e.elemStore,r=`${r||"main"}-body-`;e[r+"wrapper"]=l,e[r+"table"]=t.table,e[r+"colgroup"]=t.colgroup,e[r+"list"]=t.tbody,e[r+"xSpace"]=t.xSpace,e[r+"ySpace"]=t.ySpace,e[r+"emptyBlock"]=t.emptyBlock},beforeDestroy(){clearTimeout(this.wheelTime)},destroyed(){var{$parent:e,fixedType:l}=this,e=e.elemStore,l=`${l||"main"}-body-`;e[l+"wrapper"]=null,e[l+"table"]=null,e[l+"colgroup"]=null,e[l+"list"]=null,e[l+"xSpace"]=null,e[l+"ySpace"]=null,e[l+"emptyBlock"]=null},render(t){let{_e:e,$parent:l,fixedColumn:r,fixedType:o}=this,{$scopedSlots:s,tId:a,tableData:i,tableColumn:n,visibleColumn:d,expandColumn:c,showOverflow:p,keyboardConfig:u,keyboardOpts:h,mergeList:g,spanMethod:v,scrollXLoad:w,scrollYLoad:x,isAllOverflow:m,emptyOpts:y,mouseConfig:f,mouseOpts:b,sYOpts:T,rowOpts:S,isDragRowMove:_}=l;o&&(n=c||!(w||x||p&&m)||g.length||v||u&&h.isMerge?d:r);let C;var $;return C=s.empty?s.empty.call(this,{$table:l},t):($=($=y.name?renderer.get(y.name):null)?$.renderTableEmpty||$.renderTableEmptyView||$.renderEmpty:null)?(0,_vn.getSlotVNs)($.call(this,t,y,{$table:l})):l.emptyText||getI18n("vxe.table.emptyText"),t("div",{class:["vxe-table--body-wrapper",o?`fixed-${o}--wrapper`:"body--wrapper"],attrs:{xid:a},on:Object.assign({scroll:this.scrollEvent},x&&"wheel"===T.mode?{wheel:this.wheelEvent}:null)},[o?e():t("div",{class:"vxe-body--x-space",ref:"xSpace"}),t("div",{class:"vxe-body--y-space",ref:"ySpace"}),t("table",{class:"vxe-table--body",attrs:{xid:a,cellspacing:0,cellpadding:0,border:0},ref:"table"},[t("colgroup",{ref:"colgroup"},n.map((e,l)=>t("col",{attrs:{name:e.id},key:l}))),S.drag?t("transition-group",{props:{tag:"tbody",name:"vxe-body--row-list"+(_?"":"-disabled")}},renderRows(t,this,l,o,i,n)):t("tbody",{ref:"tbody"},renderRows(t,this,l,o,i,n))]),t("div",{class:"vxe-table--checkbox-range"}),f&&b.area?t("div",{class:"vxe-table--cell-area"},[t("span",{class:"vxe-table--cell-main-area"},b.extension?[t("span",{class:"vxe-table--cell-main-area-btn",on:{mousedown(e){l.triggerCellExtendMousedownEvent(e,{$table:l,fixed:o,type:renderType})}}})]:null),t("span",{class:"vxe-table--cell-copy-area"}),t("span",{class:"vxe-table--cell-extend-area"}),t("span",{class:"vxe-table--cell-multi-area"}),t("span",{class:"vxe-table--cell-active-area"})]):null,o?null:t("div",{class:"vxe-table--empty-block",ref:"emptyBlock"},[t("div",{class:"vxe-table--empty-content"},C)])])},methods:{scrollEvent(e){var{$el:l,$parent:t,fixedType:r}=this,{$refs:o,lastScrollTop:s,lastScrollLeft:a}=t,{tableHeader:i,tableBody:n,leftBody:d,rightBody:c,tableFooter:p}=o,i=i?i.$el:null,p=p?p.$el:null,n=n.$el,d=d?d.$el:null,c=c?c.$el:null,l=l.scrollTop,u=n.scrollLeft,a=u!==a,s=l!==s,h=o.refScrollXHandleElem,o=o.refScrollYHandleElem;o?o.scrollTop=l:s&&(t.lastScrollTop=l,t.lastScrollLeft=u,d&&"left"===r?((0,_dom.setScrollTop)(n,l),(0,_dom.setScrollTop)(c,l)):c&&"right"===r?((0,_dom.setScrollTop)(n,l),(0,_dom.setScrollTop)(d,l)):((0,_dom.setScrollTop)(d,l),(0,_dom.setScrollTop)(c,l)),t.handleScrollEvent(e,s,a,{type:renderType,fixed:r,scrollTop:l,scrollLeft:u})),h?h.scrollLeft=u:a&&(t.lastScrollTop=l,t.lastScrollLeft=u,(0,_dom.setScrollLeft)(i,u),(0,_dom.setScrollLeft)(p,u),t.handleScrollEvent(e,s,a,{type:renderType,fixed:r,scrollTop:l,scrollLeft:u}))},handleWheel(i,n,e,d,c){let p=this.$parent;var{$refs:l,elemStore:t,scrollYLoad:r,scrollXLoad:o}=p,{tableBody:l,leftBody:s,rightBody:a}=l;let u=l.$el,h=s?s.$el:null,g=a?a.$el:null;l=this.isPrevWheelTop===n?Math.max(0,this.wheelYSize-this.wheelYTotal):0,s=t["main-body-ySpace"],a=t["main-body-xSpace"];let v=(r&&s?s:u).clientHeight,w=(o&&a?a:u).clientWidth,x=(this.isPrevWheelTop=n,this.wheelYSize=Math.abs(n?e-l:e+l),this.wheelYInterval=0,this.wheelYTotal=0,clearTimeout(this.wheelTime),()=>{let{fixedType:e,wheelYTotal:l,wheelYSize:t,wheelYInterval:r}=this;var o,s,a;l<t&&(t<(l+=r=Math.max(5,Math.floor(1.5*r)))&&(r-=l-t),{scrollTop:a,clientHeight:o,scrollHeight:s}=u,a=a+r*(n?-1:1),u.scrollTop=a,h&&(h.scrollTop=a),g&&(g.scrollTop=a),(n?a<s-o:0<=a)&&(this.wheelTime=setTimeout(x,10)),this.wheelYTotal=l,this.wheelYInterval=r,p.emitEvent("scroll",{type:renderType,fixed:e,scrollTop:u.scrollTop,scrollLeft:u.scrollLeft,scrollHeight:u.scrollHeight,scrollWidth:u.scrollWidth,bodyHeight:v,bodyWidth:w,isX:d,isY:c},i))});x()},wheelEvent(e){var{deltaY:l,deltaX:t}=e,{$el:r,$parent:o}=this,{$refs:s,highlightHoverRow:a,scrollYLoad:i,lastScrollTop:n,lastScrollLeft:d,rowOpts:c}=o,s=s.tableBody,s=s.$el,p=l<0;(p?r.scrollTop<=0:r.scrollTop>=r.scrollHeight-r.clientHeight)||(r=r.scrollTop+l,t=(s=s.scrollLeft+t)!==d,(d=r!==n)&&(e.preventDefault(),o.lastScrollTop=r,o.lastScrollLeft=s,o.lastScrollTime=Date.now(),(c.isHover||a)&&o.clearHoverRow(),this.handleWheel(e,p,l,t,d),i)&&o.triggerScrollYEvent(e))}}};

package/lib/table/src/cell.js

@@ -85,23 +85,30 @@ function renderCellBaseVNs(h, params, content) {
   const {
     $table,
     column,
-    row
+    row,
+    level
   } = params;
   const {
     dragSort
   } = column;
-  const vns = _xeUtils.default.isArray(content) ? content : [content];
+  const tableProps = $table;
+  const {
+    treeConfig
+  } = tableProps;
   const rowOpts = $table.computeRowOpts;
   const dragOpts = $table.computeDragOpts;
   const {
     showRowIcon,
     rowVisibleMethod
   } = dragOpts;
+  const vns = _xeUtils.default.isArray(content) ? content : [content];
   if (dragSort && rowOpts.drag && showRowIcon && (!rowVisibleMethod || rowVisibleMethod({
     row,
     column
   }))) {
-    vns.unshift(renderCellDragIcon(h, params));
+    if (!treeConfig || !level) {
+      vns.unshift(renderCellDragIcon(h, params));
+    }
   }
   return vns;
 }

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

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=exports.Cell=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_utils=require("../../ui/src/utils"),_dom=require("../../ui/src/dom"),_util=require("./util"),_vn=require("../../ui/src/vn");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getI18n,getIcon,renderer,formats,renderEmptyElement}=_ui.VxeUI;function renderTitlePrefixIcon(e,l){let{$table:r,column:t}=l,n=t.titlePrefix||t.titleHelp;return n?[e("i",{class:["vxe-cell-title-prefix-icon",n.icon||getIcon().TABLE_TITLE_PREFIX],on:{mouseenter(e){r.triggerHeaderTitleEvent(e,n,l)},mouseleave(e){r.handleTargetLeaveEvent(e)}}})]:[]}function renderTitleSuffixIcon(e,l){let{$table:r,column:t}=l,n=t.titleSuffix;return n?[e("i",{class:["vxe-cell-title-suffix-icon",n.icon||getIcon().TABLE_TITLE_SUFFIX],on:{mouseenter(e){r.triggerHeaderTitleEvent(e,n,l)},mouseleave(e){r.handleTargetLeaveEvent(e)}}})]:[]}function renderCellDragIcon(e,l){let r=l.$table;var{rowIcon:t,rowDisabledMethod:n}=r.computeDragOpts;let a=n&&n(l);return e("span",{key:"dg",class:["vxe-cell--drag-handle",{"is--disabled":a}],on:{mousedown(e){a||r.handleCellDragMousedownEvent(e,l)},mouseup:r.handleCellDragMouseupEvent}},[e("i",{class:t||getIcon().TABLE_DRAG_ROW})])}function renderCellBaseVNs(e,l,r){var{$table:t,column:n,row:a}=l,d=n.dragSort,r=_xeUtils.default.isArray(r)?r:[r],o=t.computeRowOpts,{showRowIcon:t,rowVisibleMethod:i}=t.computeDragOpts;return d&&o.drag&&t&&(!i||i({row:a,column:n}))&&r.unshift(renderCellDragIcon(e,l)),r}function renderTitleContent(e,l,r){let{$table:t,column:n}=l;var{type:a,showHeaderOverflow:d}=n,{showHeaderOverflow:o,tooltipOpts:i}=t;let s=i.showAll||i.enabled;i=_xeUtils.default.isUndefined(d)||_xeUtils.default.isNull(d)?o:d;let c="title"===i,u=!0===i||"tooltip"===i;o={};return(c||u||s)&&(o.mouseenter=e=>{t._isResize||(c?(0,_dom.updateCellTitle)(e.currentTarget,n):(u||s)&&t.triggerHeaderTooltipEvent(e,l))}),(u||s)&&(o.mouseleave=e=>{t._isResize||(u||s)&&t.handleTargetLeaveEvent(e)}),["html"===a&&_xeUtils.default.isString(r)?e("span",{class:"vxe-cell--title",domProps:{innerHTML:r},on:o}):e("span",{class:"vxe-cell--title",on:o},(0,_vn.getSlotVNs)(r))]}function formatFooterLabel(e,l){var r,t;return _xeUtils.default.isFunction(e)?e(l):(t=(t=(r=_xeUtils.default.isArray(e))?formats.get(e[0]):formats.get(e))?t.tableFooterCellFormatMethod:null)?r?t(l,...e.slice(1)):t(l):""}function getFooterContent(e,l){var{$table:r,column:t,_columnIndex:n,row:a,items:d}=l,{slots:o,editRender:i,cellRender:s,footerFormatter:c}=t,i=i||s;if(o&&o.footer)return r.callSlot(o.footer,l,e);if(i){s=renderer.get(i.name),o=s?s.renderTableFooter||s.renderFooter:null;if(o)return(0,_vn.getSlotVNs)(o.call(r,e,i,l))}let u="";return _xeUtils.default.isArray(d)?u=d[n]:u=_xeUtils.default.get(a,t.field),[c?formatFooterLabel(c,{itemValue:u,column:t,row:a,items:d,_columnIndex:n}):(0,_utils.formatText)(u,1)]}function getDefaultCellLabel(e){var{$table:e,row:l,column:r}=e;return(0,_utils.formatText)(e.getCellLabel(l,r),1)}let Cell=exports.Cell={createColumn(e,l){var{type:r,sortable:t,remoteSort:n,filters:a,editRender:d,treeNode:o}=l,{editConfig:i,editOpts:s,checkboxOpts:c}=e,u={renderHeader:this.renderDefaultHeader,renderCell:o?this.renderTreeCell:this.renderDefaultCell,renderFooter:this.renderDefaultFooter};switch(r){case"seq":u.renderHeader=this.renderSeqHeader,u.renderCell=o?this.renderTreeIndexCell:this.renderSeqCell;break;case"radio":u.renderHeader=this.renderRadioHeader,u.renderCell=o?this.renderTreeRadioCell:this.renderRadioCell;break;case"checkbox":u.renderHeader=this.renderCheckboxHeader,u.renderCell=c.checkField?o?this.renderTreeSelectionCellByProp:this.renderCheckboxCellByProp:o?this.renderTreeSelectionCell:this.renderCheckboxCell;break;case"expand":u.renderCell=this.renderExpandCell,u.renderData=this.renderExpandData;break;case"html":u.renderCell=o?this.renderTreeHTMLCell:this.renderHTMLCell,a&&(t||n)?u.renderHeader=this.renderSortAndFilterHeader:t||n?u.renderHeader=this.renderSortHeader:a&&(u.renderHeader=this.renderFilterHeader);break;default:i&&d?(u.renderHeader=this.renderEditHeader,u.renderCell="cell"===s.mode?o?this.renderTreeCellEdit:this.renderCellEdit:o?this.renderTreeRowEdit:this.renderRowEdit):a&&(t||n)?u.renderHeader=this.renderSortAndFilterHeader:t||n?u.renderHeader=this.renderSortHeader:a&&(u.renderHeader=this.renderFilterHeader)}return(0,_util.createColumn)(e,l,u)},renderHeaderTitle(e,l){var{$table:r,column:t}=l,{slots:n,editRender:a,cellRender:d}=t,a=a||d;if(n&&n.header)return renderTitleContent(e,l,r.callSlot(n.header,l,e));if(a){d=renderer.get(a.name),n=d?d.renderTableHeader||d.renderHeader:null;if(n)return(0,_vn.getSlotVNs)(renderTitleContent(e,l,n.call(r,e,a,l)))}return renderTitleContent(e,l,(0,_utils.formatText)(t.getTitle(),1))},renderDefaultHeader(e,l){return renderTitlePrefixIcon(e,l).concat(Cell.renderHeaderTitle(e,l)).concat(renderTitleSuffixIcon(e,l))},renderDefaultCell(e,l){var{$table:r,row:t,column:n}=l,{slots:a,editRender:d,cellRender:o}=n,o=d||o;if(a&&a.default)return renderCellBaseVNs(e,l,r.callSlot(a.default,l,e));if(o){var a=renderer.get(o.name),i=a?a.renderTableDefault||a.renderDefault:null,a=a?a.renderTableCell||a.renderCell:null,a=d?a:i;if(a)return renderCellBaseVNs(e,l,(0,_vn.getSlotVNs)(a.call(r,e,o,Object.assign({$type:d?"edit":"cell"},l))))}i=r.getCellLabel(t,n),a=d?d.placeholder:"";return renderCellBaseVNs(e,l,[e("span",{class:"vxe-cell--label"},[d&&(0,_utils.eqEmptyValue)(i)?e("span",{class:"vxe-cell--placeholder"},(0,_utils.formatText)((0,_utils.getFuncText)(a),1)):e("span",(0,_utils.formatText)(i,1))])])},renderTreeCell(e,l){return Cell.renderTreeIcon(e,l,Cell.renderDefaultCell.call(this,e,l))},renderDefaultFooter(e,l){return[e("span",{class:"vxe-cell--item"},getFooterContent(e,l))]},renderTreeIcon(e,l,r){let{$table:t,isHidden:n}=l;var{treeOpts:a,treeExpandedMaps:d,treeExpandLazyLoadedMaps:o,fullAllDataRowIdData:i}=t,{row:s,column:c,level:u}=l,c=c.slots,{indent:C,lazy:E,trigger:h,iconLoaded:b,showIcon:x,iconOpen:g,iconClose:v}=a,f=a.children||a.childrenField,a=a.hasChild||a.hasChildField,f=s[f],f=f&&f.length;let p=!1,T=!1,_=!1,m=!1;var I={};return c&&c.icon?t.callSlot(c.icon,l,e,r):(n||(c=(0,_util.getRowid)(t,s),T=!!d[c],E&&(d=i[c],_=!!o[c],p=s[a],m=!!d.treeLoaded)),h&&"default"!==h||(I.click=e=>{t.triggerTreeExpandEvent(e,l)}),[e("div",{class:["vxe-cell--tree-node",{"is--active":T}],style:{paddingLeft:u*C+"px"}},[x&&(!E||m?f:p)?[e("div",{class:"vxe-tree--btn-wrapper",on:I},[e("i",{class:["vxe-tree--node-btn",_?b||getIcon().TABLE_TREE_LOADED:T?g||getIcon().TABLE_TREE_OPEN:v||getIcon().TABLE_TREE_CLOSE]})])]:null,e("div",{class:"vxe-tree-cell"},r)])])},renderSeqHeader(e,l){var{$table:r,column:t}=l,n=t.slots;return renderTitleContent(e,l,n&&n.header?r.callSlot(n.header,l,e):(0,_utils.formatText)(t.getTitle(),1))},renderSeqCell(e,l){var{$table:r,column:t}=l,{treeConfig:n,seqOpts:a}=r,t=t.slots;return t&&t.default?renderCellBaseVNs(e,l,r.callSlot(t.default,l,e)):(r=l.seq,t=a.seqMethod,renderCellBaseVNs(e,l,[e("span",""+(0,_utils.formatText)(t?t(l):n?r:(a.startIndex||0)+r,1))]))},renderTreeIndexCell(e,l){return Cell.renderTreeIcon(e,l,Cell.renderSeqCell(e,l))},renderRadioHeader(e,l){var{$table:r,column:t}=l,n=t.slots,a=n?n.header:null,n=n?n.title:null;return renderTitleContent(e,l,a?r.callSlot(a,l,e):[e("span",{class:"vxe-radio--label"},n?r.callSlot(n,l,e):(0,_utils.formatText)(t.getTitle(),1))])},renderRadioCell(e,l){let{$table:r,column:t,isHidden:n}=l;var{radioOpts:a,selectRadioRow:d}=r,o=t.slots,{labelField:a,checkMethod:i,visibleMethod:s}=a,c=l.row,u=o?o.default:null,o=o?o.radio:null,d=c===d;let C=!s||s({row:c}),E=!!i,h;n||(h={click(e){!E&&C&&r.triggerRadioRowEvent(e,l)}},i&&(E=!i({row:c})));s=Object.assign(Object.assign({},l),{checked:d,disabled:E,visible:C});return o?renderCellBaseVNs(e,l,r.callSlot(o,s,e)):(i=[],C&&i.push(e("span",{class:["vxe-radio--icon",d?getIcon().TABLE_RADIO_CHECKED:getIcon().TABLE_RADIO_UNCHECKED]})),(u||a)&&i.push(e("span",{class:"vxe-radio--label"},u?r.callSlot(u,s,e):_xeUtils.default.get(c,a))),renderCellBaseVNs(e,l,[e("span",{class:["vxe-cell--radio",{"is--checked":d,"is--disabled":E}],on:h},i)]))},renderTreeRadioCell(e,l){return Cell.renderTreeIcon(e,l,Cell.renderRadioCell(e,l))},renderCheckboxHeader(e,l){let{$table:r,column:t,isHidden:n}=l,{isAllSelected:a,isIndeterminate:d,isAllCheckboxDisabled:o}=r;var i=t.slots,s=i?i.header:null,i=i?i.title:null,c=r.checkboxOpts,u=t.getTitle();let C;n||(C={click(e){o||r.triggerCheckAllEvent(e,!a)}});l=Object.assign(Object.assign({},l),{checked:a,disabled:o,indeterminate:d});return s?renderTitleContent(e,l,r.callSlot(s,l,e)):(c.checkStrictly?c.showHeader:!1!==c.showHeader)?renderTitleContent(e,l,[e("span",{class:["vxe-cell--checkbox",{"is--checked":a,"is--disabled":o,"is--indeterminate":d}],attrs:{title:getI18n("vxe.table.allTitle")},on:C},[e("span",{class:["vxe-checkbox--icon",d?getIcon().TABLE_CHECKBOX_INDETERMINATE:a?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]})].concat(i||u?[e("span",{class:"vxe-checkbox--label"},i?r.callSlot(i,l,e):u)]:[]))]):renderTitleContent(e,l,[e("span",{class:"vxe-checkbox--label"},i?r.callSlot(i,l,e):u)])},renderCheckboxCell(e,l){let{$table:r,row:t,column:n,isHidden:a}=l;var{treeConfig:d,treeIndeterminateMaps:o,selectCheckboxMaps:i}=r,{labelField:s,checkMethod:c,visibleMethod:u}=r.checkboxOpts,C=n.slots,E=C?C.default:null,C=C?C.checkbox:null;let h=!1,b=!1,x=!u||u({row:t}),g=!!c,v;a||(u=(0,_util.getRowid)(r,t),b=!!i[u],v={click(e){!g&&x&&r.triggerCheckRowEvent(e,l,!b)}},c&&(g=!c({row:t})),d&&(h=!!o[u]));i=Object.assign(Object.assign({},l),{checked:b,disabled:g,visible:x,indeterminate:h});return C?renderCellBaseVNs(e,l,r.callSlot(C,i,e)):(c=[],x&&c.push(e("span",{class:["vxe-checkbox--icon",h?getIcon().TABLE_CHECKBOX_INDETERMINATE:b?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]})),(E||s)&&c.push(e("span",{class:"vxe-checkbox--label"},E?r.callSlot(E,i,e):_xeUtils.default.get(t,s))),renderCellBaseVNs(e,l,[e("span",{class:["vxe-cell--checkbox",{"is--checked":b,"is--disabled":g,"is--indeterminate":h,"is--hidden":!x}],on:v},c)]))},renderTreeSelectionCell(e,l){return Cell.renderTreeIcon(e,l,Cell.renderCheckboxCell(e,l))},renderCheckboxCellByProp(e,l){let{$table:r,row:t,column:n,isHidden:a}=l;var{treeConfig:d,treeIndeterminateMaps:o,checkboxOpts:i}=r,{labelField:s,checkField:c,checkMethod:u,visibleMethod:C}=i,i=i.indeterminateField||i.halfField,E=n.slots,h=E?E.default:null,E=E?E.checkbox:null;let b=!1,x=!1,g=!C||C({row:t}),v=!!u,f;a||(C=(0,_util.getRowid)(r,t),x=_xeUtils.default.get(t,c),f={click(e){!v&&g&&r.triggerCheckRowEvent(e,l,!x)}},u&&(v=!u({row:t})),d&&(b=!!o[C]));c=Object.assign(Object.assign({},l),{checked:x,disabled:v,visible:g,indeterminate:b});return E?renderCellBaseVNs(e,l,r.callSlot(E,c,e)):(u=[],g&&u.push(e("span",{class:["vxe-checkbox--icon",b?getIcon().TABLE_CHECKBOX_INDETERMINATE:x?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]})),(h||s)&&u.push(e("span",{class:"vxe-checkbox--label"},h?r.callSlot(h,c,e):_xeUtils.default.get(t,s))),renderCellBaseVNs(e,l,[e("span",{class:["vxe-cell--checkbox",{"is--checked":x,"is--disabled":v,"is--indeterminate":i&&!x?t[i]:b,"is--hidden":!g}],on:f},u)]))},renderTreeSelectionCellByProp(e,l){return Cell.renderTreeIcon(e,l,Cell.renderCheckboxCellByProp(e,l))},renderExpandCell(e,l){let{$table:r,isHidden:t,row:n,column:a}=l;var{expandOpts:d,rowExpandedMaps:o,rowExpandLazyLoadedMaps:i}=r,{lazy:d,labelField:s,iconLoaded:c,showIcon:u,iconOpen:C,iconClose:E,visibleMethod:h}=d,b=a.slots,x=b?b.default:null;let g=!1,v=!1;return b&&b.icon?renderCellBaseVNs(e,l,r.callSlot(b.icon,l,e)):(t||(b=(0,_util.getRowid)(r,n),g=!!o[b],d&&(v=!!i[b])),renderCellBaseVNs(e,l,[!u||h&&!h(l)?renderEmptyElement(r):e("span",{class:["vxe-table--expanded",{"is--active":g}],on:{click(e){r.triggerRowExpandEvent(e,l)}}},[e("i",{class:["vxe-table--expand-btn",v?c||getIcon().TABLE_EXPAND_LOADED:g?C||getIcon().TABLE_EXPAND_OPEN:E||getIcon().TABLE_EXPAND_CLOSE]})]),x||s?e("span",{class:"vxe-table--expand-label"},x?r.callSlot(x,l,e):_xeUtils.default.get(n,s)):renderEmptyElement(r)]))},renderExpandData(e,l){var{$table:r,column:t}=l,{slots:t,contentRender:n}=t;if(t&&t.content)return r.callSlot(t.content,l,e);if(n){t=renderer.get(n.name),t=t?t.renderTableExpand||t.renderExpand:null;if(t)return(0,_vn.getSlotVNs)(t.call(r,e,n,l))}return[]},renderHTMLCell(e,l){var{$table:r,column:t}=l,t=t.slots;return t&&t.default?renderCellBaseVNs(e,l,r.callSlot(t.default,l,e)):renderCellBaseVNs(e,l,[e("span",{class:"vxe-cell--html",domProps:{innerHTML:getDefaultCellLabel(l)}})])},renderTreeHTMLCell(e,l){return Cell.renderTreeIcon(e,l,Cell.renderHTMLCell(e,l))},renderSortAndFilterHeader(e,l){return Cell.renderDefaultHeader(e,l).concat(Cell.renderSortIcon(e,l)).concat(Cell.renderFilterIcon(e,l))},renderSortHeader(e,l){return Cell.renderDefaultHeader(e,l).concat(Cell.renderSortIcon(e,l))},renderSortIcon(e,l){let{$table:r,column:t}=l;var{showIcon:l,iconLayout:n,iconAsc:a,iconDesc:d}=r.sortOpts;return l?[e("span",{class:["vxe-cell--sort",`vxe-cell--sort-${n}-layout`]},[e("i",{class:["vxe-sort--asc-btn",a||getIcon().TABLE_SORT_ASC,{"sort--active":"asc"===t.order}],attrs:{title:getI18n("vxe.table.sortAsc")},on:{click(e){e.stopPropagation(),r.triggerSortEvent(e,t,"asc")}}}),e("i",{class:["vxe-sort--desc-btn",d||getIcon().TABLE_SORT_DESC,{"sort--active":"desc"===t.order}],attrs:{title:getI18n("vxe.table.sortDesc")},on:{click(e){e.stopPropagation(),r.triggerSortEvent(e,t,"desc")}}})])]:[]},renderFilterHeader(e,l){return Cell.renderDefaultHeader(e,l).concat(Cell.renderFilterIcon(e,l))},renderFilterIcon(e,l){let{$table:r,column:t,hasFilter:n}=l;var{filterStore:a,filterOpts:d}=r,{showIcon:d,iconNone:o,iconMatch:i}=d;return d?[e("span",{class:["vxe-cell--filter",{"is--active":a.visible&&a.column===t}]},[e("i",{class:["vxe-filter--btn",n?i||getIcon().TABLE_FILTER_MATCH:o||getIcon().TABLE_FILTER_NONE],attrs:{title:getI18n("vxe.table.filter")},on:{click(e){r.triggerFilterEvent&&r.triggerFilterEvent(e,l.column,l)}}})])]:[]},renderEditHeader(e,l){var{$table:r,column:t}=l,{editConfig:r,editRules:n,editOpts:a}=r,{sortable:d,remoteSort:o,filters:i,editRender:s}=t;let c=!1;return n&&(n=_xeUtils.default.get(n,t.field))&&(c=n.some(e=>e.required)),((0,_utils.isEnableConf)(r)?[c&&a.showAsterisk?e("i",{class:"vxe-cell--required-icon"}):null,(0,_utils.isEnableConf)(s)&&a.showIcon?e("i",{class:["vxe-cell--edit-icon",a.icon||getIcon().TABLE_EDIT]}):null]:[]).concat(Cell.renderDefaultHeader(e,l)).concat(d||o?Cell.renderSortIcon(e,l):[]).concat(i?Cell.renderFilterIcon(e,l):[])},renderRowEdit(e,l){var{$table:r,column:t}=l,t=t.editRender,r=r.editStore.actived;return Cell.runRenderer(e,l,this,(0,_utils.isEnableConf)(t)&&r&&r.row===l.row)},renderTreeRowEdit(e,l){return Cell.renderTreeIcon(e,l,Cell.renderRowEdit(e,l))},renderCellEdit(e,l){var{$table:r,column:t}=l,t=t.editRender,r=r.editStore.actived;return Cell.runRenderer(e,l,this,(0,_utils.isEnableConf)(t)&&r&&r.row===l.row&&r.column===l.column)},renderTreeCellEdit(e,l){return Cell.renderTreeIcon(e,l,Cell.renderCellEdit(e,l))},runRenderer(e,l,r,t){var{$table:n,column:a}=l,{slots:a,editRender:d,formatter:o}=a,i=renderer.get(d.name),i=i?i.renderTableEdit||i.renderEdit:null,s=Object.assign({$type:"",isEdit:t},l);return t?a&&a.edit?n.callSlot(a.edit,s,e):i?(0,_vn.getSlotVNs)(i.call(n,e,d,s)):[]:a&&a.default?renderCellBaseVNs(e,l,n.callSlot(a.default,s,e)):o?renderCellBaseVNs(e,l,[e("span",{class:"vxe-cell--label"},[getDefaultCellLabel(s)])]):Cell.renderDefaultCell.call(r,e,s)}};var _default=exports.default=Cell;
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=exports.Cell=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_utils=require("../../ui/src/utils"),_dom=require("../../ui/src/dom"),_util=require("./util"),_vn=require("../../ui/src/vn");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}let{getI18n,getIcon,renderer,formats,renderEmptyElement}=_ui.VxeUI;function renderTitlePrefixIcon(e,l){let{$table:r,column:t}=l,n=t.titlePrefix||t.titleHelp;return n?[e("i",{class:["vxe-cell-title-prefix-icon",n.icon||getIcon().TABLE_TITLE_PREFIX],on:{mouseenter(e){r.triggerHeaderTitleEvent(e,n,l)},mouseleave(e){r.handleTargetLeaveEvent(e)}}})]:[]}function renderTitleSuffixIcon(e,l){let{$table:r,column:t}=l,n=t.titleSuffix;return n?[e("i",{class:["vxe-cell-title-suffix-icon",n.icon||getIcon().TABLE_TITLE_SUFFIX],on:{mouseenter(e){r.triggerHeaderTitleEvent(e,n,l)},mouseleave(e){r.handleTargetLeaveEvent(e)}}})]:[]}function renderCellDragIcon(e,l){let r=l.$table;var{rowIcon:t,rowDisabledMethod:n}=r.computeDragOpts;let a=n&&n(l);return e("span",{key:"dg",class:["vxe-cell--drag-handle",{"is--disabled":a}],on:{mousedown(e){a||r.handleCellDragMousedownEvent(e,l)},mouseup:r.handleCellDragMouseupEvent}},[e("i",{class:t||getIcon().TABLE_DRAG_ROW})])}function renderCellBaseVNs(e,l,r){var{$table:t,column:n,row:a,level:d}=l,o=n.dragSort,i=t.treeConfig,s=t.computeRowOpts,{showRowIcon:t,rowVisibleMethod:c}=t.computeDragOpts,r=_xeUtils.default.isArray(r)?r:[r];return!(o&&s.drag&&t)||c&&!c({row:a,column:n})||i&&d||r.unshift(renderCellDragIcon(e,l)),r}function renderTitleContent(e,l,r){let{$table:t,column:n}=l;var{type:a,showHeaderOverflow:d}=n,{showHeaderOverflow:o,tooltipOpts:i}=t;let s=i.showAll||i.enabled;i=_xeUtils.default.isUndefined(d)||_xeUtils.default.isNull(d)?o:d;let c="title"===i,u=!0===i||"tooltip"===i;o={};return(c||u||s)&&(o.mouseenter=e=>{t._isResize||(c?(0,_dom.updateCellTitle)(e.currentTarget,n):(u||s)&&t.triggerHeaderTooltipEvent(e,l))}),(u||s)&&(o.mouseleave=e=>{t._isResize||(u||s)&&t.handleTargetLeaveEvent(e)}),["html"===a&&_xeUtils.default.isString(r)?e("span",{class:"vxe-cell--title",domProps:{innerHTML:r},on:o}):e("span",{class:"vxe-cell--title",on:o},(0,_vn.getSlotVNs)(r))]}function formatFooterLabel(e,l){var r,t;return _xeUtils.default.isFunction(e)?e(l):(t=(t=(r=_xeUtils.default.isArray(e))?formats.get(e[0]):formats.get(e))?t.tableFooterCellFormatMethod:null)?r?t(l,...e.slice(1)):t(l):""}function getFooterContent(e,l){var{$table:r,column:t,_columnIndex:n,row:a,items:d}=l,{slots:o,editRender:i,cellRender:s,footerFormatter:c}=t,i=i||s;if(o&&o.footer)return r.callSlot(o.footer,l,e);if(i){s=renderer.get(i.name),o=s?s.renderTableFooter||s.renderFooter:null;if(o)return(0,_vn.getSlotVNs)(o.call(r,e,i,l))}let u="";return _xeUtils.default.isArray(d)?u=d[n]:u=_xeUtils.default.get(a,t.field),[c?formatFooterLabel(c,{itemValue:u,column:t,row:a,items:d,_columnIndex:n}):(0,_utils.formatText)(u,1)]}function getDefaultCellLabel(e){var{$table:e,row:l,column:r}=e;return(0,_utils.formatText)(e.getCellLabel(l,r),1)}let Cell=exports.Cell={createColumn(e,l){var{type:r,sortable:t,remoteSort:n,filters:a,editRender:d,treeNode:o}=l,{editConfig:i,editOpts:s,checkboxOpts:c}=e,u={renderHeader:this.renderDefaultHeader,renderCell:o?this.renderTreeCell:this.renderDefaultCell,renderFooter:this.renderDefaultFooter};switch(r){case"seq":u.renderHeader=this.renderSeqHeader,u.renderCell=o?this.renderTreeIndexCell:this.renderSeqCell;break;case"radio":u.renderHeader=this.renderRadioHeader,u.renderCell=o?this.renderTreeRadioCell:this.renderRadioCell;break;case"checkbox":u.renderHeader=this.renderCheckboxHeader,u.renderCell=c.checkField?o?this.renderTreeSelectionCellByProp:this.renderCheckboxCellByProp:o?this.renderTreeSelectionCell:this.renderCheckboxCell;break;case"expand":u.renderCell=this.renderExpandCell,u.renderData=this.renderExpandData;break;case"html":u.renderCell=o?this.renderTreeHTMLCell:this.renderHTMLCell,a&&(t||n)?u.renderHeader=this.renderSortAndFilterHeader:t||n?u.renderHeader=this.renderSortHeader:a&&(u.renderHeader=this.renderFilterHeader);break;default:i&&d?(u.renderHeader=this.renderEditHeader,u.renderCell="cell"===s.mode?o?this.renderTreeCellEdit:this.renderCellEdit:o?this.renderTreeRowEdit:this.renderRowEdit):a&&(t||n)?u.renderHeader=this.renderSortAndFilterHeader:t||n?u.renderHeader=this.renderSortHeader:a&&(u.renderHeader=this.renderFilterHeader)}return(0,_util.createColumn)(e,l,u)},renderHeaderTitle(e,l){var{$table:r,column:t}=l,{slots:n,editRender:a,cellRender:d}=t,a=a||d;if(n&&n.header)return renderTitleContent(e,l,r.callSlot(n.header,l,e));if(a){d=renderer.get(a.name),n=d?d.renderTableHeader||d.renderHeader:null;if(n)return(0,_vn.getSlotVNs)(renderTitleContent(e,l,n.call(r,e,a,l)))}return renderTitleContent(e,l,(0,_utils.formatText)(t.getTitle(),1))},renderDefaultHeader(e,l){return renderTitlePrefixIcon(e,l).concat(Cell.renderHeaderTitle(e,l)).concat(renderTitleSuffixIcon(e,l))},renderDefaultCell(e,l){var{$table:r,row:t,column:n}=l,{slots:a,editRender:d,cellRender:o}=n,o=d||o;if(a&&a.default)return renderCellBaseVNs(e,l,r.callSlot(a.default,l,e));if(o){var a=renderer.get(o.name),i=a?a.renderTableDefault||a.renderDefault:null,a=a?a.renderTableCell||a.renderCell:null,a=d?a:i;if(a)return renderCellBaseVNs(e,l,(0,_vn.getSlotVNs)(a.call(r,e,o,Object.assign({$type:d?"edit":"cell"},l))))}i=r.getCellLabel(t,n),a=d?d.placeholder:"";return renderCellBaseVNs(e,l,[e("span",{class:"vxe-cell--label"},[d&&(0,_utils.eqEmptyValue)(i)?e("span",{class:"vxe-cell--placeholder"},(0,_utils.formatText)((0,_utils.getFuncText)(a),1)):e("span",(0,_utils.formatText)(i,1))])])},renderTreeCell(e,l){return Cell.renderTreeIcon(e,l,Cell.renderDefaultCell.call(this,e,l))},renderDefaultFooter(e,l){return[e("span",{class:"vxe-cell--item"},getFooterContent(e,l))]},renderTreeIcon(e,l,r){let{$table:t,isHidden:n}=l;var{treeOpts:a,treeExpandedMaps:d,treeExpandLazyLoadedMaps:o,fullAllDataRowIdData:i}=t,{row:s,column:c,level:u}=l,c=c.slots,{indent:C,lazy:E,trigger:h,iconLoaded:b,showIcon:x,iconOpen:g,iconClose:v}=a,f=a.children||a.childrenField,a=a.hasChild||a.hasChildField,f=s[f],f=f&&f.length;let p=!1,T=!1,_=!1,m=!1;var I={};return c&&c.icon?t.callSlot(c.icon,l,e,r):(n||(c=(0,_util.getRowid)(t,s),T=!!d[c],E&&(d=i[c],_=!!o[c],p=s[a],m=!!d.treeLoaded)),h&&"default"!==h||(I.click=e=>{t.triggerTreeExpandEvent(e,l)}),[e("div",{class:["vxe-cell--tree-node",{"is--active":T}],style:{paddingLeft:u*C+"px"}},[x&&(!E||m?f:p)?[e("div",{class:"vxe-tree--btn-wrapper",on:I},[e("i",{class:["vxe-tree--node-btn",_?b||getIcon().TABLE_TREE_LOADED:T?g||getIcon().TABLE_TREE_OPEN:v||getIcon().TABLE_TREE_CLOSE]})])]:null,e("div",{class:"vxe-tree-cell"},r)])])},renderSeqHeader(e,l){var{$table:r,column:t}=l,n=t.slots;return renderTitleContent(e,l,n&&n.header?r.callSlot(n.header,l,e):(0,_utils.formatText)(t.getTitle(),1))},renderSeqCell(e,l){var{$table:r,column:t}=l,{treeConfig:n,seqOpts:a}=r,t=t.slots;return t&&t.default?renderCellBaseVNs(e,l,r.callSlot(t.default,l,e)):(r=l.seq,t=a.seqMethod,renderCellBaseVNs(e,l,[e("span",""+(0,_utils.formatText)(t?t(l):n?r:(a.startIndex||0)+r,1))]))},renderTreeIndexCell(e,l){return Cell.renderTreeIcon(e,l,Cell.renderSeqCell(e,l))},renderRadioHeader(e,l){var{$table:r,column:t}=l,n=t.slots,a=n?n.header:null,n=n?n.title:null;return renderTitleContent(e,l,a?r.callSlot(a,l,e):[e("span",{class:"vxe-radio--label"},n?r.callSlot(n,l,e):(0,_utils.formatText)(t.getTitle(),1))])},renderRadioCell(e,l){let{$table:r,column:t,isHidden:n}=l;var{radioOpts:a,selectRadioRow:d}=r,o=t.slots,{labelField:a,checkMethod:i,visibleMethod:s}=a,c=l.row,u=o?o.default:null,o=o?o.radio:null,d=c===d;let C=!s||s({row:c}),E=!!i,h;n||(h={click(e){!E&&C&&r.triggerRadioRowEvent(e,l)}},i&&(E=!i({row:c})));s=Object.assign(Object.assign({},l),{checked:d,disabled:E,visible:C});return o?renderCellBaseVNs(e,l,r.callSlot(o,s,e)):(i=[],C&&i.push(e("span",{class:["vxe-radio--icon",d?getIcon().TABLE_RADIO_CHECKED:getIcon().TABLE_RADIO_UNCHECKED]})),(u||a)&&i.push(e("span",{class:"vxe-radio--label"},u?r.callSlot(u,s,e):_xeUtils.default.get(c,a))),renderCellBaseVNs(e,l,[e("span",{class:["vxe-cell--radio",{"is--checked":d,"is--disabled":E}],on:h},i)]))},renderTreeRadioCell(e,l){return Cell.renderTreeIcon(e,l,Cell.renderRadioCell(e,l))},renderCheckboxHeader(e,l){let{$table:r,column:t,isHidden:n}=l,{isAllSelected:a,isIndeterminate:d,isAllCheckboxDisabled:o}=r;var i=t.slots,s=i?i.header:null,i=i?i.title:null,c=r.checkboxOpts,u=t.getTitle();let C;n||(C={click(e){o||r.triggerCheckAllEvent(e,!a)}});l=Object.assign(Object.assign({},l),{checked:a,disabled:o,indeterminate:d});return s?renderTitleContent(e,l,r.callSlot(s,l,e)):(c.checkStrictly?c.showHeader:!1!==c.showHeader)?renderTitleContent(e,l,[e("span",{class:["vxe-cell--checkbox",{"is--checked":a,"is--disabled":o,"is--indeterminate":d}],attrs:{title:getI18n("vxe.table.allTitle")},on:C},[e("span",{class:["vxe-checkbox--icon",d?getIcon().TABLE_CHECKBOX_INDETERMINATE:a?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]})].concat(i||u?[e("span",{class:"vxe-checkbox--label"},i?r.callSlot(i,l,e):u)]:[]))]):renderTitleContent(e,l,[e("span",{class:"vxe-checkbox--label"},i?r.callSlot(i,l,e):u)])},renderCheckboxCell(e,l){let{$table:r,row:t,column:n,isHidden:a}=l;var{treeConfig:d,treeIndeterminateMaps:o,selectCheckboxMaps:i}=r,{labelField:s,checkMethod:c,visibleMethod:u}=r.checkboxOpts,C=n.slots,E=C?C.default:null,C=C?C.checkbox:null;let h=!1,b=!1,x=!u||u({row:t}),g=!!c,v;a||(u=(0,_util.getRowid)(r,t),b=!!i[u],v={click(e){!g&&x&&r.triggerCheckRowEvent(e,l,!b)}},c&&(g=!c({row:t})),d&&(h=!!o[u]));i=Object.assign(Object.assign({},l),{checked:b,disabled:g,visible:x,indeterminate:h});return C?renderCellBaseVNs(e,l,r.callSlot(C,i,e)):(c=[],x&&c.push(e("span",{class:["vxe-checkbox--icon",h?getIcon().TABLE_CHECKBOX_INDETERMINATE:b?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]})),(E||s)&&c.push(e("span",{class:"vxe-checkbox--label"},E?r.callSlot(E,i,e):_xeUtils.default.get(t,s))),renderCellBaseVNs(e,l,[e("span",{class:["vxe-cell--checkbox",{"is--checked":b,"is--disabled":g,"is--indeterminate":h,"is--hidden":!x}],on:v},c)]))},renderTreeSelectionCell(e,l){return Cell.renderTreeIcon(e,l,Cell.renderCheckboxCell(e,l))},renderCheckboxCellByProp(e,l){let{$table:r,row:t,column:n,isHidden:a}=l;var{treeConfig:d,treeIndeterminateMaps:o,checkboxOpts:i}=r,{labelField:s,checkField:c,checkMethod:u,visibleMethod:C}=i,i=i.indeterminateField||i.halfField,E=n.slots,h=E?E.default:null,E=E?E.checkbox:null;let b=!1,x=!1,g=!C||C({row:t}),v=!!u,f;a||(C=(0,_util.getRowid)(r,t),x=_xeUtils.default.get(t,c),f={click(e){!v&&g&&r.triggerCheckRowEvent(e,l,!x)}},u&&(v=!u({row:t})),d&&(b=!!o[C]));c=Object.assign(Object.assign({},l),{checked:x,disabled:v,visible:g,indeterminate:b});return E?renderCellBaseVNs(e,l,r.callSlot(E,c,e)):(u=[],g&&u.push(e("span",{class:["vxe-checkbox--icon",b?getIcon().TABLE_CHECKBOX_INDETERMINATE:x?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]})),(h||s)&&u.push(e("span",{class:"vxe-checkbox--label"},h?r.callSlot(h,c,e):_xeUtils.default.get(t,s))),renderCellBaseVNs(e,l,[e("span",{class:["vxe-cell--checkbox",{"is--checked":x,"is--disabled":v,"is--indeterminate":i&&!x?t[i]:b,"is--hidden":!g}],on:f},u)]))},renderTreeSelectionCellByProp(e,l){return Cell.renderTreeIcon(e,l,Cell.renderCheckboxCellByProp(e,l))},renderExpandCell(e,l){let{$table:r,isHidden:t,row:n,column:a}=l;var{expandOpts:d,rowExpandedMaps:o,rowExpandLazyLoadedMaps:i}=r,{lazy:d,labelField:s,iconLoaded:c,showIcon:u,iconOpen:C,iconClose:E,visibleMethod:h}=d,b=a.slots,x=b?b.default:null;let g=!1,v=!1;return b&&b.icon?renderCellBaseVNs(e,l,r.callSlot(b.icon,l,e)):(t||(b=(0,_util.getRowid)(r,n),g=!!o[b],d&&(v=!!i[b])),renderCellBaseVNs(e,l,[!u||h&&!h(l)?renderEmptyElement(r):e("span",{class:["vxe-table--expanded",{"is--active":g}],on:{click(e){r.triggerRowExpandEvent(e,l)}}},[e("i",{class:["vxe-table--expand-btn",v?c||getIcon().TABLE_EXPAND_LOADED:g?C||getIcon().TABLE_EXPAND_OPEN:E||getIcon().TABLE_EXPAND_CLOSE]})]),x||s?e("span",{class:"vxe-table--expand-label"},x?r.callSlot(x,l,e):_xeUtils.default.get(n,s)):renderEmptyElement(r)]))},renderExpandData(e,l){var{$table:r,column:t}=l,{slots:t,contentRender:n}=t;if(t&&t.content)return r.callSlot(t.content,l,e);if(n){t=renderer.get(n.name),t=t?t.renderTableExpand||t.renderExpand:null;if(t)return(0,_vn.getSlotVNs)(t.call(r,e,n,l))}return[]},renderHTMLCell(e,l){var{$table:r,column:t}=l,t=t.slots;return t&&t.default?renderCellBaseVNs(e,l,r.callSlot(t.default,l,e)):renderCellBaseVNs(e,l,[e("span",{class:"vxe-cell--html",domProps:{innerHTML:getDefaultCellLabel(l)}})])},renderTreeHTMLCell(e,l){return Cell.renderTreeIcon(e,l,Cell.renderHTMLCell(e,l))},renderSortAndFilterHeader(e,l){return Cell.renderDefaultHeader(e,l).concat(Cell.renderSortIcon(e,l)).concat(Cell.renderFilterIcon(e,l))},renderSortHeader(e,l){return Cell.renderDefaultHeader(e,l).concat(Cell.renderSortIcon(e,l))},renderSortIcon(e,l){let{$table:r,column:t}=l;var{showIcon:l,iconLayout:n,iconAsc:a,iconDesc:d}=r.sortOpts;return l?[e("span",{class:["vxe-cell--sort",`vxe-cell--sort-${n}-layout`]},[e("i",{class:["vxe-sort--asc-btn",a||getIcon().TABLE_SORT_ASC,{"sort--active":"asc"===t.order}],attrs:{title:getI18n("vxe.table.sortAsc")},on:{click(e){e.stopPropagation(),r.triggerSortEvent(e,t,"asc")}}}),e("i",{class:["vxe-sort--desc-btn",d||getIcon().TABLE_SORT_DESC,{"sort--active":"desc"===t.order}],attrs:{title:getI18n("vxe.table.sortDesc")},on:{click(e){e.stopPropagation(),r.triggerSortEvent(e,t,"desc")}}})])]:[]},renderFilterHeader(e,l){return Cell.renderDefaultHeader(e,l).concat(Cell.renderFilterIcon(e,l))},renderFilterIcon(e,l){let{$table:r,column:t,hasFilter:n}=l;var{filterStore:a,filterOpts:d}=r,{showIcon:d,iconNone:o,iconMatch:i}=d;return d?[e("span",{class:["vxe-cell--filter",{"is--active":a.visible&&a.column===t}]},[e("i",{class:["vxe-filter--btn",n?i||getIcon().TABLE_FILTER_MATCH:o||getIcon().TABLE_FILTER_NONE],attrs:{title:getI18n("vxe.table.filter")},on:{click(e){r.triggerFilterEvent&&r.triggerFilterEvent(e,l.column,l)}}})])]:[]},renderEditHeader(e,l){var{$table:r,column:t}=l,{editConfig:r,editRules:n,editOpts:a}=r,{sortable:d,remoteSort:o,filters:i,editRender:s}=t;let c=!1;return n&&(n=_xeUtils.default.get(n,t.field))&&(c=n.some(e=>e.required)),((0,_utils.isEnableConf)(r)?[c&&a.showAsterisk?e("i",{class:"vxe-cell--required-icon"}):null,(0,_utils.isEnableConf)(s)&&a.showIcon?e("i",{class:["vxe-cell--edit-icon",a.icon||getIcon().TABLE_EDIT]}):null]:[]).concat(Cell.renderDefaultHeader(e,l)).concat(d||o?Cell.renderSortIcon(e,l):[]).concat(i?Cell.renderFilterIcon(e,l):[])},renderRowEdit(e,l){var{$table:r,column:t}=l,t=t.editRender,r=r.editStore.actived;return Cell.runRenderer(e,l,this,(0,_utils.isEnableConf)(t)&&r&&r.row===l.row)},renderTreeRowEdit(e,l){return Cell.renderTreeIcon(e,l,Cell.renderRowEdit(e,l))},renderCellEdit(e,l){var{$table:r,column:t}=l,t=t.editRender,r=r.editStore.actived;return Cell.runRenderer(e,l,this,(0,_utils.isEnableConf)(t)&&r&&r.row===l.row&&r.column===l.column)},renderTreeCellEdit(e,l){return Cell.renderTreeIcon(e,l,Cell.renderCellEdit(e,l))},runRenderer(e,l,r,t){var{$table:n,column:a}=l,{slots:a,editRender:d,formatter:o}=a,i=renderer.get(d.name),i=i?i.renderTableEdit||i.renderEdit:null,s=Object.assign({$type:"",isEdit:t},l);return t?a&&a.edit?n.callSlot(a.edit,s,e):i?(0,_vn.getSlotVNs)(i.call(n,e,d,s)):[]:a&&a.default?renderCellBaseVNs(e,l,n.callSlot(a.default,s,e)):o?renderCellBaseVNs(e,l,[e("span",{class:"vxe-cell--label"},[getDefaultCellLabel(s)])]):Cell.renderDefaultCell.call(r,e,s)}};var _default=exports.default=Cell;

package/lib/table/src/header.js

@@ -85,7 +85,7 @@ var _default = exports.default = {
       tId,
       isGroup,
       visibleColumn,
-      resizable,
+      resizable: allResizable,
       border,
       columnKey,
       headerRowClassName,
@@ -256,7 +256,7 @@ var _default = exports.default = {
         /**
          * 列宽拖动
          */
-        !fixedHiddenColumn && !isColGroup && (_xeUtils.default.isBoolean(column.resizable) ? column.resizable : columnOpts.resizable || resizable) ? h('div', {
+        !fixedHiddenColumn && !isColGroup && (_xeUtils.default.isBoolean(column.resizable) ? column.resizable : columnOpts.resizable || allResizable) ? h('div', {
           class: ['vxe-resizable', {
             'is--line': !border || border === 'none'
           }],

package/lib/table/src/methods.js

@@ -397,6 +397,16 @@ function clearRowDropOrigin($xeTable) {
     });
   }
 }
+function updateRowDropOrigin($xeTable, row) {
+  const el = $xeTable.$el;
+  if (el) {
+    const clss = 'row--drag-origin';
+    const rowid = (0, _util.getRowid)($xeTable, row);
+    _xeUtils.default.arrayEach(el.querySelectorAll(`[rowid="${rowid}"]`), elem => {
+      (0, _dom.addClass)(elem, clss);
+    });
+  }
+}
 function clearRowDropTarget($xeTable) {
   const el = $xeTable.$el;
   if (el) {
@@ -406,6 +416,17 @@ function clearRowDropTarget($xeTable) {
     });
   }
 }
+function updateRowDropTarget($xeTable, row, dragPos) {
+  const el = $xeTable.$el;
+  if (el) {
+    const clss = 'row--drag-active-target';
+    const rowid = (0, _util.getRowid)($xeTable, row);
+    _xeUtils.default.arrayEach(el.querySelectorAll(`[rowid="${rowid}"]`), elem => {
+      (0, _dom.addClass)(elem, clss);
+      elem.setAttribute('drag-pos', dragPos);
+    });
+  }
+}
 function showRowDropTip(evnt, $xeTable) {
   const rdTipEl = $xeTable.$refs.refRowDragTipElem;
   if (!rdTipEl) {
@@ -430,7 +451,22 @@ const hideRowDropTip = $xeTable => {
 };
 const updateRowDropTipContent = ($xeTable, tdEl) => {
   const reactData = $xeTable;
-  reactData.dragTipText = tdEl.textContent || '';
+  const {
+    dragRow
+  } = reactData;
+  const dragOpts = $xeTable.computeDragOpts;
+  const {
+    rowTooltipMethod
+  } = dragOpts;
+  let tipContent = '';
+  if (rowTooltipMethod) {
+    tipContent = `${rowTooltipMethod({
+      row: dragRow
+    }) || ''}`;
+  } else {
+    tipContent = getI18n('vxe.table.dragTip', [tdEl.textContent || '']);
+  }
+  reactData.dragTipText = tipContent;
 };
 const Methods = {
   callSlot(slotFunc, params, h, vNodes) {
@@ -5481,7 +5517,9 @@ const Methods = {
     } = reactData;
     const {
       afterFullData,
+      afterTreeFullData,
       tableFullData,
+      tableFullTreeData,
       prevDragRow,
       prevDragPos
     } = internalData;
@@ -5496,18 +5534,35 @@ const Methods = {
             return;
           }
           const dragOffsetIndex = prevDragPos === 'bottom' ? 1 : 0;
-          // 移出源位置
-          const oafIndex = $xeTable.findRowIndexOf(afterFullData, dragRow);
-          const otfIndex = $xeTable.findRowIndexOf(tableFullData, dragRow);
-          afterFullData.splice(oafIndex, 1);
-          tableFullData.splice(otfIndex, 1);
-          // 插新位置
-          const pafIndex = $xeTable.findRowIndexOf(afterFullData, prevDragRow);
-          const ptfIndex = $xeTable.findRowIndexOf(tableFullData, prevDragRow);
-          const nafIndex = pafIndex + dragOffsetIndex;
-          const ntfIndex = ptfIndex + dragOffsetIndex;
-          afterFullData.splice(nafIndex, 0, dragRow);
-          tableFullData.splice(ntfIndex, 0, dragRow);
+          let oafIndex = -1;
+          let nafIndex = -1;
+          if (treeConfig) {
+            // 移出源位置
+            oafIndex = $xeTable.findRowIndexOf(afterTreeFullData, dragRow);
+            const otfIndex = $xeTable.findRowIndexOf(tableFullTreeData, dragRow);
+            afterTreeFullData.splice(oafIndex, 1);
+            tableFullTreeData.splice(otfIndex, 1);
+            // 插新位置
+            const pafIndex = $xeTable.findRowIndexOf(afterTreeFullData, prevDragRow);
+            const ptfIndex = $xeTable.findRowIndexOf(tableFullTreeData, prevDragRow);
+            nafIndex = pafIndex + dragOffsetIndex;
+            const ntfIndex = ptfIndex + dragOffsetIndex;
+            afterTreeFullData.splice(nafIndex, 0, dragRow);
+            tableFullTreeData.splice(ntfIndex, 0, dragRow);
+          } else {
+            // 移出源位置
+            oafIndex = $xeTable.findRowIndexOf(afterFullData, dragRow);
+            const otfIndex = $xeTable.findRowIndexOf(tableFullData, dragRow);
+            afterFullData.splice(oafIndex, 1);
+            tableFullData.splice(otfIndex, 1);
+            // 插新位置
+            const pafIndex = $xeTable.findRowIndexOf(afterFullData, prevDragRow);
+            const ptfIndex = $xeTable.findRowIndexOf(tableFullData, prevDragRow);
+            nafIndex = pafIndex + dragOffsetIndex;
+            const ntfIndex = ptfIndex + dragOffsetIndex;
+            afterFullData.splice(nafIndex, 0, dragRow);
+            tableFullData.splice(ntfIndex, 0, dragRow);
+          }
           reactData.isDragRowMove = true;
           $xeTable.cacheRowMap();
           $xeTable.updateScrollYStatus();
@@ -5559,8 +5614,7 @@ const Methods = {
       } = reactData;
       const offsetY = evnt.clientY - trEl.getBoundingClientRect().y;
       const dragPos = offsetY < trEl.clientHeight / 2 ? 'top' : 'bottom';
-      (0, _dom.addClass)(trEl, 'row--drag-active-target');
-      trEl.setAttribute('drag-pos', dragPos);
+      updateRowDropTarget($xeTable, row, dragPos);
       internalData.prevDragRow = row;
       internalData.prevDragPos = dragPos;
       $xeTable.dispatchEvent('row-dragover', {
@@ -5596,7 +5650,7 @@ const Methods = {
     }
     reactData.dragRow = row;
     trEl.draggable = true;
-    (0, _dom.addClass)(trEl, 'row--drag-origin');
+    updateRowDropOrigin($xeTable, row);
     showRowDropTip(evnt, $xeTable);
     updateRowDropTipContent($xeTable, tdEl);
     $xeTable.dispatchEvent('row-dragstart', params, evnt);