sard 1.0.13 → 1.0.14

package/components/select/select.vue.js

@@ -1,5 +1,4 @@
 import { createBem } from "../../utils/bem.js";
-import { debounce } from "../../utils/utils.js";
 import { scrollToTarget } from "../../utils/geometry.js";
 import { useScrollSide } from "../../use/useScrollSide.js";
 import { usePopupEnter } from "../popup/common.js";
@@ -9,19 +8,13 @@ import { useTranslateWithPrefix } from "../../locale/index.js";
 import button_default from "../button/button.vue.js";
 import input_default from "../input/input.vue.js";
 import empty_default from "../empty/empty.vue.js";
-import load_more_default from "../load-more/load-more.vue.js";
-import { useLoadMore } from "../load-more/useLoadMore.js";
 import { defaultSelectProps } from "./common.js";
 import select_option_group_default from "./select-option-group.vue.js";
 import select_option_default from "./select-option.vue.js";
 import { useSelect } from "./useSelect.js";
-import { Fragment, computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createSlots, createTextVNode, createVNode, defineComponent, mergeDefaults, mergeProps, normalizeClass, onBeforeUnmount, openBlock, ref, renderList, renderSlot, toDisplayString, unref, useSlots, useTemplateRef, watch, withCtx } from "vue";
+import { Fragment, computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createSlots, createTextVNode, createVNode, defineComponent, mergeDefaults, mergeProps, normalizeClass, openBlock, ref, renderList, renderSlot, toDisplayString, unref, useSlots, useTemplateRef, watch, withCtx } from "vue";
 import { Search } from "@sard/icons";
 //#region packages/sard/components/select/select.vue
-const _hoisted_1 = {
-	key: 1,
-	ref: "load-more"
-};
 var select_default = /*@__PURE__*/ defineComponent({
 	__name: "select",
 	props: /*@__PURE__*/ mergeDefaults({
@@ -53,18 +46,6 @@ var select_default = /*@__PURE__*/ defineComponent({
 			type: String,
 			required: false
 		},
-		remote: {
-			type: Boolean,
-			required: false
-		},
-		remoteMethod: {
-			type: Function,
-			required: false
-		},
-		threshold: {
-			type: Number,
-			required: false
-		},
 		showToolbar: {
 			type: Boolean,
 			required: false
@@ -80,13 +61,17 @@ var select_default = /*@__PURE__*/ defineComponent({
 		valueKey: {
 			type: String,
 			required: false
+		},
+		filterLoading: {
+			type: Boolean,
+			required: false
 		}
 	}, defaultSelectProps),
 	emits: [
 		"update:modelValue",
 		"change",
 		"select",
-		"update:filter-value"
+		"update:filterValue"
 	],
 	setup(__props, { expose: __expose, emit: __emit }) {
 		const props = __props;
@@ -117,32 +102,16 @@ var select_default = /*@__PURE__*/ defineComponent({
 		};
 		const scrollRef = useTemplateRef("scroll");
 		const scrollSide = useScrollSide(scrollRef, { direction: "vertical" });
-		const searchValue = ref("");
+		const searchValue = ref(String(props.filterValue ?? ""));
 		watch(() => props.filterValue, () => {
 			searchValue.value = String(props.filterValue ?? "");
 		});
 		watch(searchValue, () => {
 			props.filterMethod?.(searchValue.value);
-			debouncedRefresh();
-			if (searchValue.value !== props.filterValue) emit("update:filter-value", searchValue.value);
-		});
-		const { status, isLoading, onLoadMore, onReload, refresh } = useLoadMore({
-			root: scrollRef,
-			target: useTemplateRef("load-more"),
-			disabled: () => !props.remote || !props.remoteMethod,
-			request: async (page, isRefresh) => {
-				return props.remoteMethod(searchValue.value, page, isRefresh).then((loaded) => {
-					if (isRefresh && scrollRef.value) scrollRef.value.scrollTop = 0;
-					return loaded;
-				});
-			}
-		});
-		const debouncedRefresh = debounce(refresh, props.threshold);
-		onBeforeUnmount(() => {
-			debouncedRefresh.cancel();
+			if (searchValue.value !== props.filterValue) emit("update:filterValue", searchValue.value);
 		});
 		const isEmpty = computed(() => {
-			return members.length === 0 && (props.remote ? status.value === "complete" : true);
+			return members.length === 0;
 		});
 		const onClear = () => {
 			if (innerValue.value.length > 0) triggerChange([]);
@@ -172,7 +141,9 @@ var select_default = /*@__PURE__*/ defineComponent({
 		const scrollClass = computed(() => {
 			return [bem.e("scroll"), bem.em("scroll", "filterable", props.filterable)];
 		});
-		__expose({});
+		__expose({ scrollTop: () => {
+			if (scrollRef.value) scrollRef.value.scrollTop = 0;
+		} });
 		return (_ctx, _cache) => {
 			return openBlock(), createElementBlock("div", { class: normalizeClass(unref(bem).b()) }, [
 				__props.filterable ? (openBlock(), createElementBlock("div", {
@@ -185,7 +156,7 @@ var select_default = /*@__PURE__*/ defineComponent({
 					clearable: ""
 				}, {
 					prepend: withCtx(() => [createVNode(unref(Search))]),
-					append: withCtx(() => [unref(isLoading) ? (openBlock(), createBlock(loading_default, {
+					append: withCtx(() => [__props.filterLoading ? (openBlock(), createBlock(loading_default, {
 						key: 0,
 						class: normalizeClass(unref(bem).e("loading"))
 					}, null, 8, ["class"])) : createCommentVNode("v-if", true)]),
@@ -237,15 +208,7 @@ var select_default = /*@__PURE__*/ defineComponent({
 						key: 0,
 						class: normalizeClass(unref(bem).e("empty"))
 					}, [createVNode(empty_default, { size: "small" })], 2)) : createCommentVNode("v-if", true),
-					__props.remote && !isEmpty.value ? (openBlock(), createElementBlock("div", _hoisted_1, [createVNode(load_more_default, {
-						status: unref(status),
-						onLoadMore: unref(onLoadMore),
-						onReload: unref(onReload)
-					}, null, 8, [
-						"status",
-						"onLoadMore",
-						"onReload"
-					])], 512)) : createCommentVNode("v-if", true)
+					renderSlot(_ctx.$slots, "bottom")
 				], 2)], 2),
 				__props.multiple && __props.showToolbar ? (openBlock(), createElementBlock("div", {
 					key: 1,

package/components/select-input/common.d.ts

@@ -1,5 +1,5 @@
 import { type DefaultProps } from '../config';
-import { type SelectPopoutEmits, type SelectPopoutProps, type SelectPopoutSlots } from '../select-popout/common';
+import { type SelectPopoutEmits, type SelectPopoutExpose, type SelectPopoutProps, type SelectPopoutSlots } from '../select-popout/common';
 import { type PopoutInputSlots, type PopoutInputProps } from '../popout-input/common';
 export interface SelectInputProps extends SelectPopoutProps, Omit<PopoutInputProps, 'modelValue'> {
     maxLabels?: number;
@@ -10,5 +10,5 @@ export interface SelectInputSlots extends SelectPopoutSlots, Omit<PopoutInputSlo
 }
 export interface SelectInputEmits extends SelectPopoutEmits {
 }
-export interface SelectInputExpose {
+export interface SelectInputExpose extends SelectPopoutExpose {
 }

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

@@ -1,6 +1,7 @@
 import { type SelectInputProps, type SelectInputSlots, type SelectInputExpose } from './common';
 type __VLS_Slots = SelectInputSlots;
 declare const __VLS_base: import("vue").DefineComponent<SelectInputProps, SelectInputExpose, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {
+    select: (value: any) => any;
     change: (value: any) => any;
     "before-enter": (el: Element) => any;
     enter: (el: Element) => any;
@@ -14,7 +15,9 @@ declare const __VLS_base: import("vue").DefineComponent<SelectInputProps, Select
     "update:visible": (visible: boolean) => any;
     "update:modelValue": (value: any) => any;
     confirm: (value: any) => any;
+    "update:filterValue": (value: string) => any;
 }, string, import("vue").PublicProps, Readonly<SelectInputProps> & Readonly<{
+    onSelect?: ((value: any) => any) | undefined;
     onChange?: ((value: any) => any) | undefined;
     "onBefore-enter"?: ((el: Element) => any) | undefined;
     onEnter?: ((el: Element) => any) | undefined;
@@ -28,6 +31,7 @@ declare const __VLS_base: import("vue").DefineComponent<SelectInputProps, Select
     "onUpdate:visible"?: ((visible: boolean) => any) | undefined;
     "onUpdate:modelValue"?: ((value: any) => any) | undefined;
     onConfirm?: ((value: any) => any) | undefined;
+    "onUpdate:filterValue"?: ((value: string) => any) | undefined;
 }>, {
     title: string;
     multiple: boolean;
@@ -35,7 +39,6 @@ declare const __VLS_base: import("vue").DefineComponent<SelectInputProps, Select
     readonly: boolean;
     visible: boolean;
     loading: boolean;
-    threshold: number;
     disabled: boolean;
     modelValue: any;
     showConfirm: boolean;
@@ -52,10 +55,9 @@ declare const __VLS_base: import("vue").DefineComponent<SelectInputProps, Select
     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;
     maxLabels: number;
     mapLabel: Record<any, any>;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;

package/components/select-input/select-input.vue.js

@@ -5,7 +5,7 @@ import popout_input_default from "../popout-input/popout-input.vue.js";
 import { partitionPopoutInputProps, usePopoutInput } from "../popout-input/usePopoutInput.js";
 import select_popout_default from "../select-popout/select-popout.vue.js";
 import { defaultSelectInputProps } from "./common.js";
-import { computed, createBlock, createSlots, createVNode, defineComponent, guardReactiveProps, isRef, mergeDefaults, mergeProps, normalizeProps, openBlock, renderSlot, unref, useSlots, watch, withCtx } from "vue";
+import { computed, createBlock, createSlots, createVNode, defineComponent, guardReactiveProps, isRef, mergeDefaults, mergeProps, normalizeProps, openBlock, renderSlot, unref, useSlots, useTemplateRef, watch, withCtx } from "vue";
 //#region packages/sard/components/select-input/select-input.vue
 var select_input_default = /*@__PURE__*/ defineComponent({
 	__name: "select-input",
@@ -66,18 +66,6 @@ var select_input_default = /*@__PURE__*/ defineComponent({
 			type: String,
 			required: false
 		},
-		remote: {
-			type: Boolean,
-			required: false
-		},
-		remoteMethod: {
-			type: Function,
-			required: false
-		},
-		threshold: {
-			type: Number,
-			required: false
-		},
 		showToolbar: {
 			type: Boolean,
 			required: false
@@ -94,6 +82,10 @@ var select_input_default = /*@__PURE__*/ defineComponent({
 			type: String,
 			required: false
 		},
+		filterLoading: {
+			type: Boolean,
+			required: false
+		},
 		placeholder: {
 			type: String,
 			required: false
@@ -129,8 +121,6 @@ var select_input_default = /*@__PURE__*/ defineComponent({
 	}, defaultSelectInputProps),
 	emits: [
 		"update:visible",
-		"update:modelValue",
-		"change",
 		"confirm",
 		"before-enter",
 		"enter",
@@ -140,7 +130,11 @@ var select_input_default = /*@__PURE__*/ defineComponent({
 		"leave",
 		"after-leave",
 		"leave-cancelled",
-		"visible-hook"
+		"visible-hook",
+		"update:modelValue",
+		"change",
+		"select",
+		"update:filterValue"
 	],
 	setup(__props, { expose: __expose, emit: __emit }) {
 		const props = __props;
@@ -193,7 +187,16 @@ var select_input_default = /*@__PURE__*/ defineComponent({
 		const onConfirm = (value) => {
 			emit("confirm", value);
 		};
-		__expose({});
+		const onSelect = (value) => {
+			emit("select", value);
+		};
+		const onUpdateFilterValue = (value) => {
+			emit("update:filterValue", value);
+		};
+		const selectPopoutRef = useTemplateRef("selectPopout");
+		__expose({ scrollTop: () => {
+			selectPopoutRef.value?.scrollTop();
+		} });
 		return (_ctx, _cache) => {
 			return openBlock(), createBlock(popout_input_default, mergeProps(unref(partitionedProps)[0], {
 				modelValue: unref(inputValue),
@@ -202,14 +205,16 @@ var select_input_default = /*@__PURE__*/ defineComponent({
 				onClear: unref(onClear),
 				onClick: unref(show)
 			}), createSlots({
-				default: withCtx(() => [createVNode(select_popout_default, mergeProps(unref(partitionedProps)[1], {
+				default: withCtx(() => [createVNode(select_popout_default, mergeProps({ ref: "selectPopout" }, unref(partitionedProps)[1], {
 					visible: unref(innerVisible),
 					"onUpdate:visible": _cache[0] || (_cache[0] = ($event) => isRef(innerVisible) ? innerVisible.value = $event : null),
 					modelValue: unref(innerValue),
 					"onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => isRef(innerValue) ? innerValue.value = $event : null),
 					onChange: unref(onChange),
 					onVisibleHook: unref(onVisibleHook),
-					onConfirm
+					onConfirm,
+					onSelect,
+					"onUpdate:filterValue": onUpdateFilterValue
 				}), createSlots({ _: 2 }, [
 					slots.default ? {
 						name: "default",
@@ -225,6 +230,11 @@ var select_input_default = /*@__PURE__*/ defineComponent({
 						name: "option-label",
 						fn: withCtx((labelProps) => [renderSlot(_ctx.$slots, "option-label", normalizeProps(guardReactiveProps(labelProps)))]),
 						key: "2"
+					} : void 0,
+					slots.bottom ? {
+						name: "bottom",
+						fn: withCtx(() => [renderSlot(_ctx.$slots, "bottom")]),
+						key: "3"
 					} : void 0
 				]), 1040, [
 					"visible",

package/components/select-popout/common.d.ts

@@ -1,5 +1,5 @@
 import { type DefaultProps } from '../config';
-import { type SelectSlots, type SelectProps } from '../select/common';
+import { type SelectSlots, type SelectProps, type SelectEmits, type SelectExpose } from '../select/common';
 import { type FormPopoutProps } from '../popout/useFormPopout';
 import type { MotionEmits } from '../motion';
 export interface SelectPopoutProps extends FormPopoutProps, SelectProps {
@@ -7,11 +7,9 @@ export interface SelectPopoutProps extends FormPopoutProps, SelectProps {
 export declare const defaultSelectPopoutProps: DefaultProps<SelectPopoutProps>;
 export interface SelectPopoutSlots extends SelectSlots {
 }
-export interface SelectPopoutEmits extends MotionEmits {
+export interface SelectPopoutEmits extends MotionEmits, SelectEmits {
     (e: 'update:visible', visible: boolean): void;
-    (e: 'update:modelValue', value: any): void;
-    (e: 'change', value: any): void;
     (e: 'confirm', value: any): void;
 }
-export interface SelectPopoutExpose {
+export interface SelectPopoutExpose extends SelectExpose {
 }

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

@@ -1,6 +1,7 @@
 import { type SelectPopoutProps, type SelectPopoutSlots, type SelectPopoutExpose } from './common';
 type __VLS_Slots = SelectPopoutSlots;
 declare const __VLS_base: import("vue").DefineComponent<SelectPopoutProps, SelectPopoutExpose, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {
+    select: (value: any) => any;
     change: (value: any) => any;
     "before-enter": (el: Element) => any;
     enter: (el: Element) => any;
@@ -14,7 +15,9 @@ declare const __VLS_base: import("vue").DefineComponent<SelectPopoutProps, Selec
     "update:visible": (visible: boolean) => any;
     "update:modelValue": (value: any) => any;
     confirm: (value: any) => any;
+    "update:filterValue": (value: string) => any;
 }, string, import("vue").PublicProps, Readonly<SelectPopoutProps> & Readonly<{
+    onSelect?: ((value: any) => any) | undefined;
     onChange?: ((value: any) => any) | undefined;
     "onBefore-enter"?: ((el: Element) => any) | undefined;
     onEnter?: ((el: Element) => any) | undefined;
@@ -28,12 +31,12 @@ declare const __VLS_base: import("vue").DefineComponent<SelectPopoutProps, Selec
     "onUpdate:visible"?: ((visible: boolean) => any) | undefined;
     "onUpdate:modelValue"?: ((value: any) => any) | undefined;
     onConfirm?: ((value: any) => any) | undefined;
+    "onUpdate:filterValue"?: ((value: string) => any) | undefined;
 }>, {
     title: string;
     multiple: boolean;
     options: any[];
     visible: boolean;
-    threshold: number;
     modelValue: any;
     showConfirm: boolean;
     optionKeys: import("../../index.ts").OptionKeys;
@@ -44,10 +47,9 @@ declare const __VLS_base: import("vue").DefineComponent<SelectPopoutProps, Selec
     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;

package/components/select-popout/select-popout.vue.js

@@ -2,7 +2,7 @@ import popout_default from "../popout/popout.vue.js";
 import { omitFormPopoutProps, useFormPopout } from "../popout/useFormPopout.js";
 import select_default from "../select/select.vue.js";
 import { defaultSelectPopoutProps } from "./common.js";
-import { createBlock, createSlots, createVNode, defineComponent, guardReactiveProps, isRef, mergeDefaults, mergeProps, normalizeProps, openBlock, renderSlot, unref, useSlots, withCtx } from "vue";
+import { createBlock, createSlots, createVNode, defineComponent, guardReactiveProps, isRef, mergeDefaults, mergeProps, normalizeProps, openBlock, renderSlot, unref, useSlots, useTemplateRef, withCtx } from "vue";
 //#region packages/sard/components/select-popout/select-popout.vue
 var select_popout_default = /*@__PURE__*/ defineComponent({
 	__name: "select-popout",
@@ -55,18 +55,6 @@ var select_popout_default = /*@__PURE__*/ defineComponent({
 			type: String,
 			required: false
 		},
-		remote: {
-			type: Boolean,
-			required: false
-		},
-		remoteMethod: {
-			type: Function,
-			required: false
-		},
-		threshold: {
-			type: Number,
-			required: false
-		},
 		showToolbar: {
 			type: Boolean,
 			required: false
@@ -82,12 +70,14 @@ var select_popout_default = /*@__PURE__*/ defineComponent({
 		valueKey: {
 			type: String,
 			required: false
+		},
+		filterLoading: {
+			type: Boolean,
+			required: false
 		}
 	}, defaultSelectPopoutProps),
 	emits: [
 		"update:visible",
-		"update:modelValue",
-		"change",
 		"confirm",
 		"before-enter",
 		"enter",
@@ -97,7 +87,11 @@ var select_popout_default = /*@__PURE__*/ defineComponent({
 		"leave",
 		"after-leave",
 		"leave-cancelled",
-		"visible-hook"
+		"visible-hook",
+		"update:modelValue",
+		"change",
+		"select",
+		"update:filterValue"
 	],
 	setup(__props, { expose: __expose, emit: __emit }) {
 		const props = __props;
@@ -105,13 +99,20 @@ var select_popout_default = /*@__PURE__*/ defineComponent({
 		const emit = __emit;
 		const omittedProps = omitFormPopoutProps(props);
 		const { innerVisible, draftValue, onChange, onConfirm, onVisibleHook } = useFormPopout(props, emit);
-		const onSelect = () => {
+		const onSelect = (value) => {
 			if (!props.multiple && !props.showConfirm) {
 				onConfirm(false);
 				innerVisible.value = false;
 			}
+			emit("select", value);
 		};
-		__expose({});
+		const onUpdateFilterValue = (value) => {
+			emit("update:filterValue", value);
+		};
+		const selectRef = useTemplateRef("select");
+		__expose({ scrollTop: () => {
+			selectRef.value?.scrollTop();
+		} });
 		return (_ctx, _cache) => {
 			return openBlock(), createBlock(popout_default, {
 				visible: unref(innerVisible),
@@ -121,10 +122,11 @@ var select_popout_default = /*@__PURE__*/ defineComponent({
 				onConfirm: unref(onConfirm),
 				onVisibleHook: unref(onVisibleHook)
 			}, {
-				default: withCtx(() => [createVNode(select_default, mergeProps(unref(omittedProps), {
+				default: withCtx(() => [createVNode(select_default, mergeProps({ ref: "select" }, unref(omittedProps), {
 					"model-value": unref(draftValue),
 					onChange: unref(onChange),
-					onSelect
+					onSelect,
+					"onUpdate:filterValue": onUpdateFilterValue
 				}), createSlots({ _: 2 }, [
 					slots.default ? {
 						name: "default",
@@ -140,6 +142,11 @@ var select_popout_default = /*@__PURE__*/ defineComponent({
 						name: "option-label",
 						fn: withCtx((labelProps) => [renderSlot(_ctx.$slots, "option-label", normalizeProps(guardReactiveProps(labelProps)))]),
 						key: "2"
+					} : void 0,
+					slots.bottom ? {
+						name: "bottom",
+						fn: withCtx(() => [renderSlot(_ctx.$slots, "bottom")]),
+						key: "3"
 					} : void 0
 				]), 1040, ["model-value", "onChange"])]),
 				_: 3

package/global.d.ts

@@ -64,7 +64,6 @@ declare module 'vue' {
     SImage: typeof import('./components/image/image').default
     SIndexes: typeof import('./components/indexes/indexes').default
     SIndexesAnchor: typeof import('./components/indexes/indexes-anchor').default
-    SInfiniteList: typeof import('./components/infinite-list/infinite-list').default
     SInput: typeof import('./components/input/input').default
     SKeyboard: typeof import('./components/keyboard/keyboard').default
     SKeyboardPopout: typeof import('./components/keyboard-popout/keyboard-popout').default