vxe-table 3.7.0-beta.5 → 3.7.0-beta.7

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 (137) hide show
  1. package/README.md +4 -8
  2. package/lib/edit/src/mixin.js +3 -3
  3. package/lib/edit/src/mixin.min.js +1 -1
  4. package/lib/filter/src/mixin.js +13 -7
  5. package/lib/filter/src/mixin.min.js +1 -1
  6. package/lib/form/src/form.js +27 -5
  7. package/lib/form/src/form.min.js +1 -1
  8. package/lib/grid/src/grid.js +7 -3
  9. package/lib/grid/src/grid.min.js +1 -1
  10. package/lib/icon/style/style.css +1 -1
  11. package/lib/icon/style/style.min.css +1 -1
  12. package/lib/index.css +1 -1
  13. package/lib/index.umd.js +394 -127
  14. package/lib/index.umd.min.js +1 -1
  15. package/lib/input/src/input.js +11 -1
  16. package/lib/input/src/input.min.js +1 -1
  17. package/lib/locale/lang/en-US.js +7 -0
  18. package/lib/locale/lang/en-US.min.js +1 -1
  19. package/lib/locale/lang/en-US.umd.js +7 -0
  20. package/lib/locale/lang/es-ES.js +7 -0
  21. package/lib/locale/lang/es-ES.min.js +1 -1
  22. package/lib/locale/lang/es-ES.umd.js +7 -0
  23. package/lib/locale/lang/ja-JP.js +7 -0
  24. package/lib/locale/lang/ja-JP.min.js +1 -1
  25. package/lib/locale/lang/ja-JP.umd.js +7 -0
  26. package/lib/locale/lang/zh-CN.js +7 -0
  27. package/lib/locale/lang/zh-CN.min.js +1 -1
  28. package/lib/locale/lang/zh-CN.umd.js +7 -0
  29. package/lib/locale/lang/zh-HK.min.js +1 -1
  30. package/lib/locale/lang/zh-HK.umd.js +7 -0
  31. package/lib/locale/lang/zh-MO.min.js +1 -1
  32. package/lib/locale/lang/zh-MO.umd.js +7 -0
  33. package/lib/locale/lang/zh-TC.js +7 -0
  34. package/lib/locale/lang/zh-TC.min.js +1 -1
  35. package/lib/locale/lang/zh-TC.umd.js +7 -0
  36. package/lib/locale/lang/zh-TW.min.js +1 -1
  37. package/lib/locale/lang/zh-TW.umd.js +7 -0
  38. package/lib/menu/src/mixin.js +3 -3
  39. package/lib/menu/src/mixin.min.js +1 -1
  40. package/lib/select/src/select.js +6 -1
  41. package/lib/select/src/select.min.js +1 -1
  42. package/lib/style.css +1 -1
  43. package/lib/style.min.css +1 -1
  44. package/lib/table/src/cell.js +4 -2
  45. package/lib/table/src/cell.min.js +1 -1
  46. package/lib/table/src/columnInfo.js +6 -6
  47. package/lib/table/src/columnInfo.min.js +1 -1
  48. package/lib/table/src/methods.js +74 -47
  49. package/lib/table/src/methods.min.js +1 -1
  50. package/lib/table/src/table.js +12 -25
  51. package/lib/table/src/table.min.js +1 -1
  52. package/lib/table/style/style.css +2 -2
  53. package/lib/table/style/style.min.css +1 -1
  54. package/lib/textarea/src/textarea.js +6 -1
  55. package/lib/textarea/src/textarea.min.js +1 -1
  56. package/lib/toolbar/src/toolbar.js +18 -6
  57. package/lib/toolbar/src/toolbar.min.js +1 -1
  58. package/lib/tools/log.js +1 -1
  59. package/lib/tools/log.min.js +1 -1
  60. package/lib/v-x-e-table/index.js +3 -1
  61. package/lib/v-x-e-table/index.min.js +1 -1
  62. package/lib/v-x-e-table/src/commands.js +58 -2
  63. package/lib/v-x-e-table/src/commands.min.js +1 -1
  64. package/lib/v-x-e-table/src/conf.js +4 -1
  65. package/lib/v-x-e-table/src/conf.min.js +1 -1
  66. package/lib/v-x-e-table/src/formats.js +58 -2
  67. package/lib/v-x-e-table/src/formats.min.js +1 -1
  68. package/lib/v-x-e-table/src/menus.js +58 -2
  69. package/lib/v-x-e-table/src/menus.min.js +1 -1
  70. package/lib/v-x-e-table/src/store.js +5 -2
  71. package/lib/v-x-e-table/src/store.min.js +1 -1
  72. package/lib/v-x-e-table/src/validators.js +15 -0
  73. package/lib/v-x-e-table/src/validators.min.js +1 -0
  74. package/lib/validator/src/mixin.js +26 -4
  75. package/lib/validator/src/mixin.min.js +1 -1
  76. package/package.json +2 -2
  77. package/packages/edit/src/mixin.js +3 -3
  78. package/packages/filter/src/mixin.js +5 -1
  79. package/packages/form/src/form.js +27 -6
  80. package/packages/grid/src/grid.js +7 -3
  81. package/packages/input/src/input.js +9 -1
  82. package/packages/locale/lang/en-US.js +7 -0
  83. package/packages/locale/lang/es-ES.js +7 -0
  84. package/packages/locale/lang/ja-JP.js +7 -0
  85. package/packages/locale/lang/zh-CN.js +7 -0
  86. package/packages/locale/lang/zh-TC.js +7 -0
  87. package/packages/menu/src/mixin.js +3 -3
  88. package/packages/select/src/select.js +4 -1
  89. package/packages/table/src/cell.js +4 -2
  90. package/packages/table/src/columnInfo.js +6 -6
  91. package/packages/table/src/methods.js +67 -46
  92. package/packages/table/src/table.js +6 -2
  93. package/packages/textarea/src/textarea.js +4 -1
  94. package/packages/toolbar/src/toolbar.js +18 -6
  95. package/packages/v-x-e-table/index.js +2 -0
  96. package/packages/v-x-e-table/src/commands.js +48 -2
  97. package/packages/v-x-e-table/src/conf.js +4 -1
  98. package/packages/v-x-e-table/src/formats.js +48 -2
  99. package/packages/v-x-e-table/src/menus.js +48 -2
  100. package/packages/v-x-e-table/src/store.js +4 -2
  101. package/packages/v-x-e-table/src/validators.js +7 -0
  102. package/packages/validator/src/mixin.js +25 -4
  103. package/styles/table.scss +2 -2
  104. package/types/colgroup.d.ts +3 -1
  105. package/types/column.d.ts +3 -0
  106. package/types/edit.d.ts +4 -2
  107. package/types/export.d.ts +2 -0
  108. package/types/filter.d.ts +3 -1
  109. package/types/footer.d.ts +3 -1
  110. package/types/form-item.d.ts +2 -0
  111. package/types/form.d.ts +16 -12
  112. package/types/grid.d.ts +3 -0
  113. package/types/header.d.ts +3 -1
  114. package/types/index.d.ts +1 -1
  115. package/types/input.d.ts +2 -0
  116. package/types/list.d.ts +1 -1
  117. package/types/menu.d.ts +2 -0
  118. package/types/modal.d.ts +7 -3
  119. package/types/pulldown.d.ts +2 -3
  120. package/types/table.d.ts +33 -26
  121. package/types/textarea.d.ts +1 -0
  122. package/types/toolbar.d.ts +2 -0
  123. package/types/tooltip.d.ts +1 -1
  124. package/types/v-x-e-table/commands.d.ts +23 -13
  125. package/types/v-x-e-table/formats.d.ts +21 -12
  126. package/types/v-x-e-table/index.d.ts +31 -24
  127. package/types/v-x-e-table/interceptor.d.ts +1 -1
  128. package/types/v-x-e-table/menus.d.ts +17 -6
  129. package/types/v-x-e-table/renderer.d.ts +5 -3
  130. package/types/v-x-e-table/validators.d.ts +30 -0
  131. package/types/validator.d.ts +15 -4
  132. /package/lib/icon/style/{iconfont.1689384538396.ttf → iconfont.1690156580206.ttf} +0 -0
  133. /package/lib/icon/style/{iconfont.1689384538396.woff → iconfont.1690156580206.woff} +0 -0
  134. /package/lib/icon/style/{iconfont.1689384538396.woff2 → iconfont.1690156580206.woff2} +0 -0
  135. /package/lib/{iconfont.1689384538396.ttf → iconfont.1690156580206.ttf} +0 -0
  136. /package/lib/{iconfont.1689384538396.woff → iconfont.1690156580206.woff} +0 -0
  137. /package/lib/{iconfont.1689384538396.woff2 → iconfont.1690156580206.woff2} +0 -0
package/lib/index.umd.js CHANGED
@@ -10677,6 +10677,7 @@ var iconPrefix = 'vxe-icon-';
10677
10677
  animat: true,
10678
10678
  delayHover: 250,
10679
10679
  autoResize: true,
10680
+ minHeight: 144,
10680
10681
  // keepSource: false,
10681
10682
  // showOverflow: null,
10682
10683
  // showHeaderOverflow: null,
@@ -10710,7 +10711,9 @@ var iconPrefix = 'vxe-icon-';
10710
10711
  },
10711
10712
  validConfig: {
10712
10713
  showMessage: true,
10713
- message: 'default'
10714
+ autoClear: true,
10715
+ message: 'inline',
10716
+ msgMode: 'single'
10714
10717
  },
10715
10718
  columnConfig: {
10716
10719
  maxFixedSize: 4
@@ -11042,7 +11045,7 @@ var es_array_concat = __webpack_require__(2222);
11042
11045
 
11043
11046
 
11044
11047
  function getLog(message, params) {
11045
- return "[vxe-table v".concat("3.7.0-beta.4", "] ").concat(conf.i18n(message, params));
11048
+ return "[vxe-table v".concat("3.7.0-beta.6", "] ").concat(conf.i18n(message, params));
11046
11049
  }
11047
11050
  function outLog(type) {
11048
11051
  return function (message, params) {
@@ -12056,8 +12059,181 @@ var renderer = {
12056
12059
  var es_array_includes = __webpack_require__(6699);
12057
12060
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.includes.js
12058
12061
  var es_string_includes = __webpack_require__(2023);
12059
- ;// CONCATENATED MODULE: ./packages/v-x-e-table/src/store.js
12062
+ ;// CONCATENATED MODULE: ./packages/v-x-e-table/src/commands.js
12063
+
12064
+
12065
+
12066
+
12067
+
12068
+
12069
+
12070
+
12071
+
12072
+
12073
+ var VXECommandsStore = /*#__PURE__*/function () {
12074
+ function VXECommandsStore() {
12075
+ _classCallCheck(this, VXECommandsStore);
12076
+ this.store = {};
12077
+ }
12078
+ _createClass(VXECommandsStore, [{
12079
+ key: "mixin",
12080
+ value: function mixin(options) {
12081
+ var _this = this;
12082
+ external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(options, function (item, key) {
12083
+ _this.add(key, item);
12084
+ });
12085
+ return VXECommandsStore;
12086
+ }
12087
+ }, {
12088
+ key: "get",
12089
+ value: function get(name) {
12090
+ return this.store[name];
12091
+ }
12092
+ }, {
12093
+ key: "add",
12094
+ value: function add(name, render) {
12095
+ var conf = this.store[name];
12096
+ // 兼容
12097
+ if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(render)) {
12098
+ // warnLog('vxe.error.delProp', ['callback', 'commandMethod'])
12099
+ render = {
12100
+ commandMethod: render
12101
+ };
12102
+ }
12103
+
12104
+ // 检测是否覆盖
12105
+ if (false) { var confKeys; }
12106
+ this.store[name] = conf ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().merge(conf, render) : render;
12107
+ return VXECommandsStore;
12108
+ }
12109
+ }, {
12110
+ key: "delete",
12111
+ value: function _delete(name) {
12112
+ delete this.store[name];
12113
+ return VXECommandsStore;
12114
+ }
12115
+ }]);
12116
+ return VXECommandsStore;
12117
+ }();
12118
+ var commands = new VXECommandsStore();
12119
+ if (false) {}
12120
+ ;// CONCATENATED MODULE: ./packages/v-x-e-table/src/menus.js
12121
+
12122
+
12123
+
12124
+
12125
+
12126
+
12127
+
12128
+
12129
+
12130
+
12131
+ var VXEMenusStore = /*#__PURE__*/function () {
12132
+ function VXEMenusStore() {
12133
+ _classCallCheck(this, VXEMenusStore);
12134
+ this.store = {};
12135
+ }
12136
+ _createClass(VXEMenusStore, [{
12137
+ key: "mixin",
12138
+ value: function mixin(options) {
12139
+ var _this = this;
12140
+ external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(options, function (item, key) {
12141
+ _this.add(key, item);
12142
+ });
12143
+ return VXEMenusStore;
12144
+ }
12145
+ }, {
12146
+ key: "get",
12147
+ value: function get(name) {
12148
+ return this.store[name];
12149
+ }
12150
+ }, {
12151
+ key: "add",
12152
+ value: function add(name, render) {
12153
+ var conf = this.store[name];
12154
+ // 兼容
12155
+ if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(render)) {
12156
+ // warnLog('vxe.error.delProp', ['callback', 'menuMethod'])
12157
+ render = {
12158
+ menuMethod: render
12159
+ };
12160
+ }
12161
+
12162
+ // 检测是否覆盖
12163
+ if (false) { var confKeys; }
12164
+ this.store[name] = conf ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().merge(conf, render) : render;
12165
+ return VXEMenusStore;
12166
+ }
12167
+ }, {
12168
+ key: "delete",
12169
+ value: function _delete(name) {
12170
+ delete this.store[name];
12171
+ return VXEMenusStore;
12172
+ }
12173
+ }]);
12174
+ return VXEMenusStore;
12175
+ }();
12176
+ var menus = new VXEMenusStore();
12177
+ if (false) {}
12178
+ ;// CONCATENATED MODULE: ./packages/v-x-e-table/src/formats.js
12179
+
12180
+
12181
+
12182
+
12183
+
12184
+
12185
+
12186
+
12187
+
12188
+
12189
+ var VXEFormatsStore = /*#__PURE__*/function () {
12190
+ function VXEFormatsStore() {
12191
+ _classCallCheck(this, VXEFormatsStore);
12192
+ this.store = {};
12193
+ }
12194
+ _createClass(VXEFormatsStore, [{
12195
+ key: "mixin",
12196
+ value: function mixin(options) {
12197
+ var _this = this;
12198
+ external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(options, function (item, key) {
12199
+ _this.add(key, item);
12200
+ });
12201
+ return VXEFormatsStore;
12202
+ }
12203
+ }, {
12204
+ key: "get",
12205
+ value: function get(name) {
12206
+ return this.store[name];
12207
+ }
12208
+ }, {
12209
+ key: "add",
12210
+ value: function add(name, render) {
12211
+ var conf = this.store[name];
12212
+ // 兼容
12213
+ if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(render)) {
12214
+ // warnLog('vxe.error.delProp', ['callback', 'formatMethod'])
12215
+ render = {
12216
+ formatMethod: render
12217
+ };
12218
+ }
12060
12219
 
12220
+ // 检测是否覆盖
12221
+ if (false) { var confKeys; }
12222
+ this.store[name] = conf ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().merge(conf, render) : render;
12223
+ return VXEFormatsStore;
12224
+ }
12225
+ }, {
12226
+ key: "delete",
12227
+ value: function _delete(name) {
12228
+ delete this.store[name];
12229
+ return VXEFormatsStore;
12230
+ }
12231
+ }]);
12232
+ return VXEFormatsStore;
12233
+ }();
12234
+ var formats = new VXEFormatsStore();
12235
+ if (false) {}
12236
+ ;// CONCATENATED MODULE: ./packages/v-x-e-table/src/store.js
12061
12237
 
12062
12238
 
12063
12239
 
@@ -12078,8 +12254,11 @@ var Store = /*#__PURE__*/function () {
12078
12254
  }
12079
12255
  _createClass(Store, [{
12080
12256
  key: "mixin",
12081
- value: function mixin(map) {
12082
- Object.assign(this.store, map);
12257
+ value: function mixin(options) {
12258
+ var _this = this;
12259
+ external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(options, function (item, key) {
12260
+ _this.add(key, item);
12261
+ });
12083
12262
  return Store;
12084
12263
  }
12085
12264
  }, {
@@ -12106,20 +12285,10 @@ var Store = /*#__PURE__*/function () {
12106
12285
  return Store;
12107
12286
  }();
12108
12287
  /* harmony default export */ const store = (Store);
12109
- ;// CONCATENATED MODULE: ./packages/v-x-e-table/src/commands.js
12110
-
12111
-
12112
- var commands = new store();
12113
- if (false) {}
12114
- ;// CONCATENATED MODULE: ./packages/v-x-e-table/src/menus.js
12288
+ ;// CONCATENATED MODULE: ./packages/v-x-e-table/src/validators.js
12115
12289
 
12116
12290
 
12117
- var menus = new store();
12118
- if (false) {}
12119
- ;// CONCATENATED MODULE: ./packages/v-x-e-table/src/formats.js
12120
-
12121
-
12122
- var formats = new store();
12291
+ var validators = new store();
12123
12292
  if (false) {}
12124
12293
  ;// CONCATENATED MODULE: ./packages/v-x-e-table/src/setup.js
12125
12294
 
@@ -12146,6 +12315,7 @@ function setup(options) {
12146
12315
 
12147
12316
 
12148
12317
 
12318
+
12149
12319
  var installedPlugins = [];
12150
12320
  function use(Plugin, options) {
12151
12321
  /* eslint-disable @typescript-eslint/no-use-before-define */
@@ -12229,7 +12399,7 @@ function _t(key, args) {
12229
12399
  var v = 'v3';
12230
12400
  var VXETable = {
12231
12401
  v: v,
12232
- version: "3.7.0-beta.4",
12402
+ version: "3.7.0-beta.6",
12233
12403
  reg: reg,
12234
12404
  use: use,
12235
12405
  setup: setup,
@@ -12238,6 +12408,7 @@ var VXETable = {
12238
12408
  commands: commands,
12239
12409
  formats: formats,
12240
12410
  menus: menus,
12411
+ validators: validators,
12241
12412
  config: config,
12242
12413
  t: t,
12243
12414
  _t: _t
@@ -12367,7 +12538,7 @@ var ColumnInfo = /*#__PURE__*/function () {
12367
12538
  var proxyOpts = $xegrid ? $xegrid.proxyOpts : null;
12368
12539
  var formatter = _vm.formatter;
12369
12540
  var visible = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(_vm.visible) ? _vm.visible : true;
12370
- if (false) { var _globalFunc, globalFunc, types; }
12541
+ if (false) { var _gFormatOpts, gFormatOpts, types; }
12371
12542
  Object.assign(this, {
12372
12543
  // 基本属性
12373
12544
  type: _vm.type,
@@ -15023,7 +15194,7 @@ var Cell = {
15023
15194
  isHidden = params.isHidden;
15024
15195
  var treeConfig = $table.treeConfig,
15025
15196
  treeIndeterminates = $table.treeIndeterminates,
15026
- selection = $table.selection;
15197
+ selectCheckboxRows = $table.selectCheckboxRows;
15027
15198
  var _$table$checkboxOpts = $table.checkboxOpts,
15028
15199
  labelField = _$table$checkboxOpts.labelField,
15029
15200
  checkMethod = _$table$checkboxOpts.checkMethod,
@@ -15039,7 +15210,7 @@ var Cell = {
15039
15210
  var isDisabled = !!checkMethod;
15040
15211
  var on;
15041
15212
  if (!isHidden) {
15042
- isChecked = $table.findRowIndexOf(selection, row) > -1;
15213
+ isChecked = $table.findRowIndexOf(selectCheckboxRows, row) > -1;
15043
15214
  on = {
15044
15215
  click: function click(evnt) {
15045
15216
  if (!isDisabled && isVisible) {
@@ -15276,6 +15447,7 @@ var Cell = {
15276
15447
  },
15277
15448
  on: {
15278
15449
  click: function click(evnt) {
15450
+ evnt.stopPropagation();
15279
15451
  $table.triggerSortEvent(evnt, column, 'asc');
15280
15452
  }
15281
15453
  }
@@ -15288,6 +15460,7 @@ var Cell = {
15288
15460
  },
15289
15461
  on: {
15290
15462
  click: function click(evnt) {
15463
+ evnt.stopPropagation();
15291
15464
  $table.triggerSortEvent(evnt, column, 'desc');
15292
15465
  }
15293
15466
  }
@@ -16677,16 +16850,16 @@ var Methods = {
16677
16850
  });
16678
16851
  }
16679
16852
  } else {
16680
- var selection = this.selection;
16853
+ var selectCheckboxRows = this.selectCheckboxRows;
16681
16854
  if (treeConfig) {
16682
16855
  rowList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().filterTree(currTableData, function (row) {
16683
- return _this17.findRowIndexOf(selection, row) > -1;
16856
+ return _this17.findRowIndexOf(selectCheckboxRows, row) > -1;
16684
16857
  }, {
16685
16858
  children: transform ? mapChildren : children
16686
16859
  });
16687
16860
  } else {
16688
16861
  rowList = currTableData.filter(function (row) {
16689
- return _this17.findRowIndexOf(selection, row) > -1;
16862
+ return _this17.findRowIndexOf(selectCheckboxRows, row) > -1;
16690
16863
  });
16691
16864
  }
16692
16865
  }
@@ -17764,6 +17937,7 @@ var Methods = {
17764
17937
  },
17765
17938
  updateHeight: function updateHeight() {
17766
17939
  this.customHeight = calcHeight(this, 'height');
17940
+ this.customMinHeight = calcHeight(this, 'minHeight');
17767
17941
  this.customMaxHeight = calcHeight(this, 'maxHeight');
17768
17942
  },
17769
17943
  updateStyle: function updateStyle() {
@@ -17773,6 +17947,7 @@ var Methods = {
17773
17947
  fullColumnIdData = this.fullColumnIdData,
17774
17948
  tableColumn = this.tableColumn,
17775
17949
  customHeight = this.customHeight,
17950
+ customMinHeight = this.customMinHeight,
17776
17951
  customMaxHeight = this.customMaxHeight,
17777
17952
  border = this.border,
17778
17953
  headerHeight = this.headerHeight,
@@ -17881,15 +18056,22 @@ var Methods = {
17881
18056
  } else if (layout === 'body') {
17882
18057
  var emptyBlockElem = elemStore["".concat(name, "-").concat(layout, "-emptyBlock")];
17883
18058
  if (methods_isNodeElement(wrapperElem)) {
18059
+ var bodyMinHeight = fixedType ? customMinHeight - headerHeight - footerHeight - (showFooter ? 0 : scrollbarHeight) : customMinHeight - headerHeight - footerHeight;
18060
+ var bodyMaxHeight = 0;
17884
18061
  if (customMaxHeight) {
17885
- wrapperElem.style.maxHeight = "".concat(fixedType ? customMaxHeight - headerHeight - (showFooter ? 0 : scrollbarHeight) : customMaxHeight - headerHeight - footerHeight, "px");
17886
- } else {
17887
- if (customHeight > 0) {
17888
- wrapperElem.style.height = "".concat(fixedType ? (customHeight > 0 ? customHeight - headerHeight - footerHeight : tableHeight) - (showFooter ? 0 : scrollbarHeight) : customHeight - headerHeight - footerHeight, "px");
17889
- } else {
17890
- wrapperElem.style.height = '';
18062
+ bodyMaxHeight = Math.max(bodyMinHeight, fixedType ? customMaxHeight - headerHeight - (showFooter ? 0 : scrollbarHeight) : customMaxHeight - headerHeight - footerHeight);
18063
+ wrapperElem.style.maxHeight = "".concat(bodyMaxHeight, "px");
18064
+ }
18065
+ if (customHeight > 0) {
18066
+ var bodyHeight = fixedType ? (customHeight > 0 ? customHeight - headerHeight - footerHeight : tableHeight) - (showFooter ? 0 : scrollbarHeight) : customHeight - headerHeight - footerHeight;
18067
+ if (bodyMaxHeight) {
18068
+ bodyHeight = Math.min(bodyMaxHeight, bodyHeight);
17891
18069
  }
18070
+ wrapperElem.style.height = "".concat(Math.max(bodyMinHeight, bodyHeight), "px");
18071
+ } else {
18072
+ wrapperElem.style.height = '';
17892
18073
  }
18074
+ wrapperElem.style.minHeight = "".concat(bodyMinHeight, "px");
17893
18075
  }
17894
18076
 
17895
18077
  // 如果是固定列
@@ -18771,12 +18953,12 @@ var Methods = {
18771
18953
  return this.handleCheckedCheckboxRow(rows, value, true);
18772
18954
  },
18773
18955
  isCheckedByCheckboxRow: function isCheckedByCheckboxRow(row) {
18774
- var selection = this.selection;
18956
+ var selectCheckboxRows = this.selectCheckboxRows;
18775
18957
  var checkField = this.checkboxOpts.checkField;
18776
18958
  if (checkField) {
18777
18959
  return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField);
18778
18960
  }
18779
- return this.findRowIndexOf(selection, row) > -1;
18961
+ return this.findRowIndexOf(selectCheckboxRows, row) > -1;
18780
18962
  },
18781
18963
  isIndeterminateByCheckboxRow: function isIndeterminateByCheckboxRow(row) {
18782
18964
  var treeIndeterminates = this.treeIndeterminates;
@@ -18789,7 +18971,7 @@ var Methods = {
18789
18971
  handleSelectRow: function handleSelectRow(_ref6, value, isForce) {
18790
18972
  var _this33 = this;
18791
18973
  var row = _ref6.row;
18792
- var selection = this.selection,
18974
+ var selectCheckboxRows = this.selectCheckboxRows,
18793
18975
  afterFullData = this.afterFullData,
18794
18976
  treeConfig = this.treeConfig,
18795
18977
  treeOpts = this.treeOpts,
@@ -18861,7 +19043,7 @@ var Methods = {
18861
19043
  if (this.findRowIndexOf(treeIndeterminates, row) === -1) {
18862
19044
  treeIndeterminates.push(row);
18863
19045
  }
18864
- external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().remove(selection, function (item) {
19046
+ external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().remove(selectCheckboxRows, function (item) {
18865
19047
  return _this33.eqRow(item, row);
18866
19048
  });
18867
19049
  } else {
@@ -18871,9 +19053,9 @@ var Methods = {
18871
19053
  row: item
18872
19054
  })) {
18873
19055
  if (value) {
18874
- selection.push(item);
19056
+ selectCheckboxRows.push(item);
18875
19057
  } else {
18876
- external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().remove(selection, function (select) {
19058
+ external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().remove(selectCheckboxRows, function (select) {
18877
19059
  return _this33.eqRow(select, item);
18878
19060
  });
18879
19061
  }
@@ -18902,7 +19084,7 @@ var Methods = {
18902
19084
  _parentStatus = -1;
18903
19085
  } else {
18904
19086
  var _selectItems = _matchObj.items.filter(function (item) {
18905
- return _this33.findRowIndexOf(selection, item) > -1;
19087
+ return _this33.findRowIndexOf(selectCheckboxRows, item) > -1;
18906
19088
  });
18907
19089
  _parentStatus = _selectItems.filter(function (item) {
18908
19090
  return _this33.findRowIndexOf(_vItems, item) > -1;
@@ -18917,11 +19099,11 @@ var Methods = {
18917
19099
  row: row
18918
19100
  })) {
18919
19101
  if (value) {
18920
- if (this.findRowIndexOf(selection, row) === -1) {
18921
- selection.push(row);
19102
+ if (this.findRowIndexOf(selectCheckboxRows, row) === -1) {
19103
+ selectCheckboxRows.push(row);
18922
19104
  }
18923
19105
  } else {
18924
- external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().remove(selection, function (item) {
19106
+ external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().remove(selectCheckboxRows, function (item) {
18925
19107
  return _this33.eqRow(item, row);
18926
19108
  });
18927
19109
  }
@@ -18932,11 +19114,11 @@ var Methods = {
18932
19114
  this.checkSelectionStatus();
18933
19115
  },
18934
19116
  handleToggleCheckRowEvent: function handleToggleCheckRowEvent(evnt, params) {
18935
- var selection = this.selection,
19117
+ var selectCheckboxRows = this.selectCheckboxRows,
18936
19118
  checkboxOpts = this.checkboxOpts;
18937
19119
  var checkField = checkboxOpts.checkField;
18938
19120
  var row = params.row;
18939
- var value = checkField ? !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField) : this.findRowIndexOf(selection, row) === -1;
19121
+ var value = checkField ? !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField) : this.findRowIndexOf(selectCheckboxRows, row) === -1;
18940
19122
  if (evnt) {
18941
19123
  this.triggerCheckRowEvent(evnt, params, value);
18942
19124
  } else {
@@ -18961,10 +19143,10 @@ var Methods = {
18961
19143
  * 多选,切换某一行的选中状态
18962
19144
  */
18963
19145
  toggleCheckboxRow: function toggleCheckboxRow(row) {
18964
- var selection = this.selection,
19146
+ var selectCheckboxRows = this.selectCheckboxRows,
18965
19147
  checkboxOpts = this.checkboxOpts;
18966
19148
  var checkField = checkboxOpts.checkField;
18967
- var value = checkField ? !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField) : this.findRowIndexOf(selection, row) === -1;
19149
+ var value = checkField ? !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField) : this.findRowIndexOf(selectCheckboxRows, row) === -1;
18968
19150
  this.handleSelectRow({
18969
19151
  row: row
18970
19152
  }, value, true);
@@ -18975,7 +19157,7 @@ var Methods = {
18975
19157
  var afterFullData = this.afterFullData,
18976
19158
  treeConfig = this.treeConfig,
18977
19159
  treeOpts = this.treeOpts,
18978
- selection = this.selection,
19160
+ selectCheckboxRows = this.selectCheckboxRows,
18979
19161
  checkboxReserveRowMap = this.checkboxReserveRowMap,
18980
19162
  checkboxOpts = this.checkboxOpts;
18981
19163
  var checkField = checkboxOpts.checkField,
@@ -18983,7 +19165,7 @@ var Methods = {
18983
19165
  checkStrictly = checkboxOpts.checkStrictly,
18984
19166
  checkMethod = checkboxOpts.checkMethod;
18985
19167
  var selectRows = [];
18986
- var beforeSelection = treeConfig ? [] : selection.filter(function (row) {
19168
+ var beforeSelection = treeConfig ? [] : selectCheckboxRows.filter(function (row) {
18987
19169
  return _this34.findRowIndexOf(afterFullData, row) === -1;
18988
19170
  });
18989
19171
  if (checkStrictly) {
@@ -19038,7 +19220,7 @@ var Methods = {
19038
19220
  external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterFullData, function (row) {
19039
19221
  if (checkMethod({
19040
19222
  row: row
19041
- }) ? 0 : _this34.findRowIndexOf(selection, row) > -1) {
19223
+ }) ? 0 : _this34.findRowIndexOf(selectCheckboxRows, row) > -1) {
19042
19224
  selectRows.push(row);
19043
19225
  }
19044
19226
  }, treeOpts);
@@ -19053,7 +19235,7 @@ var Methods = {
19053
19235
  */
19054
19236
  if (!isForce && checkMethod) {
19055
19237
  selectRows = afterFullData.filter(function (row) {
19056
- return _this34.findRowIndexOf(selection, row) > -1 || checkMethod({
19238
+ return _this34.findRowIndexOf(selectCheckboxRows, row) > -1 || checkMethod({
19057
19239
  row: row
19058
19240
  });
19059
19241
  });
@@ -19070,7 +19252,7 @@ var Methods = {
19070
19252
  selectRows = afterFullData.filter(function (row) {
19071
19253
  return checkMethod({
19072
19254
  row: row
19073
- }) ? 0 : _this34.findRowIndexOf(selection, row) > -1;
19255
+ }) ? 0 : _this34.findRowIndexOf(selectCheckboxRows, row) > -1;
19074
19256
  });
19075
19257
  }
19076
19258
  }
@@ -19087,7 +19269,7 @@ var Methods = {
19087
19269
  });
19088
19270
  }
19089
19271
  }
19090
- this.selection = checkField ? [] : beforeSelection.concat(selectRows);
19272
+ this.selectCheckboxRows = checkField ? [] : beforeSelection.concat(selectRows);
19091
19273
  }
19092
19274
  this.treeIndeterminates = [];
19093
19275
  this.checkSelectionStatus();
@@ -19103,7 +19285,7 @@ var Methods = {
19103
19285
  checkSelectionStatus: function checkSelectionStatus() {
19104
19286
  var _this35 = this;
19105
19287
  var afterFullData = this.afterFullData,
19106
- selection = this.selection,
19288
+ selectCheckboxRows = this.selectCheckboxRows,
19107
19289
  treeIndeterminates = this.treeIndeterminates,
19108
19290
  checkboxOpts = this.checkboxOpts,
19109
19291
  treeConfig = this.treeConfig;
@@ -19163,22 +19345,22 @@ var Methods = {
19163
19345
  disableRows.push(row);
19164
19346
  return true;
19165
19347
  }
19166
- if (_this35.findRowIndexOf(selection, row) > -1) {
19348
+ if (_this35.findRowIndexOf(selectCheckboxRows, row) > -1) {
19167
19349
  checkRows.push(row);
19168
19350
  return true;
19169
19351
  }
19170
19352
  return false;
19171
19353
  } : function (row) {
19172
- return _this35.findRowIndexOf(selection, row) > -1;
19354
+ return _this35.findRowIndexOf(selectCheckboxRows, row) > -1;
19173
19355
  });
19174
19356
  isAllSelected = isAllResolve && afterFullData.length !== disableRows.length;
19175
19357
  if (treeConfig) {
19176
19358
  isIndeterminate = !isAllSelected && afterFullData.some(function (row) {
19177
- return _this35.findRowIndexOf(treeIndeterminates, row) > -1 || _this35.findRowIndexOf(selection, row) > -1;
19359
+ return _this35.findRowIndexOf(treeIndeterminates, row) > -1 || _this35.findRowIndexOf(selectCheckboxRows, row) > -1;
19178
19360
  });
19179
19361
  } else {
19180
19362
  isIndeterminate = !isAllSelected && afterFullData.some(function (row) {
19181
- return _this35.findRowIndexOf(selection, row) > -1;
19363
+ return _this35.findRowIndexOf(selectCheckboxRows, row) > -1;
19182
19364
  });
19183
19365
  }
19184
19366
  }
@@ -19198,7 +19380,7 @@ var Methods = {
19198
19380
  radioReserveRow = this.radioReserveRow,
19199
19381
  radioOpts = this.radioOpts,
19200
19382
  checkboxOpts = this.checkboxOpts,
19201
- selection = this.selection,
19383
+ selectCheckboxRows = this.selectCheckboxRows,
19202
19384
  rowExpandeds = this.rowExpandeds,
19203
19385
  treeExpandeds = this.treeExpandeds,
19204
19386
  expandOpts = this.expandOpts;
@@ -19214,7 +19396,7 @@ var Methods = {
19214
19396
  }
19215
19397
  }
19216
19398
  // 复选框
19217
- this.selection = getRecoverRow(this, selection); // 刷新多选行状态
19399
+ this.selectCheckboxRows = getRecoverRow(this, selectCheckboxRows); // 刷新多选行状态
19218
19400
  // 还原保留选中状态
19219
19401
  if (checkboxOpts.reserve) {
19220
19402
  this.handleCheckedCheckboxRow(handleReserveRow(this, this.checkboxReserveRowMap), true, true);
@@ -19384,7 +19566,7 @@ var Methods = {
19384
19566
  }
19385
19567
  this.isAllSelected = false;
19386
19568
  this.isIndeterminate = false;
19387
- this.selection = [];
19569
+ this.selectCheckboxRows = [];
19388
19570
  this.treeIndeterminates = [];
19389
19571
  return this.$nextTick();
19390
19572
  },
@@ -19805,12 +19987,18 @@ var Methods = {
19805
19987
  });
19806
19988
  }
19807
19989
  var params = {
19990
+ $table: this,
19991
+ $event: evnt,
19808
19992
  column: column,
19809
19993
  field: field,
19810
19994
  property: field,
19811
19995
  order: column.order,
19812
- sortList: this.getSortColumns()
19996
+ sortList: this.getSortColumns(),
19997
+ sortTime: column.sortTime
19813
19998
  };
19999
+ if (this.mouseConfig && this.mouseOpts.area && this.handleSortEvent) {
20000
+ return this.handleSortEvent(evnt, params);
20001
+ }
19814
20002
  this.emitEvent('sort-change', params, evnt);
19815
20003
  }
19816
20004
  },
@@ -20066,7 +20254,19 @@ var Methods = {
20066
20254
  * @param {Boolean} expanded 是否展开
20067
20255
  */
20068
20256
  setAllRowExpand: function setAllRowExpand(expanded) {
20069
- return this.setRowExpand(this.expandOpts.lazy ? this.tableData : this.tableFullData, expanded);
20257
+ var treeConfig = this.treeConfig,
20258
+ treeOpts = this.treeOpts,
20259
+ tableFullData = this.tableFullData,
20260
+ tableFullTreeData = this.tableFullTreeData;
20261
+ var expandedRows = [];
20262
+ if (treeConfig) {
20263
+ external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(tableFullTreeData, function (row) {
20264
+ expandedRows.push(row);
20265
+ }, treeOpts);
20266
+ } else {
20267
+ expandedRows = tableFullData;
20268
+ }
20269
+ return this.setRowExpand(expandedRows, expanded);
20070
20270
  },
20071
20271
  handleAsyncRowExpand: function handleAsyncRowExpand(row) {
20072
20272
  var _this44 = this;
@@ -20947,16 +21147,16 @@ var Methods = {
20947
21147
  * 如果组件值 v-model 发生 change 时,调用改函数用于更新某一列编辑状态
20948
21148
  * 如果单元格配置了校验规则,则会进行校验
20949
21149
  */
20950
- updateStatus: function updateStatus(scope, cellValue) {
21150
+ updateStatus: function updateStatus(slotParams, cellValue) {
20951
21151
  var _this57 = this;
20952
21152
  var customVal = !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(cellValue);
20953
21153
  return this.$nextTick().then(function () {
20954
21154
  var $refs = _this57.$refs,
20955
21155
  editRules = _this57.editRules,
20956
21156
  validStore = _this57.validStore;
20957
- if (scope && $refs.tableBody && editRules) {
20958
- var row = scope.row,
20959
- column = scope.column;
21157
+ if (slotParams && $refs.tableBody && editRules) {
21158
+ var row = slotParams.row,
21159
+ column = slotParams.column;
20960
21160
  var type = 'change';
20961
21161
  if (_this57.hasCellRules(type, row, column)) {
20962
21162
  var cell = _this57.getCell(row, column);
@@ -21147,11 +21347,11 @@ var Methods = {
21147
21347
  columnIndex: this.getColumnIndex(column)
21148
21348
  };
21149
21349
  if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(formatter)) {
21150
- var globalFunc = formats.get(formatter);
21151
- cellLabel = globalFunc ? globalFunc(formatParams) : '';
21350
+ var gFormatOpts = formats.get(formatter);
21351
+ cellLabel = gFormatOpts && gFormatOpts.formatMethod ? gFormatOpts.formatMethod(formatParams) : '';
21152
21352
  } else if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(formatter)) {
21153
- var _globalFunc = formats.get(formatter[0]);
21154
- cellLabel = _globalFunc ? _globalFunc.apply(void 0, [formatParams].concat(_toConsumableArray(formatter.slice(1)))) : '';
21353
+ var _gFormatOpts = formats.get(formatter[0]);
21354
+ cellLabel = _gFormatOpts && _gFormatOpts.formatMethod ? _gFormatOpts.formatMethod.apply(_gFormatOpts, [formatParams].concat(_toConsumableArray(formatter.slice(1)))) : '';
21155
21355
  } else {
21156
21356
  cellLabel = formatter(formatParams);
21157
21357
  }
@@ -21279,6 +21479,7 @@ var Loading = Object.assign(loading, {
21279
21479
 
21280
21480
 
21281
21481
 
21482
+
21282
21483
 
21283
21484
 
21284
21485
  /**
@@ -21369,6 +21570,13 @@ function handleUupdateResize(_vm) {
21369
21570
  data: Array,
21370
21571
  // 表格的高度
21371
21572
  height: [Number, String],
21573
+ // 表格的最小高度
21574
+ minHeight: {
21575
+ type: [Number, String],
21576
+ "default": function _default() {
21577
+ return conf.table.minHeight;
21578
+ }
21579
+ },
21372
21580
  // 表格的最大高度
21373
21581
  maxHeight: [Number, String],
21374
21582
  // 已废弃,被 column-config.resizable 替换
@@ -21690,7 +21898,7 @@ function handleUupdateResize(_vm) {
21690
21898
  // 复选框属性,有选中且非全选状态
21691
21899
  isIndeterminate: false,
21692
21900
  // 复选框属性,已选中的行
21693
- selection: [],
21901
+ selectCheckboxRows: [],
21694
21902
  // 当前行
21695
21903
  currentRow: null,
21696
21904
  // 单选框属性,选中列
@@ -22288,6 +22496,7 @@ function handleUupdateResize(_vm) {
22288
22496
  this.preventEvent(null, 'destroyed');
22289
22497
  },
22290
22498
  render: function render(h) {
22499
+ var _ref;
22291
22500
  var _e = this._e,
22292
22501
  $scopedSlots = this.$scopedSlots,
22293
22502
  tId = this.tId,
@@ -22326,33 +22535,12 @@ function handleUupdateResize(_vm) {
22326
22535
  hasTip = this.hasTip,
22327
22536
  columnOpts = this.columnOpts,
22328
22537
  rowOpts = this.rowOpts,
22329
- loadingOpts = this.loadingOpts;
22538
+ loadingOpts = this.loadingOpts,
22539
+ editRules = this.editRules;
22330
22540
  var leftList = columnStore.leftList,
22331
22541
  rightList = columnStore.rightList;
22332
22542
  return h('div', {
22333
- "class": ['vxe-table', 'vxe-table--render-default', "tid_".concat(tId), vSize ? "size--".concat(vSize) : '', "border--".concat(tableBorder), {
22334
- 'vxe-editable': !!editConfig,
22335
- 'cell--highlight': highlightCell,
22336
- 'cell--selected': mouseConfig && mouseOpts.selected,
22337
- 'cell--area': mouseConfig && mouseOpts.area,
22338
- 'row--highlight': rowOpts.isHover || highlightHoverRow,
22339
- 'column--highlight': columnOpts.isHover || highlightHoverColumn,
22340
- 'is--header': showHeader,
22341
- 'is--footer': showFooter,
22342
- 'is--group': isGroup,
22343
- 'is--tree-line': treeConfig && treeOpts.line,
22344
- 'is--fixed-left': leftList.length,
22345
- 'is--fixed-right': rightList.length,
22346
- 'is--animat': !!this.animat,
22347
- 'is--round': this.round,
22348
- 'is--stripe': !treeConfig && stripe,
22349
- 'is--loading': loading,
22350
- 'is--empty': !loading && !tableData.length,
22351
- 'is--scroll-y': overflowY,
22352
- 'is--scroll-x': overflowX,
22353
- 'is--virtual-x': scrollXLoad,
22354
- 'is--virtual-y': scrollYLoad
22355
- }],
22543
+ "class": ['vxe-table', 'vxe-table--render-default', "tid_".concat(tId), vSize ? "size--".concat(vSize) : '', "border--".concat(tableBorder), (_ref = {}, _defineProperty(_ref, "vaild-msg--".concat(validOpts.msgMode), !!editRules), _defineProperty(_ref, 'vxe-editable', !!editConfig), _defineProperty(_ref, 'cell--highlight', highlightCell), _defineProperty(_ref, 'cell--selected', mouseConfig && mouseOpts.selected), _defineProperty(_ref, 'cell--area', mouseConfig && mouseOpts.area), _defineProperty(_ref, 'row--highlight', rowOpts.isHover || highlightHoverRow), _defineProperty(_ref, 'column--highlight', columnOpts.isHover || highlightHoverColumn), _defineProperty(_ref, 'is--header', showHeader), _defineProperty(_ref, 'is--footer', showFooter), _defineProperty(_ref, 'is--group', isGroup), _defineProperty(_ref, 'is--tree-line', treeConfig && treeOpts.line), _defineProperty(_ref, 'is--fixed-left', leftList.length), _defineProperty(_ref, 'is--fixed-right', rightList.length), _defineProperty(_ref, 'is--animat', !!this.animat), _defineProperty(_ref, 'is--round', this.round), _defineProperty(_ref, 'is--stripe', !treeConfig && stripe), _defineProperty(_ref, 'is--loading', loading), _defineProperty(_ref, 'is--empty', !loading && !tableData.length), _defineProperty(_ref, 'is--scroll-y', overflowY), _defineProperty(_ref, 'is--scroll-x', overflowX), _defineProperty(_ref, 'is--virtual-x', scrollXLoad), _defineProperty(_ref, 'is--virtual-y', scrollYLoad), _ref)],
22356
22544
  on: {
22357
22545
  keydown: this.keydownEvent
22358
22546
  }
@@ -22971,12 +23159,9 @@ var Table = Object.assign(table, {
22971
23159
  }
22972
23160
  });
22973
23161
  var filterList = this.getCheckedFilters();
22974
- // 如果是服务端筛选,则跳过本地筛选处理
22975
- if (!filterOpts.remote) {
22976
- this.handleTableData(true);
22977
- this.checkSelectionStatus();
22978
- }
22979
- this.emitEvent('filter-change', {
23162
+ var params = {
23163
+ $table: this,
23164
+ $event: evnt,
22980
23165
  column: column,
22981
23166
  field: field,
22982
23167
  property: field,
@@ -22984,7 +23169,16 @@ var Table = Object.assign(table, {
22984
23169
  datas: datas,
22985
23170
  filters: filterList,
22986
23171
  filterList: filterList
22987
- }, evnt);
23172
+ };
23173
+ // 如果是服务端筛选,则跳过本地筛选处理
23174
+ if (!filterOpts.remote) {
23175
+ this.handleTableData(true);
23176
+ this.checkSelectionStatus();
23177
+ }
23178
+ if (this.mouseConfig && this.mouseOpts.area && this.handleFilterEvent) {
23179
+ this.handleFilterEvent(evnt, params);
23180
+ }
23181
+ this.emitEvent('filter-change', params, evnt);
22988
23182
  this.closeFilter();
22989
23183
  this.updateFooter().then(function () {
22990
23184
  var scrollXLoad = _this2.scrollXLoad,
@@ -23488,15 +23682,15 @@ var Filter = {
23488
23682
  ctxMenuLinkEvent: function ctxMenuLinkEvent(evnt, menu) {
23489
23683
  // 如果一级菜单有配置 code 则允许点击,否则不能点击
23490
23684
  if (!menu.disabled && (menu.code || !menu.children || !menu.children.length)) {
23491
- var ctxMenuMethod = v_x_e_table.menus.get(menu.code);
23685
+ var gMenuOpts = v_x_e_table.menus.get(menu.code);
23492
23686
  var params = Object.assign({
23493
23687
  menu: menu,
23494
23688
  $grid: this.$xegrid,
23495
23689
  $table: this,
23496
23690
  $event: evnt
23497
23691
  }, this.ctxMenuStore.args);
23498
- if (ctxMenuMethod) {
23499
- ctxMenuMethod.call(this, params, evnt);
23692
+ if (gMenuOpts && gMenuOpts.menuMethod) {
23693
+ gMenuOpts.menuMethod(params, evnt);
23500
23694
  }
23501
23695
  // 在 v4 中废弃事件 context-menu-click
23502
23696
  if (this.$listeners['context-menu-click']) {
@@ -23799,7 +23993,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
23799
23993
  mergeList = this.mergeList,
23800
23994
  editStore = this.editStore,
23801
23995
  checkboxOpts = this.checkboxOpts,
23802
- selection = this.selection,
23996
+ selectCheckboxRows = this.selectCheckboxRows,
23803
23997
  isInsertByRow = this.isInsertByRow,
23804
23998
  treeOpts = this.treeOpts;
23805
23999
  var transform = treeOpts.transform;
@@ -23823,9 +24017,9 @@ function insertTreeRow(_vm, newRecords, isAppend) {
23823
24017
  // 如果绑定了多选属性,则更新状态
23824
24018
  if (!checkField) {
23825
24019
  rows.forEach(function (row) {
23826
- var sIndex = _this2.findRowIndexOf(selection, row);
24020
+ var sIndex = _this2.findRowIndexOf(selectCheckboxRows, row);
23827
24021
  if (sIndex > -1) {
23828
- selection.splice(sIndex, 1);
24022
+ selectCheckboxRows.splice(sIndex, 1);
23829
24023
  }
23830
24024
  });
23831
24025
  }
@@ -26211,7 +26405,12 @@ function renderExtraSuffixIcon(h, _vm) {
26211
26405
  },
26212
26406
  readonly: Boolean,
26213
26407
  disabled: Boolean,
26214
- placeholder: String,
26408
+ placeholder: {
26409
+ type: String,
26410
+ "default": function _default() {
26411
+ return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(conf.input.placeholder) ? conf.i18n('vxe.base.pleaseInput') : conf.input.placeholder;
26412
+ }
26413
+ },
26215
26414
  maxlength: [String, Number],
26216
26415
  autocomplete: {
26217
26416
  type: String,
@@ -26903,6 +27102,11 @@ function renderExtraSuffixIcon(h, _vm) {
26903
27102
  this.isActivated = false;
26904
27103
  return this.$nextTick();
26905
27104
  },
27105
+ select: function select() {
27106
+ this.$refs.input.select();
27107
+ this.isActivated = false;
27108
+ return this.$nextTick();
27109
+ },
26906
27110
  triggerEvent: function triggerEvent(evnt) {
26907
27111
  var $refs = this.$refs,
26908
27112
  inputValue = this.inputValue;
@@ -28411,7 +28615,12 @@ function renderOpts(h, _vm) {
28411
28615
  props: {
28412
28616
  value: null,
28413
28617
  clearable: Boolean,
28414
- placeholder: String,
28618
+ placeholder: {
28619
+ type: String,
28620
+ "default": function _default() {
28621
+ return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(conf.select.placeholder) ? conf.i18n('vxe.base.pleaseSelect') : conf.select.placeholder;
28622
+ }
28623
+ },
28415
28624
  loading: Boolean,
28416
28625
  disabled: Boolean,
28417
28626
  multiple: Boolean,
@@ -32172,6 +32381,8 @@ var Keyboard = {
32172
32381
 
32173
32382
 
32174
32383
 
32384
+
32385
+
32175
32386
 
32176
32387
 
32177
32388
 
@@ -32439,10 +32650,11 @@ function validErrorRuleValue(rule, val) {
32439
32650
  rules.forEach(function (rule) {
32440
32651
  var type = rule.type,
32441
32652
  trigger = rule.trigger,
32442
- required = rule.required;
32653
+ required = rule.required,
32654
+ validator = rule.validator;
32443
32655
  if (validType === 'all' || !trigger || validType === trigger) {
32444
- if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(rule.validator)) {
32445
- var customValid = rule.validator({
32656
+ if (validator) {
32657
+ var validParams = {
32446
32658
  cellValue: cellValue,
32447
32659
  rule: rule,
32448
32660
  rules: rules,
@@ -32452,7 +32664,22 @@ function validErrorRuleValue(rule, val) {
32452
32664
  columnIndex: _this3.getColumnIndex(column),
32453
32665
  field: column.property,
32454
32666
  $table: _this3
32455
- });
32667
+ };
32668
+ var customValid;
32669
+ if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(validator)) {
32670
+ var gvItem = v_x_e_table.validators.get(validator);
32671
+ if (gvItem) {
32672
+ if (gvItem.cellValidatorMethod) {
32673
+ customValid = gvItem.cellValidatorMethod(validParams);
32674
+ } else {
32675
+ if (false) {}
32676
+ }
32677
+ } else {
32678
+ if (false) {}
32679
+ }
32680
+ } else {
32681
+ customValid = validator(validParams);
32682
+ }
32456
32683
  if (customValid) {
32457
32684
  if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isError(customValid)) {
32458
32685
  _this3.validRuleErr = true;
@@ -34019,14 +34246,16 @@ Object.keys(packages_table.methods).forEach(function (name) {
34019
34246
  }
34020
34247
  default:
34021
34248
  {
34022
- var btnMethod = v_x_e_table.commands.get(code);
34023
- if (btnMethod) {
34024
- btnMethod.apply(void 0, [{
34249
+ var gCommandOpts = v_x_e_table.commands.get(code);
34250
+ if (gCommandOpts.commandMethod) {
34251
+ gCommandOpts.commandMethod.apply(gCommandOpts, [{
34025
34252
  code: code,
34026
34253
  button: button,
34027
34254
  $grid: this,
34028
34255
  $table: $xetable
34029
34256
  }].concat(args));
34257
+ } else {
34258
+ if (false) {}
34030
34259
  }
34031
34260
  }
34032
34261
  }
@@ -35060,7 +35289,7 @@ function renderCustoms(h, _vm) {
35060
35289
  if ($xegrid) {
35061
35290
  $xegrid.triggerToolbarBtnEvent(item, evnt);
35062
35291
  } else {
35063
- var commandMethod = v_x_e_table.commands.get(code);
35292
+ var gCommandOpts = v_x_e_table.commands.get(code);
35064
35293
  var params = {
35065
35294
  code: code,
35066
35295
  button: item,
@@ -35068,8 +35297,12 @@ function renderCustoms(h, _vm) {
35068
35297
  $grid: $xegrid,
35069
35298
  $event: evnt
35070
35299
  };
35071
- if (commandMethod) {
35072
- commandMethod.call(this, params, evnt);
35300
+ if (gCommandOpts) {
35301
+ if (gCommandOpts.commandMethod) {
35302
+ gCommandOpts.commandMethod(params);
35303
+ } else {
35304
+ if (false) {}
35305
+ }
35073
35306
  }
35074
35307
  this.$emit('button-click', params);
35075
35308
  }
@@ -35083,7 +35316,7 @@ function renderCustoms(h, _vm) {
35083
35316
  if ($xegrid) {
35084
35317
  $xegrid.triggerToolbarTolEvent(item, evnt);
35085
35318
  } else {
35086
- var commandMethod = v_x_e_table.commands.get(code);
35319
+ var gCommandOpts = v_x_e_table.commands.get(code);
35087
35320
  var params = {
35088
35321
  code: code,
35089
35322
  tool: item,
@@ -35091,8 +35324,12 @@ function renderCustoms(h, _vm) {
35091
35324
  $table: $xetable,
35092
35325
  $event: evnt
35093
35326
  };
35094
- if (commandMethod) {
35095
- commandMethod.call(this, params, evnt);
35327
+ if (gCommandOpts) {
35328
+ if (gCommandOpts.commandMethod) {
35329
+ gCommandOpts.commandMethod(params);
35330
+ } else {
35331
+ if (false) {}
35332
+ }
35096
35333
  }
35097
35334
  this.$emit('tool-click', params);
35098
35335
  }
@@ -35970,7 +36207,12 @@ var autoTxtElem;
35970
36207
  name: String,
35971
36208
  readonly: Boolean,
35972
36209
  disabled: Boolean,
35973
- placeholder: String,
36210
+ placeholder: {
36211
+ type: String,
36212
+ "default": function _default() {
36213
+ return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(conf.textarea.placeholder) ? conf.i18n('vxe.base.pleaseInput') : conf.textarea.placeholder;
36214
+ }
36215
+ },
35974
36216
  maxlength: [String, Number],
35975
36217
  rows: {
35976
36218
  type: [String, Number],
@@ -37962,7 +38204,9 @@ function getResetValue(value, resetValue) {
37962
38204
  validateField: function validateField(fieldOrItem, callback) {
37963
38205
  var _this7 = this;
37964
38206
  var fields = [];
37965
- if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(fieldOrItem)) {
38207
+ if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(fieldOrItem)) {
38208
+ fields = fieldOrItem;
38209
+ } else {
37966
38210
  fields = [fieldOrItem];
37967
38211
  }
37968
38212
  return this.beginValidate(fields.map(function (field) {
@@ -38060,10 +38304,11 @@ function getResetValue(value, resetValue) {
38060
38304
  rules.forEach(function (rule) {
38061
38305
  var type = rule.type,
38062
38306
  trigger = rule.trigger,
38063
- required = rule.required;
38307
+ required = rule.required,
38308
+ validator = rule.validator;
38064
38309
  if (validType === 'all' || !trigger || validType === rule.trigger) {
38065
- if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(rule.validator)) {
38066
- var customValid = rule.validator({
38310
+ if (validator) {
38311
+ var validParams = {
38067
38312
  itemValue: itemValue,
38068
38313
  rule: rule,
38069
38314
  rules: rules,
@@ -38071,7 +38316,22 @@ function getResetValue(value, resetValue) {
38071
38316
  field: property,
38072
38317
  property: property,
38073
38318
  $form: _this9
38074
- });
38319
+ };
38320
+ var customValid;
38321
+ if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(validator)) {
38322
+ var gvItem = v_x_e_table.validators.get(validator);
38323
+ if (gvItem) {
38324
+ if (gvItem.itemValidatorMethod) {
38325
+ customValid = gvItem.itemValidatorMethod(validParams);
38326
+ } else {
38327
+ if (false) {}
38328
+ }
38329
+ } else {
38330
+ if (false) {}
38331
+ }
38332
+ } else {
38333
+ customValid = validator(validParams);
38334
+ }
38075
38335
  if (customValid) {
38076
38336
  if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isError(customValid)) {
38077
38337
  errorRules.push(new form_Rule({
@@ -39406,6 +39666,10 @@ var Pulldown = Object.assign(pulldown, {
39406
39666
  ;// CONCATENATED MODULE: ./packages/locale/lang/zh-CN.js
39407
39667
  /* harmony default export */ const zh_CN = ({
39408
39668
  vxe: {
39669
+ base: {
39670
+ pleaseInput: '请输入',
39671
+ pleaseSelect: '请选择'
39672
+ },
39409
39673
  loading: {
39410
39674
  text: '加载中...'
39411
39675
  },
@@ -39425,6 +39689,9 @@ var Pulldown = Object.assign(pulldown, {
39425
39689
  errProp: '不支持的参数 "{0}",可能为 "{1}"',
39426
39690
  colRepet: 'column.{0}="{1}" 重复了,这可能会导致某些功能无法使用',
39427
39691
  notFunc: '方法 "{0}" 不存在',
39692
+ notValidators: '全局校验 "{0}" 不存在',
39693
+ notFormats: '全局格式化 "{0}" 不存在',
39694
+ notCommands: '全局指令 "{0}" 不存在',
39428
39695
  notSlot: '插槽 "{0}" 不存在',
39429
39696
  noTree: '树结构不支持 "{0}"',
39430
39697
  notProp: '不支持的参数 "{0}"',