vxe-table 4.23.14 → 4.23.16

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 (309) hide show
  1. package/dist/all.esm.js +42 -20
  2. package/dist/all.esm.min.js +3 -3
  3. package/es/locale/lang/ar-EG.d.ts +7 -0
  4. package/es/locale/lang/ar-EG.js +578 -571
  5. package/es/locale/lang/de-DE.d.ts +7 -0
  6. package/es/locale/lang/de-DE.js +565 -558
  7. package/es/locale/lang/en-US.d.ts +7 -0
  8. package/es/locale/lang/en-US.js +401 -394
  9. package/es/locale/lang/es-ES.d.ts +7 -0
  10. package/es/locale/lang/es-ES.js +563 -556
  11. package/es/locale/lang/fr-FR.d.ts +7 -0
  12. package/es/locale/lang/fr-FR.js +572 -565
  13. package/es/locale/lang/hu-HU.d.ts +7 -0
  14. package/es/locale/lang/hu-HU.js +8 -1
  15. package/es/locale/lang/hy-AM.d.ts +7 -0
  16. package/es/locale/lang/hy-AM.js +8 -1
  17. package/es/locale/lang/id-ID.d.ts +7 -0
  18. package/es/locale/lang/id-ID.js +584 -577
  19. package/es/locale/lang/it-IT.d.ts +7 -0
  20. package/es/locale/lang/it-IT.js +8 -1
  21. package/es/locale/lang/ja-JP.d.ts +7 -0
  22. package/es/locale/lang/ja-JP.js +540 -533
  23. package/es/locale/lang/ko-KR.d.ts +7 -0
  24. package/es/locale/lang/ko-KR.js +8 -1
  25. package/es/locale/lang/ms-MY.d.ts +7 -0
  26. package/es/locale/lang/ms-MY.js +8 -1
  27. package/es/locale/lang/nb-NO.d.ts +7 -0
  28. package/es/locale/lang/nb-NO.js +8 -1
  29. package/es/locale/lang/pt-BR.d.ts +7 -0
  30. package/es/locale/lang/pt-BR.js +8 -1
  31. package/es/locale/lang/ru-RU.d.ts +7 -0
  32. package/es/locale/lang/ru-RU.js +586 -579
  33. package/es/locale/lang/th-TH.d.ts +7 -0
  34. package/es/locale/lang/th-TH.js +8 -1
  35. package/es/locale/lang/ug-CN.d.ts +7 -0
  36. package/es/locale/lang/ug-CN.js +8 -1
  37. package/es/locale/lang/uk-UA.d.ts +7 -0
  38. package/es/locale/lang/uk-UA.js +583 -576
  39. package/es/locale/lang/uz-UZ.d.ts +7 -0
  40. package/es/locale/lang/uz-UZ.js +8 -1
  41. package/es/locale/lang/vi-VN.d.ts +7 -0
  42. package/es/locale/lang/vi-VN.js +589 -582
  43. package/es/locale/lang/zh-CHT.d.ts +7 -0
  44. package/es/locale/lang/zh-CHT.js +330 -323
  45. package/es/locale/lang/zh-CN.d.ts +7 -0
  46. package/es/locale/lang/zh-CN.js +8 -1
  47. package/es/locale/lang/zh-HK.d.ts +7 -0
  48. package/es/locale/lang/zh-HK.js +330 -323
  49. package/es/locale/lang/zh-MO.d.ts +7 -0
  50. package/es/locale/lang/zh-MO.js +330 -323
  51. package/es/locale/lang/zh-TC.d.ts +7 -0
  52. package/es/locale/lang/zh-TC.js +330 -323
  53. package/es/locale/lang/zh-TW.d.ts +7 -0
  54. package/es/locale/lang/zh-TW.js +330 -323
  55. package/es/table/src/header.d.ts +2 -2
  56. package/es/table/src/header.js +32 -17
  57. package/es/ui/index.js +1 -1
  58. package/es/ui/src/log.js +1 -1
  59. package/lib/index.umd.js +42 -20
  60. package/lib/index.umd.min.js +3 -3
  61. package/lib/locale/ar-EG.umd.d.ts +7 -0
  62. package/lib/locale/ar-EG.umd.js +578 -571
  63. package/lib/locale/ar-EG.umd.min.js +1 -1
  64. package/lib/locale/de-DE.umd.d.ts +7 -0
  65. package/lib/locale/de-DE.umd.js +565 -558
  66. package/lib/locale/de-DE.umd.min.js +1 -1
  67. package/lib/locale/en-US.umd.d.ts +7 -0
  68. package/lib/locale/en-US.umd.js +401 -394
  69. package/lib/locale/en-US.umd.min.js +1 -1
  70. package/lib/locale/es-ES.umd.d.ts +7 -0
  71. package/lib/locale/es-ES.umd.js +563 -556
  72. package/lib/locale/es-ES.umd.min.js +1 -1
  73. package/lib/locale/fr-FR.umd.d.ts +7 -0
  74. package/lib/locale/fr-FR.umd.js +572 -565
  75. package/lib/locale/fr-FR.umd.min.js +1 -1
  76. package/lib/locale/hu-HU.umd.d.ts +7 -0
  77. package/lib/locale/hu-HU.umd.js +8 -1
  78. package/lib/locale/hu-HU.umd.min.js +1 -1
  79. package/lib/locale/hy-AM.umd.d.ts +7 -0
  80. package/lib/locale/hy-AM.umd.js +8 -1
  81. package/lib/locale/hy-AM.umd.min.js +1 -1
  82. package/lib/locale/id-ID.umd.d.ts +7 -0
  83. package/lib/locale/id-ID.umd.js +584 -577
  84. package/lib/locale/id-ID.umd.min.js +1 -1
  85. package/lib/locale/it-IT.umd.d.ts +7 -0
  86. package/lib/locale/it-IT.umd.js +8 -1
  87. package/lib/locale/it-IT.umd.min.js +1 -1
  88. package/lib/locale/ja-JP.umd.d.ts +7 -0
  89. package/lib/locale/ja-JP.umd.js +540 -533
  90. package/lib/locale/ja-JP.umd.min.js +1 -1
  91. package/lib/locale/ko-KR.umd.d.ts +7 -0
  92. package/lib/locale/ko-KR.umd.js +8 -1
  93. package/lib/locale/ko-KR.umd.min.js +1 -1
  94. package/lib/locale/lang/ar-EG.d.ts +7 -0
  95. package/lib/locale/lang/ar-EG.js +578 -571
  96. package/lib/locale/lang/ar-EG.umd.d.ts +7 -0
  97. package/lib/locale/lang/ar-EG.umd.js +578 -571
  98. package/lib/locale/lang/ar-EG.umd.min.js +1 -1
  99. package/lib/locale/lang/de-DE.d.ts +7 -0
  100. package/lib/locale/lang/de-DE.js +565 -558
  101. package/lib/locale/lang/de-DE.umd.d.ts +7 -0
  102. package/lib/locale/lang/de-DE.umd.js +565 -558
  103. package/lib/locale/lang/de-DE.umd.min.js +1 -1
  104. package/lib/locale/lang/en-US.d.ts +7 -0
  105. package/lib/locale/lang/en-US.js +401 -394
  106. package/lib/locale/lang/en-US.umd.d.ts +7 -0
  107. package/lib/locale/lang/en-US.umd.js +401 -394
  108. package/lib/locale/lang/en-US.umd.min.js +1 -1
  109. package/lib/locale/lang/es-ES.d.ts +7 -0
  110. package/lib/locale/lang/es-ES.js +563 -556
  111. package/lib/locale/lang/es-ES.umd.d.ts +7 -0
  112. package/lib/locale/lang/es-ES.umd.js +563 -556
  113. package/lib/locale/lang/es-ES.umd.min.js +1 -1
  114. package/lib/locale/lang/fr-FR.d.ts +7 -0
  115. package/lib/locale/lang/fr-FR.js +572 -565
  116. package/lib/locale/lang/fr-FR.umd.d.ts +7 -0
  117. package/lib/locale/lang/fr-FR.umd.js +572 -565
  118. package/lib/locale/lang/fr-FR.umd.min.js +1 -1
  119. package/lib/locale/lang/hu-HU.d.ts +7 -0
  120. package/lib/locale/lang/hu-HU.js +8 -1
  121. package/lib/locale/lang/hu-HU.umd.d.ts +7 -0
  122. package/lib/locale/lang/hu-HU.umd.js +8 -1
  123. package/lib/locale/lang/hu-HU.umd.min.js +1 -1
  124. package/lib/locale/lang/hy-AM.d.ts +7 -0
  125. package/lib/locale/lang/hy-AM.js +8 -1
  126. package/lib/locale/lang/hy-AM.umd.d.ts +7 -0
  127. package/lib/locale/lang/hy-AM.umd.js +8 -1
  128. package/lib/locale/lang/hy-AM.umd.min.js +1 -1
  129. package/lib/locale/lang/id-ID.d.ts +7 -0
  130. package/lib/locale/lang/id-ID.js +584 -577
  131. package/lib/locale/lang/id-ID.umd.d.ts +7 -0
  132. package/lib/locale/lang/id-ID.umd.js +584 -577
  133. package/lib/locale/lang/id-ID.umd.min.js +1 -1
  134. package/lib/locale/lang/it-IT.d.ts +7 -0
  135. package/lib/locale/lang/it-IT.js +8 -1
  136. package/lib/locale/lang/it-IT.umd.d.ts +7 -0
  137. package/lib/locale/lang/it-IT.umd.js +8 -1
  138. package/lib/locale/lang/it-IT.umd.min.js +1 -1
  139. package/lib/locale/lang/ja-JP.d.ts +7 -0
  140. package/lib/locale/lang/ja-JP.js +540 -533
  141. package/lib/locale/lang/ja-JP.umd.d.ts +7 -0
  142. package/lib/locale/lang/ja-JP.umd.js +540 -533
  143. package/lib/locale/lang/ja-JP.umd.min.js +1 -1
  144. package/lib/locale/lang/ko-KR.d.ts +7 -0
  145. package/lib/locale/lang/ko-KR.js +8 -1
  146. package/lib/locale/lang/ko-KR.umd.d.ts +7 -0
  147. package/lib/locale/lang/ko-KR.umd.js +8 -1
  148. package/lib/locale/lang/ko-KR.umd.min.js +1 -1
  149. package/lib/locale/lang/ms-MY.d.ts +7 -0
  150. package/lib/locale/lang/ms-MY.js +8 -1
  151. package/lib/locale/lang/ms-MY.umd.d.ts +7 -0
  152. package/lib/locale/lang/ms-MY.umd.js +8 -1
  153. package/lib/locale/lang/ms-MY.umd.min.js +1 -1
  154. package/lib/locale/lang/nb-NO.d.ts +7 -0
  155. package/lib/locale/lang/nb-NO.js +8 -1
  156. package/lib/locale/lang/nb-NO.umd.d.ts +7 -0
  157. package/lib/locale/lang/nb-NO.umd.js +8 -1
  158. package/lib/locale/lang/nb-NO.umd.min.js +1 -1
  159. package/lib/locale/lang/pt-BR.d.ts +7 -0
  160. package/lib/locale/lang/pt-BR.js +8 -1
  161. package/lib/locale/lang/pt-BR.umd.d.ts +7 -0
  162. package/lib/locale/lang/pt-BR.umd.js +8 -1
  163. package/lib/locale/lang/pt-BR.umd.min.js +1 -1
  164. package/lib/locale/lang/ru-RU.d.ts +7 -0
  165. package/lib/locale/lang/ru-RU.js +586 -579
  166. package/lib/locale/lang/ru-RU.umd.d.ts +7 -0
  167. package/lib/locale/lang/ru-RU.umd.js +586 -579
  168. package/lib/locale/lang/ru-RU.umd.min.js +1 -1
  169. package/lib/locale/lang/th-TH.d.ts +7 -0
  170. package/lib/locale/lang/th-TH.js +8 -1
  171. package/lib/locale/lang/th-TH.umd.d.ts +7 -0
  172. package/lib/locale/lang/th-TH.umd.js +8 -1
  173. package/lib/locale/lang/th-TH.umd.min.js +1 -1
  174. package/lib/locale/lang/ug-CN.d.ts +7 -0
  175. package/lib/locale/lang/ug-CN.js +8 -1
  176. package/lib/locale/lang/ug-CN.umd.d.ts +7 -0
  177. package/lib/locale/lang/ug-CN.umd.js +8 -1
  178. package/lib/locale/lang/ug-CN.umd.min.js +1 -1
  179. package/lib/locale/lang/uk-UA.d.ts +7 -0
  180. package/lib/locale/lang/uk-UA.js +583 -576
  181. package/lib/locale/lang/uk-UA.umd.d.ts +7 -0
  182. package/lib/locale/lang/uk-UA.umd.js +583 -576
  183. package/lib/locale/lang/uk-UA.umd.min.js +1 -1
  184. package/lib/locale/lang/uz-UZ.d.ts +7 -0
  185. package/lib/locale/lang/uz-UZ.js +8 -1
  186. package/lib/locale/lang/uz-UZ.umd.d.ts +7 -0
  187. package/lib/locale/lang/uz-UZ.umd.js +8 -1
  188. package/lib/locale/lang/uz-UZ.umd.min.js +1 -1
  189. package/lib/locale/lang/vi-VN.d.ts +7 -0
  190. package/lib/locale/lang/vi-VN.js +589 -582
  191. package/lib/locale/lang/vi-VN.umd.d.ts +7 -0
  192. package/lib/locale/lang/vi-VN.umd.js +589 -582
  193. package/lib/locale/lang/vi-VN.umd.min.js +1 -1
  194. package/lib/locale/lang/zh-CHT.d.ts +7 -0
  195. package/lib/locale/lang/zh-CHT.js +330 -323
  196. package/lib/locale/lang/zh-CHT.umd.d.ts +7 -0
  197. package/lib/locale/lang/zh-CHT.umd.js +330 -323
  198. package/lib/locale/lang/zh-CHT.umd.min.js +1 -1
  199. package/lib/locale/lang/zh-CN.d.ts +7 -0
  200. package/lib/locale/lang/zh-CN.js +8 -1
  201. package/lib/locale/lang/zh-CN.umd.d.ts +7 -0
  202. package/lib/locale/lang/zh-CN.umd.js +8 -1
  203. package/lib/locale/lang/zh-CN.umd.min.js +1 -1
  204. package/lib/locale/lang/zh-HK.d.ts +7 -0
  205. package/lib/locale/lang/zh-HK.js +330 -323
  206. package/lib/locale/lang/zh-HK.umd.d.ts +7 -0
  207. package/lib/locale/lang/zh-HK.umd.js +330 -323
  208. package/lib/locale/lang/zh-HK.umd.min.js +1 -1
  209. package/lib/locale/lang/zh-MO.d.ts +7 -0
  210. package/lib/locale/lang/zh-MO.js +330 -323
  211. package/lib/locale/lang/zh-MO.umd.d.ts +7 -0
  212. package/lib/locale/lang/zh-MO.umd.js +330 -323
  213. package/lib/locale/lang/zh-MO.umd.min.js +1 -1
  214. package/lib/locale/lang/zh-TC.d.ts +7 -0
  215. package/lib/locale/lang/zh-TC.js +330 -323
  216. package/lib/locale/lang/zh-TC.umd.d.ts +7 -0
  217. package/lib/locale/lang/zh-TC.umd.js +330 -323
  218. package/lib/locale/lang/zh-TC.umd.min.js +1 -1
  219. package/lib/locale/lang/zh-TW.d.ts +7 -0
  220. package/lib/locale/lang/zh-TW.js +330 -323
  221. package/lib/locale/lang/zh-TW.umd.d.ts +7 -0
  222. package/lib/locale/lang/zh-TW.umd.js +330 -323
  223. package/lib/locale/lang/zh-TW.umd.min.js +1 -1
  224. package/lib/locale/ms-MY.umd.d.ts +7 -0
  225. package/lib/locale/ms-MY.umd.js +8 -1
  226. package/lib/locale/ms-MY.umd.min.js +1 -1
  227. package/lib/locale/nb-NO.umd.d.ts +7 -0
  228. package/lib/locale/nb-NO.umd.js +8 -1
  229. package/lib/locale/nb-NO.umd.min.js +1 -1
  230. package/lib/locale/pt-BR.umd.d.ts +7 -0
  231. package/lib/locale/pt-BR.umd.js +8 -1
  232. package/lib/locale/pt-BR.umd.min.js +1 -1
  233. package/lib/locale/ru-RU.umd.d.ts +7 -0
  234. package/lib/locale/ru-RU.umd.js +586 -579
  235. package/lib/locale/ru-RU.umd.min.js +1 -1
  236. package/lib/locale/th-TH.umd.d.ts +7 -0
  237. package/lib/locale/th-TH.umd.js +8 -1
  238. package/lib/locale/th-TH.umd.min.js +1 -1
  239. package/lib/locale/ug-CN.umd.d.ts +7 -0
  240. package/lib/locale/ug-CN.umd.js +8 -1
  241. package/lib/locale/ug-CN.umd.min.js +1 -1
  242. package/lib/locale/uk-UA.umd.d.ts +7 -0
  243. package/lib/locale/uk-UA.umd.js +583 -576
  244. package/lib/locale/uk-UA.umd.min.js +1 -1
  245. package/lib/locale/uz-UZ.umd.d.ts +7 -0
  246. package/lib/locale/uz-UZ.umd.js +8 -1
  247. package/lib/locale/uz-UZ.umd.min.js +1 -1
  248. package/lib/locale/vi-VN.umd.d.ts +7 -0
  249. package/lib/locale/vi-VN.umd.js +589 -582
  250. package/lib/locale/vi-VN.umd.min.js +1 -1
  251. package/lib/locale/zh-CHT.umd.d.ts +7 -0
  252. package/lib/locale/zh-CHT.umd.js +330 -323
  253. package/lib/locale/zh-CHT.umd.min.js +1 -1
  254. package/lib/locale/zh-CN.umd.d.ts +7 -0
  255. package/lib/locale/zh-CN.umd.js +8 -1
  256. package/lib/locale/zh-CN.umd.min.js +1 -1
  257. package/lib/locale/zh-HK.umd.d.ts +7 -0
  258. package/lib/locale/zh-HK.umd.js +330 -323
  259. package/lib/locale/zh-HK.umd.min.js +1 -1
  260. package/lib/locale/zh-MO.umd.d.ts +7 -0
  261. package/lib/locale/zh-MO.umd.js +330 -323
  262. package/lib/locale/zh-MO.umd.min.js +1 -1
  263. package/lib/locale/zh-TC.umd.d.ts +7 -0
  264. package/lib/locale/zh-TC.umd.js +330 -323
  265. package/lib/locale/zh-TC.umd.min.js +1 -1
  266. package/lib/locale/zh-TW.umd.d.ts +7 -0
  267. package/lib/locale/zh-TW.umd.js +330 -323
  268. package/lib/locale/zh-TW.umd.min.js +1 -1
  269. package/lib/table/src/header.d.ts +2 -2
  270. package/lib/table/src/header.js +32 -17
  271. package/lib/ui/index.js +1 -1
  272. package/lib/ui/src/log.js +1 -1
  273. package/package.json +2 -2
  274. package/packages/locale/lang/ar-EG.ts +578 -571
  275. package/packages/locale/lang/de-DE.ts +565 -558
  276. package/packages/locale/lang/en-US.ts +401 -394
  277. package/packages/locale/lang/es-ES.ts +563 -556
  278. package/packages/locale/lang/fr-FR.ts +574 -567
  279. package/packages/locale/lang/hu-HU.ts +8 -1
  280. package/packages/locale/lang/hy-AM.ts +8 -1
  281. package/packages/locale/lang/id-ID.ts +584 -577
  282. package/packages/locale/lang/it-IT.ts +12 -5
  283. package/packages/locale/lang/ja-JP.ts +540 -533
  284. package/packages/locale/lang/ko-KR.ts +8 -1
  285. package/packages/locale/lang/ms-MY.ts +8 -1
  286. package/packages/locale/lang/nb-NO.ts +8 -1
  287. package/packages/locale/lang/pt-BR.ts +8 -1
  288. package/packages/locale/lang/ru-RU.ts +586 -579
  289. package/packages/locale/lang/th-TH.ts +8 -1
  290. package/packages/locale/lang/ug-CN.ts +8 -1
  291. package/packages/locale/lang/uk-UA.ts +583 -576
  292. package/packages/locale/lang/uz-UZ.ts +21 -14
  293. package/packages/locale/lang/vi-VN.ts +589 -582
  294. package/packages/locale/lang/zh-CHT.ts +330 -323
  295. package/packages/locale/lang/zh-CN.ts +8 -1
  296. package/packages/locale/lang/zh-HK.ts +330 -323
  297. package/packages/locale/lang/zh-MO.ts +330 -323
  298. package/packages/locale/lang/zh-TC.ts +330 -323
  299. package/packages/locale/lang/zh-TW.ts +330 -323
  300. package/packages/table/src/header.ts +37 -18
  301. /package/dist/{iconfont.1793683456086.ttf → iconfont.1794189355036.ttf} +0 -0
  302. /package/dist/{iconfont.1793683456086.woff → iconfont.1794189355036.woff} +0 -0
  303. /package/dist/{iconfont.1793683456086.woff2 → iconfont.1794189355036.woff2} +0 -0
  304. /package/es/{iconfont.1793683456086.ttf → iconfont.1794189355036.ttf} +0 -0
  305. /package/es/{iconfont.1793683456086.woff → iconfont.1794189355036.woff} +0 -0
  306. /package/es/{iconfont.1793683456086.woff2 → iconfont.1794189355036.woff2} +0 -0
  307. /package/lib/{iconfont.1793683456086.ttf → iconfont.1794189355036.ttf} +0 -0
  308. /package/lib/{iconfont.1793683456086.woff → iconfont.1794189355036.woff} +0 -0
  309. /package/lib/{iconfont.1793683456086.woff2 → iconfont.1794189355036.woff2} +0 -0
@@ -1,4 +1,4 @@
1
- import { h, ref, Ref, PropType, inject, nextTick, watch, onMounted, onUnmounted } from 'vue'
1
+ import { h, ref, Ref, PropType, inject, nextTick, watch, onMounted, onUnmounted, VNode } from 'vue'
2
2
  import { defineVxeComponent } from '../../ui/src/comp'
3
3
  import XEUtils from 'xe-utils'
4
4
  import { VxeUI } from '@vxe-ui/core'
@@ -313,8 +313,15 @@ export default /* define-vxe-component start */ defineVxeComponent({
313
313
  const flCompConf = isEnableConf(filterRender) && filterRender.name ? rendererOpts[filterRender.name] || renderer.get(filterRender.name) : null
314
314
  const rtFloatingFilter = flCompConf ? flCompConf.renderTableFloatingFilter : null
315
315
  const fixedHiddenColumn = overflowX && (fixedType ? column.fixed !== fixedType : !!column.fixed)
316
- const isPadding = XEUtils.isBoolean(headerCellOpts.padding) ? headerCellOpts.padding : cellOpts.padding
316
+
317
+ const cellPadding = getDefaultConfig(headerCellOpts.padding, cellOpts.padding)
318
+ const isAllCellPadding = cellPadding === true
319
+ const isCellPaddingTop = cellPadding ? isAllCellPadding || cellPadding.top !== false : false
320
+ const isCellPaddingBottom = cellPadding ? isAllCellPadding || cellPadding.bottom !== false : false
321
+ const isCellPaddingLeft = cellPadding ? isAllCellPadding || cellPadding.left !== false : false
322
+ const isCellPaddingRight = cellPadding ? isAllCellPadding || cellPadding.right !== false : false
317
323
  const headOverflow = XEUtils.eqNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow
324
+
318
325
  const headAlign = headerAlign || (compConf ? compConf.tableHeaderCellAlign : '') || allHeaderAlign || align || (compConf ? compConf.tableCellAlign : '') || allAlign
319
326
  const showEllipsis = headOverflow === 'ellipsis'
320
327
  const showTitle = headOverflow === 'title'
@@ -373,8 +380,13 @@ export default /* define-vxe-component start */ defineVxeComponent({
373
380
  'col--fixed': column.fixed,
374
381
  'col--ellipsis': hasEllipsis,
375
382
  'fixed--width': !isAutoCellWidth,
376
- 'is--padding': isPadding,
383
+ 'is--pg-top': isCellPaddingTop,
384
+ 'is--pg-bottom': isCellPaddingBottom,
385
+ 'is--pg-left': isCellPaddingLeft,
386
+ 'is--pg-right': isCellPaddingRight,
377
387
  'is--sortable': column.sortable,
388
+ 'col--filter': !!filters,
389
+ 'is--filter-active': hasFilter,
378
390
  'col--current': currColFlag && currentCol === column
379
391
  }
380
392
  ],
@@ -419,29 +431,36 @@ export default /* define-vxe-component start */ defineVxeComponent({
419
431
 
420
432
  const { headerRowClassName, headerRowStyle } = tableProps
421
433
  const floatingFilterOpts = computeFloatingFilterOpts.value
422
- const rowVNs = headerGroups.map((cols, _rowIndex) => {
434
+ const isFFEnabled = floatingFilterOpts.enabled
435
+ const isFFTop = floatingFilterOpts.position === 'top'
436
+ const rowVNs: VNode[] = []
437
+
438
+ if (isFFEnabled && isFFTop) {
439
+ rowVNs.push(
440
+ h('tr', {
441
+ key: 'fft',
442
+ class: ['vxe-header--row is--floating-filters', '' + (floatingFilterOpts.rowClassName || '')]
443
+ }, renderFilterRows(isOptimizeMode, renderColumnList))
444
+ )
445
+ }
446
+
447
+ headerGroups.forEach((cols, _rowIndex) => {
423
448
  const params = { $table: $xeTable, rowIndex: _rowIndex, _rowIndex, $rowIndex: _rowIndex, fixed: fixedType, type: renderType }
424
- return h(
425
- 'tr',
426
- {
449
+ rowVNs.push(
450
+ h('tr', {
427
451
  key: _rowIndex,
428
452
  class: ['vxe-header--row', headerRowClassName ? (XEUtils.isFunction(headerRowClassName) ? headerRowClassName(params) : headerRowClassName) : ''],
429
453
  style: headerRowStyle ? (XEUtils.isFunction(headerRowStyle) ? headerRowStyle(params) : headerRowStyle) : null
430
- },
431
- renderRows(isGroup, isOptimizeMode, headerGroups, _rowIndex, cols)
454
+ }, renderRows(isGroup, isOptimizeMode, headerGroups, _rowIndex, cols))
432
455
  )
433
456
  })
434
457
 
435
- if (floatingFilterOpts.enabled) {
458
+ if (isFFEnabled && !isFFTop) {
436
459
  rowVNs.push(
437
- h(
438
- 'tr',
439
- {
440
- key: 'ff',
441
- class: ['vxe-header--row is--floating-filters', '' + (floatingFilterOpts.rowClassName || '')]
442
- },
443
- renderFilterRows(isOptimizeMode, renderColumnList)
444
- )
460
+ h('tr', {
461
+ key: 'ffb',
462
+ class: ['vxe-header--row is--floating-filters', '' + (floatingFilterOpts.rowClassName || '')]
463
+ }, renderFilterRows(isOptimizeMode, renderColumnList))
445
464
  )
446
465
  }
447
466