cosey 0.7.9 → 0.7.10

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/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 values => {
-      if (props.formProps) {
-        return tableQueryRef.value?.reset(values);
-      } else {
-        return onReset();
-      }
+      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.9",
+  "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 @@
+