vxe-table 3.5.9-beta.10 → 3.5.9-beta.11

package/lib/header/src/header.js

@@ -17,6 +17,10 @@ var _util2 = require("../../table/src/util");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 var cellType = 'header';
@@ -356,7 +360,8 @@ var _default = {
       document.onmouseup = function (evnt) {
         document.onmousemove = domMousemove;
         document.onmouseup = domMouseup;
-        column.resizeWidth = column.renderWidth + (isRightFixed ? dragPosLeft - dragLeft : dragLeft - dragPosLeft);
+        var resizeWidth = column.renderWidth + (isRightFixed ? dragPosLeft - dragLeft : dragLeft - dragPosLeft);
+        column.resizeWidth = resizeWidth;
         resizeBarElem.style.display = 'none';
         $xetable._isResize = false;
         $xetable._lastResizeTime = Date.now();
@@ -364,7 +369,9 @@ var _default = {
         $xetable.recalculate(true).then(function () {
           $xetable.saveCustomResizable();
           $xetable.updateCellAreas();
-          $xetable.emitEvent('resizable-change', params, evnt);
+          $xetable.emitEvent('resizable-change', _objectSpread(_objectSpread({}, params), {}, {
+            resizeWidth: resizeWidth
+          }), evnt);
         });
 
         _dom.default.removeClass($xetable.$el, 'drag--resize');

package/lib/header/src/header.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_utils=_interopRequireDefault(require("../../tools/utils")),_dom=_interopRequireDefault(require("../../tools/dom")),_util=require("./util"),_util2=require("../../table/src/util");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _defineProperty(e,t,l){return t in e?Object.defineProperty(e,t,{value:l,enumerable:!0,configurable:!0,writable:!0}):e[t]=l,e}var cellType="header",_default={name:"VxeTableHeader",props:{tableData:Array,tableColumn:Array,tableGroupColumn:Array,fixedColumn:Array,size:String,fixedType:String},data:function(){return{headerColumn:[]}},watch:{tableColumn:function(){this.uploadColumn()}},created:function(){this.uploadColumn()},mounted:function(){var e=this.$parent,t=this.$el,l=this.$refs,r=this.fixedType,e=e.elemStore,r="".concat(r||"main","-header-");e["".concat(r,"wrapper")]=t,e["".concat(r,"table")]=l.table,e["".concat(r,"colgroup")]=l.colgroup,e["".concat(r,"list")]=l.thead,e["".concat(r,"xSpace")]=l.xSpace,e["".concat(r,"repair")]=l.repair},destroyed:function(){var e=this.$parent,t=this.fixedType,e=e.elemStore,t="".concat(t||"main","-header-");e["".concat(t,"wrapper")]=null,e["".concat(t,"table")]=null,e["".concat(t,"colgroup")]=null,e["".concat(t,"list")]=null,e["".concat(t,"xSpace")]=null,e["".concat(t,"repair")]=null},render:function(_){var g=this,e=this._e,b=this.$parent,v=this.fixedType,t=this.headerColumn,l=this.fixedColumn,C=b.$listeners,r=b.tId,i=b.isGroup,w=b.resizable,$=b.border,z=b.columnKey,n=b.headerRowClassName,P=b.headerCellClassName,o=b.headerRowStyle,S=b.headerCellStyle,T=b.showHeaderOverflow,M=b.headerAlign,R=b.align,W=b.highlightCurrentColumn,k=b.currentColumn,q=b.scrollXLoad,I=b.overflowX,a=b.scrollbarWidth,D=b.sortOpts,H=b.mouseConfig,U=b.columnOpts,s=this.tableColumn,t=t;return i||(t=[s=v&&(q||T)?l:s]),_("div",{class:["vxe-table--header-wrapper",v?"fixed-".concat(v,"--wrapper"):"body--wrapper"],attrs:{xid:r}},[v?e():_("div",{class:"vxe-body--x-space",ref:"xSpace"}),_("table",{class:"vxe-table--header",attrs:{xid:r,cellspacing:0,cellpadding:0,border:0},ref:"table"},[_("colgroup",{ref:"colgroup"},s.map(function(e,t){return _("col",{attrs:{name:e.id},key:t})}).concat(a?[_("col",{attrs:{name:"col_gutter"}})]:[])),_("thead",{ref:"thead"},t.map(function(x,y){return _("tr",{class:["vxe-header--row",n?_xeUtils.default.isFunction(n)?n({$table:b,$rowIndex:y,fixed:v,type:cellType}):n:""],style:o?_xeUtils.default.isFunction(o)?o({$table:b,$rowIndex:y,fixed:v,type:cellType}):o:null},x.map(function(e,t){var l=e.type,r=e.showHeaderOverflow,i=e.headerAlign,n=e.align,o=e.headerClassName,a=e.children&&e.children.length,s=v?e.fixed!==v&&!a:e.fixed&&I,d=_xeUtils.default.isUndefined(r)||_xeUtils.default.isNull(r)?T:r,u=i||n||M||R,c="ellipsis"===d,f="title"===d,p=!0===d||"tooltip"===d,h=f||p||c,r={},i=e.filters&&e.filters.some(function(e){return e.checked}),n=b.getColumnIndex(e),d=b.getVTColumnIndex(e),m={$table:b,$rowIndex:y,column:e,columnIndex:n,$columnIndex:t,_columnIndex:d,fixed:v,type:cellType,isHidden:s,hasFilter:i};return q&&!h&&(c=h=!0),(U.isCurrent||W||C["header-cell-click"]||"cell"===D.trigger)&&(r.click=function(e){return b.triggerHeaderCellClickEvent(e,m)}),C["header-cell-dblclick"]&&(r.dblclick=function(e){return b.triggerHeaderCellDblclickEvent(e,m)}),H&&(r.mousedown=function(e){return b.triggerHeaderCellMousedownEvent(e,m)}),_("th",{class:["vxe-header--column",e.id,(_defineProperty(d={},"col--".concat(u),u),_defineProperty(d,"col--".concat(l),l),_defineProperty(d,"col--last",t===x.length-1),_defineProperty(d,"col--fixed",e.fixed),_defineProperty(d,"col--group",a),_defineProperty(d,"col--ellipsis",h),_defineProperty(d,"fixed--hidden",s),_defineProperty(d,"is--sortable",e.sortable),_defineProperty(d,"col--filter",!!e.filters),_defineProperty(d,"is--filter-active",i),_defineProperty(d,"col--current",k===e),d),_utils.default.getClass(o,m),_utils.default.getClass(P,m)],attrs:{colid:e.id,colspan:1<e.colSpan?e.colSpan:null,rowspan:1<e.rowSpan?e.rowSpan:null},style:S?_xeUtils.default.isFunction(S)?S(m):S:null,on:r,key:z||U.useKey||a?e.id:t},[_("div",{class:["vxe-cell",{"c--title":f,"c--tooltip":p,"c--ellipsis":c}]},e.renderHeader(_,m)),s||a||!(_xeUtils.default.isBoolean(e.resizable)?e.resizable:U.resizable||w)?null:_("div",{class:["vxe-resizable",{"is--line":!$||"none"===$}],on:{mousedown:function(e){return g.resizeMousedown(e,m)}}})])}).concat(a?[_("th",{class:"vxe-header--gutter col--gutter"})]:[]))}))]),_("div",{class:"vxe-table--header-border-line",ref:"repair"})])},methods:{uploadColumn:function(){var e=this.$parent;this.headerColumn=e.isGroup?(0,_util.convertToRows)(this.tableGroupColumn):[]},resizeMousedown:function(e,t){var l=t.column,r=this.$parent,i=this.$el,n=this.fixedType,o=r.$refs,a=o.tableBody,s=o.leftContainer,d=o.rightContainer,u=o.resizeBar,o=e.target,c=e.clientX,f=t.cell=o.parentNode,p=0,h=a.$el,a=_dom.default.getOffsetPos(o,i),i=o.clientWidth,o=Math.floor(i/2),m=(0,_util2.getColMinWidth)(t)-o,x=a.left-f.clientWidth+i+m,y=a.left+o,_=document.onmousemove,g=document.onmouseup,b="left"===n,v="right"===n,C=0;if(b||v){for(var w=b?"nextElementSibling":"previousElementSibling",$=f[w];$&&!_dom.default.hasClass($,"fixed--hidden");)_dom.default.hasClass($,"col--group")||(C+=$.offsetWidth),$=$[w];v&&d&&(y=d.offsetLeft+C)}o=function(e){e.stopPropagation(),e.preventDefault();var t=e.clientX-c,e=y+t,t=n?0:h.scrollLeft;b?e=Math.min(e,(d?d.offsetLeft:h.clientWidth)-C-m):v?(x=(s?s.clientWidth:0)+C+m,e=Math.min(e,y+f.clientWidth-m)):x=Math.max(h.scrollLeft,x),p=Math.max(e,x),u.style.left="".concat(p-t,"px")};r._isResize=!0,_dom.default.addClass(r.$el,"drag--resize"),u.style.display="block",document.onmousemove=o,document.onmouseup=function(e){document.onmousemove=_,document.onmouseup=g,l.resizeWidth=l.renderWidth+(v?y-p:p-y),u.style.display="none",r._isResize=!1,r._lastResizeTime=Date.now(),r.analyColumnWidth(),r.recalculate(!0).then(function(){r.saveCustomResizable(),r.updateCellAreas(),r.emitEvent("resizable-change",t,e)}),_dom.default.removeClass(r.$el,"drag--resize")},o(e),r.closeMenu()}}};exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_utils=_interopRequireDefault(require("../../tools/utils")),_dom=_interopRequireDefault(require("../../tools/dom")),_util=require("./util"),_util2=require("../../table/src/util");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function ownKeys(t,e){var r,l=Object.keys(t);return Object.getOwnPropertySymbols&&(r=Object.getOwnPropertySymbols(t),e&&(r=r.filter(function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable})),l.push.apply(l,r)),l}function _objectSpread(t){for(var e=1;e<arguments.length;e++){var r=null!=arguments[e]?arguments[e]:{};e%2?ownKeys(Object(r),!0).forEach(function(e){_defineProperty(t,e,r[e])}):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(r)):ownKeys(Object(r)).forEach(function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(r,e))})}return t}function _defineProperty(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}var cellType="header",_default={name:"VxeTableHeader",props:{tableData:Array,tableColumn:Array,tableGroupColumn:Array,fixedColumn:Array,size:String,fixedType:String},data:function(){return{headerColumn:[]}},watch:{tableColumn:function(){this.uploadColumn()}},created:function(){this.uploadColumn()},mounted:function(){var e=this.$parent,t=this.$el,r=this.$refs,l=this.fixedType,e=e.elemStore,l="".concat(l||"main","-header-");e["".concat(l,"wrapper")]=t,e["".concat(l,"table")]=r.table,e["".concat(l,"colgroup")]=r.colgroup,e["".concat(l,"list")]=r.thead,e["".concat(l,"xSpace")]=r.xSpace,e["".concat(l,"repair")]=r.repair},destroyed:function(){var e=this.$parent,t=this.fixedType,e=e.elemStore,t="".concat(t||"main","-header-");e["".concat(t,"wrapper")]=null,e["".concat(t,"table")]=null,e["".concat(t,"colgroup")]=null,e["".concat(t,"list")]=null,e["".concat(t,"xSpace")]=null,e["".concat(t,"repair")]=null},render:function(x){var g=this,e=this._e,_=this.$parent,v=this.fixedType,t=this.headerColumn,r=this.fixedColumn,C=_.$listeners,l=_.tId,n=_.isGroup,w=_.resizable,P=_.border,O=_.columnKey,o=_.headerRowClassName,S=_.headerCellClassName,i=_.headerRowStyle,$=_.headerCellStyle,z=_.showHeaderOverflow,j=_.headerAlign,T=_.align,D=_.highlightCurrentColumn,M=_.currentColumn,W=_.scrollXLoad,k=_.overflowX,a=_.scrollbarWidth,R=_.sortOpts,q=_.mouseConfig,I=_.columnOpts,s=this.tableColumn,t=t;return n||(t=[s=v&&(W||z)?r:s]),x("div",{class:["vxe-table--header-wrapper",v?"fixed-".concat(v,"--wrapper"):"body--wrapper"],attrs:{xid:l}},[v?e():x("div",{class:"vxe-body--x-space",ref:"xSpace"}),x("table",{class:"vxe-table--header",attrs:{xid:l,cellspacing:0,cellpadding:0,border:0},ref:"table"},[x("colgroup",{ref:"colgroup"},s.map(function(e,t){return x("col",{attrs:{name:e.id},key:t})}).concat(a?[x("col",{attrs:{name:"col_gutter"}})]:[])),x("thead",{ref:"thead"},t.map(function(y,b){return x("tr",{class:["vxe-header--row",o?_xeUtils.default.isFunction(o)?o({$table:_,$rowIndex:b,fixed:v,type:cellType}):o:""],style:i?_xeUtils.default.isFunction(i)?i({$table:_,$rowIndex:b,fixed:v,type:cellType}):i:null},y.map(function(e,t){var r=e.type,l=e.showHeaderOverflow,n=e.headerAlign,o=e.align,i=e.headerClassName,a=e.children&&e.children.length,s=v?e.fixed!==v&&!a:e.fixed&&k,c=_xeUtils.default.isUndefined(l)||_xeUtils.default.isNull(l)?z:l,u=n||o||j||T,d="ellipsis"===c,f="title"===c,p=!0===c||"tooltip"===c,h=f||p||d,l={},n=e.filters&&e.filters.some(function(e){return e.checked}),o=_.getColumnIndex(e),c=_.getVTColumnIndex(e),m={$table:_,$rowIndex:b,column:e,columnIndex:o,$columnIndex:t,_columnIndex:c,fixed:v,type:cellType,isHidden:s,hasFilter:n};return W&&!h&&(d=h=!0),(I.isCurrent||D||C["header-cell-click"]||"cell"===R.trigger)&&(l.click=function(e){return _.triggerHeaderCellClickEvent(e,m)}),C["header-cell-dblclick"]&&(l.dblclick=function(e){return _.triggerHeaderCellDblclickEvent(e,m)}),q&&(l.mousedown=function(e){return _.triggerHeaderCellMousedownEvent(e,m)}),x("th",{class:["vxe-header--column",e.id,(_defineProperty(c={},"col--".concat(u),u),_defineProperty(c,"col--".concat(r),r),_defineProperty(c,"col--last",t===y.length-1),_defineProperty(c,"col--fixed",e.fixed),_defineProperty(c,"col--group",a),_defineProperty(c,"col--ellipsis",h),_defineProperty(c,"fixed--hidden",s),_defineProperty(c,"is--sortable",e.sortable),_defineProperty(c,"col--filter",!!e.filters),_defineProperty(c,"is--filter-active",n),_defineProperty(c,"col--current",M===e),c),_utils.default.getClass(i,m),_utils.default.getClass(S,m)],attrs:{colid:e.id,colspan:1<e.colSpan?e.colSpan:null,rowspan:1<e.rowSpan?e.rowSpan:null},style:$?_xeUtils.default.isFunction($)?$(m):$:null,on:l,key:O||I.useKey||a?e.id:t},[x("div",{class:["vxe-cell",{"c--title":f,"c--tooltip":p,"c--ellipsis":d}]},e.renderHeader(x,m)),s||a||!(_xeUtils.default.isBoolean(e.resizable)?e.resizable:I.resizable||w)?null:x("div",{class:["vxe-resizable",{"is--line":!P||"none"===P}],on:{mousedown:function(e){return g.resizeMousedown(e,m)}}})])}).concat(a?[x("th",{class:"vxe-header--gutter col--gutter"})]:[]))}))]),x("div",{class:"vxe-table--header-border-line",ref:"repair"})])},methods:{uploadColumn:function(){var e=this.$parent;this.headerColumn=e.isGroup?(0,_util.convertToRows)(this.tableGroupColumn):[]},resizeMousedown:function(e,r){var l=r.column,n=this.$parent,t=this.$el,o=this.fixedType,i=n.$refs,a=i.tableBody,s=i.leftContainer,c=i.rightContainer,u=i.resizeBar,i=e.target,d=e.clientX,f=r.cell=i.parentNode,p=0,h=a.$el,a=_dom.default.getOffsetPos(i,t),t=i.clientWidth,i=Math.floor(t/2),m=(0,_util2.getColMinWidth)(r)-i,y=a.left-f.clientWidth+t+m,b=a.left+i,x=document.onmousemove,g=document.onmouseup,_="left"===o,v="right"===o,C=0;if(_||v){for(var w=_?"nextElementSibling":"previousElementSibling",P=f[w];P&&!_dom.default.hasClass(P,"fixed--hidden");)_dom.default.hasClass(P,"col--group")||(C+=P.offsetWidth),P=P[w];v&&c&&(b=c.offsetLeft+C)}i=function(e){e.stopPropagation(),e.preventDefault();var t=e.clientX-d,e=b+t,t=o?0:h.scrollLeft;_?e=Math.min(e,(c?c.offsetLeft:h.clientWidth)-C-m):v?(y=(s?s.clientWidth:0)+C+m,e=Math.min(e,b+f.clientWidth-m)):y=Math.max(h.scrollLeft,y),p=Math.max(e,y),u.style.left="".concat(p-t,"px")};n._isResize=!0,_dom.default.addClass(n.$el,"drag--resize"),u.style.display="block",document.onmousemove=i,document.onmouseup=function(e){document.onmousemove=x,document.onmouseup=g;var t=l.renderWidth+(v?b-p:p-b);l.resizeWidth=t,u.style.display="none",n._isResize=!1,n._lastResizeTime=Date.now(),n.analyColumnWidth(),n.recalculate(!0).then(function(){n.saveCustomResizable(),n.updateCellAreas(),n.emitEvent("resizable-change",_objectSpread(_objectSpread({},r),{},{resizeWidth:t}),e)}),_dom.default.removeClass(n.$el,"drag--resize")},i(e),n.closeMenu()}}};exports.default=_default;

package/lib/index.umd.js

@@ -8808,7 +8808,7 @@ var es_array_concat = __webpack_require__("99af");
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.5.9-beta.9", "] ").concat(src_conf.i18n(message, params));
+  return "[vxe-table v".concat("3.5.9-beta.11", "] ").concat(src_conf.i18n(message, params));
 }
 
 function outLog(type) {
@@ -10089,7 +10089,7 @@ function _t(key, args) {
 var v = 'v3';
 var VXETable = {
   v: v,
-  version: "3.5.9-beta.9",
+  version: "3.5.9-beta.11",
   reg: reg,
   use: use,
   setup: setup,
@@ -11906,6 +11906,7 @@ var convertToRows = function convertToRows(originColumns) {
 
 
 
+
 var cellType = 'header';
 /* harmony default export */ var header = ({
   name: 'VxeTableHeader',
@@ -12239,7 +12240,8 @@ var cellType = 'header';
       document.onmouseup = function (evnt) {
         document.onmousemove = domMousemove;
         document.onmouseup = domMouseup;
-        column.resizeWidth = column.renderWidth + (isRightFixed ? dragPosLeft - dragLeft : dragLeft - dragPosLeft);
+        var resizeWidth = column.renderWidth + (isRightFixed ? dragPosLeft - dragLeft : dragLeft - dragPosLeft);
+        column.resizeWidth = resizeWidth;
         resizeBarElem.style.display = 'none';
         $xetable._isResize = false;
         $xetable._lastResizeTime = Date.now();
@@ -12247,7 +12249,9 @@ var cellType = 'header';
         $xetable.recalculate(true).then(function () {
           $xetable.saveCustomResizable();
           $xetable.updateCellAreas();
-          $xetable.emitEvent('resizable-change', params, evnt);
+          $xetable.emitEvent('resizable-change', _objectSpread2(_objectSpread2({}, params), {}, {
+            resizeWidth: resizeWidth
+          }), evnt);
         });
         dom.removeClass($xetable.$el, 'drag--resize');
       };