vxe-table 4.6.7 → 4.6.8

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,globalConfs:!0,v:!0,setup:!0,globalStore:!0,VXETable:!0},_xeUtils=(exports.VXETable=void 0,exports._t=_t,exports.setup=exports.globalStore=exports.globalConfs=exports.default=void 0,exports.t=t,exports.use=use,exports.v=void 0,_interopRequireDefault(require("xe-utils"))),_conf=_interopRequireDefault(require("./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")),_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")),_config=(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/config")),_utils=(Object.keys(_config).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_config[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _config[e]}})}),require("../tools/utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function getExportOrImpotType(e,r){const o=[];return _xeUtils.default.objectEach(e,(e,t)=>{0!==e&&e!==r||o.push(t)}),o}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):""}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=exports.setup=_config.config,globalStore=exports.globalStore={},VXETable=exports.VXETable={v:v,version:"4.6.7",config:_config.config,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,setup:setup,globalConfs:globalConfs};var _default=exports.default=VXETable;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={use:!0,t:!0,_t:!0,globalConfs:!0,v:!0,setup:!0,globalStore:!0,VXETable:!0},_xeUtils=(exports.VXETable=void 0,exports._t=_t,exports.setup=exports.globalStore=exports.globalConfs=exports.default=void 0,exports.t=t,exports.use=use,exports.v=void 0,_interopRequireDefault(require("xe-utils"))),_conf=_interopRequireDefault(require("./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")),_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")),_config=(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/config")),_utils=(Object.keys(_config).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_config[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _config[e]}})}),require("../tools/utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function getExportOrImpotType(e,r){const o=[];return _xeUtils.default.objectEach(e,(e,t)=>{0!==e&&e!==r||o.push(t)}),o}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):""}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=exports.setup=_config.config,globalStore=exports.globalStore={},VXETable=exports.VXETable={v:v,version:"4.6.8",config:_config.config,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,setup:setup,globalConfs:globalConfs};var _default=exports.default=VXETable;

package/lib/v-x-e-table/src/interceptor.js

@@ -19,7 +19,7 @@ const interceptor = exports.interceptor = {
   add(type, callback) {
     // 检测类型
     if (process.env.NODE_ENV === 'development') {
-      const eventTypes = ['created', 'mounted', 'activated', 'beforeUnmount', 'unmounted', 'event.clearActived', 'event.clearFilter', 'event.clearAreas', 'event.showMenu', 'event.keydown', 'event.export', 'event.import'];
+      const eventTypes = ['created', 'mounted', 'activated', 'beforeUnmount', 'unmounted', 'event.clearEdit', 'event.clearActived', 'event.clearFilter', 'event.clearAreas', 'event.showMenu', 'event.keydown', 'event.export', 'event.import'];
       if (eventTypes.indexOf(type) === -1) {
         (0, _log.warnLog)('vxe.error.errProp', [`Interceptor.${type}`, eventTypes.join('|')]);
       }

package/lib/v-x-e-table/src/interceptor.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.interceptor=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_log=require("../../tools/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}const storeMap={},interceptor=exports.interceptor={mixin(e){return _xeUtils.default.each(e,(e,r)=>interceptor.add(r,e)),interceptor},get(e){return storeMap[e]||[]},add(r,t){var e;if("development"===process.env.NODE_ENV&&-1===(e=["created","mounted","activated","beforeUnmount","unmounted","event.clearActived","event.clearFilter","event.clearAreas","event.showMenu","event.keydown","event.export","event.import"]).indexOf(r)&&(0,_log.warnLog)("vxe.error.errProp",["Interceptor."+r,e.join("|")]),t){let e=storeMap[r];e=e||(storeMap[r]=[]),"development"===process.env.NODE_ENV&&-1<e.indexOf(t)&&(0,_log.warnLog)("vxe.error.coverProp",["Interceptor",r]),e.push(t)}return interceptor},delete(e,r){var t=storeMap[e];t&&(r?_xeUtils.default.remove(t,e=>e===r):delete storeMap[e])}};
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.interceptor=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_log=require("../../tools/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}const storeMap={},interceptor=exports.interceptor={mixin(e){return _xeUtils.default.each(e,(e,r)=>interceptor.add(r,e)),interceptor},get(e){return storeMap[e]||[]},add(r,t){var e;if("development"===process.env.NODE_ENV&&-1===(e=["created","mounted","activated","beforeUnmount","unmounted","event.clearEdit","event.clearActived","event.clearFilter","event.clearAreas","event.showMenu","event.keydown","event.export","event.import"]).indexOf(r)&&(0,_log.warnLog)("vxe.error.errProp",["Interceptor."+r,e.join("|")]),t){let e=storeMap[r];e=e||(storeMap[r]=[]),"development"===process.env.NODE_ENV&&-1<e.indexOf(t)&&(0,_log.warnLog)("vxe.error.coverProp",["Interceptor",r]),e.push(t)}return interceptor},delete(e,r){var t=storeMap[e];t&&(r?_xeUtils.default.remove(t,e=>e===r):delete storeMap[e])}};

package/lib/vxe-table-custom-module/style/style.css

@@ -397,6 +397,8 @@
 .vxe-table-custom-popup--table-wrapper table {
   width: 100%;
   border: 0;
+  table-layout: fixed;
+  word-break: break-all;
   border-spacing: 0;
   border-collapse: separate;
 }
@@ -417,6 +419,9 @@
 .vxe-table-custom-popup--table-wrapper table tr:first-child td {
   border-top: 0;
 }
+.vxe-table-custom-popup--table-wrapper table tr:hover {
+  background-color: var(--vxe-table-row-hover-background-color);
+}
 .vxe-table-custom-popup--table-wrapper table th,
 .vxe-table-custom-popup--table-wrapper table td {
   height: 44px;
@@ -445,7 +450,6 @@
 }
 
 .vxe-table-custom-popup--name {
-  max-width: 360px;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
@@ -453,42 +457,34 @@
 
 .vxe-table-custom-popup--row.level--2 .vxe-table-custom-popup--name {
   padding-left: 24px;
-  max-width: 236px;
 }
 
 .vxe-table-custom-popup--row.level--3 .vxe-table-custom-popup--name {
   padding-left: 48px;
-  max-width: 212px;
 }
 
 .vxe-table-custom-popup--row.level--4 .vxe-table-custom-popup--name {
   padding-left: 72px;
-  max-width: 188px;
 }
 
 .vxe-table-custom-popup--row.level--5 .vxe-table-custom-popup--name {
   padding-left: 96px;
-  max-width: 164px;
 }
 
 .vxe-table-custom-popup--row.level--6 .vxe-table-custom-popup--name {
   padding-left: 120px;
-  max-width: 140px;
 }
 
 .vxe-table-custom-popup--row.level--7 .vxe-table-custom-popup--name {
   padding-left: 144px;
-  max-width: 116px;
 }
 
 .vxe-table-custom-popup--row.level--8 .vxe-table-custom-popup--name {
   padding-left: 168px;
-  max-width: 92px;
 }
 
 .vxe-table-custom-popup--row.level--9 .vxe-table-custom-popup--name {
   padding-left: 192px;
-  max-width: 68px;
 }
 
 .vxe-table-custom-popup--column-item {
@@ -538,4 +534,14 @@
 }
 .vxe-table-custom-popup--column-sort-btn:active {
   cursor: grabbing;
+}
+
+.vxe-table-custom-popup--table-sort-help-title,
+.vxe-table-custom-popup--table-sort-help-icon {
+  vertical-align: middle;
+}
+
+.vxe-table-custom-popup--table-sort-help-icon {
+  margin-left: 5px;
+  cursor: help;
 }

package/lib/vxe-table-custom-module/style/style.min.css

@@ -1 +1 @@
-[class*=vxe-],[class*=vxe-] :after,[class*=vxe-] :before,[class*=vxe-]:after,[class*=vxe-]:before{box-sizing:border-box}.vxe-table-custom-popup--drag-hint{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}[class*=vxe-]{font-variant:tabular-nums;font-feature-settings:"tnum"}.vxe-primary-color{color:var(--vxe-primary-color)}.vxe-success-color{color:var(--vxe-success-color)}.vxe-info-color{color:var(--vxe-info-color)}.vxe-warning-color{color:var(--vxe-warning-color)}.vxe-danger-color{color:var(--vxe-danger-color)}.vxe-perfect-color{color:var(--vxe-table-header-background-color)}.vxe-row:after{content:"";display:block;clear:both;height:0;overflow:hidden;visibility:hidden}.vxe-row>.vxe-col--1{float:left;width:4.16667%}.vxe-row>.vxe-col--2{float:left;width:8.33333%}.vxe-row>.vxe-col--3{float:left;width:12.5%}.vxe-row>.vxe-col--4{float:left;width:16.66667%}.vxe-row>.vxe-col--5{float:left;width:20.83333%}.vxe-row>.vxe-col--6{float:left;width:25%}.vxe-row>.vxe-col--7{float:left;width:29.16667%}.vxe-row>.vxe-col--8{float:left;width:33.33333%}.vxe-row>.vxe-col--9{float:left;width:37.5%}.vxe-row>.vxe-col--10{float:left;width:41.66667%}.vxe-row>.vxe-col--11{float:left;width:45.83333%}.vxe-row>.vxe-col--12{float:left;width:50%}.vxe-row>.vxe-col--13{float:left;width:54.16667%}.vxe-row>.vxe-col--14{float:left;width:58.33333%}.vxe-row>.vxe-col--15{float:left;width:62.5%}.vxe-row>.vxe-col--16{float:left;width:66.66667%}.vxe-row>.vxe-col--17{float:left;width:70.83333%}.vxe-row>.vxe-col--18{float:left;width:75%}.vxe-row>.vxe-col--19{float:left;width:79.16667%}.vxe-row>.vxe-col--20{float:left;width:83.33333%}.vxe-row>.vxe-col--21{float:left;width:87.5%}.vxe-row>.vxe-col--22{float:left;width:91.66667%}.vxe-row>.vxe-col--23{float:left;width:95.83333%}.vxe-row>.vxe-col--24{float:left;width:100%}.is--animat .vxe-filter--btn:after,.is--animat .vxe-filter--btn:before,.is--animat .vxe-sort--asc-btn:after,.is--animat .vxe-sort--asc-btn:before,.is--animat .vxe-sort--desc-btn:after,.is--animat .vxe-sort--desc-btn:before{transition:border .1s ease-in-out}.is--animat .vxe-input--wrapper .vxe-input{transition:border .1s ease-in-out}.is--animat .vxe-table--expand-btn,.is--animat .vxe-tree--node-btn{transition:transform .1s ease-in-out}.is--animat .vxe-checkbox>input:checked+span,.is--animat .vxe-radio>input:checked+span{transition:background-color .1s ease-in-out}.vxe-table-custom--option{display:flex;flex-direction:row}.vxe-table-custom-wrapper{display:none;position:absolute;top:-4px;right:2px;text-align:left;background-color:var(--vxe-toolbar-panel-background-color);z-index:19;border:1px solid var(--vxe-table-border-color);border-radius:var(--vxe-border-radius);box-shadow:0 1px 6px rgba(0,0,0,.2)}.vxe-table-custom-wrapper.is--active{display:block}.vxe-table-custom--body,.vxe-table-custom--header{list-style-type:none;overflow-x:hidden;overflow-y:auto;margin:0;padding:0;-webkit-user-select:none;-moz-user-select:none;user-select:none}.vxe-table-custom--body>li,.vxe-table-custom--header>li{max-width:18em;min-width:14em;padding:.2em 1em .2em 1em}.vxe-table-custom--body>li.level--2,.vxe-table-custom--header>li.level--2{padding-left:3.5em}.vxe-table-custom--body>li.level--2 .vxe-checkbox--icon,.vxe-table-custom--header>li.level--2 .vxe-checkbox--icon{left:1.8em}.vxe-table-custom--body>li.level--3,.vxe-table-custom--header>li.level--3{padding-left:4.5em}.vxe-table-custom--body>li.level--3 .vxe-checkbox--icon,.vxe-table-custom--header>li.level--3 .vxe-checkbox--icon{left:2.8em}.vxe-table-custom--body>li.level--4,.vxe-table-custom--header>li.level--4{padding-left:5.5em}.vxe-table-custom--body>li.level--4 .vxe-checkbox--icon,.vxe-table-custom--header>li.level--4 .vxe-checkbox--icon{left:3.8em}.vxe-table-custom--body>li.level--5,.vxe-table-custom--header>li.level--5{padding-left:6.5em}.vxe-table-custom--body>li.level--5 .vxe-checkbox--icon,.vxe-table-custom--header>li.level--5 .vxe-checkbox--icon{left:4.8em}.vxe-table-custom--body>li.level--6,.vxe-table-custom--header>li.level--6{padding-left:7.5em}.vxe-table-custom--body>li.level--6 .vxe-checkbox--icon,.vxe-table-custom--header>li.level--6 .vxe-checkbox--icon{left:5.8em}.vxe-table-custom--body>li.level--7,.vxe-table-custom--header>li.level--7{padding-left:8.5em}.vxe-table-custom--body>li.level--7 .vxe-checkbox--icon,.vxe-table-custom--header>li.level--7 .vxe-checkbox--icon{left:6.8em}.vxe-table-custom--body>li.level--8,.vxe-table-custom--header>li.level--8{padding-left:9.5em}.vxe-table-custom--body>li.level--8 .vxe-checkbox--icon,.vxe-table-custom--header>li.level--8 .vxe-checkbox--icon{left:7.8em}.vxe-table-custom--header{padding:.28em 0;font-weight:700;border-bottom:1px solid var(--vxe-table-popup-border-color)}.vxe-table-custom--body{padding:.2em 0;max-height:20em}.vxe-table-custom--body .vxe-table-custom--checkbox-option:hover{background-color:var(--vxe-table-row-hover-background-color)}.vxe-table-custom--footer{border-top:1px solid var(--vxe-table-popup-border-color);text-align:right}.vxe-table-custom--footer button{background-color:transparent;width:50%;height:2.5em;border:0;color:var(--vxe-font-color);text-align:center;cursor:pointer}.vxe-table-custom--footer button:focus{outline:0}.vxe-table-custom--footer button:hover{color:var(--vxe-primary-color)}.vxe-table-custom--checkbox-option{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;flex-grow:1}.vxe-table-custom--checkbox-option .vxe-checkbox--icon{font-size:1.34em}.vxe-table-custom--checkbox-option .vxe-checkbox--icon{color:var(--vxe-input-border-color);vertical-align:middle;font-weight:700;-webkit-user-select:none;-moz-user-select:none;user-select:none}.vxe-table-custom--checkbox-option.is--checked,.vxe-table-custom--checkbox-option.is--indeterminate{color:var(--vxe-primary-color)}.vxe-table-custom--checkbox-option.is--checked .vxe-checkbox--icon,.vxe-table-custom--checkbox-option.is--indeterminate .vxe-checkbox--icon{color:var(--vxe-primary-color)}.vxe-table-custom--checkbox-option:not(.is--disabled){cursor:pointer}.vxe-table-custom--checkbox-option:not(.is--disabled):hover .vxe-checkbox--icon{color:var(--vxe-primary-color)}.vxe-table-custom--checkbox-option.is--hidden{cursor:default}.vxe-table-custom--checkbox-option.is--disabled{color:var(--vxe-font-disabled-color);cursor:not-allowed}.vxe-table-custom--checkbox-option.is--disabled .vxe-checkbox--icon{color:var(--vxe-input-disabled-color)}.vxe-table-custom--checkbox-option .vxe-checkbox--label{padding-left:.5em;vertical-align:middle}.vxe-table-custom--fixed-option{flex-shrink:0;padding-left:.5em;display:flex;flex-direction:row;align-items:center}.vxe-table-custom--fixed-left-option,.vxe-table-custom--fixed-right-option{line-height:1.34em;font-size:1.1em;padding:0 .2em;cursor:pointer}.vxe-table-custom--fixed-left-option.is--checked,.vxe-table-custom--fixed-left-option:hover,.vxe-table-custom--fixed-right-option.is--checked,.vxe-table-custom--fixed-right-option:hover{color:var(--vxe-primary-color)}.vxe-table-custom--fixed-left-option.is--disabled,.vxe-table-custom--fixed-right-option.is--disabled{cursor:no-drop;color:var(--vxe-input-disabled-color)}.vxe-table-custom-popup--body{overflow:auto;height:100%}.vxe-table-custom-popup--table-wrapper{border-bottom:1px solid var(--vxe-table-border-color)}.vxe-table-custom-popup--table-wrapper table{width:100%;border:0;border-spacing:0;border-collapse:separate}.vxe-table-custom-popup--table-wrapper table th{position:sticky;top:0;text-align:left;border-top:1px solid var(--vxe-table-border-color);border-bottom:1px solid var(--vxe-table-border-color);border-left:1px solid var(--vxe-table-border-color);background-color:var(--vxe-table-header-background-color);z-index:7}.vxe-table-custom-popup--table-wrapper table td{border-top:1px solid var(--vxe-table-border-color);border-left:1px solid var(--vxe-table-border-color)}.vxe-table-custom-popup--table-wrapper table tr:first-child td{border-top:0}.vxe-table-custom-popup--table-wrapper table td,.vxe-table-custom-popup--table-wrapper table th{height:44px;padding:0 .6em}.vxe-table-custom-popup--table-wrapper table td:last-child,.vxe-table-custom-popup--table-wrapper table th:last-child{border-right:1px solid var(--vxe-table-border-color)}.vxe-table-custom-popup--drag-hint{display:none;position:absolute;top:0;left:0;padding:.6em 1em .6em 1.8em;max-width:300px;border-radius:var(--vxe-border-radius);-webkit-user-select:none;-moz-user-select:none;user-select:none;pointer-events:none;background-color:var(--vxe-table-body-background-color);box-shadow:0 0 10px 0 rgba(0,0,0,.2);z-index:33}.vxe-table-custom-popup--name{max-width:360px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.vxe-table-custom-popup--row.level--2 .vxe-table-custom-popup--name{padding-left:24px;max-width:236px}.vxe-table-custom-popup--row.level--3 .vxe-table-custom-popup--name{padding-left:48px;max-width:212px}.vxe-table-custom-popup--row.level--4 .vxe-table-custom-popup--name{padding-left:72px;max-width:188px}.vxe-table-custom-popup--row.level--5 .vxe-table-custom-popup--name{padding-left:96px;max-width:164px}.vxe-table-custom-popup--row.level--6 .vxe-table-custom-popup--name{padding-left:120px;max-width:140px}.vxe-table-custom-popup--row.level--7 .vxe-table-custom-popup--name{padding-left:144px;max-width:116px}.vxe-table-custom-popup--row.level--8 .vxe-table-custom-popup--name{padding-left:168px;max-width:92px}.vxe-table-custom-popup--row.level--9 .vxe-table-custom-popup--name{padding-left:192px;max-width:68px}.vxe-table-custom-popup--column-item{position:relative}.vxe-table-custom-popup--column-item.col--fixed,.vxe-table-custom-popup--column-item.col--sort,.vxe-table-custom-popup--column-item.col--visible{text-align:center}.vxe-table-custom-popup--row.active--drag-target[drag-pos=top] .vxe-table-custom-popup--column-item::after{display:block;top:-2px}.vxe-table-custom-popup--row.active--drag-target[drag-pos=bottom] .vxe-table-custom-popup--column-item::after{display:block;bottom:-2px}.vxe-table-custom-popup--row:first-child[drag-pos=top] .vxe-table-custom-popup--column-item::after{top:0}.vxe-table-custom-popup--row:last-child[drag-pos=bottom] .vxe-table-custom-popup--column-item::after{bottom:0}.vxe-table-custom-popup--column-item::after{display:none;content:"";position:absolute;left:-1px;width:calc(100% + 1px);height:3px;background-color:var(--vxe-primary-color);z-index:12}.vxe-table-custom-popup--column-item:last-child::after{width:100%}.vxe-table-custom--flip-move{transition:transform .35s}.vxe-table-custom-popup--column-sort-btn{font-size:1.2em;padding:.2em .5em;cursor:grab}.vxe-table-custom-popup--column-sort-btn:active{cursor:grabbing}
+[class*=vxe-],[class*=vxe-] :after,[class*=vxe-] :before,[class*=vxe-]:after,[class*=vxe-]:before{box-sizing:border-box}.vxe-table-custom-popup--drag-hint{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}[class*=vxe-]{font-variant:tabular-nums;font-feature-settings:"tnum"}.vxe-primary-color{color:var(--vxe-primary-color)}.vxe-success-color{color:var(--vxe-success-color)}.vxe-info-color{color:var(--vxe-info-color)}.vxe-warning-color{color:var(--vxe-warning-color)}.vxe-danger-color{color:var(--vxe-danger-color)}.vxe-perfect-color{color:var(--vxe-table-header-background-color)}.vxe-row:after{content:"";display:block;clear:both;height:0;overflow:hidden;visibility:hidden}.vxe-row>.vxe-col--1{float:left;width:4.16667%}.vxe-row>.vxe-col--2{float:left;width:8.33333%}.vxe-row>.vxe-col--3{float:left;width:12.5%}.vxe-row>.vxe-col--4{float:left;width:16.66667%}.vxe-row>.vxe-col--5{float:left;width:20.83333%}.vxe-row>.vxe-col--6{float:left;width:25%}.vxe-row>.vxe-col--7{float:left;width:29.16667%}.vxe-row>.vxe-col--8{float:left;width:33.33333%}.vxe-row>.vxe-col--9{float:left;width:37.5%}.vxe-row>.vxe-col--10{float:left;width:41.66667%}.vxe-row>.vxe-col--11{float:left;width:45.83333%}.vxe-row>.vxe-col--12{float:left;width:50%}.vxe-row>.vxe-col--13{float:left;width:54.16667%}.vxe-row>.vxe-col--14{float:left;width:58.33333%}.vxe-row>.vxe-col--15{float:left;width:62.5%}.vxe-row>.vxe-col--16{float:left;width:66.66667%}.vxe-row>.vxe-col--17{float:left;width:70.83333%}.vxe-row>.vxe-col--18{float:left;width:75%}.vxe-row>.vxe-col--19{float:left;width:79.16667%}.vxe-row>.vxe-col--20{float:left;width:83.33333%}.vxe-row>.vxe-col--21{float:left;width:87.5%}.vxe-row>.vxe-col--22{float:left;width:91.66667%}.vxe-row>.vxe-col--23{float:left;width:95.83333%}.vxe-row>.vxe-col--24{float:left;width:100%}.is--animat .vxe-filter--btn:after,.is--animat .vxe-filter--btn:before,.is--animat .vxe-sort--asc-btn:after,.is--animat .vxe-sort--asc-btn:before,.is--animat .vxe-sort--desc-btn:after,.is--animat .vxe-sort--desc-btn:before{transition:border .1s ease-in-out}.is--animat .vxe-input--wrapper .vxe-input{transition:border .1s ease-in-out}.is--animat .vxe-table--expand-btn,.is--animat .vxe-tree--node-btn{transition:transform .1s ease-in-out}.is--animat .vxe-checkbox>input:checked+span,.is--animat .vxe-radio>input:checked+span{transition:background-color .1s ease-in-out}.vxe-table-custom--option{display:flex;flex-direction:row}.vxe-table-custom-wrapper{display:none;position:absolute;top:-4px;right:2px;text-align:left;background-color:var(--vxe-toolbar-panel-background-color);z-index:19;border:1px solid var(--vxe-table-border-color);border-radius:var(--vxe-border-radius);box-shadow:0 1px 6px rgba(0,0,0,.2)}.vxe-table-custom-wrapper.is--active{display:block}.vxe-table-custom--body,.vxe-table-custom--header{list-style-type:none;overflow-x:hidden;overflow-y:auto;margin:0;padding:0;-webkit-user-select:none;-moz-user-select:none;user-select:none}.vxe-table-custom--body>li,.vxe-table-custom--header>li{max-width:18em;min-width:14em;padding:.2em 1em .2em 1em}.vxe-table-custom--body>li.level--2,.vxe-table-custom--header>li.level--2{padding-left:3.5em}.vxe-table-custom--body>li.level--2 .vxe-checkbox--icon,.vxe-table-custom--header>li.level--2 .vxe-checkbox--icon{left:1.8em}.vxe-table-custom--body>li.level--3,.vxe-table-custom--header>li.level--3{padding-left:4.5em}.vxe-table-custom--body>li.level--3 .vxe-checkbox--icon,.vxe-table-custom--header>li.level--3 .vxe-checkbox--icon{left:2.8em}.vxe-table-custom--body>li.level--4,.vxe-table-custom--header>li.level--4{padding-left:5.5em}.vxe-table-custom--body>li.level--4 .vxe-checkbox--icon,.vxe-table-custom--header>li.level--4 .vxe-checkbox--icon{left:3.8em}.vxe-table-custom--body>li.level--5,.vxe-table-custom--header>li.level--5{padding-left:6.5em}.vxe-table-custom--body>li.level--5 .vxe-checkbox--icon,.vxe-table-custom--header>li.level--5 .vxe-checkbox--icon{left:4.8em}.vxe-table-custom--body>li.level--6,.vxe-table-custom--header>li.level--6{padding-left:7.5em}.vxe-table-custom--body>li.level--6 .vxe-checkbox--icon,.vxe-table-custom--header>li.level--6 .vxe-checkbox--icon{left:5.8em}.vxe-table-custom--body>li.level--7,.vxe-table-custom--header>li.level--7{padding-left:8.5em}.vxe-table-custom--body>li.level--7 .vxe-checkbox--icon,.vxe-table-custom--header>li.level--7 .vxe-checkbox--icon{left:6.8em}.vxe-table-custom--body>li.level--8,.vxe-table-custom--header>li.level--8{padding-left:9.5em}.vxe-table-custom--body>li.level--8 .vxe-checkbox--icon,.vxe-table-custom--header>li.level--8 .vxe-checkbox--icon{left:7.8em}.vxe-table-custom--header{padding:.28em 0;font-weight:700;border-bottom:1px solid var(--vxe-table-popup-border-color)}.vxe-table-custom--body{padding:.2em 0;max-height:20em}.vxe-table-custom--body .vxe-table-custom--checkbox-option:hover{background-color:var(--vxe-table-row-hover-background-color)}.vxe-table-custom--footer{border-top:1px solid var(--vxe-table-popup-border-color);text-align:right}.vxe-table-custom--footer button{background-color:transparent;width:50%;height:2.5em;border:0;color:var(--vxe-font-color);text-align:center;cursor:pointer}.vxe-table-custom--footer button:focus{outline:0}.vxe-table-custom--footer button:hover{color:var(--vxe-primary-color)}.vxe-table-custom--checkbox-option{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;flex-grow:1}.vxe-table-custom--checkbox-option .vxe-checkbox--icon{font-size:1.34em}.vxe-table-custom--checkbox-option .vxe-checkbox--icon{color:var(--vxe-input-border-color);vertical-align:middle;font-weight:700;-webkit-user-select:none;-moz-user-select:none;user-select:none}.vxe-table-custom--checkbox-option.is--checked,.vxe-table-custom--checkbox-option.is--indeterminate{color:var(--vxe-primary-color)}.vxe-table-custom--checkbox-option.is--checked .vxe-checkbox--icon,.vxe-table-custom--checkbox-option.is--indeterminate .vxe-checkbox--icon{color:var(--vxe-primary-color)}.vxe-table-custom--checkbox-option:not(.is--disabled){cursor:pointer}.vxe-table-custom--checkbox-option:not(.is--disabled):hover .vxe-checkbox--icon{color:var(--vxe-primary-color)}.vxe-table-custom--checkbox-option.is--hidden{cursor:default}.vxe-table-custom--checkbox-option.is--disabled{color:var(--vxe-font-disabled-color);cursor:not-allowed}.vxe-table-custom--checkbox-option.is--disabled .vxe-checkbox--icon{color:var(--vxe-input-disabled-color)}.vxe-table-custom--checkbox-option .vxe-checkbox--label{padding-left:.5em;vertical-align:middle}.vxe-table-custom--fixed-option{flex-shrink:0;padding-left:.5em;display:flex;flex-direction:row;align-items:center}.vxe-table-custom--fixed-left-option,.vxe-table-custom--fixed-right-option{line-height:1.34em;font-size:1.1em;padding:0 .2em;cursor:pointer}.vxe-table-custom--fixed-left-option.is--checked,.vxe-table-custom--fixed-left-option:hover,.vxe-table-custom--fixed-right-option.is--checked,.vxe-table-custom--fixed-right-option:hover{color:var(--vxe-primary-color)}.vxe-table-custom--fixed-left-option.is--disabled,.vxe-table-custom--fixed-right-option.is--disabled{cursor:no-drop;color:var(--vxe-input-disabled-color)}.vxe-table-custom-popup--body{overflow:auto;height:100%}.vxe-table-custom-popup--table-wrapper{border-bottom:1px solid var(--vxe-table-border-color)}.vxe-table-custom-popup--table-wrapper table{width:100%;border:0;table-layout:fixed;word-break:break-all;border-spacing:0;border-collapse:separate}.vxe-table-custom-popup--table-wrapper table th{position:sticky;top:0;text-align:left;border-top:1px solid var(--vxe-table-border-color);border-bottom:1px solid var(--vxe-table-border-color);border-left:1px solid var(--vxe-table-border-color);background-color:var(--vxe-table-header-background-color);z-index:7}.vxe-table-custom-popup--table-wrapper table td{border-top:1px solid var(--vxe-table-border-color);border-left:1px solid var(--vxe-table-border-color)}.vxe-table-custom-popup--table-wrapper table tr:first-child td{border-top:0}.vxe-table-custom-popup--table-wrapper table tr:hover{background-color:var(--vxe-table-row-hover-background-color)}.vxe-table-custom-popup--table-wrapper table td,.vxe-table-custom-popup--table-wrapper table th{height:44px;padding:0 .6em}.vxe-table-custom-popup--table-wrapper table td:last-child,.vxe-table-custom-popup--table-wrapper table th:last-child{border-right:1px solid var(--vxe-table-border-color)}.vxe-table-custom-popup--drag-hint{display:none;position:absolute;top:0;left:0;padding:.6em 1em .6em 1.8em;max-width:300px;border-radius:var(--vxe-border-radius);-webkit-user-select:none;-moz-user-select:none;user-select:none;pointer-events:none;background-color:var(--vxe-table-body-background-color);box-shadow:0 0 10px 0 rgba(0,0,0,.2);z-index:33}.vxe-table-custom-popup--name{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.vxe-table-custom-popup--row.level--2 .vxe-table-custom-popup--name{padding-left:24px}.vxe-table-custom-popup--row.level--3 .vxe-table-custom-popup--name{padding-left:48px}.vxe-table-custom-popup--row.level--4 .vxe-table-custom-popup--name{padding-left:72px}.vxe-table-custom-popup--row.level--5 .vxe-table-custom-popup--name{padding-left:96px}.vxe-table-custom-popup--row.level--6 .vxe-table-custom-popup--name{padding-left:120px}.vxe-table-custom-popup--row.level--7 .vxe-table-custom-popup--name{padding-left:144px}.vxe-table-custom-popup--row.level--8 .vxe-table-custom-popup--name{padding-left:168px}.vxe-table-custom-popup--row.level--9 .vxe-table-custom-popup--name{padding-left:192px}.vxe-table-custom-popup--column-item{position:relative}.vxe-table-custom-popup--column-item.col--fixed,.vxe-table-custom-popup--column-item.col--sort,.vxe-table-custom-popup--column-item.col--visible{text-align:center}.vxe-table-custom-popup--row.active--drag-target[drag-pos=top] .vxe-table-custom-popup--column-item::after{display:block;top:-2px}.vxe-table-custom-popup--row.active--drag-target[drag-pos=bottom] .vxe-table-custom-popup--column-item::after{display:block;bottom:-2px}.vxe-table-custom-popup--row:first-child[drag-pos=top] .vxe-table-custom-popup--column-item::after{top:0}.vxe-table-custom-popup--row:last-child[drag-pos=bottom] .vxe-table-custom-popup--column-item::after{bottom:0}.vxe-table-custom-popup--column-item::after{display:none;content:"";position:absolute;left:-1px;width:calc(100% + 1px);height:3px;background-color:var(--vxe-primary-color);z-index:12}.vxe-table-custom-popup--column-item:last-child::after{width:100%}.vxe-table-custom--flip-move{transition:transform .35s}.vxe-table-custom-popup--column-sort-btn{font-size:1.2em;padding:.2em .5em;cursor:grab}.vxe-table-custom-popup--column-sort-btn:active{cursor:grabbing}.vxe-table-custom-popup--table-sort-help-icon,.vxe-table-custom-popup--table-sort-help-title{vertical-align:middle}.vxe-table-custom-popup--table-sort-help-icon{margin-left:5px;cursor:help}

package/package.json

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

package/packages/custom/src/panel.ts

@@ -6,6 +6,7 @@ import GlobalConfig from '../../v-x-e-table/src/conf'
 import VxeModalComponent from '../../modal/src/modal'
 import VxeButtonComponent from '../../button/src/button'
 import VxeRadioGroupComponent from '../../radio/src/group'
+import VxeTooltipComponent from '../../tooltip/src/tooltip'
 import XEUtils from 'xe-utils'
 
 import { VxeTableDefines, VxeTablePrivateMethods, VxeTableConstructor, VxeTableMethods, VxeTableCustomStoreObj, VxeColumnPropTypes } from '../../../types/all'
@@ -22,7 +23,7 @@ export default defineComponent({
     const $xetable = inject('$xetable', {} as VxeTableConstructor & VxeTableMethods & VxeTablePrivateMethods)
 
     const { reactData } = $xetable
-    const { computeCustomOpts, computeIsMaxFixedColumn } = $xetable.getComputeMaps()
+    const { computeCustomOpts, computeColumnOpts, computeIsMaxFixedColumn } = $xetable.getComputeMaps()
 
     const refElem = ref() as Ref<HTMLDivElement>
     const bodyElemRef = ref() as Ref<HTMLDivElement>
@@ -385,6 +386,7 @@ export default defineComponent({
       const { customColumnList } = reactData
       const customOpts = computeCustomOpts.value
       const { checkMethod, visibleMethod } = customOpts
+      const columnOpts = computeColumnOpts.value
       const isMaxFixedColumn = computeIsMaxFixedColumn.value
       const trVNs: VNode[] = []
       XEUtils.eachTree(customColumnList, (column, index, items, path, parent) => {
@@ -477,7 +479,7 @@ export default defineComponent({
         modelValue: customStore.visible,
         title: GlobalConfig.i18n('vxe.custom.cstmTitle'),
         width: '40vw',
-        minWidth: 500,
+        minWidth: 520,
         height: '50vh',
         minHeight: 300,
         mask: true,
@@ -502,10 +504,10 @@ export default defineComponent({
                 h('colgroup', {}, [
                   h('col', {
                     style: {
-                      width: '60px'
+                      width: '80px'
                     }
                   }),
-                  h('col'),
+                  h('col', {}),
                   h('col', {
                     style: {
                       width: '80px'
@@ -519,10 +521,24 @@ export default defineComponent({
                 ]),
                 h('thead', {}, [
                   h('tr', {}, [
-                    h('th', {}, GlobalConfig.i18n('vxe.custom.setting.colSort')),
+                    h('th', {}, [
+                      h('span', {
+                        class: 'vxe-table-custom-popup--table-sort-help-title'
+                      }, GlobalConfig.i18n('vxe.custom.setting.colSort')),
+                      h(VxeTooltipComponent, {
+                        enterable: true,
+                        content: GlobalConfig.i18n('vxe.custom.setting.sortHelpTip')
+                      }, {
+                        default: () => {
+                          return h('i', {
+                            class: 'vxe-table-custom-popup--table-sort-help-icon vxe-icon-question-circle-fill'
+                          })
+                        }
+                      })
+                    ]),
                     h('th', {}, GlobalConfig.i18n('vxe.custom.setting.colTitle')),
                     h('th', {}, GlobalConfig.i18n('vxe.custom.setting.colVisible')),
-                    h('th', {}, GlobalConfig.i18n('vxe.custom.setting.colFixed'))
+                    h('th', {}, GlobalConfig.i18n('vxe.custom.setting.colFixed', [columnOpts.maxFixedSize || 0]))
                   ])
                 ]),
                 h(TransitionGroup, {

package/packages/edit/src/hook.ts

@@ -504,10 +504,10 @@ const editHook: VxeGlobalHooksHandles.HookOptions = {
         return null
       },
       clearActived (evnt) {
-        // if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-        //   warnLog('vxe.error.delFunc', ['clearActived', 'clearEdit'])
-        // }
         // 即将废弃
+        if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+          warnLog('vxe.error.delFunc', ['clearActived', 'clearEdit'])
+        }
         return this.clearEdit(evnt)
       },
       /**
@@ -515,7 +515,7 @@ const editHook: VxeGlobalHooksHandles.HookOptions = {
        */
       clearEdit (evnt) {
         const { editStore } = reactData
-        const { actived } = editStore
+        const { actived, focused } = editStore
         const { row, column } = actived
         if (row || column) {
           syncActivedCell()
@@ -537,6 +537,8 @@ const editHook: VxeGlobalHooksHandles.HookOptions = {
             return $xetable.clearValidate()
           }
         }
+        focused.row = null
+        focused.column = null
         return nextTick()
       },
       /**

package/packages/locale/lang/en-US.ts

@@ -114,9 +114,10 @@ export default {
       cstmDragTarget: 'Moving target: {0}',
       setting: {
         colSort: 'Sort',
+        sortHelpTip: 'Click and drag the icon to adjust the order of the columns.',
         colTitle: 'Title',
         colVisible: 'Visible',
-        colFixed: 'Freeze column',
+        colFixed: 'Freeze columns (Max. {0})',
         fixedLeft: 'Left',
         fixedUnset: 'Unset',
         fixedRight: 'Right'

package/packages/locale/lang/es-ES.ts

@@ -114,9 +114,10 @@ export default {
       cstmDragTarget: 'Moving target: {0}',
       setting: {
         colSort: 'Sort',
+        sortHelpTip: 'Click and drag the icon to adjust the order of the columns.',
         colTitle: 'Title',
         colVisible: 'Visible',
-        colFixed: 'Freeze column',
+        colFixed: 'Freeze columns (Max {0})',
         fixedLeft: 'Left',
         fixedUnset: 'Unset',
         fixedRight: 'Right'

package/packages/locale/lang/ja-JP.ts

@@ -114,9 +114,10 @@ export default {
       cstmDragTarget: '移動ターゲット: {0}',
       setting: {
         colSort: 'ソート',
+        sortHelpTip: 'Click and drag the icon to adjust the order of the columns.',
         colTitle: 'タイトル',
         colVisible: '表示',
-        colFixed: '列固定',
+        colFixed: '冻结列（最多 {0} 列）',
         fixedLeft: '左側',
         fixedUnset: '指定しない',
         fixedRight: '右側'

package/packages/locale/lang/pt-BR.ts

@@ -114,9 +114,10 @@ export default {
       cstmDragTarget: 'Moving target: {0}',
       setting: {
         colSort: 'Sort',
+        sortHelpTip: 'Click and drag the icon to adjust the order of the columns.',
         colTitle: 'Title',
         colVisible: 'Visible',
-        colFixed: 'Freeze column',
+        colFixed: 'Freeze columns (Max {0})',
         fixedLeft: 'Left',
         fixedUnset: 'Unset',
         fixedRight: 'Right'

package/packages/locale/lang/zh-CN.ts

@@ -114,9 +114,10 @@ export default {
       cstmDragTarget: '移动目标：{0}',
       setting: {
         colSort: '排序',
+        sortHelpTip: '点击并拖动图标可以调整列的排序',
         colTitle: '标题',
         colVisible: '是否显示',
-        colFixed: '冻结列',
+        colFixed: '冻结列（最多 {0} 列）',
         fixedLeft: '左侧',
         fixedUnset: '不设置',
         fixedRight: '右侧'

package/packages/locale/lang/zh-TC.ts

@@ -114,9 +114,10 @@ export default {
       cstmDragTarget: '移動目標：{0}',
       setting: {
         colSort: '排序',
+        sortHelpTip: '點擊並拖動圖標可以調整列的排序',
         colTitle: '標題',
         colVisible: '是否顯示',
-        colFixed: '冻结列',
+        colFixed: '冻结列（最多 {0} 列）',
         fixedLeft: '左側',
         fixedUnset: '不設定',
         fixedRight: '右側'

package/packages/menu/src/hooks.ts

@@ -21,7 +21,7 @@ const tableMenuHook: VxeGlobalHooksHandles.HookOptions = {
     /**
      * 显示快捷菜单
      */
-    const openContextMenu = (evnt: any, type: 'header' | 'body' | 'footer', params: any) => {
+    const handleOpenMenuEvent = (evnt: any, type: 'header' | 'body' | 'footer', params: any) => {
       const { ctxMenuStore } = reactData
       const isMenu = computeIsMenu.value
       const menuOpts = computeMenuOpts.value
@@ -142,6 +142,7 @@ const tableMenuHook: VxeGlobalHooksHandles.HookOptions = {
           menuPrivateMethods.ctxMenuLinkEvent(evnt, ctxMenuStore[property])
         }
       },
+      handleOpenMenuEvent,
       /**
        * 快捷菜单事件处理
        */
@@ -170,7 +171,7 @@ const tableMenuHook: VxeGlobalHooksHandles.HookOptions = {
               if (activeArea && activeArea.row && activeArea.column) {
                 params.row = activeArea.row
                 params.column = activeArea.column
-                openContextMenu(evnt, type, params)
+                handleOpenMenuEvent(evnt, type, params)
                 return
               }
             } else if (mouseConfig && mouseOpts.selected) {
@@ -178,7 +179,7 @@ const tableMenuHook: VxeGlobalHooksHandles.HookOptions = {
               if (selected.row && selected.column) {
                 params.row = selected.row
                 params.column = selected.column
-                openContextMenu(evnt, type, params)
+                handleOpenMenuEvent(evnt, type, params)
                 return
               }
             }
@@ -209,14 +210,14 @@ const tableMenuHook: VxeGlobalHooksHandles.HookOptions = {
                 }
               }
               const eventType = `${typePrefix}cell-menu` as 'cell-menu' | 'header-cell-menu' | 'footer-cell-menu'
-              openContextMenu(evnt, layout, params)
+              handleOpenMenuEvent(evnt, layout, params)
               $xetable.dispatchEvent(eventType, params, evnt)
               return
             } else if (getEventTargetNode(evnt, el, `vxe-table--${layout}-wrapper`, target => target.getAttribute('xid') === xID).flag) {
               if (menuOpts.trigger === 'cell') {
                 evnt.preventDefault()
               } else {
-                openContextMenu(evnt, layout, params)
+                handleOpenMenuEvent(evnt, layout, params)
               }
               return
             }

package/packages/table/src/table.ts

@@ -187,6 +187,11 @@ export default defineComponent({
           row: null,
           column: null
         },
+        // 当前被强制聚焦单元格，只会在鼠标点击后算聚焦
+        focused: {
+          row: null,
+          column: null
+        },
         insertMaps: {},
         removeMaps: {}
       },
@@ -4046,6 +4051,7 @@ export default defineComponent({
         return !!rowExpandedMaps[rowid]
       },
       isExpandByRow (row) {
+        // 已废弃
         if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
           warnLog('vxe.error.delFunc', ['isExpandByRow', 'isRowExpandByRow'])
         }
@@ -4546,7 +4552,7 @@ export default defineComponent({
               // 如果是激活状态，点击了单元格之外
               if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-clear').flag) {
                 // 如果手动调用了激活单元格，避免触发源被移除后导致重复关闭
-                tablePrivateMethods.preventEvent(evnt, 'event.clearActived', actived.args, () => {
+                tablePrivateMethods.preventEvent(evnt, 'event.clearEdit', actived.args, () => {
                   let isClear
                   if (editOpts.mode === 'row') {
                     const rowTargetNode = getEventTargetNode(evnt, el, 'vxe-body--row')
@@ -5357,7 +5363,14 @@ export default defineComponent({
         reactData.reColumnFlag++
       },
       preventEvent (evnt, type, args, next, end) {
-        const evntList = VXETable.interceptor.get(type)
+        let evntList = VXETable.interceptor.get(type)
+
+        // 兼容老版本
+        if (!evntList.length && type === 'event.clearEdit') {
+          evntList = VXETable.interceptor.get('event.clearActived')
+        }
+        // 兼容老版本
+
         let rest
         if (!evntList.some((func) => func(Object.assign({ $grid: $xegrid, $table: $xetable, $event: evnt }, args)) === false)) {
           if (next) {
@@ -5931,7 +5944,7 @@ export default defineComponent({
         const { lazy } = expandOpts
         const rowid = getRowid($xetable, row)
         if (!lazy || !rowExpandLazyLoadedMaps[rowid]) {
-          const expanded = !tableMethods.isExpandByRow(row)
+          const expanded = !tableMethods.isRowExpandByRow(row)
           const columnIndex = tableMethods.getColumnIndex(column)
           const $columnIndex = tableMethods.getVMColumnIndex(column)
           tableMethods.setRowExpand(row, expanded)

package/packages/v-x-e-table/src/interceptor.ts

@@ -16,7 +16,7 @@ export const interceptor: VxeGlobalInterceptor = {
   add (type, callback) {
     // 检测类型
     if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-      const eventTypes: VxeGlobalInterceptorHandles.Type[] = ['created', 'mounted', 'activated', 'beforeUnmount', 'unmounted', 'event.clearActived', 'event.clearFilter', 'event.clearAreas', 'event.showMenu', 'event.keydown', 'event.export', 'event.import']
+      const eventTypes: VxeGlobalInterceptorHandles.Type[] = ['created', 'mounted', 'activated', 'beforeUnmount', 'unmounted', 'event.clearEdit', 'event.clearActived', 'event.clearFilter', 'event.clearAreas', 'event.showMenu', 'event.keydown', 'event.export', 'event.import']
       if (eventTypes.indexOf(type) === -1) {
         warnLog('vxe.error.errProp', [`Interceptor.${type}`, eventTypes.join('|')])
       }

package/styles/custom.scss

@@ -125,6 +125,8 @@
   table {
     width: 100%;
     border: 0;
+    table-layout: fixed;
+    word-break: break-all;
     border-spacing: 0;
     border-collapse: separate;
     th {
@@ -147,6 +149,9 @@
           border-top: 0;
         }
       }
+      &:hover {
+        background-color: var(--vxe-table-row-hover-background-color);
+      }
     }
     th,
     td {
@@ -176,7 +181,6 @@
 }
 
 .vxe-table-custom-popup--name {
-  max-width: 360px;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
@@ -188,7 +192,6 @@
     &.level--#{$index} {
       .vxe-table-custom-popup--name {
         padding-left: $paddingLeft;
-        max-width: 260px - $paddingLeft;
       }
     }
   }
@@ -272,3 +275,12 @@
     cursor: grabbing;
   }
 }
+
+.vxe-table-custom-popup--table-sort-help-title,
+.vxe-table-custom-popup--table-sort-help-icon {
+  vertical-align: middle;
+}
+.vxe-table-custom-popup--table-sort-help-icon {
+  margin-left: 5px;
+  cursor: help;
+}

package/types/module/edit.d.ts

@@ -108,7 +108,7 @@ export interface TableEditMethods<D = VxeTableDataRow> {
     column: VxeTableDefines.ColumnInfo<D>
   }
   /**
-   * 请使用 clearEdit
+   * 请使用 clearEdit()
    * @deprecated
    */
   clearActived(evnt?: Event): Promise<any>

package/types/module/menu.d.ts

@@ -42,6 +42,7 @@ export interface TableMenuMethods<D = VxeTableDataRow> {
 
 export interface TableMenuPrivateMethods<D = VxeTableDataRow> {
   moveCtxMenu(evnt: any, ctxMenuStore: any, property: any, hasOper: boolean, operRest: any, menuList: any): void
+  handleOpenMenuEvent(evnt: Event, type: 'header' | 'body' | 'footer', params: any): void
   handleGlobalContextmenuEvent(evnt: any): void
   ctxMenuMouseoverEvent(evnt: any, item: any, child?: any): void
   ctxMenuMouseoutEvent(evnt: any, item: any): void

package/types/table.d.ts

@@ -954,6 +954,12 @@ export interface TableReactData<D = VxeTableDataRow> {
       column: any
       [key: string]: any
     },
+    // 当前被强制聚焦单元格，只会在鼠标点击后算聚焦
+    focused: {
+      row: D | null
+      column: any
+      [key: string]: any
+    },
     insertMaps: {
       [key: string]: any
     }

package/types/v-x-e-table/interceptor.d.ts

@@ -3,7 +3,7 @@ import { VxeGridConstructor, VxeGridPrivateMethods } from '../grid'
 
 export namespace VxeGlobalInterceptorHandles {
   export type HookType = 'created' | 'mounted' | 'activated' | 'beforeUnmount' | 'unmounted'
-  export type EventType = 'event.clearActived' | 'event.clearFilter' | 'event.clearAreas' | 'event.showMenu' | 'event.keydown' | 'event.export' | 'event.import'
+  export type EventType = 'event.clearEdit' | 'event.clearActived' | 'event.clearFilter' | 'event.clearAreas' | 'event.showMenu' | 'event.keydown' | 'event.export' | 'event.import'
   export type Type = HookType | EventType
 
   export type InterceptorCallback = (params: any) => any
@@ -16,7 +16,7 @@ export namespace VxeGlobalInterceptorHandles {
 
   export interface InterceptorKeydownParams extends InterceptorParams { }
   export interface InterceptorClearFilterParams extends InterceptorParams { }
-  export interface InterceptorClearActivedParams extends InterceptorParams { }
+  export interface InterceptorClearEditParams extends InterceptorParams { }
   export interface InterceptorClearAreasParams extends InterceptorParams { }
 
   export interface InterceptorExportParams extends InterceptorParams {