vxe-table 4.4.2-beta.8 → 4.4.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (63) hide show
  1. package/es/button/style.css +3 -3
  2. package/es/filter/src/hook.js +2 -2
  3. package/es/icon/style.css +1 -1
  4. package/es/style.css +1 -1
  5. package/es/style.min.css +1 -1
  6. package/es/table/src/column.js +1 -1
  7. package/es/table/src/columnInfo.js +1 -1
  8. package/es/table/src/group.js +1 -1
  9. package/es/table/src/table.js +21 -1
  10. package/es/table/src/util.js +10 -1
  11. package/es/tools/log.js +1 -1
  12. package/es/v-x-e-table/index.js +1 -1
  13. package/es/vxe-button/style.css +3 -3
  14. package/lib/button/style/style.css +3 -3
  15. package/lib/button/style/style.min.css +1 -1
  16. package/lib/filter/src/hook.js +2 -2
  17. package/lib/filter/src/hook.min.js +1 -1
  18. package/lib/icon/style/style.css +1 -1
  19. package/lib/icon/style/style.min.css +1 -1
  20. package/lib/index.umd.js +37 -9
  21. package/lib/index.umd.min.js +1 -1
  22. package/lib/style.css +1 -1
  23. package/lib/style.min.css +1 -1
  24. package/lib/table/src/column.js +1 -1
  25. package/lib/table/src/column.min.js +1 -1
  26. package/lib/table/src/columnInfo.js +1 -1
  27. package/lib/table/src/group.js +1 -1
  28. package/lib/table/src/group.min.js +1 -1
  29. package/lib/table/src/table.js +25 -1
  30. package/lib/table/src/table.min.js +1 -1
  31. package/lib/table/src/util.js +9 -1
  32. package/lib/table/src/util.min.js +1 -1
  33. package/lib/tools/log.js +1 -1
  34. package/lib/tools/log.min.js +1 -1
  35. package/lib/v-x-e-table/index.js +1 -1
  36. package/lib/v-x-e-table/index.min.js +1 -1
  37. package/lib/vxe-button/style/style.css +3 -3
  38. package/lib/vxe-button/style/style.min.css +1 -1
  39. package/package.json +1 -1
  40. package/packages/filter/src/hook.ts +2 -2
  41. package/packages/table/src/column.ts +1 -1
  42. package/packages/table/src/columnInfo.ts +1 -1
  43. package/packages/table/src/group.ts +1 -1
  44. package/packages/table/src/table.ts +23 -1
  45. package/packages/table/src/util.ts +9 -1
  46. package/styles/button.scss +2 -2
  47. package/styles/cssvar.scss +1 -0
  48. package/styles/variable.scss +2 -1
  49. package/types/grid.d.ts +0 -1
  50. package/types/table.d.ts +6 -0
  51. package/types/tooltip.d.ts +1 -1
  52. /package/es/icon/style/{iconfont.1686616884931.ttf → iconfont.1687652107433.ttf} +0 -0
  53. /package/es/icon/style/{iconfont.1686616884931.woff → iconfont.1687652107433.woff} +0 -0
  54. /package/es/icon/style/{iconfont.1686616884931.woff2 → iconfont.1687652107433.woff2} +0 -0
  55. /package/es/{iconfont.1686616884931.ttf → iconfont.1687652107433.ttf} +0 -0
  56. /package/es/{iconfont.1686616884931.woff → iconfont.1687652107433.woff} +0 -0
  57. /package/es/{iconfont.1686616884931.woff2 → iconfont.1687652107433.woff2} +0 -0
  58. /package/lib/icon/style/{iconfont.1686616884931.ttf → iconfont.1687652107433.ttf} +0 -0
  59. /package/lib/icon/style/{iconfont.1686616884931.woff → iconfont.1687652107433.woff} +0 -0
  60. /package/lib/icon/style/{iconfont.1686616884931.woff2 → iconfont.1687652107433.woff2} +0 -0
  61. /package/lib/{iconfont.1686616884931.ttf → iconfont.1687652107433.ttf} +0 -0
  62. /package/lib/{iconfont.1686616884931.woff → iconfont.1687652107433.woff} +0 -0
  63. /package/lib/{iconfont.1686616884931.woff2 → iconfont.1687652107433.woff2} +0 -0
@@ -1 +1 @@
1
- "use strict";Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={use:!0,t:!0,_t:!0,config:!0,v:!0,VXETable:!0},_xeUtils=(exports.VXETable=void 0,exports._t=_t,exports.default=exports.config=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")),_hooks=(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/hooks")),_setup=(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/setup")),_utils=(Object.keys(_setup).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_setup[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _setup[e]}})}),require("../tools/utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function getExportOrImpotType(e,r){var o=[];return _xeUtils.default.objectEach(e,function(e,t){0!==e&&e!==r||o.push(t)}),o}var 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):""}var VXETableConfig=function(){function e(){}return Object.defineProperty(e.prototype,"zIndex",{get:function(){return(0,_utils.getLastZIndex)()},enumerable:!1,configurable:!0}),Object.defineProperty(e.prototype,"nextZIndex",{get:function(){return(0,_utils.nextZIndex)()},enumerable:!1,configurable:!0}),Object.defineProperty(e.prototype,"exportTypes",{get:function(){return getExportOrImpotType(_conf.default.export.types,1)},enumerable:!1,configurable:!0}),Object.defineProperty(e.prototype,"importTypes",{get:function(){return getExportOrImpotType(_conf.default.export.types,2)},enumerable:!1,configurable:!0}),e}(),config=new VXETableConfig,v=(exports.config=config,"v4"),VXETable={v:exports.v=v,version:"4.4.2-beta.8",setup:_setup.setup,interceptor:_interceptor.interceptor,renderer:_renderer.renderer,commands:_commands.commands,formats:_formats.formats,menus:_menus.menus,hooks:_hooks.hooks,config:config,use:use,t:t,_t:_t},_default=exports.VXETable=VXETable;exports.default=_default;
1
+ "use strict";Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={use:!0,t:!0,_t:!0,config:!0,v:!0,VXETable:!0},_xeUtils=(exports.VXETable=void 0,exports._t=_t,exports.default=exports.config=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")),_hooks=(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/hooks")),_setup=(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/setup")),_utils=(Object.keys(_setup).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_setup[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _setup[e]}})}),require("../tools/utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function getExportOrImpotType(e,r){var o=[];return _xeUtils.default.objectEach(e,function(e,t){0!==e&&e!==r||o.push(t)}),o}var 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):""}var VXETableConfig=function(){function e(){}return Object.defineProperty(e.prototype,"zIndex",{get:function(){return(0,_utils.getLastZIndex)()},enumerable:!1,configurable:!0}),Object.defineProperty(e.prototype,"nextZIndex",{get:function(){return(0,_utils.nextZIndex)()},enumerable:!1,configurable:!0}),Object.defineProperty(e.prototype,"exportTypes",{get:function(){return getExportOrImpotType(_conf.default.export.types,1)},enumerable:!1,configurable:!0}),Object.defineProperty(e.prototype,"importTypes",{get:function(){return getExportOrImpotType(_conf.default.export.types,2)},enumerable:!1,configurable:!0}),e}(),config=new VXETableConfig,v=(exports.config=config,"v4"),VXETable={v:exports.v=v,version:"4.4.3",setup:_setup.setup,interceptor:_interceptor.interceptor,renderer:_renderer.renderer,commands:_commands.commands,formats:_formats.formats,menus:_menus.menus,hooks:_hooks.hooks,config:config,use:use,t:t,_t:_t},_default=exports.VXETable=VXETable;exports.default=_default;
@@ -381,8 +381,8 @@
381
381
  min-width: var(--vxe-font-size-mini);
382
382
  }
383
383
 
384
- .vxe-input + .vxe-button, .vxe-input + .vxe-button--dropdown,
385
- .vxe-button + .vxe-button,
384
+ .vxe-input + .vxe-button.type--button, .vxe-input + .vxe-button--dropdown,
385
+ .vxe-button + .vxe-button.type--button,
386
386
  .vxe-button + .vxe-button--dropdown {
387
387
  margin-left: 12px;
388
388
  }
@@ -404,7 +404,7 @@
404
404
  .vxe-button--dropdown {
405
405
  position: relative;
406
406
  }
407
- .vxe-button--dropdown + .vxe-button, .vxe-button--dropdown + .vxe-button--dropdown {
407
+ .vxe-button--dropdown + .vxe-button.type--button, .vxe-button--dropdown + .vxe-button--dropdown {
408
408
  margin-left: 12px;
409
409
  }
410
410
  .vxe-button--dropdown > .vxe-button.type--button.theme--primary {
@@ -1 +1 @@
1
- .vxe-button{position:relative;text-align:center;background-color:var(--vxe-button-default-background-color);outline:0;font-size:var(--vxe-font-size);max-width:var(--vxe-button-max-width);line-height:1.5;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;white-space:nowrap;-webkit-user-select:none;-moz-user-select:none;user-select:none;-webkit-appearance:none;-moz-appearance:none;appearance:none;transition:border .2s ease-in-out}.vxe-button:not(.is--disabled){color:var(--vxe-font-color);cursor:pointer}.vxe-button.is--loading{cursor:progress}.vxe-button.is--loading:before{content:"";position:absolute;left:-1px;top:-1px;right:-1px;bottom:-1px;border-radius:inherit;background-color:hsla(0deg,0%,100%,.35);pointer-events:none}.vxe-button.is--disabled{color:var(--vxe-font-disabled-color)}.vxe-button.is--disabled:not(.is--loading){cursor:no-drop}.vxe-button.type--text{text-decoration:none;border:0;padding:.1em .5em;background-color:transparent}.vxe-button.type--text:not(.is--disabled):focus{color:var(--vxe-font-darken-color)}.vxe-button.type--text:not(.is--disabled):hover{color:var(--vxe-primary-lighten-color)}.vxe-button.type--text.theme--primary{color:var(--vxe-primary-color)}.vxe-button.type--text.theme--primary:not(.is--disabled):focus{color:var(--vxe-primary-darken-color)}.vxe-button.type--text.theme--primary:not(.is--disabled):hover{color:var(--vxe-primary-lighten-color)}.vxe-button.type--text.theme--primary.is--disabled{color:var(--vxe-primary-disabled-color)}.vxe-button.type--text.theme--success{color:var(--vxe-success-color)}.vxe-button.type--text.theme--success:not(.is--disabled):focus{color:var(--vxe-success-darken-color)}.vxe-button.type--text.theme--success:not(.is--disabled):hover{color:var(--vxe-success-lighten-color)}.vxe-button.type--text.theme--success.is--disabled{color:var(--vxe-success-disabled-color)}.vxe-button.type--text.theme--info{color:var(--vxe-info-color)}.vxe-button.type--text.theme--info:not(.is--disabled):focus{color:var(--vxe-info-darken-color)}.vxe-button.type--text.theme--info:not(.is--disabled):hover{color:var(--vxe-info-lighten-color)}.vxe-button.type--text.theme--info.is--disabled{color:var(--vxe-info-disabled-color)}.vxe-button.type--text.theme--warning{color:var(--vxe-warning-color)}.vxe-button.type--text.theme--warning:not(.is--disabled):focus{color:var(--vxe-warning-darken-color)}.vxe-button.type--text.theme--warning:not(.is--disabled):hover{color:var(--vxe-warning-lighten-color)}.vxe-button.type--text.theme--warning.is--disabled{color:var(--vxe-warning-disabled-color)}.vxe-button.type--text.theme--danger{color:var(--vxe-danger-color)}.vxe-button.type--text.theme--danger:not(.is--disabled):focus{color:var(--vxe-danger-darken-color)}.vxe-button.type--text.theme--danger:not(.is--disabled):hover{color:var(--vxe-danger-lighten-color)}.vxe-button.type--text.theme--danger.is--disabled{color:var(--vxe-danger-disabled-color)}.vxe-button.type--text.theme--perfect{color:var(--vxe-table-header-background-color)}.vxe-button.type--text.theme--perfect:not(.is--disabled):focus{color:var(--vxe-table-header-background-color)}.vxe-button.type--text.theme--perfect:not(.is--disabled):hover{color:var(--vxe-table-header-background-color)}.vxe-button.type--text.theme--perfect.is--disabled{color:var(--vxe-table-header-background-color)}.vxe-button.type--button{font-family:inherit;height:var(--vxe-button-height-default);line-height:1;border:1px solid var(--vxe-input-border-color)}.vxe-button.type--button.is--round{border-radius:var(--vxe-button-round-border-radius-default)}.vxe-button.type--button:not(.is--round){border-radius:var(--vxe-border-radius)}.vxe-button.type--button.is--circle{padding:0 .5em;min-width:var(--vxe-button-height-default);border-radius:50%}.vxe-button.type--button:not(.is--circle){padding:0 1em}.vxe-button.type--button:not(.is--disabled):hover{color:var(--vxe-primary-lighten-color)}.vxe-button.type--button:not(.is--disabled):focus{border-color:var(--vxe-primary-color)}.vxe-button.type--button:not(.is--disabled):active{color:var(--vxe-primary-darken-color);border-color:var(--vxe-primary-darken-color);background-color:var(--vxe-button-default-background-color)}.vxe-button.type--button.theme--primary{color:#fff}.vxe-button.type--button.theme--primary:not(.is--disabled){border-color:var(--vxe-primary-color);background-color:var(--vxe-primary-color)}.vxe-button.type--button.theme--primary:not(.is--disabled):hover{color:#fff;background-color:var(--vxe-primary-lighten-color);border-color:var(--vxe-primary-lighten-color)}.vxe-button.type--button.theme--primary:not(.is--disabled):active{color:#fff;background-color:var(--vxe-primary-darken-color);border-color:var(--vxe-primary-darken-color)}.vxe-button.type--button.theme--primary.is--disabled{border-color:var(--vxe-primary-disabled-color);background-color:var(--vxe-primary-disabled-color)}.vxe-button.type--button.theme--primary.is--loading{border-color:var(--vxe-primary-color);background-color:var(--vxe-primary-color)}.vxe-button.type--button.theme--success{color:#fff}.vxe-button.type--button.theme--success:not(.is--disabled){border-color:var(--vxe-success-color);background-color:var(--vxe-success-color)}.vxe-button.type--button.theme--success:not(.is--disabled):hover{color:#fff;background-color:var(--vxe-success-lighten-color);border-color:var(--vxe-success-lighten-color)}.vxe-button.type--button.theme--success:not(.is--disabled):active{color:#fff;background-color:var(--vxe-success-darken-color);border-color:var(--vxe-success-darken-color)}.vxe-button.type--button.theme--success.is--disabled{border-color:var(--vxe-success-disabled-color);background-color:var(--vxe-success-disabled-color)}.vxe-button.type--button.theme--success.is--loading{border-color:var(--vxe-success-color);background-color:var(--vxe-success-color)}.vxe-button.type--button.theme--info{color:#fff}.vxe-button.type--button.theme--info:not(.is--disabled){border-color:var(--vxe-info-color);background-color:var(--vxe-info-color)}.vxe-button.type--button.theme--info:not(.is--disabled):hover{color:#fff;background-color:var(--vxe-info-lighten-color);border-color:var(--vxe-info-lighten-color)}.vxe-button.type--button.theme--info:not(.is--disabled):active{color:#fff;background-color:var(--vxe-info-darken-color);border-color:var(--vxe-info-darken-color)}.vxe-button.type--button.theme--info.is--disabled{border-color:var(--vxe-info-disabled-color);background-color:var(--vxe-info-disabled-color)}.vxe-button.type--button.theme--info.is--loading{border-color:var(--vxe-info-color);background-color:var(--vxe-info-color)}.vxe-button.type--button.theme--warning{color:#fff}.vxe-button.type--button.theme--warning:not(.is--disabled){border-color:var(--vxe-warning-color);background-color:var(--vxe-warning-color)}.vxe-button.type--button.theme--warning:not(.is--disabled):hover{color:#fff;background-color:var(--vxe-warning-lighten-color);border-color:var(--vxe-warning-lighten-color)}.vxe-button.type--button.theme--warning:not(.is--disabled):active{color:#fff;background-color:var(--vxe-warning-darken-color);border-color:var(--vxe-warning-darken-color)}.vxe-button.type--button.theme--warning.is--disabled{border-color:var(--vxe-warning-disabled-color);background-color:var(--vxe-warning-disabled-color)}.vxe-button.type--button.theme--warning.is--loading{border-color:var(--vxe-warning-color);background-color:var(--vxe-warning-color)}.vxe-button.type--button.theme--danger{color:#fff}.vxe-button.type--button.theme--danger:not(.is--disabled){border-color:var(--vxe-danger-color);background-color:var(--vxe-danger-color)}.vxe-button.type--button.theme--danger:not(.is--disabled):hover{color:#fff;background-color:var(--vxe-danger-lighten-color);border-color:var(--vxe-danger-lighten-color)}.vxe-button.type--button.theme--danger:not(.is--disabled):active{color:#fff;background-color:var(--vxe-danger-darken-color);border-color:var(--vxe-danger-darken-color)}.vxe-button.type--button.theme--danger.is--disabled{border-color:var(--vxe-danger-disabled-color);background-color:var(--vxe-danger-disabled-color)}.vxe-button.type--button.theme--danger.is--loading{border-color:var(--vxe-danger-color);background-color:var(--vxe-danger-color)}.vxe-button.type--button.theme--perfect{color:var(--vxe-font-color)}.vxe-button.type--button.theme--perfect:not(.is--disabled){border-color:var(--vxe-table-header-background-color);background-color:var(--vxe-table-header-background-color)}.vxe-button.type--button.theme--perfect:not(.is--disabled):hover{color:var(--vxe-font-color);background-color:var(--vxe-table-header-background-color);border-color:var(--vxe-table-header-background-color)}.vxe-button.type--button.theme--perfect:not(.is--disabled):active{color:var(--vxe-font-color);background-color:var(--vxe-table-header-background-color);border-color:var(--vxe-table-header-background-color)}.vxe-button.type--button.theme--perfect.is--disabled{border-color:var(--vxe-table-header-background-color);background-color:var(--vxe-table-header-background-color)}.vxe-button.type--button.theme--perfect.is--loading{border-color:var(--vxe-table-header-background-color);background-color:var(--vxe-table-header-background-color)}.vxe-button.size--medium{font-size:var(--vxe-font-size-medium)}.vxe-button.size--medium.type--button{height:var(--vxe-button-height-medium)}.vxe-button.size--medium.type--button.is--circle{min-width:var(--vxe-button-height-medium)}.vxe-button.size--medium.type--button.is--round{border-radius:var(--vxe-button-round-border-radius-medium)}.vxe-button.size--medium .vxe-button--icon,.vxe-button.size--medium .vxe-button--loading-icon{min-width:var(--vxe-font-size-medium)}.vxe-button.size--small{font-size:var(--vxe-font-size-small)}.vxe-button.size--small.type--button{height:var(--vxe-button-height-small)}.vxe-button.size--small.type--button.is--circle{min-width:var(--vxe-button-height-small)}.vxe-button.size--small.type--button.is--round{border-radius:var(--vxe-button-round-border-radius-small)}.vxe-button.size--small .vxe-button--icon,.vxe-button.size--small .vxe-button--loading-icon{min-width:var(--vxe-font-size-small)}.vxe-button.size--mini{font-size:var(--vxe-font-size-mini)}.vxe-button.size--mini.type--button{height:var(--vxe-button-height-mini)}.vxe-button.size--mini.type--button.is--circle{min-width:var(--vxe-button-height-mini)}.vxe-button.size--mini.type--button.is--round{border-radius:var(--vxe-button-round-border-radius-mini)}.vxe-button.size--mini .vxe-button--icon,.vxe-button.size--mini .vxe-button--loading-icon{min-width:var(--vxe-font-size-mini)}.vxe-button+.vxe-button,.vxe-button+.vxe-button--dropdown,.vxe-input+.vxe-button,.vxe-input+.vxe-button--dropdown{margin-left:12px}.vxe-button--icon,.vxe-button--loading-icon{min-width:var(--vxe-font-size)}.vxe-button--icon+.vxe-button--content,.vxe-button--loading-icon+.vxe-button--content{margin-left:4px}.vxe-button--dropdown,.vxe-button--wrapper{display:inline-block}.vxe-button--dropdown{position:relative}.vxe-button--dropdown+.vxe-button,.vxe-button--dropdown+.vxe-button--dropdown{margin-left:12px}.vxe-button--dropdown>.vxe-button.type--button.theme--primary{color:#fff}.vxe-button--dropdown>.vxe-button.type--button.theme--success{color:#fff}.vxe-button--dropdown>.vxe-button.type--button.theme--info{color:#fff}.vxe-button--dropdown>.vxe-button.type--button.theme--warning{color:#fff}.vxe-button--dropdown>.vxe-button.type--button.theme--danger{color:#fff}.vxe-button--dropdown>.vxe-button.type--button.theme--perfect{color:var(--vxe-font-color)}.vxe-button--dropdown.is--active>.vxe-button:not(.is--disabled){color:var(--vxe-primary-lighten-color)}.vxe-button--dropdown.is--active>.vxe-button.type--text.theme--primary{color:var(--vxe-primary-lighten-color)}.vxe-button--dropdown.is--active>.vxe-button.type--text.theme--success{color:var(--vxe-success-lighten-color)}.vxe-button--dropdown.is--active>.vxe-button.type--text.theme--info{color:var(--vxe-info-lighten-color)}.vxe-button--dropdown.is--active>.vxe-button.type--text.theme--warning{color:var(--vxe-warning-lighten-color)}.vxe-button--dropdown.is--active>.vxe-button.type--text.theme--danger{color:var(--vxe-danger-lighten-color)}.vxe-button--dropdown.is--active>.vxe-button.type--text.theme--perfect{color:var(--vxe-table-header-background-color)}.vxe-button--dropdown.is--active>.vxe-button.type--button.theme--primary{color:#fff;background-color:var(--vxe-primary-lighten-color);border-color:var(--vxe-primary-lighten-color)}.vxe-button--dropdown.is--active>.vxe-button.type--button.theme--success{color:#fff;background-color:var(--vxe-success-lighten-color);border-color:var(--vxe-success-lighten-color)}.vxe-button--dropdown.is--active>.vxe-button.type--button.theme--info{color:#fff;background-color:var(--vxe-info-lighten-color);border-color:var(--vxe-info-lighten-color)}.vxe-button--dropdown.is--active>.vxe-button.type--button.theme--warning{color:#fff;background-color:var(--vxe-warning-lighten-color);border-color:var(--vxe-warning-lighten-color)}.vxe-button--dropdown.is--active>.vxe-button.type--button.theme--danger{color:#fff;background-color:var(--vxe-danger-lighten-color);border-color:var(--vxe-danger-lighten-color)}.vxe-button--dropdown.is--active>.vxe-button.type--button.theme--perfect{color:var(--vxe-font-color);background-color:var(--vxe-table-header-background-color);border-color:var(--vxe-table-header-background-color)}.vxe-button--dropdown.is--active .vxe-button--dropdown-arrow{transform:rotate(180deg)}.vxe-button--dropdown-arrow{display:inline-block;font-size:12px;margin-left:4px;transition:transform .2s ease-in-out}.vxe-button--dropdown-panel{display:none;position:absolute;right:0;padding:4px 0}.vxe-button--dropdown-panel.animat--leave{display:block;opacity:0;transform:scaleY(.5);transition:transform .3s cubic-bezier(.23,1,.32,1),opacity .3s cubic-bezier(.23,1,.32,1);transform-origin:center top;backface-visibility:hidden;transform-style:preserve-3d}.vxe-button--dropdown-panel.animat--leave[placement=top]{transform-origin:center bottom}.vxe-button--dropdown-panel.animat--enter{opacity:1;transform:scaleY(1)}.vxe-button--dropdown-wrapper{padding:5px;background-color:var(--vxe-button-dropdown-panel-background-color);border-radius:var(--vxe-border-radius);border:1px solid var(--vxe-input-border-color);box-shadow:0 1px 6px rgba(0,0,0,.2)}.vxe-button--dropdown-wrapper>.vxe-button{margin-left:0;margin-top:.4em;display:block;width:100%;border:0}.vxe-button--dropdown-wrapper>.vxe-button.type--text{padding:2px 8px}.vxe-button--dropdown-wrapper>.vxe-button:first-child{margin-top:0}.vxe-button--dropdown-wrapper>.vxe-button:last-child{margin-bottom:0}
1
+ .vxe-button{position:relative;text-align:center;background-color:var(--vxe-button-default-background-color);outline:0;font-size:var(--vxe-font-size);max-width:var(--vxe-button-max-width);line-height:1.5;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;white-space:nowrap;-webkit-user-select:none;-moz-user-select:none;user-select:none;-webkit-appearance:none;-moz-appearance:none;appearance:none;transition:border .2s ease-in-out}.vxe-button:not(.is--disabled){color:var(--vxe-font-color);cursor:pointer}.vxe-button.is--loading{cursor:progress}.vxe-button.is--loading:before{content:"";position:absolute;left:-1px;top:-1px;right:-1px;bottom:-1px;border-radius:inherit;background-color:hsla(0deg,0%,100%,.35);pointer-events:none}.vxe-button.is--disabled{color:var(--vxe-font-disabled-color)}.vxe-button.is--disabled:not(.is--loading){cursor:no-drop}.vxe-button.type--text{text-decoration:none;border:0;padding:.1em .5em;background-color:transparent}.vxe-button.type--text:not(.is--disabled):focus{color:var(--vxe-font-darken-color)}.vxe-button.type--text:not(.is--disabled):hover{color:var(--vxe-primary-lighten-color)}.vxe-button.type--text.theme--primary{color:var(--vxe-primary-color)}.vxe-button.type--text.theme--primary:not(.is--disabled):focus{color:var(--vxe-primary-darken-color)}.vxe-button.type--text.theme--primary:not(.is--disabled):hover{color:var(--vxe-primary-lighten-color)}.vxe-button.type--text.theme--primary.is--disabled{color:var(--vxe-primary-disabled-color)}.vxe-button.type--text.theme--success{color:var(--vxe-success-color)}.vxe-button.type--text.theme--success:not(.is--disabled):focus{color:var(--vxe-success-darken-color)}.vxe-button.type--text.theme--success:not(.is--disabled):hover{color:var(--vxe-success-lighten-color)}.vxe-button.type--text.theme--success.is--disabled{color:var(--vxe-success-disabled-color)}.vxe-button.type--text.theme--info{color:var(--vxe-info-color)}.vxe-button.type--text.theme--info:not(.is--disabled):focus{color:var(--vxe-info-darken-color)}.vxe-button.type--text.theme--info:not(.is--disabled):hover{color:var(--vxe-info-lighten-color)}.vxe-button.type--text.theme--info.is--disabled{color:var(--vxe-info-disabled-color)}.vxe-button.type--text.theme--warning{color:var(--vxe-warning-color)}.vxe-button.type--text.theme--warning:not(.is--disabled):focus{color:var(--vxe-warning-darken-color)}.vxe-button.type--text.theme--warning:not(.is--disabled):hover{color:var(--vxe-warning-lighten-color)}.vxe-button.type--text.theme--warning.is--disabled{color:var(--vxe-warning-disabled-color)}.vxe-button.type--text.theme--danger{color:var(--vxe-danger-color)}.vxe-button.type--text.theme--danger:not(.is--disabled):focus{color:var(--vxe-danger-darken-color)}.vxe-button.type--text.theme--danger:not(.is--disabled):hover{color:var(--vxe-danger-lighten-color)}.vxe-button.type--text.theme--danger.is--disabled{color:var(--vxe-danger-disabled-color)}.vxe-button.type--text.theme--perfect{color:var(--vxe-table-header-background-color)}.vxe-button.type--text.theme--perfect:not(.is--disabled):focus{color:var(--vxe-table-header-background-color)}.vxe-button.type--text.theme--perfect:not(.is--disabled):hover{color:var(--vxe-table-header-background-color)}.vxe-button.type--text.theme--perfect.is--disabled{color:var(--vxe-table-header-background-color)}.vxe-button.type--button{font-family:inherit;height:var(--vxe-button-height-default);line-height:1;border:1px solid var(--vxe-input-border-color)}.vxe-button.type--button.is--round{border-radius:var(--vxe-button-round-border-radius-default)}.vxe-button.type--button:not(.is--round){border-radius:var(--vxe-border-radius)}.vxe-button.type--button.is--circle{padding:0 .5em;min-width:var(--vxe-button-height-default);border-radius:50%}.vxe-button.type--button:not(.is--circle){padding:0 1em}.vxe-button.type--button:not(.is--disabled):hover{color:var(--vxe-primary-lighten-color)}.vxe-button.type--button:not(.is--disabled):focus{border-color:var(--vxe-primary-color)}.vxe-button.type--button:not(.is--disabled):active{color:var(--vxe-primary-darken-color);border-color:var(--vxe-primary-darken-color);background-color:var(--vxe-button-default-background-color)}.vxe-button.type--button.theme--primary{color:#fff}.vxe-button.type--button.theme--primary:not(.is--disabled){border-color:var(--vxe-primary-color);background-color:var(--vxe-primary-color)}.vxe-button.type--button.theme--primary:not(.is--disabled):hover{color:#fff;background-color:var(--vxe-primary-lighten-color);border-color:var(--vxe-primary-lighten-color)}.vxe-button.type--button.theme--primary:not(.is--disabled):active{color:#fff;background-color:var(--vxe-primary-darken-color);border-color:var(--vxe-primary-darken-color)}.vxe-button.type--button.theme--primary.is--disabled{border-color:var(--vxe-primary-disabled-color);background-color:var(--vxe-primary-disabled-color)}.vxe-button.type--button.theme--primary.is--loading{border-color:var(--vxe-primary-color);background-color:var(--vxe-primary-color)}.vxe-button.type--button.theme--success{color:#fff}.vxe-button.type--button.theme--success:not(.is--disabled){border-color:var(--vxe-success-color);background-color:var(--vxe-success-color)}.vxe-button.type--button.theme--success:not(.is--disabled):hover{color:#fff;background-color:var(--vxe-success-lighten-color);border-color:var(--vxe-success-lighten-color)}.vxe-button.type--button.theme--success:not(.is--disabled):active{color:#fff;background-color:var(--vxe-success-darken-color);border-color:var(--vxe-success-darken-color)}.vxe-button.type--button.theme--success.is--disabled{border-color:var(--vxe-success-disabled-color);background-color:var(--vxe-success-disabled-color)}.vxe-button.type--button.theme--success.is--loading{border-color:var(--vxe-success-color);background-color:var(--vxe-success-color)}.vxe-button.type--button.theme--info{color:#fff}.vxe-button.type--button.theme--info:not(.is--disabled){border-color:var(--vxe-info-color);background-color:var(--vxe-info-color)}.vxe-button.type--button.theme--info:not(.is--disabled):hover{color:#fff;background-color:var(--vxe-info-lighten-color);border-color:var(--vxe-info-lighten-color)}.vxe-button.type--button.theme--info:not(.is--disabled):active{color:#fff;background-color:var(--vxe-info-darken-color);border-color:var(--vxe-info-darken-color)}.vxe-button.type--button.theme--info.is--disabled{border-color:var(--vxe-info-disabled-color);background-color:var(--vxe-info-disabled-color)}.vxe-button.type--button.theme--info.is--loading{border-color:var(--vxe-info-color);background-color:var(--vxe-info-color)}.vxe-button.type--button.theme--warning{color:#fff}.vxe-button.type--button.theme--warning:not(.is--disabled){border-color:var(--vxe-warning-color);background-color:var(--vxe-warning-color)}.vxe-button.type--button.theme--warning:not(.is--disabled):hover{color:#fff;background-color:var(--vxe-warning-lighten-color);border-color:var(--vxe-warning-lighten-color)}.vxe-button.type--button.theme--warning:not(.is--disabled):active{color:#fff;background-color:var(--vxe-warning-darken-color);border-color:var(--vxe-warning-darken-color)}.vxe-button.type--button.theme--warning.is--disabled{border-color:var(--vxe-warning-disabled-color);background-color:var(--vxe-warning-disabled-color)}.vxe-button.type--button.theme--warning.is--loading{border-color:var(--vxe-warning-color);background-color:var(--vxe-warning-color)}.vxe-button.type--button.theme--danger{color:#fff}.vxe-button.type--button.theme--danger:not(.is--disabled){border-color:var(--vxe-danger-color);background-color:var(--vxe-danger-color)}.vxe-button.type--button.theme--danger:not(.is--disabled):hover{color:#fff;background-color:var(--vxe-danger-lighten-color);border-color:var(--vxe-danger-lighten-color)}.vxe-button.type--button.theme--danger:not(.is--disabled):active{color:#fff;background-color:var(--vxe-danger-darken-color);border-color:var(--vxe-danger-darken-color)}.vxe-button.type--button.theme--danger.is--disabled{border-color:var(--vxe-danger-disabled-color);background-color:var(--vxe-danger-disabled-color)}.vxe-button.type--button.theme--danger.is--loading{border-color:var(--vxe-danger-color);background-color:var(--vxe-danger-color)}.vxe-button.type--button.theme--perfect{color:var(--vxe-font-color)}.vxe-button.type--button.theme--perfect:not(.is--disabled){border-color:var(--vxe-table-header-background-color);background-color:var(--vxe-table-header-background-color)}.vxe-button.type--button.theme--perfect:not(.is--disabled):hover{color:var(--vxe-font-color);background-color:var(--vxe-table-header-background-color);border-color:var(--vxe-table-header-background-color)}.vxe-button.type--button.theme--perfect:not(.is--disabled):active{color:var(--vxe-font-color);background-color:var(--vxe-table-header-background-color);border-color:var(--vxe-table-header-background-color)}.vxe-button.type--button.theme--perfect.is--disabled{border-color:var(--vxe-table-header-background-color);background-color:var(--vxe-table-header-background-color)}.vxe-button.type--button.theme--perfect.is--loading{border-color:var(--vxe-table-header-background-color);background-color:var(--vxe-table-header-background-color)}.vxe-button.size--medium{font-size:var(--vxe-font-size-medium)}.vxe-button.size--medium.type--button{height:var(--vxe-button-height-medium)}.vxe-button.size--medium.type--button.is--circle{min-width:var(--vxe-button-height-medium)}.vxe-button.size--medium.type--button.is--round{border-radius:var(--vxe-button-round-border-radius-medium)}.vxe-button.size--medium .vxe-button--icon,.vxe-button.size--medium .vxe-button--loading-icon{min-width:var(--vxe-font-size-medium)}.vxe-button.size--small{font-size:var(--vxe-font-size-small)}.vxe-button.size--small.type--button{height:var(--vxe-button-height-small)}.vxe-button.size--small.type--button.is--circle{min-width:var(--vxe-button-height-small)}.vxe-button.size--small.type--button.is--round{border-radius:var(--vxe-button-round-border-radius-small)}.vxe-button.size--small .vxe-button--icon,.vxe-button.size--small .vxe-button--loading-icon{min-width:var(--vxe-font-size-small)}.vxe-button.size--mini{font-size:var(--vxe-font-size-mini)}.vxe-button.size--mini.type--button{height:var(--vxe-button-height-mini)}.vxe-button.size--mini.type--button.is--circle{min-width:var(--vxe-button-height-mini)}.vxe-button.size--mini.type--button.is--round{border-radius:var(--vxe-button-round-border-radius-mini)}.vxe-button.size--mini .vxe-button--icon,.vxe-button.size--mini .vxe-button--loading-icon{min-width:var(--vxe-font-size-mini)}.vxe-button+.vxe-button--dropdown,.vxe-button+.vxe-button.type--button,.vxe-input+.vxe-button--dropdown,.vxe-input+.vxe-button.type--button{margin-left:12px}.vxe-button--icon,.vxe-button--loading-icon{min-width:var(--vxe-font-size)}.vxe-button--icon+.vxe-button--content,.vxe-button--loading-icon+.vxe-button--content{margin-left:4px}.vxe-button--dropdown,.vxe-button--wrapper{display:inline-block}.vxe-button--dropdown{position:relative}.vxe-button--dropdown+.vxe-button--dropdown,.vxe-button--dropdown+.vxe-button.type--button{margin-left:12px}.vxe-button--dropdown>.vxe-button.type--button.theme--primary{color:#fff}.vxe-button--dropdown>.vxe-button.type--button.theme--success{color:#fff}.vxe-button--dropdown>.vxe-button.type--button.theme--info{color:#fff}.vxe-button--dropdown>.vxe-button.type--button.theme--warning{color:#fff}.vxe-button--dropdown>.vxe-button.type--button.theme--danger{color:#fff}.vxe-button--dropdown>.vxe-button.type--button.theme--perfect{color:var(--vxe-font-color)}.vxe-button--dropdown.is--active>.vxe-button:not(.is--disabled){color:var(--vxe-primary-lighten-color)}.vxe-button--dropdown.is--active>.vxe-button.type--text.theme--primary{color:var(--vxe-primary-lighten-color)}.vxe-button--dropdown.is--active>.vxe-button.type--text.theme--success{color:var(--vxe-success-lighten-color)}.vxe-button--dropdown.is--active>.vxe-button.type--text.theme--info{color:var(--vxe-info-lighten-color)}.vxe-button--dropdown.is--active>.vxe-button.type--text.theme--warning{color:var(--vxe-warning-lighten-color)}.vxe-button--dropdown.is--active>.vxe-button.type--text.theme--danger{color:var(--vxe-danger-lighten-color)}.vxe-button--dropdown.is--active>.vxe-button.type--text.theme--perfect{color:var(--vxe-table-header-background-color)}.vxe-button--dropdown.is--active>.vxe-button.type--button.theme--primary{color:#fff;background-color:var(--vxe-primary-lighten-color);border-color:var(--vxe-primary-lighten-color)}.vxe-button--dropdown.is--active>.vxe-button.type--button.theme--success{color:#fff;background-color:var(--vxe-success-lighten-color);border-color:var(--vxe-success-lighten-color)}.vxe-button--dropdown.is--active>.vxe-button.type--button.theme--info{color:#fff;background-color:var(--vxe-info-lighten-color);border-color:var(--vxe-info-lighten-color)}.vxe-button--dropdown.is--active>.vxe-button.type--button.theme--warning{color:#fff;background-color:var(--vxe-warning-lighten-color);border-color:var(--vxe-warning-lighten-color)}.vxe-button--dropdown.is--active>.vxe-button.type--button.theme--danger{color:#fff;background-color:var(--vxe-danger-lighten-color);border-color:var(--vxe-danger-lighten-color)}.vxe-button--dropdown.is--active>.vxe-button.type--button.theme--perfect{color:var(--vxe-font-color);background-color:var(--vxe-table-header-background-color);border-color:var(--vxe-table-header-background-color)}.vxe-button--dropdown.is--active .vxe-button--dropdown-arrow{transform:rotate(180deg)}.vxe-button--dropdown-arrow{display:inline-block;font-size:12px;margin-left:4px;transition:transform .2s ease-in-out}.vxe-button--dropdown-panel{display:none;position:absolute;right:0;padding:4px 0}.vxe-button--dropdown-panel.animat--leave{display:block;opacity:0;transform:scaleY(.5);transition:transform .3s cubic-bezier(.23,1,.32,1),opacity .3s cubic-bezier(.23,1,.32,1);transform-origin:center top;backface-visibility:hidden;transform-style:preserve-3d}.vxe-button--dropdown-panel.animat--leave[placement=top]{transform-origin:center bottom}.vxe-button--dropdown-panel.animat--enter{opacity:1;transform:scaleY(1)}.vxe-button--dropdown-wrapper{padding:5px;background-color:var(--vxe-button-dropdown-panel-background-color);border-radius:var(--vxe-border-radius);border:1px solid var(--vxe-input-border-color);box-shadow:0 1px 6px rgba(0,0,0,.2)}.vxe-button--dropdown-wrapper>.vxe-button{margin-left:0;margin-top:.4em;display:block;width:100%;border:0}.vxe-button--dropdown-wrapper>.vxe-button.type--text{padding:2px 8px}.vxe-button--dropdown-wrapper>.vxe-button:first-child{margin-top:0}.vxe-button--dropdown-wrapper>.vxe-button:last-child{margin-bottom:0}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vxe-table",
3
- "version": "4.4.2-beta.8",
3
+ "version": "4.4.3",
4
4
  "description": "一个基于 vue 的 PC 端表格组件,支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器等...",
5
5
  "scripts": {
6
6
  "update": "npm install --legacy-peer-deps",
@@ -206,8 +206,8 @@ const tableFilterHook: VxeGlobalHooksHandles.HookOptions = {
206
206
  */
207
207
  setFilter (fieldOrColumn, options) {
208
208
  const column = handleFieldOrColumn($xetable, fieldOrColumn)
209
- if (column && column.filters && options) {
210
- column.filters = toFilters(options)
209
+ if (column && column.filters) {
210
+ column.filters = toFilters(options || [])
211
211
  }
212
212
  return nextTick()
213
213
  },
@@ -97,7 +97,7 @@ export default defineComponent({
97
97
 
98
98
  provide('$xegrid', null)
99
99
 
100
- watchColumn(props, column)
100
+ watchColumn($xetable, props, column)
101
101
 
102
102
  onMounted(() => {
103
103
  assemColumn($xetable, refElem.value, column, colgroup)
@@ -144,7 +144,7 @@ export class ColumnInfo {
144
144
  }
145
145
 
146
146
  update (name: string, value: any) {
147
- // 不支持双向的属性
147
+ // 不支持直接修改的属性
148
148
  if (name !== 'filters') {
149
149
  if (name === 'field') {
150
150
  // 兼容旧属性
@@ -26,7 +26,7 @@ export default defineComponent({
26
26
  provide('xecolgroup', xecolumn)
27
27
  provide('$xegrid', null)
28
28
 
29
- watchColumn(props, column)
29
+ watchColumn($xetable, props, column)
30
30
 
31
31
  onMounted(() => {
32
32
  assemColumn($xetable, refElem.value, column, colgroup)
@@ -103,6 +103,10 @@ export default defineComponent({
103
103
  mergeList: [],
104
104
  // 合并表尾数据的对象集
105
105
  mergeFooterList: [],
106
+ // 刷新列标识,当列筛选被改变时,触发表格刷新数据
107
+ upDataFlag: 0,
108
+ // 刷新列标识,当列的特定属性被改变时,触发表格刷新列
109
+ reColumnFlag: 0,
106
110
  // 初始化标识
107
111
  initStore: {
108
112
  filter: false,
@@ -1495,7 +1499,7 @@ export default defineComponent({
1495
1499
  const emptyBlockElem = emptyBlockRef ? emptyBlockRef.value : null
1496
1500
  if (isNodeElement(wrapperElem)) {
1497
1501
  if (customMaxHeight) {
1498
- wrapperElem.style.maxHeight = `${fixedType ? customMaxHeight - headerHeight - (showFooter ? 0 : scrollbarHeight) : customMaxHeight - headerHeight}px`
1502
+ wrapperElem.style.maxHeight = `${fixedType ? customMaxHeight - headerHeight - (showFooter ? 0 : scrollbarHeight) : customMaxHeight - headerHeight - footerHeight}px`
1499
1503
  } else {
1500
1504
  if (customHeight > 0) {
1501
1505
  wrapperElem.style.height = `${fixedType ? (customHeight > 0 ? customHeight - headerHeight - footerHeight : tableHeight) - (showFooter ? 0 : scrollbarHeight) : customHeight - headerHeight - footerHeight}px`
@@ -4955,6 +4959,12 @@ export default defineComponent({
4955
4959
  tablePrivateMethods.analyColumnWidth()
4956
4960
  return tableMethods.refreshColumn()
4957
4961
  },
4962
+ handleUpdateDataQueue () {
4963
+ reactData.upDataFlag++
4964
+ },
4965
+ handleRefreshColumnQueue () {
4966
+ reactData.reColumnFlag++
4967
+ },
4958
4968
  preventEvent (evnt, type, args, next, end) {
4959
4969
  const evntList = VXETable.interceptor.get(type)
4960
4970
  let rest
@@ -5871,6 +5881,18 @@ export default defineComponent({
5871
5881
  tablePrivateMethods.analyColumnWidth()
5872
5882
  })
5873
5883
 
5884
+ watch(() => reactData.upDataFlag, () => {
5885
+ nextTick(() => {
5886
+ tableMethods.updateData()
5887
+ })
5888
+ })
5889
+
5890
+ watch(() => reactData.reColumnFlag, () => {
5891
+ nextTick(() => {
5892
+ tableMethods.refreshColumn()
5893
+ })
5894
+ })
5895
+
5874
5896
  watch(() => props.showHeader, () => {
5875
5897
  nextTick(() => {
5876
5898
  tableMethods.recalculate(true).then(() => tableMethods.refreshScroll())
@@ -210,10 +210,18 @@ export function createColumn ($xetable: VxeTableConstructor & VxeTablePrivateMet
210
210
  return isColumnInfo(options) ? options : reactive(new ColumnInfo($xetable, options, renderOptions))
211
211
  }
212
212
 
213
- export function watchColumn (props: any, column: ColumnInfo) {
213
+ export function watchColumn ($xetable: VxeTableConstructor & VxeTablePrivateMethods, props: any, column: ColumnInfo) {
214
214
  Object.keys(props).forEach(name => {
215
215
  watch(() => props[name], (value: any) => {
216
216
  column.update(name, value)
217
+ if ($xetable) {
218
+ if (name === 'filters') {
219
+ $xetable.setFilter(column as any, value)
220
+ $xetable.handleUpdateDataQueue()
221
+ } else if (['visible', 'fixed', 'width', 'minWidth', 'maxWidth'].includes(name)) {
222
+ $xetable.handleRefreshColumnQueue()
223
+ }
224
+ }
217
225
  })
218
226
  })
219
227
  }
@@ -236,7 +236,7 @@ $btnThemeList: (
236
236
  }
237
237
  .vxe-input,
238
238
  .vxe-button {
239
- &+.vxe-button,
239
+ &+.vxe-button.type--button,
240
240
  &+.vxe-button--dropdown {
241
241
  margin-left: 12px;
242
242
  }
@@ -254,7 +254,7 @@ $btnThemeList: (
254
254
  }
255
255
  .vxe-button--dropdown {
256
256
  position: relative;
257
- &+.vxe-button,
257
+ &+.vxe-button.type--button,
258
258
  &+.vxe-button--dropdown {
259
259
  margin-left: 12px;
260
260
  }
@@ -191,6 +191,7 @@
191
191
 
192
192
  /*button*/
193
193
  --vxe-button-max-width: #{$vxe-button-max-width};
194
+ --vxe-button-default-background-color: #{$vxe-button-default-background-color};
194
195
  --vxe-button-dropdown-panel-background-color: #{$vxe-button-dropdown-panel-background-color};
195
196
  --vxe-button-height-default: #{$vxe-button-height-default};
196
197
  --vxe-button-height-medium: #{$vxe-button-height-medium};
@@ -188,7 +188,8 @@ $vxe-radio-button-default-background-color: #fff !default;
188
188
 
189
189
  /*button*/
190
190
  $vxe-button-max-width: 500px !default;
191
- $vxe-button-dropdown-panel-background-color: #fff !default;
191
+ $vxe-button-default-background-color: #fff !default;
192
+ $vxe-button-dropdown-panel-background-color: $vxe-button-default-background-color !default;
192
193
  $vxe-button-height-default: 34px !default;
193
194
  $vxe-button-height-medium: 32px !default;
194
195
  $vxe-button-height-small: 30px !default;
package/types/grid.d.ts CHANGED
@@ -243,7 +243,6 @@ export namespace VxeGridPropTypes {
243
243
  export interface ToolbarOpts extends ToolbarConfig { }
244
244
  export interface ToolbarConfig extends VxeToolbarProps {
245
245
  enabled?: boolean
246
- buttons?: any[]
247
246
  zoom?: boolean | {
248
247
  escRestore?: boolean
249
248
  iconIn?: string
package/types/table.d.ts CHANGED
@@ -735,6 +735,8 @@ export interface TablePrivateMethods<D = VxeTableDataRow> {
735
735
  checkSelectionStatus(): void
736
736
  handleSelectRow(params: any, value: any, isForce?: boolean): void
737
737
  handleCustom(): Promise<void>
738
+ handleUpdateDataQueue(): void
739
+ handleRefreshColumnQueue(): void
738
740
  preventEvent(evnt: any, type: any, args?: any, next?: any, end?: any): any
739
741
  triggerHeaderHelpEvent(evnt: MouseEvent, params: VxeTableDefines.CellRenderHeaderParams<any>): void
740
742
  triggerHeaderTooltipEvent(evnt: MouseEvent, params: VxeTableDefines.CellRenderHeaderParams<any>): void
@@ -841,6 +843,10 @@ export interface TableReactData<D = VxeTableDataRow> {
841
843
  mergeList: VxeTableDefines.MergeItem<D>[]
842
844
  // 合并表尾数据的对象集
843
845
  mergeFooterList: VxeTableDefines.MergeItem<D>[]
846
+ // 刷新列标识,当列筛选被改变时,触发表格刷新数据
847
+ upDataFlag: number
848
+ // 刷新列标识,当列的特定属性被改变时,触发表格刷新列
849
+ reColumnFlag: number
844
850
  // 初始化标识
845
851
  initStore: {
846
852
  filter: boolean
@@ -46,7 +46,7 @@ export interface TooltipReactData {
46
46
  export namespace VxeTooltipPropTypes {
47
47
  export type Size = SizeType
48
48
  export type ModelValue = boolean
49
- export type Trigger = 'hover' | 'click' | '' | null
49
+ export type Trigger = 'hover' | 'click' | 'manual' | '' | null
50
50
  export type Theme = string
51
51
  export type Content = string | number
52
52
  export type UseHTML = boolean