cosey 0.7.8 → 0.7.9

package/components/form/form.api.d.ts

@@ -143,7 +143,7 @@ export declare const formEmits: {
 };
 export type FormEmits = typeof formEmits;
 export interface FormExpose {
-    reset: () => void;
+    reset: (callback?: () => void) => void;
     submit: () => Promise<any>;
     validate: (callback?: FormValidateCallback) => FormValidationResult;
     validateField: (props?: Arrayable<FormItemProp>, callback?: FormValidateCallback) => FormValidationResult;

package/components/form/useFormTemplate.d.ts

@@ -5,7 +5,7 @@ export interface UseFormTemplateOptions<T> {
 export declare function useFormTemplate<T extends FormProps, U extends FormExpose = FormExpose>(props: T, options?: UseFormTemplateOptions<T>): {
     elFormProps: import("@vueuse/core").ReactiveOmitReturn<T, keyof T>;
     expose: U;
-    reset: () => void;
+    reset: (callback?: () => void) => void;
     resetFields: () => void;
     clearValidate: () => void;
     submit: (throwError?: boolean) => Promise<void>;

package/components/form/useFormTemplate.js

@@ -31,8 +31,9 @@ function useFormTemplate(props, options = {}) {
       reset2();
     });
   };
-  const reset = () => {
+  const reset = (callback) => {
     resetFields();
+    callback?.();
     props.reset?.();
   };
   const clearValidate = () => {

package/components/table/index.d.ts

@@ -296,17 +296,17 @@ declare const _Table: {
             page: number;
             pageSize: number;
         };
-        reset: () => void;
         submit: () => Promise<any>;
         validate: (callback?: import("element-plus").FormValidateCallback) => import("element-plus").FormValidationResult;
+        clearValidate: (props?: import("@vueuse/core").Arrayable<import("element-plus").FormItemProp>) => void;
         validateField: (props?: import("@vueuse/core").Arrayable<import("element-plus").FormItemProp>, callback?: import("element-plus").FormValidateCallback) => import("element-plus").FormValidationResult;
         resetFields: (props?: import("@vueuse/core").Arrayable<import("element-plus").FormItemProp>) => void;
-        clearValidate: (props?: import("@vueuse/core").Arrayable<import("element-plus").FormItemProp>) => void;
         scrollToField: (prop: import("element-plus").FormItemProp) => void;
         fields: import("element-plus").FormItemContext[];
         getFieldsValue: () => Record<string, any>;
-        setFieldsValue: (value: Record<string, any>) => void;
+        setFieldsValue: (values: Record<PropertyKey, any>) => void;
         getFormModel: () => Record<string, any>;
+        reset: (values?: Record<PropertyKey, any>) => void;
         clearSelection: () => void;
         getSelectionRows: () => any[];
         toggleRowSelection: (row: any, selected?: boolean, emitChange?: boolean, ignoreSelectable?: boolean) => void;
@@ -648,17 +648,17 @@ declare const _Table: {
             page: number;
             pageSize: number;
         };
-        reset: () => void;
         submit: () => Promise<any>;
         validate: (callback?: import("element-plus").FormValidateCallback) => import("element-plus").FormValidationResult;
+        clearValidate: (props?: import("@vueuse/core").Arrayable<import("element-plus").FormItemProp>) => void;
         validateField: (props?: import("@vueuse/core").Arrayable<import("element-plus").FormItemProp>, callback?: import("element-plus").FormValidateCallback) => import("element-plus").FormValidationResult;
         resetFields: (props?: import("@vueuse/core").Arrayable<import("element-plus").FormItemProp>) => void;
-        clearValidate: (props?: import("@vueuse/core").Arrayable<import("element-plus").FormItemProp>) => void;
         scrollToField: (prop: import("element-plus").FormItemProp) => void;
         fields: import("element-plus").FormItemContext[];
         getFieldsValue: () => Record<string, any>;
-        setFieldsValue: (value: Record<string, any>) => void;
+        setFieldsValue: (values: Record<PropertyKey, any>) => void;
         getFormModel: () => Record<string, any>;
+        reset: (values?: Record<PropertyKey, any>) => void;
         clearSelection: () => void;
         getSelectionRows: () => any[];
         toggleRowSelection: (row: any, selected?: boolean, emitChange?: boolean, ignoreSelectable?: boolean) => void;
@@ -855,17 +855,17 @@ declare const _Table: {
         page: number;
         pageSize: number;
     };
-    reset: () => void;
     submit: () => Promise<any>;
     validate: (callback?: import("element-plus").FormValidateCallback) => import("element-plus").FormValidationResult;
+    clearValidate: (props?: import("@vueuse/core").Arrayable<import("element-plus").FormItemProp>) => void;
     validateField: (props?: import("@vueuse/core").Arrayable<import("element-plus").FormItemProp>, callback?: import("element-plus").FormValidateCallback) => import("element-plus").FormValidationResult;
     resetFields: (props?: import("@vueuse/core").Arrayable<import("element-plus").FormItemProp>) => void;
-    clearValidate: (props?: import("@vueuse/core").Arrayable<import("element-plus").FormItemProp>) => void;
     scrollToField: (prop: import("element-plus").FormItemProp) => void;
     fields: import("element-plus").FormItemContext[];
     getFieldsValue: () => Record<string, any>;
-    setFieldsValue: (value: Record<string, any>) => void;
+    setFieldsValue: (values: Record<PropertyKey, any>) => void;
     getFormModel: () => Record<string, any>;
+    reset: (values?: Record<PropertyKey, any>) => void;
     clearSelection: () => void;
     getSelectionRows: () => any[];
     toggleRowSelection: (row: any, selected?: boolean, emitChange?: boolean, ignoreSelectable?: boolean) => void;

package/components/table/table-query/table-query.api.d.ts

@@ -163,10 +163,11 @@ export declare const tableQueryEmits: {
 export type TableQueryEmits = typeof tableQueryEmits;
 export interface TableQueryCustomExpose {
     getFieldsValue: () => Record<string, any>;
-    setFieldsValue: (value: Record<string, any>) => void;
+    setFieldsValue: (values: Record<PropertyKey, any>) => void;
     getFormModel: () => Record<string, any>;
+    reset: (values?: Record<PropertyKey, any>) => void;
 }
-export interface TableQueryExpose extends FormQueryExpose, TableQueryCustomExpose {
+export interface TableQueryExpose extends Omit<FormQueryExpose, 'reset'>, TableQueryCustomExpose {
 }
 export declare const tableQueryExposeKeys: string[];
 export declare function createScheme<T extends FieldType>(props: FormItemProps<T>): FormItemProps<T>;

package/components/table/table-query/table-query.api.js

@@ -22,7 +22,8 @@ const tableQueryExposeKeys = [
   ...formExposeKeys,
   "getFieldsValue",
   "setFieldsValue",
-  "getFormModel"
+  "getFormModel",
+  "reset"
 ];
 function createScheme(props) {
   return props;

package/components/table/table-query/table-query.js

@@ -30,16 +30,25 @@ var stdin_default = defineComponent({
     const onEnter = () => {
       formQueryRef.value?.submit();
     };
+    const setFieldsValue = values => {
+      Object.assign(unref(formModel), values);
+    };
+    const reset = values => {
+      formQueryRef.value?.reset(() => {
+        if (values) {
+          setFieldsValue(values);
+        }
+      });
+    };
     const customExpose = {
       getFieldsValue() {
         return cloneDeep(unref(formModel));
       },
-      setFieldsValue(value) {
-        Object.assign(unref(formModel), value);
-      },
+      setFieldsValue,
       getFormModel() {
         return unref(formModel);
-      }
+      },
+      reset
     };
     expose(createMergedExpose(tableQueryExposeKeys, () => formQueryRef.value, customExpose));
     return () => {

package/components/table/table.vue.d.ts

@@ -152,17 +152,17 @@ declare const __VLS_component: import("vue").DefineComponent<import("vue").Extra
         page: number;
         pageSize: number;
     };
-    reset: () => void;
     submit: () => Promise<any>;
     validate: (callback?: import("element-plus").FormValidateCallback) => import("element-plus").FormValidationResult;
+    clearValidate: (props?: import("@vueuse/core").Arrayable<import("element-plus").FormItemProp>) => void;
     validateField: (props?: import("@vueuse/core").Arrayable<import("element-plus").FormItemProp>, callback?: import("element-plus").FormValidateCallback) => import("element-plus").FormValidationResult;
     resetFields: (props?: import("@vueuse/core").Arrayable<import("element-plus").FormItemProp>) => void;
-    clearValidate: (props?: import("@vueuse/core").Arrayable<import("element-plus").FormItemProp>) => void;
     scrollToField: (prop: import("element-plus").FormItemProp) => void;
     fields: import("element-plus").FormItemContext[];
     getFieldsValue: () => Record<string, any>;
-    setFieldsValue: (value: Record<string, any>) => void;
+    setFieldsValue: (values: Record<PropertyKey, any>) => void;
     getFormModel: () => Record<string, any>;
+    reset: (values?: Record<PropertyKey, any>) => void;
     clearSelection: () => void;
     getSelectionRows: () => any[];
     toggleRowSelection: (row: any, selected?: boolean, emitChange?: boolean, ignoreSelectable?: boolean) => void;

package/components/table/table.vue.js

@@ -350,9 +350,9 @@ var stdin_default = /* @__PURE__ */defineComponent({
         return onSubmit();
       }
     };
-    const reset = async () => {
+    const reset = async values => {
       if (props.formProps) {
-        return tableQueryRef.value?.reset();
+        return tableQueryRef.value?.reset(values);
       } else {
         return onReset();
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cosey",
-  "version": "0.7.8",
+  "version": "0.7.9",
   "description": "基于 Vue3 + vite 的后台管理系统框架",
   "type": "module",
   "main": "index.js",

package/utils/vue.js

@@ -19,7 +19,8 @@ function createMergedExpose(keys, ...exposeList) {
   const result = {};
   for (const key of keys) {
     result[key] = (...args) => {
-      for (const expose of exposeList) {
+      for (let i = exposeList.length - 1; i >= 0; i--) {
+        const expose = exposeList[i];
         const obj = typeof expose === "function" ? expose() : expose;
         if (obj && key in obj) {
           const value = obj[key];