vxe-table 4.6.0 → 4.6.2

package/lib/tooltip/src/tooltip.js

@@ -328,12 +328,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
         target
       } = reactData;
       const wrapperElem = refElem.value;
-      if (wrapperElem) {
-        const parentNode = wrapperElem.parentNode;
-        if (parentNode) {
-          parentNode.removeChild(wrapperElem);
-        }
-      }
       if (target) {
         if (trigger === 'hover') {
           target.onmouseenter = null;
@@ -342,6 +336,12 @@ var _default = exports.default = (0, _vue.defineComponent)({
           target.onclick = null;
         }
       }
+      if (wrapperElem) {
+        const parentNode = wrapperElem.parentNode;
+        if (parentNode) {
+          parentNode.removeChild(wrapperElem);
+        }
+      }
     });
     const renderContent = () => {
       const {

package/lib/tooltip/src/tooltip.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_size=require("../../hooks/size"),_utils=require("../../tools/utils"),_dom=require("../../tools/dom"),_vn=require("../../tools/vn");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var _default=exports.default=(0,_vue.defineComponent)({name:"VxeTooltip",props:{modelValue:Boolean,size:{type:String,default:()=>_conf.default.tooltip.size||_conf.default.size},trigger:{type:String,default:()=>_conf.default.tooltip.trigger},theme:{type:String,default:()=>_conf.default.tooltip.theme},content:{type:[String,Number],default:null},useHTML:Boolean,zIndex:[String,Number],popupClassName:[String,Function],isArrow:{type:Boolean,default:!0},enterable:Boolean,enterDelay:{type:Number,default:()=>_conf.default.tooltip.enterDelay},leaveDelay:{type:Number,default:()=>_conf.default.tooltip.leaveDelay}},emits:["update:modelValue"],setup(p,e){const{slots:v,emit:l}=e;var t=_xeUtils.default.uniqueId();const c=(0,_size.useSize)(p),d=(0,_vue.reactive)({target:null,isUpdate:!1,visible:!1,tipContent:"",tipActive:!1,tipTarget:null,tipZindex:0,tipStore:{style:{},placement:"",arrowStyle:{}}}),f=(0,_vue.ref)(),i={refElem:f},_={xID:t,props:p,context:e,reactData:d,getRefMaps:()=>i};let r={};const o=()=>{var{tipTarget:i,tipStore:l}=d;if(i){var{scrollTop:o,scrollLeft:r,visibleWidth:n}=(0,_dom.getDomNode)(),{top:a,left:u}=(0,_dom.getAbsolutePos)(i),s=f.value,p=s.offsetHeight,s=s.offsetWidth;let e=u,t=a-p-6;(e=Math.max(6,u+Math.floor((i.offsetWidth-s)/2)))+s+6>r+n&&(e=r+n-s-6),a-p<o+6&&(l.placement="bottom",t=a+i.offsetHeight+6),l.style.top=t+"px",l.style.left=e+"px",l.arrowStyle.left=u-e+i.offsetWidth/2+"px"}},n=e=>{e!==d.visible&&(d.visible=e,d.isUpdate=!0,l("update:modelValue",e))},a=()=>{d.visible?r.close():r.open()},u=()=>{r.open()},s=()=>{var{trigger:e,enterable:t,leaveDelay:i}=p;d.tipActive=!1,t&&"hover"===e?setTimeout(()=>{d.tipActive||r.close()},i):r.close()},m=()=>{d.tipActive=!0},g=()=>{var{trigger:e,enterable:t,leaveDelay:i}=p;d.tipActive=!1,t&&"hover"===e&&setTimeout(()=>{d.tipActive||r.close()},i)},x=()=>{var e=d["tipStore"],t=f.value;return t&&!t.parentNode&&document.body.appendChild(t),n(!0),d.tipZindex<(0,_utils.getLastZIndex)()&&(d.tipZindex=(0,_utils.nextZIndex)()),e.placement="top",e.style={width:"auto",left:0,top:0,zIndex:p.zIndex||d.tipZindex},e.arrowStyle={left:"50%"},r.updatePlacement()},h=_xeUtils.default.debounce(()=>{d.tipActive&&x()},p.enterDelay,{leading:!1,trailing:!0});r={dispatchEvent(e,t,i){l(e,Object.assign({$tooltip:_,$event:i},t))},open(e,t){return r.toVisible(e||d.target,t)},close(){return d.tipTarget=null,d.tipActive=!1,Object.assign(d.tipStore,{style:{},placement:"",arrowStyle:null}),n(!1),(0,_vue.nextTick)()},toVisible(e,t){if(e){var{trigger:i,enterDelay:l}=p;if(d.tipActive=!0,d.tipTarget=e,t&&(d.tipContent=t),!l||"hover"!==i)return x();h()}return(0,_vue.nextTick)()},updatePlacement(){return(0,_vue.nextTick)().then(()=>{var e=d["tipTarget"],t=f.value;if(e&&t)return o(),(0,_vue.nextTick)().then(o)})},isActived(){return d.tipActive},setActived(e){d.tipActive=!!e}},Object.assign(_,r),(0,_vue.watch)(()=>p.content,()=>{d.tipContent=p.content}),(0,_vue.watch)(()=>p.modelValue,()=>{d.isUpdate||(p.modelValue?r.open():r.close()),d.isUpdate=!1}),(0,_vue.onMounted)(()=>{(0,_vue.nextTick)(()=>{var{trigger:e,content:t,modelValue:i}=p;const l=f.value;if(l){const o=l.parentNode;o&&(d.tipContent=t,d.tipZindex=(0,_utils.nextZIndex)(),_xeUtils.default.arrayEach(l.children,(e,t)=>{1<t&&(o.insertBefore(e,l),d.target||(d.target=e))}),o.removeChild(l),t=d["target"],t&&("hover"===e?(t.onmouseenter=u,t.onmouseleave=s):"click"===e&&(t.onclick=a)),i)&&r.open()}})}),(0,_vue.onBeforeUnmount)(()=>{var e,t=p["trigger"],i=d["target"],l=f.value;l&&(e=l.parentNode)&&e.removeChild(l),i&&("hover"===t?(i.onmouseenter=null,i.onmouseleave=null):"click"===t&&(i.onclick=null))});return _.renderVN=()=>{var{popupClassName:e,theme:t,isArrow:i,enterable:l}=p,{tipActive:o,visible:r,tipStore:n}=d,a=v.default,u=c.value;let s;return l&&(s={onMouseenter:m,onMouseleave:g}),(0,_vue.h)("div",{ref:f,class:["vxe-table--tooltip-wrapper","theme--"+t,e?_xeUtils.default.isFunction(e)?e({$tooltip:_}):e:"",{["size--"+u]:u,["placement--"+n.placement]:n.placement,"is--enterable":l,"is--visible":r,"is--arrow":i,"is--active":o}],style:n.style,...s},[(t=p.useHTML,e=d.tipContent,(u=v.content)?(0,_vue.h)("div",{key:1,class:"vxe-table--tooltip-content"},(0,_vn.getSlotVNs)(u({}))):t?(0,_vue.h)("div",{key:2,class:"vxe-table--tooltip-content",innerHTML:e}):(0,_vue.h)("div",{key:3,class:"vxe-table--tooltip-content"},(0,_utils.formatText)(e))),(0,_vue.h)("div",{class:"vxe-table--tooltip-arrow",style:n.arrowStyle}),...a?(0,_vn.getSlotVNs)(a({})):[]])},_},render(){return this.renderVN()}});
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_xeUtils=_interopRequireDefault(require("xe-utils")),_conf=_interopRequireDefault(require("../../v-x-e-table/src/conf")),_size=require("../../hooks/size"),_utils=require("../../tools/utils"),_dom=require("../../tools/dom"),_vn=require("../../tools/vn");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}var _default=exports.default=(0,_vue.defineComponent)({name:"VxeTooltip",props:{modelValue:Boolean,size:{type:String,default:()=>_conf.default.tooltip.size||_conf.default.size},trigger:{type:String,default:()=>_conf.default.tooltip.trigger},theme:{type:String,default:()=>_conf.default.tooltip.theme},content:{type:[String,Number],default:null},useHTML:Boolean,zIndex:[String,Number],popupClassName:[String,Function],isArrow:{type:Boolean,default:!0},enterable:Boolean,enterDelay:{type:Number,default:()=>_conf.default.tooltip.enterDelay},leaveDelay:{type:Number,default:()=>_conf.default.tooltip.leaveDelay}},emits:["update:modelValue"],setup(p,e){const{slots:v,emit:l}=e;var t=_xeUtils.default.uniqueId();const c=(0,_size.useSize)(p),d=(0,_vue.reactive)({target:null,isUpdate:!1,visible:!1,tipContent:"",tipActive:!1,tipTarget:null,tipZindex:0,tipStore:{style:{},placement:"",arrowStyle:{}}}),f=(0,_vue.ref)(),i={refElem:f},_={xID:t,props:p,context:e,reactData:d,getRefMaps:()=>i};let r={};const o=()=>{var{tipTarget:i,tipStore:l}=d;if(i){var{scrollTop:o,scrollLeft:r,visibleWidth:n}=(0,_dom.getDomNode)(),{top:a,left:u}=(0,_dom.getAbsolutePos)(i),s=f.value,p=s.offsetHeight,s=s.offsetWidth;let e=u,t=a-p-6;(e=Math.max(6,u+Math.floor((i.offsetWidth-s)/2)))+s+6>r+n&&(e=r+n-s-6),a-p<o+6&&(l.placement="bottom",t=a+i.offsetHeight+6),l.style.top=t+"px",l.style.left=e+"px",l.arrowStyle.left=u-e+i.offsetWidth/2+"px"}},n=e=>{e!==d.visible&&(d.visible=e,d.isUpdate=!0,l("update:modelValue",e))},a=()=>{d.visible?r.close():r.open()},u=()=>{r.open()},s=()=>{var{trigger:e,enterable:t,leaveDelay:i}=p;d.tipActive=!1,t&&"hover"===e?setTimeout(()=>{d.tipActive||r.close()},i):r.close()},m=()=>{d.tipActive=!0},g=()=>{var{trigger:e,enterable:t,leaveDelay:i}=p;d.tipActive=!1,t&&"hover"===e&&setTimeout(()=>{d.tipActive||r.close()},i)},x=()=>{var e=d["tipStore"],t=f.value;return t&&!t.parentNode&&document.body.appendChild(t),n(!0),d.tipZindex<(0,_utils.getLastZIndex)()&&(d.tipZindex=(0,_utils.nextZIndex)()),e.placement="top",e.style={width:"auto",left:0,top:0,zIndex:p.zIndex||d.tipZindex},e.arrowStyle={left:"50%"},r.updatePlacement()},h=_xeUtils.default.debounce(()=>{d.tipActive&&x()},p.enterDelay,{leading:!1,trailing:!0});r={dispatchEvent(e,t,i){l(e,Object.assign({$tooltip:_,$event:i},t))},open(e,t){return r.toVisible(e||d.target,t)},close(){return d.tipTarget=null,d.tipActive=!1,Object.assign(d.tipStore,{style:{},placement:"",arrowStyle:null}),n(!1),(0,_vue.nextTick)()},toVisible(e,t){if(e){var{trigger:i,enterDelay:l}=p;if(d.tipActive=!0,d.tipTarget=e,t&&(d.tipContent=t),!l||"hover"!==i)return x();h()}return(0,_vue.nextTick)()},updatePlacement(){return(0,_vue.nextTick)().then(()=>{var e=d["tipTarget"],t=f.value;if(e&&t)return o(),(0,_vue.nextTick)().then(o)})},isActived(){return d.tipActive},setActived(e){d.tipActive=!!e}},Object.assign(_,r),(0,_vue.watch)(()=>p.content,()=>{d.tipContent=p.content}),(0,_vue.watch)(()=>p.modelValue,()=>{d.isUpdate||(p.modelValue?r.open():r.close()),d.isUpdate=!1}),(0,_vue.onMounted)(()=>{(0,_vue.nextTick)(()=>{var{trigger:e,content:t,modelValue:i}=p;const l=f.value;if(l){const o=l.parentNode;o&&(d.tipContent=t,d.tipZindex=(0,_utils.nextZIndex)(),_xeUtils.default.arrayEach(l.children,(e,t)=>{1<t&&(o.insertBefore(e,l),d.target||(d.target=e))}),o.removeChild(l),t=d["target"],t&&("hover"===e?(t.onmouseenter=u,t.onmouseleave=s):"click"===e&&(t.onclick=a)),i)&&r.open()}})}),(0,_vue.onBeforeUnmount)(()=>{var e=p["trigger"],t=d["target"],i=f.value;t&&("hover"===e?(t.onmouseenter=null,t.onmouseleave=null):"click"===e&&(t.onclick=null)),i&&(e=i.parentNode)&&e.removeChild(i)});return _.renderVN=()=>{var{popupClassName:e,theme:t,isArrow:i,enterable:l}=p,{tipActive:o,visible:r,tipStore:n}=d,a=v.default,u=c.value;let s;return l&&(s={onMouseenter:m,onMouseleave:g}),(0,_vue.h)("div",{ref:f,class:["vxe-table--tooltip-wrapper","theme--"+t,e?_xeUtils.default.isFunction(e)?e({$tooltip:_}):e:"",{["size--"+u]:u,["placement--"+n.placement]:n.placement,"is--enterable":l,"is--visible":r,"is--arrow":i,"is--active":o}],style:n.style,...s},[(t=p.useHTML,e=d.tipContent,(u=v.content)?(0,_vue.h)("div",{key:1,class:"vxe-table--tooltip-content"},(0,_vn.getSlotVNs)(u({}))):t?(0,_vue.h)("div",{key:2,class:"vxe-table--tooltip-content",innerHTML:e}):(0,_vue.h)("div",{key:3,class:"vxe-table--tooltip-content"},(0,_utils.formatText)(e))),(0,_vue.h)("div",{class:"vxe-table--tooltip-arrow",style:n.arrowStyle}),...a?(0,_vn.getSlotVNs)(a({})):[]])},_},render(){return this.renderVN()}});

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

@@ -181,7 +181,7 @@ const setup = exports.setup = _config.config;
 const globalStore = exports.globalStore = {};
 const VXETable = exports.VXETable = {
   v,
-  version: "4.6.0",
+  version: "4.6.2",
   config: _config.config,
   globalStore,
   interceptor: _interceptor.interceptor,

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.0",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.2",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/conf.js

@@ -315,10 +315,6 @@ const GlobalConfig = {
     // export: {
     //   types: ['csv', 'html', 'xml', 'txt']
     // },
-    custom: {
-      allowFixed: true,
-      showFooter: true
-    }
     // buttons: []
   },
   button: {

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;const iconPrefix="vxe-icon-",GlobalConfig={size:null,zIndex:999,version:0,emptyCell:"　",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,minHeight:144,resizeConfig:{refreshDelay:250},radioConfig:{strict:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,message:"inline",msgMode:"single"},columnConfig:{maxFixedSize:4},customConfig:{allowFixed:!0,showFooter:!0},sortConfig:{showIcon:!0,iconLayout:"vertical"},filterConfig:{showIcon:!0},treeConfig:{rowField:"id",parentField:"parentId",childrenField:"children",hasChildField:"hasChild",mapChildrenField:"_X_ROW_CHILD",indent:20,showIcon:!0},expandConfig:{showIcon:!0},editConfig:{showIcon:!0,showAsterisk:!0},importConfig:{modes:["insert","covering"]},exportConfig:{modes:["current","selected"]},printConfig:{modes:["current","selected"]},mouseConfig:{extension:!0},keyboardConfig:{isEsc:!0},areaConfig:{selectCellByHeader:!0},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},scrollX:{gt:60},scrollY:{gt:100}},export:{types:{}},icon:{LOADING:iconPrefix+"spinner roll vxe-loading--default-icon",TABLE_SORT_ASC:iconPrefix+"caret-up",TABLE_SORT_DESC:iconPrefix+"caret-down",TABLE_FILTER_NONE:iconPrefix+"funnel",TABLE_FILTER_MATCH:iconPrefix+"funnel",TABLE_EDIT:iconPrefix+"edit",TABLE_TITLE_PREFIX:iconPrefix+"question-circle-fill",TABLE_TITLE_SUFFIX:iconPrefix+"question-circle-fill",TABLE_TREE_LOADED:iconPrefix+"spinner roll",TABLE_TREE_OPEN:iconPrefix+"caret-right rotate90",TABLE_TREE_CLOSE:iconPrefix+"caret-right",TABLE_EXPAND_LOADED:iconPrefix+"spinner roll",TABLE_EXPAND_OPEN:iconPrefix+"arrow-right rotate90",TABLE_EXPAND_CLOSE:iconPrefix+"arrow-right",TABLE_CHECKBOX_CHECKED:iconPrefix+"checkbox-checked",TABLE_CHECKBOX_UNCHECKED:iconPrefix+"checkbox-unchecked",TABLE_CHECKBOX_INDETERMINATE:iconPrefix+"checkbox-indeterminate",TABLE_RADIO_CHECKED:iconPrefix+"radio-checked",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",BUTTON_DROPDOWN:iconPrefix+"arrow-down",BUTTON_LOADING:iconPrefix+"spinner roll",SELECT_LOADED:iconPrefix+"spinner roll",SELECT_OPEN:iconPrefix+"caret-down rotate180",SELECT_CLOSE:iconPrefix+"caret-down",PAGER_HOME:iconPrefix+"home-page",PAGER_END:iconPrefix+"end-page",PAGER_JUMP_PREV:iconPrefix+"arrow-double-left",PAGER_JUMP_NEXT:iconPrefix+"arrow-double-right",PAGER_PREV_PAGE:iconPrefix+"arrow-left",PAGER_NEXT_PAGE:iconPrefix+"arrow-right",PAGER_JUMP_MORE:iconPrefix+"ellipsis-h",INPUT_CLEAR:iconPrefix+"error-circle-fill",INPUT_PWD:iconPrefix+"eye-fill",INPUT_SHOW_PWD:iconPrefix+"eye-fill-close",INPUT_PREV_NUM:iconPrefix+"caret-up",INPUT_NEXT_NUM:iconPrefix+"caret-down",INPUT_DATE:iconPrefix+"calendar",INPUT_SEARCH:iconPrefix+"search",MODAL_ZOOM_IN:iconPrefix+"square",MODAL_ZOOM_OUT:iconPrefix+"maximize",MODAL_CLOSE:iconPrefix+"close",MODAL_INFO:iconPrefix+"info-circle-fill",MODAL_SUCCESS:iconPrefix+"success-circle-fill",MODAL_WARNING:iconPrefix+"warnion-circle-fill",MODAL_ERROR:iconPrefix+"error-circle-fill",MODAL_QUESTION:iconPrefix+"question-circle-fill",MODAL_LOADING:iconPrefix+"spinner roll",TOOLBAR_TOOLS_REFRESH:iconPrefix+"repeat",TOOLBAR_TOOLS_REFRESH_LOADING:iconPrefix+"repeat roll",TOOLBAR_TOOLS_IMPORT:iconPrefix+"upload",TOOLBAR_TOOLS_EXPORT:iconPrefix+"download",TOOLBAR_TOOLS_PRINT:iconPrefix+"print",TOOLBAR_TOOLS_FULLSCREEN:iconPrefix+"fullscreen",TOOLBAR_TOOLS_MINIMIZE:iconPrefix+"minimize",TOOLBAR_TOOLS_CUSTOM:iconPrefix+"custom-column",TOOLBAR_TOOLS_FIXED_LEFT:iconPrefix+"fixed-left",TOOLBAR_TOOLS_FIXED_LEFT_ACTIVED:iconPrefix+"fixed-left-fill",TOOLBAR_TOOLS_FIXED_RIGHT:iconPrefix+"fixed-right",TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVED:iconPrefix+"fixed-right-fill",FORM_PREFIX:iconPrefix+"question-circle-fill",FORM_SUFFIX:iconPrefix+"question-circle-fill",FORM_FOLDING:iconPrefix+"arrow-up rotate180",FORM_UNFOLDING:iconPrefix+"arrow-up"},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,message:!0,props:{list:null,result:"result",total:"page.total",message:"message"}}},tooltip:{trigger:"hover",theme:"dark",enterDelay:500,leaveDelay:300},pager:{},form:{validConfig:{showMessage:!0,autoPos:!0},tooltipConfig:{enterable:!0},titleAsterisk:!0},input:{startDate:new Date(1900,0,1),endDate:new Date(2100,0,1),startDay:1,selectDay:1,digits:2,controls:!0},textarea:{},select:{multiCharOverflow:8},toolbar:{custom:{allowFixed:!0,showFooter:!0}},button:{},radio:{strict:!0},radioButton:{strict:!0},radioGroup:{strict:!0},checkbox:{},checkboxGroup:{},switch:{},modal:{top:15,showHeader:!0,minWidth:340,minHeight:140,lockView:!0,mask:!0,duration:3e3,marginSize:0,dblclickZoom:!0,showTitleOverflow:!0,animat:!0,showClose:!0,draggable:!0,storageKey:"VXE_MODAL_POSITION"},list:{scrollY:{enabled:!0,gt:100}},i18n:e=>e};var _default=exports.default=GlobalConfig;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;const iconPrefix="vxe-icon-",GlobalConfig={size:null,zIndex:999,version:0,emptyCell:"　",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,minHeight:144,resizeConfig:{refreshDelay:250},radioConfig:{strict:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,message:"inline",msgMode:"single"},columnConfig:{maxFixedSize:4},customConfig:{allowFixed:!0,showFooter:!0},sortConfig:{showIcon:!0,iconLayout:"vertical"},filterConfig:{showIcon:!0},treeConfig:{rowField:"id",parentField:"parentId",childrenField:"children",hasChildField:"hasChild",mapChildrenField:"_X_ROW_CHILD",indent:20,showIcon:!0},expandConfig:{showIcon:!0},editConfig:{showIcon:!0,showAsterisk:!0},importConfig:{modes:["insert","covering"]},exportConfig:{modes:["current","selected"]},printConfig:{modes:["current","selected"]},mouseConfig:{extension:!0},keyboardConfig:{isEsc:!0},areaConfig:{selectCellByHeader:!0},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},scrollX:{gt:60},scrollY:{gt:100}},export:{types:{}},icon:{LOADING:iconPrefix+"spinner roll vxe-loading--default-icon",TABLE_SORT_ASC:iconPrefix+"caret-up",TABLE_SORT_DESC:iconPrefix+"caret-down",TABLE_FILTER_NONE:iconPrefix+"funnel",TABLE_FILTER_MATCH:iconPrefix+"funnel",TABLE_EDIT:iconPrefix+"edit",TABLE_TITLE_PREFIX:iconPrefix+"question-circle-fill",TABLE_TITLE_SUFFIX:iconPrefix+"question-circle-fill",TABLE_TREE_LOADED:iconPrefix+"spinner roll",TABLE_TREE_OPEN:iconPrefix+"caret-right rotate90",TABLE_TREE_CLOSE:iconPrefix+"caret-right",TABLE_EXPAND_LOADED:iconPrefix+"spinner roll",TABLE_EXPAND_OPEN:iconPrefix+"arrow-right rotate90",TABLE_EXPAND_CLOSE:iconPrefix+"arrow-right",TABLE_CHECKBOX_CHECKED:iconPrefix+"checkbox-checked",TABLE_CHECKBOX_UNCHECKED:iconPrefix+"checkbox-unchecked",TABLE_CHECKBOX_INDETERMINATE:iconPrefix+"checkbox-indeterminate",TABLE_RADIO_CHECKED:iconPrefix+"radio-checked",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",BUTTON_DROPDOWN:iconPrefix+"arrow-down",BUTTON_LOADING:iconPrefix+"spinner roll",SELECT_LOADED:iconPrefix+"spinner roll",SELECT_OPEN:iconPrefix+"caret-down rotate180",SELECT_CLOSE:iconPrefix+"caret-down",PAGER_HOME:iconPrefix+"home-page",PAGER_END:iconPrefix+"end-page",PAGER_JUMP_PREV:iconPrefix+"arrow-double-left",PAGER_JUMP_NEXT:iconPrefix+"arrow-double-right",PAGER_PREV_PAGE:iconPrefix+"arrow-left",PAGER_NEXT_PAGE:iconPrefix+"arrow-right",PAGER_JUMP_MORE:iconPrefix+"ellipsis-h",INPUT_CLEAR:iconPrefix+"error-circle-fill",INPUT_PWD:iconPrefix+"eye-fill",INPUT_SHOW_PWD:iconPrefix+"eye-fill-close",INPUT_PREV_NUM:iconPrefix+"caret-up",INPUT_NEXT_NUM:iconPrefix+"caret-down",INPUT_DATE:iconPrefix+"calendar",INPUT_SEARCH:iconPrefix+"search",MODAL_ZOOM_IN:iconPrefix+"square",MODAL_ZOOM_OUT:iconPrefix+"maximize",MODAL_CLOSE:iconPrefix+"close",MODAL_INFO:iconPrefix+"info-circle-fill",MODAL_SUCCESS:iconPrefix+"success-circle-fill",MODAL_WARNING:iconPrefix+"warnion-circle-fill",MODAL_ERROR:iconPrefix+"error-circle-fill",MODAL_QUESTION:iconPrefix+"question-circle-fill",MODAL_LOADING:iconPrefix+"spinner roll",TOOLBAR_TOOLS_REFRESH:iconPrefix+"repeat",TOOLBAR_TOOLS_REFRESH_LOADING:iconPrefix+"repeat roll",TOOLBAR_TOOLS_IMPORT:iconPrefix+"upload",TOOLBAR_TOOLS_EXPORT:iconPrefix+"download",TOOLBAR_TOOLS_PRINT:iconPrefix+"print",TOOLBAR_TOOLS_FULLSCREEN:iconPrefix+"fullscreen",TOOLBAR_TOOLS_MINIMIZE:iconPrefix+"minimize",TOOLBAR_TOOLS_CUSTOM:iconPrefix+"custom-column",TOOLBAR_TOOLS_FIXED_LEFT:iconPrefix+"fixed-left",TOOLBAR_TOOLS_FIXED_LEFT_ACTIVED:iconPrefix+"fixed-left-fill",TOOLBAR_TOOLS_FIXED_RIGHT:iconPrefix+"fixed-right",TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVED:iconPrefix+"fixed-right-fill",FORM_PREFIX:iconPrefix+"question-circle-fill",FORM_SUFFIX:iconPrefix+"question-circle-fill",FORM_FOLDING:iconPrefix+"arrow-up rotate180",FORM_UNFOLDING:iconPrefix+"arrow-up"},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,message:!0,props:{list:null,result:"result",total:"page.total",message:"message"}}},tooltip:{trigger:"hover",theme:"dark",enterDelay:500,leaveDelay:300},pager:{},form:{validConfig:{showMessage:!0,autoPos:!0},tooltipConfig:{enterable:!0},titleAsterisk:!0},input:{startDate:new Date(1900,0,1),endDate:new Date(2100,0,1),startDay:1,selectDay:1,digits:2,controls:!0},textarea:{},select:{multiCharOverflow:8},toolbar:{},button:{},radio:{strict:!0},radioButton:{strict:!0},radioGroup:{strict:!0},checkbox:{},checkboxGroup:{},switch:{},modal:{top:15,showHeader:!0,minWidth:340,minHeight:140,lockView:!0,mask:!0,duration:3e3,marginSize:0,dblclickZoom:!0,showTitleOverflow:!0,animat:!0,showClose:!0,draggable:!0,storageKey:"VXE_MODAL_POSITION"},list:{scrollY:{enabled:!0,gt:100}},i18n:e=>e};var _default=exports.default=GlobalConfig;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "4.6.0",
+  "version": "4.6.2",
   "description": "一个基于 vue 的 PC 端表单/表格组件，支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器、JSON 配置式...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
@@ -28,7 +28,7 @@
   "style": "lib/style.css",
   "typings": "types/index.d.ts",
   "dependencies": {
-    "dom-zindex": "^1.0.1",
+    "dom-zindex": "^1.0.2",
     "xe-utils": "^3.5.25"
   },
   "devDependencies": {

package/packages/custom/src/panel.ts

@@ -126,7 +126,7 @@ export default defineComponent({
       const { collectColumn } = internalData
       const customOpts = computeCustomOpts.value
       const { maxHeight } = customStore
-      const { checkMethod, trigger } = customOpts
+      const { checkMethod, visibleMethod, trigger } = customOpts
       const isMaxFixedColumn = computeIsMaxFixedColumn.value
       const colVNs: VNode[] = []
       const customWrapperOns: any = {}
@@ -136,15 +136,16 @@ export default defineComponent({
         customWrapperOns.onMouseleave = handleWrapperMouseleaveEvent
       }
       XEUtils.eachTree(collectColumn, (column, index, items, path, parent) => {
-        const colTitle = formatText(column.getTitle(), 1)
-        const colKey = column.getKey()
-        const isColGroup = column.children && column.children.length
-        const isDisabled = checkMethod ? !checkMethod({ column }) : false
-        if (isColGroup || colKey) {
+        const isVisible = visibleMethod ? visibleMethod({ column }) : true
+        if (isVisible) {
           const isChecked = column.visible
           const isIndeterminate = column.halfVisible
+          const isColGroup = column.children && column.children.length
+          const colTitle = formatText(column.getTitle(), 1)
+          const isDisabled = checkMethod ? !checkMethod({ column }) : false
           colVNs.push(
             h('li', {
+              key: column.id,
               class: ['vxe-table-custom--option', `level--${column.level}`, {
                 'is--group': isColGroup
               }]
@@ -255,20 +256,23 @@ export default defineComponent({
       const { customStore } = props
       const { collectColumn } = internalData
       const customOpts = computeCustomOpts.value
-      const { checkMethod } = customOpts
+      const { checkMethod, visibleMethod } = customOpts
       const isMaxFixedColumn = computeIsMaxFixedColumn.value
       const trVNs: VNode[] = []
       XEUtils.eachTree(collectColumn, (column, index, items, path, parent) => {
-        const colTitle = formatText(column.getTitle(), 1)
-        const colKey = column.getKey()
-        const isColGroup = column.children && column.children.length
-        const isDisabled = checkMethod ? !checkMethod({ column }) : false
-        if (isColGroup || colKey) {
+        const isVisible = visibleMethod ? visibleMethod({ column }) : true
+        if (isVisible) {
           const isChecked = column.visible
           const isIndeterminate = column.halfVisible
+          const colTitle = formatText(column.getTitle(), 1)
+          const isColGroup = column.children && column.children.length
+          const isDisabled = checkMethod ? !checkMethod({ column }) : false
           trVNs.push(
             h('tr', {
-              class: [`vxe-table-custom-popup--row-level${column.level}`]
+              key: column.id,
+              class: [`vxe-table-custom-popup--row-level${column.level}`, {
+                'is--group': isColGroup
+              }]
             }, [
               h('td', {
                 class: 'vxe-table-custom-popup--column-name'

package/packages/grid/src/grid.ts

@@ -1088,7 +1088,10 @@ export default defineComponent({
             })
           }
         })
-        return $xetable.loadColumn(columns)
+        if ($xetable) {
+          return $xetable.loadColumn(columns)
+        }
+        return nextTick()
       }
       (gridMethods as any).reloadColumn = (columns: any[]): Promise<any> => {
         gridExtendTableMethods.clearAll()

package/packages/table/src/table.ts

@@ -193,8 +193,7 @@ export default defineComponent({
         row: null,
         column: null,
         content: null,
-        visible: false,
-        currOpts: null
+        visible: false
       },
       // 存放数据校验相关信息
       validStore: {
@@ -406,11 +405,9 @@ export default defineComponent({
     })
 
     const computeTipConfig = computed(() => {
-      const { tooltipStore } = reactData
       const tooltipOpts = computeTooltipOpts.value
       return {
-        ...tooltipOpts,
-        ...tooltipStore.currOpts
+        ...tooltipOpts
       }
     })
 
@@ -4989,8 +4986,7 @@ export default defineComponent({
         Object.assign(tooltipStore, {
           row,
           column,
-          visible: true,
-          currOpts: null
+          visible: true
         })
         nextTick(() => {
           const $tooltip = refTooltip.value
@@ -5577,10 +5573,13 @@ export default defineComponent({
         const tipContent = iconParams.content || (iconParams as any).message
         if (tipContent) {
           const { tooltipStore } = reactData
+          const { column } = params
           const content = getFuncText(tipContent)
           handleTargetEnterEvent(true)
+          tooltipStore.row = null
+          tooltipStore.column = column
           tooltipStore.visible = true
-          tooltipStore.currOpts = { ...params, content: null }
+          // tooltipStore.currOpts = { content: null }
           nextTick(() => {
             const $tooltip = refTooltip.value
             if ($tooltip) {

package/packages/tooltip/src/tooltip.ts

@@ -277,12 +277,6 @@ export default defineComponent({
       const { trigger } = props
       const { target } = reactData
       const wrapperElem = refElem.value
-      if (wrapperElem) {
-        const parentNode = wrapperElem.parentNode
-        if (parentNode) {
-          parentNode.removeChild(wrapperElem)
-        }
-      }
       if (target) {
         if (trigger === 'hover') {
           target.onmouseenter = null
@@ -291,6 +285,12 @@ export default defineComponent({
           target.onclick = null
         }
       }
+      if (wrapperElem) {
+        const parentNode = wrapperElem.parentNode
+        if (parentNode) {
+          parentNode.removeChild(wrapperElem)
+        }
+      }
     })
 
     const renderContent = () => {

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

@@ -320,10 +320,6 @@ const GlobalConfig: VXETableConfigOptions = {
     // export: {
     //   types: ['csv', 'html', 'xml', 'txt']
     // },
-    custom: {
-      allowFixed: true,
-      showFooter: true
-    }
     // buttons: []
   },
   button: {

package/types/table.d.ts

@@ -963,8 +963,7 @@ export interface TableReactData<D = VxeTableDataRow> {
     row: D | null
     column: any
     content: any
-    visible: boolean,
-    currOpts: any
+    visible: boolean
   }
   // 存放数据校验相关信息
   validStore: {
@@ -1463,6 +1462,10 @@ export namespace VxeTablePropTypes {
      * 自定义列是否允许列选中的方法，该方法的返回值用来决定这一列的 checkbox 是否可以选中
      */
     checkMethod?(params: { column: VxeTableDefines.ColumnInfo }): boolean
+    /**
+     * 自定义列是否的方法，该方法的返回值用来决定这一列是否显示
+     */
+    visibleMethod?(params: { column: VxeTableDefines.ColumnInfo }): boolean
     allowFixed?: boolean
     showFooter?: boolean
     icon?: string