sard 1.0.13 → 1.0.14

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/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/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

@@ -60,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";
@@ -140,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, popupManager, 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;

package/components/load-more/load-more.vue.js

@@ -1,8 +1,10 @@
 import { createBem } from "../../utils/bem.js";
+import { useIntersectionObserver } from "../../use/useIntersectionObserver.js";
 import loading_default from "../loading/loading.vue.js";
 import { useTranslateWithPrefix } from "../../locale/index.js";
-import { defaultLoadMoreProps } from "./common.js";
-import { computed, createCommentVNode, createElementBlock, createTextVNode, createVNode, defineComponent, mergeDefaults, normalizeClass, openBlock, renderSlot, toDisplayString, unref, withCtx } from "vue";
+import { LoadMoreStatus, defaultLoadMoreProps } from "./common.js";
+import { useScrollParent } from "../../use/useScrollParent.js";
+import { computed, createCommentVNode, createElementBlock, createTextVNode, createVNode, defineComponent, mergeDefaults, normalizeClass, openBlock, renderSlot, toDisplayString, unref, useTemplateRef, watch, withCtx } from "vue";
 //#region packages/sard/components/load-more/load-more.vue
 var load_more_default = /*@__PURE__*/ defineComponent({
 	__name: "load-more",
@@ -26,23 +28,49 @@ var load_more_default = /*@__PURE__*/ defineComponent({
 		errorText: {
 			type: String,
 			required: false
+		},
+		disabled: {
+			type: Boolean,
+			required: false
+		},
+		rootMargin: {
+			type: String,
+			required: false
 		}
 	}, defaultLoadMoreProps),
-	emits: ["load-more", "reload"],
+	emits: ["load"],
 	setup(__props, { emit: __emit }) {
 		const props = __props;
 		const emit = __emit;
 		const bem = createBem("load-more");
 		const { t } = useTranslateWithPrefix("loadMore");
+		const loadMoreRef = useTemplateRef("loadMore");
+		const scrollParent = useScrollParent(loadMoreRef);
 		const onClick = () => {
-			if (props.status === "incomplete") emit("load-more");
-			else if (props.status === "error") emit("reload");
+			if (props.status === "incomplete") emit("load");
+			else if (props.status === "error") emit("load");
 		};
+		const { isIntersecting } = useIntersectionObserver({
+			root: scrollParent,
+			rootMargin: () => props.rootMargin,
+			threshold: 0,
+			target: loadMoreRef,
+			disabled: () => props.disabled
+		});
+		watch(isIntersecting, () => {
+			if (!props.disabled && isIntersecting.value && props.status === LoadMoreStatus.INCOMPLETE) emit("load");
+		});
+		watch(() => props.status, (status, prevStatus) => {
+			if (prevStatus === LoadMoreStatus.LOADING && status === LoadMoreStatus.INCOMPLETE) setTimeout(() => {
+				if (!props.disabled && isIntersecting.value && status === LoadMoreStatus.INCOMPLETE) emit("load");
+			}, 30);
+		});
 		const loadMoreClass = computed(() => {
 			return [bem.b(), bem.m(props.status)];
 		});
 		return (_ctx, _cache) => {
 			return openBlock(), createElementBlock("div", {
+				ref: "loadMore",
 				class: normalizeClass(loadMoreClass.value),
 				onClick
 			}, [__props.status === "incomplete" ? renderSlot(_ctx.$slots, "incomplete", { key: 0 }, () => [createTextVNode(toDisplayString(__props.incompleteText || unref(t)("incompleteText")), 1)]) : __props.status === "loading" ? renderSlot(_ctx.$slots, "loading", { key: 1 }, () => [createVNode(loading_default, null, {

package/components/pull-down-refresh/common.d.ts

@@ -7,6 +7,7 @@ export interface PullDownRefreshProps {
     transitionDuration?: number;
     doneDuration?: number;
     disabled?: boolean;
+    error?: boolean;
 }
 export declare const defaultPullDownRefreshProps: DefaultProps<PullDownRefreshProps>;
 export interface PullDownRefreshSlots {

package/components/pull-down-refresh/common.js

@@ -3,7 +3,7 @@ const defaultPullDownRefreshProps = {
 	threshold: 50,
 	headerHeight: 50,
 	transitionDuration: 300,
-	doneDuration: 0,
+	doneDuration: 500,
 	loading: false,
 	disabled: false
 };

package/components/pull-down-refresh/pull-down-refresh.vue.d.ts

@@ -5,6 +5,7 @@ declare const __VLS_base: import("vue").DefineComponent<PullDownRefreshProps, Pu
 }, string, import("vue").PublicProps, Readonly<PullDownRefreshProps> & Readonly<{
     onRefresh?: (() => any) | undefined;
 }>, {
+    error: boolean;
     loading: boolean;
     threshold: number;
     disabled: boolean;

package/components/pull-down-refresh/pull-down-refresh.vue.js

@@ -3,9 +3,10 @@ import { getScrollTop } from "../../utils/dom.js";
 import { useTimeout } from "../../use/useTimeout.js";
 import { usePointerDown } from "../../use/usePointerDown.js";
 import loading_default from "../loading/loading.vue.js";
-import { defaultPullDownRefreshProps } from "./common.js";
+import { useTranslateWithPrefix } from "../../locale/index.js";
 import { useScrollParent } from "../../use/useScrollParent.js";
-import { computed, createCommentVNode, createElementBlock, createElementVNode, createVNode, defineComponent, mergeDefaults, normalizeClass, normalizeStyle, onMounted, openBlock, ref, renderSlot, unref, useTemplateRef, watch } from "vue";
+import { defaultPullDownRefreshProps } from "./common.js";
+import { computed, createCommentVNode, createElementBlock, createElementVNode, createTextVNode, createVNode, defineComponent, mergeDefaults, normalizeClass, normalizeStyle, onMounted, openBlock, ref, renderSlot, toDisplayString, unref, useTemplateRef, watch, withCtx } from "vue";
 //#region packages/sard/components/pull-down-refresh/pull-down-refresh.vue
 var pull_down_refresh_default = /*@__PURE__*/ defineComponent({
 	__name: "pull-down-refresh",
@@ -33,6 +34,10 @@ var pull_down_refresh_default = /*@__PURE__*/ defineComponent({
 		disabled: {
 			type: Boolean,
 			required: false
+		},
+		error: {
+			type: Boolean,
+			required: false
 		}
 	}, defaultPullDownRefreshProps),
 	emits: ["refresh"],
@@ -40,6 +45,7 @@ var pull_down_refresh_default = /*@__PURE__*/ defineComponent({
 		const props = __props;
 		const emit = __emit;
 		const bem = createBem("pull-down-refresh");
+		const { t } = useTranslateWithPrefix("pullDownRefresh");
 		const scrollParent = useScrollParent(useTemplateRef("root"));
 		const status = ref("initial");
 		const translateY = ref(0);
@@ -117,6 +123,9 @@ var pull_down_refresh_default = /*@__PURE__*/ defineComponent({
 			}
 		};
 		const onPointerDown = usePointerDown(onTouchStart, onTouchMove, onTouchEnd);
+		const rootClass = computed(() => {
+			return [bem.b(), bem.m(status.value)];
+		});
 		const pullDownRefreshStyle = computed(() => {
 			return {
 				transform: `translate3d(0,${translateY.value}px,0)`,
@@ -130,7 +139,7 @@ var pull_down_refresh_default = /*@__PURE__*/ defineComponent({
 		return (_ctx, _cache) => {
 			return openBlock(), createElementBlock("div", {
 				ref: "root",
-				class: normalizeClass(unref(bem).b())
+				class: normalizeClass(rootClass.value)
 			}, [createElementVNode("div", {
 				class: normalizeClass(unref(bem).e("gesture")),
 				style: normalizeStyle(pullDownRefreshStyle.value),
@@ -147,17 +156,26 @@ var pull_down_refresh_default = /*@__PURE__*/ defineComponent({
 				progress: progress.value
 			}, () => [createVNode(loading_default, {
 				type: "clock",
-				class: normalizeClass(unref(bem).e("loading")),
+				size: "16px",
 				animated: false,
 				progress: progress.value
-			}, null, 8, ["class", "progress"])]) : status.value === "ready" ? renderSlot(_ctx.$slots, "ready", { key: 1 }, () => [createVNode(loading_default, {
+			}, {
+				default: withCtx(() => [createTextVNode(toDisplayString(unref(t)("unready")), 1)]),
+				_: 1
+			}, 8, ["progress"])]) : status.value === "ready" ? renderSlot(_ctx.$slots, "ready", { key: 1 }, () => [createVNode(loading_default, {
 				type: "clock",
-				class: normalizeClass(unref(bem).e("loading")),
+				size: "16px",
 				animated: false
-			}, null, 8, ["class"])]) : status.value === "loading" ? renderSlot(_ctx.$slots, "loading", { key: 2 }, () => [createVNode(loading_default, {
+			}, {
+				default: withCtx(() => [createTextVNode(toDisplayString(unref(t)("ready")), 1)]),
+				_: 1
+			})]) : status.value === "loading" ? renderSlot(_ctx.$slots, "loading", { key: 2 }, () => [createVNode(loading_default, {
 				type: "clock",
-				class: normalizeClass(unref(bem).e("loading"))
-			}, null, 8, ["class"])]) : status.value === "done" ? renderSlot(_ctx.$slots, "done", { key: 3 }) : createCommentVNode("v-if", true)], 6), renderSlot(_ctx.$slots, "default")], 38)], 2);
+				size: "16px"
+			}, {
+				default: withCtx(() => [createTextVNode(toDisplayString(unref(t)("loading")), 1)]),
+				_: 1
+			})]) : status.value === "done" ? renderSlot(_ctx.$slots, "done", { key: 3 }, () => [createTextVNode(toDisplayString(__props.error ? unref(t)("doneFail") : unref(t)("doneSuccess")), 1)]) : createCommentVNode("v-if", true)], 6), renderSlot(_ctx.$slots, "default")], 38)], 2);
 		};
 	}
 });

package/components/select/common.d.ts

@@ -9,17 +9,16 @@ export interface SelectProps {
     filterPlaceholder?: string;
     filterMethod?: (query: string) => void;
     filterValue?: string;
-    remote?: boolean;
-    remoteMethod?: (query: string, page: number, isRefresh: boolean) => Promise<boolean>;
-    threshold?: number;
     showToolbar?: boolean;
     options?: any[];
     optionKeys?: OptionKeys;
     valueKey?: string;
+    filterLoading?: boolean;
 }
 export declare const defaultSelectProps: DefaultProps<SelectProps>;
 export interface SelectSlots {
     default?(): any;
+    bottom?(): any;
     option?(props: {
         disabled: boolean;
         selected: boolean;
@@ -37,9 +36,10 @@ export interface SelectEmits {
     (e: 'update:modelValue', value: any): void;
     (e: 'change', value: any): void;
     (e: 'select', value: any): void;
-    (e: 'update:filter-value', value: string): void;
+    (e: 'update:filterValue', value: string): void;
 }
 export interface SelectExpose {
+    scrollTop: () => void;
 }
 export interface SelectMember {
     el: HTMLElement | null;

package/components/select/common.js

@@ -1,7 +1,6 @@
 //#region packages/sard/components/select/common.ts
 const defaultSelectProps = {
 	multipleLimit: 0,
-	threshold: 500,
 	options: () => []
 };
 const selectContextKey = Symbol("selectContext");

package/components/select/index.css

@@ -1 +1 @@
-:root{--s-select-max-height:320px;--s-select-bg:var(--s-bg-color-container);--s-select-search-padding-x:var(--s-content-padding-x);--s-select-search-padding-y:var(--s-content-padding-y);--s-select-option-min-height:var(--s-content-height-sm);--s-select-option-padding-x:var(--s-content-padding-x);--s-select-option-padding-y:var(--s-content-padding-y);--s-select-option-bg-active:var(--s-bg-color-active);--s-select-option-opacity-disabled:var(--s-opacity-disabled);--s-select-option-color-selected:var(--s-color-primary);--s-select-option-label-font-size:var(--s-font-size);--s-select-option-group-label-padding-x:var(--s-content-padding-x);--s-select-option-group-label-padding-y:var(--s-content-padding-y);--s-select-option-group-label-font-size:var(--s-font-size-sm);--s-select-option-group-label-color:var(--s-text-color-tertiary);--s-select-option-group-label-bg:var(--s-fill-color-fourth);--s-select-toolbar-padding-x:var(--s-content-padding-x);--s-select-toolbar-padding-y:0;--s-select-empty-margin-top:var(--s-size)}.s-select{background:var(--s-select-bg)}.s-select__container{position:relative}.s-select__container::before,.s-select__container::after{content:"";position:absolute;left:0;right:0;z-index:10;height:10px;overflow:hidden;box-shadow:none;touch-action:none;pointer-events:none;transition:box-shadow var(--s-duration)}.s-select__container::before{top:0}.s-select__container::after{bottom:0}.s-select__container--none::before,.s-select__container--end::before{box-shadow:var(--s-box-shadow-top)}.s-select__container--none::after,.s-select__container--start::after{box-shadow:var(--s-box-shadow-bottom)}.s-select__search{padding:var(--s-select-search-padding-y) var(--s-select-search-padding-x)}.s-select__loading{color:var(--s-text-color-fourth)}.s-select__scroll{overflow-x:hidden;overflow-y:auto;max-height:var(--s-select-max-height)}.s-select__scroll--filterable{height:var(--s-select-max-height)}.s-select__toolbar{display:flex;align-items:center;padding:var(--s-select-toolbar-padding-y) var(--s-select-toolbar-padding-x)}.s-select__num{font-size:var(--s-font-size);color:var(--s-color-primary);margin-inline-end:auto}.s-select__empty{padding-top:var(--s-select-empty-margin-top)}.s-select-option{position:relative;display:flex;align-items:center;cursor:pointer}.s-select-option:not(.is-plain){min-height:var(--s-select-option-min-height);padding:var(--s-select-option-padding-y) var(--s-select-option-padding-x)}.s-select-option:not(.is-plain)::before{position:absolute;z-index:1;pointer-events:none;touch-action:none;opacity:1;content:"";left:0;right:0;transform:scaleY(0.5);top:0;border-top:var(--s-border-width) var(--s-border-style) var(--s-border-color);transform-origin:top center;left:var(--s-select-option-padding-x);right:var(--s-select-option-padding-x)}.s-select-option:not(.is-plain):first-child::before{display:none}.s-select-option:is(.is-selected){color:var(--s-select-option-color-selected);font-weight:var(--s-font-weight-bold)}.s-select-option:is(.is-selected) .s-select-option__icon{display:flex}.s-select-option:is(.is-disabled){color:var(--s-text-color-disabled);cursor:var(--s-cursor-disabled)}.s-select-option:not(.is-disabled,.is-plain):active{background:var(--s-select-option-bg-active)}.s-select-option__label{flex:1;min-width:0;word-break:break-all;font-size:var(--s-select-option-label-font-size);line-height:var(--s-line-height-normal)}.s-select-option__icon{display:none;justify-content:center;align-items:center;margin-inline-start:8px}.s-select-option-group__label{position:sticky;top:0;z-index:2;padding:var(--s-select-option-group-label-padding-y) var(--s-select-option-group-label-padding-x);font-size:var(--s-select-option-group-label-font-size);line-height:var(--s-line-height-snug);color:var(--s-select-option-group-label-color);background:var(--s-select-option-group-label-bg)}.s-select-option-group__content{position:relative}
+:root{--s-select-max-height:320px;--s-select-bg:var(--s-bg-color-container);--s-select-search-padding-x:var(--s-content-padding-x);--s-select-search-padding-y:var(--s-content-padding-y);--s-select-option-min-height:var(--s-content-height-sm);--s-select-option-padding-x:var(--s-content-padding-x);--s-select-option-padding-y:var(--s-content-padding-y);--s-select-option-bg-active:var(--s-bg-color-active);--s-select-option-opacity-disabled:var(--s-opacity-disabled);--s-select-option-color-selected:var(--s-color-primary);--s-select-option-label-font-size:var(--s-font-size);--s-select-option-group-label-padding-x:var(--s-content-padding-x);--s-select-option-group-label-padding-y:var(--s-content-padding-y);--s-select-option-group-label-font-size:var(--s-font-size-sm);--s-select-option-group-label-color:var(--s-text-color-tertiary);--s-select-option-group-label-bg:var(--s-fill-color-fourth);--s-select-toolbar-padding-x:var(--s-content-padding-x);--s-select-toolbar-padding-y:0}.s-select{background:var(--s-select-bg)}.s-select__container{position:relative}.s-select__container::before,.s-select__container::after{content:"";position:absolute;left:0;right:0;z-index:10;height:10px;overflow:hidden;box-shadow:none;touch-action:none;pointer-events:none;transition:box-shadow var(--s-duration)}.s-select__container::before{top:0}.s-select__container::after{bottom:0}.s-select__container--none::before,.s-select__container--end::before{box-shadow:var(--s-box-shadow-top)}.s-select__container--none::after,.s-select__container--start::after{box-shadow:var(--s-box-shadow-bottom)}.s-select__search{padding:var(--s-select-search-padding-y) var(--s-select-search-padding-x)}.s-select__loading{color:var(--s-text-color-fourth)}.s-select__scroll{overflow-x:hidden;overflow-y:auto;max-height:var(--s-select-max-height)}.s-select__scroll--filterable{height:var(--s-select-max-height)}.s-select__toolbar{display:flex;align-items:center;padding:var(--s-select-toolbar-padding-y) var(--s-select-toolbar-padding-x)}.s-select__num{font-size:var(--s-font-size);color:var(--s-color-primary);margin-inline-end:auto}.s-select__empty{position:absolute;top:0;left:0;width:100%;height:100%;display:flex;justify-content:center;align-items:center}.s-select-option{position:relative;display:flex;align-items:center;cursor:pointer}.s-select-option:not(.is-plain){min-height:var(--s-select-option-min-height);padding:var(--s-select-option-padding-y) var(--s-select-option-padding-x)}.s-select-option:not(.is-plain)::before{position:absolute;z-index:1;pointer-events:none;touch-action:none;opacity:1;content:"";left:0;right:0;transform:scaleY(0.5);top:0;border-top:var(--s-border-width) var(--s-border-style) var(--s-border-color);transform-origin:top center;left:var(--s-select-option-padding-x);right:var(--s-select-option-padding-x)}.s-select-option:not(.is-plain):first-child::before{display:none}.s-select-option:is(.is-selected){color:var(--s-select-option-color-selected);font-weight:var(--s-font-weight-bold)}.s-select-option:is(.is-selected) .s-select-option__icon{display:flex}.s-select-option:is(.is-disabled){color:var(--s-text-color-disabled);cursor:var(--s-cursor-disabled)}.s-select-option:not(.is-disabled,.is-plain):active{background:var(--s-select-option-bg-active)}.s-select-option__label{flex:1;min-width:0;word-break:break-all;font-size:var(--s-select-option-label-font-size);line-height:var(--s-line-height-normal)}.s-select-option__icon{display:none;justify-content:center;align-items:center;margin-inline-start:8px}.s-select-option-group__label{position:sticky;top:0;z-index:2;padding:var(--s-select-option-group-label-padding-y) var(--s-select-option-group-label-padding-x);font-size:var(--s-select-option-group-label-font-size);line-height:var(--s-line-height-snug);color:var(--s-select-option-group-label-color);background:var(--s-select-option-group-label-bg)}.s-select-option-group__content{position:relative}

package/components/select/select.vue.d.ts

@@ -4,16 +4,15 @@ declare const __VLS_base: import("vue").DefineComponent<SelectProps, SelectExpos
     select: (value: any) => any;
     change: (value: any) => any;
     "update:modelValue": (value: any) => any;
-    "update:filter-value": (value: string) => any;
+    "update:filterValue": (value: string) => any;
 }, string, import("vue").PublicProps, Readonly<SelectProps> & Readonly<{
     onSelect?: ((value: any) => any) | undefined;
     onChange?: ((value: any) => any) | undefined;
     "onUpdate:modelValue"?: ((value: any) => any) | undefined;
-    "onUpdate:filter-value"?: ((value: string) => any) | undefined;
+    "onUpdate:filterValue"?: ((value: string) => any) | undefined;
 }>, {
     multiple: boolean;
     options: any[];
-    threshold: number;
     modelValue: any;
     optionKeys: import("../../use").OptionKeys;
     filterPlaceholder: string;
@@ -21,10 +20,9 @@ declare const __VLS_base: import("vue").DefineComponent<SelectProps, SelectExpos
     filterable: boolean;
     filterMethod: (query: string) => void;
     filterValue: string;
-    remote: boolean;
-    remoteMethod: (query: string, page: number, isRefresh: boolean) => Promise<boolean>;
     showToolbar: boolean;
     valueKey: string;
+    filterLoading: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
 declare const _default: typeof __VLS_export;