cosey 0.7.8 → 0.7.10

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/input-number-range/input-number-range.js

@@ -2,9 +2,9 @@ import { defineComponent, ref, watch, createVNode, createTextVNode } from 'vue';
 import { inputNumberRangeEmits, inputNumberRangeProps } from './input-number-range.api.js';
 import stdin_default$1 from './input-number-range.style.js';
 import { useFormItem, CHANGE_EVENT, ElInputNumber } from 'element-plus';
-import { isNullish } from '../../utils/is.js';
 import { debugWarn } from 'element-plus/es/utils/error.mjs';
 import { useComponentConfig } from '../config-provider/config-provider.api.js';
+import { isNullish } from '../../utils/is.js';
 
 var stdin_default = defineComponent({
   name: "CoInputNumberRange",

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

@@ -344,18 +344,10 @@ var stdin_default = /* @__PURE__ */defineComponent({
       }
     };
     const submit = async () => {
-      if (props.formProps) {
-        return tableQueryRef.value?.submit();
-      } else {
-        return onSubmit();
-      }
+      return props.formProps && tableQueryRef.value ? tableQueryRef.value.submit() : onSubmit();
     };
-    const reset = async () => {
-      if (props.formProps) {
-        return tableQueryRef.value?.reset();
-      } else {
-        return onReset();
-      }
+    const reset = async values => {
+      return props.formProps && tableQueryRef.value ? tableQueryRef.value.reset(values) : onReset();
     };
     const statsColumns = computed(() => unref(props.statsColumns));
     const statsData = computed(() => unref(props.statsData));

package/hooks/useFetch.d.ts

@@ -1,13 +1,19 @@
+import { type ShallowRef } from 'vue';
 export interface UseFetchOptions<T> {
     onSuccess?: (data: T) => void;
     onError?: (err: any) => void;
     onFinally?: () => void;
     immediate?: boolean;
     initialData?: T;
+    stale?: any;
 }
-export declare function useFetch<T = any, U = any>(fetcher: (params: U) => Promise<any> | any, options?: UseFetchOptions<T>): {
-    isFetching: import("vue").ShallowRef<boolean, boolean>;
-    data: import("vue").Ref<any, any> extends T | undefined ? import("vue").ShallowRef<undefined, undefined> | (T extends T & import("vue").Ref<any, any> ? import("@vue/shared").IfAny<T, import("vue").ShallowRef<T, T>, T> : import("vue").ShallowRef<T, T>) : import("vue").ShallowRef<T | undefined, T | undefined>;
-    error: import("vue").ShallowRef<any, any>;
-    execute: (params?: U) => Promise<void>;
-};
+interface UseFetchStale<T> {
+    isFetching: ShallowRef<boolean>;
+    data: ShallowRef<T | undefined>;
+    error: ShallowRef<any>;
+}
+interface UseFetchResult<T, U> extends UseFetchStale<T> {
+    execute: (params?: U | undefined) => Promise<void>;
+}
+export declare function useFetch<T = any, U = any>(fetcher: (params: U) => Promise<any> | any, options?: UseFetchOptions<T>): UseFetchResult<T, U>;
+export {};

package/hooks/useFetch.js

@@ -1,11 +1,22 @@
 import { shallowRef } from 'vue';
+import { isNullish } from '../utils/is.js';
 
+const staleMap = /* @__PURE__ */ new Map();
 function useFetch(fetcher, options = {}) {
-  const { immediate = true, initialData, onSuccess, onError, onFinally } = options;
-  const isFetching = shallowRef(false);
-  const data = shallowRef(initialData);
-  const error = shallowRef();
-  const execute = async (params) => {
+  const { immediate = true, initialData, stale, onSuccess, onError, onFinally } = options;
+  const { isFetching, error, data } = !isNullish(stale) && staleMap.get(stale) || {
+    isFetching: shallowRef(false),
+    data: shallowRef(initialData),
+    error: shallowRef()
+  };
+  if (!isNullish(stale) && !staleMap.get(stale)) {
+    staleMap.set(stale, {
+      isFetching,
+      error,
+      data
+    });
+  }
+  async function execute(params) {
     if (isFetching.value) {
       return;
     }
@@ -22,7 +33,7 @@ function useFetch(fetcher, options = {}) {
       isFetching.value = false;
       onFinally?.();
     }
-  };
+  }
   if (immediate) {
     Promise.resolve().then(() => {
       execute();
@@ -30,8 +41,8 @@ function useFetch(fetcher, options = {}) {
   }
   return {
     isFetching,
-    data,
     error,
+    data,
     execute
   };
 }

package/package.json

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

package/utils/index.js

@@ -6,7 +6,7 @@ export { addPxUnit, cssObjectToString, getContextBoxWidth, getDir, getStyle, set
 export { DATE_FORMAT, DATE_TIME_FORMAT, MONTH_FORMAT, TIME_FORMAT, YEAR_FORMAT, formatAsBasicDateTime, formatToDate, formatToDateTime, getDayjs } from './date.js';
 export { exportExcel, flatColumns } from './excel/index.js';
 export { chooseFiles, downloadAttachment, getFileType, readAsArrayBuffer, readAsDataURL } from './file.js';
-export { isBoolean, isEmpty, isFunction, isNullish, isNumber, isObject, isPlainObject, isPrimitive, isString, isUndefined } from './is.js';
+export { isBoolean, isEmpty, isFunction, isNullish, isNumber, isObject, isPlainObject, isPrimitive, isString, isThenable, isUndefined } from './is.js';
 export { minmax } from './number.js';
 export { deepAssign, initObject, omitObject, omitUndefined, uniformAssign } from './object.js';
 export { getBasename, getExtname } from './path.js';

package/utils/is.d.ts

@@ -38,3 +38,7 @@ export declare function isPrimitive(target: any): target is string | number | bo
  * 判断是否为空，包括空数组和空字符串
  */
 export declare function isEmpty(target: any): boolean;
+/**
+ * 判断是否为类Promise对象
+ */
+export declare function isThenable(target: any): target is PromiseLike<any>;

package/utils/is.js

@@ -28,5 +28,8 @@ function isPrimitive(target) {
 function isEmpty(target) {
   return isNullish(target) || target === "" || Array.isArray(target) && target.length === 0;
 }
+function isThenable(target) {
+  return (isFunction(target) || isObject(target)) && isFunction(target.then);
+}
 
-export { isBoolean, isEmpty, isFunction, isNullish, isNumber, isObject, isPlainObject, isPrimitive, isString, isUndefined };
+export { isBoolean, isEmpty, isFunction, isNullish, isNumber, isObject, isPlainObject, isPrimitive, isString, isThenable, isUndefined };

package/utils/promise.d.ts

@@ -0,0 +1 @@
+export {};

package/utils/promise.js

@@ -0,0 +1 @@
+

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];