vxe-table 4.1.9 → 4.1.11

package/lib/select/src/select.js

@@ -211,7 +211,7 @@ var _default2 = (0, _vue.defineComponent)({
     });
 
     var getOptkey = function getOptkey() {
-      return props.optionId || '_XID';
+      return props.optionId || '_X_ID';
     };
 
     var getOptid = function getOptid(option) {

package/lib/select/src/select.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_size=require("../../hooks/size"),_dom=require("../../tools/dom"),_utils=require("../../tools/utils"),_event=require("../../tools/event");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function isOptionVisible(e){return!1!==e.visible}function getOptUniqueId(){return _xeUtils.default.uniqueId("opt_")}var _default2=(0,_vue.defineComponent)({name:"VxeSelect",props:{modelValue:null,clearable:Boolean,placeholder:String,loading:Boolean,disabled:Boolean,multiple:Boolean,multiCharOverflow:{type:[Number,String],default:function(){return _conf.default.select.multiCharOverflow}},prefixIcon:String,placement:String,options:Array,optionProps:Object,optionGroups:Array,optionGroupProps:Object,className:[String,Function],size:{type:String,default:function(){return _conf.default.select.size||_conf.default.size}},emptyText:String,optionId:{type:String,default:function(){return _conf.default.select.optionId}},optionKey:Boolean,transfer:{type:Boolean,default:function(){return _conf.default.select.transfer}}},emits:["update:modelValue","change","clear"],setup:function(b,e){function m(e,t){return e&&(_xeUtils.default.isString(e)&&(e=g[e]||null),_xeUtils.default.isFunction(e))?e(t):[]}function v(t){var e=L.fullOptionList,n=L.fullGroupList,i=q.value,o=K.value;if(i)for(var l=0;l<n.length;l++){var u=n[l];if(u.options)for(var r=0;r<u.options.length;r++){var a=u.options[r];if(t===a[o])return a}}return e.find(function(e){return t===e[o]})}function i(e){var t=w.value,n=v(e);return _xeUtils.default.toValueString(n?n[t]:e)}function l(){var e=L.fullOptionList,t=L.fullGroupList;return q.value?L.visibleGroupList=t.filter(isOptionVisible):L.visibleOptionList=e.filter(isOptionVisible),(0,_vue.nextTick)()}function n(){function t(e){B(e)||(e[o]=getOptUniqueId())}var e=L.fullOptionList,n=L.fullGroupList,i=U.value,o=z();n.length?n.forEach(function(e){t(e),e[i]&&e[i].forEach(t)}):e.length&&e.forEach(t),l()}function x(e){var t=K.value;e&&(L.currentValue=e[t])}function c(i,o){return(0,_vue.nextTick)().then(function(){var e,t,n;i&&(e=P.value,t=S.value.querySelector("[optid='"+B(i)+"']"),e&&t&&(n=e.offsetHeight,o?t.offsetTop+t.offsetHeight-e.scrollTop>n&&(e.scrollTop=t.offsetTop+t.offsetHeight-n):(t.offsetTop+5<e.scrollTop||t.offsetTop+5>e.scrollTop+e.clientHeight)&&(e.scrollTop=t.offsetTop-5)))})}function o(){return(0,_vue.nextTick)().then(function(){var e=b.transfer,t=b.placement,n=L.panelIndex,i=y.value,o=S.value;if(o&&i){var l=i.offsetHeight,u=i.offsetWidth,r=o.offsetHeight,a=o.offsetWidth,s={zIndex:n},f=(0,_dom.getAbsolutePos)(i),v=f.boundingTop,o=f.boundingLeft,n=f.visibleHeight,i=f.visibleWidth,f="bottom";return e?(e=v+l,"top"===t?(f="top",e=v-r):t||(n<e+r+5&&(f="top",e=v-r),e<5&&(f="bottom",e=v+l)),i<(o=o)+a+5&&(o-=o+a+5-i),o<5&&(o=5),Object.assign(s,{left:o+"px",top:e+"px",minWidth:u+"px"})):"top"===t?(f="top",s.bottom=l+"px"):t||n<v+l+r&&5<v-l-r&&(f="top",s.bottom=l+"px"),L.panelStyle=s,L.panelPlacement=f,(0,_vue.nextTick)()}})}function f(e,t){H(t,null),F()}function h(e,t){var n,i=b.modelValue;b.multiple?(n=void 0,n=i?-1===i.indexOf(t)?i.concat([t]):i.filter(function(e){return e!==t}):[t],j(e,n)):(j(e,t),F())}function t(e){var t=b.disabled,n=L.visiblePanel;t||n&&(n=S.value,((0,_dom.getEventTargetNode)(e,n).flag?o:F)())}function u(e){var t,n=b.disabled,i=L.visiblePanel;n||(t=y.value,n=S.value,L.isActivated=(0,_dom.getEventTargetNode)(e,t).flag||(0,_dom.getEventTargetNode)(e,n).flag,i&&!L.isActivated&&F())}function r(e){var t,n,i,o,l,u,r=b.clearable,a=b.disabled,s=L.visiblePanel,f=L.currentValue;a||(l=(0,_event.hasEventKey)(e,_event.EVENT_KEYS.TAB),t=(0,_event.hasEventKey)(e,_event.EVENT_KEYS.ENTER),u=(0,_event.hasEventKey)(e,_event.EVENT_KEYS.ESCAPE),n=(0,_event.hasEventKey)(e,_event.EVENT_KEYS.ARROW_UP),i=(0,_event.hasEventKey)(e,_event.EVENT_KEYS.ARROW_DOWN),o=(0,_event.hasEventKey)(e,_event.EVENT_KEYS.DELETE),a=(0,_event.hasEventKey)(e,_event.EVENT_KEYS.SPACEBAR),l&&(L.isActivated=!1),s?u||l?F():t?(e.preventDefault(),e.stopPropagation(),h(e,f)):n||i?(e.preventDefault(),l=(u=function(e,t){var n,i,o,l,u=L.visibleOptionList,r=L.visibleGroupList,a=q.value,s=K.value,f=U.value;if(a)for(var v=0;v<r.length;v++){var c=r[v],p=c[f],d=c.disabled;if(p)for(var _=0;_<p.length;_++){var b=isOptionVisible(x=p[_]),m=d||x.disabled;if(n||m||(n=x),l&&b&&!m&&(o=x,!t))return{offsetOption:o};if(e===x[s]){if(l=x,t)return{offsetOption:i}}else b&&!m&&(i=x)}}else for(_=0;_<u.length;_++){var x,m=(x=u[_]).disabled;if(n||m||(n=x),l&&!m&&(o=x,!t))return{offsetOption:o};if(e===x[s]){if(l=x,t)return{offsetOption:i}}else m||(i=x)}return{firstOption:n}}(f,n)).firstOption,(u=u.offsetOption)||v(f)||(u=l),x(u),c(u,i)):a&&e.preventDefault():(n||i||t||a)&&L.isActivated&&(e.preventDefault(),$()),L.isActivated&&o&&r&&H(e,null))}function a(){F()}function p(){b.disabled||(L.isActivated=!0)}function d(){L.isActivated=!1}function _(e){e.$event.preventDefault(),(L.visiblePanel?F:$)()}var s,g=e.slots,E=e.emit,O=_xeUtils.default.uniqueId(),T=(0,_size.useSize)(b),L=(0,_vue.reactive)({inited:!1,staticOptions:[],fullGroupList:[],fullOptionList:[],visibleGroupList:[],visibleOptionList:[],panelIndex:0,panelStyle:{},panelPlacement:null,currentValue:null,visiblePanel:!1,animatVisible:!1,isActivated:!1}),y=(0,_vue.ref)(),V=(0,_vue.ref)(),P=(0,_vue.ref)(),S=(0,_vue.ref)(),G={refElem:y},A={xID:O,props:b,context:e,reactData:L,getRefMaps:function(){return G}},I={},N=(0,_vue.computed)(function(){return b.optionProps||{}}),k=(0,_vue.computed)(function(){return b.optionGroupProps||{}}),w=(0,_vue.computed)(function(){return N.value.label||"label"}),K=(0,_vue.computed)(function(){return N.value.value||"value"}),C=(0,_vue.computed)(function(){return k.value.label||"label"}),U=(0,_vue.computed)(function(){return k.value.options||"options"}),q=(0,_vue.computed)(function(){return L.fullGroupList.some(function(e){return e.options&&e.options.length})}),D=(0,_vue.computed)(function(){return _xeUtils.default.toNumber(b.multiCharOverflow)}),R=(0,_vue.computed)(function(){var e=b.modelValue,t=b.multiple,n=D.value;return e&&t?(_xeUtils.default.isArray(e)?e:[e]).map(function(e){e=i(e);return 0<n&&e.length>n?e.substring(0,n)+"...":e}).join(", "):i(e)}),z=function(){return b.optionId||"_XID"},B=function(e){e=e[z()];return e?encodeURIComponent(e):""},$=function(){var e=b.loading,t=b.disabled;e||t||(clearTimeout(s),L.inited||(L.inited=!0),L.isActivated=!0,L.animatVisible=!0,setTimeout(function(){var e=b.modelValue,t=b.multiple,e=v(t&&e?e[0]:e);L.visiblePanel=!0,e&&(x(e),c(e))},10),L.panelIndex<(0,_utils.getLastZIndex)()&&(L.panelIndex=(0,_utils.nextZIndex)()),o())},F=function(){L.visiblePanel=!1,s=window.setTimeout(function(){L.animatVisible=!1},350)},j=function(e,t){t!==b.modelValue&&(E("update:modelValue",t),I.dispatchEvent("change",{value:t},e))},H=function(e,t){j(e,t),I.dispatchEvent("clear",{value:t},e)},W=function(e,a){var s=b.optionKey,f=b.modelValue,v=b.multiple,c=L.currentValue,p=w.value,d=K.value,_=q.value;return e.map(function(e,t){var n=e.slots,i=e.className,o=!_||isOptionVisible(e),l=a&&a.disabled||e.disabled,u=e[d],r=B(e),n=n?n.default:null;return o?(0,_vue.h)("div",{key:s?r:t,class:["vxe-select-option",i?_xeUtils.default.isFunction(i)?i({option:e,$select:A}):i:"",{"is--disabled":l,"is--selected":v?f&&-1<f.indexOf(u):f===u,"is--hover":c===u}],optid:r,onMousedown:function(e){0===e.button&&e.stopPropagation()},onClick:function(e){l||h(e,u)},onMouseenter:function(){l||x(e)}},n?m(n,{option:e,$select:A}):(0,_utils.formatText)((0,_utils.getFuncText)(e[p]))):null})},Y=function(){var u=b.optionKey,e=L.visibleGroupList,r=C.value,a=U.value;return e.map(function(e,t){var n=e.slots,i=e.className,o=B(e),l=e.disabled,n=n?n.default:null;return(0,_vue.h)("div",{key:u?o:t,class:["vxe-optgroup",i?_xeUtils.default.isFunction(i)?i({option:e,$select:A}):i:"",{"is--disabled":l}],optid:o},[(0,_vue.h)("div",{class:"vxe-optgroup--title"},n?m(n,{option:e,$select:A}):(0,_utils.getFuncText)(e[r])),(0,_vue.h)("div",{class:"vxe-optgroup--wrapper"},W(e[a]||[],e))])})},I={dispatchEvent:function(e,t,n){E(e,Object.assign({$select:A,$event:n},t))},isPanelVisible:function(){return L.visiblePanel},togglePanel:function(){return(L.visiblePanel?F:$)(),(0,_vue.nextTick)()},hidePanel:function(){return L.visiblePanel&&F(),(0,_vue.nextTick)()},showPanel:function(){return L.visiblePanel||$(),(0,_vue.nextTick)()},refreshOption:l,focus:function(){var e=V.value;return L.isActivated=!0,e.blur(),(0,_vue.nextTick)()},blur:function(){return V.value.blur(),(L.isActivated=!1,_vue.nextTick)()}};Object.assign(A,I),(0,_vue.watch)(function(){return L.staticOptions},function(e){e.some(function(e){return e.options&&e.options.length})?(L.fullOptionList=[],L.fullGroupList=e):(L.fullGroupList=[],L.fullOptionList=e||[]),n()}),(0,_vue.watch)(function(){return b.options},function(e){L.fullGroupList=[],L.fullOptionList=e||[],n()}),(0,_vue.watch)(function(){return b.optionGroups},function(e){L.fullOptionList=[],L.fullGroupList=e||[],n()}),(0,_vue.onMounted)(function(){(0,_vue.nextTick)(function(){var e=b.options,t=b.optionGroups;t?L.fullGroupList=t:e&&(L.fullOptionList=e),n()}),_event.GlobalEvent.on(A,"mousewheel",t),_event.GlobalEvent.on(A,"mousedown",u),_event.GlobalEvent.on(A,"keydown",r),_event.GlobalEvent.on(A,"blur",a)}),(0,_vue.onUnmounted)(function(){_event.GlobalEvent.off(A,"mousewheel"),_event.GlobalEvent.off(A,"mousedown"),_event.GlobalEvent.off(A,"keydown"),_event.GlobalEvent.off(A,"blur")});return A.renderVN=function(){var e=b.className,t=b.transfer,n=b.disabled,i=b.loading,o=L.inited,l=L.isActivated,u=L.visiblePanel,r=T.value,a=R.value,s=g.prefix;return(0,_vue.h)("div",{ref:y,class:["vxe-select",e?_xeUtils.default.isFunction(e)?e({$select:A}):e:"",((e={})["size--"+r]=r,e["is--visivle"]=u,e["is--disabled"]=n,e["is--loading"]=i,e["is--active"]=l,e)]},[(0,_vue.h)("div",{class:"vxe-select-slots",ref:"hideOption"},g.default?g.default({}):[]),(0,_vue.h)((0,_vue.resolveComponent)("vxe-input"),{ref:V,clearable:b.clearable,placeholder:b.placeholder,readonly:!0,disabled:n,type:"text",prefixIcon:b.prefixIcon,suffixIcon:i?_conf.default.icon.SELECT_LOADED:u?_conf.default.icon.SELECT_OPEN:_conf.default.icon.SELECT_CLOSE,modelValue:a,onClear:f,onClick:_,onFocus:p,onBlur:d,onSuffixClick:_},s?{prefix:function(){return s({})}}:{}),(0,_vue.h)(_vue.Teleport,{to:"body",disabled:!t||!o},[(0,_vue.h)("div",{ref:S,class:["vxe-table--ignore-clear vxe-select--panel",((a={})["size--"+r]=r,a["is--transfer"]=t,a["animat--leave"]=!i&&L.animatVisible,a["animat--enter"]=!i&&u,a)],placement:L.panelPlacement,style:L.panelStyle},o?[(0,_vue.h)("div",{ref:P,class:"vxe-select-option--wrapper"},function(){var e=L.visibleGroupList,t=L.visibleOptionList;if(q.value){if(e.length)return Y()}else if(t.length)return W(t);return[(0,_vue.h)("div",{class:"vxe-select--empty-placeholder"},b.emptyText||_conf.default.i18n("vxe.select.emptyText"))]}())]:[])])])},(0,_vue.provide)("$xeselect",A),A},render:function(){return this.renderVN()}});exports.default=_default2;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_size=require("../../hooks/size"),_dom=require("../../tools/dom"),_utils=require("../../tools/utils"),_event=require("../../tools/event");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function isOptionVisible(e){return!1!==e.visible}function getOptUniqueId(){return _xeUtils.default.uniqueId("opt_")}var _default2=(0,_vue.defineComponent)({name:"VxeSelect",props:{modelValue:null,clearable:Boolean,placeholder:String,loading:Boolean,disabled:Boolean,multiple:Boolean,multiCharOverflow:{type:[Number,String],default:function(){return _conf.default.select.multiCharOverflow}},prefixIcon:String,placement:String,options:Array,optionProps:Object,optionGroups:Array,optionGroupProps:Object,className:[String,Function],size:{type:String,default:function(){return _conf.default.select.size||_conf.default.size}},emptyText:String,optionId:{type:String,default:function(){return _conf.default.select.optionId}},optionKey:Boolean,transfer:{type:Boolean,default:function(){return _conf.default.select.transfer}}},emits:["update:modelValue","change","clear"],setup:function(b,e){function m(e,t){return e&&(_xeUtils.default.isString(e)&&(e=g[e]||null),_xeUtils.default.isFunction(e))?e(t):[]}function v(t){var e=L.fullOptionList,n=L.fullGroupList,i=q.value,o=K.value;if(i)for(var l=0;l<n.length;l++){var u=n[l];if(u.options)for(var r=0;r<u.options.length;r++){var a=u.options[r];if(t===a[o])return a}}return e.find(function(e){return t===e[o]})}function i(e){var t=w.value,n=v(e);return _xeUtils.default.toValueString(n?n[t]:e)}function l(){var e=L.fullOptionList,t=L.fullGroupList;return q.value?L.visibleGroupList=t.filter(isOptionVisible):L.visibleOptionList=e.filter(isOptionVisible),(0,_vue.nextTick)()}function n(){function t(e){B(e)||(e[o]=getOptUniqueId())}var e=L.fullOptionList,n=L.fullGroupList,i=U.value,o=z();n.length?n.forEach(function(e){t(e),e[i]&&e[i].forEach(t)}):e.length&&e.forEach(t),l()}function x(e){var t=K.value;e&&(L.currentValue=e[t])}function c(i,o){return(0,_vue.nextTick)().then(function(){var e,t,n;i&&(e=P.value,t=S.value.querySelector("[optid='"+B(i)+"']"),e&&t&&(n=e.offsetHeight,o?t.offsetTop+t.offsetHeight-e.scrollTop>n&&(e.scrollTop=t.offsetTop+t.offsetHeight-n):(t.offsetTop+5<e.scrollTop||t.offsetTop+5>e.scrollTop+e.clientHeight)&&(e.scrollTop=t.offsetTop-5)))})}function o(){return(0,_vue.nextTick)().then(function(){var e=b.transfer,t=b.placement,n=L.panelIndex,i=y.value,o=S.value;if(o&&i){var l=i.offsetHeight,u=i.offsetWidth,r=o.offsetHeight,a=o.offsetWidth,s={zIndex:n},f=(0,_dom.getAbsolutePos)(i),v=f.boundingTop,o=f.boundingLeft,n=f.visibleHeight,i=f.visibleWidth,f="bottom";return e?(e=v+l,"top"===t?(f="top",e=v-r):t||(n<e+r+5&&(f="top",e=v-r),e<5&&(f="bottom",e=v+l)),i<(o=o)+a+5&&(o-=o+a+5-i),o<5&&(o=5),Object.assign(s,{left:o+"px",top:e+"px",minWidth:u+"px"})):"top"===t?(f="top",s.bottom=l+"px"):t||n<v+l+r&&5<v-l-r&&(f="top",s.bottom=l+"px"),L.panelStyle=s,L.panelPlacement=f,(0,_vue.nextTick)()}})}function f(e,t){H(t,null),F()}function h(e,t){var n,i=b.modelValue;b.multiple?(n=void 0,n=i?-1===i.indexOf(t)?i.concat([t]):i.filter(function(e){return e!==t}):[t],j(e,n)):(j(e,t),F())}function t(e){var t=b.disabled,n=L.visiblePanel;t||n&&(n=S.value,((0,_dom.getEventTargetNode)(e,n).flag?o:F)())}function u(e){var t,n=b.disabled,i=L.visiblePanel;n||(t=y.value,n=S.value,L.isActivated=(0,_dom.getEventTargetNode)(e,t).flag||(0,_dom.getEventTargetNode)(e,n).flag,i&&!L.isActivated&&F())}function r(e){var t,n,i,o,l,u,r=b.clearable,a=b.disabled,s=L.visiblePanel,f=L.currentValue;a||(l=(0,_event.hasEventKey)(e,_event.EVENT_KEYS.TAB),t=(0,_event.hasEventKey)(e,_event.EVENT_KEYS.ENTER),u=(0,_event.hasEventKey)(e,_event.EVENT_KEYS.ESCAPE),n=(0,_event.hasEventKey)(e,_event.EVENT_KEYS.ARROW_UP),i=(0,_event.hasEventKey)(e,_event.EVENT_KEYS.ARROW_DOWN),o=(0,_event.hasEventKey)(e,_event.EVENT_KEYS.DELETE),a=(0,_event.hasEventKey)(e,_event.EVENT_KEYS.SPACEBAR),l&&(L.isActivated=!1),s?u||l?F():t?(e.preventDefault(),e.stopPropagation(),h(e,f)):n||i?(e.preventDefault(),l=(u=function(e,t){var n,i,o,l,u=L.visibleOptionList,r=L.visibleGroupList,a=q.value,s=K.value,f=U.value;if(a)for(var v=0;v<r.length;v++){var c=r[v],p=c[f],d=c.disabled;if(p)for(var _=0;_<p.length;_++){var b=isOptionVisible(x=p[_]),m=d||x.disabled;if(n||m||(n=x),l&&b&&!m&&(o=x,!t))return{offsetOption:o};if(e===x[s]){if(l=x,t)return{offsetOption:i}}else b&&!m&&(i=x)}}else for(_=0;_<u.length;_++){var x,m=(x=u[_]).disabled;if(n||m||(n=x),l&&!m&&(o=x,!t))return{offsetOption:o};if(e===x[s]){if(l=x,t)return{offsetOption:i}}else m||(i=x)}return{firstOption:n}}(f,n)).firstOption,(u=u.offsetOption)||v(f)||(u=l),x(u),c(u,i)):a&&e.preventDefault():(n||i||t||a)&&L.isActivated&&(e.preventDefault(),$()),L.isActivated&&o&&r&&H(e,null))}function a(){F()}function p(){b.disabled||(L.isActivated=!0)}function d(){L.isActivated=!1}function _(e){e.$event.preventDefault(),(L.visiblePanel?F:$)()}var s,g=e.slots,E=e.emit,O=_xeUtils.default.uniqueId(),T=(0,_size.useSize)(b),L=(0,_vue.reactive)({inited:!1,staticOptions:[],fullGroupList:[],fullOptionList:[],visibleGroupList:[],visibleOptionList:[],panelIndex:0,panelStyle:{},panelPlacement:null,currentValue:null,visiblePanel:!1,animatVisible:!1,isActivated:!1}),y=(0,_vue.ref)(),V=(0,_vue.ref)(),P=(0,_vue.ref)(),S=(0,_vue.ref)(),G={refElem:y},A={xID:O,props:b,context:e,reactData:L,getRefMaps:function(){return G}},I={},N=(0,_vue.computed)(function(){return b.optionProps||{}}),k=(0,_vue.computed)(function(){return b.optionGroupProps||{}}),w=(0,_vue.computed)(function(){return N.value.label||"label"}),K=(0,_vue.computed)(function(){return N.value.value||"value"}),C=(0,_vue.computed)(function(){return k.value.label||"label"}),U=(0,_vue.computed)(function(){return k.value.options||"options"}),q=(0,_vue.computed)(function(){return L.fullGroupList.some(function(e){return e.options&&e.options.length})}),D=(0,_vue.computed)(function(){return _xeUtils.default.toNumber(b.multiCharOverflow)}),R=(0,_vue.computed)(function(){var e=b.modelValue,t=b.multiple,n=D.value;return e&&t?(_xeUtils.default.isArray(e)?e:[e]).map(function(e){e=i(e);return 0<n&&e.length>n?e.substring(0,n)+"...":e}).join(", "):i(e)}),z=function(){return b.optionId||"_X_ID"},B=function(e){e=e[z()];return e?encodeURIComponent(e):""},$=function(){var e=b.loading,t=b.disabled;e||t||(clearTimeout(s),L.inited||(L.inited=!0),L.isActivated=!0,L.animatVisible=!0,setTimeout(function(){var e=b.modelValue,t=b.multiple,e=v(t&&e?e[0]:e);L.visiblePanel=!0,e&&(x(e),c(e))},10),L.panelIndex<(0,_utils.getLastZIndex)()&&(L.panelIndex=(0,_utils.nextZIndex)()),o())},F=function(){L.visiblePanel=!1,s=window.setTimeout(function(){L.animatVisible=!1},350)},j=function(e,t){t!==b.modelValue&&(E("update:modelValue",t),I.dispatchEvent("change",{value:t},e))},H=function(e,t){j(e,t),I.dispatchEvent("clear",{value:t},e)},W=function(e,a){var s=b.optionKey,f=b.modelValue,v=b.multiple,c=L.currentValue,p=w.value,d=K.value,_=q.value;return e.map(function(e,t){var n=e.slots,i=e.className,o=!_||isOptionVisible(e),l=a&&a.disabled||e.disabled,u=e[d],r=B(e),n=n?n.default:null;return o?(0,_vue.h)("div",{key:s?r:t,class:["vxe-select-option",i?_xeUtils.default.isFunction(i)?i({option:e,$select:A}):i:"",{"is--disabled":l,"is--selected":v?f&&-1<f.indexOf(u):f===u,"is--hover":c===u}],optid:r,onMousedown:function(e){0===e.button&&e.stopPropagation()},onClick:function(e){l||h(e,u)},onMouseenter:function(){l||x(e)}},n?m(n,{option:e,$select:A}):(0,_utils.formatText)((0,_utils.getFuncText)(e[p]))):null})},Y=function(){var u=b.optionKey,e=L.visibleGroupList,r=C.value,a=U.value;return e.map(function(e,t){var n=e.slots,i=e.className,o=B(e),l=e.disabled,n=n?n.default:null;return(0,_vue.h)("div",{key:u?o:t,class:["vxe-optgroup",i?_xeUtils.default.isFunction(i)?i({option:e,$select:A}):i:"",{"is--disabled":l}],optid:o},[(0,_vue.h)("div",{class:"vxe-optgroup--title"},n?m(n,{option:e,$select:A}):(0,_utils.getFuncText)(e[r])),(0,_vue.h)("div",{class:"vxe-optgroup--wrapper"},W(e[a]||[],e))])})},I={dispatchEvent:function(e,t,n){E(e,Object.assign({$select:A,$event:n},t))},isPanelVisible:function(){return L.visiblePanel},togglePanel:function(){return(L.visiblePanel?F:$)(),(0,_vue.nextTick)()},hidePanel:function(){return L.visiblePanel&&F(),(0,_vue.nextTick)()},showPanel:function(){return L.visiblePanel||$(),(0,_vue.nextTick)()},refreshOption:l,focus:function(){var e=V.value;return L.isActivated=!0,e.blur(),(0,_vue.nextTick)()},blur:function(){return V.value.blur(),(L.isActivated=!1,_vue.nextTick)()}};Object.assign(A,I),(0,_vue.watch)(function(){return L.staticOptions},function(e){e.some(function(e){return e.options&&e.options.length})?(L.fullOptionList=[],L.fullGroupList=e):(L.fullGroupList=[],L.fullOptionList=e||[]),n()}),(0,_vue.watch)(function(){return b.options},function(e){L.fullGroupList=[],L.fullOptionList=e||[],n()}),(0,_vue.watch)(function(){return b.optionGroups},function(e){L.fullOptionList=[],L.fullGroupList=e||[],n()}),(0,_vue.onMounted)(function(){(0,_vue.nextTick)(function(){var e=b.options,t=b.optionGroups;t?L.fullGroupList=t:e&&(L.fullOptionList=e),n()}),_event.GlobalEvent.on(A,"mousewheel",t),_event.GlobalEvent.on(A,"mousedown",u),_event.GlobalEvent.on(A,"keydown",r),_event.GlobalEvent.on(A,"blur",a)}),(0,_vue.onUnmounted)(function(){_event.GlobalEvent.off(A,"mousewheel"),_event.GlobalEvent.off(A,"mousedown"),_event.GlobalEvent.off(A,"keydown"),_event.GlobalEvent.off(A,"blur")});return A.renderVN=function(){var e=b.className,t=b.transfer,n=b.disabled,i=b.loading,o=L.inited,l=L.isActivated,u=L.visiblePanel,r=T.value,a=R.value,s=g.prefix;return(0,_vue.h)("div",{ref:y,class:["vxe-select",e?_xeUtils.default.isFunction(e)?e({$select:A}):e:"",((e={})["size--"+r]=r,e["is--visivle"]=u,e["is--disabled"]=n,e["is--loading"]=i,e["is--active"]=l,e)]},[(0,_vue.h)("div",{class:"vxe-select-slots",ref:"hideOption"},g.default?g.default({}):[]),(0,_vue.h)((0,_vue.resolveComponent)("vxe-input"),{ref:V,clearable:b.clearable,placeholder:b.placeholder,readonly:!0,disabled:n,type:"text",prefixIcon:b.prefixIcon,suffixIcon:i?_conf.default.icon.SELECT_LOADED:u?_conf.default.icon.SELECT_OPEN:_conf.default.icon.SELECT_CLOSE,modelValue:a,onClear:f,onClick:_,onFocus:p,onBlur:d,onSuffixClick:_},s?{prefix:function(){return s({})}}:{}),(0,_vue.h)(_vue.Teleport,{to:"body",disabled:!t||!o},[(0,_vue.h)("div",{ref:S,class:["vxe-table--ignore-clear vxe-select--panel",((a={})["size--"+r]=r,a["is--transfer"]=t,a["animat--leave"]=!i&&L.animatVisible,a["animat--enter"]=!i&&u,a)],placement:L.panelPlacement,style:L.panelStyle},o?[(0,_vue.h)("div",{ref:P,class:"vxe-select-option--wrapper"},function(){var e=L.visibleGroupList,t=L.visibleOptionList;if(q.value){if(e.length)return Y()}else if(t.length)return W(t);return[(0,_vue.h)("div",{class:"vxe-select--empty-placeholder"},b.emptyText||_conf.default.i18n("vxe.select.emptyText"))]}())]:[])])])},(0,_vue.provide)("$xeselect",A),A},render:function(){return this.renderVN()}});exports.default=_default2;

package/lib/table/src/body.js

@@ -438,6 +438,7 @@ var _default = (0, _vue.defineComponent)({
       var treeOpts = computeTreeOpts.value;
       var editOpts = computeEditOpts.value;
       var rowOpts = computeRowOpts.value;
+      var transform = treeOpts.transform;
       var rows = [];
       tableData.forEach(function (row, $rowIndex) {
         var trOn = {};
@@ -471,8 +472,14 @@ var _default = (0, _vue.defineComponent)({
 
         var rowid = (0, _util.getRowid)($xetable, row);
         var rest = fullDataRowIdData[rowid];
-        var rowLevel = rest ? rest.level : 0;
-        var seq = rest ? rest.seq : -1;
+        var rowLevel = 0;
+        var seq = -1;
+
+        if (rest) {
+          rowLevel = rest.level;
+          seq = rest.seq;
+        }
+
         var params = {
           $table: $xetable,
           seq: seq,
@@ -484,7 +491,8 @@ var _default = (0, _vue.defineComponent)({
           rowIndex: rowIndex,
           $rowIndex: $rowIndex,
           _rowIndex: _rowIndex
-        };
+        }; // 处理新增状态
+
         var isNewRow = false;
 
         if (editConfig) {
@@ -546,7 +554,7 @@ var _default = (0, _vue.defineComponent)({
         } // 如果是树形表格
 
 
-        if (treeConfig && !scrollYLoad && treeExpandeds.length) {
+        if (treeConfig && !scrollYLoad && !transform && treeExpandeds.length) {
           var rowChildren = row[treeOpts.children];
 
           if (rowChildren && rowChildren.length && $xetable.findRowIndexOf(treeExpandeds, row) > -1) {

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=require("../../v-x-e-table"),_util=require("./util"),_dom=require("../../tools/dom"),_utils=require("../../tools/utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var l,t=1,o=arguments.length;t<o;t++)for(var r in l=arguments[t])Object.prototype.hasOwnProperty.call(l,r)&&(e[r]=l[r]);return e}).apply(this,arguments)},__spreadArray=function(e,l){for(var t=0,o=l.length,r=e.length;t<o;t++,r++)e[r]=l[t];return e},renderType="body",lineOffsetSizes={mini:3,small:2,medium:1},_default=(0,_vue.defineComponent)({name:"VxeTableBody",props:{tableData:Array,tableColumn:Array,fixedColumn:Array,fixedType:{type:String,default:null}},setup:function(_){function i(){if(l){var e=l.value;if(e)return lineOffsetSizes[e]||0}return 0}function s(e,l){var t=e[u.value.children],o=1;if(re.isTreeExpandByRow(e))for(var r=0;r<t.length;r++)o+=s(t[r],l);return o}function oe(e,l,t){var o=t.column,r=ae.treeConfig,a=u.value,n=o.slots,o=o.treeNode;return n&&n.line?re.callSlot(n.line,t):r&&o&&a.line?[(0,_vue.h)("div",{class:"vxe-tree--line-wrapper"},[(0,_vue.h)("div",{class:"vxe-tree--line",style:{height:(r=l,l=(o=t).$rowIndex,t=1,l&&(t=s(r[l-1],o)),ne.rowHeight*t-(l?1:12-i())+"px"),left:e*a.indent+(e?2-i():0)+16+"px"}})])]:[]}function q(d,v,p){var f=ae.stripe,h=ae.rowKey,x=ae.highlightHoverRow,g=ae.rowClassName,_=ae.rowStyle,m=ae.showOverflow,y=ae.editConfig,w=ae.treeConfig,b=ne.hasFixedColumn,T=ne.treeExpandeds,S=ne.scrollYLoad,C=ne.editStore,L=ne.rowExpandeds,O=ne.expandColumn,R=ne.selectRow,E=ie.fullDataRowIdData,H=de.value,I=t.value,M=u.value,D=se.value,$=pe.value,k=[];return v.forEach(function(t,o){var e={},r=re.getVTRowIndex(t),a=re.getRowIndex(t);($.isHover||x)&&(e.onMouseenter=function(e){fe()||re.triggerHoverEvent(e,{row:t,rowIndex:a})},e.onMouseleave=function(){fe()||re.clearHoverRow()});var l,n=(0,_util.getRowid)(re,t),i=E[n],s=i?i.level:0,u=i?i.seq:-1,c={$table:re,seq:u,rowid:n,fixed:d,type:renderType,level:s,row:t,rowIndex:a,$rowIndex:o,_rowIndex:r},i=!1;y&&(i=-1<re.findRowIndexOf(C.insertList,t)),k.push((0,_vue.h)("tr",__assign({class:["vxe-body--row",{"row--stripe":f&&(re.getVTRowIndex(t)+1)%2==0,"is--new":i,"row--new":i&&(D.showStatus||D.showInsertStatus),"row--radio":I.highlight&&R===t,"row--checked":H.highlight&&re.isCheckedByCheckboxRow(t)},g?_xeUtils.default.isFunction(g)?g(c):g:""],rowid:n,style:_?_xeUtils.default.isFunction(_)?_(c):_:null,key:h||w?n:o},e),p.map(function(e,l){return Y(u,n,d,s,t,a,o,r,e,l,p,v)}))),O&&L.length&&-1<re.findRowIndexOf(L,t)&&(i=void 0,w&&(i={paddingLeft:s*M.indent+30+"px"}),l=O.showOverflow,c=_xeUtils.default.isUndefined(l)||_xeUtils.default.isNull(l)?m:l,l={$table:re,seq:u,column:O,fixed:d,type:renderType,level:s,row:t,rowIndex:a,$rowIndex:o,_rowIndex:r},k.push((0,_vue.h)("tr",__assign({class:"vxe-body--expanded-row",key:"expand_"+n,style:_?_xeUtils.default.isFunction(_)?_(l):_:null},e),[(0,_vue.h)("td",{class:["vxe-body--expanded-column",{"fixed--hidden":d&&!b,"col--ellipsis":c}],colspan:p.length},[(0,_vue.h)("div",{class:"vxe-body--expanded-cell",style:i},[O.renderData(l)])])]))),!w||S||!T.length||(l=t[M.children])&&l.length&&-1<re.findRowIndexOf(T,t)&&k.push.apply(k,q(d,l,p))}),k}function m(e,l,t){(l||t)&&(l&&((0,_util.removeScrollListener)(l),l.scrollTop=e),t&&((0,_util.removeScrollListener)(t),t.scrollTop=e),clearTimeout(r),r=setTimeout(function(){(0,_util.restoreScrollListener)(l),(0,_util.restoreScrollListener)(t)},300))}function o(e){var l=_.fixedType,t=ae.highlightHoverRow,o=ne.scrollXLoad,r=ne.scrollYLoad,a=ie.elemStore,n=ie.lastScrollTop,i=ie.lastScrollLeft,s=pe.value,u=b.value,c=T.value,d=S.value,v=C.value,p=L.value,f=O.value,h=I.value,x=u?u.$el:null,g=d?d.$el:null,u=c.$el,d=v?v.$el:null,c=p?p.$el:null,v=a["main-body-ySpace"],p=a["main-body-xSpace"],a=v?v.clientHeight:0,v=p?p.clientWidth:0,p=h.scrollTop,i=(h=u.scrollLeft)!==i,n=p!==n;ie.lastScrollTop=p,ie.lastScrollLeft=h,ie.lastScrollTime=Date.now(),(s.isHover||t)&&re.clearHoverRow(),d&&"left"===l?(p=d.scrollTop,m(p,u,c)):c&&"right"===l?(p=c.scrollTop,m(p,u,d)):(i&&(x&&(x.scrollLeft=u.scrollLeft),g&&(g.scrollLeft=u.scrollLeft)),(d||c)&&(re.checkScrolling(),n&&m(p,d,c))),o&&i&&re.triggerScrollXEvent(e),r&&n&&re.triggerScrollYEvent(e),i&&f&&f.reactData.visible&&f.updatePlacement(),re.dispatchEvent("scroll",{type:renderType,fixed:l,scrollTop:p,scrollLeft:h,bodyHeight:a,bodyWidth:v,isX:i,isY:n},e)}function g(e){var l=e.deltaY,t=e.deltaX,o=ae.highlightHoverRow,r=ne.scrollYLoad,a=ie.lastScrollTop,n=ie.lastScrollLeft,i=pe.value,s=T.value,u=I.value,c=s.$el,s=_dom.browse.firefox?40*l:l,l=_dom.browse.firefox?40*t:t;((t=s<0)?u.scrollTop<=0:u.scrollTop>=u.scrollHeight-u.clientHeight)||(u=u.scrollTop+s,n=(l=c.scrollLeft+l)!==n,(a=u!==a)&&(e.preventDefault(),ie.lastScrollTop=u,ie.lastScrollLeft=l,ie.lastScrollTime=Date.now(),(i.isHover||o)&&re.clearHoverRow(),d(e,t,s,n,a),r&&re.triggerScrollYEvent(e)))}var r,f,re=(0,_vue.inject)("$xetable",{}),l=(0,_vue.inject)("xesize",null),y=re.xID,ae=re.props,w=re.context,ne=re.reactData,ie=re.internalData,e=re.getRefMaps(),b=e.refTableHeader,T=e.refTableBody,S=e.refTableFooter,C=e.refTableLeftBody,L=e.refTableRightBody,O=e.refValidTooltip,e=re.getComputeMaps(),se=e.computeEditOpts,R=e.computeMouseOpts,ue=e.computeSYOpts,E=e.computeEmptyOpts,H=e.computeKeyboardOpts,ce=e.computeTooltipOpts,t=e.computeRadioOpts,u=e.computeTreeOpts,de=e.computeCheckboxOpts,ve=e.computeValidOpts,pe=e.computeRowOpts,I=(0,_vue.ref)(),M=(0,_vue.ref)(),D=(0,_vue.ref)(),$=(0,_vue.ref)(),k=(0,_vue.ref)(),U=(0,_vue.ref)(),B=(0,_vue.ref)(),fe=function(){var e=ae.delayHover,l=ie.lastScrollTime;return ie._isResize||l&&Date.now()<l+e},Y=function(e,l,t,o,r,a,n,i,s,u,c,d){var v,p=ae.columnKey,f=ae.height,h=ae.showOverflow,x=ae.cellClassName,g=ae.cellStyle,_=ae.align,m=ae.spanMethod,y=ae.mouseConfig,w=ae.editConfig,b=ae.editRules,T=ae.tooltipConfig,S=ne.tableData,C=ne.overflowX,L=ne.scrollYLoad,O=ne.currentColumn,R=ne.mergeList,E=ne.editStore,H=ne.validStore,I=ne.isAllOverflow,M=ie.afterFullData,D=ve.value,$=de.value,k=se.value,q=ce.value,U=pe.value,B=ue.value,Y=s.type,A=s.cellRender,X=s.editRender,j=s.align,N=s.showOverflow,V=s.className,F=s.treeNode,W=E.actived,P=B.rHeight,z=U.height,K=q.showAll,G=re.getColumnIndex(s),E=re.getVTColumnIndex(s),B=(0,_utils.isEnableConf)(X),U=t?s.fixed!==t:s.fixed&&C,q=_xeUtils.default.isUndefined(N)||_xeUtils.default.isNull(N)?h:N,C="ellipsis"===q,J="title"===q,Q=!0===q||"tooltip"===q,N=J||Q||C,q={},j=j||_,_=H.row===r&&H.column===s,f=b&&D.showMessage&&("default"===D.message?f||1<S.length:"inline"===D.message),D={colid:s.id},Z={$table:re,seq:e,rowid:l,row:r,rowIndex:a,$rowIndex:n,_rowIndex:i,column:s,columnIndex:G,$columnIndex:u,_columnIndex:E,fixed:t,type:renderType,isHidden:U,level:o,visibleData:M,data:S,items:d};if(L&&!N&&(C=N=!0),(J||Q||K||T)&&(q.onMouseenter=function(e){fe()||(J?(0,_dom.updateCellTitle)(e.currentTarget,s):(Q||K)&&re.triggerBodyTooltipEvent(e,Z),re.dispatchEvent("cell-mouseenter",Object.assign({cell:e.currentTarget},Z),e))}),(Q||K||T)&&(q.onMouseleave=function(e){fe()||((Q||K)&&re.handleTargetLeaveEvent(e),re.dispatchEvent("cell-mouseleave",Object.assign({cell:e.currentTarget},Z),e))}),($.range||y)&&(q.onMousedown=function(e){re.triggerCellMousedownEvent(e,Z)}),q.onClick=function(e){re.triggerCellClickEvent(e,Z)},q.onDblclick=function(e){re.triggerCellDblclickEvent(e,Z)},R.length){var ee=(0,_util.mergeBodyMethod)(R,i,E);if(ee){var le=ee.rowspan,te=ee.colspan;if(!le||!te)return null;1<le&&(D.rowspan=le),1<te&&(D.colspan=te)}}else if(m){ee=m(Z)||{},m=ee.rowspan,le=void 0===m?1:m,ee=ee.colspan,te=void 0===ee?1:ee;if(!le||!te)return null;1<le&&(D.rowspan=le),1<te&&(D.colspan=te)}!(U=U&&R&&(1<D.colspan||1<D.rowspan)?!1:U)&&w&&(X||A)&&(k.showStatus||k.showUpdateStatus)&&(v=re.isUpdateByRow(r,s.property));A=[];return U&&h&&I?A.push((0,_vue.h)("div",{class:["vxe-cell",{"c--title":J,"c--tooltip":Q,"c--ellipsis":C}],style:{maxHeight:N&&(P||z)?(P||z)+"px":""}})):(A.push.apply(A,__spreadArray(__spreadArray([],oe(o,d,Z)),[(0,_vue.h)("div",{class:["vxe-cell",{"c--title":J,"c--tooltip":Q,"c--ellipsis":C}],style:{maxHeight:N&&(P||z)?(P||z)+"px":""},title:J?re.getCellLabel(r,s):null},s.renderCell(Z))])),f&&_&&A.push((0,_vue.h)("div",{class:"vxe-cell--valid",style:H.rule&&H.rule.maxWidth?{width:H.rule.maxWidth+"px"}:null},[(0,_vue.h)("span",{class:"vxe-cell--valid-msg"},H.content)]))),(0,_vue.h)("td",__assign(__assign(__assign({class:["vxe-body--column",s.id,((H={})["col--"+j]=j,H["col--"+Y]=Y,H["col--last"]=u===c.length-1,H["col--tree-node"]=F,H["col--edit"]=B,H["col--ellipsis"]=N,H["fixed--hidden"]=U,H["col--dirty"]=v,H["col--actived"]=w&&B&&W.row===r&&(W.column===s||"row"===k.mode),H["col--valid-error"]=_,H["col--current"]=O===s,H),(0,_util.getPropClass)(V,Z),(0,_util.getPropClass)(x,Z)],key:p?s.id:u},D),{style:Object.assign({height:N&&(P||z)?(P||z)+"px":""},g?_xeUtils.default.isFunction(g)?g(Z):g:null)}),q),A)},h=0,x=0,A=0,X=!1,d=function(a,n,e,i,s){var l=ie.elemStore,t=T.value,o=C.value,r=L.value,u=o?o.$el:null,c=r?r.$el:null,d=t.$el,t=l["main-body-ySpace"],l=l["main-body-xSpace"],v=t?t.clientHeight:0,p=l?l.clientWidth:0,l=X===n?Math.max(0,h-A):0;X=n,h=Math.abs(n?e-l:e+l),A=x=0,clearTimeout(f),function e(){var l,t,o,r;A<h&&(l=_.fixedType,x=Math.max(5,Math.floor(1.5*x)),h<(A+=x)&&(x-=A-h),r=d.scrollTop,t=d.clientHeight,o=d.scrollHeight,r=r+x*(n?-1:1),d.scrollTop=r,u&&(u.scrollTop=r),c&&(c.scrollTop=r),(n?r<o-t:0<=r)&&(f=setTimeout(e,10)),re.dispatchEvent("scroll",{type:renderType,fixed:l,scrollTop:d.scrollTop,scrollLeft:d.scrollLeft,bodyHeight:v,bodyWidth:p,isX:i,isY:s},a))}()};(0,_vue.onMounted)(function(){(0,_vue.nextTick)(function(){var e=_.fixedType,l=ie.elemStore,t=(e||"main")+"-body-",e=I.value;l[t+"wrapper"]=I.value,l[t+"table"]=M.value,l[t+"colgroup"]=D.value,l[t+"list"]=$.value,l[t+"xSpace"]=k.value,l[t+"ySpace"]=U.value,l[t+"emptyBlock"]=B.value,e.onscroll=o,e._onscroll=o})}),(0,_vue.onBeforeUnmount)(function(){var e=I.value;clearTimeout(f),e._onscroll=null,e.onscroll=null});return function(){var e=_.fixedColumn,l=_.fixedType,t=_.tableColumn,o=ae.keyboardConfig,r=ae.showOverflow,a=ae.spanMethod,n=ae.mouseConfig,i=ne.tableData,s=ne.mergeList,u=ne.scrollYLoad,c=ne.isAllOverflow,d=ie.visibleColumn,v=w.slots,p=ue.value,f=E.value,h=H.value,x=R.value;return l&&(t=!(u||r&&c)||s.length||a||o&&h.isMerge?d:e),f=v.empty?re.callSlot(v.empty,{$table:re}):(v=(v=f.name?_vXETable.VXETable.renderer.get(f.name):null)?v.renderEmpty:null)?v(f,{$table:re}):ae.emptyText||_conf.default.i18n("vxe.table.emptyText"),(0,_vue.h)("div",__assign({ref:I,class:["vxe-table--body-wrapper",l?"fixed-"+l+"--wrapper":"body--wrapper"],xid:y},u&&"wheel"===p.mode?{onWheel:g}:{}),[l?(0,_vue.createCommentVNode)():(0,_vue.h)("div",{ref:k,class:"vxe-body--x-space"}),(0,_vue.h)("div",{ref:U,class:"vxe-body--y-space"}),(0,_vue.h)("table",{ref:M,class:"vxe-table--body",xid:y,cellspacing:0,cellpadding:0,border:0},[(0,_vue.h)("colgroup",{ref:D},t.map(function(e,l){return(0,_vue.h)("col",{name:e.id,key:l})})),(0,_vue.h)("tbody",{ref:$},q(l,i,t))]),(0,_vue.h)("div",{class:"vxe-table--checkbox-range"}),n&&x.area?(0,_vue.h)("div",{class:"vxe-table--cell-area"},[(0,_vue.h)("span",{class:"vxe-table--cell-main-area"},x.extension?[(0,_vue.h)("span",{class:"vxe-table--cell-main-area-btn",onMousedown:function(e){re.triggerCellExtendMousedownEvent(e,{$table:re,fixed:l,type:renderType})}})]:[]),(0,_vue.h)("span",{class:"vxe-table--cell-copy-area"}),(0,_vue.h)("span",{class:"vxe-table--cell-extend-area"}),(0,_vue.h)("span",{class:"vxe-table--cell-multi-area"}),(0,_vue.h)("span",{class:"vxe-table--cell-active-area"})]):null,l?null:(0,_vue.h)("div",{class:"vxe-table--empty-block",ref:B},[(0,_vue.h)("div",{class:"vxe-table--empty-content"},f)])])}}});exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=require("../../v-x-e-table"),_util=require("./util"),_dom=require("../../tools/dom"),_utils=require("../../tools/utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var __assign=function(){return(__assign=Object.assign||function(e){for(var l,t=1,o=arguments.length;t<o;t++)for(var r in l=arguments[t])Object.prototype.hasOwnProperty.call(l,r)&&(e[r]=l[r]);return e}).apply(this,arguments)},__spreadArray=function(e,l){for(var t=0,o=l.length,r=e.length;t<o;t++,r++)e[r]=l[t];return e},renderType="body",lineOffsetSizes={mini:3,small:2,medium:1},_default=(0,_vue.defineComponent)({name:"VxeTableBody",props:{tableData:Array,tableColumn:Array,fixedColumn:Array,fixedType:{type:String,default:null}},setup:function(_){function i(){if(l){var e=l.value;if(e)return lineOffsetSizes[e]||0}return 0}function s(e,l){var t=e[u.value.children],o=1;if(re.isTreeExpandByRow(e))for(var r=0;r<t.length;r++)o+=s(t[r],l);return o}function oe(e,l,t){var o=t.column,r=ae.treeConfig,a=u.value,n=o.slots,o=o.treeNode;return n&&n.line?re.callSlot(n.line,t):r&&o&&a.line?[(0,_vue.h)("div",{class:"vxe-tree--line-wrapper"},[(0,_vue.h)("div",{class:"vxe-tree--line",style:{height:(r=l,l=(o=t).$rowIndex,t=1,l&&(t=s(r[l-1],o)),ne.rowHeight*t-(l?1:12-i())+"px"),left:e*a.indent+(e?2-i():0)+16+"px"}})])]:[]}function U(d,v,p){var f=ae.stripe,h=ae.rowKey,x=ae.highlightHoverRow,g=ae.rowClassName,_=ae.rowStyle,m=ae.showOverflow,y=ae.editConfig,w=ae.treeConfig,b=ne.hasFixedColumn,T=ne.treeExpandeds,S=ne.scrollYLoad,C=ne.editStore,L=ne.rowExpandeds,O=ne.expandColumn,R=ne.selectRow,E=ie.fullDataRowIdData,H=de.value,I=t.value,M=u.value,D=se.value,$=pe.value,k=M.transform,q=[];return v.forEach(function(t,o){var e={},r=re.getVTRowIndex(t),a=re.getRowIndex(t);($.isHover||x)&&(e.onMouseenter=function(e){fe()||re.triggerHoverEvent(e,{row:t,rowIndex:a})},e.onMouseleave=function(){fe()||re.clearHoverRow()});var n=(0,_util.getRowid)(re,t),l=E[n],i=0,s=-1;l&&(i=l.level,s=l.seq);var u,c={$table:re,seq:s,rowid:n,fixed:d,type:renderType,level:i,row:t,rowIndex:a,$rowIndex:o,_rowIndex:r},l=!1;y&&(l=-1<re.findRowIndexOf(C.insertList,t)),q.push((0,_vue.h)("tr",__assign({class:["vxe-body--row",{"row--stripe":f&&(re.getVTRowIndex(t)+1)%2==0,"is--new":l,"row--new":l&&(D.showStatus||D.showInsertStatus),"row--radio":I.highlight&&R===t,"row--checked":H.highlight&&re.isCheckedByCheckboxRow(t)},g?_xeUtils.default.isFunction(g)?g(c):g:""],rowid:n,style:_?_xeUtils.default.isFunction(_)?_(c):_:null,key:h||w?n:o},e),p.map(function(e,l){return Y(s,n,d,i,t,a,o,r,e,l,p,v)}))),O&&L.length&&-1<re.findRowIndexOf(L,t)&&(l=void 0,w&&(l={paddingLeft:i*M.indent+30+"px"}),u=O.showOverflow,c=_xeUtils.default.isUndefined(u)||_xeUtils.default.isNull(u)?m:u,u={$table:re,seq:s,column:O,fixed:d,type:renderType,level:i,row:t,rowIndex:a,$rowIndex:o,_rowIndex:r},q.push((0,_vue.h)("tr",__assign({class:"vxe-body--expanded-row",key:"expand_"+n,style:_?_xeUtils.default.isFunction(_)?_(u):_:null},e),[(0,_vue.h)("td",{class:["vxe-body--expanded-column",{"fixed--hidden":d&&!b,"col--ellipsis":c}],colspan:p.length},[(0,_vue.h)("div",{class:"vxe-body--expanded-cell",style:l},[O.renderData(u)])])]))),!w||S||k||!T.length||(u=t[M.children])&&u.length&&-1<re.findRowIndexOf(T,t)&&q.push.apply(q,U(d,u,p))}),q}function m(e,l,t){(l||t)&&(l&&((0,_util.removeScrollListener)(l),l.scrollTop=e),t&&((0,_util.removeScrollListener)(t),t.scrollTop=e),clearTimeout(r),r=setTimeout(function(){(0,_util.restoreScrollListener)(l),(0,_util.restoreScrollListener)(t)},300))}function o(e){var l=_.fixedType,t=ae.highlightHoverRow,o=ne.scrollXLoad,r=ne.scrollYLoad,a=ie.elemStore,n=ie.lastScrollTop,i=ie.lastScrollLeft,s=pe.value,u=b.value,c=T.value,d=S.value,v=C.value,p=L.value,f=O.value,h=I.value,x=u?u.$el:null,g=d?d.$el:null,u=c.$el,d=v?v.$el:null,c=p?p.$el:null,v=a["main-body-ySpace"],p=a["main-body-xSpace"],a=v?v.clientHeight:0,v=p?p.clientWidth:0,p=h.scrollTop,i=(h=u.scrollLeft)!==i,n=p!==n;ie.lastScrollTop=p,ie.lastScrollLeft=h,ie.lastScrollTime=Date.now(),(s.isHover||t)&&re.clearHoverRow(),d&&"left"===l?(p=d.scrollTop,m(p,u,c)):c&&"right"===l?(p=c.scrollTop,m(p,u,d)):(i&&(x&&(x.scrollLeft=u.scrollLeft),g&&(g.scrollLeft=u.scrollLeft)),(d||c)&&(re.checkScrolling(),n&&m(p,d,c))),o&&i&&re.triggerScrollXEvent(e),r&&n&&re.triggerScrollYEvent(e),i&&f&&f.reactData.visible&&f.updatePlacement(),re.dispatchEvent("scroll",{type:renderType,fixed:l,scrollTop:p,scrollLeft:h,bodyHeight:a,bodyWidth:v,isX:i,isY:n},e)}function g(e){var l=e.deltaY,t=e.deltaX,o=ae.highlightHoverRow,r=ne.scrollYLoad,a=ie.lastScrollTop,n=ie.lastScrollLeft,i=pe.value,s=T.value,u=I.value,c=s.$el,s=_dom.browse.firefox?40*l:l,l=_dom.browse.firefox?40*t:t;((t=s<0)?u.scrollTop<=0:u.scrollTop>=u.scrollHeight-u.clientHeight)||(u=u.scrollTop+s,n=(l=c.scrollLeft+l)!==n,(a=u!==a)&&(e.preventDefault(),ie.lastScrollTop=u,ie.lastScrollLeft=l,ie.lastScrollTime=Date.now(),(i.isHover||o)&&re.clearHoverRow(),d(e,t,s,n,a),r&&re.triggerScrollYEvent(e)))}var r,f,re=(0,_vue.inject)("$xetable",{}),l=(0,_vue.inject)("xesize",null),y=re.xID,ae=re.props,w=re.context,ne=re.reactData,ie=re.internalData,e=re.getRefMaps(),b=e.refTableHeader,T=e.refTableBody,S=e.refTableFooter,C=e.refTableLeftBody,L=e.refTableRightBody,O=e.refValidTooltip,e=re.getComputeMaps(),se=e.computeEditOpts,R=e.computeMouseOpts,ue=e.computeSYOpts,E=e.computeEmptyOpts,H=e.computeKeyboardOpts,ce=e.computeTooltipOpts,t=e.computeRadioOpts,u=e.computeTreeOpts,de=e.computeCheckboxOpts,ve=e.computeValidOpts,pe=e.computeRowOpts,I=(0,_vue.ref)(),M=(0,_vue.ref)(),D=(0,_vue.ref)(),$=(0,_vue.ref)(),k=(0,_vue.ref)(),q=(0,_vue.ref)(),B=(0,_vue.ref)(),fe=function(){var e=ae.delayHover,l=ie.lastScrollTime;return ie._isResize||l&&Date.now()<l+e},Y=function(e,l,t,o,r,a,n,i,s,u,c,d){var v,p=ae.columnKey,f=ae.height,h=ae.showOverflow,x=ae.cellClassName,g=ae.cellStyle,_=ae.align,m=ae.spanMethod,y=ae.mouseConfig,w=ae.editConfig,b=ae.editRules,T=ae.tooltipConfig,S=ne.tableData,C=ne.overflowX,L=ne.scrollYLoad,O=ne.currentColumn,R=ne.mergeList,E=ne.editStore,H=ne.validStore,I=ne.isAllOverflow,M=ie.afterFullData,D=ve.value,$=de.value,k=se.value,q=ce.value,U=pe.value,B=ue.value,Y=s.type,A=s.cellRender,X=s.editRender,j=s.align,N=s.showOverflow,V=s.className,F=s.treeNode,W=E.actived,P=B.rHeight,z=U.height,K=q.showAll,G=re.getColumnIndex(s),E=re.getVTColumnIndex(s),B=(0,_utils.isEnableConf)(X),U=t?s.fixed!==t:s.fixed&&C,q=_xeUtils.default.isUndefined(N)||_xeUtils.default.isNull(N)?h:N,C="ellipsis"===q,J="title"===q,Q=!0===q||"tooltip"===q,N=J||Q||C,q={},j=j||_,_=H.row===r&&H.column===s,f=b&&D.showMessage&&("default"===D.message?f||1<S.length:"inline"===D.message),D={colid:s.id},Z={$table:re,seq:e,rowid:l,row:r,rowIndex:a,$rowIndex:n,_rowIndex:i,column:s,columnIndex:G,$columnIndex:u,_columnIndex:E,fixed:t,type:renderType,isHidden:U,level:o,visibleData:M,data:S,items:d};if(L&&!N&&(C=N=!0),(J||Q||K||T)&&(q.onMouseenter=function(e){fe()||(J?(0,_dom.updateCellTitle)(e.currentTarget,s):(Q||K)&&re.triggerBodyTooltipEvent(e,Z),re.dispatchEvent("cell-mouseenter",Object.assign({cell:e.currentTarget},Z),e))}),(Q||K||T)&&(q.onMouseleave=function(e){fe()||((Q||K)&&re.handleTargetLeaveEvent(e),re.dispatchEvent("cell-mouseleave",Object.assign({cell:e.currentTarget},Z),e))}),($.range||y)&&(q.onMousedown=function(e){re.triggerCellMousedownEvent(e,Z)}),q.onClick=function(e){re.triggerCellClickEvent(e,Z)},q.onDblclick=function(e){re.triggerCellDblclickEvent(e,Z)},R.length){var ee=(0,_util.mergeBodyMethod)(R,i,E);if(ee){var le=ee.rowspan,te=ee.colspan;if(!le||!te)return null;1<le&&(D.rowspan=le),1<te&&(D.colspan=te)}}else if(m){ee=m(Z)||{},m=ee.rowspan,le=void 0===m?1:m,ee=ee.colspan,te=void 0===ee?1:ee;if(!le||!te)return null;1<le&&(D.rowspan=le),1<te&&(D.colspan=te)}!(U=U&&R&&(1<D.colspan||1<D.rowspan)?!1:U)&&w&&(X||A)&&(k.showStatus||k.showUpdateStatus)&&(v=re.isUpdateByRow(r,s.property));A=[];return U&&h&&I?A.push((0,_vue.h)("div",{class:["vxe-cell",{"c--title":J,"c--tooltip":Q,"c--ellipsis":C}],style:{maxHeight:N&&(P||z)?(P||z)+"px":""}})):(A.push.apply(A,__spreadArray(__spreadArray([],oe(o,d,Z)),[(0,_vue.h)("div",{class:["vxe-cell",{"c--title":J,"c--tooltip":Q,"c--ellipsis":C}],style:{maxHeight:N&&(P||z)?(P||z)+"px":""},title:J?re.getCellLabel(r,s):null},s.renderCell(Z))])),f&&_&&A.push((0,_vue.h)("div",{class:"vxe-cell--valid",style:H.rule&&H.rule.maxWidth?{width:H.rule.maxWidth+"px"}:null},[(0,_vue.h)("span",{class:"vxe-cell--valid-msg"},H.content)]))),(0,_vue.h)("td",__assign(__assign(__assign({class:["vxe-body--column",s.id,((H={})["col--"+j]=j,H["col--"+Y]=Y,H["col--last"]=u===c.length-1,H["col--tree-node"]=F,H["col--edit"]=B,H["col--ellipsis"]=N,H["fixed--hidden"]=U,H["col--dirty"]=v,H["col--actived"]=w&&B&&W.row===r&&(W.column===s||"row"===k.mode),H["col--valid-error"]=_,H["col--current"]=O===s,H),(0,_util.getPropClass)(V,Z),(0,_util.getPropClass)(x,Z)],key:p?s.id:u},D),{style:Object.assign({height:N&&(P||z)?(P||z)+"px":""},g?_xeUtils.default.isFunction(g)?g(Z):g:null)}),q),A)},h=0,x=0,A=0,X=!1,d=function(a,n,e,i,s){var l=ie.elemStore,t=T.value,o=C.value,r=L.value,u=o?o.$el:null,c=r?r.$el:null,d=t.$el,t=l["main-body-ySpace"],l=l["main-body-xSpace"],v=t?t.clientHeight:0,p=l?l.clientWidth:0,l=X===n?Math.max(0,h-A):0;X=n,h=Math.abs(n?e-l:e+l),A=x=0,clearTimeout(f),function e(){var l,t,o,r;A<h&&(l=_.fixedType,x=Math.max(5,Math.floor(1.5*x)),h<(A+=x)&&(x-=A-h),r=d.scrollTop,t=d.clientHeight,o=d.scrollHeight,r=r+x*(n?-1:1),d.scrollTop=r,u&&(u.scrollTop=r),c&&(c.scrollTop=r),(n?r<o-t:0<=r)&&(f=setTimeout(e,10)),re.dispatchEvent("scroll",{type:renderType,fixed:l,scrollTop:d.scrollTop,scrollLeft:d.scrollLeft,bodyHeight:v,bodyWidth:p,isX:i,isY:s},a))}()};(0,_vue.onMounted)(function(){(0,_vue.nextTick)(function(){var e=_.fixedType,l=ie.elemStore,t=(e||"main")+"-body-",e=I.value;l[t+"wrapper"]=I.value,l[t+"table"]=M.value,l[t+"colgroup"]=D.value,l[t+"list"]=$.value,l[t+"xSpace"]=k.value,l[t+"ySpace"]=q.value,l[t+"emptyBlock"]=B.value,e.onscroll=o,e._onscroll=o})}),(0,_vue.onBeforeUnmount)(function(){var e=I.value;clearTimeout(f),e._onscroll=null,e.onscroll=null});return function(){var e=_.fixedColumn,l=_.fixedType,t=_.tableColumn,o=ae.keyboardConfig,r=ae.showOverflow,a=ae.spanMethod,n=ae.mouseConfig,i=ne.tableData,s=ne.mergeList,u=ne.scrollYLoad,c=ne.isAllOverflow,d=ie.visibleColumn,v=w.slots,p=ue.value,f=E.value,h=H.value,x=R.value;return l&&(t=!(u||r&&c)||s.length||a||o&&h.isMerge?d:e),f=v.empty?re.callSlot(v.empty,{$table:re}):(v=(v=f.name?_vXETable.VXETable.renderer.get(f.name):null)?v.renderEmpty:null)?v(f,{$table:re}):ae.emptyText||_conf.default.i18n("vxe.table.emptyText"),(0,_vue.h)("div",__assign({ref:I,class:["vxe-table--body-wrapper",l?"fixed-"+l+"--wrapper":"body--wrapper"],xid:y},u&&"wheel"===p.mode?{onWheel:g}:{}),[l?(0,_vue.createCommentVNode)():(0,_vue.h)("div",{ref:k,class:"vxe-body--x-space"}),(0,_vue.h)("div",{ref:q,class:"vxe-body--y-space"}),(0,_vue.h)("table",{ref:M,class:"vxe-table--body",xid:y,cellspacing:0,cellpadding:0,border:0},[(0,_vue.h)("colgroup",{ref:D},t.map(function(e,l){return(0,_vue.h)("col",{name:e.id,key:l})})),(0,_vue.h)("tbody",{ref:$},U(l,i,t))]),(0,_vue.h)("div",{class:"vxe-table--checkbox-range"}),n&&x.area?(0,_vue.h)("div",{class:"vxe-table--cell-area"},[(0,_vue.h)("span",{class:"vxe-table--cell-main-area"},x.extension?[(0,_vue.h)("span",{class:"vxe-table--cell-main-area-btn",onMousedown:function(e){re.triggerCellExtendMousedownEvent(e,{$table:re,fixed:l,type:renderType})}})]:[]),(0,_vue.h)("span",{class:"vxe-table--cell-copy-area"}),(0,_vue.h)("span",{class:"vxe-table--cell-extend-area"}),(0,_vue.h)("span",{class:"vxe-table--cell-multi-area"}),(0,_vue.h)("span",{class:"vxe-table--cell-active-area"})]):null,l?null:(0,_vue.h)("div",{class:"vxe-table--empty-block",ref:B},[(0,_vue.h)("div",{class:"vxe-table--empty-content"},f)])])}}});exports.default=_default;

package/lib/table/src/table.js

@@ -299,10 +299,12 @@ var _default = (0, _vue.defineComponent)({
       rowExpandedReserveRowMap: {},
       // 树结构数据，已展开保留的行
       treeExpandedReserveRowMap: {},
-      // 完整数据、条件处理后
+      // 列表完整数据、条件处理后
       tableFullData: [],
-      treeFullData: [],
       afterFullData: [],
+      // 树结构完整数据、条件处理后
+      tableFullTreeData: [],
+      afterTreeFullData: [],
       tableSynchData: [],
       tableSourceData: [],
       // 收集的列配置（带分组）
@@ -1312,11 +1314,11 @@ var _default = (0, _vue.defineComponent)({
       var afterFullData = internalData.afterFullData,
           fullDataRowIdData = internalData.fullDataRowIdData,
           fullAllDataRowIdData = internalData.fullAllDataRowIdData;
-      var treeFullData = internalData.treeFullData;
+      var afterTreeFullData = internalData.afterTreeFullData;
       var treeOpts = computeTreeOpts.value;
 
       if (treeConfig) {
-        _xeUtils.default.eachTree(treeFullData, function (row, index, items, path) {
+        _xeUtils.default.eachTree(afterTreeFullData, function (row, index, items, path) {
           var rowid = (0, _util.getRowid)($xetable, row);
           var allrest = fullAllDataRowIdData[rowid];
           var fullrest = fullDataRowIdData[rowid];
@@ -1326,10 +1328,12 @@ var _default = (0, _vue.defineComponent)({
 
           if (allrest) {
             allrest.seq = seq;
+            allrest._index = index;
           }
 
           if (fullrest) {
             fullrest.seq = seq;
+            fullrest._index = index;
           } else {
             fullAllDataRowIdData[rowid] = {
               row: row,
@@ -1354,7 +1358,9 @@ var _default = (0, _vue.defineComponent)({
               level: 0
             };
           }
-        }, treeOpts);
+        }, {
+          children: treeOpts.mapChildren
+        });
       } else {
         afterFullData.forEach(function (row, index) {
           var rowid = (0, _util.getRowid)($xetable, row);
@@ -1364,6 +1370,7 @@ var _default = (0, _vue.defineComponent)({
 
           if (allrest) {
             allrest.seq = seq;
+            allrest._index = index;
           }
 
           if (fullrest) {
@@ -1403,15 +1410,20 @@ var _default = (0, _vue.defineComponent)({
 
 
     var updateAfterFullData = function updateAfterFullData() {
+      var treeConfig = props.treeConfig;
       var tableFullColumn = internalData.tableFullColumn,
-          tableFullData = internalData.tableFullData;
+          tableFullData = internalData.tableFullData,
+          tableFullTreeData = internalData.tableFullTreeData;
       var filterOpts = computeFilterOpts.value;
       var sortOpts = computeSortOpts.value;
+      var treeOpts = computeTreeOpts.value;
+      var transform = treeOpts.transform;
       var allRemoteFilter = filterOpts.remote,
           allFilterMethod = filterOpts.filterMethod;
       var allRemoteSort = sortOpts.remote,
           allSortMethod = sortOpts.sortMethod;
-      var tableData = tableFullData.slice(0);
+      var tableData = [];
+      var tableTree = []; // 处理列
 
       if (!allRemoteFilter || !allRemoteSort) {
         var filterColumns_1 = [];
@@ -1451,7 +1463,7 @@ var _default = (0, _vue.defineComponent)({
         // 支持单列、多列、组合筛选
 
         if (!allRemoteFilter && filterColumns_1.length) {
-          tableData = tableData.filter(function (row) {
+          var handleFilter = function handleFilter(row) {
             return filterColumns_1.every(function (_a) {
               var column = _a.column,
                   valueList = _a.valueList,
@@ -1508,32 +1520,78 @@ var _default = (0, _vue.defineComponent)({
 
               return valueList.indexOf(_xeUtils.default.get(row, column.property)) > -1;
             });
-          });
-        } // 处理排序
+          };
+
+          if (treeConfig && transform) {
+            // 筛选虚拟树
+            tableTree = _xeUtils.default.searchTree(tableFullTreeData, handleFilter, __assign(__assign({}, treeOpts), {
+              original: true
+            }));
+            tableData = tableTree;
+          } else {
+            tableData = treeConfig ? tableFullTreeData.filter(handleFilter) : tableFullData.filter(handleFilter);
+            tableTree = tableData;
+          }
+        } else {
+          if (treeConfig && transform) {
+            // 还原虚拟树
+            tableTree = _xeUtils.default.searchTree(tableFullTreeData, function () {
+              return true;
+            }, __assign(__assign({}, treeOpts), {
+              original: true
+            }));
+            tableData = tableTree;
+          } else {
+            tableData = treeConfig ? tableFullTreeData.slice(0) : tableFullData.slice(0);
+            tableTree = tableData;
+          }
+        } // 处理排序（不能用于树形结构）
         // 支持单列、多列、组合排序
 
 
         if (!allRemoteSort && orderColumns_1.length) {
-          if (allSortMethod) {
-            var sortRests = allSortMethod({
-              data: tableData,
-              sortList: orderColumns_1,
-              $table: $xetable
-            });
-            tableData = _xeUtils.default.isArray(sortRests) ? sortRests : tableData;
+          if (treeConfig && transform) {
+            // 虚拟树和列表一样，只能排序根级节点
+            if (allSortMethod) {
+              var sortRests = allSortMethod({
+                data: tableTree,
+                sortList: orderColumns_1,
+                $table: $xetable
+              });
+              tableTree = _xeUtils.default.isArray(sortRests) ? sortRests : tableTree;
+            } else {
+              tableTree = _xeUtils.default.orderBy(tableTree, orderColumns_1.map(function (_a) {
+                var column = _a.column,
+                    order = _a.order;
+                return [getOrderField(column), order];
+              }));
+            }
+
+            tableData = tableTree;
           } else {
-            tableData = _xeUtils.default.orderBy(tableData, orderColumns_1.map(function (_a) {
-              var column = _a.column,
-                  order = _a.order;
-              return [getOrderField(column), order];
-            }));
+            if (allSortMethod) {
+              var sortRests = allSortMethod({
+                data: tableData,
+                sortList: orderColumns_1,
+                $table: $xetable
+              });
+              tableData = _xeUtils.default.isArray(sortRests) ? sortRests : tableData;
+            } else {
+              tableData = _xeUtils.default.orderBy(tableData, orderColumns_1.map(function (_a) {
+                var column = _a.column,
+                    order = _a.order;
+                return [getOrderField(column), order];
+              }));
+            }
+
+            tableTree = tableData;
           }
         }
       }
 
       internalData.afterFullData = tableData;
+      internalData.afterTreeFullData = tableTree;
       updateAfterDataIndex();
-      return tableData;
     };
 
     var updateStyle = function updateStyle() {
@@ -1666,6 +1724,8 @@ var _default = (0, _vue.defineComponent)({
                       }
 
                       childWidth_1 += item.renderWidth;
+                    }, {
+                      children: 'children'
                     });
                   }
 
@@ -2110,7 +2170,8 @@ var _default = (0, _vue.defineComponent)({
       var fullAllDataRowIdData = internalData.fullAllDataRowIdData;
       var treeOpts = computeTreeOpts.value;
       var checkboxOpts = computeCheckboxOpts.value;
-      var loadMethod = treeOpts.loadMethod;
+      var transform = treeOpts.transform,
+          loadMethod = treeOpts.loadMethod;
       var checkStrictly = checkboxOpts.checkStrictly;
       var rest = fullAllDataRowIdData[(0, _util.getRowid)($xetable, row)];
       return new Promise(function (resolve) {
@@ -2142,12 +2203,24 @@ var _default = (0, _vue.defineComponent)({
                 if (!checkStrictly && tableMethods.isCheckedByCheckboxRow(row)) {
                   tableMethods.setCheckboxRow(childRows, true);
                 }
+
+                (0, _vue.nextTick)().then(function () {
+                  if (transform) {
+                    return tablePrivateMethods.handleTableData();
+                  }
+                }).then(function () {
+                  return tableMethods.recalculate();
+                }).then(function () {
+                  return resolve();
+                });
+              });
+            } else {
+              (0, _vue.nextTick)().then(function () {
+                return tableMethods.recalculate();
+              }).then(function () {
+                return resolve();
               });
             }
-
-            resolve((0, _vue.nextTick)().then(function () {
-              return tableMethods.recalculate();
-            }));
           });
         } else {
           resolve();
@@ -2315,6 +2388,14 @@ var _default = (0, _vue.defineComponent)({
               (0, _utils.errLog)('vxe.error.reqProp', ['tree-config.children']);
             }
 
+            if (!treeOpts.mapChildren) {
+              (0, _utils.errLog)('vxe.error.reqProp', ['tree-config.mapChildren']);
+            }
+
+            if (treeOpts.children === treeOpts.mapChildren) {
+              (0, _utils.errLog)('vxe.error.errConflicts', ['tree-config.children', 'tree-config.mapChildren']);
+            }
+
             fullData.forEach(function (row) {
               if (row[treeOpts.children] && row[treeOpts.children].length) {
                 (0, _utils.warnLog)('vxe.error.errConflicts', ['tree-config.transform', "row." + treeOpts.children]);
@@ -2325,7 +2406,8 @@ var _default = (0, _vue.defineComponent)({
           treeData = _xeUtils.default.toArrayTree(fullData, {
             key: treeOpts.rowField,
             parentKey: treeOpts.parentField,
-            children: treeOpts.children
+            children: treeOpts.children,
+            mapChildren: treeOpts.mapChildren
           });
           fullData = treeData.slice(0);
         } else {
@@ -2343,7 +2425,7 @@ var _default = (0, _vue.defineComponent)({
       reactData.scrollYLoad = sYLoad; // 全量数据
 
       internalData.tableFullData = fullData;
-      internalData.treeFullData = treeData; // 缓存数据
+      internalData.tableFullTreeData = treeData; // 缓存数据
 
       tablePrivateMethods.cacheRowMap(true); // 原始数据
 
@@ -2675,33 +2757,6 @@ var _default = (0, _vue.defineComponent)({
       reactData.scrollYLoad = scrollYLoad;
       return scrollYLoad;
     };
-
-    var updateVirtualTreeData = function updateVirtualTreeData() {
-      var oldScrollYLoad = reactData.scrollYLoad,
-          treeExpandeds = reactData.treeExpandeds;
-      var treeFullData = internalData.treeFullData;
-      var treeOpts = computeTreeOpts.value;
-      var fullData = [];
-      var expandMaps = new Map();
-
-      _xeUtils.default.eachTree(treeFullData, function (row, index, items, path, parent) {
-        if (!parent || expandMaps.has(parent) && $xetable.findRowIndexOf(treeExpandeds, parent) > -1) {
-          expandMaps.set(row, 1);
-          fullData.push(row);
-        }
-      }, treeOpts);
-
-      var scrollYLoad = updateScrollYStatus(fullData);
-      internalData.tableFullData = scrollYLoad ? fullData : treeFullData;
-
-      if (scrollYLoad || oldScrollYLoad !== scrollYLoad) {
-        return tablePrivateMethods.handleTableData(true).then(function () {
-          return tableMethods.recalculate();
-        });
-      }
-
-      return (0, _vue.nextTick)();
-    };
     /**
      * 展开与收起树节点
      * @param rows
@@ -2792,7 +2847,7 @@ var _default = (0, _vue.defineComponent)({
 
     var handleVirtualTreeExpand = function handleVirtualTreeExpand(rows, expanded) {
       return handleBaseTreeExpand(rows, expanded).then(function () {
-        return updateVirtualTreeData();
+        return tablePrivateMethods.handleTableData();
       }).then(function () {
         return tableMethods.recalculate();
       });
@@ -2887,7 +2942,7 @@ var _default = (0, _vue.defineComponent)({
       },
 
       /**
-       * 同步 data 数据
+       * 同步 data 数据（即将废弃）
        * 如果用了该方法，那么组件将不再记录增删改的状态，只能自行实现对应逻辑
        * 对于某些特殊的场景，比如深层树节点元素发生变动时可能会用到
        */
@@ -3002,7 +3057,9 @@ var _default = (0, _vue.defineComponent)({
             fullDataRowIdData = internalData.fullDataRowIdData,
             fullAllDataRowIdData = internalData.fullAllDataRowIdData;
         var treeOpts = computeTreeOpts.value;
-        var children = treeOpts.children;
+        var transform = treeOpts.transform,
+            children = treeOpts.children,
+            mapChildren = treeOpts.mapChildren;
         var parentRest = fullAllDataRowIdData[(0, _util.getRowid)($xetable, row)];
         var parentLevel = parentRest ? parentRest.level : 0;
         return tableMethods.createData(childRecords).then(function (rows) {
@@ -3036,6 +3093,11 @@ var _default = (0, _vue.defineComponent)({
           }, treeOpts);
 
           row[children] = rows;
+
+          if (transform) {
+            row[mapChildren] = rows;
+          }
+
           return rows;
         });
       },
@@ -4515,7 +4577,7 @@ var _default = (0, _vue.defineComponent)({
             return handleAsyncTreeExpandChilds(row);
           }).then(function () {
             if (transform) {
-              return updateVirtualTreeData();
+              return tablePrivateMethods.handleTableData();
             }
           }).then(function () {
             return tableMethods.recalculate();
@@ -4605,19 +4667,19 @@ var _default = (0, _vue.defineComponent)({
        */
       clearTreeExpand: function clearTreeExpand() {
         var treeExpandeds = reactData.treeExpandeds;
-        var treeFullData = internalData.treeFullData;
+        var tableFullTreeData = internalData.tableFullTreeData;
         var treeOpts = computeTreeOpts.value;
         var reserve = treeOpts.reserve;
         var isExists = treeExpandeds.length;
         reactData.treeExpandeds = [];
 
         if (reserve) {
-          _xeUtils.default.eachTree(treeFullData, function (row) {
+          _xeUtils.default.eachTree(tableFullTreeData, function (row) {
             return handleTreeExpandReserve(row, false);
           }, treeOpts);
         }
 
-        return updateVirtualTreeData().then(function () {
+        return tablePrivateMethods.handleTableData().then(function () {
           if (isExists) {
             tableMethods.recalculate();
           }
@@ -5588,11 +5650,35 @@ var _default = (0, _vue.defineComponent)({
         return record;
       },
       handleTableData: function handleTableData(force) {
+        var treeConfig = props.treeConfig;
         var scrollYLoad = reactData.scrollYLoad;
         var scrollYStore = internalData.scrollYStore,
             fullDataRowIdData = internalData.fullDataRowIdData;
-        var fullData = force ? updateAfterFullData() : internalData.afterFullData;
-        var tableData = scrollYLoad ? fullData.slice(scrollYStore.startIndex, scrollYStore.endIndex) : fullData.slice(0);
+        var treeExpandeds = reactData.treeExpandeds;
+        var treeOpts = computeTreeOpts.value;
+        var fullList = []; // 是否进行数据处理
+
+        if (force) {
+          updateAfterFullData();
+        } // 如果为虚拟树，将树结构拍平
+
+
+        if (treeConfig && treeOpts.transform) {
+          var expandMaps_1 = new Map();
+
+          _xeUtils.default.eachTree(internalData.afterTreeFullData, function (row, index, items, path, parent) {
+            if (!parent || expandMaps_1.has(parent) && $xetable.findRowIndexOf(treeExpandeds, parent) > -1) {
+              expandMaps_1.set(row, 1);
+              fullList.push(row);
+            }
+          }, {
+            children: treeOpts.mapChildren
+          });
+        } else {
+          fullList = internalData.afterFullData;
+        }
+
+        var tableData = scrollYLoad ? fullList.slice(scrollYStore.startIndex, scrollYStore.endIndex) : fullList.slice(0);
         tableData.forEach(function (row, $index) {
           var rowid = (0, _util.getRowid)($xetable, row);
           var rest = fullDataRowIdData[rowid];
@@ -5615,7 +5701,7 @@ var _default = (0, _vue.defineComponent)({
         var fullDataRowIdData = internalData.fullDataRowIdData,
             fullAllDataRowIdData = internalData.fullAllDataRowIdData,
             tableFullData = internalData.tableFullData,
-            treeFullData = internalData.treeFullData;
+            tableFullTreeData = internalData.tableFullTreeData;
         var rowkey = (0, _util.getRowkey)($xetable);
         var isLazy = treeConfig && treeOpts.lazy;
 
@@ -5660,7 +5746,7 @@ var _default = (0, _vue.defineComponent)({
         fullAllDataRowIdData = internalData.fullAllDataRowIdData = {};
 
         if (treeConfig) {
-          _xeUtils.default.eachTree(treeFullData, handleCache, treeOpts);
+          _xeUtils.default.eachTree(tableFullTreeData, handleCache, treeOpts);
         } else {
           tableFullData.forEach(handleCache);
         }
@@ -6635,7 +6721,6 @@ var _default = (0, _vue.defineComponent)({
         tablePrivateMethods.handleTableData();
         tablePrivateMethods.updateScrollYSpace();
       },
-      updateVirtualTreeData: updateVirtualTreeData,
 
       /**
        * 处理固定列的显示状态
@@ -6812,7 +6897,7 @@ var _default = (0, _vue.defineComponent)({
 
         return false;
       }
-    };
+    }; // 检测对应模块是否安装
 
     if (process.env.NODE_ENV === 'development') {
       'openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').forEach(function (name) {