sard 1.0.6 → 1.0.7

package/components/picker/common.js

@@ -64,12 +64,24 @@ function getInitialValue(columns, optionKeys) {
 		return option;
 	}
 	switch (getColumnsType(columns, optionKeys)) {
-		case "single": return [getValue(columns[0]), [columns[0]]];
-		case "multi": return [columns.map((column) => getValue(column[0])), columns.map((column) => column[0])];
+		case "single": return [
+			getValue(columns[0]),
+			[columns[0]],
+			[0]
+		];
+		case "multi": return [
+			columns.map((column) => getValue(column[0])),
+			columns.map((column) => column[0]),
+			columns.map(() => 0)
+		];
 		case "cascader": {
 			const options = [];
 			recurse(columns, options);
-			return [options.map((option) => getValue(option)), options];
+			return [
+				options.map((option) => getValue(option)),
+				options,
+				options.map(() => 0)
+			];
 		}
 	}
 }

package/components/picker-input/picker-input.d.ts

@@ -1,7 +1,7 @@
 import { type PickerInputProps, type PickerInputEmits, type PickerInputSlots } from './common';
 declare const __VLS_export: <T>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_exposed?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
     props: import("vue").PublicProps & __VLS_PrettifyLocal<PickerInputProps<T> & {
-        onChange?: ((value: any) => any) | undefined;
+        onChange?: ((value: any, selectedOptions: any[], indexes: number[]) => any) | undefined;
         "onBefore-enter"?: ((el: Element) => any) | undefined;
         onEnter?: ((el: Element) => any) | undefined;
         "onAfter-enter"?: ((el: Element) => any) | undefined;
@@ -12,8 +12,8 @@ declare const __VLS_export: <T>(__VLS_props: NonNullable<Awaited<typeof __VLS_se
         "onLeave-cancelled"?: ((el: Element) => any) | undefined;
         "onVisible-hook"?: ((name: import("../index.ts").MotionHookName, el: Element) => any) | undefined;
         "onUpdate:visible"?: ((visible: boolean) => any) | undefined;
-        "onUpdate:modelValue"?: ((value: any) => any) | undefined;
-        onConfirm?: (() => any) | undefined;
+        "onUpdate:modelValue"?: ((value: any, selectedOptions: any[], indexes: number[]) => any) | undefined;
+        onConfirm?: ((value: any, selectedOptions: any[], indexes: number[]) => any) | undefined;
     }> & (typeof globalThis extends {
         __VLS_PROPS_FALLBACK: infer P;
     } ? P : {});

package/components/picker-input/picker-input.js

@@ -113,8 +113,8 @@ var picker_input_default = /*@__PURE__*/ defineComponent({
 		watch([innerValue, () => props.columns], () => {
 			inputValue.value = getInputValue();
 		}, { immediate: true });
-		const onConfirm = () => {
-			emit("confirm");
+		const onConfirm = (...args) => {
+			emit("confirm", ...args);
 		};
 		return (_ctx, _cache) => {
 			return openBlock(), createBlock(popout_input_default, mergeProps(unref(partitionedProps)[0], {

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

@@ -9,9 +9,9 @@ export interface PickerPopoutSlots<T> extends PickerSlots<T> {
 }
 export interface PickerPopoutEmits extends MotionEmits {
     (e: 'update:visible', visible: boolean): void;
-    (e: 'update:modelValue', value: any): void;
-    (e: 'change', value: any): void;
-    (e: 'confirm'): void;
+    (e: 'update:modelValue', value: any, selectedOptions: any[], indexes: number[]): void;
+    (e: 'change', value: any, selectedOptions: any[], indexes: number[]): void;
+    (e: 'confirm', value: any, selectedOptions: any[], indexes: number[]): void;
 }
 export interface PickerPopoutExpose {
 }

package/components/picker-popout/picker-popout.d.ts

@@ -1,7 +1,7 @@
 import { type PickerPopoutProps, type PickerPopoutSlots, type PickerPopoutEmits } from './common';
 declare const __VLS_export: <T>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_exposed?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
     props: import("vue").PublicProps & __VLS_PrettifyLocal<PickerPopoutProps<T> & {
-        onChange?: ((value: any) => any) | undefined;
+        onChange?: ((value: any, selectedOptions: any[], indexes: number[]) => any) | undefined;
         "onBefore-enter"?: ((el: Element) => any) | undefined;
         onEnter?: ((el: Element) => any) | undefined;
         "onAfter-enter"?: ((el: Element) => any) | undefined;
@@ -12,8 +12,8 @@ declare const __VLS_export: <T>(__VLS_props: NonNullable<Awaited<typeof __VLS_se
         "onLeave-cancelled"?: ((el: Element) => any) | undefined;
         "onVisible-hook"?: ((name: import("../index.ts").MotionHookName, el: Element) => any) | undefined;
         "onUpdate:visible"?: ((visible: boolean) => any) | undefined;
-        "onUpdate:modelValue"?: ((value: any) => any) | undefined;
-        onConfirm?: (() => any) | undefined;
+        "onUpdate:modelValue"?: ((value: any, selectedOptions: any[], indexes: number[]) => any) | undefined;
+        onConfirm?: ((value: any, selectedOptions: any[], indexes: number[]) => any) | undefined;
     }> & (typeof globalThis extends {
         __VLS_PROPS_FALLBACK: infer P;
     } ? P : {});

package/components/picker-popout/picker-popout.js

@@ -65,11 +65,11 @@ var picker_popout_default = /*@__PURE__*/ defineComponent({
 		const emit = __emit;
 		const optionKeys = useOptionKeys(props);
 		const omittedProps = omitFormPopoutProps(props);
-		const { innerVisible, innerValue, draftValue, onChange, onConfirm, onVisibleHook } = useFormPopout(props, emit, { onConfirmBefore() {
-			if (isEmptyBinding(draftValue.value) || isEmptyArray(draftValue.value)) {
-				const [initialValue, selectedOptions] = getInitialValue(props.columns, optionKeys);
+		const { hasChange, innerVisible, innerValue, draftValue, onChange, onConfirm, onVisibleHook } = useFormPopout(props, emit, { onConfirmBefore() {
+			if (!hasChange.value || isEmptyBinding(draftValue.value) || isEmptyArray(draftValue.value)) {
+				const [initialValue, selectedOptions, indexes] = getInitialValue(props.columns, optionKeys);
 				draftValue.value = initialValue;
-				return [selectedOptions];
+				return [selectedOptions, indexes];
 			}
 		} });
 		const onEnter = () => {

package/components/popout/useFormPopout.d.ts

@@ -17,7 +17,7 @@ export interface UseFormPopoutEmits extends MotionEmits {
     (e: 'update:visible', visible: boolean): void;
     (e: 'update:modelValue', ...args: any[]): void;
     (e: 'change', ...args: any[]): void;
-    (e: 'confirm'): void;
+    (e: 'confirm', ...args: any[]): void;
 }
 /**
  * 表单 Popout 组合式函数
@@ -34,6 +34,7 @@ export declare function useFormPopout(props: UseFormPopoutProps, emit: UseFormPo
     onChange?: (...args: any[]) => void;
     onConfirmBefore?: () => any;
 }): {
+    hasChange: import("vue").Ref<boolean, boolean>;
     innerVisible: import("vue").ModelRef<boolean | undefined, PropertyKey, boolean | undefined, boolean | undefined>;
     innerValue: import("vue").Ref<any, any>;
     draftValue: import("vue").Ref<any, any>;

package/components/popout/useFormPopout.js

@@ -35,18 +35,20 @@ function useFormPopout(props, emit, options = {}) {
 		draftValue.value = innerValue.value;
 	});
 	let restArgs = [];
+	const hasChange = ref(false);
 	const onChange = (value, ...args) => {
+		hasChange.value = true;
 		draftValue.value = value;
 		restArgs = args;
 		options.onChange?.(value, ...args);
 	};
 	const onConfirm = (showConfirm = true) => {
-		if (showConfirm) emit("confirm");
 		const extraArgs = options.onConfirmBefore?.();
 		if (extraArgs) restArgs = extraArgs;
+		const args = [draftValue.value, ...restArgs];
+		if (showConfirm) emit("confirm", ...args);
 		if (draftValue.value !== innerValue.value) {
 			innerValue.value = draftValue.value;
-			const args = [innerValue.value, ...restArgs];
 			emit("update:modelValue", ...args);
 			emit("change", ...args);
 		}
@@ -57,6 +59,7 @@ function useFormPopout(props, emit, options = {}) {
 		emit(name, el);
 	};
 	return {
+		hasChange,
 		innerVisible: visible,
 		innerValue,
 		draftValue,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sard",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "sard 是基于 Vue3 的 Web 移动端 UI 组件库",
   "keywords": [
     "UI",