vxe-table 4.2.8 → 4.3.0-beta.2

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 (227) hide show
  1. package/es/button/src/button.js +14 -14
  2. package/es/button/style.css +1 -58
  3. package/es/checkbox/src/checkbox.js +7 -4
  4. package/es/checkbox/style.css +37 -58
  5. package/es/edit/src/hook.js +29 -13
  6. package/es/export/src/export-panel.js +10 -20
  7. package/es/export/src/hook.js +45 -45
  8. package/es/export/src/import-panel.js +2 -2
  9. package/es/export/src/util.js +7 -7
  10. package/es/export/style.css +27 -82
  11. package/es/filter/src/hook.js +5 -5
  12. package/es/filter/src/panel.js +9 -17
  13. package/es/filter/style.css +27 -79
  14. package/es/footer/src/footer.js +15 -15
  15. package/es/form/src/form-config-item.js +8 -7
  16. package/es/form/src/form-item.js +8 -7
  17. package/es/form/src/form.js +8 -6
  18. package/es/form/style.css +0 -3
  19. package/es/grid/src/grid.js +18 -13
  20. package/es/grid/style.css +1 -1
  21. package/es/header/src/header.js +18 -18
  22. package/es/header/style.css +0 -95
  23. package/es/icon/style.css +379 -0
  24. package/es/input/src/input.js +26 -26
  25. package/es/input/style.css +13 -4
  26. package/es/keyboard/src/hook.js +7 -7
  27. package/es/list/src/list.js +5 -5
  28. package/es/loading/src/loading.js +1 -1
  29. package/es/menu/src/hooks.js +9 -9
  30. package/es/menu/src/panel.js +2 -2
  31. package/es/modal/src/modal.js +52 -51
  32. package/es/modal/style.css +2 -3
  33. package/es/pager/src/pager.js +3 -3
  34. package/es/pager/style.css +4 -2
  35. package/es/pulldown/src/pulldown.js +7 -7
  36. package/es/radio/src/button.js +1 -1
  37. package/es/radio/src/radio.js +5 -4
  38. package/es/radio/style.css +32 -55
  39. package/es/select/src/select.js +13 -12
  40. package/es/select/style.css +1 -0
  41. package/es/style.css +1 -1
  42. package/es/style.min.css +1 -1
  43. package/es/switch/src/switch.js +1 -1
  44. package/es/table/src/body.js +38 -34
  45. package/es/table/src/cell.js +16 -28
  46. package/es/table/src/columnInfo.js +4 -4
  47. package/es/table/src/table.js +65 -60
  48. package/es/table/src/util.js +2 -2
  49. package/es/table/style.css +160 -139
  50. package/es/textarea/src/textarea.js +5 -5
  51. package/es/toolbar/src/toolbar.js +17 -24
  52. package/es/toolbar/style.css +28 -80
  53. package/es/tools/dom.js +2 -2
  54. package/es/tools/log.js +1 -1
  55. package/es/tools/vn.js +7 -0
  56. package/es/tooltip/src/tooltip.js +22 -10
  57. package/es/v-x-e-table/index.js +1 -1
  58. package/es/v-x-e-table/src/conf.js +43 -38
  59. package/es/v-x-e-table/src/interceptor.js +1 -1
  60. package/es/v-x-e-table/src/renderer.js +19 -15
  61. package/es/v-x-e-table/style.css +405 -2
  62. package/lib/button/src/button.js +10 -10
  63. package/lib/button/src/button.min.js +1 -1
  64. package/lib/button/style/style.css +1 -58
  65. package/lib/button/style/style.min.css +1 -1
  66. package/lib/checkbox/src/checkbox.js +5 -3
  67. package/lib/checkbox/src/checkbox.min.js +1 -1
  68. package/lib/checkbox/style/style.css +37 -58
  69. package/lib/checkbox/style/style.min.css +1 -1
  70. package/lib/edit/src/hook.js +14 -13
  71. package/lib/edit/src/hook.min.js +1 -1
  72. package/lib/export/src/export-panel.js +11 -17
  73. package/lib/export/src/export-panel.min.js +1 -1
  74. package/lib/export/src/hook.js +50 -50
  75. package/lib/export/src/hook.min.js +1 -1
  76. package/lib/export/src/import-panel.js +3 -3
  77. package/lib/export/src/import-panel.min.js +1 -1
  78. package/lib/export/src/util.js +4 -4
  79. package/lib/export/src/util.min.js +1 -1
  80. package/lib/export/style/style.css +27 -82
  81. package/lib/export/style/style.min.css +1 -1
  82. package/lib/filter/src/hook.js +5 -5
  83. package/lib/filter/src/hook.min.js +1 -1
  84. package/lib/filter/src/panel.js +11 -15
  85. package/lib/filter/src/panel.min.js +1 -1
  86. package/lib/filter/style/style.css +27 -79
  87. package/lib/filter/style/style.min.css +1 -1
  88. package/lib/footer/src/footer.js +14 -14
  89. package/lib/footer/src/footer.min.js +1 -1
  90. package/lib/form/src/form-config-item.js +9 -7
  91. package/lib/form/src/form-config-item.min.js +1 -1
  92. package/lib/form/src/form-item.js +9 -7
  93. package/lib/form/src/form-item.min.js +1 -1
  94. package/lib/form/src/form.js +9 -6
  95. package/lib/form/src/form.min.js +1 -1
  96. package/lib/form/style/style.css +0 -3
  97. package/lib/form/style/style.min.css +1 -1
  98. package/lib/grid/src/grid.js +17 -13
  99. package/lib/grid/src/grid.min.js +1 -1
  100. package/lib/grid/style/style.css +1 -1
  101. package/lib/grid/style/style.min.css +1 -1
  102. package/lib/header/src/header.js +17 -17
  103. package/lib/header/src/header.min.js +1 -1
  104. package/lib/header/style/style.css +0 -95
  105. package/lib/header/style/style.min.css +0 -1
  106. package/lib/icon/style/style.css +379 -0
  107. package/lib/icon/style/style.min.css +1 -1
  108. package/lib/index.umd.js +163 -159
  109. package/lib/index.umd.min.js +1 -1
  110. package/lib/input/src/input.js +23 -23
  111. package/lib/input/src/input.min.js +1 -1
  112. package/lib/input/style/style.css +13 -4
  113. package/lib/input/style/style.min.css +1 -1
  114. package/lib/keyboard/src/hook.js +7 -7
  115. package/lib/keyboard/src/hook.min.js +1 -1
  116. package/lib/list/src/list.js +5 -5
  117. package/lib/list/src/list.min.js +1 -1
  118. package/lib/loading/src/loading.js +1 -1
  119. package/lib/loading/src/loading.min.js +1 -1
  120. package/lib/menu/src/hooks.js +9 -9
  121. package/lib/menu/src/hooks.min.js +1 -1
  122. package/lib/menu/src/panel.js +2 -2
  123. package/lib/menu/src/panel.min.js +1 -1
  124. package/lib/modal/src/modal.js +55 -53
  125. package/lib/modal/src/modal.min.js +1 -1
  126. package/lib/modal/style/style.css +2 -3
  127. package/lib/modal/style/style.min.css +1 -1
  128. package/lib/pager/src/pager.js +2 -2
  129. package/lib/pager/src/pager.min.js +1 -1
  130. package/lib/pager/style/style.css +4 -2
  131. package/lib/pager/style/style.min.css +1 -1
  132. package/lib/pulldown/src/pulldown.js +7 -7
  133. package/lib/pulldown/src/pulldown.min.js +1 -1
  134. package/lib/radio/src/button.js +1 -1
  135. package/lib/radio/src/button.min.js +1 -1
  136. package/lib/radio/src/radio.js +4 -4
  137. package/lib/radio/src/radio.min.js +1 -1
  138. package/lib/radio/style/style.css +32 -55
  139. package/lib/radio/style/style.min.css +1 -1
  140. package/lib/select/src/select.js +14 -12
  141. package/lib/select/src/select.min.js +1 -1
  142. package/lib/select/style/style.css +1 -0
  143. package/lib/select/style/style.min.css +1 -1
  144. package/lib/style.css +1 -1
  145. package/lib/style.min.css +1 -1
  146. package/lib/switch/src/switch.js +1 -1
  147. package/lib/switch/src/switch.min.js +1 -1
  148. package/lib/table/src/body.js +36 -34
  149. package/lib/table/src/body.min.js +1 -1
  150. package/lib/table/src/cell.js +21 -29
  151. package/lib/table/src/cell.min.js +1 -1
  152. package/lib/table/src/columnInfo.js +4 -4
  153. package/lib/table/src/columnInfo.min.js +1 -1
  154. package/lib/table/src/table.js +65 -61
  155. package/lib/table/src/table.min.js +1 -1
  156. package/lib/table/src/util.js +2 -2
  157. package/lib/table/src/util.min.js +1 -1
  158. package/lib/table/style/style.css +160 -139
  159. package/lib/table/style/style.min.css +1 -1
  160. package/lib/textarea/src/textarea.js +6 -6
  161. package/lib/textarea/src/textarea.min.js +1 -1
  162. package/lib/toolbar/src/toolbar.js +20 -22
  163. package/lib/toolbar/src/toolbar.min.js +1 -1
  164. package/lib/toolbar/style/style.css +28 -80
  165. package/lib/toolbar/style/style.min.css +1 -1
  166. package/lib/tools/dom.js +2 -2
  167. package/lib/tools/dom.min.js +1 -1
  168. package/lib/tools/log.js +1 -1
  169. package/lib/tools/log.min.js +1 -1
  170. package/lib/tools/vn.js +13 -0
  171. package/lib/tools/vn.min.js +1 -1
  172. package/lib/tooltip/src/tooltip.js +22 -8
  173. package/lib/tooltip/src/tooltip.min.js +1 -1
  174. package/lib/v-x-e-table/index.js +1 -1
  175. package/lib/v-x-e-table/index.min.js +1 -1
  176. package/lib/v-x-e-table/src/conf.js +43 -38
  177. package/lib/v-x-e-table/src/conf.min.js +1 -1
  178. package/lib/v-x-e-table/src/interceptor.js +1 -1
  179. package/lib/v-x-e-table/src/interceptor.min.js +1 -1
  180. package/lib/v-x-e-table/src/renderer.js +18 -16
  181. package/lib/v-x-e-table/src/renderer.min.js +1 -1
  182. package/lib/v-x-e-table/style/style.css +405 -2
  183. package/lib/v-x-e-table/style/style.min.css +1 -1
  184. package/package.json +6 -6
  185. package/packages/checkbox/src/checkbox.ts +7 -4
  186. package/packages/edit/src/hook.ts +18 -6
  187. package/packages/export/src/export-panel.ts +9 -19
  188. package/packages/filter/src/panel.ts +8 -16
  189. package/packages/form/src/form-config-item.ts +4 -3
  190. package/packages/form/src/form-item.ts +4 -3
  191. package/packages/form/src/form.ts +6 -4
  192. package/packages/grid/src/grid.ts +2 -1
  193. package/packages/input/src/input.ts +3 -3
  194. package/packages/modal/src/modal.ts +5 -4
  195. package/packages/radio/src/radio.ts +4 -3
  196. package/packages/select/src/select.ts +2 -1
  197. package/packages/table/src/cell.ts +18 -35
  198. package/packages/table/src/table.ts +11 -10
  199. package/packages/toolbar/src/toolbar.ts +14 -21
  200. package/packages/tools/vn.ts +10 -0
  201. package/packages/tooltip/src/tooltip.ts +8 -4
  202. package/packages/v-x-e-table/src/conf.ts +43 -38
  203. package/styles/base/checked.scss +44 -148
  204. package/styles/button.scss +1 -43
  205. package/styles/checkbox.scss +6 -65
  206. package/styles/export.scss +2 -9
  207. package/styles/filter.scss +2 -6
  208. package/styles/form.scss +0 -3
  209. package/styles/header.scss +0 -134
  210. package/styles/icon.scss +509 -713
  211. package/styles/input.scss +8 -0
  212. package/styles/modal.scss +0 -1
  213. package/styles/old-icon.scss +713 -0
  214. package/styles/pager.scss +2 -0
  215. package/styles/radio.scss +9 -77
  216. package/styles/select.scss +1 -0
  217. package/styles/table.scss +144 -21
  218. package/styles/toolbar.scss +2 -6
  219. package/styles/variable.scss +5 -5
  220. package/types/all.d.ts +6 -0
  221. package/types/column.d.ts +11 -11
  222. package/types/component.d.ts +3 -1
  223. package/types/form-item.d.ts +1 -0
  224. package/types/form.d.ts +6 -2
  225. package/types/grid.d.ts +4 -4
  226. package/types/table.d.ts +2 -2
  227. package/types/v-x-e-table/renderer.d.ts +3 -2
package/lib/index.umd.js CHANGED
@@ -8456,14 +8456,14 @@ function _createClass(Constructor, protoProps, staticProps) {
8456
8456
  return Constructor;
8457
8457
  }
8458
8458
  // CONCATENATED MODULE: ./packages/v-x-e-table/src/conf.ts
8459
- var iconPrefix = 'vxe-icon--';
8459
+ var iconPrefix = 'vxe-icon-';
8460
8460
  var GlobalConfig = {
8461
8461
  size: null,
8462
8462
  zIndex: 999,
8463
8463
  version: 0,
8464
8464
  // resizeInterval: 500,
8465
8465
  emptyCell: ' ',
8466
- loadingText: null,
8466
+ // loadingText: null, // 自定义loading提示内容,如果为null则不显示文本
8467
8467
  table: {
8468
8468
  fit: true,
8469
8469
  showHeader: true,
@@ -8582,65 +8582,70 @@ var GlobalConfig = {
8582
8582
  },
8583
8583
  icon: {
8584
8584
  // loading
8585
- // LOADING: iconPrefix + 'refresh roll vxe-loading--default-icon',
8585
+ LOADING: iconPrefix + 'spinner roll vxe-loading--default-icon',
8586
8586
  // table
8587
- TABLE_SORT_ASC: iconPrefix + 'caret-top',
8588
- TABLE_SORT_DESC: iconPrefix + 'caret-bottom',
8587
+ TABLE_SORT_ASC: iconPrefix + 'caret-up',
8588
+ TABLE_SORT_DESC: iconPrefix + 'caret-down',
8589
8589
  TABLE_FILTER_NONE: iconPrefix + 'funnel',
8590
8590
  TABLE_FILTER_MATCH: iconPrefix + 'funnel',
8591
- TABLE_EDIT: iconPrefix + 'edit-outline',
8592
- TABLE_HELP: iconPrefix + 'question',
8593
- TABLE_TREE_LOADED: iconPrefix + 'refresh roll',
8591
+ TABLE_EDIT: iconPrefix + 'edit',
8592
+ TABLE_HELP: iconPrefix + 'question-circle-fill',
8593
+ TABLE_TREE_LOADED: iconPrefix + 'spinner roll',
8594
8594
  TABLE_TREE_OPEN: iconPrefix + 'caret-right rotate90',
8595
8595
  TABLE_TREE_CLOSE: iconPrefix + 'caret-right',
8596
- TABLE_EXPAND_LOADED: iconPrefix + 'refresh roll',
8596
+ TABLE_EXPAND_LOADED: iconPrefix + 'spinner roll',
8597
8597
  TABLE_EXPAND_OPEN: iconPrefix + 'arrow-right rotate90',
8598
8598
  TABLE_EXPAND_CLOSE: iconPrefix + 'arrow-right',
8599
+ TABLE_CHECKBOX_CHECKED: iconPrefix + 'checkbox-checked',
8600
+ TABLE_CHECKBOX_UNCHECKED: iconPrefix + 'checkbox-unchecked',
8601
+ TABLE_CHECKBOX_INDETERMINATE: iconPrefix + 'checkbox-indeterminate',
8602
+ TABLE_RADIO_CHECKED: iconPrefix + 'radio-checked',
8603
+ TABLE_RADIO_UNCHECKED: iconPrefix + 'radio-unchecked',
8599
8604
  // button
8600
- BUTTON_DROPDOWN: iconPrefix + 'arrow-bottom',
8601
- BUTTON_LOADING: iconPrefix + 'refresh roll',
8605
+ BUTTON_DROPDOWN: iconPrefix + 'arrow-down',
8606
+ BUTTON_LOADING: iconPrefix + 'spinner roll',
8602
8607
  // select
8603
- SELECT_LOADED: iconPrefix + 'refresh roll',
8604
- SELECT_OPEN: iconPrefix + 'caret-bottom rotate180',
8605
- SELECT_CLOSE: iconPrefix + 'caret-bottom',
8608
+ SELECT_LOADED: iconPrefix + 'spinner roll',
8609
+ SELECT_OPEN: iconPrefix + 'caret-down rotate180',
8610
+ SELECT_CLOSE: iconPrefix + 'caret-down',
8606
8611
  // pager
8607
- PAGER_JUMP_PREV: iconPrefix + 'd-arrow-left',
8608
- PAGER_JUMP_NEXT: iconPrefix + 'd-arrow-right',
8612
+ PAGER_JUMP_PREV: iconPrefix + 'arrow-double-left',
8613
+ PAGER_JUMP_NEXT: iconPrefix + 'arrow-double-right',
8609
8614
  PAGER_PREV_PAGE: iconPrefix + 'arrow-left',
8610
8615
  PAGER_NEXT_PAGE: iconPrefix + 'arrow-right',
8611
- PAGER_JUMP_MORE: iconPrefix + 'more',
8616
+ PAGER_JUMP_MORE: iconPrefix + 'ellipsis-h',
8612
8617
  // input
8613
- INPUT_CLEAR: iconPrefix + 'close',
8614
- INPUT_PWD: iconPrefix + 'eye-slash',
8615
- INPUT_SHOW_PWD: iconPrefix + 'eye',
8616
- INPUT_PREV_NUM: iconPrefix + 'caret-top',
8617
- INPUT_NEXT_NUM: iconPrefix + 'caret-bottom',
8618
+ INPUT_CLEAR: iconPrefix + 'error-circle-fill',
8619
+ INPUT_PWD: iconPrefix + 'eye-fill',
8620
+ INPUT_SHOW_PWD: iconPrefix + 'eye-fill-close',
8621
+ INPUT_PREV_NUM: iconPrefix + 'caret-up',
8622
+ INPUT_NEXT_NUM: iconPrefix + 'caret-down',
8618
8623
  INPUT_DATE: iconPrefix + 'calendar',
8619
8624
  INPUT_SEARCH: iconPrefix + 'search',
8620
8625
  // modal
8621
8626
  MODAL_ZOOM_IN: iconPrefix + 'square',
8622
- MODAL_ZOOM_OUT: iconPrefix + 'zoomout',
8627
+ MODAL_ZOOM_OUT: iconPrefix + 'maximize',
8623
8628
  MODAL_CLOSE: iconPrefix + 'close',
8624
- MODAL_INFO: iconPrefix + 'info',
8625
- MODAL_SUCCESS: iconPrefix + 'success',
8626
- MODAL_WARNING: iconPrefix + 'warning',
8627
- MODAL_ERROR: iconPrefix + 'error',
8628
- MODAL_QUESTION: iconPrefix + 'question',
8629
- MODAL_LOADING: iconPrefix + 'refresh roll',
8629
+ MODAL_INFO: iconPrefix + 'info-circle-fill',
8630
+ MODAL_SUCCESS: iconPrefix + 'success-circle-fill',
8631
+ MODAL_WARNING: iconPrefix + 'warnion-circle-fill',
8632
+ MODAL_ERROR: iconPrefix + 'error-circle-fill',
8633
+ MODAL_QUESTION: iconPrefix + 'question-circle-fill',
8634
+ MODAL_LOADING: iconPrefix + 'spinner roll',
8630
8635
  // toolbar
8631
- TOOLBAR_TOOLS_REFRESH: iconPrefix + 'refresh',
8632
- TOOLBAR_TOOLS_REFRESH_LOADING: iconPrefix + 'refresh roll',
8636
+ TOOLBAR_TOOLS_REFRESH: iconPrefix + 'repeat',
8637
+ TOOLBAR_TOOLS_REFRESH_LOADING: iconPrefix + 'repeat roll',
8633
8638
  TOOLBAR_TOOLS_IMPORT: iconPrefix + 'upload',
8634
8639
  TOOLBAR_TOOLS_EXPORT: iconPrefix + 'download',
8635
8640
  TOOLBAR_TOOLS_PRINT: iconPrefix + 'print',
8636
- TOOLBAR_TOOLS_ZOOM_IN: iconPrefix + 'zoomin',
8637
- TOOLBAR_TOOLS_ZOOM_OUT: iconPrefix + 'zoomout',
8638
- TOOLBAR_TOOLS_CUSTOM: iconPrefix + 'menu',
8641
+ TOOLBAR_TOOLS_FULLSCREEN: iconPrefix + 'fullscreen',
8642
+ TOOLBAR_TOOLS_MINIMIZE: iconPrefix + 'minimize',
8643
+ TOOLBAR_TOOLS_CUSTOM: iconPrefix + 'custom-column',
8639
8644
  // form
8640
- FORM_PREFIX: iconPrefix + 'question',
8641
- FORM_SUFFIX: iconPrefix + 'question',
8642
- FORM_FOLDING: iconPrefix + 'arrow-top rotate180',
8643
- FORM_UNFOLDING: iconPrefix + 'arrow-top'
8645
+ FORM_PREFIX: iconPrefix + 'question-circle-fill',
8646
+ FORM_SUFFIX: iconPrefix + 'question-circle-fill',
8647
+ FORM_FOLDING: iconPrefix + 'arrow-up rotate180',
8648
+ FORM_UNFOLDING: iconPrefix + 'arrow-up'
8644
8649
  },
8645
8650
  grid: {
8646
8651
  // size: null,
@@ -8805,7 +8810,7 @@ var es_array_concat = __webpack_require__("99af");
8805
8810
 
8806
8811
 
8807
8812
  function getLog(message, params) {
8808
- return "[vxe-table v".concat("4.2.8", "] ").concat(src_conf.i18n(message, params));
8813
+ return "[vxe-table v".concat("4.3.0-beta.1", "] ").concat(src_conf.i18n(message, params));
8809
8814
  }
8810
8815
 
8811
8816
  function outLog(type) {
@@ -9807,9 +9812,17 @@ function colToVisible($xetable, column) {
9807
9812
  return Promise.resolve();
9808
9813
  }
9809
9814
  // CONCATENATED MODULE: ./packages/tools/vn.ts
9815
+
9810
9816
  function getOnName(type) {
9811
9817
  return 'on' + type.substring(0, 1).toLocaleUpperCase() + type.substring(1);
9812
9818
  }
9819
+ function getSlotVNs(vns) {
9820
+ if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isArray(vns)) {
9821
+ return vns;
9822
+ }
9823
+
9824
+ return [vns];
9825
+ }
9813
9826
  // CONCATENATED MODULE: ./packages/v-x-e-table/src/renderer.ts
9814
9827
 
9815
9828
 
@@ -10831,7 +10844,7 @@ var v_x_e_table_config = new v_x_e_table_VXETableConfig();
10831
10844
  var v = 'v4';
10832
10845
  var VXETable = {
10833
10846
  v: v,
10834
- version: "4.2.8",
10847
+ version: "4.3.0-beta.1",
10835
10848
  setup: setup_setup,
10836
10849
  interceptor: interceptor,
10837
10850
  renderer: renderer,
@@ -10994,25 +11007,23 @@ var Icon = {
10994
11007
  }, compConf.renderFilter(filterRender, params))];
10995
11008
  }
10996
11009
 
11010
+ var isAllChecked = multiple ? filterStore.isAllSelected : !filterStore.options.some(function (item) {
11011
+ return item._checked;
11012
+ });
11013
+ var isAllIndeterminate = multiple && filterStore.isIndeterminate;
10997
11014
  return [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('ul', {
10998
11015
  class: 'vxe-table--filter-header'
10999
11016
  }, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('li', {
11000
11017
  class: ['vxe-table--filter-option', {
11001
- 'is--checked': multiple ? filterStore.isAllSelected : !filterStore.options.some(function (item) {
11002
- return item._checked;
11003
- }),
11004
- 'is--indeterminate': multiple && filterStore.isIndeterminate
11018
+ 'is--checked': isAllChecked,
11019
+ 'is--indeterminate': isAllIndeterminate
11005
11020
  }],
11006
11021
  title: src_conf.i18n(multiple ? 'vxe.table.allTitle' : 'vxe.table.allFilter'),
11007
11022
  onClick: function onClick(evnt) {
11008
11023
  changeAllOption(evnt, !filterStore.isAllSelected);
11009
11024
  }
11010
11025
  }, (multiple ? [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
11011
- class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
11012
- }), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
11013
- class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
11014
- }), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
11015
- class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
11026
+ class: ['vxe-checkbox--icon', isAllIndeterminate ? src_conf.icon.TABLE_CHECKBOX_INDETERMINATE : isAllChecked ? src_conf.icon.TABLE_CHECKBOX_CHECKED : src_conf.icon.TABLE_CHECKBOX_UNCHECKED]
11016
11027
  })] : []).concat([Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
11017
11028
  class: 'vxe-checkbox--label'
11018
11029
  }, src_conf.i18n('vxe.table.allFilter'))]))]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('ul', {
@@ -11021,6 +11032,8 @@ var Icon = {
11021
11032
  maxHeight: "".concat(maxHeight, "px")
11022
11033
  } : {}
11023
11034
  }, filterStore.options.map(function (item) {
11035
+ var isChecked = item._checked;
11036
+ var isIndeterminate = false;
11024
11037
  return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('li', {
11025
11038
  class: ['vxe-table--filter-option', {
11026
11039
  'is--checked': item._checked
@@ -11030,11 +11043,7 @@ var Icon = {
11030
11043
  changeOption(evnt, !item._checked, item);
11031
11044
  }
11032
11045
  }, (multiple ? [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
11033
- class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
11034
- }), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
11035
- class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
11036
- }), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
11037
- class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
11046
+ class: ['vxe-checkbox--icon', isIndeterminate ? src_conf.icon.TABLE_CHECKBOX_INDETERMINATE : isChecked ? src_conf.icon.TABLE_CHECKBOX_CHECKED : src_conf.icon.TABLE_CHECKBOX_UNCHECKED]
11038
11047
  })] : []).concat([Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
11039
11048
  class: 'vxe-checkbox--label'
11040
11049
  }, formatText(item.label, 1))]));
@@ -12637,7 +12646,7 @@ var editHook = {
12637
12646
 
12638
12647
 
12639
12648
  if (actived.row && $xetable.findRowIndexOf(rows, actived.row) > -1) {
12640
- editMethods.clearActived();
12649
+ editMethods.clearEdit();
12641
12650
  } // 从新增中移除已删除的数据
12642
12651
 
12643
12652
 
@@ -12944,7 +12953,6 @@ var editHook = {
12944
12953
  */
12945
12954
  setSelectCell: function setSelectCell(row, fieldOrColumn) {
12946
12955
  var tableData = reactData.tableData;
12947
- var visibleColumn = internalData.visibleColumn;
12948
12956
  var editOpts = computeEditOpts.value;
12949
12957
  var column = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isString(fieldOrColumn) ? $xetable.getColumnByField(fieldOrColumn) : fieldOrColumn;
12950
12958
 
@@ -12957,7 +12965,7 @@ var editHook = {
12957
12965
  row: row,
12958
12966
  rowIndex: rowIndex,
12959
12967
  column: column,
12960
- columnIndex: visibleColumn.indexOf(column),
12968
+ columnIndex: $xetable.getColumnIndex(column),
12961
12969
  cell: cell
12962
12970
  };
12963
12971
  $xetable.handleSelected(params, {});
@@ -13006,7 +13014,7 @@ var editHook = {
13006
13014
  $xetable.closeTooltip();
13007
13015
 
13008
13016
  if (actived.column) {
13009
- editMethods.clearActived(evnt);
13017
+ editMethods.clearEdit(evnt);
13010
13018
  }
13011
13019
 
13012
13020
  type = 'edit-actived';
@@ -13139,7 +13147,7 @@ var editHook = {
13139
13147
  var selectMethod = function selectMethod() {
13140
13148
  if (isMouseSelected && (selected.row !== row || selected.column !== column)) {
13141
13149
  if (actived.row !== row || (editOpts.mode === 'cell' ? actived.column !== column : false)) {
13142
- editMethods.clearActived(evnt);
13150
+ editMethods.clearEdit(evnt);
13143
13151
  editMethods.clearSelected();
13144
13152
 
13145
13153
  if ($xetable.clearCellAreas) {
@@ -13801,6 +13809,7 @@ var Loading = Object.assign(src_loading, {
13801
13809
 
13802
13810
 
13803
13811
 
13812
+
13804
13813
 
13805
13814
 
13806
13815
  var allActivedModals = [];
@@ -14758,9 +14767,9 @@ var msgQueue = [];
14758
14767
  title = props.title;
14759
14768
  var zoomLocat = reactData.zoomLocat;
14760
14769
  var titleSlot = slots.title || propSlots.title;
14761
- var titVNs = titleSlot ? titleSlot({
14770
+ var titVNs = titleSlot ? getSlotVNs(titleSlot({
14762
14771
  $modal: $xemodal
14763
- }) : [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
14772
+ })) : [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
14764
14773
  class: 'vxe-modal--title'
14765
14774
  }, title ? getFuncText(title) : src_conf.i18n('vxe.alert.title'))];
14766
14775
 
@@ -14808,9 +14817,9 @@ var msgQueue = [];
14808
14817
  'is--draggable': draggable,
14809
14818
  'is--ellipsis': !isMsg && props.showTitleOverflow
14810
14819
  }]
14811
- }, headerOns), headerSlot ? !reactData.inited || props.destroyOnClose && !reactData.visible ? [] : headerSlot({
14820
+ }, headerOns), headerSlot ? !reactData.inited || props.destroyOnClose && !reactData.visible ? [] : getSlotVNs(headerSlot({
14812
14821
  $modal: $xemodal
14813
- }) : renderTitles()));
14822
+ })) : renderTitles()));
14814
14823
  }
14815
14824
 
14816
14825
  return headVNs;
@@ -14836,9 +14845,9 @@ var msgQueue = [];
14836
14845
 
14837
14846
  contVNs.push(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
14838
14847
  class: 'vxe-modal--content'
14839
- }, defaultSlot ? !reactData.inited || props.destroyOnClose && !reactData.visible ? [] : defaultSlot({
14848
+ }, defaultSlot ? !reactData.inited || props.destroyOnClose && !reactData.visible ? [] : getSlotVNs(defaultSlot({
14840
14849
  $modal: $xemodal
14841
- }) : getFuncText(content)));
14850
+ })) : getFuncText(content)));
14842
14851
 
14843
14852
  if (!isMsg) {
14844
14853
  /**
@@ -14886,9 +14895,9 @@ var msgQueue = [];
14886
14895
  if (props.showFooter) {
14887
14896
  footVNs.push(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
14888
14897
  class: 'vxe-modal--footer'
14889
- }, footerSlot ? !reactData.inited || props.destroyOnClose && !reactData.visible ? [] : footerSlot({
14898
+ }, footerSlot ? !reactData.inited || props.destroyOnClose && !reactData.visible ? [] : getSlotVNs(footerSlot({
14890
14899
  $modal: $xemodal
14891
- }) : renderBtns()));
14900
+ })) : renderBtns()));
14892
14901
  }
14893
14902
 
14894
14903
  if (!isMsg && props.resize) {
@@ -17324,19 +17333,19 @@ var quarterSize = 8;
17324
17333
  }],
17325
17334
  onClick: datePrevEvent
17326
17335
  }, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('i', {
17327
- class: 'vxe-icon--caret-left'
17336
+ class: 'vxe-icon-caret-left'
17328
17337
  })]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
17329
17338
  class: 'vxe-input--date-picker-btn vxe-input--date-picker-current-btn',
17330
17339
  onClick: dateTodayMonthEvent
17331
17340
  }, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('i', {
17332
- class: 'vxe-icon--dot'
17341
+ class: 'vxe-icon-dot'
17333
17342
  })]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
17334
17343
  class: ['vxe-input--date-picker-btn vxe-input--date-picker-next-btn', {
17335
17344
  'is--disabled': isDisabledNextDateBtn
17336
17345
  }],
17337
17346
  onClick: dateNextEvent
17338
17347
  }, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('i', {
17339
- class: 'vxe-icon--caret-right'
17348
+ class: 'vxe-icon-caret-right'
17340
17349
  })]), multiple && computeSupportMultiples.value ? Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
17341
17350
  class: 'vxe-input--date-picker-btn vxe-input--date-picker-confirm-btn'
17342
17351
  }, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('button', {
@@ -17827,17 +17836,19 @@ var quarterSize = 8;
17827
17836
 
17828
17837
  var vSize = computeSize.value;
17829
17838
  var isDisabled = computeDisabled.value;
17839
+ var isChecked = computeChecked.value;
17840
+ var indeterminate = props.indeterminate;
17830
17841
  return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('label', {
17831
- class: ['vxe-checkbox', (_ref = {}, _defineProperty(_ref, "size--".concat(vSize), vSize), _defineProperty(_ref, 'is--indeterminate', props.indeterminate), _defineProperty(_ref, 'is--disabled', isDisabled), _ref)],
17842
+ class: ['vxe-checkbox', (_ref = {}, _defineProperty(_ref, "size--".concat(vSize), vSize), _defineProperty(_ref, 'is--indeterminate', indeterminate), _defineProperty(_ref, 'is--disabled', isDisabled), _defineProperty(_ref, 'is--checked', isChecked), _ref)],
17832
17843
  title: props.title
17833
17844
  }, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('input', {
17834
17845
  class: 'vxe-checkbox--input',
17835
17846
  type: 'checkbox',
17836
17847
  disabled: isDisabled,
17837
- checked: computeChecked.value,
17848
+ checked: isChecked,
17838
17849
  onChange: changeEvent
17839
17850
  }), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
17840
- class: 'vxe-checkbox--icon'
17851
+ class: ['vxe-checkbox--icon', indeterminate ? 'vxe-icon-checkbox-indeterminate' : isChecked ? 'vxe-icon-checkbox-checked' : 'vxe-icon-checkbox-unchecked']
17841
17852
  }), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
17842
17853
  class: 'vxe-checkbox--label'
17843
17854
  }, slots.default ? slots.default({}) : getFuncText(props.content))]);
@@ -17873,6 +17884,7 @@ var es_promise_finally = __webpack_require__("a79d");
17873
17884
 
17874
17885
 
17875
17886
 
17887
+
17876
17888
 
17877
17889
 
17878
17890
  function isOptionVisible(option) {
@@ -18019,7 +18031,7 @@ function getOptUniqueId() {
18019
18031
  }
18020
18032
 
18021
18033
  if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(slotFunc)) {
18022
- return slotFunc(params);
18034
+ return getSlotVNs(slotFunc(params));
18023
18035
  }
18024
18036
  }
18025
18037
 
@@ -19175,8 +19187,8 @@ function getOptUniqueId() {
19175
19187
  var renderVN = function renderVN() {
19176
19188
  var defaultOptions = props.defaultOptions,
19177
19189
  storeData = props.storeData;
19178
- var isAll = reactData.isAll,
19179
- isIndeterminate = reactData.isIndeterminate;
19190
+ var isAllChecked = reactData.isAll,
19191
+ isAllIndeterminate = reactData.isIndeterminate;
19180
19192
  var hasTree = storeData.hasTree,
19181
19193
  hasMerge = storeData.hasMerge,
19182
19194
  isPrint = storeData.isPrint,
@@ -19190,11 +19202,13 @@ function getOptUniqueId() {
19190
19202
  external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(storeData.columns, function (column) {
19191
19203
  var colTitle = formatText(column.getTitle(), 1);
19192
19204
  var isColGroup = column.children && column.children.length;
19205
+ var isChecked = column.checked;
19206
+ var indeterminate = column.halfChecked;
19193
19207
  cols.push(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('li', {
19194
19208
  class: ['vxe-export--panel-column-option', "level--".concat(column.level), {
19195
19209
  'is--group': isColGroup,
19196
- 'is--checked': column.checked,
19197
- 'is--indeterminate': column.halfChecked,
19210
+ 'is--checked': isChecked,
19211
+ 'is--indeterminate': indeterminate,
19198
19212
  'is--disabled': column.disabled
19199
19213
  }],
19200
19214
  title: colTitle,
@@ -19204,11 +19218,7 @@ function getOptUniqueId() {
19204
19218
  }
19205
19219
  }
19206
19220
  }, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
19207
- class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
19208
- }), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
19209
- class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
19210
- }), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
19211
- class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
19221
+ class: ['vxe-checkbox--icon', indeterminate ? src_conf.icon.TABLE_CHECKBOX_INDETERMINATE : isChecked ? src_conf.icon.TABLE_CHECKBOX_CHECKED : src_conf.icon.TABLE_CHECKBOX_UNCHECKED]
19212
19222
  }), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
19213
19223
  class: 'vxe-checkbox--label'
19214
19224
  }, colTitle)]));
@@ -19281,17 +19291,13 @@ function getOptUniqueId() {
19281
19291
  class: 'vxe-export--panel-column-header'
19282
19292
  }, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('li', {
19283
19293
  class: ['vxe-export--panel-column-option', {
19284
- 'is--checked': isAll,
19285
- 'is--indeterminate': isIndeterminate
19294
+ 'is--checked': isAllChecked,
19295
+ 'is--indeterminate': isAllIndeterminate
19286
19296
  }],
19287
19297
  title: src_conf.i18n('vxe.table.allTitle'),
19288
19298
  onClick: allColumnEvent
19289
19299
  }, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
19290
- class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
19291
- }), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
19292
- class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
19293
- }), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
19294
- class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
19300
+ class: ['vxe-checkbox--icon', isAllIndeterminate ? src_conf.icon.TABLE_CHECKBOX_INDETERMINATE : isAllChecked ? src_conf.icon.TABLE_CHECKBOX_CHECKED : src_conf.icon.TABLE_CHECKBOX_UNCHECKED]
19295
19301
  }), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
19296
19302
  class: 'vxe-checkbox--label'
19297
19303
  }, src_conf.i18n('vxe.export.expCurrentColumn'))])]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('ul', {
@@ -19562,20 +19568,20 @@ function getOptUniqueId() {
19562
19568
  var vSize = computeSize.value;
19563
19569
  var isDisabled = computeDisabled.value;
19564
19570
  var name = computeName.value;
19565
- var checked = computeChecked.value;
19571
+ var isChecked = computeChecked.value;
19566
19572
  return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('label', {
19567
- class: ['vxe-radio', (_ref = {}, _defineProperty(_ref, "size--".concat(vSize), vSize), _defineProperty(_ref, 'is--disabled', isDisabled), _ref)],
19573
+ class: ['vxe-radio', (_ref = {}, _defineProperty(_ref, "size--".concat(vSize), vSize), _defineProperty(_ref, 'is--checked', isChecked), _defineProperty(_ref, 'is--disabled', isDisabled), _ref)],
19568
19574
  title: props.title
19569
19575
  }, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('input', {
19570
19576
  class: 'vxe-radio--input',
19571
19577
  type: 'radio',
19572
19578
  name: name,
19573
- checked: checked,
19579
+ checked: isChecked,
19574
19580
  disabled: isDisabled,
19575
19581
  onChange: changeEvent,
19576
19582
  onClick: clickEvent
19577
19583
  }), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
19578
- class: 'vxe-radio--icon'
19584
+ class: ['vxe-radio--icon', isChecked ? 'vxe-icon-radio-checked' : 'vxe-icon-radio-unchecked']
19579
19585
  }), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
19580
19586
  class: 'vxe-radio--label'
19581
19587
  }, slots.default ? slots.default({}) : getFuncText(props.content))]);
@@ -23217,6 +23223,7 @@ dynamicApp.component(footer.name, footer);
23217
23223
 
23218
23224
 
23219
23225
 
23226
+
23220
23227
  function renderHelpIcon(params) {
23221
23228
  var $table = params.$table,
23222
23229
  column = params.column;
@@ -23304,7 +23311,7 @@ function getFooterContent(params) {
23304
23311
  var compConf = VXETable.renderer.get(renderOpts.name);
23305
23312
 
23306
23313
  if (compConf && compConf.renderFooter) {
23307
- return compConf.renderFooter(renderOpts, params);
23314
+ return getSlotVNs(compConf.renderFooter(renderOpts, params));
23308
23315
  }
23309
23316
  }
23310
23317
 
@@ -23411,11 +23418,11 @@ var Cell = {
23411
23418
  var compConf = VXETable.renderer.get(renderOpts.name);
23412
23419
 
23413
23420
  if (compConf && compConf.renderHeader) {
23414
- return renderTitleContent(params, compConf.renderHeader(renderOpts, params));
23421
+ return renderTitleContent(params, getSlotVNs(compConf.renderHeader(renderOpts, params)));
23415
23422
  }
23416
23423
  }
23417
23424
 
23418
- return renderTitleContent(params, formatText(column.getTitle(), 1));
23425
+ return renderTitleContent(params, [formatText(column.getTitle(), 1)]);
23419
23426
  },
23420
23427
  renderDefaultHeader: function renderDefaultHeader(params) {
23421
23428
  return renderHelpIcon(params).concat(Cell.renderHeaderTitle(params));
@@ -23440,9 +23447,9 @@ var Cell = {
23440
23447
  var compFn = compConf ? compConf[funName] : null;
23441
23448
 
23442
23449
  if (compFn) {
23443
- return compFn(renderOpts, Object.assign({
23450
+ return getSlotVNs(compFn(renderOpts, Object.assign({
23444
23451
  $type: editRender ? 'edit' : 'cell'
23445
- }, params));
23452
+ }, params)));
23446
23453
  }
23447
23454
  }
23448
23455
 
@@ -23541,7 +23548,7 @@ var Cell = {
23541
23548
  column = params.column;
23542
23549
  var slots = column.slots;
23543
23550
  var headerSlot = slots ? slots.header : null;
23544
- return renderTitleContent(params, headerSlot ? $table.callSlot(headerSlot, params) : formatText(column.getTitle(), 1));
23551
+ return renderTitleContent(params, headerSlot ? $table.callSlot(headerSlot, params) : [formatText(column.getTitle(), 1)]);
23545
23552
  },
23546
23553
  renderSeqCell: function renderSeqCell(params) {
23547
23554
  var $table = params.$table,
@@ -23636,9 +23643,7 @@ var Cell = {
23636
23643
 
23637
23644
  if (isVisible) {
23638
23645
  radioVNs.push(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
23639
- class: 'vxe-radio--icon vxe-radio--checked-icon'
23640
- }), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
23641
- class: 'vxe-radio--icon vxe-radio--unchecked-icon'
23646
+ class: ['vxe-radio--icon', isChecked ? src_conf.icon.TABLE_RADIO_CHECKED : src_conf.icon.TABLE_RADIO_UNCHECKED]
23642
23647
  }));
23643
23648
  }
23644
23649
 
@@ -23716,11 +23721,7 @@ var Cell = {
23716
23721
  }],
23717
23722
  title: src_conf.i18n('vxe.table.allTitle')
23718
23723
  }, ons), [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
23719
- class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
23720
- }), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
23721
- class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
23722
- }), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
23723
- class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
23724
+ class: ['vxe-checkbox--icon', isAllCheckboxIndeterminate ? src_conf.icon.TABLE_CHECKBOX_INDETERMINATE : isAllCheckboxSelected ? src_conf.icon.TABLE_CHECKBOX_CHECKED : src_conf.icon.TABLE_CHECKBOX_UNCHECKED]
23724
23725
  })].concat(titleSlot || headerTitle ? [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
23725
23726
  class: 'vxe-checkbox--label'
23726
23727
  }, titleSlot ? $table.callSlot(titleSlot, checkboxParams) : headerTitle)] : []))]);
@@ -23790,11 +23791,7 @@ var Cell = {
23790
23791
 
23791
23792
  if (isVisible) {
23792
23793
  checkVNs.push(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
23793
- class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
23794
- }), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
23795
- class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
23796
- }), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
23797
- class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
23794
+ class: ['vxe-checkbox--icon', indeterminate ? src_conf.icon.TABLE_CHECKBOX_INDETERMINATE : isChecked ? src_conf.icon.TABLE_CHECKBOX_CHECKED : src_conf.icon.TABLE_CHECKBOX_UNCHECKED]
23798
23795
  }));
23799
23796
  }
23800
23797
 
@@ -23881,11 +23878,7 @@ var Cell = {
23881
23878
 
23882
23879
  if (isVisible) {
23883
23880
  checkVNs.push(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
23884
- class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
23885
- }), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
23886
- class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
23887
- }), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
23888
- class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
23881
+ class: ['vxe-checkbox--icon', indeterminate ? src_conf.icon.TABLE_CHECKBOX_INDETERMINATE : isChecked ? src_conf.icon.TABLE_CHECKBOX_CHECKED : src_conf.icon.TABLE_CHECKBOX_UNCHECKED]
23889
23882
  }));
23890
23883
 
23891
23884
  if (defaultSlot || labelField) {
@@ -23976,7 +23969,7 @@ var Cell = {
23976
23969
  var compConf = VXETable.renderer.get(contentRender.name);
23977
23970
 
23978
23971
  if (compConf && compConf.renderExpand) {
23979
- return compConf.renderExpand(contentRender, params);
23972
+ return getSlotVNs(compConf.renderExpand(contentRender, params));
23980
23973
  }
23981
23974
  }
23982
23975
 
@@ -24160,9 +24153,13 @@ var Cell = {
24160
24153
  return $table.callSlot(editSlot, params);
24161
24154
  }
24162
24155
 
24163
- return compConf && compConf.renderEdit ? compConf.renderEdit(editRender, Object.assign({
24164
- $type: 'edit'
24165
- }, params)) : [];
24156
+ if (compConf && compConf.renderEdit) {
24157
+ return getSlotVNs(compConf.renderEdit(editRender, Object.assign({
24158
+ $type: 'edit'
24159
+ }, params)));
24160
+ }
24161
+
24162
+ return [];
24166
24163
  }
24167
24164
 
24168
24165
  if (defaultSlot) {
@@ -24691,6 +24688,7 @@ var es_array_sort = __webpack_require__("4e82");
24691
24688
 
24692
24689
 
24693
24690
 
24691
+
24694
24692
 
24695
24693
 
24696
24694
  var tableComponentPropKeys = Object.keys(src_props);
@@ -25956,7 +25954,7 @@ var gridComponentEmits = [].concat(_toConsumableArray(emits), ['page-change', 'f
25956
25954
  }
25957
25955
 
25958
25956
  if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(slotFunc)) {
25959
- return slotFunc(params);
25957
+ return getSlotVNs(slotFunc(params));
25960
25958
  }
25961
25959
  }
25962
25960
 
@@ -26133,6 +26131,7 @@ dynamicApp.component(grid.name, grid);
26133
26131
 
26134
26132
 
26135
26133
 
26134
+
26136
26135
  /* harmony default export */ var toolbar = (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["defineComponent"])({
26137
26136
  name: 'VxeToolbar',
26138
26137
  props: {
@@ -26570,10 +26569,10 @@ dynamicApp.component(grid.name, grid);
26570
26569
  var buttonsSlot = slots.buttons;
26571
26570
 
26572
26571
  if (buttonsSlot) {
26573
- return buttonsSlot({
26572
+ return getSlotVNs(buttonsSlot({
26574
26573
  $grid: $xegrid,
26575
26574
  $table: $xetable
26576
- });
26575
+ }));
26577
26576
  }
26578
26577
 
26579
26578
  var btnVNs = [];
@@ -26632,10 +26631,10 @@ dynamicApp.component(grid.name, grid);
26632
26631
  var toolsSlot = slots.tools;
26633
26632
 
26634
26633
  if (toolsSlot) {
26635
- return toolsSlot({
26634
+ return getSlotVNs(toolsSlot({
26636
26635
  $grid: $xegrid,
26637
26636
  $table: $xetable
26638
- });
26637
+ }));
26639
26638
  }
26640
26639
 
26641
26640
  var btnVNs = [];
@@ -26722,11 +26721,13 @@ dynamicApp.component(grid.name, grid);
26722
26721
  }) : false;
26723
26722
 
26724
26723
  if (isColGroup || colKey) {
26724
+ var isChecked = column.visible;
26725
+ var isIndeterminate = column.halfVisible;
26725
26726
  colVNs.push(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('li', {
26726
26727
  class: ['vxe-custom--option', "level--".concat(column.level), {
26727
26728
  'is--group': isColGroup,
26728
- 'is--checked': column.visible,
26729
- 'is--indeterminate': column.halfVisible,
26729
+ 'is--checked': isChecked,
26730
+ 'is--indeterminate': isIndeterminate,
26730
26731
  'is--disabled': isDisabled
26731
26732
  }],
26732
26733
  title: colTitle,
@@ -26736,16 +26737,14 @@ dynamicApp.component(grid.name, grid);
26736
26737
  }
26737
26738
  }
26738
26739
  }, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
26739
- class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
26740
- }), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
26741
- class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
26742
- }), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
26743
- class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
26740
+ class: ['vxe-checkbox--icon', isIndeterminate ? src_conf.icon.TABLE_CHECKBOX_INDETERMINATE : isChecked ? src_conf.icon.TABLE_CHECKBOX_CHECKED : src_conf.icon.TABLE_CHECKBOX_UNCHECKED]
26744
26741
  }), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
26745
26742
  class: 'vxe-checkbox--label'
26746
26743
  }, colTitle)]));
26747
26744
  }
26748
26745
  });
26746
+ var isAllChecked = customStore.isAll;
26747
+ var isAllIndeterminate = customStore.isIndeterminate;
26749
26748
  return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
26750
26749
  class: ['vxe-custom--wrapper', {
26751
26750
  'is--active': customStore.visible
@@ -26761,17 +26760,13 @@ dynamicApp.component(grid.name, grid);
26761
26760
  class: 'vxe-custom--header'
26762
26761
  }, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('li', {
26763
26762
  class: ['vxe-custom--option', {
26764
- 'is--checked': customStore.isAll,
26765
- 'is--indeterminate': customStore.isIndeterminate
26763
+ 'is--checked': isAllChecked,
26764
+ 'is--indeterminate': isAllIndeterminate
26766
26765
  }],
26767
26766
  title: src_conf.i18n('vxe.table.allTitle'),
26768
26767
  onClick: allCustomEvent
26769
26768
  }, [Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
26770
- class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
26771
- }), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
26772
- class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
26773
- }), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
26774
- class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
26769
+ class: ['vxe-checkbox--icon', isAllIndeterminate ? src_conf.icon.TABLE_CHECKBOX_INDETERMINATE : isAllChecked ? src_conf.icon.TABLE_CHECKBOX_CHECKED : src_conf.icon.TABLE_CHECKBOX_UNCHECKED]
26775
26770
  }), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
26776
26771
  class: 'vxe-checkbox--label'
26777
26772
  }, src_conf.i18n('vxe.toolbar.customAll'))])]), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('ul', _objectSpread2({
@@ -26866,7 +26861,7 @@ dynamicApp.component(grid.name, grid);
26866
26861
  onClick: refreshEvent
26867
26862
  }) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])(), zoom && $xegrid ? Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])(Object(external_commonjs_vue_commonjs2_vue_root_Vue_["resolveComponent"])('vxe-button'), {
26868
26863
  circle: true,
26869
- icon: $xegrid.isMaximized() ? zoomOpts.iconOut || src_conf.icon.TOOLBAR_TOOLS_ZOOM_OUT : zoomOpts.iconIn || src_conf.icon.TOOLBAR_TOOLS_ZOOM_IN,
26864
+ icon: $xegrid.isMaximized() ? zoomOpts.iconOut || src_conf.icon.TOOLBAR_TOOLS_MINIMIZE : zoomOpts.iconIn || src_conf.icon.TOOLBAR_TOOLS_FULLSCREEN,
26870
26865
  title: src_conf.i18n("vxe.toolbar.zoom".concat($xegrid.isMaximized() ? 'Out' : 'In')),
26871
26866
  onClick: zoomEvent
26872
26867
  }) : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])(), custom ? renderCustoms() : Object(external_commonjs_vue_commonjs2_vue_root_Vue_["createCommentVNode"])()])]);
@@ -28238,6 +28233,8 @@ dynamicApp.component(modal.name, modal);
28238
28233
 
28239
28234
 
28240
28235
 
28236
+
28237
+
28241
28238
  /* harmony default export */ var tooltip = (Object(external_commonjs_vue_commonjs2_vue_root_Vue_["defineComponent"])({
28242
28239
  name: 'VxeTooltip',
28243
28240
  props: {
@@ -28595,12 +28592,13 @@ dynamicApp.component(modal.name, modal);
28595
28592
  var renderContent = function renderContent() {
28596
28593
  var useHTML = props.useHTML;
28597
28594
  var tipContent = reactData.tipContent;
28595
+ var contentSlot = slots.content;
28598
28596
 
28599
- if (slots.content) {
28597
+ if (contentSlot) {
28600
28598
  return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
28601
28599
  key: 1,
28602
28600
  class: 'vxe-table--tooltip-content'
28603
- }, slots.content({}));
28601
+ }, getSlotVNs(contentSlot({})));
28604
28602
  }
28605
28603
 
28606
28604
  if (useHTML) {
@@ -28626,6 +28624,7 @@ dynamicApp.component(modal.name, modal);
28626
28624
  var tipActive = reactData.tipActive,
28627
28625
  visible = reactData.visible,
28628
28626
  tipStore = reactData.tipStore;
28627
+ var defaultSlot = slots.default;
28629
28628
  var vSize = computeSize.value;
28630
28629
  var ons;
28631
28630
 
@@ -28643,7 +28642,7 @@ dynamicApp.component(modal.name, modal);
28643
28642
  }, ons), [renderContent(), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('div', {
28644
28643
  class: 'vxe-table--tooltip-arrow',
28645
28644
  style: tipStore.arrowStyle
28646
- })].concat(slots.default ? slots.default({}) : []));
28645
+ })].concat(_toConsumableArray(defaultSlot ? getSlotVNs(defaultSlot({})) : [])));
28647
28646
  };
28648
28647
 
28649
28648
  $xetooltip.renderVN = renderVN;
@@ -28899,6 +28898,7 @@ function renderTitle($xeform, item) {
28899
28898
 
28900
28899
 
28901
28900
 
28901
+
28902
28902
  var VxeFormConfigItem = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["defineComponent"])({
28903
28903
  name: 'VxeFormConfigItem',
28904
28904
  props: {
@@ -29003,7 +29003,7 @@ var VxeFormConfigItem = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["de
29003
29003
  if (defaultSlot) {
29004
29004
  contentVNs = $xeform.callSlot(defaultSlot, params);
29005
29005
  } else if (compConf && compConf.renderItemContent) {
29006
- contentVNs = compConf.renderItemContent(itemRender, params);
29006
+ contentVNs = getSlotVNs(compConf.renderItemContent(itemRender, params));
29007
29007
  } else if (field) {
29008
29008
  contentVNs = [external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toValueString(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(data, field))];
29009
29009
  }
@@ -29102,6 +29102,7 @@ var VxeFormConfigItem = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["de
29102
29102
 
29103
29103
 
29104
29104
 
29105
+
29105
29106
 
29106
29107
 
29107
29108
  var form_Rule = /*#__PURE__*/function () {
@@ -29230,6 +29231,7 @@ function getResetValue(value, resetValue) {
29230
29231
  default: null
29231
29232
  },
29232
29233
  className: [String, Function],
29234
+ readonly: Boolean,
29233
29235
  items: Array,
29234
29236
  rules: Object,
29235
29237
  preventSubmit: {
@@ -29303,7 +29305,7 @@ function getResetValue(value, resetValue) {
29303
29305
  }
29304
29306
 
29305
29307
  if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(slotFunc)) {
29306
- return slotFunc(params);
29308
+ return getSlotVNs(slotFunc(params));
29307
29309
  }
29308
29310
  }
29309
29311
 
@@ -29419,7 +29421,7 @@ function getResetValue(value, resetValue) {
29419
29421
  $form: $xeform
29420
29422
  });
29421
29423
  } else if (field) {
29422
- external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.set(data, field, resetValue === null ? getResetValue(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(data, field), undefined) : resetValue);
29424
+ external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.set(data, field, resetValue === null ? getResetValue(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(data, field), undefined) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.clone(resetValue, true));
29423
29425
  }
29424
29426
  }
29425
29427
  });
@@ -29890,6 +29892,7 @@ dynamicApp.component(src_form.name, src_form);
29890
29892
 
29891
29893
 
29892
29894
 
29895
+
29893
29896
  var formItemProps = {
29894
29897
  title: String,
29895
29898
  field: String,
@@ -30015,7 +30018,7 @@ var formItemProps = {
30015
30018
  if (defaultSlot) {
30016
30019
  contentVNs = $xeform.callSlot(defaultSlot, params);
30017
30020
  } else if (compConf && compConf.renderItemContent) {
30018
- contentVNs = compConf.renderItemContent(itemRender, params);
30021
+ contentVNs = getSlotVNs(compConf.renderItemContent(itemRender, params));
30019
30022
  } else if (field) {
30020
30023
  contentVNs = ["".concat(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.get(data, field))];
30021
30024
  }
@@ -32920,6 +32923,7 @@ dynamicApp.component(header.name, header);
32920
32923
 
32921
32924
 
32922
32925
 
32926
+
32923
32927
 
32924
32928
 
32925
32929
  var isWebkit = browse['-webkit'] && !browse.edge;
@@ -36135,7 +36139,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
36135
36139
  var treeOpts = computeTreeOpts.value;
36136
36140
 
36137
36141
  var handleRrecord = function handleRrecord(record) {
36138
- return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["reactive"])(tablePrivateMethods.defineField(Object.assign({}, record)));
36142
+ return Object(external_commonjs_vue_commonjs2_vue_root_Vue_["reactive"])(tablePrivateMethods.defineField(record || {}));
36139
36143
  };
36140
36144
 
36141
36145
  var rows = treeConfig ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.mapTree(records, handleRrecord, treeOpts) : records.map(handleRrecord);
@@ -38023,7 +38027,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
38023
38027
  if (isClear || // 如果点击了当前表格之外
38024
38028
  !getEventTargetNode(evnt, el).flag) {
38025
38029
  setTimeout(function () {
38026
- return $xetable.clearActived(evnt);
38030
+ return $xetable.clearEdit(evnt);
38027
38031
  });
38028
38032
  }
38029
38033
  });
@@ -38115,7 +38119,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
38115
38119
  // 如果是激活编辑状态,则取消编辑
38116
38120
  if (actived.row) {
38117
38121
  var params = actived.args;
38118
- $xetable.clearActived(evnt); // 如果配置了选中功能,则为选中状态
38122
+ $xetable.clearEdit(evnt); // 如果配置了选中功能,则为选中状态
38119
38123
 
38120
38124
  if (mouseOpts.selected) {
38121
38125
  Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])(function () {
@@ -38203,7 +38207,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
38203
38207
  // 如果是激活编辑状态,则取消编辑
38204
38208
  if (actived.row) {
38205
38209
  var _params = actived.args;
38206
- $xetable.clearActived(evnt); // 如果配置了选中功能,则为选中状态
38210
+ $xetable.clearEdit(evnt); // 如果配置了选中功能,则为选中状态
38207
38211
 
38208
38212
  if (mouseOpts.selected) {
38209
38213
  Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])(function () {
@@ -38242,7 +38246,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
38242
38246
  // 如果是激活编辑状态,则取消编辑
38243
38247
  if (actived.row) {
38244
38248
  params = actived.args;
38245
- $xetable.clearActived(evnt); // 如果配置了选中功能,则为选中状态
38249
+ $xetable.clearEdit(evnt); // 如果配置了选中功能,则为选中状态
38246
38250
 
38247
38251
  if (mouseOpts.selected) {
38248
38252
  Object(external_commonjs_vue_commonjs2_vue_root_Vue_["nextTick"])(function () {
@@ -38538,7 +38542,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
38538
38542
  }
38539
38543
 
38540
38544
  if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(slotFunc)) {
38541
- return slotFunc(params);
38545
+ return getSlotVNs(slotFunc(params));
38542
38546
  }
38543
38547
  }
38544
38548
 
@@ -38599,7 +38603,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
38599
38603
  var field = column.field,
38600
38604
  editRender = column.editRender;
38601
38605
 
38602
- if (field && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.has(record, field)) {
38606
+ if (field && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.has(record, field) && !record[field]) {
38603
38607
  var cellValue = null;
38604
38608
 
38605
38609
  if (editRender) {
@@ -39001,7 +39005,7 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
39001
39005
  })) {
39002
39006
  external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.set(item, checkField, value);
39003
39007
  external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.remove(treeIndeterminates, function (half) {
39004
- return half === item;
39008
+ return $xetable.eqRow(half, item);
39005
39009
  });
39006
39010
  handleCheckboxReserveRow(row, value);
39007
39011
  }
@@ -39067,12 +39071,12 @@ var visibleStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_VISIBLE';
39067
39071
  selection.push(item);
39068
39072
  } else {
39069
39073
  external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.remove(selection, function (select) {
39070
- return select === item;
39074
+ return $xetable.eqRow(select, item);
39071
39075
  });
39072
39076
  }
39073
39077
 
39074
39078
  external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.remove(treeIndeterminates, function (half) {
39075
- return half === item;
39079
+ return $xetable.eqRow(half, item);
39076
39080
  });
39077
39081
  handleCheckboxReserveRow(row, value);
39078
39082
  }