@oiij/naive-ui 0.0.60 → 0.0.61

package/dist/composables/useDataRequest.d.ts

@@ -1,5 +1,5 @@
 import * as _vueuse_core0 from "@vueuse/core";
-import * as vue1 from "vue";
+import * as vue0 from "vue";
 import { UseRequestOptions, UseRequestPlugin } from "vue-hooks-plus/es/useRequest/types";
 
 //#region src/composables/useDataRequest.d.ts
@@ -24,12 +24,12 @@ type UseDataRequestPagination = {
   itemCount: number;
 };
 declare function useDataRequest<P extends DataObject = DataObject, D extends DataObject = DataObject, R extends DataObject = DataObject>(api: (...args: P[]) => Promise<D>, options?: UseDataRequestOptions<P, D>): {
-  loading: Readonly<vue1.Ref<boolean, boolean>>;
-  data: Readonly<vue1.Ref<D | undefined, D | undefined>>;
-  error: Readonly<vue1.Ref<Error | undefined, Error | undefined>>;
-  params: Readonly<vue1.Ref<[] | P[], [] | P[]>>;
-  list: vue1.ComputedRef<R[]>;
-  pagination: vue1.Ref<{
+  loading: Readonly<vue0.Ref<boolean, boolean>>;
+  data: Readonly<vue0.Ref<D | undefined, D | undefined>>;
+  error: Readonly<vue0.Ref<Error | undefined, Error | undefined>>;
+  params: Readonly<vue0.Ref<[] | P[], [] | P[]>>;
+  list: vue0.ComputedRef<R[]>;
+  pagination: vue0.Ref<{
     page: number;
     pageSize: number;
     itemCount: number;

package/dist/composables/useNaiveForm.cjs

@@ -3,6 +3,8 @@ let __vueuse_core = require("@vueuse/core");
 __vueuse_core = require_rolldown_runtime.__toESM(__vueuse_core);
 let vue = require("vue");
 vue = require_rolldown_runtime.__toESM(vue);
+let es_toolkit_object = require("es-toolkit/object");
+es_toolkit_object = require_rolldown_runtime.__toESM(es_toolkit_object);
 
 //#region src/composables/useNaiveForm.ts
 function isObject(value) {
@@ -34,7 +36,7 @@ function deepMerge(target = {}, source = {}) {
 }
 function useNaiveForm(value, options) {
 	const { rules, clearRules } = options ?? {};
-	const cacheValue = structuredClone((0, vue.toRaw)((0, vue.toValue)(value)));
+	const cacheValue = (0, es_toolkit_object.cloneDeep)((0, vue.toValue)(value));
 	const formValue = (0, vue.ref)((0, vue.toValue)(value ?? {}));
 	const formRules = (0, vue.ref)((0, vue.toValue)(rules) ?? {});
 	const formRef = (0, vue.ref)();
@@ -64,7 +66,7 @@ function useNaiveForm(value, options) {
 	}
 	function resetForm() {
 		clear();
-		const _cacheValue = structuredClone(cacheValue);
+		const _cacheValue = (0, es_toolkit_object.cloneDeep)(cacheValue);
 		deepMerge(formValue.value, _cacheValue);
 	}
 	function reset() {

package/dist/composables/useNaiveForm.d.ts

@@ -1,6 +1,6 @@
 import { DataObject } from "./useDataRequest.js";
-import * as _vueuse_core0 from "@vueuse/core";
-import * as vue0 from "vue";
+import * as _vueuse_core3 from "@vueuse/core";
+import * as vue5 from "vue";
 import { Ref } from "vue";
 import { FormInst, FormItemRule, FormRules } from "naive-ui";
 import { ValidateError } from "async-validator";
@@ -22,8 +22,8 @@ declare function useNaiveForm<T extends DataObject = DataObject>(value?: T | Ref
   formRules: Ref<Partial<Record<keyof T, FormRules | FormItemRule | FormItemRule[]>>, Partial<Record<keyof T, FormRules | FormItemRule | FormItemRule[]>>>;
   formProps: {
     ref: Ref<FormInst | undefined, FormInst | undefined>;
-    model: vue0.Reactive<T>;
-    rules: vue0.Reactive<Partial<Record<keyof T, FormRules | FormItemRule | FormItemRule[]>>>;
+    model: vue5.Reactive<T>;
+    rules: vue5.Reactive<Partial<Record<keyof T, FormRules | FormItemRule | FormItemRule[]>>>;
   };
   setValue: (_value: Partial<T>) => void;
   validate: () => Promise<{
@@ -33,7 +33,7 @@ declare function useNaiveForm<T extends DataObject = DataObject>(value?: T | Ref
   resetForm: () => void;
   reset: () => void;
   clear: () => void;
-  onValidated: _vueuse_core0.EventHookOn<[T]>;
+  onValidated: _vueuse_core3.EventHookOn<[T]>;
 };
 type NaiveFormReturns<T extends DataObject = DataObject> = ReturnType<typeof useNaiveForm<T>>;
 //#endregion

package/dist/composables/useNaiveForm.js

@@ -1,5 +1,6 @@
 import { createEventHook } from "@vueuse/core";
 import { reactive, ref, toRaw, toValue } from "vue";
+import { cloneDeep } from "es-toolkit/object";
 
 //#region src/composables/useNaiveForm.ts
 function isObject(value) {
@@ -31,7 +32,7 @@ function deepMerge(target = {}, source = {}) {
 }
 function useNaiveForm(value, options) {
 	const { rules, clearRules } = options ?? {};
-	const cacheValue = structuredClone(toRaw(toValue(value)));
+	const cacheValue = cloneDeep(toValue(value));
 	const formValue = ref(toValue(value ?? {}));
 	const formRules = ref(toValue(rules) ?? {});
 	const formRef = ref();
@@ -61,7 +62,7 @@ function useNaiveForm(value, options) {
 	}
 	function resetForm() {
 		clear();
-		const _cacheValue = structuredClone(cacheValue);
+		const _cacheValue = cloneDeep(cacheValue);
 		deepMerge(formValue.value, _cacheValue);
 	}
 	function reset() {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oiij/naive-ui",
   "type": "module",
-  "version": "0.0.60",
+  "version": "0.0.61",
   "description": "Some Composable Functions And Components for Vue 3",
   "author": "oiij",
   "license": "MIT",
@@ -41,27 +41,29 @@
     "@vueuse/core": "^13.9.0",
     "async-validator": "^4.2.5",
     "colord": "^2.9.3",
+    "es-toolkit": "^1.39.10",
     "naive-ui": "^2.43.1",
     "prismjs": "^1.30.0",
     "vue": "^3.5.21",
     "vue-hooks-plus": "^2.4.1",
+    "@oiij/use": "0.0.24",
     "@oiij/css-render": "0.0.4",
-    "@oiij/markdown-it": "0.0.6",
-    "@oiij/use": "0.0.24"
+    "@oiij/markdown-it": "0.0.6"
   },
   "devDependencies": {
     "@types/prismjs": "^1.26.5",
     "@vueuse/core": "^13.9.0",
     "async-validator": "^4.2.5",
     "colord": "^2.9.3",
+    "es-toolkit": "^1.39.10",
     "naive-ui": "^2.43.1",
     "prismjs": "^1.30.0",
     "vue": "^3.5.21",
     "vue-component-type-helpers": "^3.0.7",
     "vue-hooks-plus": "^2.4.1",
     "@oiij/css-render": "0.0.4",
-    "@oiij/use": "0.0.24",
-    "@oiij/markdown-it": "0.0.6"
+    "@oiij/markdown-it": "0.0.6",
+    "@oiij/use": "0.0.24"
   },
   "publishConfig": {
     "access": "public"