vxe-table 4.4.6 → 4.5.0-beta.2

package/lib/table/src/body.js

@@ -176,8 +176,8 @@ var _default = (0, _vue.defineComponent)({
         currentColumn = tableReactData.currentColumn,
         mergeList = tableReactData.mergeList,
         editStore = tableReactData.editStore,
-        validStore = tableReactData.validStore,
-        isAllOverflow = tableReactData.isAllOverflow;
+        isAllOverflow = tableReactData.isAllOverflow,
+        validErrorMaps = tableReactData.validErrorMaps;
       var afterFullData = tableInternalData.afterFullData;
       var validOpts = computeValidOpts.value;
       var checkboxOpts = computeCheckboxOpts.value;
@@ -213,7 +213,7 @@ var _default = (0, _vue.defineComponent)({
       var isDirty;
       var tdOns = {};
       var cellAlign = align || allAlign;
-      var hasValidError = validStore.row === row && validStore.column === column;
+      var errorValidItem = validErrorMaps["".concat(rowid, ":").concat(column.id)];
       var showValidTip = editRules && validOpts.showMessage;
       var attrs = {
         colid: column.id
@@ -356,19 +356,19 @@ var _default = (0, _vue.defineComponent)({
           },
           title: showTitle ? $xetable.getCellLabel(row, column) : null
         }, column.renderCell(params))], false));
-        if (showValidTip && hasValidError) {
+        if (showValidTip && errorValidItem) {
           tdVNs.push((0, _vue.h)('div', {
             class: 'vxe-cell--valid',
-            style: validStore.rule && validStore.rule.maxWidth ? {
-              width: "".concat(validStore.rule.maxWidth, "px")
+            style: errorValidItem.rule && errorValidItem.rule.maxWidth ? {
+              width: "".concat(errorValidItem.rule.maxWidth, "px")
             } : null
           }, [(0, _vue.h)('span', {
             class: 'vxe-cell--valid-msg'
-          }, validStore.content)]));
+          }, errorValidItem.content)]));
         }
       }
       return (0, _vue.h)('td', __assign(__assign(__assign({
-        class: ['vxe-body--column', column.id, (_a = {}, _a["col--".concat(cellAlign)] = cellAlign, _a["col--".concat(type)] = type, _a['col--last'] = $columnIndex === columns.length - 1, _a['col--tree-node'] = treeNode, _a['col--edit'] = isEdit, _a['col--ellipsis'] = hasEllipsis, _a['fixed--hidden'] = fixedHiddenColumn, _a['col--dirty'] = isDirty, _a['col--actived'] = editConfig && isEdit && actived.row === row && (actived.column === column || editOpts.mode === 'row'), _a['col--valid-error'] = hasValidError, _a['col--current'] = currentColumn === column, _a), (0, _dom.getPropClass)(compCellClassName, params), (0, _dom.getPropClass)(className, params), (0, _dom.getPropClass)(allCellClassName, params)],
+        class: ['vxe-body--column', column.id, (_a = {}, _a["col--".concat(cellAlign)] = cellAlign, _a["col--".concat(type)] = type, _a['col--last'] = $columnIndex === columns.length - 1, _a['col--tree-node'] = treeNode, _a['col--edit'] = isEdit, _a['col--ellipsis'] = hasEllipsis, _a['fixed--hidden'] = fixedHiddenColumn, _a['col--dirty'] = isDirty, _a['col--actived'] = editConfig && isEdit && actived.row === row && (actived.column === column || editOpts.mode === 'row'), _a['col--valid-error'] = !!errorValidItem, _a['col--current'] = currentColumn === column, _a), (0, _dom.getPropClass)(compCellClassName, params), (0, _dom.getPropClass)(className, params), (0, _dom.getPropClass)(allCellClassName, params)],
         key: columnKey || columnOpts.useKey ? column.id : $columnIndex
       }, attrs), {
         style: Object.assign({

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

package/lib/table/src/columnInfo.js

@@ -112,11 +112,18 @@ var ColumnInfo = /** @class */function () {
       checked: false,
       halfChecked: false,
       disabled: false,
+      // 分组层级
       level: 1,
+      // 跨行
       rowSpan: 1,
+      // 跨列
       colSpan: 1,
+      // 数据排序-自定义排序
       order: null,
+      // 数据排序-用于多列的先后顺序
       sortTime: 0,
+      // 列排序
+      customOrder: 0,
       renderWidth: 0,
       renderHeight: 0,
       resizeWidth: 0,

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.ColumnInfo=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=require("../../v-x-e-table"),_util=require("./util"),_utils=require("../../tools/utils"),_log=require("../../tools/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var ColumnInfo=function(){function e(e,r,t){var l,o,t=void 0===t?{}:t,i=t.renderHeader,n=t.renderCell,d=t.renderFooter,t=t.renderData,s=e.xegrid,a=r.formatter,f=!_xeUtils.default.isBoolean(r.visible)||r.visible;"development"===process.env.NODE_ENV&&(o=["seq","checkbox","radio","expand","html"],r.type&&-1===o.indexOf(r.type)&&(0,_log.warnLog)("vxe.error.errProp",["type=".concat(r.type),o.join(", ")]),(_xeUtils.default.isBoolean(r.cellRender)||r.cellRender&&!_xeUtils.default.isObject(r.cellRender))&&(0,_log.warnLog)("vxe.error.errProp",["column.cell-render=".concat(r.cellRender),"column.cell-render={}"]),(_xeUtils.default.isBoolean(r.editRender)||r.editRender&&!_xeUtils.default.isObject(r.editRender))&&(0,_log.warnLog)("vxe.error.errProp",["column.edit-render=".concat(r.editRender),"column.edit-render={}"]),r.cellRender&&r.editRender&&(0,_log.warnLog)("vxe.error.errConflicts",["column.cell-render","column.edit-render"]),"expand"===r.type&&(o=e.props.treeConfig,e=e.getComputeMaps().computeTreeOpts.value,o)&&e.line&&(0,_log.errLog)("vxe.error.errConflicts",["tree-config.line","column.type=expand"]),a)&&(_xeUtils.default.isString(a)?(l=_vXETable.VXETable.formats.get(a)||_xeUtils.default[a],_xeUtils.default.isFunction(l)||(0,_log.errLog)("vxe.error.notFunc",[a])):_xeUtils.default.isArray(a)&&(l=_vXETable.VXETable.formats.get(a[0])||_xeUtils.default[a[0]],_xeUtils.default.isFunction(l)||(0,_log.errLog)("vxe.error.notFunc",[a[0]]))),Object.assign(this,{type:r.type,property:r.field,field:r.field,title:r.title,width:r.width,minWidth:r.minWidth,maxWidth:r.maxWidth,resizable:r.resizable,fixed:r.fixed,align:r.align,headerAlign:r.headerAlign,footerAlign:r.footerAlign,showOverflow:r.showOverflow,showHeaderOverflow:r.showHeaderOverflow,showFooterOverflow:r.showFooterOverflow,className:r.className,headerClassName:r.headerClassName,footerClassName:r.footerClassName,formatter:a,sortable:r.sortable,sortBy:r.sortBy,sortType:r.sortType,filters:(0,_util.toFilters)(r.filters),filterMultiple:!_xeUtils.default.isBoolean(r.filterMultiple)||r.filterMultiple,filterMethod:r.filterMethod,filterResetMethod:r.filterResetMethod,filterRecoverMethod:r.filterRecoverMethod,filterRender:r.filterRender,treeNode:r.treeNode,cellType:r.cellType,cellRender:r.cellRender,editRender:r.editRender,contentRender:r.contentRender,headerExportMethod:r.headerExportMethod,exportMethod:r.exportMethod,footerExportMethod:r.footerExportMethod,titleHelp:r.titleHelp,titlePrefix:r.titlePrefix,params:r.params,id:r.colId||_xeUtils.default.uniqueId("col_"),parentId:null,visible:f,halfVisible:!1,defaultVisible:f,defaultFixed:r.fixed,checked:!1,halfChecked:!1,disabled:!1,level:1,rowSpan:1,colSpan:1,order:null,sortTime:0,renderWidth:0,renderHeight:0,resizeWidth:0,renderLeft:0,renderArgs:[],model:{},renderHeader:i||r.renderHeader,renderCell:n||r.renderCell,renderFooter:d||r.renderFooter,renderData:t,slots:r.slots}),s&&(o=s.getComputeMaps().computeProxyOpts.value).beforeColumn&&o.beforeColumn({$grid:s,column:this})}return e.prototype.getTitle=function(){return(0,_utils.getFuncText)(this.title||("seq"===this.type?_conf.default.i18n("vxe.table.seqTitle"):""))},e.prototype.getKey=function(){return this.field||(this.type?"type=".concat(this.type):null)},e.prototype.update=function(e,r){"filters"!==e&&("field"===e&&(this.property=r),this[e]=r)},e}();exports.ColumnInfo=ColumnInfo;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.ColumnInfo=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_vXETable=require("../../v-x-e-table"),_util=require("./util"),_utils=require("../../tools/utils"),_log=require("../../tools/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var ColumnInfo=function(){function e(e,r,t){var l,o,t=void 0===t?{}:t,i=t.renderHeader,n=t.renderCell,d=t.renderFooter,t=t.renderData,s=e.xegrid,a=r.formatter,u=!_xeUtils.default.isBoolean(r.visible)||r.visible;"development"===process.env.NODE_ENV&&(o=["seq","checkbox","radio","expand","html"],r.type&&-1===o.indexOf(r.type)&&(0,_log.warnLog)("vxe.error.errProp",["type=".concat(r.type),o.join(", ")]),(_xeUtils.default.isBoolean(r.cellRender)||r.cellRender&&!_xeUtils.default.isObject(r.cellRender))&&(0,_log.warnLog)("vxe.error.errProp",["column.cell-render=".concat(r.cellRender),"column.cell-render={}"]),(_xeUtils.default.isBoolean(r.editRender)||r.editRender&&!_xeUtils.default.isObject(r.editRender))&&(0,_log.warnLog)("vxe.error.errProp",["column.edit-render=".concat(r.editRender),"column.edit-render={}"]),r.cellRender&&r.editRender&&(0,_log.warnLog)("vxe.error.errConflicts",["column.cell-render","column.edit-render"]),"expand"===r.type&&(o=e.props.treeConfig,e=e.getComputeMaps().computeTreeOpts.value,o)&&e.line&&(0,_log.errLog)("vxe.error.errConflicts",["tree-config.line","column.type=expand"]),a)&&(_xeUtils.default.isString(a)?(l=_vXETable.VXETable.formats.get(a)||_xeUtils.default[a],_xeUtils.default.isFunction(l)||(0,_log.errLog)("vxe.error.notFunc",[a])):_xeUtils.default.isArray(a)&&(l=_vXETable.VXETable.formats.get(a[0])||_xeUtils.default[a[0]],_xeUtils.default.isFunction(l)||(0,_log.errLog)("vxe.error.notFunc",[a[0]]))),Object.assign(this,{type:r.type,property:r.field,field:r.field,title:r.title,width:r.width,minWidth:r.minWidth,maxWidth:r.maxWidth,resizable:r.resizable,fixed:r.fixed,align:r.align,headerAlign:r.headerAlign,footerAlign:r.footerAlign,showOverflow:r.showOverflow,showHeaderOverflow:r.showHeaderOverflow,showFooterOverflow:r.showFooterOverflow,className:r.className,headerClassName:r.headerClassName,footerClassName:r.footerClassName,formatter:a,sortable:r.sortable,sortBy:r.sortBy,sortType:r.sortType,filters:(0,_util.toFilters)(r.filters),filterMultiple:!_xeUtils.default.isBoolean(r.filterMultiple)||r.filterMultiple,filterMethod:r.filterMethod,filterResetMethod:r.filterResetMethod,filterRecoverMethod:r.filterRecoverMethod,filterRender:r.filterRender,treeNode:r.treeNode,cellType:r.cellType,cellRender:r.cellRender,editRender:r.editRender,contentRender:r.contentRender,headerExportMethod:r.headerExportMethod,exportMethod:r.exportMethod,footerExportMethod:r.footerExportMethod,titleHelp:r.titleHelp,titlePrefix:r.titlePrefix,params:r.params,id:r.colId||_xeUtils.default.uniqueId("col_"),parentId:null,visible:u,halfVisible:!1,defaultVisible:u,defaultFixed:r.fixed,checked:!1,halfChecked:!1,disabled:!1,level:1,rowSpan:1,colSpan:1,order:null,sortTime:0,customOrder:0,renderWidth:0,renderHeight:0,resizeWidth:0,renderLeft:0,renderArgs:[],model:{},renderHeader:i||r.renderHeader,renderCell:n||r.renderCell,renderFooter:d||r.renderFooter,renderData:t,slots:r.slots}),s&&(o=s.getComputeMaps().computeProxyOpts.value).beforeColumn&&o.beforeColumn({$grid:s,column:this})}return e.prototype.getTitle=function(){return(0,_utils.getFuncText)(this.title||("seq"===this.type?_conf.default.i18n("vxe.table.seqTitle"):""))},e.prototype.getKey=function(){return this.field||(this.type?"type=".concat(this.type):null)},e.prototype.update=function(e,r){"filters"!==e&&("field"===e&&(this.property=r),this[e]=r)},e}();exports.ColumnInfo=ColumnInfo;

package/lib/table/src/table.js

@@ -201,13 +201,9 @@ var _default = (0, _vue.defineComponent)({
       },
       // 存放数据校验相关信息
       validStore: {
-        visible: false,
-        row: null,
-        column: null,
-        content: '',
-        rule: null,
-        isArrow: false
+        visible: false
       },
+      validErrorMaps: {},
       // 导入相关信息
       importStore: {
         inited: false,
@@ -311,6 +307,7 @@ var _default = (0, _vue.defineComponent)({
       // 总的缓存数据集
       fullAllDataRowIdData: {},
       // 渲染中缓存数据
+      sourceDataRowIdData: {},
       fullDataRowIdData: {},
       fullColumnIdData: {},
       fullColumnFieldData: {},
@@ -478,6 +475,25 @@ var _default = (0, _vue.defineComponent)({
     var computeCustomOpts = (0, _vue.computed)(function () {
       return Object.assign({}, _conf.default.table.customConfig, props.customConfig);
     });
+    var computeFixedColumnSize = (0, _vue.computed)(function () {
+      var tableFullColumn = internalData.tableFullColumn;
+      var fixedSize = 0;
+      tableFullColumn.forEach(function (column) {
+        if (column.fixed) {
+          fixedSize++;
+        }
+      });
+      return fixedSize;
+    });
+    var computeIsMaxFixedColumn = (0, _vue.computed)(function () {
+      var fixedColumnSize = computeFixedColumnSize.value;
+      var columnOpts = computeColumnOpts.value;
+      var maxFixedSize = columnOpts.maxFixedSize;
+      if (maxFixedSize) {
+        return fixedColumnSize >= maxFixedSize;
+      }
+      return false;
+    });
     var computeTableBorder = (0, _vue.computed)(function () {
       var border = props.border;
       if (border === true) {
@@ -566,6 +582,8 @@ var _default = (0, _vue.defineComponent)({
       computeEmptyOpts: computeEmptyOpts,
       computeLoadingOpts: computeLoadingOpts,
       computeCustomOpts: computeCustomOpts,
+      computeFixedColumnSize: computeFixedColumnSize,
+      computeIsMaxFixedColumn: computeIsMaxFixedColumn,
       computeIsAllCheckboxDisabled: computeIsAllCheckboxDisabled
     };
     var $xetable = {
@@ -840,9 +858,8 @@ var _default = (0, _vue.defineComponent)({
         if (isCustomResizable) {
           var columnWidthStorage = getCustomStorageMap(resizableStorageKey)[id];
           if (columnWidthStorage) {
-            _xeUtils.default.each(columnWidthStorage, function (resizeWidth, field) {
-              customMap_1[field] = {
-                field: field,
+            _xeUtils.default.each(columnWidthStorage, function (resizeWidth, colKey) {
+              customMap_1[colKey] = {
                 resizeWidth: resizeWidth
               };
             });
@@ -855,13 +872,12 @@ var _default = (0, _vue.defineComponent)({
             var colFixeds = columnFixedStorage.split(',');
             colFixeds.forEach(function (fixConf) {
               var _a = fixConf.split('|'),
-                field = _a[0],
+                colKey = _a[0],
                 fixed = _a[1];
-              if (customMap_1[field]) {
-                customMap_1[field].fixed = fixed;
+              if (customMap_1[colKey]) {
+                customMap_1[colKey].fixed = fixed;
               } else {
-                customMap_1[field] = {
-                  field: field,
+                customMap_1[colKey] = {
                   fixed: fixed
                 };
               }
@@ -872,7 +888,15 @@ var _default = (0, _vue.defineComponent)({
         if (isCustomOrder) {
           var columnOrderStorage = getCustomStorageMap(orderStorageKey)[id];
           if (columnOrderStorage) {
-            // 开发中...
+            // const colOrderSeqs = columnOrderStorage.split(',')
+            // colOrderSeqs.forEach((orderConf: any) => {
+            //   const [colKey, order] = orderConf.split('|')
+            //   if (customMap[colKey]) {
+            //     customMap[colKey].order = order
+            //   } else {
+            //     customMap[colKey] = { order }
+            //   }
+            // })
           }
         }
         // 自定义隐藏列
@@ -882,22 +906,20 @@ var _default = (0, _vue.defineComponent)({
             var colVisibles = columnVisibleStorage.split('|');
             var colHides = colVisibles[0] ? colVisibles[0].split(',') : [];
             var colShows = colVisibles[1] ? colVisibles[1].split(',') : [];
-            colHides.forEach(function (field) {
-              if (customMap_1[field]) {
-                customMap_1[field].visible = false;
+            colHides.forEach(function (colKey) {
+              if (customMap_1[colKey]) {
+                customMap_1[colKey].visible = false;
               } else {
-                customMap_1[field] = {
-                  field: field,
+                customMap_1[colKey] = {
                   visible: false
                 };
               }
             });
-            colShows.forEach(function (field) {
-              if (customMap_1[field]) {
-                customMap_1[field].visible = true;
+            colShows.forEach(function (colKey) {
+              if (customMap_1[colKey]) {
+                customMap_1[colKey].visible = true;
               } else {
-                customMap_1[field] = {
-                  field: field,
+                customMap_1[colKey] = {
                   visible: true
                 };
               }
@@ -911,11 +933,12 @@ var _default = (0, _vue.defineComponent)({
             keyMap_1[colKey] = column;
           }
         });
-        _xeUtils.default.each(customMap_1, function (_a, field) {
+        _xeUtils.default.each(customMap_1, function (_a, colKey) {
           var visible = _a.visible,
             resizeWidth = _a.resizeWidth,
-            fixed = _a.fixed;
-          var column = keyMap_1[field];
+            fixed = _a.fixed,
+            order = _a.order;
+          var column = keyMap_1[colKey];
           if (column) {
             if (_xeUtils.default.isNumber(resizeWidth)) {
               column.resizeWidth = resizeWidth;
@@ -926,6 +949,9 @@ var _default = (0, _vue.defineComponent)({
             if (fixed) {
               column.fixed = fixed;
             }
+            if (order) {
+              column.customOrder = order;
+            }
           }
         });
       }
@@ -2354,7 +2380,7 @@ var _default = (0, _vue.defineComponent)({
       internalData.tableSynchData = datas;
       // 克隆原数据，用于显示编辑状态，与编辑值做对比
       if (keepSource) {
-        internalData.tableSourceData = _xeUtils.default.clone(fullData, true);
+        tablePrivateMethods.cacheSourceMap(fullData);
       }
       if (process.env.NODE_ENV === 'development') {
         if (sYLoad) {
@@ -3193,40 +3219,24 @@ var _default = (0, _vue.defineComponent)({
        * @param {String} field 字段名
        */
       isUpdateByRow: function (row, field) {
-        var _a, _b;
-        var keepSource = props.keepSource,
-          treeConfig = props.treeConfig;
-        var visibleColumn = internalData.visibleColumn,
-          tableSourceData = internalData.tableSourceData,
-          fullDataRowIdData = internalData.fullDataRowIdData;
-        var treeOpts = computeTreeOpts.value;
+        var keepSource = props.keepSource;
+        var tableFullColumn = internalData.tableFullColumn,
+          fullDataRowIdData = internalData.fullDataRowIdData,
+          sourceDataRowIdData = internalData.sourceDataRowIdData;
         if (keepSource) {
-          var oRow = void 0,
-            property = void 0;
-          var rowid_2 = (0, _util.getRowid)($xetable, row);
+          var rowid = (0, _util.getRowid)($xetable, row);
           // 新增的数据不需要检测
-          if (!fullDataRowIdData[rowid_2]) {
+          if (!fullDataRowIdData[rowid]) {
             return false;
           }
-          if (treeConfig) {
-            var children = treeOpts.children;
-            var matchObj = _xeUtils.default.findTree(tableSourceData, function (item) {
-              return rowid_2 === (0, _util.getRowid)($xetable, item);
-            }, treeOpts);
-            row = Object.assign({}, row, (_a = {}, _a[children] = null, _a));
-            if (matchObj) {
-              oRow = Object.assign({}, matchObj.item, (_b = {}, _b[children] = null, _b));
-            }
-          } else {
-            var oRowIndex = fullDataRowIdData[rowid_2].index;
-            oRow = tableSourceData[oRowIndex];
-          }
-          if (oRow) {
+          var oldRest = sourceDataRowIdData[rowid];
+          if (oldRest) {
+            var oRow = oldRest.row;
             if (arguments.length > 1) {
               return !eqCellValue(oRow, row, field);
             }
-            for (var index = 0, len = visibleColumn.length; index < len; index++) {
-              property = visibleColumn[index].field;
+            for (var index = 0, len = tableFullColumn.length; index < len; index++) {
+              var property = tableFullColumn[index].field;
               if (property && !eqCellValue(oRow, row, property)) {
                 return true;
               }
@@ -3380,8 +3390,20 @@ var _default = (0, _vue.defineComponent)({
        */
       setColumnFixed: function (fieldOrColumn, fixed) {
         var column = (0, _util.handleFieldOrColumn)($xetable, fieldOrColumn);
-        if (column && column.fixed !== fixed) {
-          _xeUtils.default.eachTree([column], function (column) {
+        var targetColumn = (0, _util.getRootColumn)($xetable, column);
+        var isMaxFixedColumn = computeIsMaxFixedColumn.value;
+        if (targetColumn && targetColumn.fixed !== fixed) {
+          // 是否超过最大固定列数量
+          if (!targetColumn.fixed && isMaxFixedColumn) {
+            if (_vXETable.VXETable.modal) {
+              _vXETable.VXETable.modal.message({
+                status: 'error',
+                content: _conf.default.i18n('vxe.table.maxFixedCol')
+              });
+            }
+            return (0, _vue.nextTick)();
+          }
+          _xeUtils.default.eachTree([targetColumn], function (column) {
             column.fixed = fixed;
           });
           tablePrivateMethods.saveCustomFixed();
@@ -3394,8 +3416,9 @@ var _default = (0, _vue.defineComponent)({
        */
       clearColumnFixed: function (fieldOrColumn) {
         var column = (0, _util.handleFieldOrColumn)($xetable, fieldOrColumn);
-        if (column && column.fixed) {
-          _xeUtils.default.eachTree([column], function (column) {
+        var targetColumn = (0, _util.getRootColumn)($xetable, column);
+        if (targetColumn && targetColumn.fixed) {
+          _xeUtils.default.eachTree([targetColumn], function (column) {
             column.fixed = null;
           });
           tablePrivateMethods.saveCustomFixed();
@@ -3453,7 +3476,7 @@ var _default = (0, _vue.defineComponent)({
        * 如果已关联工具栏，则会同步更新
        */
       resetColumn: function (options) {
-        var tableFullColumn = internalData.tableFullColumn;
+        var collectColumn = internalData.collectColumn;
         var customOpts = computeCustomOpts.value;
         var checkMethod = customOpts.checkMethod;
         var opts = Object.assign({
@@ -3461,7 +3484,7 @@ var _default = (0, _vue.defineComponent)({
           resizable: options === true,
           fixed: options === true
         }, options);
-        tableFullColumn.forEach(function (column) {
+        _xeUtils.default.eachTree(collectColumn, function (column) {
           if (opts.resizable) {
             column.resizeWidth = 0;
           }
@@ -3648,23 +3671,23 @@ var _default = (0, _vue.defineComponent)({
         var radioOpts = computeRadioOpts.value;
         var treeOpts = computeTreeOpts.value;
         if (radioOpts.reserve && radioReserveRow) {
-          var rowid_3 = (0, _util.getRowid)($xetable, radioReserveRow);
+          var rowid_2 = (0, _util.getRowid)($xetable, radioReserveRow);
           if (isFull) {
-            if (!fullDataRowIdData[rowid_3]) {
+            if (!fullDataRowIdData[rowid_2]) {
               return radioReserveRow;
             }
           } else {
             var rowkey_2 = (0, _util.getRowkey)($xetable);
             if (treeConfig) {
               var matchObj = _xeUtils.default.findTree(afterFullData, function (row) {
-                return rowid_3 === _xeUtils.default.get(row, rowkey_2);
+                return rowid_2 === _xeUtils.default.get(row, rowkey_2);
               }, treeOpts);
               if (matchObj) {
                 return radioReserveRow;
               }
             } else {
               if (!afterFullData.some(function (row) {
-                return rowid_3 === _xeUtils.default.get(row, rowkey_2);
+                return rowid_2 === _xeUtils.default.get(row, rowkey_2);
               })) {
                 return radioReserveRow;
               }
@@ -3826,16 +3849,16 @@ var _default = (0, _vue.defineComponent)({
         var selectRow = reactData.selectRow;
         var treeOpts = computeTreeOpts.value;
         if (selectRow) {
-          var rowid_4 = (0, _util.getRowid)($xetable, selectRow);
+          var rowid_3 = (0, _util.getRowid)($xetable, selectRow);
           if (isFull) {
-            if (!fullDataRowIdData[rowid_4]) {
+            if (!fullDataRowIdData[rowid_3]) {
               return selectRow;
             }
           } else {
             if (treeConfig) {
               var rowkey_3 = (0, _util.getRowkey)($xetable);
               var matchObj = _xeUtils.default.findTree(afterFullData, function (row) {
-                return rowid_4 === _xeUtils.default.get(row, rowkey_3);
+                return rowid_3 === _xeUtils.default.get(row, rowkey_3);
               }, treeOpts);
               if (matchObj) {
                 return selectRow;
@@ -4472,7 +4495,7 @@ var _default = (0, _vue.defineComponent)({
                     if (customVal && validStore.visible) {
                       (0, _util.setCellValue)(row_1, column_3, cellValue);
                     }
-                    $xetable.clearValidate();
+                    $xetable.clearValidate(row_1, column_3);
                   }).catch(function (_a) {
                     var rule = _a.rule;
                     if (customVal) {
@@ -5246,7 +5269,7 @@ var _default = (0, _vue.defineComponent)({
           tableFullTreeData = internalData.tableFullTreeData;
         var rowkey = (0, _util.getRowkey)($xetable);
         var isLazy = treeConfig && treeOpts.lazy;
-        var handleCache = function (row, index, items, path, parent, nodes) {
+        var handleRow = function (row, index, items, path, parent, nodes) {
           var rowid = (0, _util.getRowid)($xetable, row);
           var seq = treeConfig && path ? (0, _util.toTreePathSeq)(path) : index + 1;
           var level = nodes ? nodes.length - 1 : 0;
@@ -5278,10 +5301,36 @@ var _default = (0, _vue.defineComponent)({
         }
         fullAllDataRowIdData = internalData.fullAllDataRowIdData = {};
         if (treeConfig) {
-          _xeUtils.default.eachTree(tableFullTreeData, handleCache, treeOpts);
+          _xeUtils.default.eachTree(tableFullTreeData, handleRow, treeOpts);
+        } else {
+          tableFullData.forEach(handleRow);
+        }
+      },
+      cacheSourceMap: function (fullData) {
+        var treeConfig = props.treeConfig;
+        var treeOpts = computeTreeOpts.value;
+        var sourceDataRowIdData = internalData.sourceDataRowIdData;
+        var sourceData = _xeUtils.default.clone(fullData, true);
+        var rowkey = (0, _util.getRowkey)($xetable);
+        sourceDataRowIdData = internalData.sourceDataRowIdData = {};
+        var handleSourceRow = function (row) {
+          var rowid = (0, _util.getRowid)($xetable, row);
+          if ((0, _utils.eqEmptyValue)(rowid)) {
+            rowid = (0, _util.getRowUniqueId)();
+            _xeUtils.default.set(row, rowkey, rowid);
+          }
+          sourceDataRowIdData[rowid] = {
+            row: row,
+            rowid: rowid
+          };
+        };
+        // 源数据缓存
+        if (treeConfig && !treeOpts.transform) {
+          _xeUtils.default.eachTree(sourceData, handleSourceRow, treeOpts);
         } else {
-          tableFullData.forEach(handleCache);
+          sourceData.forEach(handleSourceRow);
         }
+        internalData.tableSourceData = sourceData;
       },
       /**
        * 指定列宽的列进行拆分