sard 1.0.12 → 1.0.14

package/README.md

@@ -123,13 +123,12 @@ npm run publish
 4. 暂存 `git add .`
 5. 提交 `git commit -m 'fix: '`
 6. 给提交打标签 `npm run tag`
-7. 生成 changelog `npm run changelog`
-8. 暂存、提交 changelog `git commit -a -m 'chore: changelog'`
-9. 打包组件库 `npm run build:sard`
-10. 发布到 npm `npm run publish:sard`
-11. 推送代码和标签 `npm run push`
-12. 打包文档 `npm run build:site`
-13. 部署文档 `npm run deploy`
+7. 生成 changelog 并暂存、提交 `npm run changelog && git commit -a -m 'chore: changelog'`
+8. 打包组件库 `npm run build:sard`
+9. 发布到 npm `npm run publish:sard`
+10. 推送代码和标签 `npm run push`
+11. 打包文档 `npm run build:site`
+12. 部署文档 `npm run deploy`
 
 ## 新增组件流程
 

package/all-components.js

@@ -47,7 +47,6 @@ import { FormItemPlain, FormPlain } from "./components/form-plain/index.js";
 import { Grid, GridItem } from "./components/grid/index.js";
 import { Image } from "./components/image/index.js";
 import { Indexes, IndexesAnchor, IndexesNav } from "./components/indexes/index.js";
-import { InfiniteList } from "./components/infinite-list/index.js";
 import { Input } from "./components/input/index.js";
 import { Keyboard } from "./components/keyboard/index.js";
 import { KeyboardPopout } from "./components/keyboard-popout/index.js";
@@ -185,7 +184,6 @@ var all_components_default = {
 	Indexes,
 	IndexesAnchor,
 	IndexesNav,
-	InfiniteList,
 	Input,
 	Keyboard,
 	KeyboardPopout,

package/components/action-sheet/action-sheet.vue.d.ts

@@ -33,6 +33,7 @@ declare const __VLS_base: import("vue").DefineComponent<ActionSheetProps, {}, {}
     cancel: string;
     visible: boolean;
     overlayClosable: boolean;
+    closeOnBackPress: boolean;
     description: string;
     itemList: ActionSheetItemProps[];
     showCancel: boolean;

package/components/action-sheet/action-sheet.vue.js

@@ -42,6 +42,10 @@ var action_sheet_default = /*@__PURE__*/ defineComponent({
 		internalContext: {
 			type: Object,
 			required: false
+		},
+		closeOnBackPress: {
+			type: Boolean,
+			required: false
 		}
 	}, defaultActionSheetProps),
 	emits: [
@@ -112,6 +116,10 @@ var action_sheet_default = /*@__PURE__*/ defineComponent({
 				perhapsClose("close");
 			}
 		};
+		const onBackPress = () => {
+			emit("close");
+			perhapsClose("close");
+		};
 		const onSelect = (item, index) => {
 			if (!item.disabled && !item.loading) {
 				item = { ...item };
@@ -135,7 +143,9 @@ var action_sheet_default = /*@__PURE__*/ defineComponent({
 			return openBlock(), createBlock(popup_default, {
 				effect: "slide-bottom",
 				visible: innerVisible.value,
+				"close-on-back-press": __props.closeOnBackPress,
 				onOverlayClick,
+				onBackPress,
 				onVisibleHook
 			}, {
 				default: withCtx(() => [createElementVNode("div", { class: normalizeClass(actionSheetClass.value) }, [
@@ -152,7 +162,7 @@ var action_sheet_default = /*@__PURE__*/ defineComponent({
 					}, [renderSlot(_ctx.$slots, "cancel", {}, () => [createTextVNode(toDisplayString(__props.cancel || unref(t)("cancel")), 1)])], 2)], 64)) : createCommentVNode("v-if", true)
 				], 2)]),
 				_: 3
-			}, 8, ["visible"]);
+			}, 8, ["visible", "close-on-back-press"]);
 		};
 	}
 });

package/components/action-sheet/common.d.ts

@@ -22,6 +22,7 @@ export interface ActionSheetProps {
     overlayClosable?: boolean;
     beforeClose?: ActionSheetBeforeClose;
     internalContext?: UseActionSheetReturn;
+    closeOnBackPress?: boolean;
 }
 export declare const defaultActionSheetProps: DefaultProps<ActionSheetProps>;
 export interface ActionSheetEmits extends MotionEmits {

package/components/action-sheet/common.js

@@ -1,4 +1,7 @@
 //#region packages/sard/components/action-sheet/common.ts
-const defaultActionSheetProps = { overlayClosable: true };
+const defaultActionSheetProps = {
+	overlayClosable: true,
+	closeOnBackPress: true
+};
 //#endregion
 export { defaultActionSheetProps };

package/components/badge/index.css

@@ -1 +1 @@
-:root{--s-badge-height:18px;--s-badge-font-size:var(--s-font-size-sm);--s-badge-bg:var(--s-color-danger);--s-badge-color:var(--s-white);--s-badge-border-color:var(--s-border-color-light);--s-badge-dot-size:10px}.s-badge{flex:none;display:inline-flex;justify-content:center;align-items:center;min-width:var(--s-badge-height);height:var(--s-badge-height);padding-inline-start:var(--s-size-2xs);padding-inline-end:var(--s-size-2xs);font-size:var(--s-badge-font-size);line-height:var(--s-line-height-none);text-align:center;border:1px solid var(--s-badge-border-color);border-radius:var(--s-border-radius-full);color:var(--s-badge-color);background:var(--s-badge-bg)}.s-badge--fixed{position:absolute;top:0;inset-inline-end:0;transform:translate(50%, -50%);z-index:10}:root[dir=rtl] .s-badge--fixed{transform:translate(-50%, -50%)}.s-badge--dot{width:var(--s-badge-dot-size);height:var(--s-badge-dot-size);min-width:var(--s-badge-dot-size);padding:0;border-radius:var(--s-border-radius-full)}.s-badge--zero-hide{display:none}.s-badge__wrapper{position:relative;display:inline-flex}
+:root{--s-badge-height:18px;--s-badge-font-size:var(--s-font-size-sm);--s-badge-bg:var(--s-color-danger);--s-badge-color:var(--s-white);--s-badge-dot-size:10px}.s-badge{flex:none;display:inline-flex;justify-content:center;align-items:center;min-width:var(--s-badge-height);height:var(--s-badge-height);padding-inline-start:var(--s-size-2xs);padding-inline-end:var(--s-size-2xs);font-size:var(--s-badge-font-size);line-height:var(--s-line-height-none);text-align:center;border-radius:var(--s-border-radius-full);color:var(--s-badge-color);background:var(--s-badge-bg)}.s-badge--fixed{position:absolute;top:0;inset-inline-end:0;transform:translate(50%, -50%);z-index:10}:root[dir=rtl] .s-badge--fixed{transform:translate(-50%, -50%)}.s-badge--dot{width:var(--s-badge-dot-size);height:var(--s-badge-dot-size);min-width:var(--s-badge-dot-size);padding:0;border-radius:var(--s-border-radius-full)}.s-badge--zero-hide{display:none}.s-badge__wrapper{position:relative;display:inline-flex}

package/components/crop-image/common.d.ts

@@ -16,6 +16,7 @@ export interface CropImageProps {
     beforeCrop?: (width: number, height: number) => number;
     cancelText?: string;
     confirmText?: string;
+    closeOnBackPress?: boolean;
 }
 export declare const defaultCropImageProps: DefaultProps<CropImageProps>;
 export interface CropImageSlots {

package/components/crop-image/common.js

@@ -2,7 +2,8 @@
 const defaultCropImageProps = {
 	cropScale: "1:1",
 	type: "image/png",
-	quality: .92
+	quality: .92,
+	closeOnBackPress: true
 };
 //#endregion
 export { defaultCropImageProps };

package/components/crop-image/crop-image.vue.d.ts

@@ -28,6 +28,7 @@ declare const __VLS_base: import("vue").DefineComponent<CropImageProps, CropImag
     cancel: () => void;
     type: string;
     visible: boolean;
+    closeOnBackPress: boolean;
     success: (dataURL: string, info: {
         width: number;
         height: number;

package/components/crop-image/crop-image.vue.js

@@ -68,6 +68,10 @@ var crop_image_default = /*@__PURE__*/ defineComponent({
 		confirmText: {
 			type: String,
 			required: false
+		},
+		closeOnBackPress: {
+			type: Boolean,
+			required: false
 		}
 	}, defaultCropImageProps),
 	emits: [
@@ -95,6 +99,9 @@ var crop_image_default = /*@__PURE__*/ defineComponent({
 			innerVisible.value = false;
 			emit("update:visible", false);
 		};
+		const onBackPress = () => {
+			close();
+		};
 		const onVisibleHook = (name, el) => {
 			emit("visible-hook", name, el);
 			emit(name, el);
@@ -454,6 +461,8 @@ var crop_image_default = /*@__PURE__*/ defineComponent({
 				effect: "full-fade",
 				visible: __props.visible,
 				overlay: false,
+				"close-on-back-press": __props.closeOnBackPress,
+				onBackPress,
 				onVisibleHook
 			}, {
 				default: withCtx(() => [createElementVNode("div", { class: normalizeClass(cropImageClass.value) }, [
@@ -527,7 +536,7 @@ var crop_image_default = /*@__PURE__*/ defineComponent({
 					class: normalizeClass(unref(bem).e("loading"))
 				}, [createVNode(loading_default)], 2)) : createCommentVNode("v-if", true)]),
 				_: 1
-			}, 8, ["visible"]);
+			}, 8, ["visible", "close-on-back-press"]);
 		};
 	}
 });

package/components/dialog/common.d.ts

@@ -20,6 +20,7 @@ export interface DialogProps {
     beforeClose?: DialogBeforeClose;
     cancelProps?: ButtonProps;
     confirmProps?: ButtonProps;
+    closeOnBackPress?: boolean;
 }
 export declare const defaultDialogProps: DefaultProps<DialogProps>;
 export interface DialogSlots {

package/components/dialog/common.js

@@ -4,7 +4,8 @@ const defaultDialogProps = {
 	buttonType: "round",
 	showCancel: true,
 	showConfirm: true,
-	overlayClosable: true
+	overlayClosable: true,
+	closeOnBackPress: true
 };
 //#endregion
 export { defaultDialogProps };

package/components/dialog/dialog.vue.d.ts

@@ -34,6 +34,7 @@ declare const __VLS_base: import("vue").DefineComponent<DialogProps, {}, {}, {},
     title: string;
     visible: boolean;
     overlayClosable: boolean;
+    closeOnBackPress: boolean;
     message: string;
     showCancel: boolean;
     beforeClose: import("./common").DialogBeforeClose;

package/components/dialog/dialog.vue.js

@@ -62,6 +62,10 @@ var dialog_default = /*@__PURE__*/ defineComponent({
 		confirmProps: {
 			type: Object,
 			required: false
+		},
+		closeOnBackPress: {
+			type: Boolean,
+			required: false
 		}
 	}, defaultDialogProps),
 	emits: [
@@ -132,6 +136,9 @@ var dialog_default = /*@__PURE__*/ defineComponent({
 		const onOverlayClick = () => {
 			if (props.overlayClosable) perhapsClose("close");
 		};
+		const onBackPress = () => {
+			perhapsClose("close");
+		};
 		const onClose = () => {
 			perhapsClose("close");
 		};
@@ -186,7 +193,9 @@ var dialog_default = /*@__PURE__*/ defineComponent({
 				effect: "zoom",
 				visible: __props.visible,
 				class: normalizeClass(unref(bem).e("popup")),
+				"close-on-back-press": __props.closeOnBackPress,
 				onOverlayClick,
+				onBackPress,
 				onVisibleHook
 			}, {
 				default: withCtx(() => [createElementVNode("div", { class: normalizeClass(dialogClass.value) }, [
@@ -265,7 +274,11 @@ var dialog_default = /*@__PURE__*/ defineComponent({
 					], 2)
 				], 2)]),
 				_: 3
-			}, 8, ["visible", "class"]);
+			}, 8, [
+				"visible",
+				"class",
+				"close-on-back-press"
+			]);
 		};
 	}
 });

package/components/index.d.ts

@@ -48,7 +48,6 @@ export * from './form-plain';
 export * from './grid';
 export * from './image';
 export * from './indexes';
-export * from './infinite-list';
 export * from './input';
 export * from './keyboard';
 export * from './keyboard-popout';

package/components/index.js

@@ -1,5 +1,6 @@
 import { useInPopup, usePopupEnter, usePopupVisibleHookProvide } from "./popup/common.js";
 import { Accordion, AccordionItem } from "./accordion/index.js";
+import { popupManager } from "./popup/popup-manager.js";
 import { actionSheet, createActionSheet } from "./action-sheet/imperative.js";
 import { ActionSheet, ActionSheetItem } from "./action-sheet/index.js";
 import { Alert } from "./alert/index.js";
@@ -59,14 +60,13 @@ import { FormItemPlain, FormPlain } from "./form-plain/index.js";
 import { Grid, GridItem } from "./grid/index.js";
 import { Image } from "./image/index.js";
 import { Indexes, IndexesAnchor, IndexesNav } from "./indexes/index.js";
-import { useLoadMore } from "./load-more/useLoadMore.js";
-import { InfiniteList } from "./infinite-list/index.js";
 import { Input } from "./input/index.js";
 import { plateEnglishLetterKeys, plateProvinceKeys, plateSuffixKeys } from "./keyboard/common.js";
 import { Keyboard } from "./keyboard/index.js";
 import { KeyboardPopout } from "./keyboard-popout/index.js";
 import { Col, Row } from "./layout/index.js";
 import { List, ListItem } from "./list/index.js";
+import { LoadMoreStatus } from "./load-more/common.js";
 import { LoadMore } from "./load-more/index.js";
 import { Loading } from "./loading/index.js";
 import { Marquee } from "./marquee/index.js";
@@ -139,4 +139,4 @@ import { Tree, TreeBranch, TreeNode } from "./tree/index.js";
 import { Upload, UploadPreview } from "./upload/index.js";
 import { Waterfall, WaterfallItem, WaterfallLoad } from "./waterfall/index.js";
 import { Watermark } from "./watermark/index.js";
-export { ADD_SWIPER_CONTEXT_KEY, Accordion, AccordionItem, ActionSheet, ActionSheetItem, Alert, Avatar, AvatarGroup, BackTop, Badge, Barcode, Button, Calendar, CalendarInput, CalendarPopout, Card, Cascader, CascaderInput, CascaderPopout, Checkbox, CheckboxGroup, CheckboxInput, CheckboxPopout, Col, Collapse, ColorPicker, ColorPickerInput, ColorPickerPopout, Compact, CoolIcon, CountDown, CountTo, CropImage, DateStrip, DatetimePicker, DatetimePickerInput, DatetimePickerPopout, DatetimeRangePicker, DatetimeRangePickerInput, DatetimeRangePickerPopout, Descriptions, DescriptionsItem, Dialog, Divider, Dnd, DndHandle, DndItem, Dropdown, DropdownItem, Ellipsis, Empty, Fab, FabItem, FloatingBubble, FloatingPanel, Form, FormItem, FormItemPlain, FormPlain, Grid, GridItem, Image, Indexes, IndexesAnchor, IndexesNav, InfiniteList, Input, Keyboard, KeyboardPopout, List, ListItem, LoadMore, Loading, Marquee, Menu, MenuItem, Motion, Navbar, NavbarItem, NavbarPit, NoticeBar, Notify, Overlay, Pagination, PasswordInput, Picker, PickerInput, PickerPopout, PickerView, PickerViewColumn, Popout, PopoutInput, Popover, Popup, PreviewImage, ProgressBar, ProgressCircle, PullDownRefresh, PuzzleVerify, Qrcode, REMOVE_SWIPER_CONTEXT_KEY, Radio, RadioGroup, RadioInput, RadioPopout, Rate, ReadMore, Result, RotateVerify, Row, SWIPER_AUTO_HEIGHT_KEY, ScrollList, ScrollSpy, ScrollSpyAnchor, Search, Segmented, SegmentedItem, Select, SelectInput, SelectOption, SelectOptionGroup, SelectPopout, ShareSheet, ShareSheetIcon, ShareSheetItem, ShareSheetRow, Sidebar, SidebarItem, Signature, Skeleton, SkeletonAvatar, SkeletonBlock, SkeletonParagraph, SkeletonTitle, SlideVerify, Slider, Space, StatusBar, Step, Stepper, Steps, Sticky, StickyBox, SwipeAction, Swiper, SwiperItem, Switch, Tab, Tabbar, TabbarItem, TabbarPit, Table, Tabs, Tag, Text, Timeline, TimelineItem, Toast, Tree, TreeBranch, TreeNode, Upload, UploadPreview, Waterfall, WaterfallItem, WaterfallLoad, Watermark, actionSheet, createActionSheet, createCropImage, createDialog, createNotify, createPreviewImage, createToast, cropImage, dialog, formatTime, getCurrentTime, notify, omitFormPopoutProps, partitionPopoutInputProps, plateEnglishLetterKeys, plateProvinceKeys, plateSuffixKeys, previewImage, safeAreaInsets, spaceSizes, toast, useCountDown, useElementBackTop, useFormContext, useFormItem, useFormItemContext, useFormPopout, useInPopup, useLoadMore, useMotioning, usePageBackTop, usePopoutInput, usePopupEnter, usePopupVisibleHookProvide, windowInfo };
+export { ADD_SWIPER_CONTEXT_KEY, Accordion, AccordionItem, ActionSheet, ActionSheetItem, Alert, Avatar, AvatarGroup, BackTop, Badge, Barcode, Button, Calendar, CalendarInput, CalendarPopout, Card, Cascader, CascaderInput, CascaderPopout, Checkbox, CheckboxGroup, CheckboxInput, CheckboxPopout, Col, Collapse, ColorPicker, ColorPickerInput, ColorPickerPopout, Compact, CoolIcon, CountDown, CountTo, CropImage, DateStrip, DatetimePicker, DatetimePickerInput, DatetimePickerPopout, DatetimeRangePicker, DatetimeRangePickerInput, DatetimeRangePickerPopout, Descriptions, DescriptionsItem, Dialog, Divider, Dnd, DndHandle, DndItem, Dropdown, DropdownItem, Ellipsis, Empty, Fab, FabItem, FloatingBubble, FloatingPanel, Form, FormItem, FormItemPlain, FormPlain, Grid, GridItem, Image, Indexes, IndexesAnchor, IndexesNav, Input, Keyboard, KeyboardPopout, List, ListItem, LoadMore, LoadMoreStatus, Loading, Marquee, Menu, MenuItem, Motion, Navbar, NavbarItem, NavbarPit, NoticeBar, Notify, Overlay, Pagination, PasswordInput, Picker, PickerInput, PickerPopout, PickerView, PickerViewColumn, Popout, PopoutInput, Popover, Popup, PreviewImage, ProgressBar, ProgressCircle, PullDownRefresh, PuzzleVerify, Qrcode, REMOVE_SWIPER_CONTEXT_KEY, Radio, RadioGroup, RadioInput, RadioPopout, Rate, ReadMore, Result, RotateVerify, Row, SWIPER_AUTO_HEIGHT_KEY, ScrollList, ScrollSpy, ScrollSpyAnchor, Search, Segmented, SegmentedItem, Select, SelectInput, SelectOption, SelectOptionGroup, SelectPopout, ShareSheet, ShareSheetIcon, ShareSheetItem, ShareSheetRow, Sidebar, SidebarItem, Signature, Skeleton, SkeletonAvatar, SkeletonBlock, SkeletonParagraph, SkeletonTitle, SlideVerify, Slider, Space, StatusBar, Step, Stepper, Steps, Sticky, StickyBox, SwipeAction, Swiper, SwiperItem, Switch, Tab, Tabbar, TabbarItem, TabbarPit, Table, Tabs, Tag, Text, Timeline, TimelineItem, Toast, Tree, TreeBranch, TreeNode, Upload, UploadPreview, Waterfall, WaterfallItem, WaterfallLoad, Watermark, actionSheet, createActionSheet, createCropImage, createDialog, createNotify, createPreviewImage, createToast, cropImage, dialog, formatTime, getCurrentTime, notify, omitFormPopoutProps, partitionPopoutInputProps, plateEnglishLetterKeys, plateProvinceKeys, plateSuffixKeys, popupManager, previewImage, safeAreaInsets, spaceSizes, toast, useCountDown, useElementBackTop, useFormContext, useFormItem, useFormItemContext, useFormPopout, useInPopup, useMotioning, usePageBackTop, usePopoutInput, usePopupEnter, usePopupVisibleHookProvide, windowInfo };

package/components/infinite-list/common.d.ts

@@ -1,24 +1,19 @@
 import { type DefaultProps } from '../config';
-import type { LoadMoreStatus } from '../load-more/common';
+import type { LoadMoreStatus } from '../load-more';
 import type { PullDownRefreshSlots } from '../pull-down-refresh/common';
 export interface InfiniteListProps {
-    request: (page: number, isRefresh: boolean) => Promise<boolean>;
+    status?: LoadMoreStatus;
+    request: (page: number) => Promise<boolean>;
     hideLoadMore?: boolean;
     refreshable?: boolean;
-    doneDuration?: number;
     rootMargin?: string;
 }
 export declare const defaultInfiniteListProps: DefaultProps<InfiniteListProps>;
 export interface InfiniteListSlots extends Omit<PullDownRefreshSlots, 'default'> {
-    default?(props: {
-        status: LoadMoreStatus;
-        refresh: () => void;
-    }): any;
+    default?(props: Record<string, never>): any;
 }
 export interface InfiniteListEmits {
-    (e: 'refresh-success'): void;
-    (e: 'refresh-error'): void;
+    (e: 'load'): void;
 }
 export interface InfiniteListExpose {
-    refresh: () => void;
 }

package/components/infinite-list/common.js

@@ -1,4 +1,4 @@
 //#region packages/sard/components/infinite-list/common.ts
-const defaultInfiniteListProps = { doneDuration: 500 };
+const defaultInfiniteListProps = {};
 //#endregion
 export { defaultInfiniteListProps };

package/components/infinite-list/index.css

@@ -1 +0,0 @@
-.s-infinite-list .s-pull-down-refresh{min-height:100%}.s-infinite-list__load-more:is(.is-hidden){height:0;overflow:hidden;visibility:hidden;pointer-events:none}

package/components/infinite-list/infinite-list.vue.d.ts

@@ -1,15 +1,14 @@
 import { type InfiniteListProps, type InfiniteListSlots, type InfiniteListExpose } from './common';
+import { LoadMoreStatus } from '../load-more';
 type __VLS_Slots = InfiniteListSlots;
 declare const __VLS_base: import("vue").DefineComponent<InfiniteListProps, InfiniteListExpose, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {
-    "refresh-success": () => any;
-    "refresh-error": () => any;
+    load: () => any;
 }, string, import("vue").PublicProps, Readonly<InfiniteListProps> & Readonly<{
-    "onRefresh-success"?: (() => any) | undefined;
-    "onRefresh-error"?: (() => any) | undefined;
+    onLoad?: (() => any) | undefined;
 }>, {
     rootMargin: string;
-    doneDuration: number;
-    request: (page: number, isRefresh: boolean) => Promise<boolean>;
+    status: LoadMoreStatus;
+    request: (page: number) => Promise<boolean>;
     hideLoadMore: boolean;
     refreshable: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;

package/components/infinite-list/infinite-list.vue.js

@@ -1,16 +1,17 @@
 import { createBem } from "../../utils/bem.js";
-import loading_default from "../loading/loading.vue.js";
-import { useTranslateWithPrefix } from "../../locale/index.js";
-import { defaultInfiniteListProps } from "./common.js";
-import { useScrollParent } from "../../use/useScrollParent.js";
-import pull_down_refresh_default from "../pull-down-refresh/pull-down-refresh.vue.js";
+import { LoadMoreStatus } from "../load-more/common.js";
 import load_more_default from "../load-more/load-more.vue.js";
-import { useLoadMore } from "../load-more/useLoadMore.js";
-import { createElementBlock, createElementVNode, createTextVNode, createVNode, defineComponent, guardReactiveProps, mergeDefaults, normalizeClass, normalizeProps, openBlock, ref, renderSlot, toDisplayString, unref, useTemplateRef, withCtx } from "vue";
+import pull_down_refresh_default from "../pull-down-refresh/pull-down-refresh.vue.js";
+import { defaultInfiniteListProps } from "./common.js";
+import { createBlock, createCommentVNode, createElementBlock, createElementVNode, createVNode, defineComponent, mergeDefaults, normalizeClass, openBlock, ref, renderSlot, unref, withCtx } from "vue";
 //#region packages/sard/components/infinite-list/infinite-list.vue
 var infinite_list_default = /*@__PURE__*/ defineComponent({
 	__name: "infinite-list",
 	props: /*@__PURE__*/ mergeDefaults({
+		status: {
+			type: String,
+			required: false
+		},
 		request: {
 			type: Function,
 			required: true
@@ -23,96 +24,54 @@ var infinite_list_default = /*@__PURE__*/ defineComponent({
 			type: Boolean,
 			required: false
 		},
-		doneDuration: {
-			type: Number,
-			required: false
-		},
 		rootMargin: {
 			type: String,
 			required: false
 		}
 	}, defaultInfiniteListProps),
-	emits: ["refresh-success", "refresh-error"],
+	emits: ["load"],
 	setup(__props, { expose: __expose, emit: __emit }) {
 		const props = __props;
-		const emit = __emit;
 		const bem = createBem("infinite-list");
-		const { t } = useTranslateWithPrefix("pullDownRefresh");
-		const doneText = ref("");
-		const onRefresh = () => {
-			refresh().then(() => {
-				doneText.value = t("doneSuccess");
-				emit("refresh-success");
+		const status = ref(LoadMoreStatus.INCOMPLETE);
+		let page = 1;
+		const getData = async () => {
+			status.value = LoadMoreStatus.LOADING;
+			return props.request(page).then((finish) => {
+				if (finish) status.value = LoadMoreStatus.COMPLETE;
+				else {
+					status.value = LoadMoreStatus.INCOMPLETE;
+					page++;
+				}
 			}).catch(() => {
-				doneText.value = t("doneFail");
-				emit("refresh-error");
+				status.value = LoadMoreStatus.ERROR;
+			});
+		};
+		const refreshing = ref(false);
+		const onRefresh = () => {
+			page = 1;
+			refreshing.value = true;
+			getData().finally(() => {
+				refreshing.value = false;
 			});
 		};
-		const { status, isLoading, isRefreshing, onLoadMore, onReload, refresh } = useLoadMore({
-			root: useScrollParent(useTemplateRef("scroll")),
-			target: useTemplateRef("load-more"),
-			rootMargin: () => props.rootMargin,
-			request: async (page, isRefresh) => {
-				return props.request(page, isRefresh);
-			}
-		});
-		__expose({ refresh });
+		__expose({});
 		return (_ctx, _cache) => {
-			return openBlock(), createElementBlock("div", {
-				ref: "scroll",
-				class: normalizeClass(unref(bem).b())
-			}, [createVNode(pull_down_refresh_default, {
-				loading: unref(isRefreshing),
-				disabled: !__props.refreshable || unref(isLoading),
-				"done-duration": __props.doneDuration,
+			return openBlock(), createElementBlock("div", { class: normalizeClass(unref(bem).b()) }, [__props.refreshable ? (openBlock(), createBlock(pull_down_refresh_default, {
+				key: 0,
+				loading: refreshing.value,
+				disabled: status.value === unref(LoadMoreStatus).LOADING,
 				onRefresh
 			}, {
-				unready: withCtx((slotsProps) => [renderSlot(_ctx.$slots, "unready", normalizeProps(guardReactiveProps(slotsProps)), () => [createVNode(loading_default, {
-					type: "clock",
-					size: "16px",
-					animated: false,
-					progress: slotsProps.progress
-				}, {
-					default: withCtx(() => [createTextVNode(toDisplayString(unref(t)("unready")), 1)]),
-					_: 1
-				}, 8, ["progress"])])]),
-				ready: withCtx(() => [renderSlot(_ctx.$slots, "ready", {}, () => [createVNode(loading_default, {
-					type: "clock",
-					size: "16px",
-					animated: false
-				}, {
-					default: withCtx(() => [createTextVNode(toDisplayString(unref(t)("ready")), 1)]),
-					_: 1
-				})])]),
-				loading: withCtx(() => [renderSlot(_ctx.$slots, "loading", {}, () => [createVNode(loading_default, {
-					type: "clock",
-					size: "16px"
-				}, {
-					default: withCtx(() => [createTextVNode(toDisplayString(unref(t)("loading")), 1)]),
-					_: 1
-				})])]),
-				done: withCtx(() => [renderSlot(_ctx.$slots, "done", {}, () => [createTextVNode(toDisplayString(doneText.value), 1)])]),
-				default: withCtx(() => [renderSlot(_ctx.$slots, "default", {
-					status: unref(status),
-					refresh: unref(refresh)
-				}), createElementVNode("div", {
-					ref: "load-more",
-					class: normalizeClass([unref(bem).e("load-more"), unref(bem).is("hidden", __props.hideLoadMore)])
-				}, [createVNode(load_more_default, {
-					status: unref(status),
-					onLoadMore: unref(onLoadMore),
-					onReload: unref(onReload)
-				}, null, 8, [
-					"status",
-					"onLoadMore",
-					"onReload"
-				])], 2)]),
+				default: withCtx(() => [renderSlot(_ctx.$slots, "default"), createVNode(load_more_default, {
+					status: status.value,
+					onLoad: getData
+				}, null, 8, ["status"])]),
 				_: 3
-			}, 8, [
-				"loading",
-				"disabled",
-				"done-duration"
-			])], 2);
+			}, 8, ["loading", "disabled"])) : createCommentVNode("v-if", true), createElementVNode("template", null, [renderSlot(_ctx.$slots, "default"), createVNode(load_more_default, {
+				status: status.value,
+				onLoad: getData
+			}, null, 8, ["status"])])], 2);
 		};
 	}
 });

package/components/load-more/common.d.ts

@@ -1,11 +1,18 @@
 import { type DefaultProps } from '../config';
-export type LoadMoreStatus = 'incomplete' | 'loading' | 'complete' | 'error';
+export declare enum LoadMoreStatus {
+    INCOMPLETE = "incomplete",
+    LOADING = "loading",
+    COMPLETE = "complete",
+    ERROR = "error"
+}
 export interface LoadMoreProps {
     status?: LoadMoreStatus;
     incompleteText?: string;
     loadingText?: string;
     completeText?: string;
     errorText?: string;
+    disabled?: boolean;
+    rootMargin?: string;
 }
 export declare const defaultLoadMoreProps: DefaultProps<LoadMoreProps>;
 export interface LoadMoreSlots {
@@ -15,6 +22,5 @@ export interface LoadMoreSlots {
     error?(props: Record<string, never>): any;
 }
 export interface LoadMoreEmits {
-    (e: 'load-more'): void;
-    (e: 'reload'): void;
+    (e: 'load'): void;
 }

package/components/load-more/common.js

@@ -1,4 +1,11 @@
 //#region packages/sard/components/load-more/common.ts
-const defaultLoadMoreProps = { status: "incomplete" };
+let LoadMoreStatus = /* @__PURE__ */ function(LoadMoreStatus) {
+	LoadMoreStatus["INCOMPLETE"] = "incomplete";
+	LoadMoreStatus["LOADING"] = "loading";
+	LoadMoreStatus["COMPLETE"] = "complete";
+	LoadMoreStatus["ERROR"] = "error";
+	return LoadMoreStatus;
+}({});
+const defaultLoadMoreProps = { status: LoadMoreStatus.INCOMPLETE };
 //#endregion
-export { defaultLoadMoreProps };
+export { LoadMoreStatus, defaultLoadMoreProps };

package/components/load-more/index.d.ts

@@ -1,6 +1,7 @@
 import { type EnhancedComponent } from '../../utils';
+import { LoadMoreStatus } from './common';
 import _LoadMore from './load-more.vue';
 export declare const LoadMore: EnhancedComponent<typeof _LoadMore>;
 export default LoadMore;
-export type { LoadMoreStatus, LoadMoreProps, LoadMoreSlots, LoadMoreEmits } from './common';
-export * from './useLoadMore';
+export type { LoadMoreProps, LoadMoreSlots, LoadMoreEmits } from './common';
+export { LoadMoreStatus };

package/components/load-more/index.js

@@ -1,7 +1,7 @@
 import { enhanceComponent } from "../../utils/component.js";
+import { LoadMoreStatus } from "./common.js";
 import load_more_default from "./load-more.vue.js";
-import { useLoadMore } from "./useLoadMore.js";
 //#region packages/sard/components/load-more/index.ts
 const LoadMore = enhanceComponent(load_more_default);
 //#endregion
-export { LoadMore, LoadMore as default, useLoadMore };
+export { LoadMore, LoadMore as default, LoadMoreStatus };

package/components/load-more/load-more.vue.d.ts

@@ -1,13 +1,13 @@
-import { type LoadMoreProps, type LoadMoreSlots } from './common';
+import { type LoadMoreProps, type LoadMoreSlots, LoadMoreStatus } from './common';
 type __VLS_Slots = LoadMoreSlots;
 declare const __VLS_base: import("vue").DefineComponent<LoadMoreProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {
-    "load-more": () => any;
-    reload: () => any;
+    load: () => any;
 }, string, import("vue").PublicProps, Readonly<LoadMoreProps> & Readonly<{
-    "onLoad-more"?: (() => any) | undefined;
-    onReload?: (() => any) | undefined;
+    onLoad?: (() => any) | undefined;
 }>, {
-    status: import("./common").LoadMoreStatus;
+    rootMargin: string;
+    disabled: boolean;
+    status: LoadMoreStatus;
     incompleteText: string;
     loadingText: string;
     completeText: string;