3h1-ui 3.0.0-next.8 → 3.0.0-next.9

package/es/index.js

@@ -8408,8 +8408,12 @@ const basicProps$7 = Object.assign({}, modalProps, {
   keyboard: { type: Boolean, default: true },
   maskStyle: Object,
   okType: { type: String, default: "primary" },
-  okButtonProps: Object,
-  cancelButtonProps: Object,
+  okButtonProps: {
+    type: Object
+  },
+  cancelButtonProps: {
+    type: Object
+  },
   title: { type: String },
   visible: { type: Boolean },
   width: [String, Number],
@@ -9050,6 +9054,9 @@ const _sfc_main$1e = defineComponent({
   name: "BasicModalFooter",
   props: basicProps$7,
   emits: ["ok", "cancel"],
+  components: {
+    Button: Button$1
+  },
   setup(_, { emit }) {
     function handleOk(e) {
       emit("ok", e);
@@ -9061,17 +9068,17 @@ const _sfc_main$1e = defineComponent({
   }
 });
 function _sfc_render$I(_ctx, _cache, $props, $setup, $data, $options) {
-  const _component_a_button = resolveComponent("a-button");
+  const _component_Button = resolveComponent("Button");
   return openBlock(), createElementBlock("div", null, [
     renderSlot(_ctx.$slots, "insertFooter"),
-    _ctx.showCancelBtn ? (openBlock(), createBlock(_component_a_button, mergeProps({ key: 0 }, _ctx.cancelButtonProps, { onClick: _ctx.handleCancel }), {
+    _ctx.showCancelBtn ? (openBlock(), createBlock(_component_Button, mergeProps({ key: 0 }, _ctx.cancelButtonProps, { onClick: _ctx.handleCancel }), {
       default: withCtx(() => [
         createTextVNode(toDisplayString(_ctx.cancelText), 1)
       ]),
       _: 1
     }, 16, ["onClick"])) : createCommentVNode("", true),
     renderSlot(_ctx.$slots, "centerFooter"),
-    _ctx.showOkBtn ? (openBlock(), createBlock(_component_a_button, mergeProps({
+    _ctx.showOkBtn ? (openBlock(), createBlock(_component_Button, mergeProps({
       key: 1,
       type: _ctx.okType,
       onClick: _ctx.handleOk,
@@ -9304,7 +9311,7 @@ const _sfc_main$1a = defineComponent({
     "register",
     "update:visible"
   ],
-  setup(props2, { emit, attrs }) {
+  setup(props2, { emit, attrs, slots }) {
     const visibleRef = ref(false);
     const propsRef = ref(null);
     const modalWrapperRef = ref(null);
@@ -9328,7 +9335,8 @@ const _sfc_main$1a = defineComponent({
     const getMergeProps = computed(() => {
       return {
         ...props2,
-        ...unref(propsRef)
+        ...unref(propsRef),
+        wrapClassName: `${props2.wrapClassName || ""} ${prefixCls2}`
       };
     });
     const { handleFullScreen, getWrapClassName, fullScreenRef } = useFullScreen(
@@ -9363,6 +9371,17 @@ const _sfc_main$1a = defineComponent({
       }
       return omit$1(attr, "title");
     });
+    const omitBindValue = computed(() => {
+      return omit$1(
+        getProps.value.wrapperProps,
+        "visible",
+        "height",
+        "modalFooterHeight"
+      );
+    });
+    const omitSlotKeys = computed(() => {
+      return Object.keys(omit$1(slots, ["default"]));
+    });
     const getWrapperHeight = computed(() => {
       if (unref(fullScreenRef))
         return void 0;
@@ -9375,8 +9394,10 @@ const _sfc_main$1a = defineComponent({
     watch(
       () => unref(visibleRef),
       (v) => {
+        var _a2;
         emit("visible-change", v);
         emit("update:visible", v);
+        instance && ((_a2 = modalMethods.emitVisible) == null ? void 0 : _a2.call(modalMethods, v, instance.uid));
         nextTick(() => {
           if (props2.scrollTop && v && unref(modalWrapperRef)) {
             unref(modalWrapperRef).scrollTop();
@@ -9427,6 +9448,7 @@ const _sfc_main$1a = defineComponent({
       handleFullScreen(e);
     }
     return {
+      prefixCls: prefixCls2,
       handleCancel,
       getBindValue,
       getProps,
@@ -9435,7 +9457,9 @@ const _sfc_main$1a = defineComponent({
       getMergeProps,
       handleOk,
       visibleRef,
-      omit: omit$1,
+      omitBindValue,
+      omitSlotKeys,
+      // omit,
       modalWrapperRef,
       handleExtHeight,
       handleHeightChange,
@@ -9444,33 +9468,30 @@ const _sfc_main$1a = defineComponent({
     };
   }
 });
+const BasicModal_vue_vue_type_style_index_0_lang = "";
 function _sfc_render$G(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_ModalClose = resolveComponent("ModalClose");
   const _component_ModalHeader = resolveComponent("ModalHeader");
   const _component_ModalFooter = resolveComponent("ModalFooter");
   const _component_ModalWrapper = resolveComponent("ModalWrapper");
   const _component_Modal = resolveComponent("Modal");
-  return openBlock(), createBlock(_component_Modal, mergeProps({ class: "modal-wrapper" }, _ctx.getBindValue, { onCancel: _ctx.handleCancel }), createSlots({
+  return openBlock(), createBlock(_component_Modal, mergeProps(_ctx.getBindValue, { onCancel: _ctx.handleCancel }), createSlots({
     default: withCtx(() => [
-      createVNode(_component_ModalWrapper, mergeProps(
-        {
-          useWrapper: _ctx.getProps.useWrapper,
-          footerOffset: _ctx.wrapperFooterOffset,
-          fullScreen: _ctx.fullScreenRef,
-          ref: "modalWrapperRef",
-          loading: _ctx.getProps.loading,
-          "loading-tip": _ctx.getProps.loadingTip,
-          minHeight: _ctx.getProps.minHeight,
-          height: _ctx.getWrapperHeight,
-          visible: _ctx.visibleRef,
-          modalFooterHeight: _ctx.footer !== void 0 && !_ctx.footer ? 0 : void 0
-        },
-        _ctx.omit(_ctx.getProps.wrapperProps, "visible", "height", "modalFooterHeight"),
-        {
-          onExtHeight: _ctx.handleExtHeight,
-          onHeightChange: _ctx.handleHeightChange
-        }
-      ), {
+      createVNode(_component_ModalWrapper, mergeProps({
+        useWrapper: _ctx.getProps.useWrapper,
+        footerOffset: _ctx.wrapperFooterOffset,
+        fullScreen: _ctx.fullScreenRef,
+        ref: "modalWrapperRef",
+        loading: _ctx.getProps.loading,
+        "loading-tip": _ctx.getProps.loadingTip,
+        minHeight: _ctx.getProps.minHeight,
+        height: _ctx.getWrapperHeight,
+        visible: _ctx.visibleRef,
+        modalFooterHeight: _ctx.footer !== void 0 && !_ctx.footer ? 0 : void 0
+      }, _ctx.omitBindValue, {
+        onExtHeight: _ctx.handleExtHeight,
+        onHeightChange: _ctx.handleHeightChange
+      }), {
         default: withCtx(() => [
           renderSlot(_ctx.$slots, "default")
         ]),
@@ -9521,7 +9542,7 @@ function _sfc_render$G(_ctx, _cache, $props, $setup, $data, $options) {
       ]),
       key: "2"
     } : void 0,
-    renderList(Object.keys(_ctx.omit(_ctx.$slots, "default")), (item) => {
+    renderList(_ctx.omitSlotKeys, (item) => {
       return {
         name: item,
         fn: withCtx((data) => [
@@ -14598,7 +14619,7 @@ const _sfc_main$R = /* @__PURE__ */ defineComponent({
   }
 });
 const HeaderCell_vue_vue_type_style_index_0_lang$1 = "";
-function itemRender$1({
+function itemRender({
   page,
   type,
   originalElement
@@ -14636,7 +14657,7 @@ function usePagination$2(refProps) {
       showTotal: (total) => `共 ${total} 条数据`,
       showSizeChanger: true,
       pageSizeOptions: PAGE_SIZE_OPTIONS$1,
-      itemRender: itemRender$1,
+      itemRender,
       showQuickJumper: true,
       ...isBoolean(pagination) ? {} : pagination,
       ...unref(configRef)
@@ -17729,14 +17750,14 @@ function _sfc_render$u(_ctx, _cache, $props, $setup, $data, $options) {
     scroll: _ctx.scroll
   }, null, 8, ["dataSource", "rowKey", "columns", "scroll"])) : createCommentVNode("", true);
 }
-const TableFooter = /* @__PURE__ */ _export_sfc(_sfc_main$G, [["render", _sfc_render$u]]);
+const TableFooter$1 = /* @__PURE__ */ _export_sfc(_sfc_main$G, [["render", _sfc_render$u]]);
 function useTableFooter(propsRef, scrollRef, tableElRef, getDataSourceRef) {
   const getIsEmptyData = computed(() => {
     return (unref(getDataSourceRef) || []).length === 0;
   });
   const getFooterProps = computed(() => {
     const { summaryFunc, showSummary, summaryData } = unref(propsRef);
-    return showSummary && !unref(getIsEmptyData) ? () => h(TableFooter, { summaryFunc, summaryData, scroll: unref(scrollRef) }) : void 0;
+    return showSummary && !unref(getIsEmptyData) ? () => h(TableFooter$1, { summaryFunc, summaryData, scroll: unref(scrollRef) }) : void 0;
   });
   watchEffect(() => {
     handleSummary();
@@ -19818,7 +19839,9 @@ const _sfc_main$v = defineComponent({
       () => visibleRef.value,
       (visible) => {
         nextTick(() => {
+          var _a2;
           emit("visible-change", visible);
+          instance && ((_a2 = drawerInstance.emitVisible) == null ? void 0 : _a2.call(drawerInstance, visible, instance.uid));
         });
       }
     );
@@ -30672,6 +30695,13 @@ const setConstConfig = (config) => {
   DEFAULT_ALIGN = config.align;
 };
 const basicProps = reactive({
+  isShowPagination: {
+    type: Boolean
+  },
+  isShowFooter: {
+    type: Boolean,
+    default: true
+  },
   clickToRowSelect: { type: Boolean, default: true },
   isTreeTable: Boolean,
   tableSetting: {
@@ -30838,7 +30868,7 @@ const basicProps = reactive({
     default: DEFAULT_SIZE
   }
 });
-reactive({
+const paginationProps = reactive({
   type: Object,
   default: () => {
     return {
@@ -30925,18 +30955,6 @@ function useLoading(props2) {
   }
   return { getLoading, setLoading };
 }
-function itemRender({
-  page,
-  type,
-  originalElement
-}) {
-  if (type === "prev") {
-    return page === 0 ? null : createVNode(LeftOutlined$1, null, null);
-  } else if (type === "next") {
-    return page === 1 ? null : createVNode(RightOutlined$1, null, null);
-  }
-  return originalElement;
-}
 function usePagination(refProps) {
   const configRef = ref({});
   const show = ref(true);
@@ -30952,9 +30970,6 @@ function usePagination(refProps) {
     const {
       pagination
     } = unref(refProps);
-    if (!unref(show) || isBoolean(pagination) && !pagination) {
-      return false;
-    }
     return {
       current: 1,
       pageSize: PAGE_SIZE,
@@ -30963,7 +30978,7 @@ function usePagination(refProps) {
       showTotal: (total) => `共 ${total} 条数据`,
       showSizeChanger: true,
       pageSizeOptions: PAGE_SIZE_OPTIONS,
-      itemRender,
+      // itemRender: itemRender,
       showQuickJumper: true,
       ...isBoolean(pagination) ? {} : pagination,
       ...unref(configRef)
@@ -31139,7 +31154,7 @@ function useDataSource(propsRef, {
     }
   );
   let oldSortInfoRef;
-  function handleTableChange(pagination, filters, sorter) {
+  function handleTableChange(pagination, filters, sorter, extra) {
     const isChangeSorter = !eq(oldSortInfoRef, sorter.order);
     const { clearSelectOnPageChange, sortFn, filterFn } = unref(propsRef);
     if (clearSelectOnPageChange) {
@@ -33383,12 +33398,11 @@ function useTableScroll(propsRef, tableElRef, columnsRef, rowSelectionRef, getDa
     tableHeightRef.value = height;
     (_a2 = modalFn == null ? void 0 : modalFn.redoModalHeight) == null ? void 0 : _a2.call(modalFn);
   }
-  let paginationEl;
-  let footerEl;
   let bodyEl;
   async function calcTableHeight() {
     var _a2, _b, _c;
     const {
+      isShowFooter,
       resizeHeightOffset,
       pagination,
       maxHeight,
@@ -33427,27 +33441,7 @@ function useTableScroll(propsRef, tableElRef, columnsRef, rowSelectionRef, getDa
     if (!headEl)
       return;
     let paddingHeight = propsRef.value.useTableWrapper ? 20 : 10;
-    let paginationHeight = 10;
-    if (!!isBoolean(pagination) && tableData.length !== 0) {
-      paginationEl = tableEl.querySelector(".ant-pagination");
-      if (paginationEl) {
-        const offsetHeight = paginationEl.offsetHeight;
-        paginationHeight += offsetHeight || 0;
-      } else {
-        paginationHeight += 24;
-      }
-    } else {
-      paginationHeight = 0;
-    }
-    let footerHeight = 0;
-    if (!isBoolean(pagination)) {
-      if (!footerEl) {
-        footerEl = tableEl.querySelector(".ant-table-footer");
-      } else {
-        const offsetHeight = footerEl.offsetHeight;
-        footerHeight += offsetHeight || 0;
-      }
-    }
+    let footerHeight = isShowFooter ? 24 : 0;
     let headerHeight = 0;
     if (headEl) {
       headerHeight = headEl.offsetHeight + 1;
@@ -33473,7 +33467,8 @@ function useTableScroll(propsRef, tableElRef, columnsRef, rowSelectionRef, getDa
     } else {
       bottomIncludeBody = getViewportOffset(headEl).bottomIncludeBody;
     }
-    let height = bottomIncludeBody - (resizeHeightOffset || 0) - paddingHeight - paginationHeight - footerHeight - headerHeight;
+    let height = bottomIncludeBody - (resizeHeightOffset || 0) - paddingHeight - // paginationHeight -
+    footerHeight - headerHeight;
     height = height > maxHeight ? maxHeight : height;
     height = Math.floor(height);
     setHeight(height);
@@ -33900,6 +33895,56 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   }
 });
 const HeaderCell_vue_vue_type_style_index_0_lang = "";
+const tableFooter = "";
+const TableFooter = /* @__PURE__ */ defineComponent({
+  emits: ["pageChange"],
+  props: {
+    isShowSettings: {
+      type: Boolean,
+      default: true
+    },
+    isShowPagination: {
+      type: Boolean
+    },
+    pagination: paginationProps
+  },
+  setup(props2, {
+    emit
+  }) {
+    const {
+      prefixCls: prefixCls2
+    } = useDesign$1("table-footer");
+    const {
+      getSelectRowKeys
+    } = useTableContext();
+    const getSelectTotal = computed(() => {
+      var _a2;
+      return `已选择${(_a2 = getSelectRowKeys()) == null ? void 0 : _a2.length}条`;
+    });
+    const handlePageChange = (current, pageSize) => {
+      emit("pageChange", {
+        current,
+        pageSize
+      });
+    };
+    return () => {
+      const isShowSettings = () => {
+        return props2.isShowSettings ? createVNode("div", {
+          "class": `${prefixCls2}-settings`
+        }, [createVNode("div", {
+          "class": `${prefixCls2}-count-box`
+        }, [getSelectTotal.value]), createVNode("div", {
+          "class": `${prefixCls2}-setting-box`
+        }, null)]) : null;
+      };
+      return createVNode("div", {
+        "class": prefixCls2
+      }, [isShowSettings(), createVNode(Pagination$1, mergeProps(props2.pagination, {
+        "onChange": handlePageChange
+      }), null)]);
+    };
+  }
+});
 function _isSlot(s) {
   return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !isVNode(s);
 }
@@ -33915,7 +33960,7 @@ const ShyTable = /* @__PURE__ */ defineComponent({
   }) {
     const {
       prefixCls: prefixCls2
-    } = useDesign$1("basic-table");
+    } = useDesign$1("table");
     const getWrapperClass = computed(() => {
       return [prefixCls2, attrs.class, {
         [`${prefixCls2}-form-container`]: props2.useSearchForm,
@@ -33950,14 +33995,14 @@ const ShyTable = /* @__PURE__ */ defineComponent({
         tableLayout: "fixed",
         rowSelection: unref(getRowSelectionRef),
         rowKey: unref(getRowKey),
-        // // @ts-ignore
         columns: toRaw(unref(getViewColumns)),
-        pagination: toRaw(unref(getPaginationInfo)),
+        // pagination: toRaw(unref(getPaginationInfo)),
         dataSource,
         // footer: unref(getFooterProps),
         ...unref(getExpandOption),
         // 默认项
-        showSorterTooltip: false
+        showSorterTooltip: false,
+        pagination: false
       };
       propsData = omit$1(propsData, ["class", "onChange"]);
       return propsData;
@@ -34117,14 +34162,6 @@ const ShyTable = /* @__PURE__ */ defineComponent({
       setCurSearchParams,
       getCurSearchParams
     });
-    function handleTableChange(...args) {
-      onTableChange.call(void 0, ...args);
-      emit("change", ...args);
-      const {
-        onChange
-      } = unref(getProps);
-      onChange && isFunction$2(onChange) && onChange.call(void 0, ...args);
-    }
     const {
       getFormProps,
       replaceFormSlotKey,
@@ -34156,6 +34193,14 @@ const ShyTable = /* @__PURE__ */ defineComponent({
     function getCurSearchParams() {
       return getCurSearchParamsHooks();
     }
+    function handleTableChange(...args) {
+      onTableChange.call(void 0, ...args);
+      emit("change", ...args);
+      const {
+        onChange
+      } = unref(getProps);
+      onChange && isFunction$2(onChange) && onChange.call(void 0, ...args);
+    }
     expose(tableAction2);
     emit("register", tableAction2, formActions);
     return () => {
@@ -34212,6 +34257,13 @@ const ShyTable = /* @__PURE__ */ defineComponent({
           })]
         }) : null;
       };
+      const isShowFooter = () => {
+        return getBindValues.value.isShowFooter ? createVNode(TableFooter, {
+          "isShowPagination": getBindValues.value.isShowPagination,
+          "pagination": getPaginationInfo.value,
+          "onPageChange": setPagination
+        }, null) : null;
+      };
       const handleResizeColumn = (w, col) => {
         col.width = w;
       };
@@ -34230,7 +34282,7 @@ const ShyTable = /* @__PURE__ */ defineComponent({
         emptyText: () => createVNode("div", {
           "class": "flex justify-center items-center",
           "style": {
-            height: `${getScrollRef.value.y - 41}px`
+            height: `${getScrollRef.value.y - 41 - (getProps.value.showSummaryTotal ? 47 : 0)}px`
           }
         }, [createVNode(Empty$3, null, null)]),
         bodyCell: (data) => {
@@ -34247,7 +34299,7 @@ const ShyTable = /* @__PURE__ */ defineComponent({
             }
           };
         }, {})
-      })]);
+      }), isShowFooter()]);
     };
   }
 });