vxe-table 4.7.41 → 4.7.42

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

@@ -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(k){const L=_ui.VxeUI.getComponent("VxeModal"),A=_ui.VxeUI.getComponent("VxeButton"),y=_ui.VxeUI.getComponent("VxeInput"),F=_ui.VxeUI.getComponent("VxeTooltip"),w=_ui.VxeUI.getComponent("VxeRadioGroup"),v=(0,_vue.inject)("$xeTable",{}),H=v["reactData"],{computeCustomOpts:R,computeColumnOpts:D,computeIsMaxFixedColumn:M}=v.getComputeMaps(),S=(0,_vue.ref)(),U=(0,_vue.ref)(),K=(0,_vue.ref)(),W=(0,_vue.ref)();let n;const X=e=>{var t=k["customStore"];t.activeWrapper=!0,v.customOpenEvent(e)},z=e=>{const t=k["customStore"];t.activeWrapper=!1,setTimeout(()=>{t.activeBtn||t.activeWrapper||v.customCloseEvent(e)},300)},q=e=>{var t=H["customColumnList"];const{allowVisible:s,allowSort:a,allowFixed:r,allowResizable:n}=R.value;_xeUtils.default.eachTree(t,(e,t,o,l,i)=>{i||(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)}),v.closeCustom(),v.emitCustomEvent("confirm",e),v.saveCustomStore("confirm")},j=e=>{var t=k["customStore"],o=H["customColumnList"];const{oldSortMaps:i,oldFixedMaps:s,oldVisibleMaps:a}=t,{allowVisible:r,allowSort:n,allowFixed:u,allowResizable:c}=R.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"}),v.closeCustom(),v.emitCustomEvent("cancel",e)},o=e=>{v.resetColumn(!0),v.closeCustom(),v.emitCustomEvent("reset",e)},G=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=H["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))},P=e=>{const t=!e.renderVisible;var o=R.value;_xeUtils.default.eachTree([e],e=>{e.renderVisible=t,e.halfVisible=!1}),l(e),o.immediate&&(v.handleCustom(),v.saveCustomStore("update:visible")),v.checkCustomStatus()},Y=(e,t)=>{var o=M.value;e.renderFixed===t?e.renderFixed="":o&&!e.renderFixed||(e.renderFixed=t)},$=()=>{var e=k["customStore"],t=H["customColumnList"];const o=R.value["checkMethod"],l=!e.isAll;_xeUtils.default.eachTree(t,e=>{o&&!o({column:e})||(e.renderVisible=l,e.halfVisible=!1)}),e.isAll=l,v.checkCustomStatus()},J=e=>{var e=e.currentTarget.parentNode.parentNode,t=e.getAttribute("colid"),t=v.getColumnById(t);e.draggable=!0,W.value=t,(0,_dom.addClass)(e,"active--drag-origin")},Q=e=>{var e=e.currentTarget.parentNode.parentNode,t=K.value;e.draggable=!1,(W.value=null,_dom.removeClass)(e,"active--drag-origin"),t&&(t.style.display="")},Z=e=>{var t=new Image;e.dataTransfer&&e.dataTransfer.setDragImage(t,0,0)},ee=e=>{var t=H["customColumnList"],e=e.currentTarget,o=K.value;if(n){if(n!==e){var l=n.getAttribute("drag-pos"),i=e.getAttribute("colid");const a=v.getColumnById(i);if(!a)return;var i=_xeUtils.default.findIndexOf(t,e=>e.id===a.id),s=n.getAttribute("colid");const r=v.getColumnById(s);if(!r)return;t.splice(i,1);s=_xeUtils.default.findIndexOf(t,e=>e.id===r.id);t.splice(s+("bottom"===l?1:0),0,a)}n.draggable=!1,n.removeAttribute("drag-pos"),(0,_dom.removeClass)(n,"active--drag-target")}W.value=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")},te=e=>{var t=e.currentTarget,o=(n!==t&&(0,_dom.removeClass)(n,"active--drag-target"),t.getAttribute("colid")),o=v.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),n=t);{o=e;var l=K.value,i=U.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)(()=>{L||(0,_log.errLog)("vxe.error.reqComp",["vxe-modal"]),A||(0,_log.errLog)("vxe.error.reqComp",["vxe-button"]),y||(0,_log.errLog)("vxe.error.reqComp",["vxe-input"]),F||(0,_log.errLog)("vxe.error.reqComp",["vxe-tooltip"]),w||(0,_log.errLog)("vxe.error.reqComp",["vxe-radio-group"])}),()=>{if("popup"===R.value.mode){const a=k["customStore"];var e=H["customColumnList"];const r=R.value,{modalOptions:n,allowVisible:c,allowSort:v,allowFixed:d,allowResizable:m,checkMethod:h,visibleMethod:p}=r,u=D.value;var t=Object.assign({},n);const x=M.value,_=[],g=(_xeUtils.default.eachTree(e,(t,e,o,l,i)=>{if(!p||p({column:t})){var s=t.renderVisible,a=t.halfVisible,r=(0,_utils.formatText)(t.getTitle(),1),n=t.children&&t.children.length;const u=!!h&&!h({column:t});_.push((0,_vue.h)("tr",{key:t.id,colid:t.id,class:["vxe-table-custom-popup--row level--"+t.level,{"is--group":n}],onDragstart:Z,onDragend:ee,onDragover:te},[c?(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":u}],title:getI18n("vxe.custom.setting.colVisible"),onClick:()=>{u||P(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)(),v?(0,_vue.h)("td",{class:"vxe-table-custom-popup--column-item col--sort"},[1===t.level?(0,_vue.h)("span",{class:"vxe-table-custom-popup--column-sort-btn",title:getI18n("vxe.custom.setting.sortHelpTip"),onMousedown:J,onMouseup:Q},[(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"},[(0,_vue.h)("div",{class:"vxe-table-custom-popup--name",title:r},r)]),m?(0,_vue.h)("td",{class:"vxe-table-custom-popup--column-item col--resizable"},[!s||t.children&&t.children.length?(0,_vue.h)("span","-"):y?(0,_vue.h)(y,{type:"integer",min:40,modelValue:t.renderResizeWidth,"onUpdate:modelValue"(e){t.renderResizeWidth=Math.max(40,Number(e))}}):(0,_vue.createCommentVNode)()]):(0,_vue.createCommentVNode)(),d?(0,_vue.h)("td",{class:"vxe-table-custom-popup--column-item col--fixed"},[i?(0,_vue.h)("span","-"):w?(0,_vue.h)(w,{modelValue:t.renderFixed||"",type:"button",size:"mini",options:[{label:getI18n("vxe.custom.setting.fixedLeft"),value:"left",disabled:x},{label:getI18n("vxe.custom.setting.fixedUnset"),value:""},{label:getI18n("vxe.custom.setting.fixedRight"),value:"right",disabled:x}],"onUpdate:modelValue"(e){t.renderFixed=e}}):(0,_vue.createCommentVNode)()]):(0,_vue.createCommentVNode)()]))}}),a.isAll),b=a.isIndeterminate;return L?(0,_vue.h)(L,{key:"popup",className:["vxe-table-custom-popup-wrapper","vxe-table--ignore-clear",t.className||""].join(" "),modelValue:a.visible,title:t.title||getI18n("vxe.custom.cstmTitle"),width:t.width||"50vw",minWidth:t.minWidth||700,height:t.height||"50vh",minHeight:t.minHeight||400,mask:!0,lockView:!0,showFooter:!0,resize:!0,escClosable:!0,destroyOnClose:!0,"onUpdate:modelValue"(e){a.visible=e}},{default:()=>(0,_vue.h)("div",{ref:U,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",{},[c?(0,_vue.h)("col",{style:{width:"80px"}}):(0,_vue.createCommentVNode)(),v?(0,_vue.h)("col",{style:{width:"80px"}}):(0,_vue.createCommentVNode)(),(0,_vue.h)("col",{style:{minWidth:"120px"}}),m?(0,_vue.h)("col",{style:{width:"140px"}}):(0,_vue.createCommentVNode)(),d?(0,_vue.h)("col",{style:{width:"200px"}}):(0,_vue.createCommentVNode)()]),(0,_vue.h)("thead",{},[(0,_vue.h)("tr",{},[c?(0,_vue.h)("th",{},[(0,_vue.h)("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":g,"is--indeterminate":b}],title:getI18n("vxe.table.allTitle"),onClick:$},[(0,_vue.h)("span",{class:["vxe-checkbox--icon",b?getIcon().TABLE_CHECKBOX_INDETERMINATE:g?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")),F?(0,_vue.h)(F,{enterable:!0,content:getI18n("vxe.custom.setting.sortHelpTip")},{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")),m?(0,_vue.h)("th",{},getI18n("vxe.custom.setting.colResizable")):(0,_vue.createCommentVNode)(),d?(0,_vue.h)("th",{},getI18n("vxe.custom.setting.colFixed",[u.maxFixedSize||0])):(0,_vue.createCommentVNode)()])]),(0,_vue.h)(_vue.TransitionGroup,{class:"vxe-table-custom--body",tag:"tbody",name:"vxe-table-custom--list"},{default:()=>_})])]),(0,_vue.h)("div",{ref:K,class:"vxe-table-custom-popup--drag-hint"},getI18n("vxe.custom.cstmDragTarget",[W.value?W.value.getTitle():""]))]),footer:()=>(0,_vue.h)("div",{class:"vxe-table-custom-popup--footer"},[A?(0,_vue.h)(A,{content:r.resetButtonText||getI18n("vxe.custom.cstmRestore"),onClick:G}):(0,_vue.createCommentVNode)(),A?(0,_vue.h)(A,{content:r.resetButtonText||getI18n("vxe.custom.cstmCancel"),onClick:j}):(0,_vue.createCommentVNode)(),A?(0,_vue.h)(A,{status:"primary",content:r.confirmButtonText||getI18n("vxe.custom.cstmConfirm"),onClick:q}):(0,_vue.createCommentVNode)()])}):(0,_vue.createCommentVNode)()}{var e=k["customStore"],t=H["customColumnList"],o=R.value,l=e["maxHeight"];const{checkMethod:C,visibleMethod:f,allowVisible:I,allowSort:T,allowFixed:V,trigger:E,placement:N}=o,B=M.value,O=[];var i={},t=("hover"===E&&(i.onMouseenter=X,i.onMouseleave=z),_xeUtils.default.eachTree(t,(e,t,o,l,i)=>{if(!f||f({column:e})){var s=e.renderVisible,a=e.halfVisible,r=e.children&&e.children.length,n=(0,_utils.formatText)(e.getTitle(),1);const u=!!C&&!C({column:e});O.push((0,_vue.h)("li",{key:e.id,colid:e.id,class:["vxe-table-custom--option","level--"+e.level,{"is--group":r}],onDragstart:Z,onDragend:ee,onDragover:te},[I?(0,_vue.h)("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":s,"is--indeterminate":a,"is--disabled":u}],title:getI18n("vxe.custom.setting.colVisible"),onClick:()=>{u||P(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)(),T&&1===e.level?(0,_vue.h)("div",{class:"vxe-table-custom--sort-option"},[(0,_vue.h)("span",{class:"vxe-table-custom--sort-btn",title:getI18n("vxe.custom.setting.sortHelpTip"),onMousedown:J,onMouseup:Q},[(0,_vue.h)("i",{class:getIcon().TABLE_CUSTOM_SORT})])]):(0,_vue.createCommentVNode)(),(0,_vue.h)("div",{class:"vxe-table-custom--checkbox-label",title:n},n),!i&&V?(0,_vue.h)("div",{class:"vxe-table-custom--fixed-option"},[(0,_vue.h)("span",{class:["vxe-table-custom--fixed-left-option","left"===e.renderFixed?getIcon().TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE:getIcon().TOOLBAR_TOOLS_FIXED_LEFT,{"is--checked":"left"===e.renderFixed,"is--disabled":B&&!e.renderFixed}],title:getI18n("left"===e.renderFixed?"vxe.toolbar.cancelFixed":"vxe.toolbar.fixedLeft"),onClick:()=>{Y(e,"left")}}),(0,_vue.h)("span",{class:["vxe-table-custom--fixed-right-option","right"===e.renderFixed?getIcon().TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE:getIcon().TOOLBAR_TOOLS_FIXED_RIGHT,{"is--checked":"right"===e.renderFixed,"is--disabled":B&&!e.renderFixed}],title:getI18n("right"===e.renderFixed?"vxe.toolbar.cancelFixed":"vxe.toolbar.fixedRight"),onClick:()=>{Y(e,"right")}})]):(0,_vue.createCommentVNode)()]))}}),e.isAll),s=e.isIndeterminate;return(0,_vue.h)("div",{ref:S,key:"simple",class:["vxe-table-custom-wrapper","placement--"+N,{"is--active":e.visible}],style:l&&!["left","right"].includes(N)?{maxHeight:l+"px"}:{}},e.visible?[(0,_vue.h)("ul",{class:"vxe-table-custom--header"},[(0,_vue.h)("li",{class:"vxe-table-custom--option"},[I?(0,_vue.h)("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":t,"is--indeterminate":s}],title:getI18n("vxe.table.allTitle"),onClick:$},[(0,_vue.h)("span",{class:["vxe-checkbox--icon",s?getIcon().TABLE_CHECKBOX_INDETERMINATE:t?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:U,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:()=>O}),(0,_vue.h)("div",{ref:K,class:"vxe-table-custom-popup--drag-hint"},getI18n("vxe.custom.cstmDragTarget",[W.value?W.value.getTitle():""]))]),o.showFooter?(0,_vue.h)("div",{class:"vxe-table-custom--footer"},[(0,_vue.h)("button",{class:"btn--reset",onClick:G},o.resetButtonText||getI18n("vxe.table.customRestore")),o.immediate?(0,_vue.createCommentVNode)():(0,_vue.h)("button",{class:"btn--cancel",onClick:j},o.resetButtonText||getI18n("vxe.table.customCancel")),(0,_vue.h)("button",{class:"btn--confirm",onClick:q},o.confirmButtonText||getI18n("vxe.table.customConfirm"))]):null]:[]);return}}}});
+"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(O){const w=_ui.VxeUI.getComponent("VxeModal"),L=_ui.VxeUI.getComponent("VxeButton"),A=_ui.VxeUI.getComponent("VxeInput"),y=_ui.VxeUI.getComponent("VxeTooltip"),F=_ui.VxeUI.getComponent("VxeRadioGroup"),d=(0,_vue.inject)("$xeTable",{}),M=d["reactData"],{computeCustomOpts:H,computeColumnOpts:R,computeIsMaxFixedColumn:D}=d.getComputeMaps(),S=(0,_vue.ref)(),U=(0,_vue.ref)(),K=(0,_vue.ref)(),z=(0,_vue.ref)();let n;const W=e=>{var t=O["customStore"];t.activeWrapper=!0,d.customOpenEvent(e)},X=e=>{const t=O["customStore"];t.activeWrapper=!1,setTimeout(()=>{t.activeBtn||t.activeWrapper||d.customCloseEvent(e)},300)},q=e=>{var t=M["customColumnList"];const{allowVisible:s,allowSort:a,allowFixed:r,allowResizable:n}=H.value;_xeUtils.default.eachTree(t,(e,t,o,l,i)=>{i||(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")},j=e=>{var t=O["customStore"],o=M["customColumnList"];const{oldSortMaps:i,oldFixedMaps:s,oldVisibleMaps:a}=t,{allowVisible:r,allowSort:n,allowFixed:c,allowResizable:u}=H.value;_xeUtils.default.eachTree(o,e=>{var t=e.getKey(),o=!!a[t],l=s[t]||"";r&&(e.renderVisible=o,e.visible=o),c&&(e.renderFixed=l,e.fixed=l),n&&(e.renderSortNumber=i[t]||0),u&&(e.renderResizeWidth=e.renderWidth)},{children:"children"}),d.closeCustom(),d.emitCustomEvent("cancel",e)},o=e=>{d.resetColumn(!0),d.closeCustom(),d.emitCustomEvent("reset",e)},G=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=M["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))},P=e=>{const t=!e.renderVisible;var o=H.value;_xeUtils.default.eachTree([e],e=>{e.renderVisible=t,e.halfVisible=!1}),l(e),o.immediate&&(d.handleCustom(),d.saveCustomStore("update:visible")),d.checkCustomStatus()},Y=(e,t)=>{var o=D.value;e.renderFixed===t?e.renderFixed="":o&&!e.renderFixed||(e.renderFixed=t)},Z=()=>{var e=O["customStore"],t=M["customColumnList"];const o=H.value["checkMethod"],l=!e.isAll;_xeUtils.default.eachTree(t,e=>{o&&!o({column:e})||(e.renderVisible=l,e.halfVisible=!1)}),e.isAll=l,d.checkCustomStatus()},$=e=>{var e=e.currentTarget.parentNode.parentNode,t=e.getAttribute("colid"),t=d.getColumnById(t);e.draggable=!0,z.value=t,(0,_dom.addClass)(e,"active--drag-origin")},J=e=>{var e=e.currentTarget.parentNode.parentNode,t=K.value;e.draggable=!1,(z.value=null,_dom.removeClass)(e,"active--drag-origin"),t&&(t.style.display="")},Q=e=>{var t=new Image;e.dataTransfer&&e.dataTransfer.setDragImage(t,0,0)},ee=e=>{var t=M["customColumnList"],e=e.currentTarget,o=K.value;if(n){if(n!==e){var l=n.getAttribute("drag-pos"),i=e.getAttribute("colid");const a=d.getColumnById(i);if(!a)return;var i=_xeUtils.default.findIndexOf(t,e=>e.id===a.id),s=n.getAttribute("colid");const r=d.getColumnById(s);if(!r)return;t.splice(i,1);s=_xeUtils.default.findIndexOf(t,e=>e.id===r.id);t.splice(s+("bottom"===l?1:0),0,a)}n.draggable=!1,n.removeAttribute("drag-pos"),(0,_dom.removeClass)(n,"active--drag-target")}z.value=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")},te=e=>{var t=e.currentTarget,o=(n!==t&&(0,_dom.removeClass)(n,"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),n=t);{o=e;var l=K.value,i=U.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)(()=>{w||(0,_log.errLog)("vxe.error.reqComp",["vxe-modal"]),L||(0,_log.errLog)("vxe.error.reqComp",["vxe-button"]),A||(0,_log.errLog)("vxe.error.reqComp",["vxe-input"]),y||(0,_log.errLog)("vxe.error.reqComp",["vxe-tooltip"]),F||(0,_log.errLog)("vxe.error.reqComp",["vxe-radio-group"])}),()=>{if("popup"===H.value.mode){const a=O["customStore"];var e=M["customColumnList"];const r=H.value,{modalOptions:n,allowVisible:u,allowSort:d,allowFixed:v,allowResizable:m,checkMethod:h,visibleMethod:x}=r,c=R.value["maxFixedSize"];var t=Object.assign({},n);const p=D.value,_=[],g=(_xeUtils.default.eachTree(e,(t,e,o,l,i)=>{if(!x||x({column:t})){var s=t.renderVisible,a=t.halfVisible,r=(0,_utils.formatText)(t.getTitle(),1),n=t.children&&t.children.length;const c=!!h&&!h({column:t});_.push((0,_vue.h)("tr",{key:t.id,colid:t.id,class:["vxe-table-custom-popup--row level--"+t.level,{"is--group":n}],onDragstart:Q,onDragend:ee,onDragover:te},[u?(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||P(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)(),d?(0,_vue.h)("td",{class:"vxe-table-custom-popup--column-item col--sort"},[1===t.level?(0,_vue.h)("span",{class:"vxe-table-custom-popup--column-sort-btn",title:getI18n("vxe.custom.setting.sortHelpTip"),onMousedown:$,onMouseup:J},[(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"},[(0,_vue.h)("div",{class:"vxe-table-custom-popup--name",title:r},r)]),m?(0,_vue.h)("td",{class:"vxe-table-custom-popup--column-item col--resizable"},[!s||t.children&&t.children.length?(0,_vue.h)("span","-"):A?(0,_vue.h)(A,{type:"integer",min:40,modelValue:t.renderResizeWidth,"onUpdate:modelValue"(e){t.renderResizeWidth=Math.max(40,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","-"):F?(0,_vue.h)(F,{modelValue:t.renderFixed||"",type:"button",size:"mini",options:[{label:getI18n("vxe.custom.setting.fixedLeft"),value:"left",disabled:p},{label:getI18n("vxe.custom.setting.fixedUnset"),value:""},{label:getI18n("vxe.custom.setting.fixedRight"),value:"right",disabled:p}],"onUpdate:modelValue"(e){t.renderFixed=e}}):(0,_vue.createCommentVNode)()]):(0,_vue.createCommentVNode)()]))}}),a.isAll),b=a.isIndeterminate;return w?(0,_vue.h)(w,{key:"popup",className:["vxe-table-custom-popup-wrapper","vxe-table--ignore-clear",t.className||""].join(" "),modelValue:a.visible,title:t.title||getI18n("vxe.custom.cstmTitle"),width:t.width||"50vw",minWidth:t.minWidth||700,height:t.height||"50vh",minHeight:t.minHeight||400,showZoom:t.showZoom,showMaximize:t.showMaximize,showMinimize:t.showMinimize,mask:t.mask,lockView:t.lockView,resize:t.resize,escClosable:!!t.escClosable,destroyOnClose:!0,showFooter:!0,"onUpdate:modelValue"(e){a.visible=e}},{default:()=>(0,_vue.h)("div",{ref:U,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",{},[u?(0,_vue.h)("col",{style:{width:"80px"}}):(0,_vue.createCommentVNode)(),d?(0,_vue.h)("col",{style:{width:"80px"}}):(0,_vue.createCommentVNode)(),(0,_vue.h)("col",{style:{minWidth:"120px"}}),m?(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",{},[u?(0,_vue.h)("th",{},[(0,_vue.h)("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":g,"is--indeterminate":b}],title:getI18n("vxe.table.allTitle"),onClick:Z},[(0,_vue.h)("span",{class:["vxe-checkbox--icon",b?getIcon().TABLE_CHECKBOX_INDETERMINATE:g?getIcon().TABLE_CHECKBOX_CHECKED:getIcon().TABLE_CHECKBOX_UNCHECKED]}),(0,_vue.h)("span",{class:"vxe-checkbox--label"},getI18n("vxe.toolbar.customAll"))])]):(0,_vue.createCommentVNode)(),d?(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")},{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")),m?(0,_vue.h)("th",{},getI18n("vxe.custom.setting.colResizable")):(0,_vue.createCommentVNode)(),v?(0,_vue.h)("th",{},getI18n("vxe.custom.setting."+(c?"colFixedMax":"colFixed"),[c])):(0,_vue.createCommentVNode)()])]),(0,_vue.h)(_vue.TransitionGroup,{class:"vxe-table-custom--body",tag:"tbody",name:"vxe-table-custom--list"},{default:()=>_})])]),(0,_vue.h)("div",{ref:K,class:"vxe-table-custom-popup--drag-hint"},getI18n("vxe.custom.cstmDragTarget",[z.value?z.value.getTitle():""]))]),footer:()=>(0,_vue.h)("div",{class:"vxe-table-custom-popup--footer"},[L?(0,_vue.h)(L,{content:r.resetButtonText||getI18n("vxe.custom.cstmRestore"),onClick:G}):(0,_vue.createCommentVNode)(),L?(0,_vue.h)(L,{content:r.resetButtonText||getI18n("vxe.custom.cstmCancel"),onClick:j}):(0,_vue.createCommentVNode)(),L?(0,_vue.h)(L,{status:"primary",content:r.confirmButtonText||getI18n("vxe.custom.cstmConfirm"),onClick:q}):(0,_vue.createCommentVNode)()])}):(0,_vue.createCommentVNode)()}{var e=O["customStore"],t=M["customColumnList"],o=H.value,l=e["maxHeight"];const{checkMethod:C,visibleMethod:f,allowVisible:I,allowSort:T,allowFixed:V,trigger:E,placement:N}=o,k=D.value,B=[];var i={},t=("hover"===E&&(i.onMouseenter=W,i.onMouseleave=X),_xeUtils.default.eachTree(t,(e,t,o,l,i)=>{if(!f||f({column:e})){var s=e.renderVisible,a=e.halfVisible,r=e.children&&e.children.length,n=(0,_utils.formatText)(e.getTitle(),1);const c=!!C&&!C({column:e});B.push((0,_vue.h)("li",{key:e.id,colid:e.id,class:["vxe-table-custom--option","level--"+e.level,{"is--group":r}],onDragstart:Q,onDragend:ee,onDragover:te},[I?(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||P(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)(),T&&1===e.level?(0,_vue.h)("div",{class:"vxe-table-custom--sort-option"},[(0,_vue.h)("span",{class:"vxe-table-custom--sort-btn",title:getI18n("vxe.custom.setting.sortHelpTip"),onMousedown:$,onMouseup:J},[(0,_vue.h)("i",{class:getIcon().TABLE_CUSTOM_SORT})])]):(0,_vue.createCommentVNode)(),(0,_vue.h)("div",{class:"vxe-table-custom--checkbox-label",title:n},n),!i&&V?(0,_vue.h)("div",{class:"vxe-table-custom--fixed-option"},[(0,_vue.h)("span",{class:["vxe-table-custom--fixed-left-option","left"===e.renderFixed?getIcon().TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE:getIcon().TOOLBAR_TOOLS_FIXED_LEFT,{"is--checked":"left"===e.renderFixed,"is--disabled":k&&!e.renderFixed}],title:getI18n("left"===e.renderFixed?"vxe.toolbar.cancelFixed":"vxe.toolbar.fixedLeft"),onClick:()=>{Y(e,"left")}}),(0,_vue.h)("span",{class:["vxe-table-custom--fixed-right-option","right"===e.renderFixed?getIcon().TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE:getIcon().TOOLBAR_TOOLS_FIXED_RIGHT,{"is--checked":"right"===e.renderFixed,"is--disabled":k&&!e.renderFixed}],title:getI18n("right"===e.renderFixed?"vxe.toolbar.cancelFixed":"vxe.toolbar.fixedRight"),onClick:()=>{Y(e,"right")}})]):(0,_vue.createCommentVNode)()]))}}),e.isAll),s=e.isIndeterminate;return(0,_vue.h)("div",{ref:S,key:"simple",class:["vxe-table-custom-wrapper","placement--"+N,{"is--active":e.visible}],style:l&&!["left","right"].includes(N)?{maxHeight:l+"px"}:{}},e.visible?[(0,_vue.h)("ul",{class:"vxe-table-custom--header"},[(0,_vue.h)("li",{class:"vxe-table-custom--option"},[I?(0,_vue.h)("div",{class:["vxe-table-custom--checkbox-option",{"is--checked":t,"is--indeterminate":s}],title:getI18n("vxe.table.allTitle"),onClick:Z},[(0,_vue.h)("span",{class:["vxe-checkbox--icon",s?getIcon().TABLE_CHECKBOX_INDETERMINATE:t?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:U,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:K,class:"vxe-table-custom-popup--drag-hint"},getI18n("vxe.custom.cstmDragTarget",[z.value?z.value.getTitle():""]))]),o.showFooter?(0,_vue.h)("div",{class:"vxe-table-custom--footer"},[(0,_vue.h)("button",{class:"btn--reset",onClick:G},o.resetButtonText||getI18n("vxe.table.customRestore")),o.immediate?(0,_vue.createCommentVNode)():(0,_vue.h)("button",{class:"btn--cancel",onClick:j},o.resetButtonText||getI18n("vxe.table.customCancel")),(0,_vue.h)("button",{class:"btn--confirm",onClick:q},o.confirmButtonText||getI18n("vxe.table.customConfirm"))]):null]:[]);return}}}});

package/lib/table/src/table.js

@@ -517,7 +517,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       let fixedSize = 0;
       // 只判断第一层
       collectColumn.forEach(column => {
-        if (column.fixed) {
+        if (column.renderFixed) {
           fixedSize++;
         }
       });
@@ -916,9 +916,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
       return num;
     };
     const handleCustomRestore = storeData => {
-      const {
-        tableFullColumn
-      } = internalData;
       let {
         collectColumn
       } = internalData;
@@ -931,21 +928,24 @@ var _default = exports.default = (0, _vue.defineComponent)({
       let hasCustomSort = false;
       // 处理还原
       if (resizableData || sortData || visibleData || fixedData) {
-        tableFullColumn.forEach(column => {
+        _xeUtils.default.eachTree(collectColumn, (column, index, items, path, parent) => {
           const colKey = column.getKey();
+          // 支持一级
+          if (!parent) {
+            if (fixedData && fixedData[colKey]) {
+              column.fixed = fixedData[colKey];
+            }
+            if (sortData && _xeUtils.default.isNumber(sortData[colKey])) {
+              hasCustomSort = true;
+              column.renderSortNumber = sortData[colKey];
+            }
+          }
           if (resizableData && _xeUtils.default.isNumber(resizableData[colKey])) {
             column.resizeWidth = resizableData[colKey];
           }
           if (visibleData && _xeUtils.default.isBoolean(visibleData[colKey])) {
             column.visible = visibleData[colKey];
           }
-          if (fixedData && fixedData[colKey]) {
-            column.fixed = fixedData[colKey];
-          }
-          if (sortData && _xeUtils.default.isNumber(sortData[colKey])) {
-            hasCustomSort = true;
-            column.renderSortNumber = sortData[colKey];
-          }
         });
         // 如果自定义了顺序
         if (hasCustomSort) {
@@ -3819,16 +3819,13 @@ var _default = exports.default = (0, _vue.defineComponent)({
         const targetColumn = (0, _util.getRootColumn)($xeTable, column);
         const isMaxFixedColumn = computeIsMaxFixedColumn.value;
         const columnOpts = computeColumnOpts.value;
-        const {
-          maxFixedSize
-        } = columnOpts;
         if (targetColumn && targetColumn.fixed !== fixed) {
           // 是否超过最大固定列数量
           if (!targetColumn.fixed && isMaxFixedColumn) {
             if (_ui.VxeUI.modal) {
               _ui.VxeUI.modal.message({
                 status: 'error',
-                content: getI18n('vxe.table.maxFixedCol', [maxFixedSize])
+                content: getI18n('vxe.table.maxFixedCol', [columnOpts.maxFixedSize])
               });
             }
             return (0, _vue.nextTick)();
@@ -5308,7 +5305,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         let hasFixedt = 0;
         let hasVisible = 0;
         _xeUtils.default.eachTree(collectColumn, (column, index, items, path, parent) => {
-          // 排序只支持一级
+          // 只支持一级
           if (!parent) {
             collectColumn.forEach(column => {
               const colKey = column.getKey();
@@ -5317,6 +5314,13 @@ var _default = exports.default = (0, _vue.defineComponent)({
                 sortData[colKey] = column.renderSortNumber;
               }
             });
+            if (column.fixed && column.fixed !== column.defaultFixed) {
+              const colKey = column.getKey();
+              if (colKey) {
+                hasFixedt = 1;
+                fixedData[colKey] = column.fixed;
+              }
+            }
           }
           if (column.resizeWidth) {
             const colKey = column.getKey();
@@ -5325,13 +5329,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
               resizableData[colKey] = column.renderWidth;
             }
           }
-          if (column.fixed && column.fixed !== column.defaultFixed) {
-            const colKey = column.getKey();
-            if (colKey) {
-              hasFixedt = 1;
-              fixedData[colKey] = column.fixed;
-            }
-          }
           if (!checkMethod || checkMethod({
             column
           })) {