ll-plus 2.3.17 → 2.3.18

package/es/components/table/src/table.vue2.mjs

@@ -4,7 +4,7 @@ import '../../../utils/index.mjs';
 import HeaderSearch from './components/header-search.vue.mjs';
 import MainTable from './components/main-table.vue.mjs';
 import Pagination from './components/pagination.vue.mjs';
-import { tableProps } from './config/table.mjs';
+import { tableProps, HEADER_SRARCH_HEIGHT, PAGINATION_HEIGHT } from './config/table.mjs';
 import { ImenuSwitchType } from './config/header-search.mjs';
 import { createNamespace } from '../../../utils/create-namespace.mjs';
 
@@ -21,6 +21,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       columns: []
     });
     const contentType = ref(ImenuSwitchType.TABLE);
+    const headerSearchHeight = ref(HEADER_SRARCH_HEIGHT);
+    const tableRef = ref();
     const bem = createNamespace("table");
     const handleChangeDataSource = (dataSource) => {
       newNaTableptions.value.dataSource = dataSource;
@@ -28,6 +30,11 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     const handleSwitchMenuChange = (v) => {
       contentType.value = v;
     };
+    const handleChangeHeaderSearch = (height) => {
+      if (headerSearchHeight.value === height)
+        return;
+      headerSearchHeight.value = height;
+    };
     watch(
       () => props.tableProps,
       (newValue) => {
@@ -42,6 +49,19 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         immediate: true
       }
     );
+    watch(
+      () => [tableRef, headerSearchHeight],
+      () => {
+        if (tableRef.value) {
+          const diffHeight = headerSearchHeight.value + 20 + PAGINATION_HEIGHT + 10;
+          tableRef.value.style.height = `calc(100% - ${diffHeight}px)`;
+        }
+      },
+      {
+        immediate: true,
+        deep: true
+      }
+    );
     provide("contentType", contentType);
     return (_ctx, _cache) => {
       const _component_a_spin = resolveComponent("a-spin");
@@ -57,35 +77,35 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
             },
             [
               createCommentVNode(" \u5934\u90E8seach "),
-              createVNode(
-                HeaderSearch,
-                mergeProps(_ctx.headerSearchProps, { onChange: handleSwitchMenuChange }),
-                {
-                  header: withCtx(() => [
-                    renderSlot(_ctx.$slots, "header")
-                  ]),
-                  headerLeft: withCtx(() => [
-                    renderSlot(_ctx.$slots, "headerLeft")
-                  ]),
-                  headerMiddle: withCtx(() => [
-                    renderSlot(_ctx.$slots, "headerMiddle")
-                  ]),
-                  headerRight: withCtx(() => [
-                    renderSlot(_ctx.$slots, "headerRight")
-                  ]),
-                  default: withCtx(() => [
-                    renderSlot(_ctx.$slots, "header")
-                  ]),
-                  _: 3
-                  /* FORWARDED */
-                },
-                16
-                /* FULL_PROPS */
-              ),
+              createVNode(HeaderSearch, mergeProps(_ctx.headerSearchProps, {
+                "header-search-height": headerSearchHeight.value,
+                onChange: handleSwitchMenuChange,
+                onChangeHeaderSearch: handleChangeHeaderSearch
+              }), {
+                header: withCtx(() => [
+                  renderSlot(_ctx.$slots, "header")
+                ]),
+                headerLeft: withCtx(() => [
+                  renderSlot(_ctx.$slots, "headerLeft")
+                ]),
+                headerMiddle: withCtx(() => [
+                  renderSlot(_ctx.$slots, "headerMiddle")
+                ]),
+                headerRight: withCtx(() => [
+                  renderSlot(_ctx.$slots, "headerRight")
+                ]),
+                default: withCtx(() => [
+                  renderSlot(_ctx.$slots, "header")
+                ]),
+                _: 3
+                /* FORWARDED */
+              }, 16, ["header-search-height"]),
               createCommentVNode(" slot-content table\u548Ccard\u9ED8\u8BA4table "),
               createElementVNode(
                 "div",
                 {
+                  ref_key: "tableRef",
+                  ref: tableRef,
                   class: normalizeClass([
                     unref(bem).m("fixed-height"),
                     !newNaTableptions.value.dataSource.length ? unref(bem).m("empty") : ""

package/es/components/table/src/table.vue2.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"table.vue2.mjs","sources":["../../../../../packages/components/table/src/table.vue"],"sourcesContent":["<template>\n  <a-spin :spinning=\"props.loading\" wrapper-class-name=\"ll-table-spin-wrapper\">\n    <div :class=\"bem.b()\">\n      <!-- 头部seach -->\n      <header-search\n        v-bind=\"headerSearchProps\"\n        @change=\"handleSwitchMenuChange\"\n      >\n        <!-- header-slot -->\n        <template #header>\n          <slot name=\"header\" />\n        </template>\n        <slot name=\"header\"></slot>\n        <!-- left-slot -->\n        <template #headerLeft>\n          <slot name=\"headerLeft\"></slot>\n        </template>\n        <!-- middle-slot -->\n        <template #headerMiddle>\n          <slot name=\"headerMiddle\"></slot>\n        </template>\n        <!-- right-slot -->\n        <template #headerRight>\n          <slot name=\"headerRight\"></slot>\n        </template>\n      </header-search>\n      <!-- slot-content table和card默认table -->\n      <div\n        :class=\"[\n          bem.m('fixed-height'),\n          !newNaTableptions.dataSource!.length ? bem.m('empty') : ''\n        ]\"\n      >\n        <slot :name=\"contentType\">\n          <main-table\n            v-bind=\"newNaTableptions\"\n            @handle-change-data-source=\"handleChangeDataSource\"\n          >\n            <!-- tableHeaderCell-slot -->\n            <template #tableHeaderCell=\"slots\">\n              <slot name=\"tableHeaderCell\" v-bind=\"slots\"></slot>\n            </template>\n            <!-- tableBodyCell-slot -->\n            <template #tableBodyCell=\"slots\">\n              <slot name=\"tableBodyCell\" v-bind=\"slots\"></slot>\n            </template>\n            <!--tableOperate-slot -->\n            <template #tableOperate=\"slots\">\n              <slot name=\"tableOperate\" v-bind=\"slots\"></slot>\n            </template>\n            <!-- tableRowExpand-slot -->\n            <template v-if=\"$slots.expandedRow\" #expandedRow=\"slots\">\n              <slot name=\"expandedRow\" v-bind=\"slots\"></slot>\n            </template>\n            <!-- expandColumnTitle-slot -->\n            <template #expandedTitle>\n              <slot name=\"expandedTitle\"> </slot>\n            </template>\n            <!-- empty-slot -->\n            <template #emptyText>\n              <slot name=\"emptyText\"></slot>\n            </template>\n            <!-- customFilterDropdown-slot -->\n            <template\n              v-if=\"$slots.customFilterDropdown\"\n              #customFilterDropdown=\"slots\"\n            >\n              <slot name=\"customFilterDropdown\" v-bind=\"slots\"></slot>\n            </template>\n            <!-- customFilterIcon-slot -->\n            <template v-if=\"$slots.customFilterIcon\" #customFilterIcon=\"slots\">\n              <slot name=\"customFilterIcon\" v-bind=\"slots\"></slot>\n            </template>\n            <!-- summary-slot -->\n            <template v-if=\"$slots.summary\" #summary=\"slots\">\n              <slot name=\"summary\" v-bind=\"slots\"></slot>\n            </template>\n          </main-table>\n        </slot>\n      </div>\n      <!-- 底部分页 -->\n      <template\n        v-if=\"\n          newNaTableptions.dataSource!.length &&\n          !newNaTableptions.hiddenPagination\n        \"\n      >\n        <pagination v-bind=\"paginationProps\" />\n      </template>\n    </div>\n  </a-spin>\n</template>\n<script lang=\"ts\" setup>\nimport { ref, watch, provide } from 'vue'\n\nimport { ImenuSwitchType } from './config'\nimport { createNamespace } from '@ll-plus/utils'\n\nimport HeaderSearch from './components/header-search.vue'\nimport MainTable from './components/main-table.vue'\nimport Pagination from './components/pagination.vue'\n\nimport { tableProps } from './config'\n\n// 1.defineOptions\ndefineOptions({ name: 'LlTable' })\n\n// 2.props\nconst props = defineProps(tableProps)\n// 3.ref\n// 表格数据\nconst originDataSource = ref()\nconst newNaTableptions = ref<any>({\n  dataSource: [],\n  columns: []\n})\n// 菜单切换/内容插槽\nconst contentType = ref(ImenuSwitchType.TABLE) // 菜单切换\nconst bem = createNamespace('table')\n\n// 4.methods\n// 拖拽完成后获取拖拽后的数据\nconst handleChangeDataSource = (dataSource: any[]) => {\n  newNaTableptions.value.dataSource = dataSource\n}\n// 切换菜单内容\nconst handleSwitchMenuChange = (v: ImenuSwitchType) => {\n  contentType.value = v\n}\n\n// 5.watch\nwatch(\n  () => props.tableProps,\n  (newValue: any) => {\n    if (newValue) {\n      newNaTableptions.value = { ...newValue }\n      originDataSource.value = [...newValue.dataSource]\n      contentType.value = newNaTableptions.value.contentType\n    }\n  },\n  {\n    deep: true,\n    immediate: true\n  }\n)\n// 6.其他\nprovide('contentType', contentType)\n</script>\n"],"names":[],"mappings":";;;;;;;;;;;;;;;;AA4GA,IAAA,MAAM,KAAQ,GAAA,OAAA,CAAA;AAGd,IAAA,MAAM,mBAAmB,GAAI,EAAA,CAAA;AAC7B,IAAA,MAAM,mBAAmB,GAAS,CAAA;AAAA,MAChC,YAAY,EAAC;AAAA,MACb,SAAS,EAAC;AAAA,KACX,CAAA,CAAA;AAED,IAAM,MAAA,WAAA,GAAc,GAAI,CAAA,eAAA,CAAgB,KAAK,CAAA,CAAA;AAC7C,IAAM,MAAA,GAAA,GAAM,gBAAgB,OAAO,CAAA,CAAA;AAInC,IAAM,MAAA,sBAAA,GAAyB,CAAC,UAAsB,KAAA;AACpD,MAAA,gBAAA,CAAiB,MAAM,UAAa,GAAA,UAAA,CAAA;AAAA,KACtC,CAAA;AAEA,IAAM,MAAA,sBAAA,GAAyB,CAAC,CAAuB,KAAA;AACrD,MAAA,WAAA,CAAY,KAAQ,GAAA,CAAA,CAAA;AAAA,KACtB,CAAA;AAGA,IAAA,KAAA;AAAA,MACE,MAAM,KAAM,CAAA,UAAA;AAAA,MACZ,CAAC,QAAkB,KAAA;AACjB,QAAA,IAAI,QAAU,EAAA;AACZ,UAAiB,gBAAA,CAAA,KAAA,GAAQ,EAAE,GAAG,QAAS,EAAA,CAAA;AACvC,UAAA,gBAAA,CAAiB,KAAQ,GAAA,CAAC,GAAG,QAAA,CAAS,UAAU,CAAA,CAAA;AAChD,UAAY,WAAA,CAAA,KAAA,GAAQ,iBAAiB,KAAM,CAAA,WAAA,CAAA;AAAA,SAC7C;AAAA,OACF;AAAA,MACA;AAAA,QACE,IAAM,EAAA,IAAA;AAAA,QACN,SAAW,EAAA,IAAA;AAAA,OACb;AAAA,KACF,CAAA;AAEA,IAAA,OAAA,CAAQ,eAAe,WAAW,CAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"table.vue2.mjs","sources":["../../../../../packages/components/table/src/table.vue"],"sourcesContent":["<template>\n  <a-spin :spinning=\"props.loading\" wrapper-class-name=\"ll-table-spin-wrapper\">\n    <div :class=\"bem.b()\">\n      <!-- 头部seach -->\n      <header-search\n        v-bind=\"headerSearchProps\"\n        :header-search-height=\"headerSearchHeight\"\n        @change=\"handleSwitchMenuChange\"\n        @change-header-search=\"handleChangeHeaderSearch\"\n      >\n        <!-- header-slot -->\n        <template #header>\n          <slot name=\"header\" />\n        </template>\n        <slot name=\"header\"></slot>\n        <!-- left-slot -->\n        <template #headerLeft>\n          <slot name=\"headerLeft\"></slot>\n        </template>\n        <!-- middle-slot -->\n        <template #headerMiddle>\n          <slot name=\"headerMiddle\"></slot>\n        </template>\n        <!-- right-slot -->\n        <template #headerRight>\n          <slot name=\"headerRight\"></slot>\n        </template>\n      </header-search>\n      <!-- slot-content table和card默认table -->\n      <div\n        ref=\"tableRef\"\n        :class=\"[\n          bem.m('fixed-height'),\n          !newNaTableptions.dataSource!.length ? bem.m('empty') : ''\n        ]\"\n      >\n        <slot :name=\"contentType\">\n          <main-table\n            v-bind=\"newNaTableptions\"\n            @handle-change-data-source=\"handleChangeDataSource\"\n          >\n            <!-- tableHeaderCell-slot -->\n            <template #tableHeaderCell=\"slots\">\n              <slot name=\"tableHeaderCell\" v-bind=\"slots\"></slot>\n            </template>\n            <!-- tableBodyCell-slot -->\n            <template #tableBodyCell=\"slots\">\n              <slot name=\"tableBodyCell\" v-bind=\"slots\"></slot>\n            </template>\n            <!--tableOperate-slot -->\n            <template #tableOperate=\"slots\">\n              <slot name=\"tableOperate\" v-bind=\"slots\"></slot>\n            </template>\n            <!-- tableRowExpand-slot -->\n            <template v-if=\"$slots.expandedRow\" #expandedRow=\"slots\">\n              <slot name=\"expandedRow\" v-bind=\"slots\"></slot>\n            </template>\n            <!-- expandColumnTitle-slot -->\n            <template #expandedTitle>\n              <slot name=\"expandedTitle\"> </slot>\n            </template>\n            <!-- empty-slot -->\n            <template #emptyText>\n              <slot name=\"emptyText\"></slot>\n            </template>\n            <!-- customFilterDropdown-slot -->\n            <template\n              v-if=\"$slots.customFilterDropdown\"\n              #customFilterDropdown=\"slots\"\n            >\n              <slot name=\"customFilterDropdown\" v-bind=\"slots\"></slot>\n            </template>\n            <!-- customFilterIcon-slot -->\n            <template v-if=\"$slots.customFilterIcon\" #customFilterIcon=\"slots\">\n              <slot name=\"customFilterIcon\" v-bind=\"slots\"></slot>\n            </template>\n            <!-- summary-slot -->\n            <template v-if=\"$slots.summary\" #summary=\"slots\">\n              <slot name=\"summary\" v-bind=\"slots\"></slot>\n            </template>\n          </main-table>\n        </slot>\n      </div>\n      <!-- 底部分页 -->\n      <template\n        v-if=\"\n          newNaTableptions.dataSource!.length &&\n          !newNaTableptions.hiddenPagination\n        \"\n      >\n        <pagination v-bind=\"paginationProps\" />\n      </template>\n    </div>\n  </a-spin>\n</template>\n<script lang=\"ts\" setup>\nimport { ref, watch, provide } from 'vue'\n\nimport { ImenuSwitchType } from './config'\nimport { createNamespace } from '@ll-plus/utils'\nimport { HEADER_SRARCH_HEIGHT, PAGINATION_HEIGHT } from './config'\n\nimport HeaderSearch from './components/header-search.vue'\nimport MainTable from './components/main-table.vue'\nimport Pagination from './components/pagination.vue'\n\nimport { tableProps } from './config'\n\n// 1.defineOptions\ndefineOptions({ name: 'LlTable' })\n\n// 2.props\nconst props = defineProps(tableProps)\n// 3.ref\n// 表格数据\nconst originDataSource = ref()\nconst newNaTableptions = ref<any>({\n  dataSource: [],\n  columns: []\n})\n// 菜单切换/内容插槽\nconst contentType = ref(ImenuSwitchType.TABLE) // 菜单切换\nconst headerSearchHeight = ref(HEADER_SRARCH_HEIGHT) // 头部内容默认高度\nconst tableRef = ref()\nconst bem = createNamespace('table')\n\n// 4.methods\n// 拖拽完成后获取拖拽后的数据\nconst handleChangeDataSource = (dataSource: any[]) => {\n  newNaTableptions.value.dataSource = dataSource\n}\n// 切换菜单内容\nconst handleSwitchMenuChange = (v: ImenuSwitchType) => {\n  contentType.value = v\n}\n// 改变头部高度\nconst handleChangeHeaderSearch = (height: number) => {\n  if (headerSearchHeight.value === height) return\n  headerSearchHeight.value = height\n}\n\n// 5.watch\nwatch(\n  () => props.tableProps,\n  (newValue: any) => {\n    if (newValue) {\n      newNaTableptions.value = { ...newValue }\n      originDataSource.value = [...newValue.dataSource]\n      contentType.value = newNaTableptions.value.contentType\n    }\n  },\n  {\n    deep: true,\n    immediate: true\n  }\n)\n// 根据头部和分页高度动态设置表格的高度\nwatch(\n  () => [tableRef, headerSearchHeight],\n  () => {\n    if (tableRef.value) {\n      const diffHeight = headerSearchHeight.value + 20 + PAGINATION_HEIGHT + 10\n      tableRef.value.style.height = `calc(100% - ${diffHeight}px)`\n    }\n  },\n  {\n    immediate: true,\n    deep: true\n  }\n)\n\n// 6.其他\nprovide('contentType', contentType)\n</script>\n"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAgHA,IAAA,MAAM,KAAQ,GAAA,OAAA,CAAA;AAGd,IAAA,MAAM,mBAAmB,GAAI,EAAA,CAAA;AAC7B,IAAA,MAAM,mBAAmB,GAAS,CAAA;AAAA,MAChC,YAAY,EAAC;AAAA,MACb,SAAS,EAAC;AAAA,KACX,CAAA,CAAA;AAED,IAAM,MAAA,WAAA,GAAc,GAAI,CAAA,eAAA,CAAgB,KAAK,CAAA,CAAA;AAC7C,IAAM,MAAA,kBAAA,GAAqB,IAAI,oBAAoB,CAAA,CAAA;AACnD,IAAA,MAAM,WAAW,GAAI,EAAA,CAAA;AACrB,IAAM,MAAA,GAAA,GAAM,gBAAgB,OAAO,CAAA,CAAA;AAInC,IAAM,MAAA,sBAAA,GAAyB,CAAC,UAAsB,KAAA;AACpD,MAAA,gBAAA,CAAiB,MAAM,UAAa,GAAA,UAAA,CAAA;AAAA,KACtC,CAAA;AAEA,IAAM,MAAA,sBAAA,GAAyB,CAAC,CAAuB,KAAA;AACrD,MAAA,WAAA,CAAY,KAAQ,GAAA,CAAA,CAAA;AAAA,KACtB,CAAA;AAEA,IAAM,MAAA,wBAAA,GAA2B,CAAC,MAAmB,KAAA;AACnD,MAAA,IAAI,mBAAmB,KAAU,KAAA,MAAA;AAAQ,QAAA,OAAA;AACzC,MAAA,kBAAA,CAAmB,KAAQ,GAAA,MAAA,CAAA;AAAA,KAC7B,CAAA;AAGA,IAAA,KAAA;AAAA,MACE,MAAM,KAAM,CAAA,UAAA;AAAA,MACZ,CAAC,QAAkB,KAAA;AACjB,QAAA,IAAI,QAAU,EAAA;AACZ,UAAiB,gBAAA,CAAA,KAAA,GAAQ,EAAE,GAAG,QAAS,EAAA,CAAA;AACvC,UAAA,gBAAA,CAAiB,KAAQ,GAAA,CAAC,GAAG,QAAA,CAAS,UAAU,CAAA,CAAA;AAChD,UAAY,WAAA,CAAA,KAAA,GAAQ,iBAAiB,KAAM,CAAA,WAAA,CAAA;AAAA,SAC7C;AAAA,OACF;AAAA,MACA;AAAA,QACE,IAAM,EAAA,IAAA;AAAA,QACN,SAAW,EAAA,IAAA;AAAA,OACb;AAAA,KACF,CAAA;AAEA,IAAA,KAAA;AAAA,MACE,MAAM,CAAC,QAAA,EAAU,kBAAkB,CAAA;AAAA,MACnC,MAAM;AACJ,QAAA,IAAI,SAAS,KAAO,EAAA;AAClB,UAAA,MAAM,UAAa,GAAA,kBAAA,CAAmB,KAAQ,GAAA,EAAA,GAAK,iBAAoB,GAAA,EAAA,CAAA;AACvE,UAAA,QAAA,CAAS,KAAM,CAAA,KAAA,CAAM,MAAS,GAAA,CAAA,YAAA,EAAe,UAAU,CAAA,GAAA,CAAA,CAAA;AAAA,SACzD;AAAA,OACF;AAAA,MACA;AAAA,QACE,SAAW,EAAA,IAAA;AAAA,QACX,IAAM,EAAA,IAAA;AAAA,OACR;AAAA,KACF,CAAA;AAGA,IAAA,OAAA,CAAQ,eAAe,WAAW,CAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/es/index.mjs

@@ -80,7 +80,7 @@ export { LlSwitch } from './components/switch/index.mjs';
 export { ImenuSwitchType, menuSwitchRadioList, tableHeaderSearchEmits, tableHeaderSearchProps } from './components/table/src/config/header-search.mjs';
 export { mainTableEmits, mainTableProps, tableContentType } from './components/table/src/config/main-table.mjs';
 export { tablePaginationProps } from './components/table/src/config/pagination.mjs';
-export { tableProps } from './components/table/src/config/table.mjs';
+export { HEADER_SRARCH_HEIGHT, PAGINATION_HEIGHT, tableProps } from './components/table/src/config/table.mjs';
 export { LlTable } from './components/table/index.mjs';
 export { tabsSimpleEmits, tabsSimpleProps } from './components/tabs-simple/src/tabs-simple.mjs';
 export { LlTabsSimple } from './components/tabs-simple/index.mjs';

package/es/utils/props/runtime.d.ts

@@ -27,6 +27,6 @@ export declare const buildProp: <Type = never, Value = never, Validator = never,
 export type TestProps = Record<string, {
     [epPropKey]: true;
 } | NativePropType | EpPropInput<any, any, any, any, any>>;
-export declare const buildProps: <Props extends Record<string, {
+export declare const buildProps: <Props extends Record<string, NativePropType | EpPropInput<any, any, any, any, any> | {
     __epPropKey: true;
-} | NativePropType | EpPropInput<any, any, any, any, any>>>(props: Props) => { [K in keyof Props]: IfEpProp<Props[K], Props[K], IfNativePropType<Props[K], Props[K], EpPropConvert<Props[K]>>>; };
+}>>(props: Props) => { [K in keyof Props]: IfEpProp<Props[K], Props[K], IfNativePropType<Props[K], Props[K], EpPropConvert<Props[K]>>>; };

package/index.full.js

@@ -59173,19 +59173,29 @@
             fn: require$$0.withCtx(() => [
               require$$0.renderSlot(_ctx.$slots, "footer", {}, () => [
                 require$$0.createCommentVNode(" \u786E\u8BA4\u6846 "),
-                props.showCancel && props.type !== "confirm" ? (require$$0.openBlock(), require$$0.createBlock(require$$0.unref(LlButton), {
-                  key: 0,
-                  label: props.cancelText ? props.cancelText : "\u53D6\u6D88",
-                  size: "middle",
-                  onClick: handleCancel
-                }, null, 8, ["label"])) : require$$0.createCommentVNode("v-if", true),
-                require$$0.createVNode(require$$0.unref(LlButton), {
-                  type: "primary",
-                  loading: props.loading,
-                  size: "middle",
-                  label: props.confirmText ? props.confirmText : props.type === "confirm" ? "\u77E5\u9053\u4E86" : "\u786E\u8BA4",
-                  onClick: handleOk
-                }, null, 8, ["loading", "label"])
+                require$$0.createElementVNode(
+                  "div",
+                  {
+                    class: require$$0.normalizeClass(require$$0.unref(bem).e("footer"))
+                  },
+                  [
+                    props.showCancel && props.type !== "confirm" ? (require$$0.openBlock(), require$$0.createBlock(require$$0.unref(LlButton), {
+                      key: 0,
+                      label: props.cancelText ? props.cancelText : "\u53D6\u6D88",
+                      size: "middle",
+                      onClick: handleCancel
+                    }, null, 8, ["label"])) : require$$0.createCommentVNode("v-if", true),
+                    require$$0.createVNode(require$$0.unref(LlButton), {
+                      type: "primary",
+                      loading: props.loading,
+                      size: "middle",
+                      label: props.confirmText ? props.confirmText : props.type === "confirm" ? "\u77E5\u9053\u4E86" : "\u786E\u8BA4",
+                      onClick: handleOk
+                    }, null, 8, ["loading", "label"])
+                  ],
+                  2
+                  /* CLASS */
+                )
               ])
             ]),
             key: "0"
@@ -61704,13 +61714,19 @@
     }
   ];
   const tableHeaderSearchProps = buildProps({
+    headerSearchHeight: {
+      type: Number,
+      default: 36
+    },
     menuSwitchOptions: {
       type: definePropType(Object),
       default: () => mutable({})
     }
   });
   const tableHeaderSearchEmits = {
-    change: (v) => !!v
+    change: (v) => !!v,
+    // 返回值要明确返回一个布尔类型要不然vue会警告
+    changeHeaderSearch: (height) => !!height
     // 返回值要明确返回一个布尔类型要不然vue会警告
   };
 
@@ -61889,6 +61905,8 @@
       default: () => mutable({})
     }
   });
+  const HEADER_SRARCH_HEIGHT = 36;
+  const PAGINATION_HEIGHT = 60;
 
   var _sfc_main$i = /* @__PURE__ */ require$$0.defineComponent({
     ...{
@@ -61899,6 +61917,8 @@
     emits: tableHeaderSearchEmits,
     setup(__props, { emit: __emit }) {
       const props = __props;
+      const headerSearchRef = require$$0.ref();
+      const contentType = require$$0.inject("contentType");
       const emits = __emit;
       const bem = createNamespace("table");
       const handleMenuSwitchChange = (event) => {
@@ -61907,13 +61927,38 @@
         props.menuSwitchOptions.onChange && props.menuSwitchOptions.onChange(value);
         emits("change", value);
       };
-      const contentType = require$$0.inject("contentType");
+      require$$0.watch(
+        headerSearchRef,
+        () => {
+          if (headerSearchRef.value) {
+            const observer = new MutationObserver(function(mutations) {
+              mutations.forEach(function() {
+                const newHeight = headerSearchRef.value.getBoundingClientRect().height;
+                emits("changeHeaderSearch", newHeight);
+              });
+            });
+            const config = {
+              childList: true,
+              // 观察直接子节点
+              subtree: true
+              // 及其更低的后代节点
+            };
+            observer.observe(headerSearchRef.value, config);
+          }
+        },
+        {
+          immediate: true,
+          deep: true
+        }
+      );
       return (_ctx, _cache) => {
         const _component_a_radio_button = require$$0.resolveComponent("a-radio-button");
         const _component_a_radio_group = require$$0.resolveComponent("a-radio-group");
         return require$$0.openBlock(), require$$0.createElementBlock(
           "div",
           {
+            ref_key: "headerSearchRef",
+            ref: headerSearchRef,
             class: require$$0.normalizeClass(`${require$$0.unref(bem).e("header-wrapper")}`)
           },
           [
@@ -69651,6 +69696,8 @@
         columns: []
       });
       const contentType = require$$0.ref(ImenuSwitchType.TABLE);
+      const headerSearchHeight = require$$0.ref(HEADER_SRARCH_HEIGHT);
+      const tableRef = require$$0.ref();
       const bem = createNamespace("table");
       const handleChangeDataSource = (dataSource) => {
         newNaTableptions.value.dataSource = dataSource;
@@ -69658,6 +69705,11 @@
       const handleSwitchMenuChange = (v) => {
         contentType.value = v;
       };
+      const handleChangeHeaderSearch = (height) => {
+        if (headerSearchHeight.value === height)
+          return;
+        headerSearchHeight.value = height;
+      };
       require$$0.watch(
         () => props.tableProps,
         (newValue) => {
@@ -69672,6 +69724,19 @@
           immediate: true
         }
       );
+      require$$0.watch(
+        () => [tableRef, headerSearchHeight],
+        () => {
+          if (tableRef.value) {
+            const diffHeight = headerSearchHeight.value + 20 + PAGINATION_HEIGHT + 10;
+            tableRef.value.style.height = `calc(100% - ${diffHeight}px)`;
+          }
+        },
+        {
+          immediate: true,
+          deep: true
+        }
+      );
       require$$0.provide("contentType", contentType);
       return (_ctx, _cache) => {
         const _component_a_spin = require$$0.resolveComponent("a-spin");
@@ -69687,35 +69752,35 @@
               },
               [
                 require$$0.createCommentVNode(" \u5934\u90E8seach "),
-                require$$0.createVNode(
-                  HeaderSearch$1,
-                  require$$0.mergeProps(_ctx.headerSearchProps, { onChange: handleSwitchMenuChange }),
-                  {
-                    header: require$$0.withCtx(() => [
-                      require$$0.renderSlot(_ctx.$slots, "header")
-                    ]),
-                    headerLeft: require$$0.withCtx(() => [
-                      require$$0.renderSlot(_ctx.$slots, "headerLeft")
-                    ]),
-                    headerMiddle: require$$0.withCtx(() => [
-                      require$$0.renderSlot(_ctx.$slots, "headerMiddle")
-                    ]),
-                    headerRight: require$$0.withCtx(() => [
-                      require$$0.renderSlot(_ctx.$slots, "headerRight")
-                    ]),
-                    default: require$$0.withCtx(() => [
-                      require$$0.renderSlot(_ctx.$slots, "header")
-                    ]),
-                    _: 3
-                    /* FORWARDED */
-                  },
-                  16
-                  /* FULL_PROPS */
-                ),
+                require$$0.createVNode(HeaderSearch$1, require$$0.mergeProps(_ctx.headerSearchProps, {
+                  "header-search-height": headerSearchHeight.value,
+                  onChange: handleSwitchMenuChange,
+                  onChangeHeaderSearch: handleChangeHeaderSearch
+                }), {
+                  header: require$$0.withCtx(() => [
+                    require$$0.renderSlot(_ctx.$slots, "header")
+                  ]),
+                  headerLeft: require$$0.withCtx(() => [
+                    require$$0.renderSlot(_ctx.$slots, "headerLeft")
+                  ]),
+                  headerMiddle: require$$0.withCtx(() => [
+                    require$$0.renderSlot(_ctx.$slots, "headerMiddle")
+                  ]),
+                  headerRight: require$$0.withCtx(() => [
+                    require$$0.renderSlot(_ctx.$slots, "headerRight")
+                  ]),
+                  default: require$$0.withCtx(() => [
+                    require$$0.renderSlot(_ctx.$slots, "header")
+                  ]),
+                  _: 3
+                  /* FORWARDED */
+                }, 16, ["header-search-height"]),
                 require$$0.createCommentVNode(" slot-content table\u548Ccard\u9ED8\u8BA4table "),
                 require$$0.createElementVNode(
                   "div",
                   {
+                    ref_key: "tableRef",
+                    ref: tableRef,
                     class: require$$0.normalizeClass([
                       require$$0.unref(bem).m("fixed-height"),
                       !newNaTableptions.value.dataSource.length ? require$$0.unref(bem).m("empty") : ""
@@ -77258,6 +77323,7 @@
 
   exports.DEFAULT_METHOD = DEFAULT_METHOD;
   exports.DEFAULT_TYPE = DEFAULT_TYPE;
+  exports.HEADER_SRARCH_HEIGHT = HEADER_SRARCH_HEIGHT;
   exports.ILlUploadDragProps = ILlUploadDragProps;
   exports.ImenuSwitchType = ImenuSwitchType;
   exports.LEFT_SELECT_MIN_WIDTH = LEFT_SELECT_MIN_WIDTH;
@@ -77319,6 +77385,7 @@
   exports.LlUploadImage = LlUploadImage;
   exports.LlUriInput = LlUriInput;
   exports.OperateTreeEmits = OperateTreeEmits;
+  exports.PAGINATION_HEIGHT = PAGINATION_HEIGHT;
   exports.TypeEnum = TypeEnum;
   exports.advancedFilteringEmits = advancedFilteringEmits;
   exports.advancedFilteringParamsEmits = advancedFilteringParamsEmits;