vxe-table 4.6.22 → 4.6.25

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.assemColumn=assemColumn,exports.clearTableAllStatus=clearTableAllStatus,exports.clearTableDefaultStatus=clearTableDefaultStatus,exports.colToVisible=colToVisible,exports.convertHeaderColumnToRows=void 0,exports.createColumn=createColumn,exports.destroyColumn=destroyColumn,exports.getCellValue=getCellValue,exports.getColReMaxWidth=getColReMaxWidth,exports.getColReMinWidth=getColReMinWidth,exports.getRootColumn=getRootColumn,exports.getRowUniqueId=getRowUniqueId,exports.getRowid=getRowid,exports.getRowkey=getRowkey,exports.handleFieldOrColumn=void 0,exports.isColumnInfo=isColumnInfo,exports.mergeBodyMethod=mergeBodyMethod,exports.removeScrollListener=removeScrollListener,exports.restoreScrollListener=restoreScrollListener,exports.restoreScrollLocation=restoreScrollLocation,exports.rowToVisible=rowToVisible,exports.setCellValue=setCellValue,exports.toFilters=toFilters,exports.toTreePathSeq=toTreePathSeq,exports.watchColumn=watchColumn;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_columnInfo=require("./columnInfo"),_dom=require("../../tools/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}const getAllConvertColumns=(e,l)=>{const t=[];return e.forEach(e=>{e.parentId=l?l.id:null,e.visible&&(e.children&&e.children.length&&e.children.some(e=>e.visible)?(t.push(e),t.push(...getAllConvertColumns(e.children,e))):t.push(e))}),t},convertHeaderColumnToRows=e=>{let l=1;const r=(t,e)=>{if(e&&(t.level=e.level+1,l<t.level)&&(l=t.level),t.children&&t.children.length&&t.children.some(e=>e.visible)){let l=0;t.children.forEach(e=>{e.visible&&(r(e,t),l+=e.colSpan)}),t.colSpan=l}else t.colSpan=1},t=(e.forEach(e=>{e.level=1,r(e)}),[]);for(let e=0;e<l;e++)t.push([]);return getAllConvertColumns(e).forEach(e=>{e.children&&e.children.length&&e.children.some(e=>e.visible)?e.rowSpan=1:e.rowSpan=l-e.level+1,t[e.level-1].push(e)}),t};function restoreScrollLocation(e,l,t){const r=e["internalData"];return e.clearScroll().then(()=>{if(l||t)return r.lastScrollLeft=0,r.lastScrollTop=0,e.scrollTo(l,t)})}function removeScrollListener(e){e&&e._onscroll&&(e.onscroll=null)}function restoreScrollListener(e){e&&e._onscroll&&(e.onscroll=e._onscroll)}function getRowUniqueId(){return _xeUtils.default.uniqueId("row_")}function getRowkey(e){var l=e["props"],e=e.getComputeMaps()["computeRowOpts"],l=l["rowId"],e=e.value;return l||e.keyField||"_X_ROW_KEY"}function getRowid(e,l){l=_xeUtils.default.get(l,getRowkey(e));return _xeUtils.default.eqNull(l)?"":encodeURIComponent(l)}exports.convertHeaderColumnToRows=convertHeaderColumnToRows;const handleFieldOrColumn=(e,l)=>l?_xeUtils.default.isString(l)?e.getColumnByField(l):l:null;function getPaddingLeftRightSize(e){return e?(e=getComputedStyle(e),_xeUtils.default.toNumber(e.paddingLeft)+_xeUtils.default.toNumber(e.paddingRight)):0}function getElemenMarginWidth(e){var l,t;return e?(t=getComputedStyle(e),l=_xeUtils.default.toNumber(t.marginLeft),t=_xeUtils.default.toNumber(t.marginRight),e.offsetWidth+l+t):0}function queryCellElement(e,l){return e.querySelector(".vxe-cell"+l)}function toFilters(e){return e&&_xeUtils.default.isArray(e)?e.map(({label:e,value:l,data:t,resetValue:r,checked:o})=>({label:e,value:l,data:t,resetValue:r,checked:!!o,_checked:!!o})):e}function toTreePathSeq(e){return e.map((e,l)=>l%2==0?Number(e)+1:".").join("")}function getCellValue(e,l){return _xeUtils.default.get(e,l.field)}function setCellValue(e,l,t){return _xeUtils.default.set(e,l.field,t)}function getColReMaxWidth(e){var l=e["$table"],l=l.getComputeMaps()["computeResizableOpts"],l=l.value["maxWidth"];if(l){e=_xeUtils.default.isFunction(l)?l(e):l;if("auto"!==e)return Math.max(1,_xeUtils.default.toNumber(e))}return-1}function getColReMinWidth(e){var{$table:l,column:t,cell:r}=e,o=l["props"],n=l.getComputeMaps()["computeResizableOpts"],n=n.value["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,n=o["showHeaderOverflow"],{showHeaderOverflow:e,minWidth:o}=t,t=_xeUtils.default.isUndefined(e)||_xeUtils.default.isNull(e)?n:e,n="title"===t||(!0===t||"tooltip"===t)||"ellipsis"===t;let u=_xeUtils.default.floor(1.6*(_xeUtils.default.toNumber(getComputedStyle(r).fontSize)||14))+(getPaddingLeftRightSize(r)+getPaddingLeftRightSize(queryCellElement(r,"")));if(n&&(e=getPaddingLeftRightSize(queryCellElement(r,"--title>.vxe-cell--checkbox")),t=getElemenMarginWidth(queryCellElement(r,">.vxe-cell--required-icon")),n=getElemenMarginWidth(queryCellElement(r,">.vxe-cell--edit-icon")),s=getElemenMarginWidth(queryCellElement(r,">.vxe-cell-title-prefix-icon")),i=getElemenMarginWidth(queryCellElement(r,">.vxe-cell-title-suffix-icon")),a=getElemenMarginWidth(queryCellElement(r,">.vxe-cell--sort")),r=getElemenMarginWidth(queryCellElement(r,">.vxe-cell--filter")),u+=e+t+n+s+i+r+a),o){var s,e=l.getRefMaps()["refTableBody"],t=e.value,n=t?t.$el:null;if(n){if((0,_dom.isScale)(o))return s=(n.clientWidth-1)/100,Math.max(u,Math.floor(_xeUtils.default.toInteger(o)*s));if((0,_dom.isPx)(o))return Math.max(u,_xeUtils.default.toInteger(o))}}return u}function isColumnInfo(e){return e&&(e.constructor===_columnInfo.ColumnInfo||e instanceof _columnInfo.ColumnInfo)}function createColumn(e,l,t){return isColumnInfo(l)?l:(0,_vue.reactive)(new _columnInfo.ColumnInfo(e,l,t))}function watchColumn(t,e,r){Object.keys(e).forEach(l=>{(0,_vue.watch)(()=>e[l],e=>{r.update(l,e),t&&("filters"===l?(t.setFilter(r,e),t.handleUpdateDataQueue()):["visible","fixed","width","minWidth","maxWidth"].includes(l)&&t.handleRefreshColumnQueue())})})}function assemColumn(e,l,t,r){var e=e["reactData"],o=e["staticColumns"],n=l.parentNode,r=r?r.column:null,r=r?r.children:o;n&&r&&(r.splice(_xeUtils.default.arrayIndexOf(n.children,l),0,t),e.staticColumns=o.slice(0))}function destroyColumn(e,l){var e=e["reactData"],t=e["staticColumns"],r=_xeUtils.default.findTree(t,e=>e.id===l.id,{children:"children"});r&&r.items.splice(r.index,1),e.staticColumns=t.slice(0)}function getRootColumn(e,l){var e=e["internalData"],t=e["fullColumnIdData"];if(!l)return null;let r=l.parentId;for(;t[r];){const l=t[r].column;if(!(r=l.parentId))return l}return l}function mergeBodyMethod(l,t,r){for(let e=0;e<l.length;e++){var{row:o,col:n,rowspan:i,colspan:a}=l[e];if(-1<n&&-1<o&&i&&a){if(o===t&&n===r)return{rowspan:i,colspan:a};if(o<=t&&t<o+i&&n<=r&&r<n+a)return{rowspan:0,colspan:0}}}}function clearTableDefaultStatus(e){var{props:l,internalData:t}=e;return t.initStatus=!1,e.clearSort(),e.clearCurrentRow(),e.clearCurrentColumn(),e.clearRadioRow(),e.clearRadioReserve(),e.clearCheckboxRow(),e.clearCheckboxReserve(),e.clearRowExpand(),e.clearTreeExpand(),e.clearTreeExpandReserve(),e.clearPendingRow(),e.clearFilter&&e.clearFilter(),e.clearSelected&&(l.keyboardConfig||l.mouseConfig)&&e.clearSelected(),e.clearCellAreas&&l.mouseConfig&&(e.clearCellAreas(),e.clearCopyCellArea()),e.clearScroll()}function clearTableAllStatus(e){return e.clearFilter&&e.clearFilter(),clearTableDefaultStatus(e)}function rowToVisible(e,l){var{reactData:t,internalData:r}=e,o=e.getRefMaps()["refTableBody"],t=t["scrollYLoad"],{afterFullData:r,scrollYStore:n}=r,o=o.value,o=o?o.$el:null;if(o){var i=o.querySelector(`[rowid="${getRowid(e,l)}"]`);if(i){var a=o.clientHeight,o=o.scrollTop,u=i.offsetParent,u=i.offsetTop+(u?u.offsetTop:0),i=i.clientHeight;if(u<o||o+a<u)return e.scrollTo(null,u);if(a+o<=u+i)return e.scrollTo(null,o+i)}else if(t)return e.scrollTo(null,(r.indexOf(l)-1)*n.rowHeight)}return Promise.resolve()}function colToVisible(e,t){var{reactData:l,internalData:r}=e,o=e.getRefMaps()["refTableBody"],l=l["scrollXLoad"],n=r["visibleColumn"],r=o.value,o=r?r.$el:null;if(o){r=o.querySelector("."+t.id);if(r){var i=o.clientWidth,o=o.scrollLeft,a=r.offsetParent,a=r.offsetLeft+(a?a.offsetLeft:0),r=r.clientWidth;if(a<o||o+i<a)return e.scrollTo(a);if(i+o<=a+r)return e.scrollTo(o+r)}else if(l){let l=0;for(let e=0;e<n.length&&n[e]!==t;e++)l+=n[e].renderWidth;return e.scrollTo(l)}}return Promise.resolve()}exports.handleFieldOrColumn=handleFieldOrColumn;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.assemColumn=assemColumn,exports.clearTableAllStatus=clearTableAllStatus,exports.clearTableDefaultStatus=clearTableDefaultStatus,exports.colToVisible=colToVisible,exports.convertHeaderColumnToRows=void 0,exports.createColumn=createColumn,exports.destroyColumn=destroyColumn,exports.getCellValue=getCellValue,exports.getColReMaxWidth=getColReMaxWidth,exports.getColReMinWidth=getColReMinWidth,exports.getRootColumn=getRootColumn,exports.getRowUniqueId=getRowUniqueId,exports.getRowid=getRowid,exports.getRowkey=getRowkey,exports.handleFieldOrColumn=void 0,exports.isColumnInfo=isColumnInfo,exports.mergeBodyMethod=mergeBodyMethod,exports.removeScrollListener=removeScrollListener,exports.restoreScrollListener=restoreScrollListener,exports.restoreScrollLocation=restoreScrollLocation,exports.rowToVisible=rowToVisible,exports.setCellValue=setCellValue,exports.toFilters=toFilters,exports.toTreePathSeq=toTreePathSeq,exports.watchColumn=watchColumn;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_columnInfo=require("./columnInfo"),_dom=require("../../tools/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}const getAllConvertColumns=(e,l)=>{const t=[];return e.forEach(e=>{e.parentId=l?l.id:null,e.visible&&(e.children&&e.children.length&&e.children.some(e=>e.visible)?(t.push(e),t.push(...getAllConvertColumns(e.children,e))):t.push(e))}),t},convertHeaderColumnToRows=e=>{let l=1;const r=(t,e)=>{if(e&&(t.level=e.level+1,l<t.level)&&(l=t.level),t.children&&t.children.length&&t.children.some(e=>e.visible)){let l=0;t.children.forEach(e=>{e.visible&&(r(e,t),l+=e.colSpan)}),t.colSpan=l}else t.colSpan=1},t=(e.forEach(e=>{e.level=1,r(e)}),[]);for(let e=0;e<l;e++)t.push([]);return getAllConvertColumns(e).forEach(e=>{e.children&&e.children.length&&e.children.some(e=>e.visible)?e.rowSpan=1:e.rowSpan=l-e.level+1,t[e.level-1].push(e)}),t};function restoreScrollLocation(e,l,t){const r=e["internalData"];return e.clearScroll().then(()=>{if(l||t)return r.lastScrollLeft=0,r.lastScrollTop=0,e.scrollTo(l,t)})}function removeScrollListener(e){e&&e._onscroll&&(e.onscroll=null)}function restoreScrollListener(e){e&&e._onscroll&&(e.onscroll=e._onscroll)}function getRowUniqueId(){return _xeUtils.default.uniqueId("row_")}function getRowkey(e){var l=e["props"],e=e.getComputeMaps()["computeRowOpts"],l=l["rowId"],e=e.value;return l||e.keyField||"_X_ROW_KEY"}function getRowid(e,l){l=_xeUtils.default.get(l,getRowkey(e));return _xeUtils.default.eqNull(l)?"":encodeURIComponent(l)}exports.convertHeaderColumnToRows=convertHeaderColumnToRows;const handleFieldOrColumn=(e,l)=>l?_xeUtils.default.isString(l)?e.getColumnByField(l):l:null;function getPaddingLeftRightSize(e){return e?(e=getComputedStyle(e),_xeUtils.default.toNumber(e.paddingLeft)+_xeUtils.default.toNumber(e.paddingRight)):0}function getElemenMarginWidth(e){var l,t;return e?(t=getComputedStyle(e),l=_xeUtils.default.toNumber(t.marginLeft),t=_xeUtils.default.toNumber(t.marginRight),e.offsetWidth+l+t):0}function queryCellElement(e,l){return e.querySelector(".vxe-cell"+l)}function toFilters(e){return e&&_xeUtils.default.isArray(e)?e.map(({label:e,value:l,data:t,resetValue:r,checked:o})=>({label:e,value:l,data:t,resetValue:r,checked:!!o,_checked:!!o})):e}function toTreePathSeq(e){return e.map((e,l)=>l%2==0?Number(e)+1:".").join("")}function getCellValue(e,l){return _xeUtils.default.get(e,l.field)}function setCellValue(e,l,t){return _xeUtils.default.set(e,l.field,t)}function getColReMaxWidth(e){var l=e["$table"],l=l.getComputeMaps()["computeResizableOpts"],l=l.value["maxWidth"];if(l){e=_xeUtils.default.isFunction(l)?l(e):l;if("auto"!==e)return Math.max(1,_xeUtils.default.toNumber(e))}return-1}function getColReMinWidth(e){var{$table:l,column:t,cell:r}=e,o=l["props"],n=l.getComputeMaps()["computeResizableOpts"],n=n.value["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,n=o["showHeaderOverflow"],{showHeaderOverflow:e,minWidth:o}=t,t=_xeUtils.default.isUndefined(e)||_xeUtils.default.isNull(e)?n:e,n="title"===t||(!0===t||"tooltip"===t)||"ellipsis"===t;let u=_xeUtils.default.floor(1.6*(_xeUtils.default.toNumber(getComputedStyle(r).fontSize)||14))+(getPaddingLeftRightSize(r)+getPaddingLeftRightSize(queryCellElement(r,"")));if(n&&(e=getPaddingLeftRightSize(queryCellElement(r,"--title>.vxe-cell--checkbox")),t=getElemenMarginWidth(queryCellElement(r,">.vxe-cell--required-icon")),n=getElemenMarginWidth(queryCellElement(r,">.vxe-cell--edit-icon")),s=getElemenMarginWidth(queryCellElement(r,">.vxe-cell-title-prefix-icon")),i=getElemenMarginWidth(queryCellElement(r,">.vxe-cell-title-suffix-icon")),a=getElemenMarginWidth(queryCellElement(r,">.vxe-cell--sort")),r=getElemenMarginWidth(queryCellElement(r,">.vxe-cell--filter")),u+=e+t+n+s+i+r+a),o){var s,e=l.getRefMaps()["refTableBody"],t=e.value,n=t?t.$el:null;if(n){if((0,_dom.isScale)(o))return s=(n.clientWidth-1)/100,Math.max(u,Math.floor(_xeUtils.default.toInteger(o)*s));if((0,_dom.isPx)(o))return Math.max(u,_xeUtils.default.toInteger(o))}}return u}function isColumnInfo(e){return e&&(e.constructor===_columnInfo.ColumnInfo||e instanceof _columnInfo.ColumnInfo)}function createColumn(e,l,t){return isColumnInfo(l)?l:(0,_vue.reactive)(new _columnInfo.ColumnInfo(e,l,t))}function watchColumn(t,e,r){Object.keys(e).forEach(l=>{(0,_vue.watch)(()=>e[l],e=>{r.update(l,e),t&&("filters"===l?(t.setFilter(r,e),t.handleUpdateDataQueue()):["visible","fixed","width","minWidth","maxWidth"].includes(l)&&t.handleRefreshColumnQueue())})})}function assemColumn(e,l,t,r){var e=e["reactData"],o=e["staticColumns"],n=l.parentNode,r=r?r.column:null,r=r?r.children:o;n&&r&&(r.splice(_xeUtils.default.arrayIndexOf(n.children,l),0,t),e.staticColumns=o.slice(0))}function destroyColumn(e,l){var e=e["reactData"],t=e["staticColumns"],r=_xeUtils.default.findTree(t,e=>e.id===l.id,{children:"children"});r&&r.items.splice(r.index,1),e.staticColumns=t.slice(0)}function getRootColumn(e,l){var e=e["internalData"],t=e["fullColumnIdData"];if(!l)return null;let r=l.parentId;for(;t[r];){const l=t[r].column;if(!(r=l.parentId))return l}return l}function mergeBodyMethod(l,t,r){for(let e=0;e<l.length;e++){var{row:o,col:n,rowspan:i,colspan:a}=l[e];if(-1<n&&-1<o&&i&&a){if(o===t&&n===r)return{rowspan:i,colspan:a};if(o<=t&&t<o+i&&n<=r&&r<n+a)return{rowspan:0,colspan:0}}}}function clearTableDefaultStatus(e){var{props:l,internalData:t}=e;return t.initStatus=!1,e.clearSort(),e.clearCurrentRow(),e.clearCurrentColumn(),e.clearRadioRow(),e.clearRadioReserve(),e.clearCheckboxRow(),e.clearCheckboxReserve(),e.clearRowExpand(),e.clearTreeExpand(),e.clearTreeExpandReserve(),e.clearPendingRow(),e.clearFilter&&e.clearFilter(),e.clearSelected&&(l.keyboardConfig||l.mouseConfig)&&e.clearSelected(),e.clearCellAreas&&l.mouseConfig&&(e.clearCellAreas(),e.clearCopyCellArea()),e.clearScroll()}function clearTableAllStatus(e){return e.clearFilter&&e.clearFilter(),clearTableDefaultStatus(e)}function rowToVisible(e,l){var{reactData:t,internalData:r}=e,o=e.getRefMaps()["refTableBody"],t=t["scrollYLoad"],{afterFullData:r,scrollYStore:n}=r,o=o.value,o=o?o.$el:null;if(o){var i=o.querySelector(`[rowid="${getRowid(e,l)}"]`);if(i){var a=o.clientHeight,o=o.scrollTop,u=i.offsetParent,u=i.offsetTop+(u?u.offsetTop:0),i=i.clientHeight;if(u<o||o+a<u)return e.scrollTo(null,u);if(a+o<=u+i)return e.scrollTo(null,o+i)}else if(t)return e.scrollTo(null,(r.indexOf(l)-1)*n.rowHeight)}return Promise.resolve()}function colToVisible(e,t){var{reactData:l,internalData:r}=e,o=e.getRefMaps()["refTableBody"],l=l["scrollXLoad"],n=r["visibleColumn"],r=o.value,o=r?r.$el:null;if((!t||!t.fixed)&&o){r=o.querySelector("."+t.id);if(r){var i=o.clientWidth,o=o.scrollLeft,a=r.offsetParent,a=r.offsetLeft+(a?a.offsetLeft:0),r=r.clientWidth;if(a<o||o+i<a)return e.scrollTo(a);if(i+o<=a+r)return e.scrollTo(o+r)}else if(l){let l=0;for(let e=0;e<n.length&&n[e]!==t;e++)l+=n[e].renderWidth;return e.scrollTo(l)}}return Promise.resolve()}exports.handleFieldOrColumn=handleFieldOrColumn;

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(e) { return e && e.__esModule ? e : { default: e }; }
 function getLog(message, params) {
-  return `[vxe-table v${"4.6.22"}] ${_conf.default.i18n(message, params)}`;
+  return `[vxe-table v${"4.6.25"}] ${_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 v4.6.22] "+_conf.default.i18n(e,o)}function outLog(r){return function(e,o){e=getLog(e,o);return console[r](e),e}}const 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 v4.6.25] "+_conf.default.i18n(e,o)}function outLog(r){return function(e,o){e=getLog(e,o);return console[r](e),e}}const warnLog=exports.warnLog=outLog("warn"),errLog=exports.errLog=outLog("error");

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

@@ -235,7 +235,7 @@ function component(comp) {
     components[comp.name] = comp;
   }
 }
-const version = exports.version = "4.6.22";
+const version = exports.version = "4.6.25";
 const tableVersion = exports.tableVersion = version;
 const VXETable = exports.VXETable = {
   v,

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={use:!0,t:!0,_t:!0,setConfig:!0,globalConfs:!0,v:!0,setup:!0,config:!0,setIcon:!0,globalStore:!0,getComponent:!0,component:!0,version:!0,tableVersion:!0,VXETable:!0,VxeUI:!0},_xeUtils=(exports.VxeUI=exports.VXETable=void 0,exports._t=_t,exports.component=component,exports.default=exports.config=void 0,exports.getComponent=getComponent,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"))),_conf=_interopRequireDefault(require("./src/conf")),_domZindex=_interopRequireDefault(require("dom-zindex")),_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")),_hooks=(Object.keys(_validators).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_validators[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _validators[e]}})}),require("./src/hooks")),_theme=(Object.keys(_hooks).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_hooks[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _hooks[e]}})}),require("./src/theme")),_utils=require("../tools/utils"),_log=require("../tools/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function getExportOrImpotType(e,o){const r=[];return _xeUtils.default.objectEach(e,(e,t)=>{0!==e&&e!==o||r.push(t)}),r}const installedPlugins=[];function use(e,t){return e&&e.install&&-1===installedPlugins.indexOf(e)&&(e.install(VXETable,t),installedPlugins.push(e)),VXETable}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):""}const setConfig=e=>(e&&(e.theme&&(0,_theme.setTheme)(e.theme),e.zIndex&&_domZindex.default.setCurrent(e.zIndex),_xeUtils.default.merge(_conf.default,e)),VXETable);exports.setConfig=setConfig;class VXETableConfig{get zIndex(){return(0,_utils.getLastZIndex)()}get nextZIndex(){return(0,_utils.nextZIndex)()}get exportTypes(){return getExportOrImpotType(_conf.default.export.types,1)}get importTypes(){return getExportOrImpotType(_conf.default.export.types,2)}}const globalConfs=exports.globalConfs=new VXETableConfig,v=exports.v="v4",setup=e=>("development"===process.env.NODE_ENV&&(0,_log.warnLog)("vxe.error.delFunc",["setup","setConfig"]),setConfig(e),_conf.default),config=(exports.setup=setup,e=>("development"===process.env.NODE_ENV&&(0,_log.warnLog)("vxe.error.delFunc",["setup","setConfig"]),setConfig(e),_conf.default));function setIcon(e){return e&&Object.assign(_conf.default.icon,e),VXETable}exports.config=config;const globalStore=exports.globalStore={},components={};function getComponent(e){return components[e]||null}function component(e){e&&e.name&&(components[e.name]=e)}const version=exports.version="4.6.22",tableVersion=exports.tableVersion=version,VXETable=exports.VXETable={v:v,version:version,tableVersion:tableVersion,setConfig:setConfig,setIcon:setIcon,globalStore:globalStore,interceptor:_interceptor.interceptor,renderer:_renderer.renderer,commands:_commands.commands,formats:_formats.formats,validators:_validators.validators,menus:_menus.menus,hooks:_hooks.hooks,use:use,t:t,_t:_t,setTheme:_theme.setTheme,getTheme:_theme.getTheme,getComponent:getComponent,config:config,setup:setup,globalConfs:globalConfs},VxeUI=exports.VxeUI=VXETable;(0,_theme.setTheme)("light");var _default=exports.default=VXETable;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={use:!0,t:!0,_t:!0,setConfig:!0,globalConfs:!0,v:!0,setup:!0,config:!0,setIcon:!0,globalStore:!0,getComponent:!0,component:!0,version:!0,tableVersion:!0,VXETable:!0,VxeUI:!0},_xeUtils=(exports.VxeUI=exports.VXETable=void 0,exports._t=_t,exports.component=component,exports.default=exports.config=void 0,exports.getComponent=getComponent,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"))),_conf=_interopRequireDefault(require("./src/conf")),_domZindex=_interopRequireDefault(require("dom-zindex")),_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")),_hooks=(Object.keys(_validators).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_validators[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _validators[e]}})}),require("./src/hooks")),_theme=(Object.keys(_hooks).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_hooks[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _hooks[e]}})}),require("./src/theme")),_utils=require("../tools/utils"),_log=require("../tools/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function getExportOrImpotType(e,o){const r=[];return _xeUtils.default.objectEach(e,(e,t)=>{0!==e&&e!==o||r.push(t)}),r}const installedPlugins=[];function use(e,t){return e&&e.install&&-1===installedPlugins.indexOf(e)&&(e.install(VXETable,t),installedPlugins.push(e)),VXETable}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):""}const setConfig=e=>(e&&(e.theme&&(0,_theme.setTheme)(e.theme),e.zIndex&&_domZindex.default.setCurrent(e.zIndex),_xeUtils.default.merge(_conf.default,e)),VXETable);exports.setConfig=setConfig;class VXETableConfig{get zIndex(){return(0,_utils.getLastZIndex)()}get nextZIndex(){return(0,_utils.nextZIndex)()}get exportTypes(){return getExportOrImpotType(_conf.default.export.types,1)}get importTypes(){return getExportOrImpotType(_conf.default.export.types,2)}}const globalConfs=exports.globalConfs=new VXETableConfig,v=exports.v="v4",setup=e=>("development"===process.env.NODE_ENV&&(0,_log.warnLog)("vxe.error.delFunc",["setup","setConfig"]),setConfig(e),_conf.default),config=(exports.setup=setup,e=>("development"===process.env.NODE_ENV&&(0,_log.warnLog)("vxe.error.delFunc",["setup","setConfig"]),setConfig(e),_conf.default));function setIcon(e){return e&&Object.assign(_conf.default.icon,e),VXETable}exports.config=config;const globalStore=exports.globalStore={},components={};function getComponent(e){return components[e]||null}function component(e){e&&e.name&&(components[e.name]=e)}const version=exports.version="4.6.25",tableVersion=exports.tableVersion=version,VXETable=exports.VXETable={v:v,version:version,tableVersion:tableVersion,setConfig:setConfig,setIcon:setIcon,globalStore:globalStore,interceptor:_interceptor.interceptor,renderer:_renderer.renderer,commands:_commands.commands,formats:_formats.formats,validators:_validators.validators,menus:_menus.menus,hooks:_hooks.hooks,use:use,t:t,_t:_t,setTheme:_theme.setTheme,getTheme:_theme.getTheme,getComponent:getComponent,config:config,setup:setup,globalConfs:globalConfs},VxeUI=exports.VxeUI=VXETable;(0,_theme.setTheme)("light");var _default=exports.default=VXETable;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "4.6.22",
+  "version": "4.6.25",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟树、列拖拽，懒加载、快捷菜单、数据校验、树形结构、打印导出、自定义模板、渲染器、JSON 配置式...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",

package/packages/edit/src/hook.ts

@@ -768,7 +768,12 @@ const editHook: VxeGlobalHooksHandles.HookOptions = {
           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/table.ts

@@ -2315,14 +2315,14 @@ export default defineComponent({
       if (keepSource) {
         tablePrivateMethods.cacheSourceMap(fullData)
       }
-      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-        if (sYLoad) {
-          if (!(props.height || props.maxHeight)) {
-            errLog('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}'])
-          }
-          if (!props.showOverflow) {
-            warnLog('vxe.error.reqProp', ['table.show-overflow'])
-          }
+      if (sYLoad) {
+        if (!(props.height || props.maxHeight)) {
+          errLog('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}'])
+        }
+        if (!props.showOverflow) {
+          errLog('vxe.error.reqProp', ['table.show-overflow'])
+        }
+        if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
           if (props.spanMethod) {
             warnLog('vxe.error.scrollErrProp', ['table.span-method'])
           }
@@ -3354,7 +3354,7 @@ export default defineComponent({
        * 如果为 true 则重置所有状态
        * 如果已关联工具栏，则会同步更新
        */
-      resetColumn (options) {
+      resetCustom (options) {
         const { collectColumn } = internalData
         const customOpts = computeCustomOpts.value
         const { checkMethod } = customOpts
@@ -3389,6 +3389,10 @@ export default defineComponent({
         }
         return tablePrivateMethods.handleCustom()
       },
+      resetColumn (options) {
+        warnLog('vxe.error.delFunc', ['resetColumn', 'resetCustom'])
+        return $xetable.resetCustom(options)
+      },
       /**
        * 刷新列信息
        * 将固定的列左边、右边分别靠边

package/packages/table/src/util.ts

@@ -417,6 +417,9 @@ export function colToVisible ($xetable: VxeTableConstructor & VxeTablePrivateMet
   const { visibleColumn } = internalData
   const tableBody = refTableBody.value
   const bodyElem = tableBody ? tableBody.$el as HTMLDivElement : null
+  if (column && column.fixed) {
+    return Promise.resolve()
+  }
   if (bodyElem) {
     const tdElem: HTMLTableCellElement | null = bodyElem.querySelector(`.${column.id}`)
     if (tdElem) {

package/styles/theme/dark.scss

@@ -1,50 +1,55 @@
-@use '../variable.scss' as *;
+@use '../variable.scss';
 
 [data-vxe-ui-theme="dark"] {
+  // 兼容
+  --vxe-ui-font-color: #98989E;
+  --vxe-ui-font-primary-color: #2C7ECF;
+  // 兼容
+
   color-scheme: dark;
 
   /*font*/
-  --vxe-font-family: #{$vxe-font-family};
-  --vxe-font-size: #{$vxe-font-size};
-  --vxe-font-size-medium: #{$vxe-font-size-medium};
-  --vxe-font-size-small: #{$vxe-font-size-small};
-  --vxe-font-size-mini: #{$vxe-font-size-mini};
+  --vxe-font-family: #{variable.$vxe-font-family};
+  --vxe-font-size: #{variable.$vxe-font-size};
+  --vxe-font-size-medium: #{variable.$vxe-font-size-medium};
+  --vxe-font-size-small: #{variable.$vxe-font-size-small};
+  --vxe-font-size-mini: #{variable.$vxe-font-size-mini};
 
   /*size*/
-  --vxe-border-radius: #{$vxe-border-radius};
+  --vxe-border-radius: #{variable.$vxe-border-radius};
 
   /*icon*/
-  --vxe-icon-font-family: #{$vxe-icon-font-family};
+  --vxe-icon-font-family: #{variable.$vxe-icon-font-family};
   --vxe-icon-background-color: #98989E;
 
   /*color*/
-  --vxe-font-color: #98989E;
-  --vxe-primary-color: #2C7ECF;
-  --vxe-success-color: #{$vxe-success-color};
-  --vxe-info-color: #{$vxe-info-color};
-  --vxe-warning-color: #{$vxe-warning-color};
-  --vxe-danger-color: #{$vxe-danger-color};
-
-  --vxe-font-lighten-color: #{$vxe-font-lighten-color};
-  --vxe-primary-lighten-color: #{$vxe-primary-lighten-color};
-  --vxe-success-lighten-color: #{$vxe-success-lighten-color};
-  --vxe-info-lighten-color: #{$vxe-info-lighten-color};
-  --vxe-warning-lighten-color: #{$vxe-warning-lighten-color};
-  --vxe-danger-lighten-color: #{$vxe-danger-lighten-color};
-
-  --vxe-font-darken-color: #{$vxe-font-darken-color};
-  --vxe-primary-darken-color: #{$vxe-primary-darken-color};
-  --vxe-success-darken-color: #{$vxe-success-darken-color};
-  --vxe-info-darken-color: #{$vxe-info-darken-color};
-  --vxe-warning-darken-color: #{$vxe-warning-darken-color};
-  --vxe-danger-darken-color: #{$vxe-danger-darken-color};
-
-  --vxe-font-disabled-color: #{$vxe-font-disabled-color};
-  --vxe-primary-disabled-color: #{$vxe-primary-disabled-color};
-  --vxe-success-disabled-color: #{$vxe-success-disabled-color};
-  --vxe-info-disabled-color: #{$vxe-info-disabled-color};
-  --vxe-warning-disabled-color: #{$vxe-warning-disabled-color};
-  --vxe-danger-disabled-color: #{$vxe-danger-disabled-color};
+  --vxe-font-color: var(--vxe-ui-font-color);
+  --vxe-primary-color: var(--vxe-ui-font-primary-color);
+  --vxe-success-color: #{variable.$vxe-success-color};
+  --vxe-info-color: #{variable.$vxe-info-color};
+  --vxe-warning-color: #{variable.$vxe-warning-color};
+  --vxe-danger-color: #{variable.$vxe-danger-color};
+
+  --vxe-font-lighten-color: #{variable.$vxe-font-lighten-color};
+  --vxe-primary-lighten-color: #{variable.$vxe-primary-lighten-color};
+  --vxe-success-lighten-color: #{variable.$vxe-success-lighten-color};
+  --vxe-info-lighten-color: #{variable.$vxe-info-lighten-color};
+  --vxe-warning-lighten-color: #{variable.$vxe-warning-lighten-color};
+  --vxe-danger-lighten-color: #{variable.$vxe-danger-lighten-color};
+
+  --vxe-font-darken-color: #{variable.$vxe-font-darken-color};
+  --vxe-primary-darken-color: #{variable.$vxe-primary-darken-color};
+  --vxe-success-darken-color: #{variable.$vxe-success-darken-color};
+  --vxe-info-darken-color: #{variable.$vxe-info-darken-color};
+  --vxe-warning-darken-color: #{variable.$vxe-warning-darken-color};
+  --vxe-danger-darken-color: #{variable.$vxe-danger-darken-color};
+
+  --vxe-font-disabled-color: #{variable.$vxe-font-disabled-color};
+  --vxe-primary-disabled-color: #{variable.$vxe-primary-disabled-color};
+  --vxe-success-disabled-color: #{variable.$vxe-success-disabled-color};
+  --vxe-info-disabled-color: #{variable.$vxe-info-disabled-color};
+  --vxe-warning-disabled-color: #{variable.$vxe-warning-disabled-color};
+  --vxe-danger-disabled-color: #{variable.$vxe-danger-disabled-color};
 
   /*input/radio/checkbox*/
   --vxe-input-border-color: #424242;
@@ -58,23 +63,23 @@
   /*table*/
   --vxe-table-header-font-color: #98989E;
   --vxe-table-footer-font-color: #98989E;
-  --vxe-table-border-radius: #{$vxe-table-border-radius};
-  --vxe-table-border-width: #{$vxe-table-border-width};
+  --vxe-table-border-radius: #{variable.$vxe-table-border-radius};
+  --vxe-table-border-width: #{variable.$vxe-table-border-width};
   --vxe-table-border-color: #37373A;
   --vxe-table-resizable-line-color: rgba(255, 255, 255, 0.1);
-  --vxe-table-resizable-drag-line-color: #{$vxe-table-resizable-drag-line-color};
+  --vxe-table-resizable-drag-line-color: #{variable.$vxe-table-resizable-drag-line-color};
   --vxe-table-header-background-color: #28282A;
   --vxe-table-body-background-color: #151518;
   --vxe-table-footer-background-color: #151518;
-  --vxe-table-tree-node-line-color: #{$vxe-table-tree-node-line-color};
-  --vxe-table-tree-node-line-style: #{$vxe-table-tree-node-line-style};
-  --vxe-table-header-font-weight: #{$vxe-table-header-font-weight};
-
-  --vxe-table-row-height-default: #{$vxe-table-row-height-default};
-  --vxe-table-row-height-medium: #{$vxe-table-row-height-medium};
-  --vxe-table-row-height-small: #{$vxe-table-row-height-small};
-  --vxe-table-row-height-mini: #{$vxe-table-row-height-mini};
-  --vxe-table-row-line-height: #{$vxe-table-row-line-height};
+  --vxe-table-tree-node-line-color: #{variable.$vxe-table-tree-node-line-color};
+  --vxe-table-tree-node-line-style: #{variable.$vxe-table-tree-node-line-style};
+  --vxe-table-header-font-weight: #{variable.$vxe-table-header-font-weight};
+
+  --vxe-table-row-height-default: #{variable.$vxe-table-row-height-default};
+  --vxe-table-row-height-medium: #{variable.$vxe-table-row-height-medium};
+  --vxe-table-row-height-small: #{variable.$vxe-table-row-height-small};
+  --vxe-table-row-height-mini: #{variable.$vxe-table-row-height-mini};
+  --vxe-table-row-line-height: #{variable.$vxe-table-row-line-height};
   --vxe-table-row-hover-background-color: #262727;
   --vxe-table-row-striped-background-color: #1D1D1D;
   --vxe-table-row-hover-striped-background-color: #262727;
@@ -85,41 +90,41 @@
   --vxe-table-row-current-background-color: #18222c;
   --vxe-table-row-hover-current-background-color: #262727;
 
-  --vxe-table-column-padding-default: #{$vxe-table-column-padding-default};
-  --vxe-table-column-padding-medium: #{$vxe-table-column-padding-medium};
-  --vxe-table-column-padding-small: #{$vxe-table-column-padding-small};
-  --vxe-table-column-padding-mini: #{$vxe-table-column-padding-mini};
+  --vxe-table-column-padding-default: #{variable.$vxe-table-column-padding-default};
+  --vxe-table-column-padding-medium: #{variable.$vxe-table-column-padding-medium};
+  --vxe-table-column-padding-small: #{variable.$vxe-table-column-padding-small};
+  --vxe-table-column-padding-mini: #{variable.$vxe-table-column-padding-mini};
   --vxe-table-column-hover-background-color: #18222c;
   --vxe-table-column-current-background-color: #18222c;
-  --vxe-table-column-icon-border-color: #{$vxe-table-column-icon-border-color};
-  --vxe-table-column-icon-border-hover-color: #{$vxe-table-column-icon-border-hover-color};
-
-  --vxe-table-cell-placeholder-color: #{$vxe-table-cell-placeholder-color};
-  --vxe-table-cell-padding-left: #{$vxe-table-cell-padding-left};
-  --vxe-table-cell-padding-right: #{$vxe-table-cell-padding-right};
-  --vxe-table-cell-input-height-default: #{$vxe-table-cell-input-height-default};
-  --vxe-table-cell-input-height-medium: #{$vxe-table-cell-input-height-medium};
-  --vxe-table-cell-input-height-small: #{$vxe-table-cell-input-height-small};
-  --vxe-table-cell-input-height-mini: #{$vxe-table-cell-input-height-mini};
-  --vxe-table-cell-dirty-width: #{$vxe-table-cell-dirty-width};
-  --vxe-table-cell-dirty-update-color: #{$vxe-table-cell-dirty-update-color};
-  --vxe-table-cell-dirty-insert-color: #{$vxe-table-cell-dirty-insert-color};
-  --vxe-table-cell-area-border-color: #{$vxe-table-cell-area-border-color};
-  --vxe-table-cell-area-border-width: #{$vxe-table-cell-area-border-width};
-  --vxe-table-cell-main-area-extension-border-color: #{$vxe-table-cell-main-area-extension-border-color};
-  --vxe-table-cell-main-area-extension-background-color: #{$vxe-table-cell-main-area-extension-background-color};
-  --vxe-table-cell-extend-area-border-width: #{$vxe-table-cell-extend-area-border-width};
-  --vxe-table-cell-copy-area-border-width: #{$vxe-table-cell-copy-area-border-width};
-  --vxe-table-cell-active-area-border-width: #{$vxe-table-cell-active-area-border-width};
-  --vxe-table-cell-active-area-background-color: #{$vxe-table-cell-active-area-background-color};
-  --vxe-table-cell-copy-area-border-color: #{$vxe-table-cell-copy-area-border-color};
-  --vxe-table-cell-extend-area-border-color: #{$vxe-table-cell-extend-area-border-color};
-  --vxe-table-cell-active-area-border-color: #{$vxe-table-cell-active-area-border-color};
-  --vxe-table-cell-area-background-color: #{$vxe-table-cell-area-background-color};
-
-  --vxe-table-checkbox-range-border-width: #{$vxe-table-checkbox-range-border-width};
-  --vxe-table-checkbox-range-border-color: #{$vxe-table-checkbox-range-border-color};
-  --vxe-table-checkbox-range-background-color: #{$vxe-table-checkbox-range-background-color};
+  --vxe-table-column-icon-border-color: #{variable.$vxe-table-column-icon-border-color};
+  --vxe-table-column-icon-border-hover-color: #{variable.$vxe-table-column-icon-border-hover-color};
+
+  --vxe-table-cell-placeholder-color: #{variable.$vxe-table-cell-placeholder-color};
+  --vxe-table-cell-padding-left: #{variable.$vxe-table-cell-padding-left};
+  --vxe-table-cell-padding-right: #{variable.$vxe-table-cell-padding-right};
+  --vxe-table-cell-input-height-default: #{variable.$vxe-table-cell-input-height-default};
+  --vxe-table-cell-input-height-medium: #{variable.$vxe-table-cell-input-height-medium};
+  --vxe-table-cell-input-height-small: #{variable.$vxe-table-cell-input-height-small};
+  --vxe-table-cell-input-height-mini: #{variable.$vxe-table-cell-input-height-mini};
+  --vxe-table-cell-dirty-width: #{variable.$vxe-table-cell-dirty-width};
+  --vxe-table-cell-dirty-update-color: #{variable.$vxe-table-cell-dirty-update-color};
+  --vxe-table-cell-dirty-insert-color: #{variable.$vxe-table-cell-dirty-insert-color};
+  --vxe-table-cell-area-border-color: #{variable.$vxe-table-cell-area-border-color};
+  --vxe-table-cell-area-border-width: #{variable.$vxe-table-cell-area-border-width};
+  --vxe-table-cell-main-area-extension-border-color: #{variable.$vxe-table-cell-main-area-extension-border-color};
+  --vxe-table-cell-main-area-extension-background-color: #{variable.$vxe-table-cell-main-area-extension-background-color};
+  --vxe-table-cell-extend-area-border-width: #{variable.$vxe-table-cell-extend-area-border-width};
+  --vxe-table-cell-copy-area-border-width: #{variable.$vxe-table-cell-copy-area-border-width};
+  --vxe-table-cell-active-area-border-width: #{variable.$vxe-table-cell-active-area-border-width};
+  --vxe-table-cell-active-area-background-color: #{variable.$vxe-table-cell-active-area-background-color};
+  --vxe-table-cell-copy-area-border-color: #{variable.$vxe-table-cell-copy-area-border-color};
+  --vxe-table-cell-extend-area-border-color: #{variable.$vxe-table-cell-extend-area-border-color};
+  --vxe-table-cell-active-area-border-color: #{variable.$vxe-table-cell-active-area-border-color};
+  --vxe-table-cell-area-background-color: #{variable.$vxe-table-cell-area-background-color};
+
+  --vxe-table-checkbox-range-border-width: #{variable.$vxe-table-checkbox-range-border-width};
+  --vxe-table-checkbox-range-border-color: #{variable.$vxe-table-checkbox-range-border-color};
+  --vxe-table-checkbox-range-background-color: #{variable.$vxe-table-checkbox-range-background-color};
 
   --vxe-table-fixed-left-scrolling-box-shadow: 8px 0px 10px -5px rgba(0, 0, 0, 0.5);
   --vxe-table-fixed-right-scrolling-box-shadow: -8px 0px 10px -5px rgba(0, 0, 0, 0.5);
@@ -128,30 +133,30 @@
   --vxe-table-filter-panel-background-color: #151518;
 
   /*menu*/
-  --vxe-table-menu-item-width: #{$vxe-table-menu-item-width};
-  --vxe-table-menu-background-color: #{$vxe-table-menu-background-color};
+  --vxe-table-menu-item-width: #{variable.$vxe-table-menu-item-width};
+  --vxe-table-menu-background-color: #{variable.$vxe-table-menu-background-color};
 
   /*loading*/
-  --vxe-loading-color: #{$vxe-loading-color};
+  --vxe-loading-color: #{variable.$vxe-loading-color};
   --vxe-loading-background-color: rgba(0, 0, 0, 0.5);;
-  --vxe-loading-z-index: #{$vxe-loading-z-index};
+  --vxe-loading-z-index: #{variable.$vxe-loading-z-index};
 
   /*validate*/
-  --vxe-table-validate-error-color: #{$vxe-table-validate-error-color};
-  --vxe-table-validate-error-background-color: #{$vxe-table-validate-error-background-color};
+  --vxe-table-validate-error-color: #{variable.$vxe-table-validate-error-color};
+  --vxe-table-validate-error-background-color: #{variable.$vxe-table-validate-error-background-color};
 
   /*grid*/
-  --vxe-grid-maximize-background-color: #{$vxe-grid-maximize-background-color};
+  --vxe-grid-maximize-background-color: #{variable.$vxe-grid-maximize-background-color};
 
   /*toolbar*/
   --vxe-toolbar-background-color: #151518;
-  --vxe-toolbar-custom-active-background-color: #{$vxe-toolbar-custom-active-background-color};
+  --vxe-toolbar-custom-active-background-color: #{variable.$vxe-toolbar-custom-active-background-color};
   --vxe-toolbar-panel-background-color: #151518;
 
   /*tooltip*/
-  --vxe-tooltip-dark-color: #{$vxe-tooltip-dark-color};
-  --vxe-tooltip-dark-background-color: #{$vxe-tooltip-dark-background-color};
-  --vxe-tooltip-light-background-color: #{$vxe-tooltip-light-background-color};
+  --vxe-tooltip-dark-color: #{variable.$vxe-tooltip-dark-color};
+  --vxe-tooltip-dark-background-color: #{variable.$vxe-tooltip-dark-background-color};
+  --vxe-tooltip-light-background-color: #{variable.$vxe-tooltip-light-background-color};
 
   /*pager*/
   --vxe-pager-background-color: #151518;
@@ -169,111 +174,111 @@
   --vxe-drawer-border-color: #424242;
 
   /*checkbox*/
-  --vxe-checkbox-font-size-default: #{$vxe-checkbox-font-size-default};
-  --vxe-checkbox-font-size-medium: #{$vxe-checkbox-font-size-medium};
-  --vxe-checkbox-font-size-small: #{$vxe-checkbox-font-size-small};
-  --vxe-checkbox-font-size-mini: #{$vxe-checkbox-font-size-mini};
-  --vxe-checkbox-checked-width: #{$vxe-checkbox-checked-width};
-  --vxe-checkbox-checked-height: #{$vxe-checkbox-checked-height};
-  --vxe-checkbox-indeterminate-width: #{$vxe-checkbox-indeterminate-width};
-  --vxe-checkbox-indeterminate-height: #{$vxe-checkbox-indeterminate-height};
-  --vxe-checkbox-border-width: #{$vxe-checkbox-border-width};
-  --vxe-checkbox-border-radius: #{$vxe-checkbox-border-radius};
-  --vxe-checkbox-icon-background-color: #{$vxe-checkbox-icon-background-color};
-  --vxe-checkbox-checked-icon-border-color: #{$vxe-checkbox-checked-icon-border-color};
-  --vxe-checkbox-indeterminate-icon-background-color: #{$vxe-checkbox-indeterminate-icon-background-color};
+  --vxe-checkbox-font-size-default: #{variable.$vxe-checkbox-font-size-default};
+  --vxe-checkbox-font-size-medium: #{variable.$vxe-checkbox-font-size-medium};
+  --vxe-checkbox-font-size-small: #{variable.$vxe-checkbox-font-size-small};
+  --vxe-checkbox-font-size-mini: #{variable.$vxe-checkbox-font-size-mini};
+  --vxe-checkbox-checked-width: #{variable.$vxe-checkbox-checked-width};
+  --vxe-checkbox-checked-height: #{variable.$vxe-checkbox-checked-height};
+  --vxe-checkbox-indeterminate-width: #{variable.$vxe-checkbox-indeterminate-width};
+  --vxe-checkbox-indeterminate-height: #{variable.$vxe-checkbox-indeterminate-height};
+  --vxe-checkbox-border-width: #{variable.$vxe-checkbox-border-width};
+  --vxe-checkbox-border-radius: #{variable.$vxe-checkbox-border-radius};
+  --vxe-checkbox-icon-background-color: #{variable.$vxe-checkbox-icon-background-color};
+  --vxe-checkbox-checked-icon-border-color: #{variable.$vxe-checkbox-checked-icon-border-color};
+  --vxe-checkbox-indeterminate-icon-background-color: #{variable.$vxe-checkbox-indeterminate-icon-background-color};
 
   /*radio*/
-  --vxe-radio-font-size-default: #{$vxe-radio-font-size-default};
-  --vxe-radio-font-size-medium: #{$vxe-radio-font-size-medium};
-  --vxe-radio-font-size-small: #{$vxe-radio-font-size-small};
-  --vxe-radio-font-size-mini: #{$vxe-radio-font-size-mini};
-  --vxe-radio-border-width: #{$vxe-radio-border-width};
-  --vxe-radio-icon-background-color: #{$vxe-radio-icon-background-color};
-  --vxe-radio-checked-icon-background-color: #{$vxe-radio-checked-icon-background-color};
-  --vxe-radio-indeterminate-icon-background-color: #{$vxe-radio-indeterminate-icon-background-color};
+  --vxe-radio-font-size-default: #{variable.$vxe-radio-font-size-default};
+  --vxe-radio-font-size-medium: #{variable.$vxe-radio-font-size-medium};
+  --vxe-radio-font-size-small: #{variable.$vxe-radio-font-size-small};
+  --vxe-radio-font-size-mini: #{variable.$vxe-radio-font-size-mini};
+  --vxe-radio-border-width: #{variable.$vxe-radio-border-width};
+  --vxe-radio-icon-background-color: #{variable.$vxe-radio-icon-background-color};
+  --vxe-radio-checked-icon-background-color: #{variable.$vxe-radio-checked-icon-background-color};
+  --vxe-radio-indeterminate-icon-background-color: #{variable.$vxe-radio-indeterminate-icon-background-color};
   --vxe-radio-button-default-background-color: #151518;
 
   /*button*/
-  --vxe-button-max-width: #{$vxe-button-max-width};
+  --vxe-button-max-width: #{variable.$vxe-button-max-width};
   --vxe-button-default-background-color: #151518;
   --vxe-button-dropdown-panel-background-color: #151518;
-  --vxe-button-height-default: #{$vxe-button-height-default};
-  --vxe-button-height-medium: #{$vxe-button-height-medium};
-  --vxe-button-height-small: #{$vxe-button-height-small};
-  --vxe-button-height-mini: #{$vxe-button-height-mini};
-  --vxe-button-round-border-radius-default: #{$vxe-button-round-border-radius-default};
-  --vxe-button-round-border-radius-medium: #{$vxe-button-round-border-radius-medium};
-  --vxe-button-round-border-radius-small: #{$vxe-button-round-border-radius-small};
-  --vxe-button-round-border-radius-mini: #{$vxe-button-round-border-radius-mini};
+  --vxe-button-height-default: #{variable.$vxe-button-height-default};
+  --vxe-button-height-medium: #{variable.$vxe-button-height-medium};
+  --vxe-button-height-small: #{variable.$vxe-button-height-small};
+  --vxe-button-height-mini: #{variable.$vxe-button-height-mini};
+  --vxe-button-round-border-radius-default: #{variable.$vxe-button-round-border-radius-default};
+  --vxe-button-round-border-radius-medium: #{variable.$vxe-button-round-border-radius-medium};
+  --vxe-button-round-border-radius-small: #{variable.$vxe-button-round-border-radius-small};
+  --vxe-button-round-border-radius-mini: #{variable.$vxe-button-round-border-radius-mini};
 
   /*input*/
   --vxe-input-background-color: #151518;
-  --vxe-input-panel-background-color: #{$vxe-input-panel-background-color};
-  --vxe-input-number-disabled-color: #{$vxe-input-number-disabled-color};
-  --vxe-input-date-festival-color: #{$vxe-input-date-festival-color};
-  --vxe-input-date-festival-important-color: #{$vxe-input-date-festival-important-color};
-  --vxe-input-date-notice-background-color: #{$vxe-input-date-notice-background-color};
-  --vxe-input-date-picker-hover-background-color: #{$vxe-input-date-picker-hover-background-color};
-  --vxe-input-date-picker-selected-color: #{$vxe-input-date-picker-selected-color};
-  --vxe-input-date-time-confirm-button-color: #{$vxe-input-date-time-confirm-button-color};
-  --vxe-input-date-picker-festival-selected-color: #{$vxe-input-date-picker-festival-selected-color};
-  --vxe-input-date-picker-notice-selected-background-color: #{$vxe-input-date-picker-notice-selected-background-color};
-  --vxe-input-date-extra-color: #{$vxe-input-date-extra-color};
-  --vxe-input-date-extra-important-color: #{$vxe-input-date-extra-important-color};
-  --vxe-input-date-title-height-default: #{$vxe-input-date-title-height-default};
-  --vxe-input-date-title-height-medium: #{$vxe-input-date-title-height-medium};
-  --vxe-input-date-title-height-small: #{$vxe-input-date-title-height-small};
-  --vxe-input-date-title-height-mini: #{$vxe-input-date-title-height-mini};
-  --vxe-input-date-time-week-row-height-default: #{$vxe-input-date-time-week-row-height-default};
-  --vxe-input-date-time-week-row-height-medium: #{$vxe-input-date-time-week-row-height-medium};
-  --vxe-input-date-time-week-row-height-small: #{$vxe-input-date-time-week-row-height-small};
-  --vxe-input-date-time-week-row-height-mini: #{$vxe-input-date-time-week-row-height-mini};
-  --vxe-input-date-month-year-row-height-default: #{$vxe-input-date-month-year-row-height-default};
-  --vxe-input-date-month-year-row-height-medium: #{$vxe-input-date-month-year-row-height-medium};
-  --vxe-input-date-month-year-row-height-small: #{$vxe-input-date-month-year-row-height-small};
-  --vxe-input-date-month-year-row-height-mini: #{$vxe-input-date-month-year-row-height-mini};
-  --vxe-input-date-quarter-row-height-default: #{$vxe-input-date-quarter-row-height-default};
-  --vxe-input-date-quarter-row-height-medium: #{$vxe-input-date-quarter-row-height-medium};
-  --vxe-input-date-quarter-row-height-small: #{$vxe-input-date-quarter-row-height-small};
-  --vxe-input-date-quarter-row-height-mini: #{$vxe-input-date-quarter-row-height-mini};
-  --vxe-input-height-default: #{$vxe-input-height-default};
-  --vxe-input-height-medium: #{$vxe-input-height-medium};
-  --vxe-input-height-small: #{$vxe-input-height-small};
-  --vxe-input-height-mini: #{$vxe-input-height-mini};
-  --vxe-input-count-color: #{$vxe-input-count-color};
+  --vxe-input-panel-background-color: #{variable.$vxe-input-panel-background-color};
+  --vxe-input-number-disabled-color: #{variable.$vxe-input-number-disabled-color};
+  --vxe-input-date-festival-color: #{variable.$vxe-input-date-festival-color};
+  --vxe-input-date-festival-important-color: #{variable.$vxe-input-date-festival-important-color};
+  --vxe-input-date-notice-background-color: #{variable.$vxe-input-date-notice-background-color};
+  --vxe-input-date-picker-hover-background-color: #{variable.$vxe-input-date-picker-hover-background-color};
+  --vxe-input-date-picker-selected-color: #{variable.$vxe-input-date-picker-selected-color};
+  --vxe-input-date-time-confirm-button-color: #{variable.$vxe-input-date-time-confirm-button-color};
+  --vxe-input-date-picker-festival-selected-color: #{variable.$vxe-input-date-picker-festival-selected-color};
+  --vxe-input-date-picker-notice-selected-background-color: #{variable.$vxe-input-date-picker-notice-selected-background-color};
+  --vxe-input-date-extra-color: #{variable.$vxe-input-date-extra-color};
+  --vxe-input-date-extra-important-color: #{variable.$vxe-input-date-extra-important-color};
+  --vxe-input-date-title-height-default: #{variable.$vxe-input-date-title-height-default};
+  --vxe-input-date-title-height-medium: #{variable.$vxe-input-date-title-height-medium};
+  --vxe-input-date-title-height-small: #{variable.$vxe-input-date-title-height-small};
+  --vxe-input-date-title-height-mini: #{variable.$vxe-input-date-title-height-mini};
+  --vxe-input-date-time-week-row-height-default: #{variable.$vxe-input-date-time-week-row-height-default};
+  --vxe-input-date-time-week-row-height-medium: #{variable.$vxe-input-date-time-week-row-height-medium};
+  --vxe-input-date-time-week-row-height-small: #{variable.$vxe-input-date-time-week-row-height-small};
+  --vxe-input-date-time-week-row-height-mini: #{variable.$vxe-input-date-time-week-row-height-mini};
+  --vxe-input-date-month-year-row-height-default: #{variable.$vxe-input-date-month-year-row-height-default};
+  --vxe-input-date-month-year-row-height-medium: #{variable.$vxe-input-date-month-year-row-height-medium};
+  --vxe-input-date-month-year-row-height-small: #{variable.$vxe-input-date-month-year-row-height-small};
+  --vxe-input-date-month-year-row-height-mini: #{variable.$vxe-input-date-month-year-row-height-mini};
+  --vxe-input-date-quarter-row-height-default: #{variable.$vxe-input-date-quarter-row-height-default};
+  --vxe-input-date-quarter-row-height-medium: #{variable.$vxe-input-date-quarter-row-height-medium};
+  --vxe-input-date-quarter-row-height-small: #{variable.$vxe-input-date-quarter-row-height-small};
+  --vxe-input-date-quarter-row-height-mini: #{variable.$vxe-input-date-quarter-row-height-mini};
+  --vxe-input-height-default: #{variable.$vxe-input-height-default};
+  --vxe-input-height-medium: #{variable.$vxe-input-height-medium};
+  --vxe-input-height-small: #{variable.$vxe-input-height-small};
+  --vxe-input-height-mini: #{variable.$vxe-input-height-mini};
+  --vxe-input-count-color: #{variable.$vxe-input-count-color};
   --vxe-input-count-background-color: #151518;
-  --vxe-input-count-error-color: #{$vxe-input-count-error-color};
+  --vxe-input-count-error-color: #{variable.$vxe-input-count-error-color};
 
   /*textarea*/
-  --vxe-textarea-line-height: #{$vxe-textarea-line-height};
+  --vxe-textarea-line-height: #{variable.$vxe-textarea-line-height};
   --vxe-textarea-background-color: #151518;
 
   /*form*/
-  --vxe-form-item-min-height-default: #{$vxe-form-item-min-height-default};
-  --vxe-form-item-min-height-medium: #{$vxe-form-item-min-height-medium};
-  --vxe-form-item-min-height-small: #{$vxe-form-item-min-height-small};
-  --vxe-form-item-min-height-mini: #{$vxe-form-item-min-height-mini};
+  --vxe-form-item-min-height-default: #{variable.$vxe-form-item-min-height-default};
+  --vxe-form-item-min-height-medium: #{variable.$vxe-form-item-min-height-medium};
+  --vxe-form-item-min-height-small: #{variable.$vxe-form-item-min-height-small};
+  --vxe-form-item-min-height-mini: #{variable.$vxe-form-item-min-height-mini};
   --vxe-form-background-color: #151518;
-  --vxe-form-validate-error-color: #{$vxe-form-validate-error-color};
-  --vxe-form-validate-error-background-color: #{$vxe-form-validate-error-background-color};
+  --vxe-form-validate-error-color: #{variable.$vxe-form-validate-error-color};
+  --vxe-form-validate-error-background-color: #{variable.$vxe-form-validate-error-background-color};
 
   /*select*/
-  --vxe-select-option-height-default: #{$vxe-select-option-height-default};
-  --vxe-select-option-height-medium: #{$vxe-select-option-height-medium};
-  --vxe-select-option-height-small: #{$vxe-select-option-height-small};
-  --vxe-select-option-height-mini: #{$vxe-select-option-height-mini};
+  --vxe-select-option-height-default: #{variable.$vxe-select-option-height-default};
+  --vxe-select-option-height-medium: #{variable.$vxe-select-option-height-medium};
+  --vxe-select-option-height-small: #{variable.$vxe-select-option-height-small};
+  --vxe-select-option-height-mini: #{variable.$vxe-select-option-height-mini};
   --vxe-select-option-hover-background-color: #262727;
   --vxe-select-panel-background-color: #151518;
-  --vxe-select-empty-color: #{$vxe-select-empty-color};
-  --vxe-optgroup-title-color: #{$vxe-optgroup-title-color};
+  --vxe-select-empty-color: #{variable.$vxe-select-empty-color};
+  --vxe-optgroup-title-color: #{variable.$vxe-optgroup-title-color};
 
   /*switch*/
-  --vxe-switch-font-color: #{$vxe-switch-font-color};
-  --vxe-switch-icon-background-color: #{$vxe-switch-icon-background-color};
-  --vxe-switch-open-background-color: #{$vxe-switch-open-background-color};
+  --vxe-switch-font-color: #{variable.$vxe-switch-font-color};
+  --vxe-switch-icon-background-color: #{variable.$vxe-switch-icon-background-color};
+  --vxe-switch-open-background-color: #{variable.$vxe-switch-open-background-color};
   --vxe-switch-close-background-color: #4C4D4F;
-  --vxe-switch-disabled-background-color: #{$vxe-switch-disabled-background-color};
+  --vxe-switch-disabled-background-color: #{variable.$vxe-switch-disabled-background-color};
 
   /*pulldown*/
   --vxe-pulldown-panel-background-color: #151518;