@element-plus/nightly 0.0.20220710 → 0.0.20220711

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 (282) hide show
  1. package/dist/index.css +1 -1
  2. package/dist/index.full.js +120 -199
  3. package/dist/index.full.min.js +14 -14
  4. package/dist/index.full.min.js.map +1 -1
  5. package/dist/index.full.min.mjs +14 -14
  6. package/dist/index.full.min.mjs.map +1 -1
  7. package/dist/index.full.mjs +120 -199
  8. package/dist/locale/af.js +1 -1
  9. package/dist/locale/af.min.js +1 -1
  10. package/dist/locale/af.min.mjs +1 -1
  11. package/dist/locale/af.mjs +1 -1
  12. package/dist/locale/ar.js +1 -1
  13. package/dist/locale/ar.min.js +1 -1
  14. package/dist/locale/ar.min.mjs +1 -1
  15. package/dist/locale/ar.mjs +1 -1
  16. package/dist/locale/az.js +1 -1
  17. package/dist/locale/az.min.js +1 -1
  18. package/dist/locale/az.min.mjs +1 -1
  19. package/dist/locale/az.mjs +1 -1
  20. package/dist/locale/bg.js +1 -1
  21. package/dist/locale/bg.min.js +1 -1
  22. package/dist/locale/bg.min.mjs +1 -1
  23. package/dist/locale/bg.mjs +1 -1
  24. package/dist/locale/bn.js +1 -1
  25. package/dist/locale/bn.min.js +1 -1
  26. package/dist/locale/bn.min.mjs +1 -1
  27. package/dist/locale/bn.mjs +1 -1
  28. package/dist/locale/ca.js +1 -1
  29. package/dist/locale/ca.min.js +1 -1
  30. package/dist/locale/ca.min.mjs +1 -1
  31. package/dist/locale/ca.mjs +1 -1
  32. package/dist/locale/cs.js +1 -1
  33. package/dist/locale/cs.min.js +1 -1
  34. package/dist/locale/cs.min.mjs +1 -1
  35. package/dist/locale/cs.mjs +1 -1
  36. package/dist/locale/da.js +1 -1
  37. package/dist/locale/da.min.js +1 -1
  38. package/dist/locale/da.min.mjs +1 -1
  39. package/dist/locale/da.mjs +1 -1
  40. package/dist/locale/de.js +1 -1
  41. package/dist/locale/de.min.js +1 -1
  42. package/dist/locale/de.min.mjs +1 -1
  43. package/dist/locale/de.mjs +1 -1
  44. package/dist/locale/el.js +1 -1
  45. package/dist/locale/el.min.js +1 -1
  46. package/dist/locale/el.min.mjs +1 -1
  47. package/dist/locale/el.mjs +1 -1
  48. package/dist/locale/en.js +1 -1
  49. package/dist/locale/en.min.js +1 -1
  50. package/dist/locale/en.min.mjs +1 -1
  51. package/dist/locale/en.mjs +1 -1
  52. package/dist/locale/eo.js +1 -1
  53. package/dist/locale/eo.min.js +1 -1
  54. package/dist/locale/eo.min.mjs +1 -1
  55. package/dist/locale/eo.mjs +1 -1
  56. package/dist/locale/es.js +1 -1
  57. package/dist/locale/es.min.js +1 -1
  58. package/dist/locale/es.min.mjs +1 -1
  59. package/dist/locale/es.mjs +1 -1
  60. package/dist/locale/et.js +1 -1
  61. package/dist/locale/et.min.js +1 -1
  62. package/dist/locale/et.min.mjs +1 -1
  63. package/dist/locale/et.mjs +1 -1
  64. package/dist/locale/eu.js +1 -1
  65. package/dist/locale/eu.min.js +1 -1
  66. package/dist/locale/eu.min.mjs +1 -1
  67. package/dist/locale/eu.mjs +1 -1
  68. package/dist/locale/fa.js +1 -1
  69. package/dist/locale/fa.min.js +1 -1
  70. package/dist/locale/fa.min.mjs +1 -1
  71. package/dist/locale/fa.mjs +1 -1
  72. package/dist/locale/fi.js +1 -1
  73. package/dist/locale/fi.min.js +1 -1
  74. package/dist/locale/fi.min.mjs +1 -1
  75. package/dist/locale/fi.mjs +1 -1
  76. package/dist/locale/fr.js +1 -1
  77. package/dist/locale/fr.min.js +1 -1
  78. package/dist/locale/fr.min.mjs +1 -1
  79. package/dist/locale/fr.mjs +1 -1
  80. package/dist/locale/he.js +1 -1
  81. package/dist/locale/he.min.js +1 -1
  82. package/dist/locale/he.min.mjs +1 -1
  83. package/dist/locale/he.mjs +1 -1
  84. package/dist/locale/hr.js +1 -1
  85. package/dist/locale/hr.min.js +1 -1
  86. package/dist/locale/hr.min.mjs +1 -1
  87. package/dist/locale/hr.mjs +1 -1
  88. package/dist/locale/hu.js +1 -1
  89. package/dist/locale/hu.min.js +1 -1
  90. package/dist/locale/hu.min.mjs +1 -1
  91. package/dist/locale/hu.mjs +1 -1
  92. package/dist/locale/hy-am.js +1 -1
  93. package/dist/locale/hy-am.min.js +1 -1
  94. package/dist/locale/hy-am.min.mjs +1 -1
  95. package/dist/locale/hy-am.mjs +1 -1
  96. package/dist/locale/id.js +1 -1
  97. package/dist/locale/id.min.js +1 -1
  98. package/dist/locale/id.min.mjs +1 -1
  99. package/dist/locale/id.mjs +1 -1
  100. package/dist/locale/it.js +1 -1
  101. package/dist/locale/it.min.js +1 -1
  102. package/dist/locale/it.min.mjs +1 -1
  103. package/dist/locale/it.mjs +1 -1
  104. package/dist/locale/ja.js +1 -1
  105. package/dist/locale/ja.min.js +1 -1
  106. package/dist/locale/ja.min.mjs +1 -1
  107. package/dist/locale/ja.mjs +1 -1
  108. package/dist/locale/kk.js +1 -1
  109. package/dist/locale/kk.min.js +1 -1
  110. package/dist/locale/kk.min.mjs +1 -1
  111. package/dist/locale/kk.mjs +1 -1
  112. package/dist/locale/km.js +1 -1
  113. package/dist/locale/km.min.js +1 -1
  114. package/dist/locale/km.min.mjs +1 -1
  115. package/dist/locale/km.mjs +1 -1
  116. package/dist/locale/ko.js +1 -1
  117. package/dist/locale/ko.min.js +1 -1
  118. package/dist/locale/ko.min.mjs +1 -1
  119. package/dist/locale/ko.mjs +1 -1
  120. package/dist/locale/ku.js +1 -1
  121. package/dist/locale/ku.min.js +1 -1
  122. package/dist/locale/ku.min.mjs +1 -1
  123. package/dist/locale/ku.mjs +1 -1
  124. package/dist/locale/ky.js +1 -1
  125. package/dist/locale/ky.min.js +1 -1
  126. package/dist/locale/ky.min.mjs +1 -1
  127. package/dist/locale/ky.mjs +1 -1
  128. package/dist/locale/lt.js +1 -1
  129. package/dist/locale/lt.min.js +1 -1
  130. package/dist/locale/lt.min.mjs +1 -1
  131. package/dist/locale/lt.mjs +1 -1
  132. package/dist/locale/lv.js +1 -1
  133. package/dist/locale/lv.min.js +1 -1
  134. package/dist/locale/lv.min.mjs +1 -1
  135. package/dist/locale/lv.mjs +1 -1
  136. package/dist/locale/mg.js +1 -1
  137. package/dist/locale/mg.min.js +1 -1
  138. package/dist/locale/mg.min.mjs +1 -1
  139. package/dist/locale/mg.mjs +1 -1
  140. package/dist/locale/mn.js +1 -1
  141. package/dist/locale/mn.min.js +1 -1
  142. package/dist/locale/mn.min.mjs +1 -1
  143. package/dist/locale/mn.mjs +1 -1
  144. package/dist/locale/nb-no.js +1 -1
  145. package/dist/locale/nb-no.min.js +1 -1
  146. package/dist/locale/nb-no.min.mjs +1 -1
  147. package/dist/locale/nb-no.mjs +1 -1
  148. package/dist/locale/nl.js +1 -1
  149. package/dist/locale/nl.min.js +1 -1
  150. package/dist/locale/nl.min.mjs +1 -1
  151. package/dist/locale/nl.mjs +1 -1
  152. package/dist/locale/pa.js +1 -1
  153. package/dist/locale/pa.min.js +1 -1
  154. package/dist/locale/pa.min.mjs +1 -1
  155. package/dist/locale/pa.mjs +1 -1
  156. package/dist/locale/pl.js +1 -1
  157. package/dist/locale/pl.min.js +1 -1
  158. package/dist/locale/pl.min.mjs +1 -1
  159. package/dist/locale/pl.mjs +1 -1
  160. package/dist/locale/pt-br.js +1 -1
  161. package/dist/locale/pt-br.min.js +1 -1
  162. package/dist/locale/pt-br.min.mjs +1 -1
  163. package/dist/locale/pt-br.mjs +1 -1
  164. package/dist/locale/pt.js +1 -1
  165. package/dist/locale/pt.min.js +1 -1
  166. package/dist/locale/pt.min.mjs +1 -1
  167. package/dist/locale/pt.mjs +1 -1
  168. package/dist/locale/ro.js +1 -1
  169. package/dist/locale/ro.min.js +1 -1
  170. package/dist/locale/ro.min.mjs +1 -1
  171. package/dist/locale/ro.mjs +1 -1
  172. package/dist/locale/ru.js +1 -1
  173. package/dist/locale/ru.min.js +1 -1
  174. package/dist/locale/ru.min.mjs +1 -1
  175. package/dist/locale/ru.mjs +1 -1
  176. package/dist/locale/sk.js +1 -1
  177. package/dist/locale/sk.min.js +1 -1
  178. package/dist/locale/sk.min.mjs +1 -1
  179. package/dist/locale/sk.mjs +1 -1
  180. package/dist/locale/sl.js +1 -1
  181. package/dist/locale/sl.min.js +1 -1
  182. package/dist/locale/sl.min.mjs +1 -1
  183. package/dist/locale/sl.mjs +1 -1
  184. package/dist/locale/sr.js +1 -1
  185. package/dist/locale/sr.min.js +1 -1
  186. package/dist/locale/sr.min.mjs +1 -1
  187. package/dist/locale/sr.mjs +1 -1
  188. package/dist/locale/sv.js +1 -1
  189. package/dist/locale/sv.min.js +1 -1
  190. package/dist/locale/sv.min.mjs +1 -1
  191. package/dist/locale/sv.mjs +1 -1
  192. package/dist/locale/ta.js +1 -1
  193. package/dist/locale/ta.min.js +1 -1
  194. package/dist/locale/ta.min.mjs +1 -1
  195. package/dist/locale/ta.mjs +1 -1
  196. package/dist/locale/th.js +1 -1
  197. package/dist/locale/th.min.js +1 -1
  198. package/dist/locale/th.min.mjs +1 -1
  199. package/dist/locale/th.mjs +1 -1
  200. package/dist/locale/tk.js +1 -1
  201. package/dist/locale/tk.min.js +1 -1
  202. package/dist/locale/tk.min.mjs +1 -1
  203. package/dist/locale/tk.mjs +1 -1
  204. package/dist/locale/tr.js +1 -1
  205. package/dist/locale/tr.min.js +1 -1
  206. package/dist/locale/tr.min.mjs +1 -1
  207. package/dist/locale/tr.mjs +1 -1
  208. package/dist/locale/ug-cn.js +1 -1
  209. package/dist/locale/ug-cn.min.js +1 -1
  210. package/dist/locale/ug-cn.min.mjs +1 -1
  211. package/dist/locale/ug-cn.mjs +1 -1
  212. package/dist/locale/uk.js +1 -1
  213. package/dist/locale/uk.min.js +1 -1
  214. package/dist/locale/uk.min.mjs +1 -1
  215. package/dist/locale/uk.mjs +1 -1
  216. package/dist/locale/uz-uz.js +1 -1
  217. package/dist/locale/uz-uz.min.js +1 -1
  218. package/dist/locale/uz-uz.min.mjs +1 -1
  219. package/dist/locale/uz-uz.mjs +1 -1
  220. package/dist/locale/vi.js +1 -1
  221. package/dist/locale/vi.min.js +1 -1
  222. package/dist/locale/vi.min.mjs +1 -1
  223. package/dist/locale/vi.mjs +1 -1
  224. package/dist/locale/zh-cn.js +1 -1
  225. package/dist/locale/zh-cn.min.js +1 -1
  226. package/dist/locale/zh-cn.min.mjs +1 -1
  227. package/dist/locale/zh-cn.mjs +1 -1
  228. package/dist/locale/zh-tw.js +1 -1
  229. package/dist/locale/zh-tw.min.js +1 -1
  230. package/dist/locale/zh-tw.min.mjs +1 -1
  231. package/dist/locale/zh-tw.mjs +1 -1
  232. package/es/components/cascader/src/index.mjs +10 -9
  233. package/es/components/cascader/src/index.mjs.map +1 -1
  234. package/es/components/scrollbar/src/scrollbar2.mjs +3 -1
  235. package/es/components/scrollbar/src/scrollbar2.mjs.map +1 -1
  236. package/es/components/table/index.d.ts +21 -31
  237. package/es/components/table/src/table/style-helper.d.ts +21 -31
  238. package/es/components/table/src/table/style-helper.mjs +68 -95
  239. package/es/components/table/src/table/style-helper.mjs.map +1 -1
  240. package/es/components/table/src/table-layout.d.ts +1 -5
  241. package/es/components/table/src/table-layout.mjs +3 -52
  242. package/es/components/table/src/table-layout.mjs.map +1 -1
  243. package/es/components/table/src/table.mjs +29 -34
  244. package/es/components/table/src/table.mjs.map +1 -1
  245. package/es/components/table/src/table.vue.d.ts +21 -31
  246. package/es/components/table/src/util.mjs +6 -11
  247. package/es/components/table/src/util.mjs.map +1 -1
  248. package/es/components/table-v2/index.d.ts +1 -1
  249. package/es/components/table-v2/src/components/header.d.ts +1 -1
  250. package/es/components/table-v2/src/table-grid.d.ts +1 -1
  251. package/es/components/table-v2/src/table-v2.d.ts +1 -1
  252. package/es/version.d.ts +1 -1
  253. package/es/version.mjs +1 -1
  254. package/es/version.mjs.map +1 -1
  255. package/lib/components/cascader/src/index.js +10 -9
  256. package/lib/components/cascader/src/index.js.map +1 -1
  257. package/lib/components/scrollbar/src/scrollbar2.js +3 -1
  258. package/lib/components/scrollbar/src/scrollbar2.js.map +1 -1
  259. package/lib/components/table/index.d.ts +21 -31
  260. package/lib/components/table/src/table/style-helper.d.ts +21 -31
  261. package/lib/components/table/src/table/style-helper.js +67 -94
  262. package/lib/components/table/src/table/style-helper.js.map +1 -1
  263. package/lib/components/table/src/table-layout.d.ts +1 -5
  264. package/lib/components/table/src/table-layout.js +3 -52
  265. package/lib/components/table/src/table-layout.js.map +1 -1
  266. package/lib/components/table/src/table.js +29 -34
  267. package/lib/components/table/src/table.js.map +1 -1
  268. package/lib/components/table/src/table.vue.d.ts +21 -31
  269. package/lib/components/table/src/util.js +6 -11
  270. package/lib/components/table/src/util.js.map +1 -1
  271. package/lib/components/table-v2/index.d.ts +1 -1
  272. package/lib/components/table-v2/src/components/header.d.ts +1 -1
  273. package/lib/components/table-v2/src/table-grid.d.ts +1 -1
  274. package/lib/components/table-v2/src/table-v2.d.ts +1 -1
  275. package/lib/version.d.ts +1 -1
  276. package/lib/version.js +1 -1
  277. package/lib/version.js.map +1 -1
  278. package/package.json +2 -2
  279. package/theme-chalk/el-table.css +1 -1
  280. package/theme-chalk/index.css +1 -1
  281. package/theme-chalk/src/table.scss +7 -1
  282. package/web-types.json +1 -1
@@ -1,4 +1,4 @@
1
- /*! Element Plus v0.0.20220710 */
1
+ /*! Element Plus v0.0.20220711 */
2
2
 
3
3
  (function (global, factory) {
4
4
  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('vue')) :
@@ -10734,7 +10734,7 @@
10734
10734
  return [recordCursor, setCursor];
10735
10735
  }
10736
10736
 
10737
- const version$1 = "0.0.20220710";
10737
+ const version$1 = "0.0.20220711";
10738
10738
 
10739
10739
  const makeInstaller = (components = []) => {
10740
10740
  const install = (app, options) => {
@@ -12036,7 +12036,9 @@
12036
12036
  }));
12037
12037
  vue.onMounted(() => {
12038
12038
  if (!props.native)
12039
- vue.nextTick(() => update());
12039
+ vue.nextTick(() => {
12040
+ update();
12041
+ });
12040
12042
  });
12041
12043
  vue.onUpdated(() => update());
12042
12044
  expose({
@@ -20968,9 +20970,8 @@
20968
20970
  }
20969
20971
  });
20970
20972
  const _hoisted_1$M = { key: 0 };
20971
- const _hoisted_2$x = { class: "el-cascader__collapse-tags" };
20972
- const _hoisted_3$k = ["placeholder"];
20973
- const _hoisted_4$d = ["onClick"];
20973
+ const _hoisted_2$x = ["placeholder"];
20974
+ const _hoisted_3$k = ["onClick"];
20974
20975
  function _sfc_render$A(_ctx, _cache, $props, $setup, $data, $options) {
20975
20976
  const _component_circle_close = vue.resolveComponent("circle-close");
20976
20977
  const _component_el_icon = vue.resolveComponent("el-icon");
@@ -21092,11 +21093,13 @@
21092
21093
  vue.createElementVNode("span", null, vue.toDisplayString(tag.text), 1)
21093
21094
  ]),
21094
21095
  content: vue.withCtx(() => [
21095
- vue.createElementVNode("div", _hoisted_2$x, [
21096
+ vue.createElementVNode("div", {
21097
+ class: vue.normalizeClass(_ctx.nsCascader.e("collapse-tags"))
21098
+ }, [
21096
21099
  (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(_ctx.allPresentTags, (tag2, idx) => {
21097
21100
  return vue.openBlock(), vue.createElementBlock("div", {
21098
21101
  key: idx,
21099
- class: "el-cascader__collapse-tag"
21102
+ class: vue.normalizeClass(_ctx.nsCascader.e("collapse-tag"))
21100
21103
  }, [
21101
21104
  (vue.openBlock(), vue.createBlock(_component_el_tag, {
21102
21105
  key: tag2.key,
@@ -21113,9 +21116,9 @@
21113
21116
  ]),
21114
21117
  _: 2
21115
21118
  }, 1032, ["type", "size", "hit", "closable", "onClose"]))
21116
- ]);
21119
+ ], 2);
21117
21120
  }), 128))
21118
- ])
21121
+ ], 2)
21119
21122
  ]),
21120
21123
  _: 2
21121
21124
  }, 1032, ["disabled"]))
@@ -21135,7 +21138,7 @@
21135
21138
  onCompositionstart: _cache[8] || (_cache[8] = (...args) => _ctx.handleComposition && _ctx.handleComposition(...args)),
21136
21139
  onCompositionupdate: _cache[9] || (_cache[9] = (...args) => _ctx.handleComposition && _ctx.handleComposition(...args)),
21137
21140
  onCompositionend: _cache[10] || (_cache[10] = (...args) => _ctx.handleComposition && _ctx.handleComposition(...args))
21138
- }, null, 42, _hoisted_3$k)), [
21141
+ }, null, 42, _hoisted_2$x)), [
21139
21142
  [vue.vModelText, _ctx.searchInputValue]
21140
21143
  ]) : vue.createCommentVNode("v-if", true)
21141
21144
  ], 2)) : vue.createCommentVNode("v-if", true)
@@ -21183,7 +21186,7 @@
21183
21186
  ]),
21184
21187
  _: 1
21185
21188
  })) : vue.createCommentVNode("v-if", true)
21186
- ], 10, _hoisted_4$d);
21189
+ ], 10, _hoisted_3$k);
21187
21190
  }), 128)) : vue.renderSlot(_ctx.$slots, "empty", { key: 1 }, () => [
21188
21191
  vue.createElementVNode("li", {
21189
21192
  class: vue.normalizeClass(_ctx.nsCascader.e("empty-text"))
@@ -40518,11 +40521,9 @@
40518
40521
  try {
40519
40522
  popperInstance && popperInstance.destroy();
40520
40523
  content && (parentNode == null ? void 0 : parentNode.removeChild(content));
40521
- off(trigger, "mouseenter", showPopper);
40522
- off(trigger, "mouseleave", removePopper);
40523
- if (scrollContainer) {
40524
- off(scrollContainer, "scroll", removePopper);
40525
- }
40524
+ trigger.removeEventListener("mouseenter", showPopper);
40525
+ trigger.removeEventListener("mouseleave", removePopper);
40526
+ scrollContainer == null ? void 0 : scrollContainer.removeEventListener("scroll", removePopper);
40526
40527
  removePopper = void 0;
40527
40528
  } catch (e) {
40528
40529
  }
@@ -40550,11 +40551,9 @@
40550
40551
  ],
40551
40552
  ...popperOptions
40552
40553
  });
40553
- on$1(trigger, "mouseenter", showPopper);
40554
- on$1(trigger, "mouseleave", removePopper);
40555
- if (scrollContainer) {
40556
- on$1(scrollContainer, "scroll", removePopper);
40557
- }
40554
+ trigger.addEventListener("mouseenter", showPopper);
40555
+ trigger.addEventListener("mouseleave", removePopper);
40556
+ scrollContainer == null ? void 0 : scrollContainer.addEventListener("scroll", removePopper);
40558
40557
  return popperInstance;
40559
40558
  }
40560
40559
  const isFixedColumn = (index, fixed, store, realColumns) => {
@@ -41612,14 +41611,6 @@
41612
41611
  this.bodyWidth = vue.ref(null);
41613
41612
  this.fixedWidth = vue.ref(null);
41614
41613
  this.rightFixedWidth = vue.ref(null);
41615
- this.tableHeight = vue.ref(null);
41616
- this.headerHeight = vue.ref(44);
41617
- this.appendHeight = vue.ref(0);
41618
- this.footerHeight = vue.ref(44);
41619
- this.viewportHeight = vue.ref(null);
41620
- this.bodyHeight = vue.ref(null);
41621
- this.bodyScrollHeight = vue.ref(0);
41622
- this.fixedBodyHeight = vue.ref(null);
41623
41614
  this.gutterWidth = 0;
41624
41615
  for (const name in options) {
41625
41616
  if (hasOwn(options, name)) {
@@ -41641,15 +41632,11 @@
41641
41632
  const height = this.height.value;
41642
41633
  if (height === null)
41643
41634
  return false;
41644
- const bodyWrapper = this.table.refs.bodyWrapper;
41645
- if (this.table.vnode.el && bodyWrapper) {
41635
+ const scrollBarRef = this.table.refs.scrollBarRef;
41636
+ if (this.table.vnode.el && scrollBarRef) {
41646
41637
  let scrollY = true;
41647
41638
  const prevScrollY = this.scrollY.value;
41648
- if (this.bodyHeight.value === null) {
41649
- scrollY = false;
41650
- } else {
41651
- scrollY = bodyWrapper.scrollHeight > this.bodyHeight.value;
41652
- }
41639
+ scrollY = scrollBarRef.wrap$.scrollHeight > scrollBarRef.wrap$.clientHeight;
41653
41640
  this.scrollY.value = scrollY;
41654
41641
  return prevScrollY !== scrollY;
41655
41642
  }
@@ -41687,43 +41674,6 @@
41687
41674
  return flattenColumns;
41688
41675
  }
41689
41676
  updateElsHeight() {
41690
- var _a, _b;
41691
- if (!this.table.$ready)
41692
- return vue.nextTick(() => this.updateElsHeight());
41693
- const {
41694
- tableWrapper,
41695
- headerWrapper,
41696
- appendWrapper,
41697
- footerWrapper,
41698
- tableHeader,
41699
- tableBody
41700
- } = this.table.refs;
41701
- if (tableWrapper && tableWrapper.style.display === "none") {
41702
- return;
41703
- }
41704
- const { tableLayout } = this.table.props;
41705
- this.appendHeight.value = appendWrapper ? appendWrapper.offsetHeight : 0;
41706
- if (this.showHeader && !headerWrapper && tableLayout === "fixed") {
41707
- return;
41708
- }
41709
- const headerTrElm = tableHeader ? tableHeader : null;
41710
- const noneHeader = this.headerDisplayNone(headerTrElm);
41711
- const headerWrapperOffsetHeight = (headerWrapper == null ? void 0 : headerWrapper.offsetHeight) || 0;
41712
- const headerHeight = this.headerHeight.value = !this.showHeader ? 0 : headerWrapperOffsetHeight;
41713
- if (this.showHeader && !noneHeader && headerWrapperOffsetHeight > 0 && (this.table.store.states.columns.value || []).length > 0 && headerHeight < 2) {
41714
- return vue.nextTick(() => this.updateElsHeight());
41715
- }
41716
- const tableHeight = this.tableHeight.value = (_b = (_a = this.table) == null ? void 0 : _a.vnode.el) == null ? void 0 : _b.clientHeight;
41717
- const footerHeight = this.footerHeight.value = footerWrapper ? footerWrapper.offsetHeight : 0;
41718
- if (this.height.value !== null) {
41719
- if (this.bodyHeight.value === null) {
41720
- requestAnimationFrame(() => this.updateElsHeight());
41721
- }
41722
- this.bodyHeight.value = tableHeight - headerHeight - footerHeight + (footerWrapper ? 1 : 0);
41723
- this.bodyScrollHeight.value = tableBody == null ? void 0 : tableBody.scrollHeight;
41724
- }
41725
- this.fixedBodyHeight.value = this.scrollX.value ? this.bodyHeight.value - this.gutterWidth : this.bodyHeight.value;
41726
- this.viewportHeight.value = this.scrollX.value ? tableHeight - this.gutterWidth : tableHeight;
41727
41677
  this.updateScrollY();
41728
41678
  this.notifyObservers("scrollable");
41729
41679
  }
@@ -43359,14 +43309,18 @@
43359
43309
  };
43360
43310
  const resizeState = vue.ref({
43361
43311
  width: null,
43362
- height: null
43312
+ height: null,
43313
+ headerHeight: null
43363
43314
  });
43364
43315
  const isGroup = vue.ref(false);
43365
43316
  const scrollbarViewStyle = {
43366
- display: "block",
43317
+ display: "inline-block",
43367
43318
  verticalAlign: "middle"
43368
43319
  };
43369
43320
  const tableWidth = vue.ref();
43321
+ const tableScrollHeight = vue.ref(0);
43322
+ const bodyScrollHeight = vue.ref(0);
43323
+ const headerScrollHeight = vue.ref(0);
43370
43324
  vue.watchEffect(() => {
43371
43325
  layout.setHeight(props.height);
43372
43326
  });
@@ -43423,12 +43377,14 @@
43423
43377
  bindEvents();
43424
43378
  requestAnimationFrame(doLayout);
43425
43379
  const el = table.vnode.el;
43380
+ const tableHeader = table.refs.headerWrapper;
43426
43381
  if (props.flexible && el && el.parentElement) {
43427
43382
  el.parentElement.style.minWidth = "0";
43428
43383
  }
43429
43384
  resizeState.value = {
43430
43385
  width: tableWidth.value = el.offsetWidth,
43431
- height: el.offsetHeight
43386
+ height: el.offsetHeight,
43387
+ headerHeight: props.showHeader && tableHeader ? tableHeader.offsetHeight : null
43432
43388
  };
43433
43389
  store.states.columns.value.forEach((column) => {
43434
43390
  if (column.filteredValue && column.filteredValue.length) {
@@ -43499,23 +43455,36 @@
43499
43455
  }
43500
43456
  };
43501
43457
  const resizeListener = () => {
43458
+ var _a;
43502
43459
  if (!table.$ready)
43503
43460
  return;
43504
43461
  let shouldUpdateLayout = false;
43505
43462
  const el = table.vnode.el;
43506
- const { width: oldWidth, height: oldHeight } = resizeState.value;
43463
+ const {
43464
+ width: oldWidth,
43465
+ height: oldHeight,
43466
+ headerHeight: oldHeaderHeight
43467
+ } = resizeState.value;
43507
43468
  const width = tableWidth.value = el.offsetWidth;
43508
43469
  if (oldWidth !== width) {
43509
43470
  shouldUpdateLayout = true;
43510
43471
  }
43511
- const height2 = el.offsetHeight;
43512
- if ((props.height || shouldUpdateHeight.value) && oldHeight !== height2) {
43472
+ const height = el.offsetHeight;
43473
+ if ((props.height || shouldUpdateHeight.value) && oldHeight !== height) {
43513
43474
  shouldUpdateLayout = true;
43514
43475
  }
43476
+ const tableHeader = table.refs.headerWrapper;
43477
+ if (props.showHeader && tableHeader.offsetHeight !== oldHeaderHeight) {
43478
+ shouldUpdateLayout = true;
43479
+ }
43480
+ tableScrollHeight.value = table.refs.tableWrapper.scrollHeight;
43481
+ headerScrollHeight.value = ((_a = table.refs.headerWrapper) == null ? void 0 : _a.scrollHeight) || 0;
43482
+ bodyScrollHeight.value = tableScrollHeight.value - headerScrollHeight.value;
43515
43483
  if (shouldUpdateLayout) {
43516
43484
  resizeState.value = {
43517
43485
  width,
43518
- height: height2
43486
+ height,
43487
+ headerHeight: props.showHeader ? tableHeader.offsetHeight : null
43519
43488
  };
43520
43489
  doLayout();
43521
43490
  }
@@ -43530,57 +43499,57 @@
43530
43499
  return "fixed";
43531
43500
  return props.tableLayout;
43532
43501
  });
43533
- function calcMaxHeight(maxHeight, footerHeight, headerHeight) {
43534
- const parsedMaxHeight = parseHeight(maxHeight);
43535
- const tableHeaderHeight = props.showHeader ? headerHeight : 0;
43536
- if (parsedMaxHeight === null)
43537
- return;
43538
- if (isString(parsedMaxHeight)) {
43539
- return `calc(${parsedMaxHeight} - ${footerHeight}px - ${tableHeaderHeight}px)`;
43502
+ const emptyBlockStyle = vue.computed(() => {
43503
+ if (props.data && props.data.length)
43504
+ return null;
43505
+ let height = "100%";
43506
+ if (bodyScrollHeight.value) {
43507
+ height = `${bodyScrollHeight.value}px`;
43540
43508
  }
43541
- return parsedMaxHeight - footerHeight - tableHeaderHeight;
43542
- }
43543
- const height = vue.computed(() => {
43544
- const headerHeight = layout.headerHeight.value || 0;
43545
- const bodyHeight2 = layout.bodyHeight.value;
43546
- const footerHeight = layout.footerHeight.value || 0;
43509
+ const width = tableWidth.value;
43510
+ return {
43511
+ width: width ? `${width}px` : "",
43512
+ height
43513
+ };
43514
+ });
43515
+ const tableInnerStyle = vue.computed(() => {
43547
43516
  if (props.height) {
43548
- return bodyHeight2 ? bodyHeight2 : void 0;
43549
- } else if (props.maxHeight) {
43550
- return calcMaxHeight(props.maxHeight, footerHeight, headerHeight);
43517
+ return {
43518
+ height: !Number.isNaN(Number(props.height)) ? `${props.height}px` : props.height
43519
+ };
43551
43520
  }
43552
- return void 0;
43521
+ if (props.maxHeight) {
43522
+ return {
43523
+ maxHeight: !Number.isNaN(Number(props.maxHeight)) ? `${props.maxHeight}px` : props.maxHeight
43524
+ };
43525
+ }
43526
+ return {};
43553
43527
  });
43554
- const bodyHeight = vue.computed(() => {
43555
- const headerHeight = layout.headerHeight.value || 0;
43556
- const bodyHeight2 = layout.bodyHeight.value;
43557
- const footerHeight = layout.footerHeight.value || 0;
43528
+ const scrollbarStyle = vue.computed(() => {
43529
+ var _a;
43558
43530
  if (props.height) {
43559
43531
  return {
43560
- height: bodyHeight2 ? `${bodyHeight2}px` : ""
43532
+ height: "100%"
43561
43533
  };
43562
- } else if (props.maxHeight) {
43563
- const maxHeight = calcMaxHeight(props.maxHeight, footerHeight, headerHeight);
43564
- if (maxHeight !== null) {
43534
+ }
43535
+ if (props.maxHeight) {
43536
+ if (!Number.isNaN(Number(props.maxHeight))) {
43537
+ const headerHeight = ((_a = table.refs.headerWrapper) == null ? void 0 : _a.scrollHeight) || 0;
43538
+ const maxHeight = props.maxHeight;
43539
+ const reachMaxHeight = tableScrollHeight.value >= Number(maxHeight);
43540
+ if (reachMaxHeight) {
43541
+ return {
43542
+ maxHeight: `${tableScrollHeight.value - headerHeight}px`
43543
+ };
43544
+ }
43545
+ } else {
43565
43546
  return {
43566
- "max-height": `${maxHeight}${isNumber(maxHeight) ? "px" : ""}`
43547
+ maxHeight: `calc(${props.maxHeight} - ${headerScrollHeight.value}px)`
43567
43548
  };
43568
43549
  }
43569
43550
  }
43570
43551
  return {};
43571
43552
  });
43572
- const emptyBlockStyle = vue.computed(() => {
43573
- if (props.data && props.data.length)
43574
- return null;
43575
- let height2 = "100%";
43576
- if (layout.appendHeight.value) {
43577
- height2 = `calc(100% - ${layout.appendHeight.value}px)`;
43578
- }
43579
- return {
43580
- width: tableWidth.value ? `${tableWidth.value}px` : "",
43581
- height: height2
43582
- };
43583
- });
43584
43553
  const handleFixedMousewheel = (event, data) => {
43585
43554
  const bodyWrapper = table.refs.bodyWrapper;
43586
43555
  if (Math.abs(data.spinY) > 0) {
@@ -43596,47 +43565,6 @@
43596
43565
  bodyWrapper.scrollLeft += Math.ceil(data.pixelX / 5);
43597
43566
  }
43598
43567
  };
43599
- const fixedHeight = vue.computed(() => {
43600
- if (props.maxHeight) {
43601
- if (props.showSummary) {
43602
- return {
43603
- bottom: 0
43604
- };
43605
- }
43606
- return {
43607
- bottom: layout.scrollX.value && props.data.length ? `${layout.gutterWidth}px` : ""
43608
- };
43609
- } else {
43610
- if (props.showSummary) {
43611
- return {
43612
- height: layout.tableHeight.value ? `${layout.tableHeight.value}px` : ""
43613
- };
43614
- }
43615
- return {
43616
- height: layout.viewportHeight.value ? `${layout.viewportHeight.value}px` : ""
43617
- };
43618
- }
43619
- });
43620
- const fixedBodyHeight = vue.computed(() => {
43621
- if (props.height) {
43622
- return {
43623
- height: layout.fixedBodyHeight.value ? `${layout.fixedBodyHeight.value}px` : ""
43624
- };
43625
- } else if (props.maxHeight) {
43626
- let maxHeight = parseHeight(props.maxHeight);
43627
- if (typeof maxHeight === "number") {
43628
- maxHeight = layout.scrollX.value ? maxHeight - layout.gutterWidth : maxHeight;
43629
- if (props.showHeader) {
43630
- maxHeight -= layout.headerHeight.value;
43631
- }
43632
- maxHeight -= layout.footerHeight.value;
43633
- return {
43634
- "max-height": `${maxHeight}px`
43635
- };
43636
- }
43637
- }
43638
- return {};
43639
- });
43640
43568
  return {
43641
43569
  isHidden,
43642
43570
  renderExpanded,
@@ -43645,19 +43573,17 @@
43645
43573
  handleMouseLeave,
43646
43574
  handleHeaderFooterMousewheel,
43647
43575
  tableSize,
43648
- bodyHeight,
43649
- height,
43650
43576
  emptyBlockStyle,
43651
43577
  handleFixedMousewheel,
43652
- fixedHeight,
43653
- fixedBodyHeight,
43654
43578
  resizeProxyVisible,
43655
43579
  bodyWidth,
43656
43580
  resizeState,
43657
43581
  doLayout,
43658
43582
  tableBodyStyles,
43659
43583
  tableLayout,
43660
- scrollbarViewStyle
43584
+ scrollbarViewStyle,
43585
+ tableInnerStyle,
43586
+ scrollbarStyle
43661
43587
  };
43662
43588
  }
43663
43589
 
@@ -43832,19 +43758,17 @@
43832
43758
  handleMouseLeave,
43833
43759
  handleHeaderFooterMousewheel,
43834
43760
  tableSize,
43835
- bodyHeight,
43836
- height,
43837
43761
  emptyBlockStyle,
43838
43762
  handleFixedMousewheel,
43839
- fixedHeight,
43840
- fixedBodyHeight,
43841
43763
  resizeProxyVisible,
43842
43764
  bodyWidth,
43843
43765
  resizeState,
43844
43766
  doLayout,
43845
43767
  tableBodyStyles,
43846
43768
  tableLayout,
43847
- scrollbarViewStyle
43769
+ scrollbarViewStyle,
43770
+ tableInnerStyle,
43771
+ scrollbarStyle
43848
43772
  } = useStyle(props, layout, store, table);
43849
43773
  const { scrollBarRef, scrollTo, setScrollLeft, setScrollTop } = useScrollbar$1();
43850
43774
  const debouncedUpdateLayout = debounce(doLayout, 50);
@@ -43875,14 +43799,10 @@
43875
43799
  resizeState,
43876
43800
  isGroup,
43877
43801
  bodyWidth,
43878
- bodyHeight,
43879
- height,
43880
43802
  tableBodyStyles,
43881
43803
  emptyBlockStyle,
43882
43804
  debouncedUpdateLayout,
43883
43805
  handleFixedMousewheel,
43884
- fixedHeight,
43885
- fixedBodyHeight,
43886
43806
  setCurrentRow,
43887
43807
  getSelectionRows,
43888
43808
  toggleRowSelection,
@@ -43900,6 +43820,8 @@
43900
43820
  computedEmptyText,
43901
43821
  tableLayout,
43902
43822
  scrollbarViewStyle,
43823
+ tableInnerStyle,
43824
+ scrollbarStyle,
43903
43825
  scrollBarRef,
43904
43826
  scrollTo,
43905
43827
  setScrollLeft,
@@ -43945,7 +43867,8 @@
43945
43867
  onMouseleave: _cache[0] || (_cache[0] = ($event) => _ctx.handleMouseLeave())
43946
43868
  }, [
43947
43869
  vue.createElementVNode("div", {
43948
- class: vue.normalizeClass(_ctx.ns.e("inner-wrapper"))
43870
+ class: vue.normalizeClass(_ctx.ns.e("inner-wrapper")),
43871
+ style: vue.normalizeStyle(_ctx.tableInnerStyle)
43949
43872
  }, [
43950
43873
  vue.createElementVNode("div", _hoisted_2$7, [
43951
43874
  vue.renderSlot(_ctx.$slots, "default")
@@ -43980,14 +43903,12 @@
43980
43903
  ]) : vue.createCommentVNode("v-if", true),
43981
43904
  vue.createElementVNode("div", {
43982
43905
  ref: "bodyWrapper",
43983
- style: vue.normalizeStyle(_ctx.bodyHeight),
43984
43906
  class: vue.normalizeClass(_ctx.ns.e("body-wrapper"))
43985
43907
  }, [
43986
43908
  vue.createVNode(_component_el_scrollbar, {
43987
43909
  ref: "scrollBarRef",
43988
- height: _ctx.maxHeight ? void 0 : _ctx.height,
43989
- "max-height": _ctx.maxHeight ? _ctx.height : void 0,
43990
43910
  "view-style": _ctx.scrollbarViewStyle,
43911
+ "wrap-style": _ctx.scrollbarStyle,
43991
43912
  always: _ctx.scrollbarAlwaysOn
43992
43913
  }, {
43993
43914
  default: vue.withCtx(() => [
@@ -44046,30 +43967,30 @@
44046
43967
  ], 2)) : vue.createCommentVNode("v-if", true)
44047
43968
  ]),
44048
43969
  _: 3
44049
- }, 8, ["height", "max-height", "view-style", "always"])
44050
- ], 6),
44051
- _ctx.border || _ctx.isGroup ? (vue.openBlock(), vue.createElementBlock("div", {
43970
+ }, 8, ["view-style", "wrap-style", "always"])
43971
+ ], 2),
43972
+ _ctx.showSummary ? vue.withDirectives((vue.openBlock(), vue.createElementBlock("div", {
44052
43973
  key: 1,
43974
+ ref: "footerWrapper",
43975
+ class: vue.normalizeClass(_ctx.ns.e("footer-wrapper"))
43976
+ }, [
43977
+ vue.createVNode(_component_table_footer, {
43978
+ border: _ctx.border,
43979
+ "default-sort": _ctx.defaultSort,
43980
+ store: _ctx.store,
43981
+ style: vue.normalizeStyle(_ctx.tableBodyStyles),
43982
+ "sum-text": _ctx.computedSumText,
43983
+ "summary-method": _ctx.summaryMethod
43984
+ }, null, 8, ["border", "default-sort", "store", "style", "sum-text", "summary-method"])
43985
+ ], 2)), [
43986
+ [vue.vShow, !_ctx.isEmpty],
43987
+ [_directive_mousewheel, _ctx.handleHeaderFooterMousewheel]
43988
+ ]) : vue.createCommentVNode("v-if", true),
43989
+ _ctx.border || _ctx.isGroup ? (vue.openBlock(), vue.createElementBlock("div", {
43990
+ key: 2,
44053
43991
  class: vue.normalizeClass(_ctx.ns.e("border-left-patch"))
44054
43992
  }, null, 2)) : vue.createCommentVNode("v-if", true)
44055
- ], 2),
44056
- _ctx.showSummary ? vue.withDirectives((vue.openBlock(), vue.createElementBlock("div", {
44057
- key: 0,
44058
- ref: "footerWrapper",
44059
- class: vue.normalizeClass(_ctx.ns.e("footer-wrapper"))
44060
- }, [
44061
- vue.createVNode(_component_table_footer, {
44062
- border: _ctx.border,
44063
- "default-sort": _ctx.defaultSort,
44064
- store: _ctx.store,
44065
- style: vue.normalizeStyle(_ctx.tableBodyStyles),
44066
- "sum-text": _ctx.computedSumText,
44067
- "summary-method": _ctx.summaryMethod
44068
- }, null, 8, ["border", "default-sort", "store", "style", "sum-text", "summary-method"])
44069
- ], 2)), [
44070
- [vue.vShow, !_ctx.isEmpty],
44071
- [_directive_mousewheel, _ctx.handleHeaderFooterMousewheel]
44072
- ]) : vue.createCommentVNode("v-if", true),
43993
+ ], 6),
44073
43994
  vue.withDirectives(vue.createElementVNode("div", {
44074
43995
  ref: "resizeProxy",
44075
43996
  class: vue.normalizeClass(_ctx.ns.e("column-resize-proxy"))