vxe-table 4.23.7 → 4.23.9

package/es/table/src/header.js

@@ -1,7 +1,7 @@
 import { h, ref, inject, nextTick, watch, onMounted, onUnmounted } from "vue";
 import { defineVxeComponent } from "../../ui/src/comp";
 import XEUtils from "xe-utils";
-import { VxeUI } from "../../ui";
+import { VxeUI } from "@vxe-ui/core";
 import { getDefaultConfig, hasEnableConf, isEnableConf } from "../../ui/src/utils";
 import { getCalcHeight, convertHeaderColumnToRows, convertHeaderToGridRows } from "./util";
 import { getSlotVNs } from "../../ui/src/vn";
@@ -185,60 +185,75 @@ var header_default = defineVxeComponent({
           });
           tcStyle.width = `${childWidth}px`;
         }
-        return h("th", {
-          class: [
-            "vxe-table--column vxe-header--column",
-            colid,
-            fixedHiddenColumn ? "fixed--hidden" : "fixed--visible",
-            {
-              [`col--${headAlign}`]: headAlign,
-              [`col--${type}`]: type,
-              "col--last": isLastColumn,
-              "col--fixed": column.fixed,
-              "col--group": isColGroup,
-              "col--ellipsis": hasEllipsis,
-              "fixed--width": !isAutoCellWidth,
-              "is--pg-top": isCellPaddingTop,
-              "is--pg-bottom": isCellPaddingBottom,
-              "is--pg-left": isCellPaddingLeft,
-              "is--pg-right": isCellPaddingRight,
-              "is--sortable": column.sortable,
-              "col--filter": !!filters,
-              "is--filter-active": hasFilter,
-              "is--drag-active": columnOpts.drag && !column.fixed && !isDisabledDrag && (isCrossDrag || isPeerDrag || !column.parentId),
-              "is--drag-disabled": columnOpts.drag && isDisabledDrag,
-              "col--current": currColFlag && currentCol === column
-            },
-            headerClassName ? XEUtils.isFunction(headerClassName) ? headerClassName(cellParams) : headerClassName : "",
-            headerCellClassName ? XEUtils.isFunction(headerCellClassName) ? headerCellClassName(cellParams) : headerCellClassName : ""
-          ],
-          style: headerCellStyle ? XEUtils.isFunction(headerCellStyle) ? headerCellStyle(cellParams) : headerCellStyle : null,
-          ...thAttrs,
-          ...thOns,
-          key: showCustomHeader ? `${colid}${$columnIndex}` : columnKey || scrollXLoad || scrollYLoad || columnOpts.useKey || columnOpts.drag || isColGroup ? colid : $columnIndex
-        }, [
-          h("div", {
-            class: ["vxe-cell", {
-              "c--title": showTitle,
-              "c--tooltip": showTooltip,
-              "c--ellipsis": showEllipsis
-            }],
-            style: tcStyle
-          }, isVNPreEmptyStatus || isOptimizeMode && fixedHiddenColumn ? [] : [
-            h("div", {
+        return h(
+          "th",
+          {
+            class: [
+              "vxe-table--column vxe-header--column",
               colid,
-              class: "vxe-cell--wrapper vxe-header-cell--wrapper"
-            }, column.renderHeader(cellParams))
-          ]),
-          /**
-           * 列宽拖动
-           */
-          !fixedHiddenColumn && showResizable && (!showCustomHeader || isLastRow) ? h("div", {
-            class: "vxe-cell--col-resizable",
-            onMousedown: (evnt) => $xeTable.handleColResizeMousedownEvent(evnt, fixedType, cellParams),
-            onDblclick: (evnt) => $xeTable.handleColResizeDblclickEvent(evnt, cellParams)
-          }) : renderEmptyElement($xeTable)
-        ]);
+              fixedHiddenColumn ? "fixed--hidden" : "fixed--visible",
+              {
+                [`col--${headAlign}`]: headAlign,
+                [`col--${type}`]: type,
+                "col--last": isLastColumn,
+                "col--fixed": column.fixed,
+                "col--group": isColGroup,
+                "col--ellipsis": hasEllipsis,
+                "fixed--width": !isAutoCellWidth,
+                "is--pg-top": isCellPaddingTop,
+                "is--pg-bottom": isCellPaddingBottom,
+                "is--pg-left": isCellPaddingLeft,
+                "is--pg-right": isCellPaddingRight,
+                "is--sortable": column.sortable,
+                "col--filter": !!filters,
+                "is--filter-active": hasFilter,
+                "is--drag-active": columnOpts.drag && !column.fixed && !isDisabledDrag && (isCrossDrag || isPeerDrag || !column.parentId),
+                "is--drag-disabled": columnOpts.drag && isDisabledDrag,
+                "col--current": currColFlag && currentCol === column
+              },
+              headerClassName ? XEUtils.isFunction(headerClassName) ? headerClassName(cellParams) : headerClassName : "",
+              headerCellClassName ? XEUtils.isFunction(headerCellClassName) ? headerCellClassName(cellParams) : headerCellClassName : ""
+            ],
+            style: headerCellStyle ? XEUtils.isFunction(headerCellStyle) ? headerCellStyle(cellParams) : headerCellStyle : null,
+            ...thAttrs,
+            ...thOns,
+            key: showCustomHeader ? `${colid}${$columnIndex}` : columnKey || scrollXLoad || scrollYLoad || columnOpts.useKey || columnOpts.drag || isColGroup ? colid : $columnIndex
+          },
+          [
+            h(
+              "div",
+              {
+                class: [
+                  "vxe-cell",
+                  {
+                    "c--title": showTitle,
+                    "c--tooltip": showTooltip,
+                    "c--ellipsis": showEllipsis
+                  }
+                ],
+                style: tcStyle
+              },
+              isVNPreEmptyStatus || isOptimizeMode && fixedHiddenColumn ? [] : [
+                h(
+                  "div",
+                  {
+                    colid,
+                    class: "vxe-cell--wrapper vxe-header-cell--wrapper"
+                  },
+                  column.renderHeader(cellParams)
+                )
+              ]
+            ),
+            /**
+             * 列宽拖动
+             */
+            !fixedHiddenColumn && showResizable && (!showCustomHeader || isLastRow) ? h("div", {
+              class: "vxe-cell--col-resizable",
+              onMousedown: (evnt) => $xeTable.handleColResizeMousedownEvent(evnt, fixedType, cellParams),
+              onDblclick: (evnt) => $xeTable.handleColResizeDblclickEvent(evnt, cellParams)
+            }) : renderEmptyElement($xeTable)
+          ]
+        );
       });
     };
     const renderFilterRows = (isOptimizeMode, cols) => {
@@ -307,40 +322,56 @@ var header_default = defineVxeComponent({
         } else {
           tcStyle.minHeight = `${currCellHeight}px`;
         }
-        return h("th", {
-          class: [
-            "vxe-table--column vxe-header--column is--floating-filters",
-            colid,
-            fixedHiddenColumn ? "fixed--hidden" : "fixed--visible",
-            {
-              [`col--${headAlign}`]: headAlign,
-              [`col--${type}`]: type,
-              "col--last": isLastColumn,
-              "col--fixed": column.fixed,
-              "col--ellipsis": hasEllipsis,
-              "fixed--width": !isAutoCellWidth,
-              "is--padding": isPadding,
-              "is--sortable": column.sortable,
-              "col--current": currColFlag && currentCol === column
-            }
-          ],
-          key: colid,
-          ...thAttrs
-        }, [
-          h("div", {
-            class: ["vxe-cell", "" + (cellClassName || ""), {
-              "c--title": showTitle,
-              "c--tooltip": showTooltip,
-              "c--ellipsis": showEllipsis
-            }],
-            style: tcStyle
-          }, isOptimizeMode && fixedHiddenColumn && !floatingFilters ? [] : [
-            h("div", {
+        return h(
+          "th",
+          {
+            class: [
+              "vxe-table--column vxe-header--column is--floating-filters",
               colid,
-              class: "vxe-cell--wrapper vxe-header-cell--wrapper"
-            }, flSlot ? $xeTable.callSlot(flSlot, cellParams) : rtFloatingFilter && firstFilterOption ? getSlotVNs(rtFloatingFilter(filterRender, cellParams)) : [])
-          ])
-        ]);
+              fixedHiddenColumn ? "fixed--hidden" : "fixed--visible",
+              {
+                [`col--${headAlign}`]: headAlign,
+                [`col--${type}`]: type,
+                "col--last": isLastColumn,
+                "col--fixed": column.fixed,
+                "col--ellipsis": hasEllipsis,
+                "fixed--width": !isAutoCellWidth,
+                "is--padding": isPadding,
+                "is--sortable": column.sortable,
+                "col--current": currColFlag && currentCol === column
+              }
+            ],
+            key: colid,
+            ...thAttrs
+          },
+          [
+            h(
+              "div",
+              {
+                class: [
+                  "vxe-cell",
+                  "" + (cellClassName || ""),
+                  {
+                    "c--title": showTitle,
+                    "c--tooltip": showTooltip,
+                    "c--ellipsis": showEllipsis
+                  }
+                ],
+                style: tcStyle
+              },
+              isOptimizeMode && fixedHiddenColumn && !floatingFilters ? [] : [
+                h(
+                  "div",
+                  {
+                    colid,
+                    class: "vxe-cell--wrapper vxe-header-cell--wrapper"
+                  },
+                  flSlot ? $xeTable.callSlot(flSlot, cellParams) : rtFloatingFilter && firstFilterOption ? getSlotVNs(rtFloatingFilter(filterRender, cellParams)) : []
+                )
+              ]
+            )
+          ]
+        );
       });
     };
     const renderHeads = (isGroup, isOptimizeMode, headerGroups, renderColumnList) => {
@@ -349,24 +380,26 @@ var header_default = defineVxeComponent({
       const floatingFilterOpts = computeFloatingFilterOpts.value;
       const rowVNs = headerGroups.map((cols, _rowIndex) => {
         const params = { $table: $xeTable, rowIndex: _rowIndex, _rowIndex, $rowIndex: _rowIndex, fixed: fixedType, type: renderType };
-        return h("tr", {
-          key: _rowIndex,
-          class: [
-            "vxe-header--row",
-            headerRowClassName ? XEUtils.isFunction(headerRowClassName) ? headerRowClassName(params) : headerRowClassName : ""
-          ],
-          style: headerRowStyle ? XEUtils.isFunction(headerRowStyle) ? headerRowStyle(params) : headerRowStyle : null
-        }, renderRows(isGroup, isOptimizeMode, headerGroups, _rowIndex, cols));
+        return h(
+          "tr",
+          {
+            key: _rowIndex,
+            class: ["vxe-header--row", headerRowClassName ? XEUtils.isFunction(headerRowClassName) ? headerRowClassName(params) : headerRowClassName : ""],
+            style: headerRowStyle ? XEUtils.isFunction(headerRowStyle) ? headerRowStyle(params) : headerRowStyle : null
+          },
+          renderRows(isGroup, isOptimizeMode, headerGroups, _rowIndex, cols)
+        );
       });
       if (floatingFilterOpts.enabled) {
         rowVNs.push(
-          h("tr", {
-            key: "ff",
-            class: [
-              "vxe-header--row is--floating-filters",
-              "" + (floatingFilterOpts.rowClassName || "")
-            ]
-          }, renderFilterRows(isOptimizeMode, renderColumnList))
+          h(
+            "tr",
+            {
+              key: "ff",
+              class: ["vxe-header--row is--floating-filters", "" + (floatingFilterOpts.rowClassName || "")]
+            },
+            renderFilterRows(isOptimizeMode, renderColumnList)
+          )
         );
       }
       return rowVNs;
@@ -419,77 +452,101 @@ var header_default = defineVxeComponent({
           }
         }
       }
-      return h("div", {
-        ref: refElem,
-        class: ["vxe-table--header-wrapper", fixedType ? `fixed-${fixedType}--wrapper` : "body--wrapper"],
-        xid: xID
-      }, [
-        h("div", {
-          ref: refHeaderScroll,
-          class: "vxe-table--header-inner-wrapper",
-          onScroll(evnt) {
-            $xeTable.triggerHeaderScrollEvent(evnt, fixedType);
-          }
-        }, [
-          fixedType ? renderEmptyElement($xeTable) : h("div", {
-            ref: refHeaderXSpace,
-            class: "vxe-body--x-space"
-          }),
-          h("table", {
-            ref: refHeaderTable,
-            class: "vxe-table--header",
-            xid: xID,
-            cellspacing: 0,
-            cellpadding: 0,
-            border: 0,
-            xvm: isOptimizeMode ? "1" : null
-          }, [
-            /**
-             * 列宽
-             */
-            h("colgroup", {
-              ref: refHeaderColgroup
-            }, renderColumnList.map((column, $columnIndex) => {
-              return h("col", {
-                name: column.id,
-                key: $columnIndex,
-                style: {
-                  width: `${column.renderWidth}px`
-                }
-              });
-            })),
-            /**
-             * 头部
-             */
-            h("thead", {
-              ref: refHeaderTHead
-            }, renderHeads(isGroup, isOptimizeMode, renderHeaderList, renderColumnList))
-          ]),
-          hasEnableConf(mouseConfig, mouseOpts) && mouseOpts.area ? h("div", {
-            class: "vxe-table--cell-area",
-            xid: xID
-          }, [
-            h("span", {
-              class: "vxe-table--cell-main-area"
-            }),
-            h("span", {
-              class: "vxe-table--cell-clip-area"
-            }),
-            h("span", {
-              class: "vxe-table--cell-extend-area"
-            }),
-            h("span", {
-              class: "vxe-table--cell-multi-area"
-            }),
-            h("span", {
-              class: "vxe-table--cell-active-area"
-            }),
-            h("span", {
-              class: "vxe-table--cell-col-status-area"
-            })
-          ]) : renderEmptyElement($xeTable)
-        ])
-      ]);
+      return h(
+        "div",
+        {
+          ref: refElem,
+          class: ["vxe-table--header-wrapper", fixedType ? `fixed-${fixedType}--wrapper` : "body--wrapper"],
+          xid: xID
+        },
+        [
+          h(
+            "div",
+            {
+              ref: refHeaderScroll,
+              class: "vxe-table--header-inner-wrapper",
+              onScroll(evnt) {
+                $xeTable.triggerHeaderScrollEvent(evnt, fixedType);
+              }
+            },
+            [
+              fixedType ? renderEmptyElement($xeTable) : h("div", {
+                ref: refHeaderXSpace,
+                class: "vxe-body--x-space"
+              }),
+              h(
+                "table",
+                {
+                  ref: refHeaderTable,
+                  class: "vxe-table--header",
+                  xid: xID,
+                  cellspacing: 0,
+                  cellpadding: 0,
+                  border: 0,
+                  xvm: isOptimizeMode ? "1" : null
+                },
+                [
+                  /**
+                   * 列宽
+                   */
+                  h(
+                    "colgroup",
+                    {
+                      ref: refHeaderColgroup
+                    },
+                    renderColumnList.map((column, $columnIndex) => {
+                      return h("col", {
+                        name: column.id,
+                        key: $columnIndex,
+                        style: {
+                          width: `${column.renderWidth}px`
+                        }
+                      });
+                    })
+                  ),
+                  /**
+                   * 头部
+                   */
+                  h(
+                    "thead",
+                    {
+                      ref: refHeaderTHead
+                    },
+                    renderHeads(isGroup, isOptimizeMode, renderHeaderList, renderColumnList)
+                  )
+                ]
+              ),
+              hasEnableConf(mouseConfig, mouseOpts) && mouseOpts.area ? h(
+                "div",
+                {
+                  class: "vxe-table--cell-area",
+                  xid: xID
+                },
+                [
+                  h("span", {
+                    class: "vxe-table--cell-main-area"
+                  }),
+                  h("span", {
+                    class: "vxe-table--cell-clip-area"
+                  }),
+                  h("span", {
+                    class: "vxe-table--cell-extend-area"
+                  }),
+                  h("span", {
+                    class: "vxe-table--cell-multi-area"
+                  }),
+                  h("span", {
+                    class: "vxe-table--cell-active-area"
+                  }),
+                  h("span", {
+                    class: "vxe-table--cell-col-status-area"
+                  })
+                ]
+              ) : renderEmptyElement($xeTable)
+            ]
+          )
+        ]
+      );
     };
     watch(() => props.tableColumn, uploadColumn);
     onMounted(() => {

package/es/table/src/props.js

@@ -1,4 +1,4 @@
-import { VxeUI } from "../../ui";
+import { VxeUI } from "@vxe-ui/core";
 import { getDefaultConfig } from "../../ui/src/utils";
 const { getConfig } = VxeUI;
 const tableProps = {