vxe-table 4.8.4 → 4.8.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (45) hide show
  1. package/README.md +12 -12
  2. package/es/grid/src/grid.js +1 -1
  3. package/es/style.css +1 -1
  4. package/es/style.min.css +1 -1
  5. package/es/table/module/custom/hook.js +135 -3
  6. package/es/table/module/custom/panel.js +151 -175
  7. package/es/table/src/table.js +8 -28
  8. package/es/table/style.css +42 -37
  9. package/es/table/style.min.css +1 -1
  10. package/es/ui/index.js +1 -1
  11. package/es/ui/src/log.js +1 -1
  12. package/es/vxe-table/style.css +42 -37
  13. package/es/vxe-table/style.min.css +1 -1
  14. package/lib/grid/src/grid.js +1 -1
  15. package/lib/grid/src/grid.min.js +1 -1
  16. package/lib/index.umd.js +265 -197
  17. package/lib/index.umd.min.js +1 -1
  18. package/lib/style.css +1 -1
  19. package/lib/style.min.css +1 -1
  20. package/lib/table/module/custom/hook.js +177 -3
  21. package/lib/table/module/custom/hook.min.js +1 -1
  22. package/lib/table/module/custom/panel.js +77 -157
  23. package/lib/table/module/custom/panel.min.js +1 -1
  24. package/lib/table/src/table.js +8 -34
  25. package/lib/table/src/table.min.js +1 -1
  26. package/lib/table/style/style.css +42 -37
  27. package/lib/table/style/style.min.css +1 -1
  28. package/lib/ui/index.js +1 -1
  29. package/lib/ui/index.min.js +1 -1
  30. package/lib/ui/src/log.js +1 -1
  31. package/lib/ui/src/log.min.js +1 -1
  32. package/lib/vxe-table/style/style.css +42 -37
  33. package/lib/vxe-table/style/style.min.css +1 -1
  34. package/package.json +2 -2
  35. package/packages/grid/src/grid.ts +1 -1
  36. package/packages/table/module/custom/hook.ts +136 -3
  37. package/packages/table/module/custom/panel.ts +157 -179
  38. package/packages/table/src/table.ts +8 -28
  39. package/styles/components/table-module/custom.scss +21 -5
  40. /package/es/{iconfont.1730946045701.ttf → iconfont.1730971754265.ttf} +0 -0
  41. /package/es/{iconfont.1730946045701.woff → iconfont.1730971754265.woff} +0 -0
  42. /package/es/{iconfont.1730946045701.woff2 → iconfont.1730971754265.woff2} +0 -0
  43. /package/lib/{iconfont.1730946045701.ttf → iconfont.1730971754265.ttf} +0 -0
  44. /package/lib/{iconfont.1730946045701.woff → iconfont.1730971754265.woff} +0 -0
  45. /package/lib/{iconfont.1730946045701.woff2 → iconfont.1730971754265.woff2} +0 -0
@@ -1 +1 @@
1
- "use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_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}}const{getI18n,getIcon}=_ui.VxeUI;var _default=exports.default=(0,_vue.defineComponent)({name:"TableCustomPanel",props:{customStore:{type:Object,default:()=>({})}},setup(L){const F=_ui.VxeUI.getComponent("VxeModal"),A=_ui.VxeUI.getComponent("VxeDrawer"),M=_ui.VxeUI.getComponent("VxeButton"),U=_ui.VxeUI.getComponent("VxeInput"),H=_ui.VxeUI.getComponent("VxeTooltip"),R=_ui.VxeUI.getComponent("VxeRadioGroup"),d=(0,_vue.inject)("$xeTable",{}),S=d["reactData"],{computeCustomOpts:D,computeColumnOpts:K,computeIsMaxFixedColumn:z}=d.getComputeMaps(),W=(0,_vue.ref)(),X=(0,_vue.ref)(),q=(0,_vue.ref)(),j=(0,_vue.ref)();let u;const G=e=>{var t=L["customStore"];t.activeWrapper=!0,d.customOpenEvent(e)},$=e=>{const t=L["customStore"];t.activeWrapper=!1,setTimeout(()=>{t.activeBtn||t.activeWrapper||d.customCloseEvent(e)},300)},P=({$event:e})=>{var t=S["customColumnList"];const{allowVisible:s,allowSort:a,allowFixed:r,allowResizable:n}=D.value;_xeUtils.default.eachTree(t,(e,t,o,l,i)=>{i?e.fixed=i.fixed:(a&&(e.renderSortNumber=t+1),r&&(e.fixed=e.renderFixed)),n&&e.renderVisible&&(!e.children||e.children.length)&&e.renderResizeWidth!==e.renderWidth&&(e.resizeWidth=e.renderResizeWidth,e.renderWidth=e.renderResizeWidth),s&&(e.visible=e.renderVisible)}),d.closeCustom(),d.emitCustomEvent("confirm",e),d.saveCustomStore("confirm")},Y=({$event:e})=>{d.closeCustom(),d.emitCustomEvent("close",e)},Z=({$event:e})=>{var t=L["customStore"],o=S["customColumnList"];const{oldSortMaps:i,oldFixedMaps:s,oldVisibleMaps:a}=t,{allowVisible:r,allowSort:n,allowFixed:u,allowResizable:c}=D.value;_xeUtils.default.eachTree(o,e=>{var t=e.getKey(),o=!!a[t],l=s[t]||"";r&&(e.renderVisible=o,e.visible=o),u&&(e.renderFixed=l,e.fixed=l),n&&(e.renderSortNumber=i[t]||0),c&&(e.renderResizeWidth=e.renderWidth)},{children:"children"}),d.closeCustom(),d.emitCustomEvent("cancel",e)},o=e=>{d.resetColumn(!0),d.closeCustom(),d.emitCustomEvent("reset",e)},J=({$event:t})=>{_ui.VxeUI.modal?_ui.VxeUI.modal.confirm({content:getI18n("vxe.custom.cstmConfirmRestore"),className:"vxe-table--ignore-clear",escClosable:!0}).then(e=>{"confirm"===e&&o(t)}):o(t)},l=t=>{var e=S["customColumnList"],e=_xeUtils.default.findTree(e,e=>e===t);e&&e.parent&&(e=e["parent"],e.children)&&e.children.length&&(e.renderVisible=e.children.every(e=>e.renderVisible),e.halfVisible=!e.renderVisible&&e.children.some(e=>e.renderVisible||e.halfVisible),l(e))},Q=e=>{const t=!e.renderVisible;D.value.immediate?(_xeUtils.default.eachTree([e],e=>{e.visible=t,e.renderVisible=t,e.halfVisible=!1}),d.handleCustom(),d.saveCustomStore("update:visible")):_xeUtils.default.eachTree([e],e=>{e.renderVisible=t,e.halfVisible=!1}),l(e),d.checkCustomStatus()},ee=(e,t)=>{var o=z.value;D.value.immediate?(e.renderFixed===t?_xeUtils.default.eachTree([e],e=>{e.fixed="",e.renderFixed=""}):o&&!e.renderFixed||_xeUtils.default.eachTree([e],e=>{e.fixed=t,e.renderFixed=t}),d.handleCustom(),d.saveCustomStore("update:fixed")):e.renderFixed===t?_xeUtils.default.eachTree([e],e=>{e.renderFixed=""}):o&&!e.renderFixed||_xeUtils.default.eachTree([e],e=>{e.renderFixed=t})},te=()=>{var e=L["customStore"],t=S["customColumnList"],o=D.value;const{checkMethod:l,visibleMethod:i}=o,s=!e.isAll;o.immediate?(_xeUtils.default.eachTree(t,e=>{i&&!i({column:e})||l&&!l({column:e})||(e.visible=s,e.renderVisible=s,e.halfVisible=!1)}),e.isAll=s,d.handleCustom(),d.saveCustomStore("update:visible")):(_xeUtils.default.eachTree(t,e=>{i&&!i({column:e})||l&&!l({column:e})||(e.renderVisible=s,e.halfVisible=!1)}),e.isAll=s),d.checkCustomStatus()},oe=e=>{var e=e.currentTarget.parentNode.parentNode,t=e.getAttribute("colid"),t=d.getColumnById(t);e.draggable=!0,j.value=t,(0,_dom.addClass)(e,"active--drag-origin")},le=e=>{var e=e.currentTarget.parentNode.parentNode,t=q.value;e.draggable=!1,(j.value=null,_dom.removeClass)(e,"active--drag-origin"),t&&(t.style.display="")},ie=e=>{var t=new Image;e.dataTransfer&&e.dataTransfer.setDragImage(t,0,0)},se=e=>{var t=S["customColumnList"],o=D.value,e=e.currentTarget,l=q.value;if(u){if(u!==e){var i=u.getAttribute("drag-pos"),s=e.getAttribute("colid");const r=d.getColumnById(s);if(!r)return;var s=_xeUtils.default.findIndexOf(t,e=>e.id===r.id),a=u.getAttribute("colid");const n=d.getColumnById(a);if(!n)return;t.splice(s,1);a=_xeUtils.default.findIndexOf(t,e=>e.id===n.id);t.splice(a+("bottom"===i?1:0),0,r)}u.draggable=!1,u.removeAttribute("drag-pos"),(0,_dom.removeClass)(u,"active--drag-target")}j.value=null,e.draggable=!1,e.removeAttribute("drag-pos"),l&&(l.style.display=""),(0,_dom.removeClass)(e,"active--drag-target"),(0,_dom.removeClass)(e,"active--drag-origin"),o.immediate&&(_xeUtils.default.eachTree(t,(e,t,o,l,i)=>{i||(e.renderSortNumber=t+1)}),d.handleCustom(),d.saveCustomStore("update:sort"))},ae=e=>{var t=e.currentTarget,o=(u!==t&&(0,_dom.removeClass)(u,"active--drag-target"),t.getAttribute("colid")),o=d.getColumnById(o);o&&1===o.level&&(e.preventDefault(),o=e.clientY-t.getBoundingClientRect().y<t.clientHeight/2?"top":"bottom",(0,_dom.addClass)(t,"active--drag-target"),t.setAttribute("drag-pos",o),u=t);{o=e;var l=q.value,i=X.value;i&&l&&(e=(t=i.parentNode).getBoundingClientRect(),l.style.display="block",l.style.top=Math.min(t.clientHeight-t.scrollTop-l.clientHeight,o.clientY-e.y)+"px",l.style.left=Math.min(t.clientWidth-t.scrollLeft-l.clientWidth-16,o.clientX-e.x)+"px")}};return"development"===process.env.NODE_ENV&&(0,_vue.nextTick)(()=>{var e=D.value["mode"];F||(0,_log.errLog)("vxe.error.reqComp",["vxe-modal"]),A||"drawer"!==e||(0,_log.errLog)("vxe.error.reqComp",["vxe-drawer"]),M||(0,_log.errLog)("vxe.error.reqComp",["vxe-button"]),U||(0,_log.errLog)("vxe.error.reqComp",["vxe-input"]),H||(0,_log.errLog)("vxe.error.reqComp",["vxe-tooltip"]),R||(0,_log.errLog)("vxe.error.reqComp",["vxe-radio-group"])}),()=>{var e=D.value;if(["modal","drawer","popup"].includes(""+e.mode)){const r=L["customStore"];e=S["customColumnList"];const n=D.value,{modalOptions:u,drawerOptions:c,allowVisible:d,allowSort:m,allowFixed:v,allowResizable:h,checkMethod:x,visibleMethod:_}=n,p=K.value["maxFixedSize"];var t=n["mode"],o=Object.assign({},u),l=Object.assign({},c);const g=z.value,b=[],C=(_xeUtils.default.eachTree(e,(t,e,o,l,i)=>{if(!_||_({column:t})){var s=t.renderVisible,a=t.halfVisible,r=(0,_utils.formatText)(t.getTitle(),1),n=t.children&&t.children.length;const c=!!x&&!x({column:t});var u=!s;b.push((0,_vue.h)("tr",{key:t.id,colid:t.id,class:["vxe-table-custom-popup--row level--"+t.level,{"is--group":n}],onDragstart:ie,onDragend:se,onDragover:ae},[d?(0,_vue.h)("td",{class:"vxe-table-custom-popup--column-item col--visible"},[(0,_vue.h)("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":s,"is--indeterminate":a,"is--disabled":c}],title:getI18n("vxe.custom.setting.colVisible"),onClick:()=>{c||Q(t)}},[(0,_vue.h)("span",{class:["vxe-checkbox--icon",a?getIcon().TABLE_CHECKBOX_INDETERMINATE:s?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]})])]):(0,_vue.createCommentVNode)(),m?(0,_vue.h)("td",{class:"vxe-table-custom-popup--column-item col--sort"},[1===t.level?(0,_vue.h)("span",Object.assign({class:["vxe-table-custom-popup--column-sort-btn",{"is--disabled":c||u}],title:getI18n("vxe.custom.setting.sortHelpTip")},c||u?{}:{onMousedown:oe,onMouseup:le}),[(0,_vue.h)("i",{class:getIcon().TABLE_CUSTOM_SORT})]):(0,_vue.h)("span","-")]):(0,_vue.createCommentVNode)(),(0,_vue.h)("td",{class:"vxe-table-custom-popup--column-item col--name"},["html"===t.type?(0,_vue.h)("div",{key:"1",class:"vxe-table-custom-popup--name",innerHTML:r}):(0,_vue.h)("div",{key:"0",class:"vxe-table-custom-popup--name",title:r},r)]),h?(0,_vue.h)("td",{class:"vxe-table-custom-popup--column-item col--resizable"},[t.children&&t.children.length?(0,_vue.h)("span","-"):U?(0,_vue.h)(U,{type:"integer",disabled:c||u,modelValue:t.renderResizeWidth,"onUpdate:modelValue"(e){t.renderResizeWidth=Math.max(0,Number(e))}}):(0,_vue.createCommentVNode)()]):(0,_vue.createCommentVNode)(),v?(0,_vue.h)("td",{class:"vxe-table-custom-popup--column-item col--fixed"},[i?(0,_vue.h)("span","-"):R?(0,_vue.h)(R,{modelValue:t.renderFixed||"",type:"button",size:"mini",disabled:c||u,options:[{label:getI18n("vxe.custom.setting.fixedLeft"),value:"left",disabled:c||u||g},{label:getI18n("vxe.custom.setting.fixedUnset"),value:"",disabled:c||u},{label:getI18n("vxe.custom.setting.fixedRight"),value:"right",disabled:c||u||g}],"onUpdate:modelValue"(e){t.renderFixed=e}}):(0,_vue.createCommentVNode)()]):(0,_vue.createCommentVNode)()]))}}),r.isAll),f=r.isIndeterminate,T=j.value;e={default:()=>(0,_vue.h)("div",{ref:X,class:"vxe-table-custom-popup--body"},[(0,_vue.h)("div",{class:"vxe-table-custom-popup--table-wrapper"},[(0,_vue.h)("table",{},[(0,_vue.h)("colgroup",{},[d?(0,_vue.h)("col",{style:{width:"80px"}}):(0,_vue.createCommentVNode)(),m?(0,_vue.h)("col",{style:{width:"80px"}}):(0,_vue.createCommentVNode)(),(0,_vue.h)("col",{style:{minWidth:"120px"}}),h?(0,_vue.h)("col",{style:{width:"140px"}}):(0,_vue.createCommentVNode)(),v?(0,_vue.h)("col",{style:{width:"200px"}}):(0,_vue.createCommentVNode)()]),(0,_vue.h)("thead",{},[(0,_vue.h)("tr",{},[d?(0,_vue.h)("th",{},[(0,_vue.h)("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":C,"is--indeterminate":f}],title:getI18n("vxe.table.allTitle"),onClick:te},[(0,_vue.h)("span",{class:["vxe-checkbox--icon",f?getIcon().TABLE_CHECKBOX_INDETERMINATE:C?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]}),(0,_vue.h)("span",{class:"vxe-checkbox--label"},getI18n("vxe.toolbar.customAll"))])]):(0,_vue.createCommentVNode)(),m?(0,_vue.h)("th",{},[(0,_vue.h)("span",{class:"vxe-table-custom-popup--table-sort-help-title"},getI18n("vxe.custom.setting.colSort")),H?(0,_vue.h)(H,{enterable:!0,content:getI18n("vxe.custom.setting.sortHelpTip"),popupClassName:"vxe-table--ignore-clear"},{default:()=>(0,_vue.h)("i",{class:"vxe-table-custom-popup--table-sort-help-icon vxe-icon-question-circle-fill"})}):(0,_vue.createCommentVNode)()]):(0,_vue.createCommentVNode)(),(0,_vue.h)("th",{},getI18n("vxe.custom.setting.colTitle")),h?(0,_vue.h)("th",{},getI18n("vxe.custom.setting.colResizable")):(0,_vue.createCommentVNode)(),v?(0,_vue.h)("th",{},getI18n("vxe.custom.setting."+(p?"colFixedMax":"colFixed"),[p])):(0,_vue.createCommentVNode)()])]),(0,_vue.h)(_vue.TransitionGroup,{class:"vxe-table-custom--body",tag:"tbody",name:"vxe-table-custom--list"},{default:()=>b})])]),(0,_vue.h)("div",{ref:q,class:"vxe-table-custom-popup--drag-hint"},getI18n("vxe.custom.cstmDragTarget",[T?T.getTitle():""]))]),footer:()=>(0,_vue.h)("div",{class:"vxe-table-custom-popup--footer"},[M?(0,_vue.h)(M,{content:n.resetButtonText||getI18n("vxe.custom.cstmRestore"),onClick:J}):(0,_vue.createCommentVNode)(),M?(0,_vue.h)(M,{content:n.resetButtonText||getI18n("vxe.custom.cstmCancel"),onClick:Z}):(0,_vue.createCommentVNode)(),M?(0,_vue.h)(M,{status:"primary",content:n.confirmButtonText||getI18n("vxe.custom.cstmConfirm"),onClick:P}):(0,_vue.createCommentVNode)()])};return"drawer"===t?A?(0,_vue.h)(A,{key:"drawer",className:["vxe-table-custom-drawer-wrapper","vxe-table--ignore-clear",l.className||""].join(" "),modelValue:r.visible,title:l.title||getI18n("vxe.custom.cstmTitle"),width:l.width||Math.min(880,document.documentElement.clientWidth),position:l.position,escClosable:!!l.escClosable,destroyOnClose:!0,showFooter:!0,"onUpdate:modelValue"(e){r.visible=e}},e):(0,_vue.createCommentVNode)():F?(0,_vue.h)(F,{key:"modal",className:["vxe-table-custom-modal-wrapper","vxe-table--ignore-clear",o.className||""].join(" "),modelValue:r.visible,title:o.title||getI18n("vxe.custom.cstmTitle"),width:o.width||Math.min(880,document.documentElement.clientWidth),minWidth:o.minWidth||700,height:o.height||Math.min(680,document.documentElement.clientHeight),minHeight:o.minHeight||400,showZoom:o.showZoom,showMaximize:o.showMaximize,showMinimize:o.showMinimize,mask:o.mask,lockView:o.lockView,resize:o.resize,escClosable:!!o.escClosable,destroyOnClose:!0,showFooter:!0,"onUpdate:modelValue"(e){r.visible=e}},e):(0,_vue.createCommentVNode)()}{t=L["customStore"],l=S["customColumnList"],o=D.value,e=t["maxHeight"];const{checkMethod:I,visibleMethod:V,allowVisible:E,allowSort:N,allowFixed:w,trigger:k,placement:O}=o,y=z.value,B=[];var i={},l=("hover"===k&&(i.onMouseenter=G,i.onMouseleave=$),_xeUtils.default.eachTree(l,(e,t,o,l,i)=>{if(!V||V({column:e})){var s=e.renderVisible,a=e.halfVisible,r=e.children&&e.children.length,n=(0,_utils.formatText)(e.getTitle(),1);const c=!!I&&!I({column:e});var u=!s;B.push((0,_vue.h)("li",{key:e.id,colid:e.id,class:["vxe-table-custom--option","level--"+e.level,{"is--hidden":c||u,"is--group":r}],onDragstart:ie,onDragend:se,onDragover:ae},[E?(0,_vue.h)("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":s,"is--indeterminate":a,"is--disabled":c}],title:getI18n("vxe.custom.setting.colVisible"),onClick:()=>{c||Q(e)}},[(0,_vue.h)("span",{class:["vxe-checkbox--icon",a?getIcon().TABLE_CHECKBOX_INDETERMINATE:s?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]})]):(0,_vue.createCommentVNode)(),N&&1===e.level?(0,_vue.h)("div",{class:"vxe-table-custom--sort-option"},[(0,_vue.h)("span",Object.assign({class:["vxe-table-custom--sort-btn",{"is--disabled":c||u}],title:getI18n("vxe.custom.setting.sortHelpTip")},c||u?{}:{onMousedown:oe,onMouseup:le}),[(0,_vue.h)("i",{class:getIcon().TABLE_CUSTOM_SORT})])]):(0,_vue.createCommentVNode)(),"html"===e.type?(0,_vue.h)("div",{key:"1",class:"vxe-table-custom--checkbox-label",innerHTML:n}):(0,_vue.h)("div",{key:"0",class:"vxe-table-custom--checkbox-label"},n),!i&&w?(0,_vue.h)("div",{class:"vxe-table-custom--fixed-option"},[M?(0,_vue.h)(M,{mode:"text",icon:"left"===e.renderFixed?getIcon().TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE:getIcon().TOOLBAR_TOOLS_FIXED_LEFT,status:"left"===e.renderFixed?"primary":"",disabled:c||u||y&&!e.renderFixed,title:getI18n("left"===e.renderFixed?"vxe.toolbar.cancelFixed":"vxe.toolbar.fixedLeft"),onClick:()=>{ee(e,"left")}}):(0,_vue.createCommentVNode)(),M?(0,_vue.h)(M,{mode:"text",icon:"right"===e.renderFixed?getIcon().TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE:getIcon().TOOLBAR_TOOLS_FIXED_RIGHT,status:"right"===e.renderFixed?"primary":"",disabled:c||u||y&&!e.renderFixed,title:getI18n("right"===e.renderFixed?"vxe.toolbar.cancelFixed":"vxe.toolbar.fixedRight"),onClick:()=>{ee(e,"right")}}):(0,_vue.createCommentVNode)()]):(0,_vue.createCommentVNode)()]))}}),t.isAll),s=t.isIndeterminate,a=j.value;return(0,_vue.h)("div",{ref:W,key:"simple",class:["vxe-table-custom-wrapper","placement--"+O,{"is--active":t.visible}],style:e&&!["left","right"].includes(O)?{maxHeight:e+"px"}:{}},t.visible?[(0,_vue.h)("ul",{class:"vxe-table-custom--header"},[(0,_vue.h)("li",{class:"vxe-table-custom--option"},[E?(0,_vue.h)("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":l,"is--indeterminate":s}],title:getI18n("vxe.table.allTitle"),onClick:te},[(0,_vue.h)("span",{class:["vxe-checkbox--icon",s?getIcon().TABLE_CHECKBOX_INDETERMINATE:l?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]}),(0,_vue.h)("span",{class:"vxe-checkbox--label"},getI18n("vxe.toolbar.customAll"))]):(0,_vue.h)("span",{class:"vxe-checkbox--label"},getI18n("vxe.table.customTitle"))])]),(0,_vue.h)("div",{ref:X,class:"vxe-table-custom--list-wrapper"},[(0,_vue.h)(_vue.TransitionGroup,Object.assign({class:"vxe-table-custom--body",name:"vxe-table-custom--list",tag:"ul"},i),{default:()=>B}),(0,_vue.h)("div",{ref:q,class:"vxe-table-custom-popup--drag-hint"},getI18n("vxe.custom.cstmDragTarget",[a&&"html"!==a.type?a.getTitle():""]))]),o.showFooter?(0,_vue.h)("div",{class:"vxe-table-custom--footer"},[M?(0,_vue.h)(M,{mode:"text",content:o.resetButtonText||getI18n("vxe.table.customRestore"),onClick:J}):(0,_vue.createCommentVNode)(),o.immediate?M?(0,_vue.h)(M,{mode:"text",content:o.closeButtonText||getI18n("vxe.table.customClose"),onClick:Y}):(0,_vue.createCommentVNode)():M?(0,_vue.h)(M,{mode:"text",content:o.cancelButtonText||getI18n("vxe.table.customCancel"),onClick:Z}):(0,_vue.createCommentVNode)(),!o.immediate&&M?(0,_vue.h)(M,{mode:"text",status:"primary",content:o.confirmButtonText||getI18n("vxe.table.customConfirm"),onClick:P}):(0,_vue.createCommentVNode)()]):null]:[]);return}}}});
1
+ "use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_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}}const{getI18n,getIcon,renderEmptyElement}=_ui.VxeUI;var _default=exports.default=(0,_vue.defineComponent)({name:"TableCustomPanel",props:{customStore:{type:Object,default:()=>({})}},setup(W){const j=_ui.VxeUI.getComponent("VxeModal"),$=_ui.VxeUI.getComponent("VxeDrawer"),G=_ui.VxeUI.getComponent("VxeButton"),P=_ui.VxeUI.getComponent("VxeInput"),Y=_ui.VxeUI.getComponent("VxeTooltip"),Z=_ui.VxeUI.getComponent("VxeRadioGroup"),J=(0,_vue.inject)("$xeTable",{}),Q=J["reactData"],{computeCustomOpts:ee,computeColumnOpts:te,computeIsMaxFixedColumn:oe}=J.getComputeMaps(),le=(0,_vue.ref)(),ae=(0,_vue.ref)(),se=(0,_vue.ref)(),ie=(0,_vue.ref)();let c;const ne=e=>{var t=W["customStore"];t.activeWrapper=!0,J.customOpenEvent(e)},re=e=>{const t=W["customStore"];t.activeWrapper=!1,setTimeout(()=>{t.activeBtn||t.activeWrapper||J.customCloseEvent(e)},300)},ce=({$event:e})=>{J.saveCustom(),J.closeCustom(),J.emitCustomEvent("confirm",e)},ue=({$event:e})=>{J.closeCustom(),J.emitCustomEvent("close",e)},de=({$event:e})=>{J.cancelCustom(),J.closeCustom(),J.emitCustomEvent("cancel",e)},o=e=>{J.resetCustom(!0),J.closeCustom(),J.emitCustomEvent("reset",e)},me=({$event:t})=>{_ui.VxeUI.modal?_ui.VxeUI.modal.confirm({content:getI18n("vxe.custom.cstmConfirmRestore"),className:"vxe-table--ignore-clear",escClosable:!0}).then(e=>{"confirm"===e&&o(t)}):o(t)},l=t=>{var e=Q["customColumnList"],e=_xeUtils.default.findTree(e,e=>e===t);e&&e.parent&&(e=e["parent"],e.children)&&e.children.length&&(e.renderVisible=e.children.every(e=>e.renderVisible),e.halfVisible=!e.renderVisible&&e.children.some(e=>e.renderVisible||e.halfVisible),l(e))},ve=e=>{const t=!e.renderVisible;ee.value.immediate?(_xeUtils.default.eachTree([e],e=>{e.visible=t,e.renderVisible=t,e.halfVisible=!1}),J.handleCustom(),J.saveCustomStore("update:visible")):_xeUtils.default.eachTree([e],e=>{e.renderVisible=t,e.halfVisible=!1}),l(e),J.checkCustomStatus()},pe=(e,t)=>{var o=oe.value;ee.value.immediate?(e.renderFixed===t?_xeUtils.default.eachTree([e],e=>{e.fixed="",e.renderFixed=""}):o&&!e.renderFixed||_xeUtils.default.eachTree([e],e=>{e.fixed=t,e.renderFixed=t}),J.handleCustom(),J.saveCustomStore("update:fixed")):e.renderFixed===t?_xeUtils.default.eachTree([e],e=>{e.renderFixed=""}):o&&!e.renderFixed||_xeUtils.default.eachTree([e],e=>{e.renderFixed=t})},xe=()=>{J.toggleCustomAllCheckbox()},_e=e=>{var t=e.currentTarget.parentNode.parentNode,o=t.getAttribute("colid"),o=J.getColumnById(o);t.draggable=!0,ie.value=o,(0,_dom.addClass)(t,"active--drag-origin"),a(e)},he=e=>{var e=e.currentTarget.parentNode.parentNode,t=se.value;e.draggable=!1,(ie.value=null,_dom.removeClass)(e,"active--drag-origin"),t&&(t.style.display="")},ge=e=>{var t=new Image;e.dataTransfer&&e.dataTransfer.setDragImage(t,0,0)},be=e=>{var t=Q["customColumnList"],o=ee.value,e=e.currentTarget,l=se.value;if(c){if(c!==e){var a=c.getAttribute("drag-pos"),s=e.getAttribute("colid");const n=J.getColumnById(s);if(!n)return;var s=_xeUtils.default.findIndexOf(t,e=>e.id===n.id),i=c.getAttribute("colid");const r=J.getColumnById(i);if(!r)return;t.splice(s,1);i=_xeUtils.default.findIndexOf(t,e=>e.id===r.id);t.splice(i+("bottom"===a?1:0),0,n)}c.draggable=!1,c.removeAttribute("drag-pos"),(0,_dom.removeClass)(c,"active--drag-target")}ie.value=null,e.draggable=!1,e.removeAttribute("drag-pos"),l&&(l.style.display=""),(0,_dom.removeClass)(e,"active--drag-target"),(0,_dom.removeClass)(e,"active--drag-origin"),o.immediate&&(_xeUtils.default.eachTree(t,(e,t,o,l,a)=>{a||(e.renderSortNumber=t+1)}),J.handleCustom(),J.saveCustomStore("update:sort"))},Ce=e=>{var t=e.currentTarget,o=(c!==t&&(0,_dom.removeClass)(c,"active--drag-target"),t.getAttribute("colid")),o=J.getColumnById(o);o&&1===o.level&&(e.preventDefault(),o=e.clientY-t.getBoundingClientRect().y<t.clientHeight/2?"top":"bottom",(0,_dom.addClass)(t,"active--drag-target"),t.setAttribute("drag-pos",o),c=t),a(e)},a=e=>{var t,o=se.value,l=ae.value;l&&o&&(t=(l=l.parentNode).getBoundingClientRect(),o.style.display="block",o.style.top=Math.min(l.clientHeight-l.scrollTop-o.clientHeight,e.clientY-t.y)+"px",o.style.left=Math.min(l.clientWidth-l.scrollLeft-o.clientWidth-16,e.clientX-t.x)+"px")};return"development"===process.env.NODE_ENV&&(0,_vue.nextTick)(()=>{var e=ee.value["mode"];j||(0,_log.errLog)("vxe.error.reqComp",["vxe-modal"]),$||"drawer"!==e||(0,_log.errLog)("vxe.error.reqComp",["vxe-drawer"]),G||(0,_log.errLog)("vxe.error.reqComp",["vxe-button"]),P||(0,_log.errLog)("vxe.error.reqComp",["vxe-input"]),Y||(0,_log.errLog)("vxe.error.reqComp",["vxe-tooltip"]),Z||(0,_log.errLog)("vxe.error.reqComp",["vxe-radio-group"])}),()=>{var e=ee.value;if(["modal","drawer","popup"].includes(""+e.mode)){const u=W["customStore"];e=Q["customColumnList"];const d=ee.value,{modalOptions:R,drawerOptions:K,allowVisible:m,allowSort:v,allowFixed:p,allowResizable:x,checkMethod:_,visibleMethod:h}=d,g=te.value["maxFixedSize"];var t=d["mode"],o=Object.assign({},R),l=Object.assign({},K);const b=oe.value;var a=d.slots||{};const C=a.header,f=a.top,I=a.bottom,T=a.default,E=a.footer,V=[],N=u.isAll,k=u.isIndeterminate,O=ie.value,y={$table:J,$grid:J.xegrid,columns:e,isAllChecked:N,isAllIndeterminate:k};_xeUtils.default.eachTree(e,(t,e,o,l,a)=>{if(!h||h({column:t})){var s=t.renderVisible,i=t.halfVisible,n=(0,_utils.formatText)(t.getTitle(),1),r=t.children&&t.children.length;const u=!!_&&!_({column:t});var c=!s;V.push((0,_vue.h)("tr",{key:t.id,colid:t.id,class:["vxe-table-custom-popup--row level--"+t.level,{"is--group":r}],onDragstart:ge,onDragend:be,onDragover:Ce},[m?(0,_vue.h)("td",{class:"vxe-table-custom-popup--column-item col--visible"},[(0,_vue.h)("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":s,"is--indeterminate":i,"is--disabled":u}],title:getI18n("vxe.custom.setting.colVisible"),onClick:()=>{u||ve(t)}},[(0,_vue.h)("span",{class:["vxe-checkbox--icon",i?getIcon().TABLE_CHECKBOX_INDETERMINATE:s?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]})])]):(0,_vue.createCommentVNode)(),v?(0,_vue.h)("td",{class:"vxe-table-custom-popup--column-item col--sort"},[1===t.level?(0,_vue.h)("span",Object.assign({class:["vxe-table-custom-popup--column-sort-btn",{"is--disabled":u||c}],title:getI18n("vxe.custom.setting.sortHelpTip")},u||c?{}:{onMousedown:_e,onMouseup:he}),[(0,_vue.h)("i",{class:getIcon().TABLE_CUSTOM_SORT})]):(0,_vue.h)("span","-")]):(0,_vue.createCommentVNode)(),(0,_vue.h)("td",{class:"vxe-table-custom-popup--column-item col--name"},["html"===t.type?(0,_vue.h)("div",{key:"1",class:"vxe-table-custom-popup--name",innerHTML:n}):(0,_vue.h)("div",{key:"0",class:"vxe-table-custom-popup--name",title:n},n)]),x?(0,_vue.h)("td",{class:"vxe-table-custom-popup--column-item col--resizable"},[t.children&&t.children.length?(0,_vue.h)("span","-"):P?(0,_vue.h)(P,{type:"integer",disabled:u||c,modelValue:t.renderResizeWidth,"onUpdate:modelValue"(e){t.renderResizeWidth=Math.max(0,Number(e))}}):(0,_vue.createCommentVNode)()]):(0,_vue.createCommentVNode)(),p?(0,_vue.h)("td",{class:"vxe-table-custom-popup--column-item col--fixed"},[a?(0,_vue.h)("span","-"):Z?(0,_vue.h)(Z,{modelValue:t.renderFixed||"",type:"button",size:"mini",disabled:u||c,options:[{label:getI18n("vxe.custom.setting.fixedLeft"),value:"left",disabled:u||c||b},{label:getI18n("vxe.custom.setting.fixedUnset"),value:"",disabled:u||c},{label:getI18n("vxe.custom.setting.fixedRight"),value:"right",disabled:u||c||b}],"onUpdate:modelValue"(e){t.renderFixed=e}}):(0,_vue.createCommentVNode)()]):(0,_vue.createCommentVNode)()]))}});a={default:()=>T?J.callSlot(T,y):(0,_vue.h)("div",{ref:ae,class:"vxe-table-custom-popup--body"},[f?(0,_vue.h)("div",{class:"vxe-table-custom-popup--table-top"},J.callSlot(f,y)):renderEmptyElement(J),(0,_vue.h)("div",{class:"vxe-table-custom-popup--table-wrapper"},[(0,_vue.h)("table",{},[(0,_vue.h)("colgroup",{},[m?(0,_vue.h)("col",{class:"vxe-table-custom-popup--table-col-seq"}):(0,_vue.createCommentVNode)(),v?(0,_vue.h)("col",{class:"vxe-table-custom-popup--table-col-sort"}):(0,_vue.createCommentVNode)(),(0,_vue.h)("col",{class:"vxe-table-custom-popup--table-col-title"}),x?(0,_vue.h)("col",{class:"vxe-table-custom-popup--table-col-width"}):(0,_vue.createCommentVNode)(),p?(0,_vue.h)("col",{class:"vxe-table-custom-popup--table-col-fixed"}):(0,_vue.createCommentVNode)()]),(0,_vue.h)("thead",{},[(0,_vue.h)("tr",{},[m?(0,_vue.h)("th",{},[(0,_vue.h)("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":N,"is--indeterminate":k}],title:getI18n("vxe.table.allTitle"),onClick:xe},[(0,_vue.h)("span",{class:["vxe-checkbox--icon",k?getIcon().TABLE_CHECKBOX_INDETERMINATE:N?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]}),(0,_vue.h)("span",{class:"vxe-checkbox--label"},getI18n("vxe.toolbar.customAll"))])]):(0,_vue.createCommentVNode)(),v?(0,_vue.h)("th",{},[(0,_vue.h)("span",{class:"vxe-table-custom-popup--table-sort-help-title"},getI18n("vxe.custom.setting.colSort")),Y?(0,_vue.h)(Y,{enterable:!0,content:getI18n("vxe.custom.setting.sortHelpTip"),popupClassName:"vxe-table--ignore-clear"},{default:()=>(0,_vue.h)("i",{class:"vxe-table-custom-popup--table-sort-help-icon vxe-icon-question-circle-fill"})}):(0,_vue.createCommentVNode)()]):(0,_vue.createCommentVNode)(),(0,_vue.h)("th",{},getI18n("vxe.custom.setting.colTitle")),x?(0,_vue.h)("th",{},getI18n("vxe.custom.setting.colResizable")):(0,_vue.createCommentVNode)(),p?(0,_vue.h)("th",{},getI18n("vxe.custom.setting."+(g?"colFixedMax":"colFixed"),[g])):(0,_vue.createCommentVNode)()])]),(0,_vue.h)(_vue.TransitionGroup,{class:"vxe-table-custom--panel-list",tag:"tbody",name:"vxe-table-custom--list"},{default:()=>V})])]),I?(0,_vue.h)("div",{class:"vxe-table-custom-popup--table-bottom"},J.callSlot(I,y)):renderEmptyElement(J),(0,_vue.h)("div",{ref:se,class:"vxe-table-custom-popup--drag-hint"},getI18n("vxe.custom.cstmDragTarget",[O?O.getTitle():""]))]),footer:()=>E?J.callSlot(E,y):(0,_vue.h)("div",{class:"vxe-table-custom-popup--footer"},[G?(0,_vue.h)(G,{content:d.resetButtonText||getI18n("vxe.custom.cstmRestore"),onClick:me}):(0,_vue.createCommentVNode)(),G?(0,_vue.h)(G,{content:d.resetButtonText||getI18n("vxe.custom.cstmCancel"),onClick:de}):(0,_vue.createCommentVNode)(),G?(0,_vue.h)(G,{status:"primary",content:d.confirmButtonText||getI18n("vxe.custom.cstmConfirm"),onClick:ce}):(0,_vue.createCommentVNode)()])};return C&&(a.header=()=>J.callSlot(C,y)),"drawer"===t?$?(0,_vue.h)($,{key:"drawer",className:["vxe-table-custom-drawer-wrapper","vxe-table--ignore-clear",l.className||""].join(" "),modelValue:u.visible,title:l.title||getI18n("vxe.custom.cstmTitle"),width:l.width||Math.min(880,document.documentElement.clientWidth),position:l.position,escClosable:!!l.escClosable,destroyOnClose:!0,showFooter:!0,"onUpdate:modelValue"(e){u.visible=e}},a):(0,_vue.createCommentVNode)():j?(0,_vue.h)(j,{key:"modal",className:["vxe-table-custom-modal-wrapper","vxe-table--ignore-clear",o.className||""].join(" "),modelValue:u.visible,title:o.title||getI18n("vxe.custom.cstmTitle"),width:o.width||Math.min(880,document.documentElement.clientWidth),minWidth:o.minWidth||700,height:o.height||Math.min(680,document.documentElement.clientHeight),minHeight:o.minHeight||400,showZoom:o.showZoom,showMaximize:o.showMaximize,showMinimize:o.showMinimize,mask:o.mask,lockView:o.lockView,resize:o.resize,escClosable:!!o.escClosable,destroyOnClose:!0,showFooter:!0,"onUpdate:modelValue"(e){u.visible=e}},a):(0,_vue.createCommentVNode)()}{e=W["customStore"],t=Q["customColumnList"],l=ee.value,o=e["maxHeight"];const{checkMethod:B,visibleMethod:A,allowVisible:w,allowSort:X,allowFixed:q,trigger:z,placement:L}=l,F=oe.value;var a=l.slots||{},M=a.header,U=a.top,S=a.bottom,D=a.default,a=a.footer;const H=[];var s={},i=e.isAll,n=e.isIndeterminate,r=ie.value,c=("hover"===z&&(s.onMouseenter=ne,s.onMouseleave=re),{$table:J,$grid:J.xegrid,columns:t,isAllChecked:i,isAllIndeterminate:n});return _xeUtils.default.eachTree(t,(e,t,o,l,a)=>{if(!A||A({column:e})){var s=e.renderVisible,i=e.halfVisible,n=e.children&&e.children.length,r=(0,_utils.formatText)(e.getTitle(),1);const u=!!B&&!B({column:e});var c=!s;H.push((0,_vue.h)("li",{key:e.id,colid:e.id,class:["vxe-table-custom--option","level--"+e.level,{"is--hidden":u||c,"is--group":n}],onDragstart:ge,onDragend:be,onDragover:Ce},[w?(0,_vue.h)("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":s,"is--indeterminate":i,"is--disabled":u}],title:getI18n("vxe.custom.setting.colVisible"),onClick:()=>{u||ve(e)}},[(0,_vue.h)("span",{class:["vxe-checkbox--icon",i?getIcon().TABLE_CHECKBOX_INDETERMINATE:s?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]})]):(0,_vue.createCommentVNode)(),X&&1===e.level?(0,_vue.h)("div",{class:"vxe-table-custom--sort-option"},[(0,_vue.h)("span",Object.assign({class:["vxe-table-custom--sort-btn",{"is--disabled":u||c}],title:getI18n("vxe.custom.setting.sortHelpTip")},u||c?{}:{onMousedown:_e,onMouseup:he}),[(0,_vue.h)("i",{class:getIcon().TABLE_CUSTOM_SORT})])]):(0,_vue.createCommentVNode)(),"html"===e.type?(0,_vue.h)("div",{key:"1",class:"vxe-table-custom--checkbox-label",innerHTML:r}):(0,_vue.h)("div",{key:"0",class:"vxe-table-custom--checkbox-label"},r),!a&&q?(0,_vue.h)("div",{class:"vxe-table-custom--fixed-option"},[G?(0,_vue.h)(G,{mode:"text",icon:"left"===e.renderFixed?getIcon().TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE:getIcon().TOOLBAR_TOOLS_FIXED_LEFT,status:"left"===e.renderFixed?"primary":"",disabled:u||c||F&&!e.renderFixed,title:getI18n("left"===e.renderFixed?"vxe.toolbar.cancelFixed":"vxe.toolbar.fixedLeft"),onClick:()=>{pe(e,"left")}}):(0,_vue.createCommentVNode)(),G?(0,_vue.h)(G,{mode:"text",icon:"right"===e.renderFixed?getIcon().TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE:getIcon().TOOLBAR_TOOLS_FIXED_RIGHT,status:"right"===e.renderFixed?"primary":"",disabled:u||c||F&&!e.renderFixed,title:getI18n("right"===e.renderFixed?"vxe.toolbar.cancelFixed":"vxe.toolbar.fixedRight"),onClick:()=>{pe(e,"right")}}):(0,_vue.createCommentVNode)()]):(0,_vue.createCommentVNode)()]))}}),(0,_vue.h)("div",{ref:le,key:"simple",class:["vxe-table-custom-wrapper","placement--"+L,{"is--active":e.visible}],style:o&&!["left","right"].includes(L)?{maxHeight:o+"px"}:{}},e.visible?[(0,_vue.h)("div",{class:"vxe-table-custom--header"},M?J.callSlot(M,c):[(0,_vue.h)("ul",{class:"vxe-table-custom--panel-list"},[(0,_vue.h)("li",{class:"vxe-table-custom--option"},[w?(0,_vue.h)("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":i,"is--indeterminate":n}],title:getI18n("vxe.table.allTitle"),onClick:xe},[(0,_vue.h)("span",{class:["vxe-checkbox--icon",n?getIcon().TABLE_CHECKBOX_INDETERMINATE:i?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]}),(0,_vue.h)("span",{class:"vxe-checkbox--label"},getI18n("vxe.toolbar.customAll"))]):(0,_vue.h)("span",{class:"vxe-checkbox--label"},getI18n("vxe.table.customTitle"))])])]),(0,_vue.h)("div",{ref:ae,class:"vxe-table-custom--body"},[U?(0,_vue.h)("div",{class:"vxe-table-custom--panel-top"},J.callSlot(U,c)):renderEmptyElement(J),D?(0,_vue.h)("div",{class:"vxe-table-custom--panel-body"},J.callSlot(D,c)):(0,_vue.h)(_vue.TransitionGroup,Object.assign({class:"vxe-table-custom--panel-list",name:"vxe-table-custom--list",tag:"ul"},s),{default:()=>H}),S?(0,_vue.h)("div",{class:"vxe-table-custom--panel-bottom"},J.callSlot(S,c)):renderEmptyElement(J),(0,_vue.h)("div",{ref:se,class:"vxe-table-custom-popup--drag-hint"},getI18n("vxe.custom.cstmDragTarget",[r&&"html"!==r.type?r.getTitle():""]))]),l.showFooter?(0,_vue.h)("div",{class:"vxe-table-custom--footer"},a?J.callSlot(a,c):[(0,_vue.h)("div",{class:"vxe-table-custom--footer-buttons"},[G?(0,_vue.h)(G,{mode:"text",content:l.resetButtonText||getI18n("vxe.table.customRestore"),onClick:me}):(0,_vue.createCommentVNode)(),l.immediate?G?(0,_vue.h)(G,{mode:"text",content:l.closeButtonText||getI18n("vxe.table.customClose"),onClick:ue}):(0,_vue.createCommentVNode)():G?(0,_vue.h)(G,{mode:"text",content:l.cancelButtonText||getI18n("vxe.table.customCancel"),onClick:de}):(0,_vue.createCommentVNode)(),!l.immediate&&G?(0,_vue.h)(G,{mode:"text",status:"primary",content:l.confirmButtonText||getI18n("vxe.table.customConfirm"),onClick:ce}):(0,_vue.createCommentVNode)()])]):null]:[]);return}}}});
@@ -2562,7 +2562,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
2562
2562
  $table: $xeTable,
2563
2563
  row
2564
2564
  })).then(childRecords => {
2565
- rowRest.treeLoaded = true;
2565
+ if (rowRest) {
2566
+ rowRest.treeLoaded = true;
2567
+ }
2566
2568
  if (treeExpandLazyLoadedMaps[rowid]) {
2567
2569
  delete treeExpandLazyLoadedMaps[rowid];
2568
2570
  }
@@ -2592,7 +2594,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
2592
2594
  const {
2593
2595
  treeExpandLazyLoadedMaps
2594
2596
  } = reactData;
2595
- rowRest.treeLoaded = false;
2597
+ if (rowRest) {
2598
+ rowRest.treeLoaded = false;
2599
+ }
2596
2600
  if (treeExpandLazyLoadedMaps[rowid]) {
2597
2601
  delete treeExpandLazyLoadedMaps[rowid];
2598
2602
  }
@@ -4229,38 +4233,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
4229
4233
  * 如果已关联工具栏,则会同步更新
4230
4234
  */
4231
4235
  resetColumn(options) {
4232
- const {
4233
- collectColumn
4234
- } = internalData;
4235
- const customOpts = computeCustomOpts.value;
4236
- const {
4237
- checkMethod
4238
- } = customOpts;
4239
- const opts = Object.assign({
4240
- visible: true,
4241
- resizable: options === true,
4242
- fixed: options === true,
4243
- sort: options === true
4244
- }, options);
4245
- _xeUtils.default.eachTree(collectColumn, column => {
4246
- if (opts.resizable) {
4247
- column.resizeWidth = 0;
4248
- }
4249
- if (opts.fixed) {
4250
- column.fixed = column.defaultFixed;
4251
- }
4252
- if (opts.sort) {
4253
- column.renderSortNumber = column.sortNumber;
4254
- }
4255
- if (!checkMethod || checkMethod({
4256
- column
4257
- })) {
4258
- column.visible = column.defaultVisible;
4259
- }
4260
- column.renderResizeWidth = column.renderWidth;
4261
- });
4262
- $xeTable.saveCustomStore('reset');
4263
- return tablePrivateMethods.handleCustom();
4236
+ (0, _log.warnLog)('vxe.error.delFunc', ['resetColumn', 'resetCustom']);
4237
+ return $xeTable.resetCustom(options);
4264
4238
  },
4265
4239
  /**
4266
4240
  * 刷新列信息