vxe-table 4.23.7 → 4.23.9

package/es/table/src/columnInfo.js

@@ -1,5 +1,5 @@
 import XEUtils from "xe-utils";
-import { VxeUI } from "../../ui";
+import { VxeUI } from "@vxe-ui/core";
 import { toFilters } from "./util";
 import { isEnableConf, getFuncText } from "../../ui/src/utils";
 import { isPx } from "../../ui/src/dom";
@@ -179,6 +179,7 @@ class ColumnInfo {
       slots: colConfs.slots
     });
     if (ctFilterOptions && (!filters || !filters.length)) {
+      ;
       this.filters = toFilters(ctFilterOptions({ $table: $xeTable, column: this }), colId);
     }
     if ($xeGGWrapper) {

package/es/table/src/footer.js

@@ -1,7 +1,7 @@
 import { h, ref, inject, nextTick, 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 { updateCellTitle, getPropClass } from "../../ui/src/dom";
 import { getCalcHeight } from "./util";
 import { getDefaultConfig } from "../../ui/src/utils";
@@ -165,49 +165,73 @@ var footer_default = defineVxeComponent({
         } else {
           tcStyle.minHeight = `${currCellHeight}px`;
         }
-        return h("td", {
-          class: ["vxe-table--column vxe-footer--column", column.id, {
-            [`col--${footAlign}`]: footAlign,
-            [`col--${type}`]: type,
-            "col--last": isLastColumn,
-            "fixed--width": !isAutoCellWidth,
-            "fixed--hidden": fixedHiddenColumn,
-            "is--pg-top": isCellPaddingTop,
-            "is--pg-bottom": isCellPaddingBottom,
-            "is--pg-left": isCellPaddingLeft,
-            "is--pg-right": isCellPaddingRight,
-            "col--ellipsis": hasEllipsis,
-            "col--current": currColFlag && currentCol === column
-          }, getPropClass(footerClassName, cellParams), getPropClass(footerCellClassName, cellParams)],
-          ...attrs,
-          style: footerCellStyle ? XEUtils.isFunction(footerCellStyle) ? footerCellStyle(cellParams) : footerCellStyle : null,
-          ...tfOns,
-          key: columnKey || scrollXLoad || scrollYLoad || columnOpts.useKey || columnOpts.drag ? column.id : $columnIndex
-        }, [
-          h("div", {
-            class: ["vxe-cell", {
-              "c--title": showTitle,
-              "c--tooltip": showTooltip,
-              "c--ellipsis": showEllipsis
-            }],
-            style: tcStyle
-          }, isVNPreEmptyStatus ? [] : [
-            h("div", {
-              colid,
-              class: "vxe-cell--wrapper vxe-footer-cell--wrapper"
-            }, column.renderFooter(cellParams))
-          ]),
-          /**
-           * 列宽拖动
-           */
-          !fixedHiddenColumn && showResizable && isAllColumnDrag ? h("div", {
-            class: ["vxe-cell--col-resizable", {
-              "is--line": !border || border === "none"
-            }],
-            onMousedown: (evnt) => $xeTable.handleColResizeMousedownEvent(evnt, fixedType, cellParams),
-            onDblclick: (evnt) => $xeTable.handleColResizeDblclickEvent(evnt, cellParams)
-          }) : renderEmptyElement($xeTable)
-        ]);
+        return h(
+          "td",
+          {
+            class: [
+              "vxe-table--column vxe-footer--column",
+              column.id,
+              {
+                [`col--${footAlign}`]: footAlign,
+                [`col--${type}`]: type,
+                "col--last": isLastColumn,
+                "fixed--width": !isAutoCellWidth,
+                "fixed--hidden": fixedHiddenColumn,
+                "is--pg-top": isCellPaddingTop,
+                "is--pg-bottom": isCellPaddingBottom,
+                "is--pg-left": isCellPaddingLeft,
+                "is--pg-right": isCellPaddingRight,
+                "col--ellipsis": hasEllipsis,
+                "col--current": currColFlag && currentCol === column
+              },
+              getPropClass(footerClassName, cellParams),
+              getPropClass(footerCellClassName, cellParams)
+            ],
+            ...attrs,
+            style: footerCellStyle ? XEUtils.isFunction(footerCellStyle) ? footerCellStyle(cellParams) : footerCellStyle : null,
+            ...tfOns,
+            key: columnKey || scrollXLoad || scrollYLoad || columnOpts.useKey || columnOpts.drag ? column.id : $columnIndex
+          },
+          [
+            h(
+              "div",
+              {
+                class: [
+                  "vxe-cell",
+                  {
+                    "c--title": showTitle,
+                    "c--tooltip": showTooltip,
+                    "c--ellipsis": showEllipsis
+                  }
+                ],
+                style: tcStyle
+              },
+              isVNPreEmptyStatus ? [] : [
+                h(
+                  "div",
+                  {
+                    colid,
+                    class: "vxe-cell--wrapper vxe-footer-cell--wrapper"
+                  },
+                  column.renderFooter(cellParams)
+                )
+              ]
+            ),
+            /**
+             * 列宽拖动
+             */
+            !fixedHiddenColumn && showResizable && isAllColumnDrag ? h("div", {
+              class: [
+                "vxe-cell--col-resizable",
+                {
+                  "is--line": !border || border === "none"
+                }
+              ],
+              onMousedown: (evnt) => $xeTable.handleColResizeMousedownEvent(evnt, fixedType, cellParams),
+              onDblclick: (evnt) => $xeTable.handleColResizeDblclickEvent(evnt, cellParams)
+            }) : renderEmptyElement($xeTable)
+          ]
+        );
       });
     };
     const renderHeads = (isOptimizeMode, renderColumnList) => {
@@ -216,14 +240,15 @@ var footer_default = defineVxeComponent({
       return footerTableData.map((row, _rowIndex) => {
         const $rowIndex = _rowIndex;
         const rowParams = { $table: $xeTable, row, rowIndex: _rowIndex, _rowIndex, $rowIndex, fixed: fixedType, type: renderType };
-        return h("tr", {
-          key: _rowIndex,
-          class: [
-            "vxe-footer--row",
-            footerRowClassName ? XEUtils.isFunction(footerRowClassName) ? footerRowClassName(rowParams) : footerRowClassName : ""
-          ],
-          style: footerRowStyle ? XEUtils.isFunction(footerRowStyle) ? footerRowStyle(rowParams) : footerRowStyle : null
-        }, renderRows(isOptimizeMode, renderColumnList, footerTableData, row, _rowIndex, _rowIndex));
+        return h(
+          "tr",
+          {
+            key: _rowIndex,
+            class: ["vxe-footer--row", footerRowClassName ? XEUtils.isFunction(footerRowClassName) ? footerRowClassName(rowParams) : footerRowClassName : ""],
+            style: footerRowStyle ? XEUtils.isFunction(footerRowStyle) ? footerRowStyle(rowParams) : footerRowStyle : null
+          },
+          renderRows(isOptimizeMode, renderColumnList, footerTableData, row, _rowIndex, _rowIndex)
+        );
       });
     };
     const renderVN = () => {
@@ -264,54 +289,74 @@ var footer_default = defineVxeComponent({
           }
         }
       }
-      return h("div", {
-        ref: refElem,
-        class: ["vxe-table--footer-wrapper", fixedType ? `fixed-${fixedType}--wrapper` : "body--wrapper"],
-        xid: xID
-      }, [
-        h("div", {
-          ref: refFooterScroll,
-          class: "vxe-table--footer-inner-wrapper",
-          onScroll(evnt) {
-            $xeTable.triggerFooterScrollEvent(evnt, fixedType);
-          }
-        }, [
-          fixedType ? renderEmptyElement($xeTable) : h("div", {
-            ref: refFooterXSpace,
-            class: "vxe-body--x-space"
-          }),
-          h("table", {
-            ref: refFooterTable,
-            class: "vxe-table--footer",
-            xid: xID,
-            cellspacing: 0,
-            cellpadding: 0,
-            border: 0,
-            xvm: isOptimizeMode ? "1" : null
-          }, [
-            /**
-            * 列宽
-            */
-            h("colgroup", {
-              ref: refFooterColgroup
-            }, renderColumnList.map((column, $columnIndex) => {
-              return h("col", {
-                name: column.id,
-                key: $columnIndex,
-                style: {
-                  width: `${column.renderWidth}px`
-                }
-              });
-            })),
-            /**
-            * 底部
-            */
-            h("tfoot", {
-              ref: refFooterTFoot
-            }, renderHeads(isOptimizeMode, renderColumnList))
-          ])
-        ])
-      ]);
+      return h(
+        "div",
+        {
+          ref: refElem,
+          class: ["vxe-table--footer-wrapper", fixedType ? `fixed-${fixedType}--wrapper` : "body--wrapper"],
+          xid: xID
+        },
+        [
+          h(
+            "div",
+            {
+              ref: refFooterScroll,
+              class: "vxe-table--footer-inner-wrapper",
+              onScroll(evnt) {
+                $xeTable.triggerFooterScrollEvent(evnt, fixedType);
+              }
+            },
+            [
+              fixedType ? renderEmptyElement($xeTable) : h("div", {
+                ref: refFooterXSpace,
+                class: "vxe-body--x-space"
+              }),
+              h(
+                "table",
+                {
+                  ref: refFooterTable,
+                  class: "vxe-table--footer",
+                  xid: xID,
+                  cellspacing: 0,
+                  cellpadding: 0,
+                  border: 0,
+                  xvm: isOptimizeMode ? "1" : null
+                },
+                [
+                  /**
+                   * 列宽
+                   */
+                  h(
+                    "colgroup",
+                    {
+                      ref: refFooterColgroup
+                    },
+                    renderColumnList.map((column, $columnIndex) => {
+                      return h("col", {
+                        name: column.id,
+                        key: $columnIndex,
+                        style: {
+                          width: `${column.renderWidth}px`
+                        }
+                      });
+                    })
+                  ),
+                  /**
+                   * 底部
+                   */
+                  h(
+                    "tfoot",
+                    {
+                      ref: refFooterTFoot
+                    },
+                    renderHeads(isOptimizeMode, renderColumnList)
+                  )
+                ]
+              )
+            ]
+          )
+        ]
+      );
     };
     onMounted(() => {
       nextTick(() => {

package/es/table/src/group.js

@@ -35,9 +35,13 @@ var group_default = defineVxeComponent({
     });
     const renderVN = () => {
       const defaultSlot = slots.default;
-      return h("div", {
-        ref: refElem
-      }, defaultSlot ? defaultSlot() : []);
+      return h(
+        "div",
+        {
+          ref: refElem
+        },
+        defaultSlot ? defaultSlot() : []
+      );
     };
     const $xeColgroup = { columnConfig };
     provide("$xeColgroup", $xeColgroup);