@oiij/naive-ui 0.0.76 → 0.0.77

package/dist/components/data-table-plus/index.d.ts

@@ -3,57 +3,77 @@ import { RemoteRequestEmits, RemoteRequestProps } from "../remote-request/index.
 import { SearchInputProps } from "../search-input/index.js";
 import { _default } from "./DataTablePlus.vue.js";
 import { CSSProperties, Ref, ShallowRef } from "vue";
-import { ButtonProps, DataTableColumns, DataTableFilterState, DataTableInst, DataTableProps, DataTableSortState, PaginationProps } from "naive-ui";
+import { DataTableColumns, DataTableFilterState, DataTableInst, DataTableProps, DataTableSortState, PaginationProps } from "naive-ui";
 import { ComponentExposed } from "vue-component-type-helpers";
-import { FilterState, TableBaseColumn } from "naive-ui/es/data-table/src/interface";
+import { FilterState, RowKey, TableBaseColumn } from "naive-ui/es/data-table/src/interface";
 
 //#region src/components/data-table-plus/index.d.ts
+/**
+ * 类样式类型
+ */
 type ClassStyle = {
-  class?: string;
+  /** CSS 类名 */class?: string; /** CSS 样式 */
   style?: CSSProperties | string;
 };
+/**
+ * 数据表格增强组件暴露的方法
+ * @template P 请求参数类型
+ * @template D 响应数据类型
+ * @template R 列表项类型
+ */
 type DataTablePlusExpose<P extends DataObject = DataObject, D extends DataObject = DataObject, R extends DataObject = DataObject> = UseDataRequestReturns<P, D, R> & {
-  filters: Ref<DataTableFilterState | undefined>;
-  sorters: Ref<Record<string, DataTableSortState> | undefined>;
+  /** 筛选状态 */filters: Ref<DataTableFilterState | undefined>; /** 排序状态 */
+  sorters: Ref<Record<string, DataTableSortState> | undefined>; /** 数据表格实例 */
   dataTableInst: Readonly<ShallowRef<DataTableInst | null>>;
 };
+/**
+ * 数据表格增强字段配置
+ */
 type DataTablePlusFields = DataRequestFields & {
-  filter?: string;
-  sorter?: string;
-  rowKey?: string;
-  search?: string;
+  /** 筛选字段名 */filter?: string; /** 排序字段名 */
+  sorter?: string; /** 行键字段名 */
+  rowKey?: string; /** 搜索字段名 */
+  search?: string; /** 子节点字段名 */
   children?: string;
 };
+/**
+ * 数据表格增强组件属性
+ * @template P 请求参数类型
+ * @template D 响应数据类型
+ * @template R 列表项类型
+ */
 type DataTablePlusProps<P extends DataObject = DataObject, D extends DataObject = DataObject, R extends DataObject = DataObject> = RemoteRequestProps<P, D> & {
-  title?: string;
-  scrollTop?: number | boolean | {
-    top?: number;
-    buttonProps?: ButtonProps & ClassStyle;
-  };
-  columns?: DataTableColumns<R>;
-  fields?: DataTablePlusFields;
-  search?: SearchInputProps & ClassStyle | boolean;
-  pagination?: Omit<PaginationProps, 'page' | 'pageSize' | 'itemCount'> & ClassStyle | boolean;
-  columnsFilterOptions?: (filters: DataTableFilterState) => Record<string, any>;
-  columnsSorterOptions?: (sorters: Record<string, DataTableSortState>) => Record<string, any>;
+  /** 标题 */title?: string; /** 表格列配置 */
+  columns?: DataTableColumns<R>; /** 字段配置 */
+  fields?: DataTablePlusFields; /** 搜索配置 */
+  search?: SearchInputProps & ClassStyle | boolean; /** 分页配置 */
+  pagination?: Omit<PaginationProps, 'page' | 'pageSize' | 'itemCount'> & ClassStyle | boolean; /** 列筛选选项 */
+  columnsFilterOptions?: (filters: DataTableFilterState) => Record<string, any>; /** 列排序选项 */
+  columnsSorterOptions?: (sorters: Record<string, DataTableSortState>) => Record<string, any>; /** 数据表格属性 */
   dataTableProps?: DataTableProps & ClassStyle;
 };
+/**
+ * 数据表格增强组件事件
+ * @template P 请求参数类型
+ * @template D 响应数据类型
+ * @template R 列表项类型
+ */
 type DataTablePlusEmits<P extends DataObject = DataObject, D extends DataObject = DataObject, R extends DataObject = DataObject> = RemoteRequestEmits<P, D> & {
-  (e: 'clickRow', row: R, index: number, event: MouseEvent, currentData: R[]): void;
-  (e: 'contextMenuRow', row: R, index: number, event: MouseEvent, currentData: R[]): void;
-  (e: 'load', row: R): Promise<void>;
-  (e: 'scroll', ev: Event): void;
-  (e: 'scrollBottom', ev: Event): void;
-  (e: 'update:checkedRowKeys', keys: (string | number)[], rows: (R | undefined)[], meta: {
+  /** 点击行事件 */(e: 'clickRow', row: R, index: number, event: MouseEvent, currentData: R[]): void; /** 右键点击行事件 */
+  (e: 'contextMenuRow', row: R, index: number, event: MouseEvent, currentData: R[]): void; /** 更新选中行键事件 */
+  (e: 'update:checkedRowKeys', keys: RowKey[], rows: R[], meta: {
     row: R | undefined;
     action: 'check' | 'uncheck' | 'checkAll' | 'uncheckAll';
-  }, currentData: R[]): void;
-  (e: 'update:expandedRowKeys', keys: (string | number)[], currentData: R[]): void;
-  (e: 'update:filters', filterState: FilterState, sourceColumn: TableBaseColumn): void;
-  (e: 'update:sorter', options: DataTableSortState | DataTableSortState[] | null): void;
-  (e: 'update:page', page: number): void;
-  (e: 'update:pageSize', pageSize: number): void;
+  }, currentData: R[]): void; /** 更新筛选事件 */
+  (e: 'update:filters', filterState: FilterState, sourceColumn: TableBaseColumn): void; /** 更新排序事件 */
+  (e: 'update:sorter', options: DataTableSortState | DataTableSortState[] | null): void; /** 更新页码事件 */
+  (e: 'update:page', page: number): void; /** 更新每页大小事件 */
+  (e: 'update:pageSize', pageSize: number): void; /** 成功事件 */
+  (e: 'loadedRows', data: R[]): void;
 };
+/**
+ * 数据表格增强组件实例类型
+ */
 type DataTablePlusInst = ComponentExposed<typeof _default>;
 //#endregion
 export { ClassStyle, DataTablePlusEmits, DataTablePlusExpose, DataTablePlusFields, DataTablePlusInst, DataTablePlusProps };

package/dist/components/index.d.ts

@@ -5,7 +5,7 @@ import { SearchInputProps } from "./search-input/index.js";
 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 { LOADING_PROVIDER_INJECTION_KEY, LoadingProviderInst, LoadingProviderProps } from "./loading-provider/index.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";
@@ -24,6 +24,4 @@ import "./toggle-input/index.js";
 import { _default as _default$11 } from "./tooltip-button/TooltipButton.vue.js";
 import { TooltipButtonProps } from "./tooltip-button/index.js";
 import { _default as _default$12 } from "./transition/BaseTransition.vue.js";
-import { TransitionProps } from "./transition/index.js";
-import { _default as _default$13 } from "./type-writer/TypeWriter.vue.js";
-import { TypeWriterProps } from "./type-writer/index.js";
+import { TransitionProps } from "./transition/index.js";

package/dist/components/loading-provider/LoadingProvider.js

@@ -1,6 +1,6 @@
 import BaseTransition_default from "../transition/BaseTransition.js";
 import { cName, loadingProviderCssr } from "./loading-provider.cssr.js";
-import { loadingProviderInjectionKey } from "./index.js";
+import { LOADING_PROVIDER_INJECTION_KEY } from "./index.js";
 import { Fragment, Teleport, createBlock, createCommentVNode, createElementBlock, createSlots, createVNode, defineComponent, mergeProps, normalizeClass, normalizeStyle, openBlock, provide, ref, renderSlot, unref, watchEffect, withCtx } from "vue";
 import { useStyle } from "@oiij/css-render";
 import { NEl, NSpin } from "naive-ui";
@@ -41,7 +41,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
 			}, _duration ?? __props.duration);
 			return { hide: hideLoading };
 		}
-		provide(loadingProviderInjectionKey, {
+		provide(LOADING_PROVIDER_INJECTION_KEY, {
 			show: showLoading,
 			hide: hideLoading
 		});

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

@@ -1,5 +1,5 @@
 import { LoadingProviderProps } from "./index.js";
-import * as vue35 from "vue";
+import * as vue63 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: vue35.DefineComponent<LoadingProviderProps, {}, {}, {}, {}, vue35.ComponentOptionsMixin, vue35.ComponentOptionsMixin, {}, string, vue35.PublicProps, Readonly<LoadingProviderProps> & Readonly<{}>, {}, {}, {}, {}, string, vue35.ComponentProvideOptions, false, {}, any>;
+declare const __VLS_base: vue63.DefineComponent<LoadingProviderProps, {}, {}, {}, {}, vue63.ComponentOptionsMixin, vue63.ComponentOptionsMixin, {}, string, vue63.PublicProps, Readonly<LoadingProviderProps> & Readonly<{}>, {}, {}, {}, {}, string, vue63.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/loading-provider/index.d.ts

@@ -4,21 +4,30 @@ import { CSSProperties, InjectionKey, RendererElement } from "vue";
 import { SpinProps } from "naive-ui";
 
 //#region src/components/loading-provider/index.d.ts
+/**
+ * 加载提供者实例
+ */
 type LoadingProviderInst = {
-  show: (options?: {
-    text?: string;
+  /** 显示加载 */show: (options?: {
+    /** 加载文本 */text?: string; /** 持续时间 */
     duration?: number;
-  }) => void;
+  }) => void; /** 隐藏加载 */
   hide: () => void;
 };
-declare const loadingProviderInjectionKey: InjectionKey<LoadingProviderInst>;
+/**
+ * 加载提供者注入键
+ */
+declare const LOADING_PROVIDER_INJECTION_KEY: InjectionKey<LoadingProviderInst>;
+/**
+ * 加载提供者属性
+ */
 type LoadingProviderProps = {
-  show?: boolean;
-  appendTo?: string | RendererElement;
-  mask?: boolean | CSSProperties;
-  blur?: boolean;
-  duration?: number;
+  /** 是否显示 */show?: boolean; /** 挂载目标元素 */
+  appendTo?: string | RendererElement; /** 遮罩层配置 */
+  mask?: boolean | CSSProperties; /** 是否模糊 */
+  blur?: boolean; /** 持续时间 */
+  duration?: number; /** 加载组件属性 */
   spinProps?: Omit<SpinProps, 'show'> & ClassStyle;
 };
 //#endregion
-export { LoadingProviderInst, LoadingProviderProps, loadingProviderInjectionKey };
+export { LOADING_PROVIDER_INJECTION_KEY, LoadingProviderInst, LoadingProviderProps };

package/dist/components/loading-provider/index.js

@@ -1,7 +1,10 @@
 import LoadingProvider_default from "./LoadingProvider.js";
 
 //#region src/components/loading-provider/index.ts
-const loadingProviderInjectionKey = Symbol("loading-provider-key");
+/**
+* 加载提供者注入键
+*/
+const LOADING_PROVIDER_INJECTION_KEY = Symbol("loading-provider-key");
 
 //#endregion
-export { loadingProviderInjectionKey };
+export { LOADING_PROVIDER_INJECTION_KEY };

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

@@ -1,7 +1,7 @@
 import { useNaiveForm } from "../../composables/use-naive-form.js";
 import PresetInput_default from "../preset-input/PresetInput.js";
 import { mergeRule } from "./_utils.js";
-import { Fragment, computed, createBlock, createCommentVNode, createElementBlock, createTextVNode, createVNode, defineComponent, guardReactiveProps, mergeProps, normalizeProps, openBlock, ref, renderList, renderSlot, resolveDynamicComponent, toDisplayString, toValue, unref, useTemplateRef, withCtx } from "vue";
+import { Fragment, computed, createBlock, createCommentVNode, createElementBlock, createTextVNode, createVNode, defineComponent, guardReactiveProps, mergeProps, normalizeProps, openBlock, ref, renderList, renderSlot, resolveDynamicComponent, toDisplayString, unref, useTemplateRef, withCtx } from "vue";
 import { NButton, NCollapseTransition, NDivider, NForm, NFormItem, NGi, NGrid } from "naive-ui";
 
 //#region src/components/preset-form/PresetForm.vue
@@ -27,15 +27,36 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
 			emit("validated", value);
 		});
 		const filterCollapsed = ref(false);
+		const visibleOptions = computed(() => {
+			return __props.options?.filter((f) => typeof f.hidden === "function" ? !f.hidden() : !f.hidden) || [];
+		});
 		const _options = computed(() => {
-			return __props.options?.filter((f) => typeof f.hidden === "function" ? !f.hidden() : !f.hidden).filter((f) => typeof f.collapsed === "function" ? !f.collapsed() : !f.collapsed);
+			return visibleOptions.value.filter((f) => typeof f.collapsed === "function" ? !f.collapsed() : !f.collapsed);
 		});
 		const _collapsedOptions = computed(() => {
-			return __props.options?.filter((f) => typeof f.hidden === "function" ? !f.hidden() : !f.hidden).filter((f) => typeof f.collapsed === "function" ? !f.collapsed() : f.collapsed);
+			return visibleOptions.value.filter((f) => typeof f.collapsed === "function" ? f.collapsed() : f.collapsed);
 		});
 		function onPresetInputUpdate(val, key) {
 			if (key) setValue({ [key]: val });
 		}
+		function presetFormProps(options) {
+			return options.map((option) => {
+				const { key, label, required, span, rule, itemProps, render, ...inputOption } = option;
+				const { offset, suffix, ...extraItemProps } = itemProps ?? {};
+				return {
+					key: typeof key === "string" ? key : void 0,
+					label: typeof label === "function" ? label() : label,
+					span: typeof span === "function" ? span() : span ?? itemProps?.span,
+					required,
+					rule,
+					offset,
+					suffix,
+					itemProps: extraItemProps,
+					render,
+					inputOption
+				};
+			});
+		}
 		const expose = {
 			formInst,
 			formValue,
@@ -52,10 +73,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
 		const templateBind = computed(() => {
 			return {
 				...expose,
-				formInst: toValue(formInst),
-				formValue: toValue(formValue),
-				formRules: toValue(formRules),
-				formProps: toValue(_formProps)
+				formInst: formInst.value,
+				formValue: formValue.value,
+				formRules: formRules.value,
+				formProps: _formProps
 			};
 		});
 		__expose(expose);
@@ -68,30 +89,30 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
 				default: withCtx(() => [
 					renderSlot(_ctx.$slots, "header", normalizeProps(guardReactiveProps(templateBind.value))),
 					renderSlot(_ctx.$slots, "default", normalizeProps(guardReactiveProps(templateBind.value)), () => [_options.value && _options.value.length > 0 ? (openBlock(), createBlock(unref(NGrid), normalizeProps(mergeProps({ key: 0 }, __props.gridProps)), {
-						default: withCtx(() => [(openBlock(true), createElementBlock(Fragment, null, renderList(_options.value, ({ key, label, required, span, rule, itemProps: { offset, span: _span, suffix, ..._itemProps } = {}, render, ...opt }, _index) => {
+						default: withCtx(() => [(openBlock(true), createElementBlock(Fragment, null, renderList(presetFormProps(_options.value), ({ span, offset, suffix, label, key, required, rule, itemProps, render, inputOption }, index) => {
 							return openBlock(), createBlock(unref(NGi), mergeProps({
-								key: _index,
-								span: typeof span === "function" ? span() : span ?? _span
+								key: index,
+								span
 							}, { ref_for: true }, {
 								offset,
 								suffix
 							}), {
 								default: withCtx(({ overflow }) => [createVNode(unref(NFormItem), mergeProps({
-									label: typeof label === "function" ? label() : label,
-									path: typeof key === "string" ? key : void 0,
+									label,
+									path: key,
 									rule: unref(mergeRule)({
 										key,
 										label,
 										required,
 										rule
 									})
-								}, { ref_for: true }, _itemProps), {
+								}, { ref_for: true }, itemProps), {
 									default: withCtx(() => [render ? (openBlock(), createBlock(resolveDynamicComponent(render({
 										...expose,
 										overflow
 									})), { key: 0 })) : (openBlock(), createBlock(unref(PresetInput_default), {
 										key: 1,
-										options: opt,
+										options: inputOption,
 										value: key ? unref(formValue)[key] : void 0,
 										"onUpdate:value": (val) => onPresetInputUpdate(val, key)
 									}, null, 8, [
@@ -120,30 +141,30 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
 						_: 1
 					}), createVNode(unref(NCollapseTransition), { show: filterCollapsed.value }, {
 						default: withCtx(() => [createVNode(unref(NGrid), normalizeProps(guardReactiveProps(__props.gridProps)), {
-							default: withCtx(() => [(openBlock(true), createElementBlock(Fragment, null, renderList(_collapsedOptions.value, ({ key, label, required, span, rule, itemProps: { offset, span: _span, suffix, ..._itemProps } = {}, render, ...opt }, _index) => {
+							default: withCtx(() => [(openBlock(true), createElementBlock(Fragment, null, renderList(presetFormProps(_collapsedOptions.value), ({ span, offset, suffix, label, key, required, rule, itemProps, render, inputOption }, index) => {
 								return openBlock(), createBlock(unref(NGi), mergeProps({
-									key: _index,
-									span: typeof span === "function" ? span() : span ?? _span
+									key: index,
+									span
 								}, { ref_for: true }, {
 									offset,
 									suffix
 								}), {
 									default: withCtx(({ overflow }) => [createVNode(unref(NFormItem), mergeProps({
-										label: typeof label === "function" ? label() : label,
-										path: typeof key === "string" ? key : void 0,
+										label,
+										path: key,
 										rule: unref(mergeRule)({
 											key,
 											label,
 											required,
 											rule
 										})
-									}, { ref_for: true }, _itemProps), {
+									}, { ref_for: true }, itemProps), {
 										default: withCtx(() => [render ? (openBlock(), createBlock(resolveDynamicComponent(render({
 											...expose,
 											overflow
 										})), { key: 0 })) : (openBlock(), createBlock(unref(PresetInput_default), {
 											key: 1,
-											options: opt,
+											options: inputOption,
 											value: key ? unref(formValue)[key] : void 0,
 											"onUpdate:value": (val) => onPresetInputUpdate(val, key)
 										}, null, 8, [

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_core8 from "@vueuse/core";
-import * as vue40 from "vue";
+import * as _vueuse_core28 from "@vueuse/core";
+import * as vue46 from "vue";
 import * as naive_ui0 from "naive-ui";
 import { FormInst, FormRules } 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: vue40.PublicProps & __VLS_PrettifyLocal<PresetFormProps<V> & {
+  props: vue46.PublicProps & __VLS_PrettifyLocal<PresetFormProps<V> & {
     onValidated?: ((val: V) => any) | undefined;
   }> & (typeof globalThis extends {
     __VLS_PROPS_FALLBACK: infer P;
   } ? P : {});
-  expose: (exposed: vue40.ShallowUnwrapRef<PresetFormExpose<V>>) => void;
+  expose: (exposed: vue46.ShallowUnwrapRef<PresetFormExpose<V>>) => void;
   attrs: any;
   slots: {
     header?: (props: {
@@ -21,10 +21,10 @@ declare const __VLS_export: <V extends DataObject>(__VLS_props: NonNullable<Awai
       formValue: V;
       formRules: Partial<Record<keyof V, FormRules | naive_ui0.FormItemRule | naive_ui0.FormItemRule[]>>;
       formProps: {
-        model: vue40.Reactive<V>;
-        rules: vue40.Reactive<Partial<Record<keyof V, FormRules | naive_ui0.FormItemRule | naive_ui0.FormItemRule[]>>>;
+        model: vue46.Reactive<V>;
+        rules: vue46.Reactive<Partial<Record<keyof V, FormRules | naive_ui0.FormItemRule | naive_ui0.FormItemRule[]>>>;
       };
-      setValue: (_value: Partial<V>) => void;
+      setValue: (value: Partial<V>) => void;
       validate: () => Promise<{
         warnings?: async_validator0.ValidateError[][];
       }>;
@@ -32,7 +32,7 @@ declare const __VLS_export: <V extends DataObject>(__VLS_props: NonNullable<Awai
       resetForm: () => void;
       reset: () => void;
       clear: () => void;
-      onValidated: _vueuse_core8.EventHookOn<[V]>;
+      onValidated: _vueuse_core28.EventHookOn<[V]>;
     }) => any;
   } & {
     default?: (props: {
@@ -40,10 +40,10 @@ declare const __VLS_export: <V extends DataObject>(__VLS_props: NonNullable<Awai
       formValue: V;
       formRules: Partial<Record<keyof V, FormRules | naive_ui0.FormItemRule | naive_ui0.FormItemRule[]>>;
       formProps: {
-        model: vue40.Reactive<V>;
-        rules: vue40.Reactive<Partial<Record<keyof V, FormRules | naive_ui0.FormItemRule | naive_ui0.FormItemRule[]>>>;
+        model: vue46.Reactive<V>;
+        rules: vue46.Reactive<Partial<Record<keyof V, FormRules | naive_ui0.FormItemRule | naive_ui0.FormItemRule[]>>>;
       };
-      setValue: (_value: Partial<V>) => void;
+      setValue: (value: Partial<V>) => void;
       validate: () => Promise<{
         warnings?: async_validator0.ValidateError[][];
       }>;
@@ -51,7 +51,7 @@ declare const __VLS_export: <V extends DataObject>(__VLS_props: NonNullable<Awai
       resetForm: () => void;
       reset: () => void;
       clear: () => void;
-      onValidated: _vueuse_core8.EventHookOn<[V]>;
+      onValidated: _vueuse_core28.EventHookOn<[V]>;
     }) => any;
   } & {
     footer?: (props: {
@@ -59,10 +59,10 @@ declare const __VLS_export: <V extends DataObject>(__VLS_props: NonNullable<Awai
       formValue: V;
       formRules: Partial<Record<keyof V, FormRules | naive_ui0.FormItemRule | naive_ui0.FormItemRule[]>>;
       formProps: {
-        model: vue40.Reactive<V>;
-        rules: vue40.Reactive<Partial<Record<keyof V, FormRules | naive_ui0.FormItemRule | naive_ui0.FormItemRule[]>>>;
+        model: vue46.Reactive<V>;
+        rules: vue46.Reactive<Partial<Record<keyof V, FormRules | naive_ui0.FormItemRule | naive_ui0.FormItemRule[]>>>;
       };
-      setValue: (_value: Partial<V>) => void;
+      setValue: (value: Partial<V>) => void;
       validate: () => Promise<{
         warnings?: async_validator0.ValidateError[][];
       }>;
@@ -70,11 +70,11 @@ declare const __VLS_export: <V extends DataObject>(__VLS_props: NonNullable<Awai
       resetForm: () => void;
       reset: () => void;
       clear: () => void;
-      onValidated: _vueuse_core8.EventHookOn<[V]>;
+      onValidated: _vueuse_core28.EventHookOn<[V]>;
     }) => any;
   };
   emit: (e: "validated", val: V) => void;
-}>) => vue40.VNode & {
+}>) => vue46.VNode & {
   __ctx?: Awaited<typeof __VLS_setup>;
 };
 declare const _default: typeof __VLS_export;

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

@@ -1,15 +1,30 @@
 //#region src/components/preset-form/_utils.ts
 function mergeRule(option) {
 	const { key, label, required, rule } = option ?? {};
-	let _rule;
-	if (typeof required === "function" ? required() : required) _rule = {
-		required: true,
-		message: `${typeof label === "string" ? label : typeof label === "function" ? label() : typeof key === "string" ? key : "字段"}不能为空`,
-		trigger: ["input", "blur"]
+	const _required = typeof required === "function" ? required() : required;
+	if (!_required && !rule) return;
+	const getLabelText = () => {
+		if (typeof label === "string") return label;
+		if (typeof label === "function") return label();
+		if (typeof key === "string") return key;
+		return "字段";
 	};
-	if (rule) if (_rule) Object.assign(_rule, rule);
-	else _rule = rule;
-	return _rule;
+	if (_required) {
+		const requiredRule = {
+			required: true,
+			message: `${getLabelText()}不能为空`,
+			trigger: ["input", "blur"]
+		};
+		if (rule) {
+			if (Array.isArray(rule)) return [requiredRule, ...rule];
+			return {
+				...requiredRule,
+				...rule
+			};
+		}
+		return requiredRule;
+	}
+	return rule;
 }
 
 //#endregion

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

@@ -8,29 +8,48 @@ import { FormItemProps, FormItemRule, FormProps, FormRules, GridItemProps, GridP
 import { ComponentExposed } from "vue-component-type-helpers";
 
 //#region src/components/preset-form/index.d.ts
+/**
+ * 预设表单暴露的方法
+ * @template V 表单值类型
+ */
 type PresetFormExpose<V extends DataObject = DataObject> = UseNaiveFormReturns<V>;
+/**
+ * 预设表单选项项
+ * @template V 表单值类型
+ */
 type PresetFormOptionItem<V extends DataObject = DataObject> = PresetInputOptions & {
-  key?: keyof V;
-  label?: string | (() => string);
-  required?: boolean | (() => boolean);
-  collapsed?: boolean | (() => boolean);
-  span?: string | number | (() => string | number);
-  hidden?: boolean | (() => boolean);
-  rule?: FormRules | FormItemRule | FormItemRule[];
-  itemProps?: FormItemProps & GridItemProps & ClassStyle;
+  /** 字段键名 */key?: keyof V; /** 标签 */
+  label?: string | (() => string); /** 是否必填 */
+  required?: boolean | (() => boolean); /** 是否折叠 */
+  collapsed?: boolean | (() => boolean); /** 跨度 */
+  span?: string | number | (() => string | number); /** 是否隐藏 */
+  hidden?: boolean | (() => boolean); /** 验证规则 */
+  rule?: FormRules | FormItemRule | FormItemRule[]; /** 表单项属性 */
+  itemProps?: FormItemProps & GridItemProps & ClassStyle; /** 自定义渲染函数 */
   render?: (params: PresetFormExpose<V> & {
     overflow: boolean;
   }) => VNode | null;
 };
+/**
+ * 预设表单选项
+ * @template V 表单值类型
+ */
 type PresetFormOptions<V extends DataObject = DataObject> = PresetFormOptionItem<V>[];
+/**
+ * 预设表单属性
+ * @template V 表单值类型
+ */
 type PresetFormProps<V extends DataObject = DataObject> = {
-  options?: PresetFormOptions<V>;
-  value?: V;
-  rules?: UseNaiveFormRules<V>;
-  clearRules?: UseNaiveFormClearRules;
-  formProps?: FormProps & ClassStyle;
+  /** 表单选项 */options?: PresetFormOptions<V>; /** 表单值 */
+  value?: V; /** 验证规则 */
+  rules?: UseNaiveFormRules<V>; /** 清空规则 */
+  clearRules?: UseNaiveFormClearRules; /** 表单属性 */
+  formProps?: FormProps & ClassStyle; /** 网格属性 */
   gridProps?: GridProps & ClassStyle;
 };
+/**
+ * 预设表单实例类型
+ */
 type PresetFormInst = ComponentExposed<typeof _default>;
 //#endregion
 export { PresetFormExpose, PresetFormInst, PresetFormOptionItem, PresetFormOptions, PresetFormProps };

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

@@ -1,9 +1,9 @@
 import { PresetInputProps } from "./index.js";
-import * as vue25 from "vue";
+import * as vue28 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: vue25.PublicProps & __VLS_PrettifyLocal<PresetInputProps<V> & {
+  props: vue28.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;
-}>) => vue25.VNode & {
+}>) => vue28.VNode & {
   __ctx?: Awaited<typeof __VLS_setup>;
 };
 declare const _default: typeof __VLS_export;