vxe-table 3.8.26 → 3.8.28

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.calcTreeLine=calcTreeLine,exports.clearTableAllStatus=clearTableAllStatus,exports.clearTableDefaultStatus=clearTableDefaultStatus,exports.colToVisible=colToVisible,exports.convertHeaderColumnToRows=void 0,exports.getColReMinWidth=getColReMinWidth,exports.getColumnConfig=getColumnConfig,exports.getOffsetSize=getOffsetSize,exports.getRootColumn=getRootColumn,exports.getRowid=getRowid,exports.getRowkey=getRowkey,exports.handleFieldOrColumn=handleFieldOrColumn,exports.isColumnInfo=isColumnInfo,exports.mergeBodyMethod=mergeBodyMethod,exports.removeScrollListener=removeScrollListener,exports.restoreScrollListener=restoreScrollListener,exports.restoreScrollLocation=restoreScrollLocation,exports.rowToVisible=rowToVisible,exports.toFilters=toFilters,exports.toTreePathSeq=toTreePathSeq;var _vXETable=_interopRequireDefault(require("../../v-x-e-table")),_xeUtils=_interopRequireDefault(require("xe-utils")),_columnInfo=require("./columnInfo"),_dom=_interopRequireDefault(require("../../tools/dom"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _toConsumableArray(e){return _arrayWithoutHoles(e)||_iterableToArray(e)||_unsupportedIterableToArray(e)||_nonIterableSpread()}function _nonIterableSpread(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _unsupportedIterableToArray(e,r){var t;if(e)return"string"==typeof e?_arrayLikeToArray(e,r):"Map"===(t="Object"===(t=Object.prototype.toString.call(e).slice(8,-1))&&e.constructor?e.constructor.name:t)||"Set"===t?Array.from(e):"Arguments"===t||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t)?_arrayLikeToArray(e,r):void 0}function _iterableToArray(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function _arrayWithoutHoles(e){if(Array.isArray(e))return _arrayLikeToArray(e)}function _arrayLikeToArray(e,r){(null==r||r>e.length)&&(r=e.length);for(var t=0,l=new Array(r);t<r;t++)l[t]=e[t];return l}var getAllConvertColumns=function r(e,t){var l=[];return e.forEach(function(e){e.parentId=t?t.id:null,e.visible&&(e.children&&e.children.length&&e.children.some(function(e){return e.visible})?(l.push(e),l.push.apply(l,_toConsumableArray(r(e.children,e)))):l.push(e))}),l},convertHeaderColumnToRows=exports.convertHeaderColumnToRows=function(e){for(var o=1,r=function r(t,e){var l;e&&(t.level=e.level+1,o<t.level)&&(o=t.level),t.children&&t.children.length&&t.children.some(function(e){return e.visible})?(l=0,t.children.forEach(function(e){e.visible&&(r(e,t),l+=e.colSpan)}),t.colSpan=l):t.colSpan=1},t=(e.forEach(function(e){e.level=1,r(e)}),[]),l=0;l<o;l++)t.push([]);return getAllConvertColumns(e).forEach(function(e){e.children&&e.children.length&&e.children.some(function(e){return e.visible})?e.rowSpan=1:e.rowSpan=o-e.level+1,t[e.level-1].push(e)}),t},lineOffsetSizes={mini:3,small:2,medium:1};function restoreScrollLocation(e,r,t){return e.clearScroll().then(function(){if(r||t)return e.lastScrollLeft=0,e.lastScrollTop=0,e.scrollTo(r,t)})}function toTreePathSeq(e){return e.map(function(e,r){return r%2==0?Number(e)+1:"."}).join("")}function removeScrollListener(e){e&&e._onscroll&&(e.onscroll=null)}function restoreScrollListener(e){e&&e._onscroll&&(e.onscroll=e._onscroll)}function getRowkey(e){return e.rowOpts.keyField||e.rowId||"_X_ROW_KEY"}function getRowid(e,r){r=_xeUtils.default.get(r,getRowkey(e));return _xeUtils.default.eqNull(r)?"":encodeURIComponent(r)}function getPaddingLeftRightSize(e){return e?(e=getComputedStyle(e),_xeUtils.default.toNumber(e.paddingLeft)+_xeUtils.default.toNumber(e.paddingRight)):0}function getElemenMarginWidth(e){var r,t;return e?(t=getComputedStyle(e),r=_xeUtils.default.toNumber(t.marginLeft),t=_xeUtils.default.toNumber(t.marginRight),e.offsetWidth+r+t):0}function handleFieldOrColumn(e,r){return r?_xeUtils.default.isString(r)?e.getColumnByField(r):r:null}function getRootColumn(e,r){var t=e.fullColumnIdData;if(!r)return null;for(var l=r.parentId;t[l];){var o=t[l].column;if(!(l=o.parentId))return o}return r}function queryCellElement(e,r){return e.querySelector(".vxe-cell"+r)}function toFilters(e){return e&&_xeUtils.default.isArray(e)?e.map(function(e){var r=e.label,t=e.value,l=e.data,o=e.resetValue,e=e.checked;return{label:r,value:t,data:l,resetValue:o,checked:!!e,_checked:!!e}}):e}function getColReMinWidth(e){var r=e.$table,t=e.column,l=e.cell,o=r.showHeaderOverflow,n=r.resizableOpts.minWidth;if(n){e=_xeUtils.default.isFunction(n)?n(e):n;if("auto"!==e)return Math.max(1,_xeUtils.default.toNumber(e))}var i,a,u,n=t.showHeaderOverflow,e=t.minWidth,t=_xeUtils.default.isUndefined(n)||_xeUtils.default.isNull(n)?o:n,o="title"===t||(!0===t||"tooltip"===t)||"ellipsis"===t,n=_xeUtils.default.floor(1.6*(_xeUtils.default.toNumber(getComputedStyle(l).fontSize)||14))+(getPaddingLeftRightSize(l)+getPaddingLeftRightSize(queryCellElement(l,"")));if(o&&(t=getPaddingLeftRightSize(queryCellElement(l,"--title>.vxe-cell--checkbox")),o=getElemenMarginWidth(queryCellElement(l,">.vxe-cell--required-icon")),c=getElemenMarginWidth(queryCellElement(l,">.vxe-cell--edit-icon")),i=getElemenMarginWidth(queryCellElement(l,">.vxe-cell-title-prefix-icon")),a=getElemenMarginWidth(queryCellElement(l,">.vxe-cell-title-suffix-icon")),u=getElemenMarginWidth(queryCellElement(l,">.vxe-cell--sort")),n+=t+o+c+i+a+getElemenMarginWidth(queryCellElement(l,">.vxe-cell--filter"))+u),e){var c,t=r.$refs.tableBody,o=t?t.$el:null;if(o){if(_dom.default.isScale(e))return c=(o.clientWidth-1)/100,Math.max(n,Math.floor(_xeUtils.default.toInteger(e)*c));if(_dom.default.isPx(e))return Math.max(n,_xeUtils.default.toInteger(e))}}return n}function countTreeExpand(e,r){var t=1;if(e){var l=r.$table,o=l.treeOpts,n=e[o.children||o.childrenField];if(n&&l.isTreeExpandByRow(e))for(var i=0;i<n.length;i++)t+=countTreeExpand(n[i],r)}return t}function getOffsetSize(e){return lineOffsetSizes[e.vSize]||0}function calcTreeLine(e,r,t){var l=e.$table,o=1;return t&&(o=countTreeExpand(r[t-1],e)),l.rowHeight*o-(t?1:12-getOffsetSize(l))}function mergeBodyMethod(e,r,t){for(var l=0;l<e.length;l++){var o=e[l],n=o.row,i=o.col,a=o.rowspan,o=o.colspan;if(-1<i&&-1<n&&a&&o){if(n===r&&i===t)return{rowspan:a,colspan:o};if(n<=r&&r<n+a&&i<=t&&t<i+o)return{rowspan:0,colspan:0}}}}function clearTableDefaultStatus(e){return e.initStatus=!1,e.clearSort(),e.clearCurrentRow(),e.clearCurrentColumn(),e.clearRadioRow(),e.clearRadioReserve(),e.clearCheckboxRow(),e.clearCheckboxReserve(),e.clearRowExpand(),e.clearTreeExpand(),e.clearTreeExpandReserve(),e.clearEdit&&_vXETable.default._edit&&e.clearEdit(),e.clearSelected&&(e.keyboardConfig||e.mouseConfig)&&e.clearSelected(),e.clearCellAreas&&e.mouseConfig&&(e.clearCellAreas(),e.clearCopyCellArea()),e.clearScroll()}function clearTableAllStatus(e){return e.clearFilter&&_vXETable.default._filter&&e.clearFilter(),clearTableDefaultStatus(e)}function isColumnInfo(e){return e instanceof _columnInfo.ColumnInfo}function getColumnConfig(e,r,t){return isColumnInfo(r)?r:new _columnInfo.ColumnInfo(e,r,t)}function rowToVisible(e,r){var t=e.$refs.tableBody,t=t?t.$el:null;if(t){var l=t.querySelector('[rowid="'.concat(getRowid(e,r),'"]'));if(l){var o=t.clientHeight,t=t.scrollTop,n=l.offsetTop+(l.offsetParent?l.offsetParent.offsetTop:0),l=l.clientHeight;if(n<t||t+o<n)return e.scrollTo(null,n);if(o+t<=n+l)return e.scrollTo(null,t+l)}else if(e.scrollYLoad)return e.scrollTo(null,(e.afterFullData.indexOf(r)-1)*e.scrollYStore.rowHeight)}return Promise.resolve()}function colToVisible(e,r){var t=e.$refs.tableBody,t=t?t.$el:null;if(t){var l=t.querySelector(".".concat(r.id));if(l){var o=t.clientWidth,t=t.scrollLeft,n=l.offsetLeft+(l.offsetParent?l.offsetParent.offsetLeft:0),l=l.clientWidth;if(n<t||t+o<n)return e.scrollTo(n);if(o+t<=n+l)return e.scrollTo(t+l)}else if(e.scrollXLoad){for(var i=e.visibleColumn,a=0,u=0;u<i.length&&i[u]!==r;u++)a+=i[u].renderWidth;return e.scrollTo(a)}}return Promise.resolve()}
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.calcTreeLine=calcTreeLine,exports.clearTableAllStatus=clearTableAllStatus,exports.clearTableDefaultStatus=clearTableDefaultStatus,exports.colToVisible=colToVisible,exports.convertHeaderColumnToRows=void 0,exports.getColReMinWidth=getColReMinWidth,exports.getColumnConfig=getColumnConfig,exports.getOffsetSize=getOffsetSize,exports.getRootColumn=getRootColumn,exports.getRowid=getRowid,exports.getRowkey=getRowkey,exports.handleFieldOrColumn=handleFieldOrColumn,exports.isColumnInfo=isColumnInfo,exports.mergeBodyMethod=mergeBodyMethod,exports.removeScrollListener=removeScrollListener,exports.restoreScrollListener=restoreScrollListener,exports.restoreScrollLocation=restoreScrollLocation,exports.rowToVisible=rowToVisible,exports.toFilters=toFilters,exports.toTreePathSeq=toTreePathSeq;var _vXETable=_interopRequireDefault(require("../../v-x-e-table")),_xeUtils=_interopRequireDefault(require("xe-utils")),_columnInfo=require("./columnInfo"),_dom=_interopRequireDefault(require("../../tools/dom"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _toConsumableArray(e){return _arrayWithoutHoles(e)||_iterableToArray(e)||_unsupportedIterableToArray(e)||_nonIterableSpread()}function _nonIterableSpread(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _unsupportedIterableToArray(e,r){var t;if(e)return"string"==typeof e?_arrayLikeToArray(e,r):"Map"===(t="Object"===(t=Object.prototype.toString.call(e).slice(8,-1))&&e.constructor?e.constructor.name:t)||"Set"===t?Array.from(e):"Arguments"===t||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t)?_arrayLikeToArray(e,r):void 0}function _iterableToArray(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function _arrayWithoutHoles(e){if(Array.isArray(e))return _arrayLikeToArray(e)}function _arrayLikeToArray(e,r){(null==r||r>e.length)&&(r=e.length);for(var t=0,l=new Array(r);t<r;t++)l[t]=e[t];return l}var getAllConvertColumns=function r(e,t){var l=[];return e.forEach(function(e){e.parentId=t?t.id:null,e.visible&&(e.children&&e.children.length&&e.children.some(function(e){return e.visible})?(l.push(e),l.push.apply(l,_toConsumableArray(r(e.children,e)))):l.push(e))}),l},convertHeaderColumnToRows=exports.convertHeaderColumnToRows=function(e){for(var o=1,r=function r(t,e){var l;e&&(t.level=e.level+1,o<t.level)&&(o=t.level),t.children&&t.children.length&&t.children.some(function(e){return e.visible})?(l=0,t.children.forEach(function(e){e.visible&&(r(e,t),l+=e.colSpan)}),t.colSpan=l):t.colSpan=1},t=(e.forEach(function(e){e.level=1,r(e)}),[]),l=0;l<o;l++)t.push([]);return getAllConvertColumns(e).forEach(function(e){e.children&&e.children.length&&e.children.some(function(e){return e.visible})?e.rowSpan=1:e.rowSpan=o-e.level+1,t[e.level-1].push(e)}),t},lineOffsetSizes={mini:3,small:2,medium:1};function restoreScrollLocation(e,r,t){return e.clearScroll().then(function(){if(r||t)return e.lastScrollLeft=0,e.lastScrollTop=0,e.scrollTo(r,t)})}function toTreePathSeq(e){return e.map(function(e,r){return r%2==0?Number(e)+1:"."}).join("")}function removeScrollListener(e){e&&e._onscroll&&(e.onscroll=null)}function restoreScrollListener(e){e&&e._onscroll&&(e.onscroll=e._onscroll)}function getRowkey(e){return e.rowOpts.keyField||e.rowId||"_X_ROW_KEY"}function getRowid(e,r){r=_xeUtils.default.get(r,getRowkey(e));return _xeUtils.default.eqNull(r)?"":encodeURIComponent(r)}function getPaddingLeftRightSize(e){return e?(e=getComputedStyle(e),_xeUtils.default.toNumber(e.paddingLeft)+_xeUtils.default.toNumber(e.paddingRight)):0}function getElemenMarginWidth(e){var r,t;return e?(t=getComputedStyle(e),r=_xeUtils.default.toNumber(t.marginLeft),t=_xeUtils.default.toNumber(t.marginRight),e.offsetWidth+r+t):0}function handleFieldOrColumn(e,r){return r?_xeUtils.default.isString(r)?e.getColumnByField(r):r:null}function getRootColumn(e,r){var t=e.fullColumnIdData;if(!r)return null;for(var l=r.parentId;t[l];){var o=t[l].column;if(!(l=o.parentId))return o}return r}function queryCellElement(e,r){return e.querySelector(".vxe-cell"+r)}function toFilters(e){return e&&_xeUtils.default.isArray(e)?e.map(function(e){var r=e.label,t=e.value,l=e.data,o=e.resetValue,e=e.checked;return{label:r,value:t,data:l,resetValue:o,checked:!!e,_checked:!!e}}):e}function getColReMinWidth(e){var r=e.$table,t=e.column,l=e.cell,o=r.showHeaderOverflow,n=r.resizableOpts.minWidth;if(n){e=_xeUtils.default.isFunction(n)?n(e):n;if("auto"!==e)return Math.max(1,_xeUtils.default.toNumber(e))}var i,a,u,n=t.showHeaderOverflow,e=t.minWidth,t=_xeUtils.default.isUndefined(n)||_xeUtils.default.isNull(n)?o:n,o="title"===t||(!0===t||"tooltip"===t)||"ellipsis"===t,n=_xeUtils.default.floor(1.6*(_xeUtils.default.toNumber(getComputedStyle(l).fontSize)||14))+(getPaddingLeftRightSize(l)+getPaddingLeftRightSize(queryCellElement(l,"")));if(o&&(t=getPaddingLeftRightSize(queryCellElement(l,"--title>.vxe-cell--checkbox")),o=getElemenMarginWidth(queryCellElement(l,">.vxe-cell--required-icon")),c=getElemenMarginWidth(queryCellElement(l,">.vxe-cell--edit-icon")),i=getElemenMarginWidth(queryCellElement(l,">.vxe-cell-title-prefix-icon")),a=getElemenMarginWidth(queryCellElement(l,">.vxe-cell-title-suffix-icon")),u=getElemenMarginWidth(queryCellElement(l,">.vxe-cell--sort")),n+=t+o+c+i+a+getElemenMarginWidth(queryCellElement(l,">.vxe-cell--filter"))+u),e){var c,t=r.$refs.tableBody,o=t?t.$el:null;if(o){if(_dom.default.isScale(e))return c=(o.clientWidth-1)/100,Math.max(n,Math.floor(_xeUtils.default.toInteger(e)*c));if(_dom.default.isPx(e))return Math.max(n,_xeUtils.default.toInteger(e))}}return n}function countTreeExpand(e,r){var t=1;if(e){var l=r.$table,o=l.treeOpts,n=e[o.children||o.childrenField];if(n&&l.isTreeExpandByRow(e))for(var i=0;i<n.length;i++)t+=countTreeExpand(n[i],r)}return t}function getOffsetSize(e){return lineOffsetSizes[e.vSize]||0}function calcTreeLine(e,r,t){var l=e.$table,o=1;return t&&(o=countTreeExpand(r[t-1],e)),l.rowHeight*o-(t?1:12-getOffsetSize(l))}function mergeBodyMethod(e,r,t){for(var l=0;l<e.length;l++){var o=e[l],n=o.row,i=o.col,a=o.rowspan,o=o.colspan;if(-1<i&&-1<n&&a&&o){if(n===r&&i===t)return{rowspan:a,colspan:o};if(n<=r&&r<n+a&&i<=t&&t<i+o)return{rowspan:0,colspan:0}}}}function clearTableDefaultStatus(e){return e.initStatus=!1,e.clearSort(),e.clearCurrentRow(),e.clearCurrentColumn(),e.clearRadioRow(),e.clearRadioReserve(),e.clearCheckboxRow(),e.clearCheckboxReserve(),e.clearRowExpand(),e.clearTreeExpand(),e.clearTreeExpandReserve(),e.clearEdit&&_vXETable.default._edit&&e.clearEdit(),e.clearSelected&&(e.keyboardConfig||e.mouseConfig)&&e.clearSelected(),e.clearCellAreas&&e.mouseConfig&&(e.clearCellAreas(),e.clearCopyCellArea()),e.clearScroll()}function clearTableAllStatus(e){return e.clearFilter&&_vXETable.default._filter&&e.clearFilter(),clearTableDefaultStatus(e)}function isColumnInfo(e){return e instanceof _columnInfo.ColumnInfo}function getColumnConfig(e,r,t){return isColumnInfo(r)?r:new _columnInfo.ColumnInfo(e,r,t)}function rowToVisible(e,r){var t=e.$refs.tableBody,t=t?t.$el:null;if(t){var l=t.querySelector('[rowid="'.concat(getRowid(e,r),'"]'));if(l){var o=t.clientHeight,t=t.scrollTop,n=l.offsetTop+(l.offsetParent?l.offsetParent.offsetTop:0),l=l.clientHeight;if(n<t||t+o<n)return e.scrollTo(null,n);if(o+t<=n+l)return e.scrollTo(null,t+l)}else if(e.scrollYLoad)return e.scrollTo(null,(e.afterFullData.indexOf(r)-1)*e.scrollYStore.rowHeight)}return Promise.resolve()}function colToVisible(e,r){var t=e.$refs.tableBody,t=t?t.$el:null;if((!r||!r.fixed)&&t){var l=t.querySelector(".".concat(r.id));if(l){var o=t.clientWidth,t=t.scrollLeft,n=l.offsetLeft+(l.offsetParent?l.offsetParent.offsetLeft:0),l=l.clientWidth;if(n<t||t+o<n)return e.scrollTo(n);if(o+t<=n+l)return e.scrollTo(t+l)}else if(e.scrollXLoad){for(var i=e.visibleColumn,a=0,u=0;u<i.length&&i[u]!==r;u++)a+=i[u].renderWidth;return e.scrollTo(a)}}return Promise.resolve()}

package/lib/tools/log.js

@@ -9,7 +9,7 @@ exports.warnLog = void 0;
 var _conf = _interopRequireDefault(require("../v-x-e-table/src/conf"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.8.26", "] ", _conf.default.i18n(message, params));
+  return "[vxe-table v".concat("3.8.28", "] ", _conf.default.i18n(message, params));
 }
 function outLog(type) {
   return function (message, params) {

package/lib/tools/log.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.errLog=void 0,exports.getLog=getLog,exports.warnLog=void 0;var _conf=_interopRequireDefault(require("../v-x-e-table/src/conf"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function getLog(e,o){return"[vxe-table v".concat("3.8.26","] ",_conf.default.i18n(e,o))}function outLog(r){return function(e,o){e=getLog(e,o);return console[r](e),e}}var warnLog=exports.warnLog=outLog("warn"),errLog=exports.errLog=outLog("error");
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.errLog=void 0,exports.getLog=getLog,exports.warnLog=void 0;var _conf=_interopRequireDefault(require("../v-x-e-table/src/conf"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function getLog(e,o){return"[vxe-table v".concat("3.8.28","] ",_conf.default.i18n(e,o))}function outLog(r){return function(e,o){e=getLog(e,o);return console[r](e),e}}var warnLog=exports.warnLog=outLog("warn"),errLog=exports.errLog=outLog("error");

package/lib/v-x-e-table/index.js

@@ -262,7 +262,7 @@ function component(comp) {
     components[comp.name] = comp;
   }
 }
-var version = exports.version = "3.8.26";
+var version = exports.version = "3.8.28";
 var tableVersion = exports.tableVersion = version;
 var VxeUI = exports.VxeUI = {
   v: v,

package/lib/v-x-e-table/index.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={use:!0,setConfig:!0,getConfig:!0,globalConfs:!0,t:!0,_t:!0,v:!0,setup:!0,config:!0,setIcon:!0,globalStore:!0,getComponent:!0,component:!0,version:!0,tableVersion:!0,VxeUI:!0,VXETable:!0},_xeUtils=(exports.VxeUI=exports.VXETable=void 0,exports._t=_t,exports.component=component,exports.default=exports.config=void 0,exports.getComponent=getComponent,exports.getConfig=getConfig,exports.setConfig=exports.globalStore=exports.globalConfs=void 0,exports.setIcon=setIcon,exports.setup=void 0,exports.t=t,exports.tableVersion=void 0,exports.use=use,exports.version=exports.v=void 0,_interopRequireDefault(require("xe-utils"))),_domZindex=_interopRequireDefault(require("dom-zindex")),_conf=_interopRequireDefault(require("../v-x-e-table/src/conf")),_interceptor=require("./src/interceptor"),_renderer=(Object.keys(_interceptor).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_interceptor[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _interceptor[e]}})}),require("./src/renderer")),_commands=(Object.keys(_renderer).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_renderer[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _renderer[e]}})}),require("./src/commands")),_menus=(Object.keys(_commands).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_commands[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _commands[e]}})}),require("./src/menus")),_formats=(Object.keys(_menus).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_menus[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _menus[e]}})}),require("./src/formats")),_validators=(Object.keys(_formats).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_formats[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _formats[e]}})}),require("./src/validators")),_theme=require("./src/theme"),_utils=(Object.keys(_theme).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_theme[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _theme[e]}})}),require("../tools/utils")),_log=require("../tools/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function _classCallCheck(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function _defineProperties(e,t){for(var o=0;o<t.length;o++){var r=t[o];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,_toPropertyKey(r.key),r)}}function _createClass(e,t,o){return t&&_defineProperties(e.prototype,t),o&&_defineProperties(e,o),Object.defineProperty(e,"prototype",{writable:!1}),e}function _toPropertyKey(e){e=_toPrimitive(e,"string");return"symbol"==_typeof(e)?e:e+""}function _toPrimitive(e,t){if("object"!=_typeof(e)||!e)return e;var o=e[Symbol.toPrimitive];if(void 0===o)return("string"===t?String:Number)(e);o=o.call(e,t||"default");if("object"!=_typeof(o))return o;throw new TypeError("@@toPrimitive must return a primitive value.")}var installedPlugins=[];function use(e,t){return e&&e.install&&-1===installedPlugins.indexOf(e)&&(e.install(VxeUI,t),installedPlugins.push(e)),VxeUI}function reg(e){"development"===process.env.NODE_ENV&&VxeUI.Table&&(0,_log.errLog)("vxe.error.useErr",[e]),VxeUI["_".concat(e)]=1}var setConfig=exports.setConfig=function(e){return e&&(e.theme&&(0,_theme.setTheme)(e.theme),e.zIndex&&_domZindex.default.setCurrent(e.zIndex),_xeUtils.default.merge(_conf.default,e)),VxeUI};function getConfig(e,t){return arguments.length?_xeUtils.default.get(_conf.default,e,t):_conf.default}var VXETableConfig=function(){return _createClass(function e(){_classCallCheck(this,e)},[{key:"zIndex",get:function(){return _utils.UtilTools.getLastZIndex()}},{key:"nextZIndex",get:function(){return _utils.UtilTools.nextZIndex()}},{key:"exportTypes",get:function(){return _xeUtils.default.keys(_conf.default.table.exportConfig._typeMaps)}},{key:"importTypes",get:function(){return _xeUtils.default.keys(_conf.default.table.importConfig._typeMaps)}}])}(),globalConfs=exports.globalConfs=new VXETableConfig;function t(e,t){return _conf.default.i18n(e,t)}function _t(e,t){return e?_xeUtils.default.toValueString(_conf.default.translate?_conf.default.translate(e,t):e):""}var v=exports.v="v3",setup=exports.setup=function(e){return"development"===process.env.NODE_ENV&&(0,_log.warnLog)("vxe.error.delFunc",["setup","setConfig"]),setConfig(e)},config=exports.config=function(e){return"development"===process.env.NODE_ENV&&(0,_log.warnLog)("vxe.error.delFunc",["setup","setConfig"]),setConfig(e)};function setIcon(e){return e&&Object.assign(_conf.default.icon,e),VxeUI}var globalStore=exports.globalStore={},components={};function getComponent(e){return components[e]||null}function component(e){e&&e.name&&(components[e.name]=e)}var version=exports.version="3.8.26",tableVersion=exports.tableVersion=version,VxeUI=exports.VxeUI={v:v,version:version,tableVersion:tableVersion,reg:reg,use:use,setConfig:setConfig,getConfig:getConfig,setIcon:setIcon,globalStore:globalStore,interceptor:_interceptor.interceptor,renderer:_renderer.renderer,commands:_commands.commands,formats:_formats.formats,menus:_menus.menus,validators:_validators.validators,t:t,_t:_t,setTheme:_theme.setTheme,getTheme:_theme.getTheme,getComponent:getComponent,component:component,config:config,setup:setup,globalConfs:globalConfs},VXETable=exports.VXETable=VxeUI,_default=((0,_theme.setTheme)("light"),exports.default=VxeUI);
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={use:!0,setConfig:!0,getConfig:!0,globalConfs:!0,t:!0,_t:!0,v:!0,setup:!0,config:!0,setIcon:!0,globalStore:!0,getComponent:!0,component:!0,version:!0,tableVersion:!0,VxeUI:!0,VXETable:!0},_xeUtils=(exports.VxeUI=exports.VXETable=void 0,exports._t=_t,exports.component=component,exports.default=exports.config=void 0,exports.getComponent=getComponent,exports.getConfig=getConfig,exports.setConfig=exports.globalStore=exports.globalConfs=void 0,exports.setIcon=setIcon,exports.setup=void 0,exports.t=t,exports.tableVersion=void 0,exports.use=use,exports.version=exports.v=void 0,_interopRequireDefault(require("xe-utils"))),_domZindex=_interopRequireDefault(require("dom-zindex")),_conf=_interopRequireDefault(require("../v-x-e-table/src/conf")),_interceptor=require("./src/interceptor"),_renderer=(Object.keys(_interceptor).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_interceptor[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _interceptor[e]}})}),require("./src/renderer")),_commands=(Object.keys(_renderer).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_renderer[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _renderer[e]}})}),require("./src/commands")),_menus=(Object.keys(_commands).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_commands[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _commands[e]}})}),require("./src/menus")),_formats=(Object.keys(_menus).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_menus[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _menus[e]}})}),require("./src/formats")),_validators=(Object.keys(_formats).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_formats[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _formats[e]}})}),require("./src/validators")),_theme=require("./src/theme"),_utils=(Object.keys(_theme).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_theme[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _theme[e]}})}),require("../tools/utils")),_log=require("../tools/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function _classCallCheck(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function _defineProperties(e,t){for(var o=0;o<t.length;o++){var r=t[o];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,_toPropertyKey(r.key),r)}}function _createClass(e,t,o){return t&&_defineProperties(e.prototype,t),o&&_defineProperties(e,o),Object.defineProperty(e,"prototype",{writable:!1}),e}function _toPropertyKey(e){e=_toPrimitive(e,"string");return"symbol"==_typeof(e)?e:e+""}function _toPrimitive(e,t){if("object"!=_typeof(e)||!e)return e;var o=e[Symbol.toPrimitive];if(void 0===o)return("string"===t?String:Number)(e);o=o.call(e,t||"default");if("object"!=_typeof(o))return o;throw new TypeError("@@toPrimitive must return a primitive value.")}var installedPlugins=[];function use(e,t){return e&&e.install&&-1===installedPlugins.indexOf(e)&&(e.install(VxeUI,t),installedPlugins.push(e)),VxeUI}function reg(e){"development"===process.env.NODE_ENV&&VxeUI.Table&&(0,_log.errLog)("vxe.error.useErr",[e]),VxeUI["_".concat(e)]=1}var setConfig=exports.setConfig=function(e){return e&&(e.theme&&(0,_theme.setTheme)(e.theme),e.zIndex&&_domZindex.default.setCurrent(e.zIndex),_xeUtils.default.merge(_conf.default,e)),VxeUI};function getConfig(e,t){return arguments.length?_xeUtils.default.get(_conf.default,e,t):_conf.default}var VXETableConfig=function(){return _createClass(function e(){_classCallCheck(this,e)},[{key:"zIndex",get:function(){return _utils.UtilTools.getLastZIndex()}},{key:"nextZIndex",get:function(){return _utils.UtilTools.nextZIndex()}},{key:"exportTypes",get:function(){return _xeUtils.default.keys(_conf.default.table.exportConfig._typeMaps)}},{key:"importTypes",get:function(){return _xeUtils.default.keys(_conf.default.table.importConfig._typeMaps)}}])}(),globalConfs=exports.globalConfs=new VXETableConfig;function t(e,t){return _conf.default.i18n(e,t)}function _t(e,t){return e?_xeUtils.default.toValueString(_conf.default.translate?_conf.default.translate(e,t):e):""}var v=exports.v="v3",setup=exports.setup=function(e){return"development"===process.env.NODE_ENV&&(0,_log.warnLog)("vxe.error.delFunc",["setup","setConfig"]),setConfig(e)},config=exports.config=function(e){return"development"===process.env.NODE_ENV&&(0,_log.warnLog)("vxe.error.delFunc",["setup","setConfig"]),setConfig(e)};function setIcon(e){return e&&Object.assign(_conf.default.icon,e),VxeUI}var globalStore=exports.globalStore={},components={};function getComponent(e){return components[e]||null}function component(e){e&&e.name&&(components[e.name]=e)}var version=exports.version="3.8.28",tableVersion=exports.tableVersion=version,VxeUI=exports.VxeUI={v:v,version:version,tableVersion:tableVersion,reg:reg,use:use,setConfig:setConfig,getConfig:getConfig,setIcon:setIcon,globalStore:globalStore,interceptor:_interceptor.interceptor,renderer:_renderer.renderer,commands:_commands.commands,formats:_formats.formats,menus:_menus.menus,validators:_validators.validators,t:t,_t:_t,setTheme:_theme.setTheme,getTheme:_theme.getTheme,getComponent:getComponent,component:component,config:config,setup:setup,globalConfs:globalConfs},VXETable=exports.VXETable=VxeUI,_default=((0,_theme.setTheme)("light"),exports.default=VxeUI);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "3.8.26",
+  "version": "3.8.28",
   "description": "一个基于 vue 的 PC 端表单/表格组件，支持增删改查、虚拟树、列拖拽，懒加载、快捷菜单、数据校验、树形结构、打印导出、自定义模板、渲染器、JSON 配置式...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
@@ -27,7 +27,7 @@
   "typings": "types/index.d.ts",
   "dependencies": {
     "dom-zindex": "^1.0.6",
-    "xe-utils": "^3.5.31"
+    "xe-utils": "^3.5.32"
   },
   "devDependencies": {
     "@types/resize-observer-browser": "^0.1.11",

package/packages/edit/src/mixin.js

@@ -638,7 +638,12 @@ export default {
         if (XEUtils.isFunction(autoFocus)) {
           inputElem = autoFocus.call(this, params)
         } else if (autoFocus) {
-          inputElem = cell.querySelector(autoFocus)
+          if (autoFocus === true) {
+            // 自动匹配模式，会自动匹配第一个可输入元素
+            inputElem = cell.querySelector('input,textarea')
+          } else {
+            inputElem = cell.querySelector(autoFocus)
+          }
           if (inputElem) {
             inputElem.focus()
           }

package/packages/table/src/methods.js

@@ -430,14 +430,14 @@ const Methods = {
     if (keepSource) {
       this.cacheSourceMap(fullData)
     }
-    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-      if (sYLoad) {
-        if (!(this.height || this.maxHeight)) {
-          errLog('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}'])
-        }
-        if (!this.showOverflow) {
-          warnLog('vxe.error.reqProp', ['table.show-overflow'])
-        }
+    if (sYLoad) {
+      if (!(this.height || this.maxHeight)) {
+        errLog('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}'])
+      }
+      if (!this.showOverflow) {
+        errLog('vxe.error.reqProp', ['table.show-overflow'])
+      }
+      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
         if (this.spanMethod) {
           warnLog('vxe.error.scrollErrProp', ['table.span-method'])
         }
@@ -1657,7 +1657,7 @@ const Methods = {
    * 如果为 true 则重置所有状态
    * 如果已关联工具栏，则会同步更新
    */
-  resetColumn (options) {
+  resetCustom (options) {
     const { collectColumn, customOpts } = this
     const { checkMethod } = customOpts
     const opts = Object.assign({
@@ -1684,6 +1684,10 @@ const Methods = {
     this.saveCustomStore('reset')
     return this.handleCustom()
   },
+  resetColumn (options) {
+    warnLog('vxe.error.delFunc', ['resetColumn', 'resetCustom'])
+    return this.resetCustom(options)
+  },
   handleCustom () {
     const { mouseConfig } = this
     if (mouseConfig) {
@@ -4736,7 +4740,7 @@ const Methods = {
     const hasChildField = treeOpts.hasChild || treeOpts.hasChildField
     const rowid = getRowid(this, row)
     if (lazy && row[hasChildField] && !treeExpandLazyLoadedMaps[rowid]) {
-      this.clearTreeExpandLoaded(row).then(() => {
+      return this.clearTreeExpandLoaded(row).then(() => {
         return this.handleAsyncTreeExpandChilds(row)
       }).then(() => {
         if (transform) {

package/packages/table/src/util.js

@@ -330,6 +330,9 @@ export function rowToVisible ($xetable, row) {
 export function colToVisible ($xetable, column) {
   const { tableBody } = $xetable.$refs
   const bodyElem = tableBody ? tableBody.$el : null
+  if (column && column.fixed) {
+    return Promise.resolve()
+  }
   if (bodyElem) {
     const tdElem = bodyElem.querySelector(`.${column.id}`)
     if (tdElem) {

package/styles/variable.scss

@@ -1,3 +1,8 @@
+// 兼容
+$vxe-ui-font-color: #606266 !default;
+$vxe-ui-font-primary-color: #409eff !default;
+// 兼容
+
 /*font*/
 $vxe-font-family: -apple-system,BlinkMacSystemFont,Segoe UI,PingFang SC,Hiragino Sans GB,Microsoft YaHei,Helvetica Neue,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol !default;
 $vxe-font-size: 14px !default;
@@ -13,8 +18,8 @@ $vxe-icon-font-family: Verdana,Arial,Tahoma !default;
 $vxe-icon-background-color: #fff !default;
 
 /*color*/
-$vxe-font-color: #606266 !default;
-$vxe-primary-color: #409eff !default;
+$vxe-font-color: $vxe-ui-font-color !default;
+$vxe-primary-color: $vxe-ui-font-primary-color !default;
 $vxe-success-color: #67c23a !default;
 $vxe-info-color: #909399 !default;
 $vxe-warning-color: #e6a23c !default;

package/types/table.d.ts

@@ -495,9 +495,8 @@ export declare class VxeTable extends VXETableComponent {
   setColumnWidth(column: ColumnInfo | string, width: number | string): Promise<any>;
   getColumnWidth(column: ColumnInfo | string): number;
   /**
-   * 手动重置列的显示隐藏、列宽拖动的状态；如果为 true 则重置所有状态
-   * 如果已关联工具栏，则会同步更新
-   * @param options 可选参数
+   * 已废弃，被 resetCustom 替换
+   * @deprecated
    */
   resetColumn(options: boolean | {
     visible?: boolean
@@ -506,6 +505,18 @@ export declare class VxeTable extends VXETableComponent {
     order?: boolean
    }): Promise<any>;
 
+  /**
+    * 手动重置列的显示隐藏、列宽拖动的状态；如果为 true 则重置所有状态
+    * 如果已关联工具栏，则会同步更新
+    * @param options 可选参数
+    */
+  resetCustom(options: boolean | {
+    visible?: boolean
+    resizable?: boolean
+    fixed?: boolean
+    order?: boolean
+   }): Promise<any>;
+
   /**
    * 刷新列配置
    * 对于动态修改属性、显示/隐藏列等场景下可能会用到