sard-uniapp 1.19.0 → 1.19.2

package/use/useFormPopout.js

@@ -24,7 +24,10 @@ export function useFormPopout(props, emit, options = {}) {
         options.onChange?.(value, ...args);
     };
     const onConfirm = () => {
-        options.onConfirmBefore?.();
+        const extraArgs = options.onConfirmBefore?.();
+        if (extraArgs) {
+            restArgs = extraArgs;
+        }
         if (popoutValue.value !== innerValue.value) {
             innerValue.value = popoutValue.value;
             const args = [innerValue.value, ...restArgs];

package/use/usePopoutInput.d.ts

@@ -1,6 +1,7 @@
 export interface UsePopoutInputProps {
     visible?: boolean;
     modelValue?: any;
+    valueOnClear?: () => any;
 }
 export interface UsePopoutInputEmits {
     (e: 'update:visible', visible: boolean): void;
@@ -8,7 +9,7 @@ export interface UsePopoutInputEmits {
     (e: 'change', ...args: any[]): void;
 }
 export declare function usePopoutInput(props: UsePopoutInputProps, emit: UsePopoutInputEmits, options?: {
-    onClear?: () => void;
+    onClear?: (value: any) => void;
 }): {
     innerVisible: import("vue").Ref<boolean | undefined, boolean | undefined>;
     innerValue: import("vue").Ref<any, any>;

package/use/usePopoutInput.js

@@ -1,5 +1,7 @@
 import { ref, watch } from 'vue';
 import { useTwoWayVisible } from './useTwoWayVisible';
+import { defaultConfig } from '../components/config';
+const defaultValueOnClear = () => undefined;
 export function usePopoutInput(props, emit, options = {}) {
     // visible
     const { visible } = useTwoWayVisible(props, emit);
@@ -8,6 +10,7 @@ export function usePopoutInput(props, emit, options = {}) {
     };
     // value
     const innerValue = ref(props.modelValue);
+    const getValueOnClear = () => (props.valueOnClear || defaultConfig.valueOnClear || defaultValueOnClear)();
     watch(() => props.modelValue, () => {
         innerValue.value = props.modelValue;
     });
@@ -17,13 +20,13 @@ export function usePopoutInput(props, emit, options = {}) {
     };
     const onClear = () => {
         inputValue.value = '';
-        innerValue.value = undefined;
+        innerValue.value = getValueOnClear();
         if (options.onClear) {
-            options.onClear();
+            options.onClear(innerValue.value);
         }
         else {
-            emit('update:model-value', undefined);
-            emit('change', undefined);
+            emit('update:model-value', innerValue.value);
+            emit('change', innerValue.value);
         }
     };
     // input