vxe-table 4.23.7 → 4.23.9

package/lib/table/src/columnInfo.js

@@ -32,13 +32,13 @@ __export(columnInfo_exports, {
 });
 module.exports = __toCommonJS(columnInfo_exports);
 var import_xe_utils = __toESM(require("xe-utils"));
-var import_ui = require("../../ui");
+var import_core = require("@vxe-ui/core");
 var import_util = require("./util");
 var import_utils = require("../../ui/src/utils");
 var import_dom = require("../../ui/src/dom");
 var import_log = require("../../ui/src/log");
 const { warnLog, errLog } = (0, import_log.createComponentLog)("table");
-const { getI18n, formats, renderer } = import_ui.VxeUI;
+const { getI18n, formats, renderer } = import_core.VxeUI;
 class ColumnInfo {
   /* eslint-disable @typescript-eslint/no-use-before-define */
   constructor($xeTable, colConfs, { renderHeader, renderCell, renderFooter, renderData } = {}) {
@@ -212,6 +212,7 @@ class ColumnInfo {
       slots: colConfs.slots
     });
     if (ctFilterOptions && (!filters || !filters.length)) {
+      ;
       this.filters = (0, import_util.toFilters)(ctFilterOptions({ $table: $xeTable, column: this }), colId);
     }
     if ($xeGGWrapper) {

package/lib/table/src/footer.js

@@ -34,11 +34,11 @@ module.exports = __toCommonJS(footer_exports);
 var import_vue = require("vue");
 var import_comp = require("../../ui/src/comp");
 var import_xe_utils = __toESM(require("xe-utils"));
-var import_ui = require("../../ui");
+var import_core = require("@vxe-ui/core");
 var import_dom = require("../../ui/src/dom");
 var import_util = require("./util");
 var import_utils = require("../../ui/src/utils");
-const { renderer, renderEmptyElement } = import_ui.VxeUI;
+const { renderer, renderEmptyElement } = import_core.VxeUI;
 const sourceType = "table";
 const renderType = "footer";
 var footer_default = (0, import_comp.defineVxeComponent)({
@@ -198,49 +198,73 @@ var footer_default = (0, import_comp.defineVxeComponent)({
         } else {
           tcStyle.minHeight = `${currCellHeight}px`;
         }
-        return (0, import_vue.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
-          }, (0, import_dom.getPropClass)(footerClassName, cellParams), (0, import_dom.getPropClass)(footerCellClassName, cellParams)],
-          ...attrs,
-          style: footerCellStyle ? import_xe_utils.default.isFunction(footerCellStyle) ? footerCellStyle(cellParams) : footerCellStyle : null,
-          ...tfOns,
-          key: columnKey || scrollXLoad || scrollYLoad || columnOpts.useKey || columnOpts.drag ? column.id : $columnIndex
-        }, [
-          (0, import_vue.h)("div", {
-            class: ["vxe-cell", {
-              "c--title": showTitle,
-              "c--tooltip": showTooltip,
-              "c--ellipsis": showEllipsis
-            }],
-            style: tcStyle
-          }, isVNPreEmptyStatus ? [] : [
-            (0, import_vue.h)("div", {
-              colid,
-              class: "vxe-cell--wrapper vxe-footer-cell--wrapper"
-            }, column.renderFooter(cellParams))
-          ]),
-          /**
-           * 列宽拖动
-           */
-          !fixedHiddenColumn && showResizable && isAllColumnDrag ? (0, import_vue.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 (0, import_vue.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
+              },
+              (0, import_dom.getPropClass)(footerClassName, cellParams),
+              (0, import_dom.getPropClass)(footerCellClassName, cellParams)
+            ],
+            ...attrs,
+            style: footerCellStyle ? import_xe_utils.default.isFunction(footerCellStyle) ? footerCellStyle(cellParams) : footerCellStyle : null,
+            ...tfOns,
+            key: columnKey || scrollXLoad || scrollYLoad || columnOpts.useKey || columnOpts.drag ? column.id : $columnIndex
+          },
+          [
+            (0, import_vue.h)(
+              "div",
+              {
+                class: [
+                  "vxe-cell",
+                  {
+                    "c--title": showTitle,
+                    "c--tooltip": showTooltip,
+                    "c--ellipsis": showEllipsis
+                  }
+                ],
+                style: tcStyle
+              },
+              isVNPreEmptyStatus ? [] : [
+                (0, import_vue.h)(
+                  "div",
+                  {
+                    colid,
+                    class: "vxe-cell--wrapper vxe-footer-cell--wrapper"
+                  },
+                  column.renderFooter(cellParams)
+                )
+              ]
+            ),
+            /**
+             * 列宽拖动
+             */
+            !fixedHiddenColumn && showResizable && isAllColumnDrag ? (0, import_vue.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) => {
@@ -249,14 +273,15 @@ var footer_default = (0, import_comp.defineVxeComponent)({
       return footerTableData.map((row, _rowIndex) => {
         const $rowIndex = _rowIndex;
         const rowParams = { $table: $xeTable, row, rowIndex: _rowIndex, _rowIndex, $rowIndex, fixed: fixedType, type: renderType };
-        return (0, import_vue.h)("tr", {
-          key: _rowIndex,
-          class: [
-            "vxe-footer--row",
-            footerRowClassName ? import_xe_utils.default.isFunction(footerRowClassName) ? footerRowClassName(rowParams) : footerRowClassName : ""
-          ],
-          style: footerRowStyle ? import_xe_utils.default.isFunction(footerRowStyle) ? footerRowStyle(rowParams) : footerRowStyle : null
-        }, renderRows(isOptimizeMode, renderColumnList, footerTableData, row, _rowIndex, _rowIndex));
+        return (0, import_vue.h)(
+          "tr",
+          {
+            key: _rowIndex,
+            class: ["vxe-footer--row", footerRowClassName ? import_xe_utils.default.isFunction(footerRowClassName) ? footerRowClassName(rowParams) : footerRowClassName : ""],
+            style: footerRowStyle ? import_xe_utils.default.isFunction(footerRowStyle) ? footerRowStyle(rowParams) : footerRowStyle : null
+          },
+          renderRows(isOptimizeMode, renderColumnList, footerTableData, row, _rowIndex, _rowIndex)
+        );
       });
     };
     const renderVN = () => {
@@ -297,54 +322,74 @@ var footer_default = (0, import_comp.defineVxeComponent)({
           }
         }
       }
-      return (0, import_vue.h)("div", {
-        ref: refElem,
-        class: ["vxe-table--footer-wrapper", fixedType ? `fixed-${fixedType}--wrapper` : "body--wrapper"],
-        xid: xID
-      }, [
-        (0, import_vue.h)("div", {
-          ref: refFooterScroll,
-          class: "vxe-table--footer-inner-wrapper",
-          onScroll(evnt) {
-            $xeTable.triggerFooterScrollEvent(evnt, fixedType);
-          }
-        }, [
-          fixedType ? renderEmptyElement($xeTable) : (0, import_vue.h)("div", {
-            ref: refFooterXSpace,
-            class: "vxe-body--x-space"
-          }),
-          (0, import_vue.h)("table", {
-            ref: refFooterTable,
-            class: "vxe-table--footer",
-            xid: xID,
-            cellspacing: 0,
-            cellpadding: 0,
-            border: 0,
-            xvm: isOptimizeMode ? "1" : null
-          }, [
-            /**
-            * 列宽
-            */
-            (0, import_vue.h)("colgroup", {
-              ref: refFooterColgroup
-            }, renderColumnList.map((column, $columnIndex) => {
-              return (0, import_vue.h)("col", {
-                name: column.id,
-                key: $columnIndex,
-                style: {
-                  width: `${column.renderWidth}px`
-                }
-              });
-            })),
-            /**
-            * 底部
-            */
-            (0, import_vue.h)("tfoot", {
-              ref: refFooterTFoot
-            }, renderHeads(isOptimizeMode, renderColumnList))
-          ])
-        ])
-      ]);
+      return (0, import_vue.h)(
+        "div",
+        {
+          ref: refElem,
+          class: ["vxe-table--footer-wrapper", fixedType ? `fixed-${fixedType}--wrapper` : "body--wrapper"],
+          xid: xID
+        },
+        [
+          (0, import_vue.h)(
+            "div",
+            {
+              ref: refFooterScroll,
+              class: "vxe-table--footer-inner-wrapper",
+              onScroll(evnt) {
+                $xeTable.triggerFooterScrollEvent(evnt, fixedType);
+              }
+            },
+            [
+              fixedType ? renderEmptyElement($xeTable) : (0, import_vue.h)("div", {
+                ref: refFooterXSpace,
+                class: "vxe-body--x-space"
+              }),
+              (0, import_vue.h)(
+                "table",
+                {
+                  ref: refFooterTable,
+                  class: "vxe-table--footer",
+                  xid: xID,
+                  cellspacing: 0,
+                  cellpadding: 0,
+                  border: 0,
+                  xvm: isOptimizeMode ? "1" : null
+                },
+                [
+                  /**
+                   * 列宽
+                   */
+                  (0, import_vue.h)(
+                    "colgroup",
+                    {
+                      ref: refFooterColgroup
+                    },
+                    renderColumnList.map((column, $columnIndex) => {
+                      return (0, import_vue.h)("col", {
+                        name: column.id,
+                        key: $columnIndex,
+                        style: {
+                          width: `${column.renderWidth}px`
+                        }
+                      });
+                    })
+                  ),
+                  /**
+                   * 底部
+                   */
+                  (0, import_vue.h)(
+                    "tfoot",
+                    {
+                      ref: refFooterTFoot
+                    },
+                    renderHeads(isOptimizeMode, renderColumnList)
+                  )
+                ]
+              )
+            ]
+          )
+        ]
+      );
     };
     (0, import_vue.onMounted)(() => {
       (0, import_vue.nextTick)(() => {

package/lib/table/src/group.js

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