pro-design-vue 1.4.0 → 1.4.2

package/dist/index.full.js

@@ -1,4 +1,4 @@
-/*! Pro Design Vue v1.4.0 */
+/*! Pro Design Vue v1.4.2 */
 
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('ant-design-vue'), require('vue'), require('ant-design-vue/es/locale/zh_CN.js')) :
@@ -32,7 +32,7 @@
   const DEFAULT_NAMESPACE = "pro";
   const DEFAULT_LOCALE = "zh-CN";
 
-  const version$1 = "1.4.0";
+  const version$1 = "1.4.2";
 
   const makeInstaller = (components = []) => {
     const install = (app) => {
@@ -27064,201 +27064,189 @@
       }
       mergeColumns.value = newColumns;
     });
-    let columnsRafFrame;
-    let isFirstRun = true;
-    const recalcColumns = () => {
-      var _a, _b, _c, _d;
-      const originMergeColumns = mergeColumns.value;
-      let newMaxRowSpan = 1;
-      const newLeftColumns = [];
-      const newRightColumns = [];
-      const newCenterColumns = [];
-      const newAutoHeightColumns = [];
-      const newLeftHeaderColumns = [];
-      const newRightHeaderColumns = [];
-      const newCenterHeaderColumns = [];
-      keyColumnMap.value = /* @__PURE__ */ new Map();
-      if (!measureWidthRef.value) {
-        return;
-      }
-      const autoWidthColumns = [];
-      let finallyWidthTotal = 0;
-      const genColumns = (allCols, leftHeaderCols, centerHeaderCols, rightHeaderCols, rowSpan, pos, fix) => {
-        for (let i = 0, len = allCols.length; i < len; i++) {
-          const originColumn = allCols[i];
-          if (!originColumn) {
-            continue;
-          }
-          const {
-            width,
-            fixed = fix,
-            children,
-            ellipsis = false,
-            tooltip,
-            minWidth,
-            maxWidth
-          } = originColumn;
-          const columnWidth = columnWidthByString(measureWidthRef.value, bodyScrollWidth.value, width);
-          const columnMinWidth = columnWidthByString(
-            measureWidthRef.value,
-            bodyScrollWidth.value,
-            minWidth
-          );
-          const columnMaxWidth = maxWidth ? columnWidthByString(measureWidthRef.value, bodyScrollWidth.value, maxWidth) : 1 / 0;
-          const finallyWidth = Math.min(Math.max(columnWidth, columnMinWidth), columnMaxWidth);
-          const columnPos = getColumnPos(i, pos);
-          const columnKey = originColumn.columnKey || originColumn.key || columnPos;
-          const parseFiexed = fixed === true ? "left" : fixed;
-          const finallyColumn = Object.assign({}, originColumn, {
-            finallyWidth,
-            columnKey,
-            originColumn,
-            showTitle: !tooltip && (ellipsis === true || typeof ellipsis === "object" && (ellipsis == null ? void 0 : ellipsis.showTitle) !== false),
-            fixed: parseFiexed,
-            hidden: true === originColumn.hidden
-          });
-          keyColumnMap.value.set(columnKey, finallyColumn);
-          if (finallyColumn.hidden) {
-            break;
-          }
-          if (children && children.length) {
-            finallyColumn.children = [];
-            if (parseFiexed === "left") {
-              leftHeaderCols.push(finallyColumn);
-            } else if (parseFiexed === "right") {
-              rightHeaderCols.push(finallyColumn);
-            } else {
-              centerHeaderCols.push(finallyColumn);
+    vue.watch(
+      [mergeColumns, baseHeight, bodyScrollWidth, measureWidthRef],
+      () => {
+        var _a, _b, _c, _d;
+        const originMergeColumns = mergeColumns.value;
+        let newMaxRowSpan = 1;
+        const newLeftColumns = [];
+        const newRightColumns = [];
+        const newCenterColumns = [];
+        const newAutoHeightColumns = [];
+        const newLeftHeaderColumns = [];
+        const newRightHeaderColumns = [];
+        const newCenterHeaderColumns = [];
+        keyColumnMap.value = /* @__PURE__ */ new Map();
+        if (!measureWidthRef.value) {
+          return;
+        }
+        const autoWidthColumns = [];
+        let finallyWidthTotal = 0;
+        const genColumns = (allCols, leftHeaderCols, centerHeaderCols, rightHeaderCols, rowSpan, pos, fix) => {
+          for (let i = 0, len = allCols.length; i < len; i++) {
+            const originColumn = allCols[i];
+            if (!originColumn) {
+              continue;
             }
-            newMaxRowSpan = Math.max(newMaxRowSpan, rowSpan + 1);
-            genColumns(
+            const {
+              width,
+              fixed = fix,
               children,
-              finallyColumn.children,
-              finallyColumn.children,
-              finallyColumn.children,
-              rowSpan + 1,
-              columnPos,
-              parseFiexed
+              ellipsis = false,
+              tooltip,
+              minWidth,
+              maxWidth
+            } = originColumn;
+            const columnWidth = columnWidthByString(
+              measureWidthRef.value,
+              bodyScrollWidth.value,
+              width
             );
-          } else {
-            if (finallyColumn.width === void 0) {
-              autoWidthColumns.push(finallyColumn);
+            const columnMinWidth = columnWidthByString(
+              measureWidthRef.value,
+              bodyScrollWidth.value,
+              minWidth
+            );
+            const columnMaxWidth = maxWidth ? columnWidthByString(measureWidthRef.value, bodyScrollWidth.value, maxWidth) : 1 / 0;
+            const finallyWidth = Math.min(Math.max(columnWidth, columnMinWidth), columnMaxWidth);
+            const columnPos = getColumnPos(i, pos);
+            const columnKey = originColumn.columnKey || originColumn.key || columnPos;
+            const parseFiexed = fixed === true ? "left" : fixed;
+            const finallyColumn = Object.assign({}, originColumn, {
+              finallyWidth,
+              columnKey,
+              originColumn,
+              showTitle: !tooltip && (ellipsis === true || typeof ellipsis === "object" && (ellipsis == null ? void 0 : ellipsis.showTitle) !== false),
+              fixed: parseFiexed,
+              hidden: true === originColumn.hidden
+            });
+            keyColumnMap.value.set(columnKey, finallyColumn);
+            if (finallyColumn.hidden) {
+              break;
             }
-            finallyWidthTotal += finallyColumn.finallyWidth;
-            if (parseFiexed === "left") {
-              newLeftColumns.push(finallyColumn);
-              leftHeaderCols.push(finallyColumn);
-            } else if (parseFiexed === "right") {
-              newRightColumns.push(finallyColumn);
-              rightHeaderCols.push(finallyColumn);
+            if (children && children.length) {
+              finallyColumn.children = [];
+              if (parseFiexed === "left") {
+                leftHeaderCols.push(finallyColumn);
+              } else if (parseFiexed === "right") {
+                rightHeaderCols.push(finallyColumn);
+              } else {
+                centerHeaderCols.push(finallyColumn);
+              }
+              newMaxRowSpan = Math.max(newMaxRowSpan, rowSpan + 1);
+              genColumns(
+                children,
+                finallyColumn.children,
+                finallyColumn.children,
+                finallyColumn.children,
+                rowSpan + 1,
+                columnPos,
+                parseFiexed
+              );
             } else {
-              newCenterColumns.push(finallyColumn);
-              if (finallyColumn.autoHeight) {
-                newAutoHeightColumns.push(finallyColumn);
+              if (finallyColumn.width === void 0) {
+                autoWidthColumns.push(finallyColumn);
+              }
+              finallyWidthTotal += finallyColumn.finallyWidth;
+              if (parseFiexed === "left") {
+                newLeftColumns.push(finallyColumn);
+                leftHeaderCols.push(finallyColumn);
+              } else if (parseFiexed === "right") {
+                newRightColumns.push(finallyColumn);
+                rightHeaderCols.push(finallyColumn);
+              } else {
+                newCenterColumns.push(finallyColumn);
+                if (finallyColumn.autoHeight) {
+                  newAutoHeightColumns.push(finallyColumn);
+                }
+                centerHeaderCols.push(finallyColumn);
               }
-              centerHeaderCols.push(finallyColumn);
             }
           }
-        }
-      };
-      genColumns(
-        originMergeColumns,
-        newLeftHeaderColumns,
-        newCenterHeaderColumns,
-        newRightHeaderColumns,
-        1,
-        "__S_TABLE_COLUMN_Key__"
-      );
-      let differenceWidth = bodyScrollWidth.value - finallyWidthTotal;
-      const nonResizableColumns = autoWidthColumns.length ? autoWidthColumns : newLeftColumns.concat(newCenterColumns, newRightColumns).filter((column) => !column.resizable || !column.__Internal__Column__);
-      const widthDiffAverage = Math.floor(differenceWidth / nonResizableColumns.length);
-      if (differenceWidth > 0) {
-        for (let i = 0, len = nonResizableColumns.length; i < len; i++) {
-          const column = nonResizableColumns[i];
-          let finallyWidth = 0;
-          if (i == len - 1 && differenceWidth > widthDiffAverage) {
-            finallyWidth = column.finallyWidth + differenceWidth;
-          } else {
-            finallyWidth = Math.max(
-              Math.min(column.finallyWidth + widthDiffAverage, (_a = column.maxWidth) != null ? _a : 1 / 0),
-              (_b = column.minWidth) != null ? _b : 50
-            );
+        };
+        genColumns(
+          originMergeColumns,
+          newLeftHeaderColumns,
+          newCenterHeaderColumns,
+          newRightHeaderColumns,
+          1,
+          "__S_TABLE_COLUMN_Key__"
+        );
+        let differenceWidth = bodyScrollWidth.value - finallyWidthTotal;
+        const nonResizableColumns = autoWidthColumns.length ? autoWidthColumns : newLeftColumns.concat(newCenterColumns, newRightColumns).filter((column) => !column.resizable || !column.__Internal__Column__);
+        const widthDiffAverage = Math.floor(differenceWidth / nonResizableColumns.length);
+        if (differenceWidth > 0) {
+          for (let i = 0, len = nonResizableColumns.length; i < len; i++) {
+            const column = nonResizableColumns[i];
+            let finallyWidth = 0;
+            if (i == len - 1 && differenceWidth > widthDiffAverage) {
+              finallyWidth = column.finallyWidth + differenceWidth;
+            } else {
+              finallyWidth = Math.max(
+                Math.min(column.finallyWidth + widthDiffAverage, (_a = column.maxWidth) != null ? _a : 1 / 0),
+                (_b = column.minWidth) != null ? _b : 50
+              );
+            }
+            differenceWidth -= finallyWidth - column.finallyWidth;
+            column.finallyWidth = finallyWidth;
           }
-          differenceWidth -= finallyWidth - column.finallyWidth;
-          column.finallyWidth = finallyWidth;
-        }
-      } else {
-        for (let i = 0, len = autoWidthColumns.length; i < len; i++) {
-          const column = autoWidthColumns[i];
-          column.finallyWidth = Math.min((_c = column.minWidth) != null ? _c : 50, (_d = column.maxWidth) != null ? _d : 1 / 0);
-        }
-      }
-      if (props.headerHeight !== void 0) {
-        if (Array.isArray(props.headerHeight)) {
-          headerHeight.value = props.headerHeight.concat(new Array(newMaxRowSpan).fill(baseHeight.value)).slice(0, newMaxRowSpan);
         } else {
-          headerHeight.value = new Array(newMaxRowSpan).fill(props.headerHeight);
+          for (let i = 0, len = autoWidthColumns.length; i < len; i++) {
+            const column = autoWidthColumns[i];
+            column.finallyWidth = Math.min((_c = column.minWidth) != null ? _c : 50, (_d = column.maxWidth) != null ? _d : 1 / 0);
+          }
         }
-      } else {
-        headerHeight.value = new Array(newMaxRowSpan).fill(baseHeight.value);
-      }
-      const genHeaderColumns = (headerColumns, left, top, rowSpan) => {
-        let totalFinallyWidth = 0;
-        let totalLeft = left;
-        headerColumns.forEach((column) => {
-          column.left = totalLeft;
-          column.top = top;
-          if (column.children) {
-            column.rowSpan = 1;
-            column.height = headerHeight.value[newMaxRowSpan - rowSpan];
-            column.finallyWidth = genHeaderColumns(
-              column.children,
-              totalLeft,
-              column.height,
-              rowSpan - 1
-            );
+        if (props.headerHeight !== void 0) {
+          if (Array.isArray(props.headerHeight)) {
+            headerHeight.value = props.headerHeight.concat(new Array(newMaxRowSpan).fill(baseHeight.value)).slice(0, newMaxRowSpan);
           } else {
-            column.rowSpan = rowSpan;
-            column.height = headerHeight.value.slice(newMaxRowSpan - rowSpan).reduce((pre, cur) => pre + cur, 0);
+            headerHeight.value = new Array(newMaxRowSpan).fill(props.headerHeight);
           }
-          totalLeft += column.finallyWidth;
-          totalFinallyWidth += column.finallyWidth;
-        });
-        return totalFinallyWidth;
-      };
-      genHeaderColumns(
-        newLeftHeaderColumns.concat(newCenterHeaderColumns, newRightHeaderColumns),
-        0,
-        0,
-        newMaxRowSpan
-      );
-      leftColumns.value = newLeftColumns;
-      rightColumns.value = newRightColumns;
-      centerColumns.value = newCenterColumns;
-      autoHeightColumns.value = newAutoHeightColumns;
-      leftHeaderColumns.value = newLeftHeaderColumns;
-      rightHeaderColumns.value = newRightHeaderColumns;
-      centerHeaderColumns.value = newCenterHeaderColumns;
-      maxRowSpan.value = newMaxRowSpan;
-    };
-    vue.watch(
-      [mergeColumns, baseHeight, bodyScrollWidth, measureWidthRef],
-      () => {
-        if (isFirstRun) {
-          isFirstRun = false;
-          recalcColumns();
-          return;
-        }
-        raf.cancel(columnsRafFrame);
-        columnsRafFrame = raf(() => {
-          recalcColumns();
-        });
+        } else {
+          headerHeight.value = new Array(newMaxRowSpan).fill(baseHeight.value);
+        }
+        const genHeaderColumns = (headerColumns, left, top, rowSpan) => {
+          let totalFinallyWidth = 0;
+          let totalLeft = left;
+          headerColumns.forEach((column) => {
+            column.left = totalLeft;
+            column.top = top;
+            if (column.children) {
+              column.rowSpan = 1;
+              column.height = headerHeight.value[newMaxRowSpan - rowSpan];
+              column.finallyWidth = genHeaderColumns(
+                column.children,
+                totalLeft,
+                column.height,
+                rowSpan - 1
+              );
+            } else {
+              column.rowSpan = rowSpan;
+              column.height = headerHeight.value.slice(newMaxRowSpan - rowSpan).reduce((pre, cur) => pre + cur, 0);
+            }
+            totalLeft += column.finallyWidth;
+            totalFinallyWidth += column.finallyWidth;
+          });
+          return totalFinallyWidth;
+        };
+        genHeaderColumns(
+          newLeftHeaderColumns.concat(newCenterHeaderColumns, newRightHeaderColumns),
+          0,
+          0,
+          newMaxRowSpan
+        );
+        leftColumns.value = newLeftColumns;
+        rightColumns.value = newRightColumns;
+        centerColumns.value = newCenterColumns;
+        autoHeightColumns.value = newAutoHeightColumns;
+        leftHeaderColumns.value = newLeftHeaderColumns;
+        rightHeaderColumns.value = newRightHeaderColumns;
+        centerHeaderColumns.value = newCenterHeaderColumns;
+        maxRowSpan.value = newMaxRowSpan;
       },
       { immediate: true }
     );
-    vue.onBeforeUnmount(() => {
-      raf.cancel(columnsRafFrame);
-    });
     const allColumns = vue.shallowRef([]);
     let cacheColumnKeyPositonMap = {};
     const columnKeyIndexMap = vue.shallowRef({});
@@ -32491,8 +32479,8 @@
     rowIndex: { type: Number, required: true },
     flattenRowIndex: { type: Number, required: true },
     rowKey: { type: [Number, String] },
-    column: { type: Object },
-    item: { type: Object },
+    column: { type: Object, default: () => ({}) },
+    item: { type: Object, default: () => ({}) },
     wrapText: { type: Boolean, default: false },
     type: { type: String },
     height: Number,
@@ -32518,39 +32506,6 @@
     error: "#e8353e",
     warning: "#eb8903"
   };
-  let cachedPrefixCls = "";
-  let cls = {
-    cellInner: "",
-    cellContent: "",
-    cellWrapText: "",
-    cellTextEllipsis: "",
-    cell: "",
-    firstCell: "",
-    bodyCell: "",
-    cellMulti: "",
-    cellHidden: "",
-    columnSort: "",
-    withAppend: ""
-  };
-  function getCls(prefixCls) {
-    if (prefixCls !== cachedPrefixCls) {
-      cachedPrefixCls = prefixCls;
-      cls = {
-        cellInner: `${prefixCls}-cell-inner`,
-        cellContent: `${prefixCls}-cell-content`,
-        cellWrapText: `${prefixCls}-cell-wrap-text`,
-        cellTextEllipsis: `${prefixCls}-cell-text-ellipsis`,
-        cell: `${prefixCls}-cell`,
-        firstCell: `${prefixCls}-first-cell`,
-        bodyCell: `${prefixCls}-body-cell`,
-        cellMulti: `${prefixCls}-cell-multi`,
-        cellHidden: `${prefixCls}-cell-hidden`,
-        columnSort: `${prefixCls}-column-sort`,
-        withAppend: `${prefixCls}-with-append`
-      };
-    }
-    return cls;
-  }
   const BodyCell$1 = (props, { slots, emit }) => {
     var _a, _b, _c, _d, _e, _f, _g, _h;
     const { table } = useProConfigInject();
@@ -32571,13 +32526,11 @@
     let tooltipTitle = value;
     const valueStatus = runFunction(column == null ? void 0 : column.valueStatus, value, props.item, valueEnum == null ? void 0 : valueEnum[value]);
     const recordIndexs = tableContext.getIndexsByKey(rowKey);
-    const c = getCls(prefixCls);
-    const cellInnerClass = c.cellInner;
-    const isWrapText = column.wrapText === void 0 ? wrapText : column.wrapText;
+    const cellInnerClass = { [`${prefixCls}-cell-inner`]: true };
     const cellContentClass = {
-      [c.cellContent]: true,
-      [c.cellWrapText]: isWrapText,
-      [c.cellTextEllipsis]: !!column.ellipsis
+      [`${prefixCls}-cell-content`]: true,
+      [`${prefixCls}-cell-wrap-text`]: column.wrapText === void 0 ? wrapText : column.wrapText,
+      [`${prefixCls}-cell-text-ellipsis`]: !!column.ellipsis
     };
     const cellContentStyle = {
       textAlign: `${column.align}`,
@@ -32594,13 +32547,13 @@
     const cellProps2 = cellRender.props || {};
     const cellRowSpan = cellProps2.rowSpan;
     const cellClass = {
-      [c.cell]: true,
-      [c.firstCell]: column.columnIndex === 0,
-      [c.bodyCell]: true,
-      [c.cellMulti]: cellRowSpan > 1,
-      [c.cellHidden]: cellRowSpan === 0,
-      [c.columnSort]: sorterInfo.sorterOrder,
-      [c.withAppend]: hasAppendNode
+      [`${prefixCls}-cell`]: true,
+      [`${prefixCls}-first-cell`]: column.columnIndex === 0,
+      [`${prefixCls}-body-cell`]: true,
+      [`${prefixCls}-cell-multi`]: cellRowSpan > 1,
+      [`${prefixCls}-cell-hidden`]: cellRowSpan === 0,
+      [`${prefixCls}-column-sort`]: sorterInfo.sorterOrder,
+      [`${prefixCls}-with-append`]: hasAppendNode
     };
     const cellRenderArgs = {
       record: item,
@@ -32608,7 +32561,7 @@
       text: value,
       value,
       index: rowIndex,
-      recordIndexs,
+      recordIndexs: tableContext.getIndexsByKey(rowKey),
       key,
       valueStatus,
       cancelEditable: tableContext.cancelEditable,
@@ -32672,12 +32625,14 @@
       [
         vue.createVNode(
           "div",
-          {
-            class: cellContentClass,
-            style: cellContentStyle,
-            title: altTitle,
-            ...cellKeyProps
-          },
+          vue.mergeProps(
+            {
+              class: cellContentClass,
+              style: cellContentStyle,
+              title: altTitle
+            },
+            cellKeyProps
+          ),
           [hasAppendNode ? (_h = slots.appendNode) == null ? void 0 : _h.call(slots) : null, bodyCell]
         )
       ]
@@ -33224,8 +33179,8 @@
       rowIndex: { type: Number, required: true },
       flattenRowIndex: { type: Number, required: true },
       rowKey: { type: [Number, String] },
-      column: { type: Object, required: true },
-      item: { type: Object, required: true },
+      column: { type: Object, default: () => ({}) },
+      item: { type: Object, default: () => ({}) },
       wrapText: { type: Boolean, default: false },
       type: { type: String },
       height: Number,
@@ -33351,33 +33306,18 @@
       "edit-row": _ctx.editRow,
       "editable-keys": _ctx.editableKeys,
       "is-row-edit": _ctx.isRowEdit
-    }, null, 8, ["prefixCls", "rowIndex", "flattenRowIndex", "rowKey", "column", "item", "edit-row", "editable-keys", "is-row-edit"])) : (vue.openBlock(), vue.createBlock(_component_BodyTextCell, {
-      key: 1,
-      prefixCls: _ctx.prefixCls,
-      rowIndex: _ctx.rowIndex,
-      flattenRowIndex: _ctx.flattenRowIndex,
-      rowKey: _ctx.rowKey,
-      column: _ctx.column,
-      item: _ctx.item,
-      wrapText: _ctx.wrapText,
-      type: _ctx.type,
-      height: _ctx.height,
-      hasAppendNode: _ctx.hasAppendNode,
-      resizeObserver: _ctx.resizeObserver,
-      calMaxHeight: _ctx.calMaxHeight,
-      tooltipOpen: _ctx.tooltipOpen,
-      getPopupContainer: _ctx.getPopupContainer,
-      style: vue.normalizeStyle({ cursor: _ctx.editable ? "poiner" : "" }),
+    }, null, 8, ["prefixCls", "rowIndex", "flattenRowIndex", "rowKey", "column", "item", "edit-row", "editable-keys", "is-row-edit"])) : (vue.openBlock(), vue.createBlock(_component_BodyTextCell, vue.mergeProps({ key: 1 }, _ctx.props, {
+      style: { cursor: _ctx.editable ? "poiner" : "" },
       onClick: _cache[0] || (_cache[0] = ($event) => _ctx.onCellEvent($event, "click")),
       onDblClick: _cache[1] || (_cache[1] = ($event) => _ctx.onCellEvent($event, "dblClick")),
       onContextmenu: _cache[2] || (_cache[2] = ($event) => _ctx.onCellEvent($event, "contextmenu"))
-    }, {
+    }), {
       appendNode: vue.withCtx(() => [
         vue.renderSlot(_ctx.$slots, "appendNode")
       ]),
       _: 3
       /* FORWARDED */
-    }, 8, ["prefixCls", "rowIndex", "flattenRowIndex", "rowKey", "column", "item", "wrapText", "type", "height", "hasAppendNode", "resizeObserver", "calMaxHeight", "tooltipOpen", "getPopupContainer", "style"]));
+    }, 16, ["style"]));
   }
   var BodyCell = /* @__PURE__ */ _export_sfc(_sfc_main$n, [["render", _sfc_render$j]]);
 
@@ -34846,25 +34786,11 @@
         return summaryStyle.value;
       });
       const emptyStyle = vue.computed(() => ({ width: `${props.bodyWidth}px` }));
-      let resizeRafFrame;
-      let pendingWidth = 0;
-      let pendingHeight = 0;
       useResizeObserver(measureDomRef, (entries) => {
         var _a;
         const contentRect = (_a = entries[0]) == null ? void 0 : _a.contentRect;
-        const w = Math.floor((contentRect == null ? void 0 : contentRect.width) || 0);
-        const h = Math.floor((contentRect == null ? void 0 : contentRect.height) || 0);
-        if (w === pendingWidth && h === pendingHeight) return;
-        pendingWidth = w;
-        pendingHeight = h;
-        raf.cancel(resizeRafFrame);
-        resizeRafFrame = raf(() => {
-          emit("update:bodyWidth", pendingWidth);
-          emit("update:bodyHeight", pendingHeight);
-        });
-      });
-      vue.onBeforeUnmount(() => {
-        raf.cancel(resizeRafFrame);
+        emit("update:bodyWidth", (contentRect == null ? void 0 : contentRect.width) || 0);
+        emit("update:bodyHeight", (contentRect == null ? void 0 : contentRect.height) || 0);
       });
       return {
         bodyContainerStyle,
@@ -37877,7 +37803,7 @@
         [`${props.prefixCls}-card-bordered`]: isCard.value && isBordered("search", props.cardBordered)
       }));
       return () => {
-        var _a, _b;
+        var _a;
         return vue.createVNode("div", {
           "class": className.value,
           "style": {
@@ -37889,27 +37815,27 @@
           "items": props.items,
           "loading": props.loading,
           "style": {
-            marginBlockEnd: ((_a = props.search) == null ? void 0 : _a.cardProps) !== false && props.tableShowCard ? 0 : "16px",
-            ...(_b = props.search) == null ? void 0 : _b.style
+            marginBlockEnd: isCard.value ? 0 : "16px",
+            ...(_a = props.search) == null ? void 0 : _a.style
           },
           "onReset": props.onReset,
           "onFinish": (values) => {
-            var _a2, _b2;
+            var _a2, _b;
             submit(values, false);
-            (_b2 = (_a2 = props.search) == null ? void 0 : _a2.onFinish) == null ? void 0 : _b2.call(_a2, values);
+            (_b = (_a2 = props.search) == null ? void 0 : _a2.onFinish) == null ? void 0 : _b.call(_a2, values);
           },
           "onValuesChange": (values) => {
-            var _a2, _b2, _c;
+            var _a2, _b, _c;
             if (((_a2 = props.search) == null ? void 0 : _a2.submitter) === false) {
               submit(values, true);
             }
-            (_c = (_b2 = props.search) == null ? void 0 : _b2.onValuesChange) == null ? void 0 : _c.call(_b2, values);
+            (_c = (_b = props.search) == null ? void 0 : _b.onValuesChange) == null ? void 0 : _c.call(_b, values);
           },
           "onInit": (values, action) => {
-            var _a2, _b2, _c;
+            var _a2, _b, _c;
             submit(values, true);
             (_a2 = props.setFormAction) == null ? void 0 : _a2.call(props, action);
-            (_c = (_b2 = props.search) == null ? void 0 : _b2.onInit) == null ? void 0 : _c.call(_b2, values, action);
+            (_c = (_b = props.search) == null ? void 0 : _b.onInit) == null ? void 0 : _c.call(_b, values, action);
           },
           "onCollapse": props.onCollapse
         }), slots)]);
@@ -38198,11 +38124,11 @@
         return false;
       });
       const showTableCard = vue.computed(() => {
-        var _a2, _b2;
+        var _a2, _b2, _c;
         if (counter.hasFullScreen.value) {
           return false;
         }
-        return !!((_b2 = props.cardProps) != null ? _b2 : (_a2 = table == null ? void 0 : table.value) == null ? void 0 : _a2.cardProps) && !notNeedCardDom.value;
+        return !!((_c = (_b2 = props.cardProps) != null ? _b2 : (_a2 = table == null ? void 0 : table.value) == null ? void 0 : _a2.cardProps) != null ? _c : true) && !notNeedCardDom.value;
       });
       const cardBodyStyle = vue.computed(() => {
         if (!showTableCard.value) return {};