@oiij/naive-ui 0.0.71 → 0.0.73

package/dist/components/data-table-plus/DataTablePlus.js

@@ -113,26 +113,26 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
 			requestOptions: __props.requestOptions,
 			requestPlugins: __props.requestPlugins
 		});
-		onBefore((params$1) => {
-			emit("before", params$1);
+		onBefore((params) => {
+			emit("before", params);
 		});
-		onSuccess((data$1, params$1) => {
-			emit("success", data$1, params$1);
-			onSuccessEffect(data$1, params$1);
+		onSuccess((data, params) => {
+			emit("success", data, params);
+			onSuccessEffect(data, params);
 		});
-		onError((err, params$1) => {
-			emit("error", err, params$1);
+		onError((err, params) => {
+			emit("error", err, params);
 		});
-		onFinally((params$1, data$1, err) => {
-			emit("finally", params$1, data$1, err);
+		onFinally((params, data, err) => {
+			emit("finally", params, data, err);
 		});
 		const scrollX = computed(() => {
 			return __props.columns?.reduce((pre, cur) => {
 				return pre + Number(cur.width ?? 100);
 			}, 0);
 		});
-		function onSuccessEffect(data$1, _params) {
-			data$1[_fields.list]?.forEach((f) => {
+		function onSuccessEffect(data, _params) {
+			data[_fields.list]?.forEach((f) => {
 				if (!_dataCache.some((s) => s?.[_fields.rowKey] === f?.[_fields.rowKey])) _dataCache.push(f);
 			});
 			if (columnsReactive) {

package/dist/components/data-table-plus/DataTablePlus.vue.d.ts

@@ -2,12 +2,12 @@ import { DataObject, UseDataRequestPagination } from "../../composables/use-data
 import { DataTablePlusEmits, DataTablePlusExpose, DataTablePlusProps } from "./index.js";
 import "../../composables/index.js";
 import * as _vueuse_core31 from "@vueuse/core";
-import * as vue63 from "vue";
+import * as vue69 from "vue";
 import { DataTableBaseColumn, DataTableFilterState, DataTableInst, DataTableSortState } from "naive-ui";
 
 //#region src/components/data-table-plus/DataTablePlus.vue.d.ts
 declare const __VLS_export: <P extends DataObject, D extends DataObject, R extends DataObject>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_exposed?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
-  props: vue63.PublicProps & __VLS_PrettifyLocal<DataTablePlusProps<P, D, R> & {
+  props: vue69.PublicProps & __VLS_PrettifyLocal<DataTablePlusProps<P, D, R> & {
     onSuccess?: ((data: D, params: P[]) => any) | undefined;
     onError?: ((err: Error, params: P[]) => any) | undefined;
     onLoad?: ((row: R) => any) | undefined;
@@ -29,7 +29,7 @@ declare const __VLS_export: <P extends DataObject, D extends DataObject, R exten
   }> & (typeof globalThis extends {
     __VLS_PROPS_FALLBACK: infer P_1;
   } ? P_1 : {});
-  expose: (exposed: vue63.ShallowUnwrapRef<DataTablePlusExpose<P, D, R>>) => void;
+  expose: (exposed: vue69.ShallowUnwrapRef<DataTablePlusExpose<P, D, R>>) => void;
   attrs: any;
   slots: {
     header?: (props: {
@@ -46,7 +46,7 @@ declare const __VLS_export: <P extends DataObject, D extends DataObject, R exten
       filters: DataTableFilterState | undefined;
       sorters: Record<string, DataTableSortState> | undefined;
       dataTableRef: DataTableInst | null;
-      pagination: vue63.Ref<{
+      pagination: vue69.Ref<{
         page: number;
         pageSize: number;
         itemCount: number;
@@ -86,7 +86,7 @@ declare const __VLS_export: <P extends DataObject, D extends DataObject, R exten
       filters: DataTableFilterState | undefined;
       sorters: Record<string, DataTableSortState> | undefined;
       dataTableRef: DataTableInst | null;
-      pagination: vue63.Ref<{
+      pagination: vue69.Ref<{
         page: number;
         pageSize: number;
         itemCount: number;
@@ -124,7 +124,7 @@ declare const __VLS_export: <P extends DataObject, D extends DataObject, R exten
       filters: DataTableFilterState | undefined;
       sorters: Record<string, DataTableSortState> | undefined;
       dataTableRef: DataTableInst | null;
-      pagination: vue63.Ref<{
+      pagination: vue69.Ref<{
         page: number;
         pageSize: number;
         itemCount: number;
@@ -162,7 +162,7 @@ declare const __VLS_export: <P extends DataObject, D extends DataObject, R exten
       filters: DataTableFilterState | undefined;
       sorters: Record<string, DataTableSortState> | undefined;
       dataTableRef: DataTableInst | null;
-      pagination: vue63.Ref<{
+      pagination: vue69.Ref<{
         page: number;
         pageSize: number;
         itemCount: number;
@@ -200,7 +200,7 @@ declare const __VLS_export: <P extends DataObject, D extends DataObject, R exten
       filters: DataTableFilterState | undefined;
       sorters: Record<string, DataTableSortState> | undefined;
       dataTableRef: DataTableInst | null;
-      pagination: vue63.Ref<{
+      pagination: vue69.Ref<{
         page: number;
         pageSize: number;
         itemCount: number;
@@ -238,7 +238,7 @@ declare const __VLS_export: <P extends DataObject, D extends DataObject, R exten
       filters: DataTableFilterState | undefined;
       sorters: Record<string, DataTableSortState> | undefined;
       dataTableRef: DataTableInst | null;
-      pagination: vue63.Ref<{
+      pagination: vue69.Ref<{
         page: number;
         pageSize: number;
         itemCount: number;
@@ -276,7 +276,7 @@ declare const __VLS_export: <P extends DataObject, D extends DataObject, R exten
       filters: DataTableFilterState | undefined;
       sorters: Record<string, DataTableSortState> | undefined;
       dataTableRef: DataTableInst | null;
-      pagination: vue63.Ref<{
+      pagination: vue69.Ref<{
         page: number;
         pageSize: number;
         itemCount: number;
@@ -301,7 +301,7 @@ declare const __VLS_export: <P extends DataObject, D extends DataObject, R exten
     }) => any;
   };
   emit: DataTablePlusEmits<P, D, R>;
-}>) => vue63.VNode & {
+}>) => vue69.VNode & {
   __ctx?: Awaited<typeof __VLS_setup>;
 };
 declare const _default: typeof __VLS_export;

package/dist/components/index.d.ts

@@ -6,7 +6,7 @@ import { _default as _default$2 } from "./data-table-plus/DataTablePlus.vue.js";
 import { ClassStyle, DataTablePlusEmits, DataTablePlusExpose, DataTablePlusFields, DataTablePlusInst, DataTablePlusProps } from "./data-table-plus/index.js";
 import { _default as _default$3 } from "./loading-provider/LoadingProvider.vue.js";
 import { LoadingProviderInst, LoadingProviderProps, loadingProviderInjectionKey } from "./loading-provider/index.js";
-import { NaiveFormRules } from "../composables/use-naive-form.js";
+import { UseNaiveFormRules } from "../composables/use-naive-form.js";
 import { _default as _default$4 } from "./config-providers/ConfigProviders.vue.js";
 import { ConfigProvidersProps } from "./config-providers/index.js";
 import { _default as _default$5 } from "./copy-button/CopyButton.vue.js";

package/dist/components/loading-provider/LoadingProvider.vue.d.ts

@@ -1,5 +1,5 @@
 import { LoadingProviderProps } from "./index.js";
-import * as vue23 from "vue";
+import * as vue33 from "vue";
 
 //#region src/components/loading-provider/LoadingProvider.vue.d.ts
 declare var __VLS_26: {}, __VLS_29: {}, __VLS_31: {};
@@ -10,7 +10,7 @@ type __VLS_Slots = {} & {
 } & {
   default?: (props: typeof __VLS_31) => any;
 };
-declare const __VLS_base: vue23.DefineComponent<LoadingProviderProps, {}, {}, {}, {}, vue23.ComponentOptionsMixin, vue23.ComponentOptionsMixin, {}, string, vue23.PublicProps, Readonly<LoadingProviderProps> & Readonly<{}>, {}, {}, {}, {}, string, vue23.ComponentProvideOptions, false, {}, any>;
+declare const __VLS_base: vue33.DefineComponent<LoadingProviderProps, {}, {}, {}, {}, vue33.ComponentOptionsMixin, vue33.ComponentOptionsMixin, {}, string, vue33.PublicProps, Readonly<LoadingProviderProps> & Readonly<{}>, {}, {}, {}, {}, string, vue33.ComponentProvideOptions, false, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
 declare const _default: typeof __VLS_export;
 type __VLS_WithSlots<T, S> = T & {

package/dist/components/preset-form/PresetForm.js

@@ -9,7 +9,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
 	__name: "PresetForm",
 	props: {
 		options: {},
-		values: {},
+		value: {},
 		rules: {},
 		clearRules: {},
 		formProps: {},
@@ -18,7 +18,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
 	emits: ["validated"],
 	setup(__props, { expose: __expose, emit: __emit }) {
 		const emit = __emit;
-		const { formValue, formRules, formRef, formProps: _formProps, setValue, validate, resetValidation, resetForm, reset, clear, onValidated } = useNaiveForm(useTemplateRef("form-ref"), __props.values, {
+		const { formValueRef, formRulesRef, formInstRef, formProps: _formProps, setValue, validate, resetValidation, resetForm, reset, clear, onValidated } = useNaiveForm(useTemplateRef("form-ref"), {
+			value: __props.value,
 			rules: __props.rules,
 			clearRules: __props.clearRules
 		});
@@ -36,9 +37,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
 			if (key) setValue({ [key]: val });
 		}
 		const expose = {
-			formRef,
-			formValue,
-			formRules,
+			formInstRef,
+			formValueRef,
+			formRulesRef,
 			formProps: _formProps,
 			setValue,
 			validate,
@@ -51,9 +52,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
 		const templateBind = computed(() => {
 			return {
 				...expose,
-				formRef: toValue(formRef),
-				formValue: toValue(formValue),
-				formRules: toValue(formRules),
+				formRef: toValue(formInstRef),
+				formValue: toValue(formValueRef),
+				formRules: toValue(formRulesRef),
 				formProps: toValue(_formProps)
 			};
 		});
@@ -61,8 +62,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
 		return (_ctx, _cache) => {
 			return openBlock(), createBlock(unref(NForm), mergeProps({
 				ref: "form-ref",
-				model: unref(formValue),
-				rules: unref(formRules)
+				model: unref(formValueRef),
+				rules: unref(formRulesRef)
 			}, __props.formProps), {
 				default: withCtx(() => [
 					renderSlot(_ctx.$slots, "header", normalizeProps(guardReactiveProps(templateBind.value))),
@@ -91,7 +92,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
 									})), { key: 0 })) : (openBlock(), createBlock(unref(PresetInput_default), {
 										key: 1,
 										options: opt,
-										value: key ? unref(formValue)[key] : void 0,
+										value: key ? unref(formValueRef)[key] : void 0,
 										"onUpdate:value": (val) => onPresetInputUpdate(val, key)
 									}, null, 8, [
 										"options",
@@ -143,7 +144,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
 										})), { key: 0 })) : (openBlock(), createBlock(unref(PresetInput_default), {
 											key: 1,
 											options: opt,
-											value: key ? unref(formValue)[key] : void 0,
+											value: key ? unref(formValueRef)[key] : void 0,
 											"onUpdate:value": (val) => onPresetInputUpdate(val, key)
 										}, null, 8, [
 											"options",

package/dist/components/preset-form/PresetForm.vue.d.ts

@@ -1,19 +1,19 @@
 import { DataObject } from "../../composables/use-data-request.js";
 import { PresetFormExpose, PresetFormProps } from "./index.js";
-import * as _vueuse_core4 from "@vueuse/core";
-import * as vue33 from "vue";
+import * as _vueuse_core8 from "@vueuse/core";
+import * as vue48 from "vue";
 import * as naive_ui0 from "naive-ui";
 import { FormInst } from "naive-ui";
 import * as async_validator0 from "async-validator";
 
 //#region src/components/preset-form/PresetForm.vue.d.ts
 declare const __VLS_export: <V extends DataObject>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_exposed?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
-  props: vue33.PublicProps & __VLS_PrettifyLocal<PresetFormProps<V> & {
+  props: vue48.PublicProps & __VLS_PrettifyLocal<PresetFormProps<V> & {
     onValidated?: ((val: V) => any) | undefined;
   }> & (typeof globalThis extends {
     __VLS_PROPS_FALLBACK: infer P;
   } ? P : {});
-  expose: (exposed: vue33.ShallowUnwrapRef<PresetFormExpose<V>>) => void;
+  expose: (exposed: vue48.ShallowUnwrapRef<PresetFormExpose<V>>) => void;
   attrs: any;
   slots: {
     header?: (props: {
@@ -21,9 +21,12 @@ declare const __VLS_export: <V extends DataObject>(__VLS_props: NonNullable<Awai
       formValue: V;
       formRules: Partial<Record<keyof V, naive_ui0.FormRules | naive_ui0.FormItemRule | naive_ui0.FormItemRule[]>>;
       formProps: {
-        model: vue33.Reactive<V>;
-        rules: vue33.Reactive<Partial<Record<keyof V, naive_ui0.FormRules | naive_ui0.FormItemRule | naive_ui0.FormItemRule[]>>>;
+        model: vue48.Reactive<V>;
+        rules: vue48.Reactive<Partial<Record<keyof V, naive_ui0.FormRules | naive_ui0.FormItemRule | naive_ui0.FormItemRule[]>>>;
       };
+      formInstRef: Readonly<vue48.ShallowRef<FormInst | null>>;
+      formValueRef: vue48.Ref<V, V>;
+      formRulesRef: vue48.Ref<Partial<Record<keyof V, naive_ui0.FormRules | naive_ui0.FormItemRule | naive_ui0.FormItemRule[]>>, Partial<Record<keyof V, naive_ui0.FormRules | naive_ui0.FormItemRule | naive_ui0.FormItemRule[]>>>;
       setValue: (_value: Partial<V>) => void;
       validate: () => Promise<{
         warnings?: async_validator0.ValidateError[][];
@@ -32,7 +35,7 @@ declare const __VLS_export: <V extends DataObject>(__VLS_props: NonNullable<Awai
       resetForm: () => void;
       reset: () => void;
       clear: () => void;
-      onValidated: _vueuse_core4.EventHookOn<[V]>;
+      onValidated: _vueuse_core8.EventHookOn<[V]>;
     }) => any;
   } & {
     default?: (props: {
@@ -40,9 +43,12 @@ declare const __VLS_export: <V extends DataObject>(__VLS_props: NonNullable<Awai
       formValue: V;
       formRules: Partial<Record<keyof V, naive_ui0.FormRules | naive_ui0.FormItemRule | naive_ui0.FormItemRule[]>>;
       formProps: {
-        model: vue33.Reactive<V>;
-        rules: vue33.Reactive<Partial<Record<keyof V, naive_ui0.FormRules | naive_ui0.FormItemRule | naive_ui0.FormItemRule[]>>>;
+        model: vue48.Reactive<V>;
+        rules: vue48.Reactive<Partial<Record<keyof V, naive_ui0.FormRules | naive_ui0.FormItemRule | naive_ui0.FormItemRule[]>>>;
       };
+      formInstRef: Readonly<vue48.ShallowRef<FormInst | null>>;
+      formValueRef: vue48.Ref<V, V>;
+      formRulesRef: vue48.Ref<Partial<Record<keyof V, naive_ui0.FormRules | naive_ui0.FormItemRule | naive_ui0.FormItemRule[]>>, Partial<Record<keyof V, naive_ui0.FormRules | naive_ui0.FormItemRule | naive_ui0.FormItemRule[]>>>;
       setValue: (_value: Partial<V>) => void;
       validate: () => Promise<{
         warnings?: async_validator0.ValidateError[][];
@@ -51,7 +57,7 @@ declare const __VLS_export: <V extends DataObject>(__VLS_props: NonNullable<Awai
       resetForm: () => void;
       reset: () => void;
       clear: () => void;
-      onValidated: _vueuse_core4.EventHookOn<[V]>;
+      onValidated: _vueuse_core8.EventHookOn<[V]>;
     }) => any;
   } & {
     footer?: (props: {
@@ -59,9 +65,12 @@ declare const __VLS_export: <V extends DataObject>(__VLS_props: NonNullable<Awai
       formValue: V;
       formRules: Partial<Record<keyof V, naive_ui0.FormRules | naive_ui0.FormItemRule | naive_ui0.FormItemRule[]>>;
       formProps: {
-        model: vue33.Reactive<V>;
-        rules: vue33.Reactive<Partial<Record<keyof V, naive_ui0.FormRules | naive_ui0.FormItemRule | naive_ui0.FormItemRule[]>>>;
+        model: vue48.Reactive<V>;
+        rules: vue48.Reactive<Partial<Record<keyof V, naive_ui0.FormRules | naive_ui0.FormItemRule | naive_ui0.FormItemRule[]>>>;
       };
+      formInstRef: Readonly<vue48.ShallowRef<FormInst | null>>;
+      formValueRef: vue48.Ref<V, V>;
+      formRulesRef: vue48.Ref<Partial<Record<keyof V, naive_ui0.FormRules | naive_ui0.FormItemRule | naive_ui0.FormItemRule[]>>, Partial<Record<keyof V, naive_ui0.FormRules | naive_ui0.FormItemRule | naive_ui0.FormItemRule[]>>>;
       setValue: (_value: Partial<V>) => void;
       validate: () => Promise<{
         warnings?: async_validator0.ValidateError[][];
@@ -70,11 +79,11 @@ declare const __VLS_export: <V extends DataObject>(__VLS_props: NonNullable<Awai
       resetForm: () => void;
       reset: () => void;
       clear: () => void;
-      onValidated: _vueuse_core4.EventHookOn<[V]>;
+      onValidated: _vueuse_core8.EventHookOn<[V]>;
     }) => any;
   };
   emit: (e: "validated", val: V) => void;
-}>) => vue33.VNode & {
+}>) => vue48.VNode & {
   __ctx?: Awaited<typeof __VLS_setup>;
 };
 declare const _default: typeof __VLS_export;

package/dist/components/preset-form/index.d.ts

@@ -1,6 +1,6 @@
 import { DataObject } from "../../composables/use-data-request.js";
 import { ClassStyle } from "../data-table-plus/index.js";
-import { NaiveFormClearRules, NaiveFormReturns, NaiveFormRules } from "../../composables/use-naive-form.js";
+import { UseNaiveFormClearRules, UseNaiveFormReturns, UseNaiveFormRules } from "../../composables/use-naive-form.js";
 import { PresetInputOptions } from "../preset-input/index.js";
 import { _default } from "./PresetForm.vue.js";
 import { VNode } from "vue";
@@ -8,7 +8,7 @@ import { FormItemProps, FormItemRule, FormProps, FormRules, GridItemProps, GridP
 import { ComponentExposed } from "vue-component-type-helpers";
 
 //#region src/components/preset-form/index.d.ts
-type PresetFormExpose<V extends DataObject = DataObject> = NaiveFormReturns<V>;
+type PresetFormExpose<V extends DataObject = DataObject> = UseNaiveFormReturns<V>;
 type PresetFormOptionItem<V extends DataObject = DataObject> = PresetInputOptions & {
   key?: keyof V;
   label?: string | (() => string);
@@ -25,9 +25,9 @@ type PresetFormOptionItem<V extends DataObject = DataObject> = PresetInputOption
 type PresetFormOptions<V extends DataObject = DataObject> = PresetFormOptionItem<V>[];
 type PresetFormProps<V extends DataObject = DataObject> = {
   options?: PresetFormOptions<V>;
-  values?: V;
-  rules?: NaiveFormRules<V>;
-  clearRules?: NaiveFormClearRules;
+  value?: V;
+  rules?: UseNaiveFormRules<V>;
+  clearRules?: UseNaiveFormClearRules;
   formProps?: FormProps & ClassStyle;
   gridProps?: GridProps & ClassStyle;
 };

package/dist/components/preset-input/PresetInput.vue.d.ts

@@ -1,9 +1,9 @@
 import { PresetInputProps } from "./index.js";
-import * as vue52 from "vue";
+import * as vue46 from "vue";
 
 //#region src/components/preset-input/PresetInput.vue.d.ts
 declare const __VLS_export: <V>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_exposed?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
-  props: vue52.PublicProps & __VLS_PrettifyLocal<PresetInputProps<V> & {
+  props: vue46.PublicProps & __VLS_PrettifyLocal<PresetInputProps<V> & {
     "onUpdate:value"?: ((val?: V | undefined) => any) | undefined;
   }> & (typeof globalThis extends {
     __VLS_PROPS_FALLBACK: infer P;
@@ -12,7 +12,7 @@ declare const __VLS_export: <V>(__VLS_props: NonNullable<Awaited<typeof __VLS_se
   attrs: any;
   slots: {};
   emit: (e: "update:value", val?: V) => void;
-}>) => vue52.VNode & {
+}>) => vue46.VNode & {
   __ctx?: Awaited<typeof __VLS_setup>;
 };
 declare const _default: typeof __VLS_export;

package/dist/components/preset-picker/PresetPicker.vue.d.ts

@@ -1,11 +1,11 @@
 import { DataObject } from "../../composables/use-data-request.js";
 import { PresetPickerEmits, PresetPickerExpose, PresetPickerProps, PresetPickerValue } from "./index.js";
-import * as vue57 from "vue";
+import * as vue79 from "vue";
 import { DataTableColumns } from "naive-ui";
 
 //#region src/components/preset-picker/PresetPicker.vue.d.ts
 declare const __VLS_export: <V extends PresetPickerValue, R extends DataObject>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_exposed?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
-  props: vue57.PublicProps & __VLS_PrettifyLocal<PresetPickerProps<V, R> & {
+  props: vue79.PublicProps & __VLS_PrettifyLocal<PresetPickerProps<V, R> & {
     onClose?: (() => any) | undefined;
     "onUpdate:value"?: ((val: V | null, raw: R | R[] | null) => any) | undefined;
     onAfterEnter?: (() => any) | undefined;
@@ -18,7 +18,7 @@ declare const __VLS_export: <V extends PresetPickerValue, R extends DataObject>(
   }> & (typeof globalThis extends {
     __VLS_PROPS_FALLBACK: infer P;
   } ? P : {});
-  expose: (exposed: vue57.ShallowUnwrapRef<PresetPickerExpose<R>>) => void;
+  expose: (exposed: vue79.ShallowUnwrapRef<PresetPickerExpose<R>>) => void;
   attrs: any;
   slots: {
     'button-icon'?: (props: {}) => any;
@@ -54,7 +54,7 @@ declare const __VLS_export: <V extends PresetPickerValue, R extends DataObject>(
     'modal-close'?: (props: {}) => any;
   };
   emit: PresetPickerEmits<V, R>;
-}>) => vue57.VNode & {
+}>) => vue79.VNode & {
   __ctx?: Awaited<typeof __VLS_setup>;
 };
 declare const _default: typeof __VLS_export;

package/dist/components/preset-select/PresetSelect.js

@@ -74,20 +74,20 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
 			requestOptions: __props.requestOptions,
 			requestPlugins: __props.requestPlugins
 		});
-		onBefore((params$1) => {
-			emit("before", params$1);
+		onBefore((params) => {
+			emit("before", params);
 		});
-		onSuccess((data$1, params$1) => {
-			emit("success", data$1, params$1);
-			data$1?.[_fields.list]?.forEach((f) => {
+		onSuccess((data, params) => {
+			emit("success", data, params);
+			data?.[_fields.list]?.forEach((f) => {
 				if (!_dataCache.some((s) => s?.[_fields.rowKey] === f?.[_fields.rowKey])) _dataCache.push(f);
 			});
 		});
-		onError((err, params$1) => {
-			emit("error", err, params$1);
+		onError((err, params) => {
+			emit("error", err, params);
 		});
-		onFinally((params$1, data$1, err) => {
-			emit("finally", params$1, data$1, err);
+		onFinally((params, data, err) => {
+			emit("finally", params, data, err);
 		});
 		const optionsReactive = computed(() => {
 			return typeof __props.optionFormat === "function" ? list.value.map((m) => __props.optionFormat(m)).filter((f) => !!f) : list.value.map((m) => {

package/dist/components/preset-select/PresetSelect.vue.d.ts

@@ -1,12 +1,12 @@
 import { DataObject, UseDataRequestPagination } from "../../composables/use-data-request.js";
 import { PresetSelectEmits, PresetSelectExpose, PresetSelectProps, PresetSelectValue } from "./index.js";
 import * as _vueuse_core11 from "@vueuse/core";
-import * as vue60 from "vue";
+import * as vue66 from "vue";
 import { SelectInst, SelectOption } from "naive-ui";
 
 //#region src/components/preset-select/PresetSelect.vue.d.ts
 declare const __VLS_export: <V extends PresetSelectValue, P extends DataObject, D extends DataObject, R extends DataObject>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_exposed?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
-  props: vue60.PublicProps & __VLS_PrettifyLocal<PresetSelectProps<V, P, D, R> & {
+  props: vue66.PublicProps & __VLS_PrettifyLocal<PresetSelectProps<V, P, D, R> & {
     onSuccess?: ((data: D, params: P[]) => any) | undefined;
     onError?: ((err: Error, params: P[]) => any) | undefined;
     onClear?: (() => any) | undefined;
@@ -23,7 +23,7 @@ declare const __VLS_export: <V extends PresetSelectValue, P extends DataObject,
   }> & (typeof globalThis extends {
     __VLS_PROPS_FALLBACK: infer P_1;
   } ? P_1 : {});
-  expose: (exposed: vue60.ShallowUnwrapRef<PresetSelectExpose<P, D, R>>) => void;
+  expose: (exposed: vue66.ShallowUnwrapRef<PresetSelectExpose<P, D, R>>) => void;
   attrs: any;
   slots: {
     header?: (props: {
@@ -162,7 +162,7 @@ declare const __VLS_export: <V extends PresetSelectValue, P extends DataObject,
     }) => any;
   };
   emit: PresetSelectEmits<V, P, D, R>;
-}>) => vue60.VNode & {
+}>) => vue66.VNode & {
   __ctx?: Awaited<typeof __VLS_setup>;
 };
 declare const _default: typeof __VLS_export;

package/dist/components/remote-request/RemoteRequest.js

@@ -34,17 +34,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
 			requestOptions: __props.requestOptions,
 			requestPlugins: __props.requestPlugins
 		});
-		onBefore((params$1) => {
-			emit("before", params$1);
+		onBefore((params) => {
+			emit("before", params);
 		});
-		onSuccess((data$1, params$1) => {
-			emit("success", data$1, params$1);
+		onSuccess((data, params) => {
+			emit("success", data, params);
 		});
-		onError((err, params$1) => {
-			emit("error", err, params$1);
+		onError((err, params) => {
+			emit("error", err, params);
 		});
-		onFinally((params$1, data$1, err) => {
-			emit("finally", params$1, data$1, err);
+		onFinally((params, data, err) => {
+			emit("finally", params, data, err);
 		});
 		const expose = {
 			loading,

package/dist/components/remote-request/RemoteRequest.vue.d.ts

@@ -1,11 +1,11 @@
 import { DataObject, UseDataRequestPagination } from "../../composables/use-data-request.js";
 import { RemoteRequestEmits, RemoteRequestExpose, RemoteRequestProps } from "./index.js";
-import * as _vueuse_core7 from "@vueuse/core";
-import * as vue54 from "vue";
+import * as _vueuse_core4 from "@vueuse/core";
+import * as vue38 from "vue";
 
 //#region src/components/remote-request/RemoteRequest.vue.d.ts
 declare const __VLS_export: <P extends DataObject, D extends DataObject, R extends DataObject>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_exposed?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
-  props: vue54.PublicProps & __VLS_PrettifyLocal<RemoteRequestProps<P, D> & {
+  props: vue38.PublicProps & __VLS_PrettifyLocal<RemoteRequestProps<P, D> & {
     onSuccess?: ((data: D, params: P[]) => any) | undefined;
     onError?: ((err: Error, params: P[]) => any) | undefined;
     onFinally?: ((params: P[], data?: D | undefined, err?: Error | undefined) => any) | undefined;
@@ -13,7 +13,7 @@ declare const __VLS_export: <P extends DataObject, D extends DataObject, R exten
   }> & (typeof globalThis extends {
     __VLS_PROPS_FALLBACK: infer P_1;
   } ? P_1 : {});
-  expose: (exposed: vue54.ShallowUnwrapRef<RemoteRequestExpose<P, D, R>>) => void;
+  expose: (exposed: vue38.ShallowUnwrapRef<RemoteRequestExpose<P, D, R>>) => void;
   attrs: any;
   slots: {
     default?: (props: {
@@ -36,14 +36,14 @@ declare const __VLS_export: <P extends DataObject, D extends DataObject, R exten
       setParams: (_params: Partial<P>) => void;
       runParams: (_params: Partial<P>) => void;
       runParamsAsync: (_params: Partial<P>) => Promise<D>;
-      onBefore: _vueuse_core7.EventHookOn<[P[]]>;
-      onSuccess: _vueuse_core7.EventHookOn<[D, P[]]>;
-      onError: _vueuse_core7.EventHookOn<[Error, P[]]>;
-      onFinally: _vueuse_core7.EventHookOn<[P[], D | undefined, Error | undefined]>;
+      onBefore: _vueuse_core4.EventHookOn<[P[]]>;
+      onSuccess: _vueuse_core4.EventHookOn<[D, P[]]>;
+      onError: _vueuse_core4.EventHookOn<[Error, P[]]>;
+      onFinally: _vueuse_core4.EventHookOn<[P[], D | undefined, Error | undefined]>;
     }) => any;
   };
   emit: RemoteRequestEmits<P, D>;
-}>) => vue54.VNode & {
+}>) => vue38.VNode & {
   __ctx?: Awaited<typeof __VLS_setup>;
 };
 declare const _default: typeof __VLS_export;

package/dist/components/search-input/SearchInput.vue.d.ts

@@ -1,5 +1,5 @@
 import { SearchInputProps } from "./index.js";
-import * as vue42 from "vue";
+import * as vue23 from "vue";
 
 //#region src/components/search-input/SearchInput.vue.d.ts
 declare var __VLS_19: {}, __VLS_21: {}, __VLS_28: {
@@ -15,11 +15,11 @@ type __VLS_Slots = {} & {
 } & {
   'button-icon'?: (props: typeof __VLS_39) => any;
 };
-declare const __VLS_base: vue42.DefineComponent<SearchInputProps, {}, {}, {}, {}, vue42.ComponentOptionsMixin, vue42.ComponentOptionsMixin, {} & {
+declare const __VLS_base: vue23.DefineComponent<SearchInputProps, {}, {}, {}, {}, vue23.ComponentOptionsMixin, vue23.ComponentOptionsMixin, {} & {
   "update:value": (v: string | null | undefined) => any;
-}, string, vue42.PublicProps, Readonly<SearchInputProps> & Readonly<{
+}, string, vue23.PublicProps, Readonly<SearchInputProps> & Readonly<{
   "onUpdate:value"?: ((v: string | null | undefined) => any) | undefined;
-}>, {}, {}, {}, {}, string, vue42.ComponentProvideOptions, false, {}, any>;
+}>, {}, {}, {}, {}, string, vue23.ComponentProvideOptions, false, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
 declare const _default: typeof __VLS_export;
 type __VLS_WithSlots<T, S> = T & {

package/dist/components/toggle-input/ToggleInput.vue.d.ts

@@ -1,5 +1,5 @@
 import { ClassStyle } from "../data-table-plus/index.js";
-import * as vue8 from "vue";
+import * as vue13 from "vue";
 import { InputProps } from "naive-ui";
 
 //#region src/components/toggle-input/ToggleInput.vue.d.ts
@@ -27,14 +27,14 @@ type __VLS_Slots = {} & {
 } & {
   default?: (props: typeof __VLS_13) => any;
 };
-declare const __VLS_base: vue8.DefineComponent<__VLS_PublicProps, {}, {}, {}, {}, vue8.ComponentOptionsMixin, vue8.ComponentOptionsMixin, {
+declare const __VLS_base: vue13.DefineComponent<__VLS_PublicProps, {}, {}, {}, {}, vue13.ComponentOptionsMixin, vue13.ComponentOptionsMixin, {
   "update:value": (value: string | number | undefined) => any;
 } & {
   trigger: () => any;
-}, string, vue8.PublicProps, Readonly<__VLS_PublicProps> & Readonly<{
+}, string, vue13.PublicProps, Readonly<__VLS_PublicProps> & Readonly<{
   "onUpdate:value"?: ((value: string | number | undefined) => any) | undefined;
   onTrigger?: (() => any) | undefined;
-}>, {}, {}, {}, {}, string, vue8.ComponentProvideOptions, false, {}, any>;
+}>, {}, {}, {}, {}, string, vue13.ComponentProvideOptions, false, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
 declare const _default: typeof __VLS_export;
 type __VLS_WithSlots<T, S> = T & {

package/dist/components/tooltip-button/TooltipButton.vue.d.ts

@@ -1,5 +1,5 @@
 import { TooltipButtonProps } from "./index.js";
-import * as vue13 from "vue";
+import * as vue8 from "vue";
 
 //#region src/components/tooltip-button/TooltipButton.vue.d.ts
 declare var __VLS_17: {}, __VLS_20: {}, __VLS_22: {};
@@ -10,11 +10,11 @@ type __VLS_Slots = {} & {
 } & {
   tooltip?: (props: typeof __VLS_22) => any;
 };
-declare const __VLS_base: vue13.DefineComponent<TooltipButtonProps, {}, {}, {}, {}, vue13.ComponentOptionsMixin, vue13.ComponentOptionsMixin, {} & {
+declare const __VLS_base: vue8.DefineComponent<TooltipButtonProps, {}, {}, {}, {}, vue8.ComponentOptionsMixin, vue8.ComponentOptionsMixin, {} & {
   click: (ev: MouseEvent) => any;
-}, string, vue13.PublicProps, Readonly<TooltipButtonProps> & Readonly<{
+}, string, vue8.PublicProps, Readonly<TooltipButtonProps> & Readonly<{
   onClick?: ((ev: MouseEvent) => any) | undefined;
-}>, {}, {}, {}, {}, string, vue13.ComponentProvideOptions, false, {}, any>;
+}>, {}, {}, {}, {}, string, vue8.ComponentProvideOptions, false, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
 declare const _default: typeof __VLS_export;
 type __VLS_WithSlots<T, S> = T & {

package/dist/components/transition/BaseTransition.vue.d.ts

@@ -1,12 +1,12 @@
 import { TransitionProps as TransitionProps$1 } from "./index.js";
-import * as vue47 from "vue";
+import * as vue41 from "vue";
 
 //#region src/components/transition/BaseTransition.vue.d.ts
 declare var __VLS_7: {};
 type __VLS_Slots = {} & {
   default?: (props: typeof __VLS_7) => any;
 };
-declare const __VLS_base: vue47.DefineComponent<TransitionProps$1, {}, {}, {}, {}, vue47.ComponentOptionsMixin, vue47.ComponentOptionsMixin, {}, string, vue47.PublicProps, Readonly<TransitionProps$1> & Readonly<{}>, {}, {}, {}, {}, string, vue47.ComponentProvideOptions, false, {}, any>;
+declare const __VLS_base: vue41.DefineComponent<TransitionProps$1, {}, {}, {}, {}, vue41.ComponentOptionsMixin, vue41.ComponentOptionsMixin, {}, string, vue41.PublicProps, Readonly<TransitionProps$1> & Readonly<{}>, {}, {}, {}, {}, string, vue41.ComponentProvideOptions, false, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
 declare const _default: typeof __VLS_export;
 type __VLS_WithSlots<T, S> = T & {

package/dist/components/type-writer/TypeWriter.js

@@ -43,14 +43,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
 		onStop((v) => {
 			emit("stop", v);
 		});
-		const { html } = useMarkdownIt(void 0, typedValue, {
-			html: true,
-			linkify: true,
-			typographer: true,
-			breaks: true,
-			highlight
+		const { htmlRef } = useMarkdownIt(void 0, {
+			value: typedValue,
+			markdownItOptions: {
+				html: true,
+				linkify: true,
+				typographer: true,
+				breaks: true,
+				highlight
+			}
 		});
-		const renderValue = computed(() => __props.markdown ? html.value : typedValue.value);
+		const renderValue = computed(() => __props.markdown ? htmlRef.value : typedValue.value);
 		return (_ctx, _cache) => {
 			return openBlock(), createBlock(unref(NEl), {
 				tag: "div",

package/dist/components/type-writer/TypeWriter.vue.d.ts

@@ -1,22 +1,22 @@
 import { TypeWriterProps } from "./index.js";
-import * as vue73 from "vue";
+import * as vue82 from "vue";
 
 //#region src/components/type-writer/TypeWriter.vue.d.ts
-declare const __VLS_export: vue73.DefineComponent<TypeWriterProps, {}, {}, {}, {}, vue73.ComponentOptionsMixin, vue73.ComponentOptionsMixin, {} & {
+declare const __VLS_export: vue82.DefineComponent<TypeWriterProps, {}, {}, {}, {}, vue82.ComponentOptionsMixin, vue82.ComponentOptionsMixin, {} & {
   start: () => any;
   update: (v: {
     index: number;
     value: string;
   }) => any;
   stop: (v: string) => any;
-}, string, vue73.PublicProps, Readonly<TypeWriterProps> & Readonly<{
+}, string, vue82.PublicProps, Readonly<TypeWriterProps> & Readonly<{
   onStart?: (() => any) | undefined;
   onUpdate?: ((v: {
     index: number;
     value: string;
   }) => any) | undefined;
   onStop?: ((v: string) => any) | undefined;
-}>, {}, {}, {}, {}, string, vue73.ComponentProvideOptions, false, {}, any>;
+}>, {}, {}, {}, {}, string, vue82.ComponentProvideOptions, false, {}, any>;
 declare const _default: typeof __VLS_export;
 //#endregion
 export { _default };

package/dist/components.d.ts

@@ -6,7 +6,7 @@ import { _default as _default$2 } from "./components/data-table-plus/DataTablePl
 import { ClassStyle, DataTablePlusEmits, DataTablePlusExpose, DataTablePlusFields, DataTablePlusInst, DataTablePlusProps } from "./components/data-table-plus/index.js";
 import { _default as _default$3 } from "./components/loading-provider/LoadingProvider.vue.js";
 import { LoadingProviderInst, LoadingProviderProps, loadingProviderInjectionKey } from "./components/loading-provider/index.js";
-import { NaiveFormRules } from "./composables/use-naive-form.js";
+import { UseNaiveFormRules } from "./composables/use-naive-form.js";
 import { _default } from "./components/config-providers/ConfigProviders.vue.js";
 import { ConfigProvidersProps } from "./components/config-providers/index.js";
 import { _default as _default$1 } from "./components/copy-button/CopyButton.vue.js";
@@ -28,4 +28,4 @@ import { _default as _default$13 } from "./components/type-writer/TypeWriter.vue
 import { TypeWriterProps } from "./components/type-writer/index.js";
 import "./components/index.js";
 import { ComponentAttrs, ComponentEmit, ComponentExposed, ComponentProps, ComponentSlots } from "vue-component-type-helpers";
-export { ArrayAwareType, ClassStyle, ComponentAttrs, ComponentEmit, ComponentExposed, ComponentProps, ComponentSlots, ConfigProvidersProps, CopyButtonProps, DataTablePlusEmits, DataTablePlusExpose, DataTablePlusFields, DataTablePlusInst, DataTablePlusProps, LoadingProviderInst, LoadingProviderProps, _default as NConfigProviders, _default$1 as NCopyButton, _default$2 as NDataTablePlus, _default$3 as NLoadingProvider, _default$4 as NPresetForm, _default$5 as NPresetInput, _default$6 as NPresetPicker, _default$7 as NPresetSelect, _default$8 as NRemoteRequest, _default$9 as NSearchInput, _default$10 as NToggleInput, _default$11 as NTooltipButton, _default$12 as NTransition, _default$13 as NTypeWriter, NaiveFormRules, OptionFormat, PresetFormExpose, PresetFormInst, PresetFormOptionItem, PresetFormOptions, PresetFormProps, PresetInputOptions, PresetInputProps, PresetInputType, PresetPickerEmits, PresetPickerExpose, PresetPickerInst, PresetPickerProps, PresetPickerValue, PresetSelectEmits, PresetSelectExpose, PresetSelectFields, PresetSelectInst, PresetSelectProps, PresetSelectValue, RemoteRequestEmits, RemoteRequestExpose, RemoteRequestFields, RemoteRequestInst, RemoteRequestProps, SearchInputProps, TooltipButtonProps, TransitionProps, TypeWriterProps, loadingProviderInjectionKey };
+export { ArrayAwareType, ClassStyle, ComponentAttrs, ComponentEmit, ComponentExposed, ComponentProps, ComponentSlots, ConfigProvidersProps, CopyButtonProps, DataTablePlusEmits, DataTablePlusExpose, DataTablePlusFields, DataTablePlusInst, DataTablePlusProps, LoadingProviderInst, LoadingProviderProps, _default as NConfigProviders, _default$1 as NCopyButton, _default$2 as NDataTablePlus, _default$3 as NLoadingProvider, _default$4 as NPresetForm, _default$5 as NPresetInput, _default$6 as NPresetPicker, _default$7 as NPresetSelect, _default$8 as NRemoteRequest, _default$9 as NSearchInput, _default$10 as NToggleInput, _default$11 as NTooltipButton, _default$12 as NTransition, _default$13 as NTypeWriter, OptionFormat, PresetFormExpose, PresetFormInst, PresetFormOptionItem, PresetFormOptions, PresetFormProps, PresetInputOptions, PresetInputProps, PresetInputType, PresetPickerEmits, PresetPickerExpose, PresetPickerInst, PresetPickerProps, PresetPickerValue, PresetSelectEmits, PresetSelectExpose, PresetSelectFields, PresetSelectInst, PresetSelectProps, PresetSelectValue, RemoteRequestEmits, RemoteRequestExpose, RemoteRequestFields, RemoteRequestInst, RemoteRequestProps, SearchInputProps, TooltipButtonProps, TransitionProps, TypeWriterProps, UseNaiveFormRules, loadingProviderInjectionKey };

package/dist/composables/index.d.ts

@@ -1,4 +1,4 @@
 import { DataObject, DataRequestFields, UseDataRequestOptions, UseDataRequestPagination, UseDataRequestReturns, useDataRequest } from "./use-data-request.js";
 import { useLoading } from "./use-loading.js";
-import { NaiveFormClearRules, NaiveFormOptions, NaiveFormReturns, NaiveFormRules, useNaiveForm } from "./use-naive-form.js";
-import { NaiveThemeOptions, NaiveThemeReturns, useNaiveTheme } from "./use-naive-theme.js";
+import { UseNaiveFormClearRules, UseNaiveFormOptions, UseNaiveFormReturns, UseNaiveFormRules, useNaiveForm } from "./use-naive-form.js";
+import { UseNaiveThemeOptions, UseNaiveThemeReturns, useNaiveTheme } from "./use-naive-theme.js";

package/dist/composables/use-data-request.js

@@ -29,33 +29,33 @@ function useDataRequest(api, options) {
 		}],
 		manual,
 		...requestOptions,
-		onBefore: (params$1) => {
-			requestOptions?.onBefore?.(params$1);
-			onBeforeEvent.trigger(params$1);
+		onBefore: (params) => {
+			requestOptions?.onBefore?.(params);
+			onBeforeEvent.trigger(params);
 		},
-		onSuccess: (data$1, params$1) => {
-			requestOptions?.onSuccess?.(data$1, params$1);
-			onSuccessEvent.trigger(data$1, params$1);
-			if (_fields.page in params$1?.[0]) {
-				const _page = Number(params$1?.[0][_fields.page]);
+		onSuccess: (data, params) => {
+			requestOptions?.onSuccess?.(data, params);
+			onSuccessEvent.trigger(data, params);
+			if (_fields.page in params?.[0]) {
+				const _page = Number(params?.[0][_fields.page]);
 				if (!Number.isNaN(_page)) pagination.value.page = _page;
 			}
-			if (_fields.pageSize in params$1?.[0]) {
-				const _pageSize = Number(params$1?.[0][_fields.pageSize]);
+			if (_fields.pageSize in params?.[0]) {
+				const _pageSize = Number(params?.[0][_fields.pageSize]);
 				if (!Number.isNaN(_pageSize)) pagination.value.pageSize = _pageSize;
 			}
-			if (_fields.count in data$1) {
-				const _count = Number(data$1[_fields.count]);
+			if (_fields.count in data) {
+				const _count = Number(data[_fields.count]);
 				if (!Number.isNaN(_count)) pagination.value.itemCount = _count;
 			}
 		},
-		onError: (err, params$1) => {
-			requestOptions?.onError?.(err, params$1);
-			onErrorEvent.trigger(err, params$1);
+		onError: (err, params) => {
+			requestOptions?.onError?.(err, params);
+			onErrorEvent.trigger(err, params);
 		},
-		onFinally: (params$1, data$1, err) => {
-			requestOptions?.onFinally?.(params$1, data$1, err);
-			onFinallyEvent.trigger(params$1, data$1, err);
+		onFinally: (params, data, err) => {
+			requestOptions?.onFinally?.(params, data, err);
+			onFinallyEvent.trigger(params, data, err);
 		}
 	}, requestPlugins);
 	const list = computed(() => data.value?.[_fields.list] ?? []);

package/dist/composables/use-naive-form.d.ts

@@ -1,25 +1,26 @@
 import { DataObject } from "./use-data-request.js";
 import * as _vueuse_core3 from "@vueuse/core";
 import * as vue5 from "vue";
-import { Ref, TemplateRef } from "vue";
+import { MaybeRefOrGetter, Ref, TemplateRef } from "vue";
 import { FormInst, FormItemRule, FormRules } from "naive-ui";
 import { ValidateError } from "async-validator";
 
 //#region src/composables/use-naive-form.d.ts
-type NaiveFormClearRules = {
+type UseNaiveFormClearRules = {
   string?: string | null;
   number?: number | null;
   boolean?: boolean | null;
 };
-type NaiveFormRules<T extends DataObject> = Partial<Record<keyof T, FormRules | FormItemRule | FormItemRule[]>>;
-type NaiveFormOptions<T extends DataObject> = {
-  rules?: NaiveFormRules<T> | Ref<NaiveFormRules<T>>;
-  clearRules?: NaiveFormClearRules;
+type UseNaiveFormRules<T extends DataObject> = Partial<Record<keyof T, FormRules | FormItemRule | FormItemRule[]>>;
+type UseNaiveFormOptions<T extends DataObject> = {
+  value?: MaybeRefOrGetter<T>;
+  rules?: MaybeRefOrGetter<UseNaiveFormRules<T>>;
+  clearRules?: UseNaiveFormClearRules;
 };
-declare function useNaiveForm<T extends DataObject = DataObject>(formRef: TemplateRef<FormInst>, value?: T | Ref<T>, options?: NaiveFormOptions<T>): {
-  formRef: Readonly<vue5.ShallowRef<FormInst | null>>;
-  formValue: Ref<T, T>;
-  formRules: Ref<Partial<Record<keyof T, FormRules | FormItemRule | FormItemRule[]>>, Partial<Record<keyof T, FormRules | FormItemRule | FormItemRule[]>>>;
+declare function useNaiveForm<T extends DataObject = DataObject>(formInstRef: TemplateRef<FormInst>, options?: UseNaiveFormOptions<T>): {
+  formInstRef: Readonly<vue5.ShallowRef<FormInst | null>>;
+  formValueRef: Ref<T, T>;
+  formRulesRef: Ref<Partial<Record<keyof T, FormRules | FormItemRule | FormItemRule[]>>, Partial<Record<keyof T, FormRules | FormItemRule | FormItemRule[]>>>;
   formProps: {
     model: vue5.Reactive<T>;
     rules: vue5.Reactive<Partial<Record<keyof T, FormRules | FormItemRule | FormItemRule[]>>>;
@@ -34,6 +35,6 @@ declare function useNaiveForm<T extends DataObject = DataObject>(formRef: Templa
   clear: () => void;
   onValidated: _vueuse_core3.EventHookOn<[T]>;
 };
-type NaiveFormReturns<T extends DataObject = DataObject> = ReturnType<typeof useNaiveForm<T>>;
+type UseNaiveFormReturns<T extends DataObject = DataObject> = ReturnType<typeof useNaiveForm<T>>;
 //#endregion
-export { NaiveFormClearRules, NaiveFormOptions, NaiveFormReturns, NaiveFormRules, useNaiveForm };
+export { UseNaiveFormClearRules, UseNaiveFormOptions, UseNaiveFormReturns, UseNaiveFormRules, useNaiveForm };

package/dist/composables/use-naive-form.js

@@ -1,5 +1,5 @@
 import { createEventHook } from "@vueuse/core";
-import { reactive, ref, toRaw, toValue } from "vue";
+import { reactive, ref, toRaw, toValue, watchEffect } from "vue";
 import { cloneDeep } from "es-toolkit/object";
 
 //#region src/composables/use-naive-form.ts
@@ -30,47 +30,51 @@ function deepMerge(target = {}, source = {}) {
 	}
 	return target;
 }
-function useNaiveForm(formRef, value, options) {
-	const { rules, clearRules } = options ?? {};
-	const cacheValue = cloneDeep(toValue(value));
-	const formValue = ref(toValue(value ?? {}));
-	const formRules = ref(toValue(rules) ?? {});
+function useNaiveForm(formInstRef, options) {
+	const { value, rules, clearRules } = options ?? {};
+	const cacheValue = cloneDeep(toValue(value) ?? {});
+	const formValueRef = ref(toValue(value) ?? {});
+	watchEffect(() => {
+		formValueRef.value = toValue(value) ?? {};
+	});
+	const formRulesRef = ref(toValue(rules));
+	watchEffect(() => formRulesRef.value = toValue(rules) ?? {});
 	const formProps = {
-		model: reactive(formValue.value),
-		rules: reactive(formRules.value)
+		model: reactive(formValueRef.value),
+		rules: reactive(formRulesRef.value)
 	};
 	const onValidatedEvent = createEventHook();
 	function setValue(_value) {
-		Object.assign(formValue.value, _value);
+		Object.assign(formValueRef.value, _value);
 	}
 	function validate() {
 		return new Promise((resolve, reject) => {
-			if (!formRef.value) return reject(/* @__PURE__ */ new Error("useNaiveForm: formRef is not found."));
-			formRef.value.validate().then((res) => {
-				onValidatedEvent.trigger(toRaw(toValue(formValue)));
+			if (!formInstRef.value) return reject(/* @__PURE__ */ new Error("useNaiveForm: formInstRef is not found."));
+			formInstRef.value.validate().then((res) => {
+				onValidatedEvent.trigger(toRaw(toValue(formValueRef)));
 				return resolve(res);
 			}).catch(reject);
 		});
 	}
 	function resetValidation() {
-		formRef.value?.restoreValidation();
+		formInstRef.value?.restoreValidation();
 	}
 	function clear() {
-		clearObjectValues(formValue.value, clearRules);
+		clearObjectValues(formValueRef.value, clearRules);
 	}
 	function resetForm() {
 		clear();
 		const _cacheValue = cloneDeep(cacheValue);
-		deepMerge(formValue.value, _cacheValue);
+		deepMerge(formValueRef.value, _cacheValue);
 	}
 	function reset() {
 		resetValidation();
 		resetForm();
 	}
 	return {
-		formRef,
-		formValue,
-		formRules,
+		formInstRef,
+		formValueRef,
+		formRulesRef,
 		formProps,
 		setValue,
 		validate,

package/dist/composables/use-naive-theme.d.ts

@@ -1,5 +1,5 @@
 import { Colors } from "./_helper.js";
-import { ComputedRef, Ref } from "vue";
+import { ComputedRef, MaybeRefOrGetter, Ref } from "vue";
 import { GlobalThemeOverrides, NDateLocale, zhCN } from "naive-ui";
 import * as naive_ui_es_themes_interface0 from "naive-ui/es/themes/interface";
 
@@ -9,19 +9,19 @@ type Locales<T extends string = string> = Record<T, {
   dateLocale: NDateLocale;
   locale: typeof zhCN;
 }>;
-type NaiveThemeOptions<T extends string> = {
-  language?: T | Ref<T>;
-  darkMode?: boolean | Ref<boolean>;
+type UseNaiveThemeOptions<T extends string> = {
+  language?: MaybeRefOrGetter<T>;
+  darkMode?: MaybeRefOrGetter<boolean>;
   colors?: Colors;
   globalThemeOverrides?: GlobalThemeOverrides;
   locales?: Partial<Locales<T>>;
   darkColors?: Colors | ((colors: Colors) => Colors);
 };
-declare function useNaiveTheme<T extends string>(options?: NaiveThemeOptions<T>): {
-  language: Ref<T, T>;
-  darkMode: Ref<boolean | undefined, boolean | undefined>;
+declare function useNaiveTheme<T extends string>(options?: UseNaiveThemeOptions<T>): {
+  languageRef: Ref<T | undefined, T | undefined>;
+  darkModeRef: Ref<boolean | undefined, boolean | undefined>;
   theme: ComputedRef<naive_ui_es_themes_interface0.BuiltInGlobalTheme | undefined>;
-  colors: Ref<{
+  colorsRef: Ref<{
     primary?: string | undefined;
     info?: string | undefined;
     success?: string | undefined;
@@ -46,6 +46,6 @@ declare function useNaiveTheme<T extends string>(options?: NaiveThemeOptions<T>)
   locale: ComputedRef<Locales<T>[T]>;
   setColor: (v: Partial<Colors>) => void;
 };
-type NaiveThemeReturns = ReturnType<typeof useNaiveTheme>;
+type UseNaiveThemeReturns = ReturnType<typeof useNaiveTheme>;
 //#endregion
-export { NaiveThemeOptions, NaiveThemeReturns, useNaiveTheme };
+export { UseNaiveThemeOptions, UseNaiveThemeReturns, useNaiveTheme };

package/dist/composables/use-naive-theme.js

@@ -16,18 +16,14 @@ const naiveLocaleMap = {
 	}
 };
 function useNaiveTheme(options) {
-	const { language = "zh-CN", darkMode, colors, globalThemeOverrides, locales, darkColors } = options ?? {};
+	const { language, darkMode, colors, globalThemeOverrides, locales, darkColors } = options ?? {};
 	const languageRef = ref(toValue(language));
-	watchEffect(() => {
-		languageRef.value = toValue(language);
-	});
+	watchEffect(() => languageRef.value = toValue(language));
 	const darkModeRef = ref(toValue(darkMode));
-	watchEffect(() => {
-		darkModeRef.value = toValue(darkMode);
-	});
+	watchEffect(() => darkModeRef.value = toValue(darkMode));
 	const { common, ...extra } = globalThemeOverrides ?? {};
 	const colorsRef = ref({ ...colors });
-	const themeColorsRef = computed(() => {
+	const themeColors = computed(() => {
 		if (darkModeRef.value) {
 			if (typeof darkColors === "function") {
 				const darkColorsResult = darkColors(colorsRef.value);
@@ -54,7 +50,7 @@ function useNaiveTheme(options) {
 		return darkModeRef?.value ? darkTheme : void 0;
 	});
 	const themeOverrides = computed(() => {
-		const { primary, info, success, warning, error } = getColors(themeColorsRef.value);
+		const { primary, info, success, warning, error } = getColors(themeColors.value);
 		return {
 			common: {
 				primaryColor: primary?.color,
@@ -82,19 +78,19 @@ function useNaiveTheme(options) {
 			...extra
 		};
 	});
-	const _locales = {
+	const localesMerge = {
 		...naiveLocaleMap,
 		...locales
 	};
 	return {
-		language: languageRef,
-		darkMode: darkModeRef,
+		languageRef,
+		darkModeRef,
 		theme,
-		colors: colorsRef,
-		themeColors: themeColorsRef,
+		colorsRef,
+		themeColors,
 		themeOverrides,
-		locales: _locales,
-		locale: computed(() => _locales[languageRef.value] ?? naiveLocaleMap["zh-CN"]),
+		locales: localesMerge,
+		locale: computed(() => localesMerge[languageRef.value ?? "zh-CN"] ?? naiveLocaleMap["zh-CN"]),
 		setColor
 	};
 }

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { DataObject, DataRequestFields, UseDataRequestOptions, UseDataRequestPagination, UseDataRequestReturns, useDataRequest } from "./composables/use-data-request.js";
 import { useLoading } from "./composables/use-loading.js";
-import { NaiveFormClearRules, NaiveFormOptions, NaiveFormReturns, NaiveFormRules, useNaiveForm } from "./composables/use-naive-form.js";
-import { NaiveThemeOptions, NaiveThemeReturns, useNaiveTheme } from "./composables/use-naive-theme.js";
+import { UseNaiveFormClearRules, UseNaiveFormOptions, UseNaiveFormReturns, UseNaiveFormRules, useNaiveForm } from "./composables/use-naive-form.js";
+import { UseNaiveThemeOptions, UseNaiveThemeReturns, useNaiveTheme } from "./composables/use-naive-theme.js";
 import "./composables/index.js";
-export { DataObject, DataRequestFields, NaiveFormClearRules, NaiveFormOptions, NaiveFormReturns, NaiveFormRules, NaiveThemeOptions, NaiveThemeReturns, UseDataRequestOptions, UseDataRequestPagination, UseDataRequestReturns, useDataRequest, useLoading, useNaiveForm, useNaiveTheme };
+export { DataObject, DataRequestFields, UseDataRequestOptions, UseDataRequestPagination, UseDataRequestReturns, UseNaiveFormClearRules, UseNaiveFormOptions, UseNaiveFormReturns, UseNaiveFormRules, UseNaiveThemeOptions, UseNaiveThemeReturns, useDataRequest, useLoading, useNaiveForm, useNaiveTheme };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oiij/naive-ui",
   "type": "module",
-  "version": "0.0.71",
+  "version": "0.0.73",
   "description": "Some Composable Functions And Components for Vue 3",
   "author": "oiij",
   "license": "MIT",
@@ -39,30 +39,30 @@
     "@vueuse/core": "^14.1.0",
     "async-validator": "^4.2.5",
     "colord": "^2.9.3",
-    "es-toolkit": "^1.43.0",
+    "es-toolkit": "^1.44.0",
     "naive-ui": "^2.43.2",
     "prismjs": "^1.30.0",
-    "vue": "^3.5.26",
-    "vue-component-type-helpers": "^3.2.1",
+    "vue": "^3.5.27",
+    "vue-component-type-helpers": "^3.2.4",
     "vue-hooks-plus": "^2.4.1",
-    "@oiij/markdown-it": "0.0.10",
-    "@oiij/css-render": "0.0.9",
-    "@oiij/use": "0.0.37"
+    "@oiij/css-render": "0.0.10",
+    "@oiij/markdown-it": "0.0.11",
+    "@oiij/use": "0.0.42"
   },
   "devDependencies": {
     "@types/prismjs": "^1.26.5",
     "@vueuse/core": "^14.1.0",
     "async-validator": "^4.2.5",
     "colord": "^2.9.3",
-    "es-toolkit": "^1.43.0",
+    "es-toolkit": "^1.44.0",
     "naive-ui": "^2.43.2",
     "prismjs": "^1.30.0",
-    "vue": "^3.5.26",
-    "vue-component-type-helpers": "^3.2.1",
+    "vue": "^3.5.27",
+    "vue-component-type-helpers": "^3.2.4",
     "vue-hooks-plus": "^2.4.1",
-    "@oiij/css-render": "0.0.9",
-    "@oiij/markdown-it": "0.0.10",
-    "@oiij/use": "0.0.37"
+    "@oiij/css-render": "0.0.10",
+    "@oiij/markdown-it": "0.0.11",
+    "@oiij/use": "0.0.42"
   },
   "publishConfig": {
     "access": "public"