vxe-table 4.23.13 → 4.23.15

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 (52) hide show
  1. package/dist/all.esm.js +36 -20
  2. package/dist/all.esm.min.js +3 -3
  3. package/es/colgroup/index.d.ts +18 -18
  4. package/es/column/index.d.ts +18 -18
  5. package/es/grid/index.d.ts +170 -170
  6. package/es/grid/src/grid.d.ts +27 -27
  7. package/es/grid/src/props.d.ts +1 -1
  8. package/es/table/index.d.ts +162 -162
  9. package/es/table/src/column.d.ts +3 -3
  10. package/es/table/src/footer.d.ts +2 -2
  11. package/es/table/src/group.d.ts +3 -3
  12. package/es/table/src/header.d.ts +2 -2
  13. package/es/table/src/header.js +32 -17
  14. package/es/table/src/props.d.ts +1 -1
  15. package/es/table/src/table.d.ts +26 -26
  16. package/es/table/src/util.d.ts +1 -1
  17. package/es/ui/index.js +3 -2
  18. package/es/ui/src/dom.d.ts +1 -1
  19. package/es/ui/src/log.js +1 -1
  20. package/es/ui/src/vn.d.ts +2 -2
  21. package/lib/colgroup/index.d.ts +18 -18
  22. package/lib/column/index.d.ts +18 -18
  23. package/lib/grid/index.d.ts +170 -170
  24. package/lib/grid/src/grid.d.ts +27 -27
  25. package/lib/grid/src/props.d.ts +1 -1
  26. package/lib/index.umd.js +36 -20
  27. package/lib/index.umd.min.js +3 -3
  28. package/lib/table/index.d.ts +162 -162
  29. package/lib/table/src/column.d.ts +3 -3
  30. package/lib/table/src/footer.d.ts +2 -2
  31. package/lib/table/src/group.d.ts +3 -3
  32. package/lib/table/src/header.d.ts +2 -2
  33. package/lib/table/src/header.js +32 -17
  34. package/lib/table/src/props.d.ts +1 -1
  35. package/lib/table/src/table.d.ts +26 -26
  36. package/lib/table/src/util.d.ts +1 -1
  37. package/lib/ui/index.js +3 -2
  38. package/lib/ui/src/dom.d.ts +1 -1
  39. package/lib/ui/src/log.js +1 -1
  40. package/lib/ui/src/vn.d.ts +2 -2
  41. package/package.json +7 -7
  42. package/packages/table/src/header.ts +37 -18
  43. package/packages/ui/index.ts +2 -1
  44. /package/dist/{iconfont.1793627868721.ttf → iconfont.1793861614058.ttf} +0 -0
  45. /package/dist/{iconfont.1793627868721.woff → iconfont.1793861614058.woff} +0 -0
  46. /package/dist/{iconfont.1793627868721.woff2 → iconfont.1793861614058.woff2} +0 -0
  47. /package/es/{iconfont.1793627868721.ttf → iconfont.1793861614058.ttf} +0 -0
  48. /package/es/{iconfont.1793627868721.woff → iconfont.1793861614058.woff} +0 -0
  49. /package/es/{iconfont.1793627868721.woff2 → iconfont.1793861614058.woff2} +0 -0
  50. /package/lib/{iconfont.1793627868721.ttf → iconfont.1793861614058.ttf} +0 -0
  51. /package/lib/{iconfont.1793627868721.woff → iconfont.1793861614058.woff} +0 -0
  52. /package/lib/{iconfont.1793627868721.woff2 → iconfont.1793861614058.woff2} +0 -0
@@ -251,13 +251,13 @@ declare const _default: import("vue").DefineComponent<{
251
251
  params: PropType<VxeColumnPropTypes.Params>;
252
252
  }>>, {
253
253
  padding: VxeColumnPropTypes.Padding;
254
- verticalAlign: VxeColumnPropTypes.VerticalAlign;
254
+ visible: boolean;
255
255
  resizable: boolean;
256
256
  showOverflow: import("vxe-pc-ui/types/components/table").VxeTablePropTypes.ShowOverflow;
257
257
  showHeaderOverflow: import("vxe-pc-ui/types/components/table").VxeTablePropTypes.ShowOverflow;
258
258
  showFooterOverflow: import("vxe-pc-ui/types/components/table").VxeTablePropTypes.ShowOverflow;
259
- visible: boolean;
260
- filters: VxeColumnPropTypes.Filters<any>;
261
259
  filterMultiple: boolean;
260
+ filters: VxeColumnPropTypes.Filters<any>;
261
+ verticalAlign: VxeColumnPropTypes.VerticalAlign;
262
262
  }, {}>;
263
263
  export default _default;
@@ -37,9 +37,9 @@ declare const _default: import("vue").DefineComponent<{
37
37
  default: null;
38
38
  };
39
39
  }>>, {
40
- footerTableData: any[][];
40
+ fixedType: "" | "left" | "right";
41
41
  tableColumn: VxeTableDefines.ColumnInfo<any>[];
42
42
  fixedColumn: VxeTableDefines.ColumnInfo<any>[];
43
- fixedType: "" | "left" | "right";
43
+ footerTableData: any[][];
44
44
  }, {}>;
45
45
  export default _default;
@@ -166,13 +166,13 @@ declare const _default: import("vue").DefineComponent<{
166
166
  params: import("vue").PropType<import("vxe-pc-ui/types/components/column").VxeColumnPropTypes.Params>;
167
167
  }>>, {
168
168
  padding: import("vxe-pc-ui/types/components/column").VxeColumnPropTypes.Padding;
169
- verticalAlign: import("vxe-pc-ui/types/components/column").VxeColumnPropTypes.VerticalAlign;
169
+ visible: boolean;
170
170
  resizable: boolean;
171
171
  showOverflow: import("vxe-pc-ui/types/components/table").VxeTablePropTypes.ShowOverflow;
172
172
  showHeaderOverflow: import("vxe-pc-ui/types/components/table").VxeTablePropTypes.ShowOverflow;
173
173
  showFooterOverflow: import("vxe-pc-ui/types/components/table").VxeTablePropTypes.ShowOverflow;
174
- visible: boolean;
175
- filters: import("vxe-pc-ui/types/components/column").VxeColumnPropTypes.Filters<any>;
176
174
  filterMultiple: boolean;
175
+ filters: import("vxe-pc-ui/types/components/column").VxeColumnPropTypes.Filters<any>;
176
+ verticalAlign: import("vxe-pc-ui/types/components/column").VxeColumnPropTypes.VerticalAlign;
177
177
  }, {}>;
178
178
  export default _default;
@@ -1,4 +1,4 @@
1
- import { PropType } from 'vue';
1
+ import { PropType, VNode } from 'vue';
2
2
  import type { VxeTableDefines } from '../../../types';
3
3
  declare const _default: import("vue").DefineComponent<{
4
4
  tableData: PropType<any[]>;
@@ -9,7 +9,7 @@ declare const _default: import("vue").DefineComponent<{
9
9
  type: PropType<"right" | "left" | "">;
10
10
  default: null;
11
11
  };
12
- }, () => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
12
+ }, () => VNode<import("vue").RendererNode, import("vue").RendererElement, {
13
13
  [key: string]: any;
14
14
  }>, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
15
15
  tableData: PropType<any[]>;
@@ -316,7 +316,12 @@ var header_default = (
316
316
  const flCompConf = (0, import_utils.isEnableConf)(filterRender) && filterRender.name ? rendererOpts[filterRender.name] || renderer.get(filterRender.name) : null;
317
317
  const rtFloatingFilter = flCompConf ? flCompConf.renderTableFloatingFilter : null;
318
318
  const fixedHiddenColumn = overflowX && (fixedType ? column.fixed !== fixedType : !!column.fixed);
319
- const isPadding = import_xe_utils.default.isBoolean(headerCellOpts.padding) ? headerCellOpts.padding : cellOpts.padding;
319
+ const cellPadding = (0, import_utils.getDefaultConfig)(headerCellOpts.padding, cellOpts.padding);
320
+ const isAllCellPadding = cellPadding === true;
321
+ const isCellPaddingTop = cellPadding ? isAllCellPadding || cellPadding.top !== false : false;
322
+ const isCellPaddingBottom = cellPadding ? isAllCellPadding || cellPadding.bottom !== false : false;
323
+ const isCellPaddingLeft = cellPadding ? isAllCellPadding || cellPadding.left !== false : false;
324
+ const isCellPaddingRight = cellPadding ? isAllCellPadding || cellPadding.right !== false : false;
320
325
  const headOverflow = import_xe_utils.default.eqNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
321
326
  const headAlign = headerAlign || (compConf ? compConf.tableHeaderCellAlign : "") || allHeaderAlign || align || (compConf ? compConf.tableCellAlign : "") || allAlign;
322
327
  const showEllipsis = headOverflow === "ellipsis";
@@ -371,8 +376,13 @@ var header_default = (
371
376
  "col--fixed": column.fixed,
372
377
  "col--ellipsis": hasEllipsis,
373
378
  "fixed--width": !isAutoCellWidth,
374
- "is--padding": isPadding,
379
+ "is--pg-top": isCellPaddingTop,
380
+ "is--pg-bottom": isCellPaddingBottom,
381
+ "is--pg-left": isCellPaddingLeft,
382
+ "is--pg-right": isCellPaddingRight,
375
383
  "is--sortable": column.sortable,
384
+ "col--filter": !!filters,
385
+ "is--filter-active": hasFilter,
376
386
  "col--current": currColFlag && currentCol === column
377
387
  }
378
388
  ],
@@ -413,28 +423,33 @@ var header_default = (
413
423
  const { fixedType } = props;
414
424
  const { headerRowClassName, headerRowStyle } = tableProps;
415
425
  const floatingFilterOpts = computeFloatingFilterOpts.value;
416
- const rowVNs = headerGroups.map((cols, _rowIndex) => {
426
+ const isFFEnabled = floatingFilterOpts.enabled;
427
+ const isFFTop = floatingFilterOpts.position === "top";
428
+ const rowVNs = [];
429
+ if (isFFEnabled && isFFTop) {
430
+ rowVNs.push(
431
+ (0, import_vue.h)("tr", {
432
+ key: "fft",
433
+ class: ["vxe-header--row is--floating-filters", "" + (floatingFilterOpts.rowClassName || "")]
434
+ }, renderFilterRows(isOptimizeMode, renderColumnList))
435
+ );
436
+ }
437
+ headerGroups.forEach((cols, _rowIndex) => {
417
438
  const params = { $table: $xeTable, rowIndex: _rowIndex, _rowIndex, $rowIndex: _rowIndex, fixed: fixedType, type: renderType };
418
- return (0, import_vue.h)(
419
- "tr",
420
- {
439
+ rowVNs.push(
440
+ (0, import_vue.h)("tr", {
421
441
  key: _rowIndex,
422
442
  class: ["vxe-header--row", headerRowClassName ? import_xe_utils.default.isFunction(headerRowClassName) ? headerRowClassName(params) : headerRowClassName : ""],
423
443
  style: headerRowStyle ? import_xe_utils.default.isFunction(headerRowStyle) ? headerRowStyle(params) : headerRowStyle : null
424
- },
425
- renderRows(isGroup, isOptimizeMode, headerGroups, _rowIndex, cols)
444
+ }, renderRows(isGroup, isOptimizeMode, headerGroups, _rowIndex, cols))
426
445
  );
427
446
  });
428
- if (floatingFilterOpts.enabled) {
447
+ if (isFFEnabled && !isFFTop) {
429
448
  rowVNs.push(
430
- (0, import_vue.h)(
431
- "tr",
432
- {
433
- key: "ff",
434
- class: ["vxe-header--row is--floating-filters", "" + (floatingFilterOpts.rowClassName || "")]
435
- },
436
- renderFilterRows(isOptimizeMode, renderColumnList)
437
- )
449
+ (0, import_vue.h)("tr", {
450
+ key: "ffb",
451
+ class: ["vxe-header--row is--floating-filters", "" + (floatingFilterOpts.rowClassName || "")]
452
+ }, renderFilterRows(isOptimizeMode, renderColumnList))
438
453
  );
439
454
  }
440
455
  return rowVNs;
@@ -153,7 +153,7 @@ export declare const tableComponenProps: {
153
153
  type: PropType<VxeTablePropTypes.AutoResize>;
154
154
  default: () => boolean | undefined;
155
155
  };
156
- syncResize: (StringConstructor | NumberConstructor | BooleanConstructor)[];
156
+ syncResize: (NumberConstructor | BooleanConstructor | StringConstructor)[];
157
157
  resizeConfig: PropType<VxeTablePropTypes.ResizeConfig>;
158
158
  columnConfig: PropType<VxeTablePropTypes.ColumnConfig>;
159
159
  currentColumnConfig: PropType<VxeTablePropTypes.CurrentColumnConfig>;
@@ -135,7 +135,7 @@ declare const _default: import("vue").DefineComponent<{
135
135
  type: import("vue").PropType<VxeTablePropTypes.AutoResize>;
136
136
  default: () => boolean | undefined;
137
137
  };
138
- syncResize: (StringConstructor | NumberConstructor | BooleanConstructor)[];
138
+ syncResize: (NumberConstructor | BooleanConstructor | StringConstructor)[];
139
139
  resizeConfig: import("vue").PropType<VxeTablePropTypes.ResizeConfig>;
140
140
  columnConfig: import("vue").PropType<VxeTablePropTypes.ColumnConfig>;
141
141
  currentColumnConfig: import("vue").PropType<VxeTablePropTypes.CurrentColumnConfig>;
@@ -198,7 +198,7 @@ declare const _default: import("vue").DefineComponent<{
198
198
  };
199
199
  rendererConfig: import("vue").PropType<VxeTablePropTypes.RendererConfig>;
200
200
  params: import("vue").PropType<VxeTablePropTypes.Params>;
201
- }, VxeTableConstructor<any> & VxeTableMethods<any> & VxeTablePrivateMethods<any>, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ["ready", "init-rendered", "data-rendered", "update:data", "keydown-start", "keydown", "keydown-end", "paste", "copy", "cut", "undo", "redo", "context-menu", "columns-change", "data-change", "footer-data-change", "current-change", "current-row-change", "current-row-disabled", "current-column-change", "current-column-disabled", "radio-change", "checkbox-change", "checkbox-all", "checkbox-range-start", "checkbox-range-change", "checkbox-range-end", "checkbox-range-select", "cell-click", "cell-dblclick", "cell-menu", "cell-mouseenter", "cell-mouseleave", "cell-selected", "cell-delete-value", "cell-backspace-value", "header-cell-click", "header-cell-dblclick", "header-cell-menu", "footer-cell-click", "footer-cell-dblclick", "footer-cell-menu", "clear-merge", "sort-change", "clear-sort", "clear-all-sort", "filter-change", "filter-visible", "clear-filter", "clear-all-filter", "resizable-change", "column-resizable-change", "row-resizable-change", "toggle-row-group-expand", "toggle-row-expand", "toggle-tree-expand", "menu-click", "edit-closed", "row-dragstart", "row-dragover", "row-dragend", "row-remove-dragend", "row-insert-dragend", "column-dragstart", "column-dragover", "column-dragend", "enter-append-row", "tab-append-row", "edit-actived", "edit-activated", "edit-disabled", "valid-error", "scroll", "scroll-boundary", "custom", "custom-open", "custom-close", "custom-cancel", "custom-reset", "custom-confirm", "custom-visible-change", "custom-visible-all", "custom-fixed-change", "custom-sort-change", "custom-align-change", "custom-header-align-change", "custom-footer-align-change", "change-fnr", "open-fnr", "show-fnr", "hide-fnr", "fnr-change", "fnr-find", "fnr-find-all", "fnr-replace", "fnr-replace-all", "cell-area-copy", "cell-area-cut", "cell-area-paste", "cell-area-merge", "clear-cell-area-selection", "clear-cell-area-merge", "header-cell-area-selection", "cell-area-selection-invalid", "cell-area-selection-start", "cell-area-selection-drag", "cell-area-selection-end", "cell-area-extension-start", "cell-area-extension-drag", "cell-area-extension-end", "cell-area-extension-fill", "cell-area-selection-all-start", "cell-area-selection-all-end", "cell-area-arrows-start", "cell-area-arrows-end", "cell-area-fill-copy", "active-cell-change-start", "active-cell-change-end"], "ready" | "init-rendered" | "data-rendered" | "update:data" | "keydown-start" | "keydown" | "keydown-end" | "paste" | "copy" | "cut" | "undo" | "redo" | "context-menu" | "columns-change" | "data-change" | "footer-data-change" | "current-change" | "current-row-change" | "current-row-disabled" | "current-column-change" | "current-column-disabled" | "radio-change" | "checkbox-change" | "checkbox-all" | "checkbox-range-start" | "checkbox-range-change" | "checkbox-range-end" | "checkbox-range-select" | "cell-click" | "cell-dblclick" | "cell-menu" | "cell-mouseenter" | "cell-mouseleave" | "cell-selected" | "cell-delete-value" | "cell-backspace-value" | "header-cell-click" | "header-cell-dblclick" | "header-cell-menu" | "footer-cell-click" | "footer-cell-dblclick" | "footer-cell-menu" | "clear-merge" | "sort-change" | "clear-sort" | "clear-all-sort" | "filter-change" | "filter-visible" | "clear-filter" | "clear-all-filter" | "resizable-change" | "column-resizable-change" | "row-resizable-change" | "toggle-row-group-expand" | "toggle-row-expand" | "toggle-tree-expand" | "menu-click" | "edit-closed" | "row-dragstart" | "row-dragover" | "row-dragend" | "row-remove-dragend" | "row-insert-dragend" | "column-dragstart" | "column-dragover" | "column-dragend" | "enter-append-row" | "tab-append-row" | "edit-actived" | "edit-activated" | "edit-disabled" | "valid-error" | "scroll" | "scroll-boundary" | "custom" | "custom-open" | "custom-close" | "custom-cancel" | "custom-reset" | "custom-confirm" | "custom-visible-change" | "custom-visible-all" | "custom-fixed-change" | "custom-sort-change" | "custom-align-change" | "custom-header-align-change" | "custom-footer-align-change" | "change-fnr" | "open-fnr" | "show-fnr" | "hide-fnr" | "fnr-change" | "fnr-find" | "fnr-find-all" | "fnr-replace" | "fnr-replace-all" | "cell-area-copy" | "cell-area-cut" | "cell-area-paste" | "cell-area-merge" | "clear-cell-area-selection" | "clear-cell-area-merge" | "header-cell-area-selection" | "cell-area-selection-invalid" | "cell-area-selection-start" | "cell-area-selection-drag" | "cell-area-selection-end" | "cell-area-extension-start" | "cell-area-extension-drag" | "cell-area-extension-end" | "cell-area-extension-fill" | "cell-area-selection-all-start" | "cell-area-selection-all-end" | "cell-area-arrows-start" | "cell-area-arrows-end" | "cell-area-fill-copy" | "active-cell-change-start" | "active-cell-change-end", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
201
+ }, VxeTableConstructor<any> & VxeTableMethods<any> & VxeTablePrivateMethods<any>, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ["ready", "init-rendered", "data-rendered", "update:data", "keydown-start", "keydown", "keydown-end", "paste", "copy", "cut", "undo", "redo", "context-menu", "columns-change", "data-change", "footer-data-change", "current-change", "current-row-change", "current-row-disabled", "current-column-change", "current-column-disabled", "radio-change", "checkbox-change", "checkbox-all", "checkbox-range-start", "checkbox-range-change", "checkbox-range-end", "checkbox-range-select", "cell-click", "cell-dblclick", "cell-menu", "cell-mouseenter", "cell-mouseleave", "cell-selected", "cell-delete-value", "cell-backspace-value", "header-cell-click", "header-cell-dblclick", "header-cell-menu", "footer-cell-click", "footer-cell-dblclick", "footer-cell-menu", "clear-merge", "sort-change", "clear-sort", "clear-all-sort", "filter-change", "filter-visible", "clear-filter", "clear-all-filter", "resizable-change", "column-resizable-change", "row-resizable-change", "toggle-row-group-expand", "toggle-row-expand", "toggle-tree-expand", "menu-click", "edit-closed", "row-dragstart", "row-dragover", "row-dragend", "row-remove-dragend", "row-insert-dragend", "column-dragstart", "column-dragover", "column-dragend", "enter-append-row", "tab-append-row", "edit-actived", "edit-activated", "edit-disabled", "valid-error", "scroll", "scroll-boundary", "custom", "custom-open", "custom-close", "custom-cancel", "custom-reset", "custom-confirm", "custom-visible-change", "custom-visible-all", "custom-fixed-change", "custom-sort-change", "custom-align-change", "custom-header-align-change", "custom-footer-align-change", "change-fnr", "open-fnr", "show-fnr", "hide-fnr", "fnr-change", "fnr-find", "fnr-find-all", "fnr-replace", "fnr-replace-all", "cell-area-copy", "cell-area-cut", "cell-area-paste", "cell-area-merge", "clear-cell-area-selection", "clear-cell-area-merge", "header-cell-area-selection", "cell-area-selection-invalid", "cell-area-selection-start", "cell-area-selection-drag", "cell-area-selection-end", "cell-area-extension-start", "cell-area-extension-drag", "cell-area-extension-end", "cell-area-extension-fill", "cell-area-selection-all-start", "cell-area-selection-all-end", "cell-area-arrows-start", "cell-area-arrows-end", "cell-area-fill-copy", "active-cell-change-start", "active-cell-change-end"], "undo" | "redo" | "ready" | "init-rendered" | "data-rendered" | "update:data" | "keydown-start" | "keydown" | "keydown-end" | "paste" | "copy" | "cut" | "context-menu" | "columns-change" | "data-change" | "footer-data-change" | "current-change" | "current-row-change" | "current-row-disabled" | "current-column-change" | "current-column-disabled" | "radio-change" | "checkbox-change" | "checkbox-all" | "checkbox-range-start" | "checkbox-range-change" | "checkbox-range-end" | "checkbox-range-select" | "cell-click" | "cell-dblclick" | "cell-menu" | "cell-mouseenter" | "cell-mouseleave" | "cell-selected" | "cell-delete-value" | "cell-backspace-value" | "header-cell-click" | "header-cell-dblclick" | "header-cell-menu" | "footer-cell-click" | "footer-cell-dblclick" | "footer-cell-menu" | "clear-merge" | "sort-change" | "clear-sort" | "clear-all-sort" | "filter-change" | "filter-visible" | "clear-filter" | "clear-all-filter" | "resizable-change" | "column-resizable-change" | "row-resizable-change" | "toggle-row-group-expand" | "toggle-row-expand" | "toggle-tree-expand" | "menu-click" | "edit-closed" | "row-dragstart" | "row-dragover" | "row-dragend" | "row-remove-dragend" | "row-insert-dragend" | "column-dragstart" | "column-dragover" | "column-dragend" | "enter-append-row" | "tab-append-row" | "edit-actived" | "edit-activated" | "edit-disabled" | "valid-error" | "scroll" | "scroll-boundary" | "custom" | "custom-open" | "custom-close" | "custom-cancel" | "custom-reset" | "custom-confirm" | "custom-visible-change" | "custom-visible-all" | "custom-fixed-change" | "custom-sort-change" | "custom-align-change" | "custom-header-align-change" | "custom-footer-align-change" | "change-fnr" | "open-fnr" | "show-fnr" | "hide-fnr" | "fnr-change" | "fnr-find" | "fnr-find-all" | "fnr-replace" | "fnr-replace-all" | "cell-area-copy" | "cell-area-cut" | "cell-area-paste" | "cell-area-merge" | "clear-cell-area-selection" | "clear-cell-area-merge" | "header-cell-area-selection" | "cell-area-selection-invalid" | "cell-area-selection-start" | "cell-area-selection-drag" | "cell-area-selection-end" | "cell-area-extension-start" | "cell-area-extension-drag" | "cell-area-extension-end" | "cell-area-extension-fill" | "cell-area-selection-all-start" | "cell-area-selection-all-end" | "cell-area-arrows-start" | "cell-area-arrows-end" | "cell-area-fill-copy" | "active-cell-change-start" | "active-cell-change-end", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
202
202
  id: import("vue").PropType<VxeTablePropTypes.ID>;
203
203
  data: import("vue").PropType<any[]>;
204
204
  height: import("vue").PropType<VxeTablePropTypes.Height>;
@@ -325,7 +325,7 @@ declare const _default: import("vue").DefineComponent<{
325
325
  type: import("vue").PropType<VxeTablePropTypes.AutoResize>;
326
326
  default: () => boolean | undefined;
327
327
  };
328
- syncResize: (StringConstructor | NumberConstructor | BooleanConstructor)[];
328
+ syncResize: (NumberConstructor | BooleanConstructor | StringConstructor)[];
329
329
  resizeConfig: import("vue").PropType<VxeTablePropTypes.ResizeConfig>;
330
330
  columnConfig: import("vue").PropType<VxeTablePropTypes.ColumnConfig>;
331
331
  currentColumnConfig: import("vue").PropType<VxeTablePropTypes.CurrentColumnConfig>;
@@ -389,18 +389,19 @@ declare const _default: import("vue").DefineComponent<{
389
389
  rendererConfig: import("vue").PropType<VxeTablePropTypes.RendererConfig>;
390
390
  params: import("vue").PropType<VxeTablePropTypes.Params>;
391
391
  }>> & {
392
- onReady?: ((...args: any[]) => any) | undefined;
393
- "onInit-rendered"?: ((...args: any[]) => any) | undefined;
394
- "onData-rendered"?: ((...args: any[]) => any) | undefined;
395
- "onUpdate:data"?: ((...args: any[]) => any) | undefined;
396
- "onKeydown-start"?: ((...args: any[]) => any) | undefined;
397
392
  onKeydown?: ((...args: any[]) => any) | undefined;
398
- "onKeydown-end"?: ((...args: any[]) => any) | undefined;
399
393
  onPaste?: ((...args: any[]) => any) | undefined;
400
394
  onCopy?: ((...args: any[]) => any) | undefined;
401
395
  onCut?: ((...args: any[]) => any) | undefined;
396
+ onScroll?: ((...args: any[]) => any) | undefined;
402
397
  onUndo?: ((...args: any[]) => any) | undefined;
403
398
  onRedo?: ((...args: any[]) => any) | undefined;
399
+ onReady?: ((...args: any[]) => any) | undefined;
400
+ "onInit-rendered"?: ((...args: any[]) => any) | undefined;
401
+ "onData-rendered"?: ((...args: any[]) => any) | undefined;
402
+ "onUpdate:data"?: ((...args: any[]) => any) | undefined;
403
+ "onKeydown-start"?: ((...args: any[]) => any) | undefined;
404
+ "onKeydown-end"?: ((...args: any[]) => any) | undefined;
404
405
  "onContext-menu"?: ((...args: any[]) => any) | undefined;
405
406
  "onColumns-change"?: ((...args: any[]) => any) | undefined;
406
407
  "onData-change"?: ((...args: any[]) => any) | undefined;
@@ -461,7 +462,6 @@ declare const _default: import("vue").DefineComponent<{
461
462
  "onEdit-activated"?: ((...args: any[]) => any) | undefined;
462
463
  "onEdit-disabled"?: ((...args: any[]) => any) | undefined;
463
464
  "onValid-error"?: ((...args: any[]) => any) | undefined;
464
- onScroll?: ((...args: any[]) => any) | undefined;
465
465
  "onScroll-boundary"?: ((...args: any[]) => any) | undefined;
466
466
  onCustom?: ((...args: any[]) => any) | undefined;
467
467
  "onCustom-open"?: ((...args: any[]) => any) | undefined;
@@ -508,32 +508,32 @@ declare const _default: import("vue").DefineComponent<{
508
508
  "onActive-cell-change-start"?: ((...args: any[]) => any) | undefined;
509
509
  "onActive-cell-change-end"?: ((...args: any[]) => any) | undefined;
510
510
  }, {
511
- border: VxeTablePropTypes.Border;
511
+ size: VxeComponentSizeType;
512
+ useScrollbar: import("vxe-pc-ui").VxeComponentIsVScrollbar;
513
+ fit: boolean;
514
+ showHeader: boolean;
515
+ animat: boolean;
516
+ delayHover: number;
517
+ autoResize: boolean;
512
518
  minHeight: VxeTablePropTypes.MinHeight;
513
519
  padding: boolean;
514
- useScrollbar: import("vxe-pc-ui").VxeComponentIsVScrollbar;
515
- size: VxeComponentSizeType;
516
520
  resizable: boolean;
517
- stripe: boolean;
518
- round: boolean;
519
- fit: boolean;
520
521
  align: import("vxe-pc-ui").VxeComponentAlignType;
521
522
  headerAlign: import("vxe-pc-ui").VxeComponentAlignType;
522
523
  footerAlign: import("vxe-pc-ui").VxeComponentAlignType;
523
- showHeader: boolean;
524
- highlightCurrentRow: boolean;
525
- highlightHoverRow: boolean;
526
- highlightCurrentColumn: boolean;
527
- highlightHoverColumn: boolean;
524
+ stripe: boolean;
525
+ round: boolean;
526
+ border: VxeTablePropTypes.Border;
528
527
  showCustomHeader: boolean;
529
528
  showOverflow: VxeTablePropTypes.ShowOverflow;
530
529
  showHeaderOverflow: VxeTablePropTypes.ShowOverflow;
531
530
  showFooterOverflow: VxeTablePropTypes.ShowOverflow;
532
- rowId: string;
533
- emptyText: string;
534
531
  keepSource: boolean;
535
- autoResize: boolean;
536
- animat: boolean;
537
- delayHover: number;
532
+ emptyText: string;
533
+ highlightCurrentRow: boolean;
534
+ highlightHoverRow: boolean;
535
+ highlightCurrentColumn: boolean;
536
+ highlightHoverColumn: boolean;
537
+ rowId: string;
538
538
  }, {}>;
539
539
  export default _default;
@@ -53,7 +53,7 @@ export declare function createColumn($xeTable: VxeTableConstructor & VxeTablePri
53
53
  export declare function watchColumn($xeTable: VxeTableConstructor & VxeTablePrivateMethods, props: any, column: ColumnInfo): void;
54
54
  export declare function assembleColumn($xeTable: VxeTableConstructor & VxeTablePrivateMethods, elem: HTMLElement, column: ColumnInfo, colgroup: XEColumnInstance | null): void;
55
55
  export declare function destroyColumn($xeTable: VxeTableConstructor & VxeTablePrivateMethods, column: ColumnInfo): void;
56
- export declare function getRootColumn($xeTable: VxeTableConstructor & VxeTablePrivateMethods, column: ColumnInfo): VxeTableDefines.ColumnInfo<any> | ColumnInfo | null;
56
+ export declare function getRootColumn($xeTable: VxeTableConstructor & VxeTablePrivateMethods, column: ColumnInfo): ColumnInfo | VxeTableDefines.ColumnInfo<any> | null;
57
57
  export declare function getFirstChildColumn(column: VxeTableDefines.ColumnInfo): VxeTableDefines.ColumnInfo;
58
58
  export declare function getLastChildColumn(column: VxeTableDefines.ColumnInfo): VxeTableDefines.ColumnInfo;
59
59
  export declare function clearTableDefaultStatus($xeTable: VxeTableConstructor & VxeTablePrivateMethods): Promise<any>;
package/lib/ui/index.js CHANGED
@@ -33,7 +33,7 @@ __export(ui_exports, {
33
33
  module.exports = __toCommonJS(ui_exports);
34
34
  var import_core = require("@vxe-ui/core");
35
35
  var import_utils = require("./src/utils");
36
- const version = "4.23.13";
36
+ const version = "4.23.15";
37
37
  import_core.VxeUI.version = version;
38
38
  import_core.VxeUI.tableVersion = version;
39
39
  import_core.VxeUI.setConfig({
@@ -200,7 +200,8 @@ import_core.VxeUI.setConfig({
200
200
  maxHeight: 320
201
201
  },
202
202
  floatingFilterConfig: {
203
- // enabled: false
203
+ // enabled: false,
204
+ padding: true
204
205
  },
205
206
  aggregateConfig: {
206
207
  padding: true,
@@ -72,7 +72,7 @@ export declare function updatePanelPlacement(targetElem: HTMLElement | null | un
72
72
  left: number;
73
73
  arrowLeft: number;
74
74
  style: Record<string, string>;
75
- placement: "bottom" | "top";
75
+ placement: "top" | "bottom";
76
76
  };
77
77
  export declare function getPopupWrapperElement(panelElem: HTMLElement | null | undefined): HTMLElement | null;
78
78
  export declare function getPopupContainer(appendTo: string | HTMLElement | ((params: any) => string | HTMLElement) | undefined): string | HTMLElement;
package/lib/ui/src/log.js CHANGED
@@ -25,7 +25,7 @@ __export(log_exports, {
25
25
  module.exports = __toCommonJS(log_exports);
26
26
  var import_core = require("@vxe-ui/core");
27
27
  const { log } = import_core.VxeUI;
28
- const tableVersion = `table v${"4.23.13"}`;
28
+ const tableVersion = `table v${"4.23.15"}`;
29
29
  function createComponentLog(name) {
30
30
  const uiVersion = import_core.VxeUI.uiVersion ? `ui v${import_core.VxeUI.uiVersion}` : "";
31
31
  const ganttVersion = import_core.VxeUI.ganttVersion ? `gantt v${import_core.VxeUI.ganttVersion}` : "";
@@ -1,7 +1,7 @@
1
1
  import type { VxeGlobalRendererHandles } from 'vxe-pc-ui';
2
2
  import type { VxeComponentSlotType } from '../../../types';
3
3
  export declare function getOnName(type: string): string;
4
- export declare function getModelEvent(renderOpts: VxeGlobalRendererHandles.RenderOptions): "change" | "input" | "update:modelValue";
5
- export declare function getChangeEvent(renderOpts: VxeGlobalRendererHandles.RenderOptions): "change" | "input";
4
+ export declare function getModelEvent(renderOpts: VxeGlobalRendererHandles.RenderOptions): "input" | "change" | "update:modelValue";
5
+ export declare function getChangeEvent(renderOpts: VxeGlobalRendererHandles.RenderOptions): "input" | "change";
6
6
  export declare function hasInputType(renderOpts: VxeGlobalRendererHandles.RenderOptions): boolean;
7
7
  export declare function getSlotVNs(vns: VxeComponentSlotType | VxeComponentSlotType[]): VxeComponentSlotType[];
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vxe-table",
3
- "version": "4.23.13",
3
+ "version": "4.23.15",
4
4
  "description": "A PC-end table component based on Vxe UI, supporting copy-paste, data pivot table, and high-performance virtual list table solution.",
5
5
  "scripts": {
6
6
  "update": "npm install --legacy-peer-deps",
@@ -75,14 +75,14 @@
75
75
  "typescript": "~5.9.3",
76
76
  "vue": "3.4.27",
77
77
  "vue-router": "~4.5.1",
78
- "vxe-pc-ui": "4.20.35"
78
+ "vxe-pc-ui": "4.20.37"
79
79
  },
80
80
  "allowScripts": {
81
- "esbuild@0.28.2": true,
82
- "@parcel/watcher@2.5.6": true,
83
- "yorkie@2.0.0": true,
84
- "core-js@3.49.0": true,
85
- "es5-ext@0.10.64": true
81
+ "esbuild": true,
82
+ "@parcel/watcher": true,
83
+ "yorkie": true,
84
+ "core-js": true,
85
+ "es5-ext": true
86
86
  },
87
87
  "vetur": {
88
88
  "tags": "helper/vetur/tags.json",
@@ -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
 
@@ -173,7 +173,8 @@ VxeUI.setConfig({
173
173
  maxHeight: 320
174
174
  },
175
175
  floatingFilterConfig: {
176
- // enabled: false
176
+ // enabled: false,
177
+ padding: true
177
178
  },
178
179
  aggregateConfig: {
179
180
  padding: true,