@oiij/naive-ui 0.0.76 → 0.0.78

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,30 +1,30 @@
 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 naive_ui0 from "naive-ui";
+import * as _vueuse_core56 from "@vueuse/core";
+import * as vue49 from "vue";
+import * as naive_ui1 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: vue49.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: vue49.ShallowUnwrapRef<PresetFormExpose<V>>) => void;
   attrs: any;
   slots: {
     header?: (props: {
       formInst: FormInst | null;
       formValue: V;
-      formRules: Partial<Record<keyof V, FormRules | naive_ui0.FormItemRule | naive_ui0.FormItemRule[]>>;
+      formRules: Partial<Record<keyof V, FormRules | naive_ui1.FormItemRule | naive_ui1.FormItemRule[]>>;
       formProps: {
-        model: vue40.Reactive<V>;
-        rules: vue40.Reactive<Partial<Record<keyof V, FormRules | naive_ui0.FormItemRule | naive_ui0.FormItemRule[]>>>;
+        model: vue49.Reactive<V>;
+        rules: vue49.Reactive<Partial<Record<keyof V, FormRules | naive_ui1.FormItemRule | naive_ui1.FormItemRule[]>>>;
       };
-      setValue: (_value: Partial<V>) => void;
+      setValue: (value: Partial<V>) => void;
       validate: () => Promise<{
         warnings?: async_validator0.ValidateError[][];
       }>;
@@ -32,18 +32,18 @@ declare const __VLS_export: <V extends DataObject>(__VLS_props: NonNullable<Awai
       resetForm: () => void;
       reset: () => void;
       clear: () => void;
-      onValidated: _vueuse_core8.EventHookOn<[V]>;
+      onValidated: _vueuse_core56.EventHookOn<[V]>;
     }) => any;
   } & {
     default?: (props: {
       formInst: FormInst | null;
       formValue: V;
-      formRules: Partial<Record<keyof V, FormRules | naive_ui0.FormItemRule | naive_ui0.FormItemRule[]>>;
+      formRules: Partial<Record<keyof V, FormRules | naive_ui1.FormItemRule | naive_ui1.FormItemRule[]>>;
       formProps: {
-        model: vue40.Reactive<V>;
-        rules: vue40.Reactive<Partial<Record<keyof V, FormRules | naive_ui0.FormItemRule | naive_ui0.FormItemRule[]>>>;
+        model: vue49.Reactive<V>;
+        rules: vue49.Reactive<Partial<Record<keyof V, FormRules | naive_ui1.FormItemRule | naive_ui1.FormItemRule[]>>>;
       };
-      setValue: (_value: Partial<V>) => void;
+      setValue: (value: Partial<V>) => void;
       validate: () => Promise<{
         warnings?: async_validator0.ValidateError[][];
       }>;
@@ -51,18 +51,18 @@ declare const __VLS_export: <V extends DataObject>(__VLS_props: NonNullable<Awai
       resetForm: () => void;
       reset: () => void;
       clear: () => void;
-      onValidated: _vueuse_core8.EventHookOn<[V]>;
+      onValidated: _vueuse_core56.EventHookOn<[V]>;
     }) => any;
   } & {
     footer?: (props: {
       formInst: FormInst | null;
       formValue: V;
-      formRules: Partial<Record<keyof V, FormRules | naive_ui0.FormItemRule | naive_ui0.FormItemRule[]>>;
+      formRules: Partial<Record<keyof V, FormRules | naive_ui1.FormItemRule | naive_ui1.FormItemRule[]>>;
       formProps: {
-        model: vue40.Reactive<V>;
-        rules: vue40.Reactive<Partial<Record<keyof V, FormRules | naive_ui0.FormItemRule | naive_ui0.FormItemRule[]>>>;
+        model: vue49.Reactive<V>;
+        rules: vue49.Reactive<Partial<Record<keyof V, FormRules | naive_ui1.FormItemRule | naive_ui1.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_core56.EventHookOn<[V]>;
     }) => any;
   };
   emit: (e: "validated", val: V) => void;
-}>) => vue40.VNode & {
+}>) => vue49.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 vue44 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: vue44.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 & {
+}>) => vue44.VNode & {
   __ctx?: Awaited<typeof __VLS_setup>;
 };
 declare const _default: typeof __VLS_export;

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

@@ -6,23 +6,26 @@ import { ButtonProps, CheckboxGroupProps, CheckboxProps, ColorPickerProps, DateP
 
 //#region src/components/preset-input/index.d.ts
 type RawChildren = string | number | boolean | VNode | VNodeArrayChildren | (() => any);
+/**
+ * 预设输入类型
+ */
 type PresetInputType = {
-  'button': {
-    props?: ButtonProps & {
+  /** 按钮 */'button': {
+    /** 属性 */props?: ButtonProps & {
       label?: string;
-    };
+    }; /** 插槽 */
     slots?: {
       default?: () => RawChildren;
       icon?: () => RawChildren;
     };
-  };
+  }; /** 颜色选择器 */
   'color-picker': {
     props?: ColorPickerProps;
     slots?: {
       label?: (color: string | null) => RawChildren;
       action?: () => RawChildren;
     };
-  };
+  }; /** 复选框 */
   'checkbox': {
     props?: CheckboxGroupProps & {
       options?: CheckboxProps[];
@@ -30,17 +33,17 @@ type PresetInputType = {
     slots?: {
       default?: () => RawChildren;
     };
-  };
+  }; /** 分割线 */
   'divider': {
     props?: DividerProps;
     slots?: {
       default?: () => RawChildren;
     };
-  };
+  }; /** 日期选择器 */
   'date-picker': {
     props?: DatePickerProps;
     slots?: undefined;
-  };
+  }; /** 动态标签 */
   'dynamic-tags': {
     props?: DynamicTagsProps;
     slots?: {
@@ -53,7 +56,7 @@ type PresetInputType = {
         disabled: boolean;
       }) => RawChildren;
     };
-  };
+  }; /** 输入框 */
   'input': {
     props?: InputProps;
     slots?: {
@@ -67,7 +70,7 @@ type PresetInputType = {
       separator?: () => RawChildren;
       suffix?: () => RawChildren;
     };
-  };
+  }; /** 数字输入框 */
   'input-number': {
     props?: InputNumberProps;
     slots?: {
@@ -76,7 +79,7 @@ type PresetInputType = {
       prefix?: () => RawChildren;
       suffix?: () => RawChildren;
     };
-  };
+  }; /** 搜索框 */
   'search': {
     props?: SearchInputProps;
     slots?: {
@@ -88,7 +91,7 @@ type PresetInputType = {
       }) => RawChildren;
       buttonIcon?: () => RawChildren;
     };
-  };
+  }; /** 单选框 */
   'radio': {
     props?: RadioGroupProps & {
       options?: RadioProps[];
@@ -96,7 +99,7 @@ type PresetInputType = {
     slots?: {
       default?: () => RawChildren;
     };
-  };
+  }; /** 评分 */
   'rate': {
     props?: RateProps;
     slots?: {
@@ -104,7 +107,7 @@ type PresetInputType = {
         index: number;
       }) => RawChildren;
     };
-  };
+  }; /** 选择器 */
   'select': {
     props?: SelectProps;
     slots?: {
@@ -113,13 +116,13 @@ type PresetInputType = {
       empty?: () => RawChildren;
       arrow?: () => RawChildren;
     };
-  };
+  }; /** 滑块 */
   'slider': {
     props?: SliderProps;
     slots?: {
       thumb?: () => RawChildren;
     };
-  };
+  }; /** 开关 */
   'switch': {
     props?: SwitchProps;
     slots?: {
@@ -129,7 +132,7 @@ type PresetInputType = {
       unchecked?: () => RawChildren;
       uncheckedIcon?: () => RawChildren;
     };
-  };
+  }; /** 时间选择器 */
   'time-picker': {
     props?: TimePickerProps;
     slots?: {
@@ -137,13 +140,20 @@ type PresetInputType = {
     };
   };
 };
+/**
+ * 预设输入选项
+ */
 type PresetInputOptions = { [K in keyof PresetInputType]: {
-  type?: K;
-  props?: PresetInputType[K]['props'] & ClassStyle;
+  /** 类型 */type?: K; /** 属性 */
+  props?: PresetInputType[K]['props'] & ClassStyle; /** 插槽 */
   slots?: PresetInputType[K]['slots'];
 } }[keyof PresetInputType];
+/**
+ * 预设输入属性
+ * @template V 值类型
+ */
 type PresetInputProps<V> = {
-  value?: V;
+  /** 值 */value?: V; /** 选项 */
   options?: PresetInputOptions;
 };
 //#endregion

package/dist/components/preset-picker/PresetPicker.js

@@ -1,5 +1,5 @@
 import MageMultiplyCircleFill_default from "../icons/MageMultiplyCircleFill.js";
-import { computed, createBlock, createCommentVNode, createElementVNode, createVNode, defineComponent, guardReactiveProps, mergeProps, normalizeProps, openBlock, reactive, ref, renderSlot, toDisplayString, toRaw, toValue, unref, watch, withCtx, withModifiers } from "vue";
+import { computed, createBlock, createCommentVNode, createElementVNode, createVNode, defineComponent, mergeProps, openBlock, reactive, ref, renderSlot, toDisplayString, toRaw, toValue, unref, watch, withCtx, withModifiers } from "vue";
 import { NBadge, NButton, NButtonGroup, NModal, NTooltip } from "naive-ui";
 import { cloneDeep } from "es-toolkit/object";
 
@@ -28,12 +28,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
 	},
 	emits: [
 		"update:value",
-		"afterEnter",
-		"afterLeave",
-		"esc",
-		"maskClick",
-		"update:show",
-		"close",
 		"negativeClick",
 		"positiveClick"
 	],
@@ -63,15 +57,18 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
 			showModalFlag.value = true;
 		}
 		function clickRowEffect(row) {
-			if (__props.multiple) if (checkedRowKeys.value.includes(row?.[_fields.value])) {
-				checkedRowKeys.value = checkedRowKeys.value.filter((f) => f !== row?.[_fields.value]);
-				checkedRows.value = checkedRows.value.filter((f) => f?.[_fields.value] !== row?.[_fields.value]);
+			const rowValue = row?.[_fields.value];
+			if (__props.multiple) {
+				const index = checkedRowKeys.value.indexOf(rowValue);
+				if (index > -1) {
+					checkedRowKeys.value.splice(index, 1);
+					checkedRows.value = checkedRows.value.filter((f) => f?.[_fields.value] !== rowValue);
+				} else {
+					checkedRowKeys.value.push(rowValue);
+					checkedRows.value.push(row);
+				}
 			} else {
-				checkedRowKeys.value.push(row?.[_fields.value]);
-				checkedRows.value.push(row);
-			}
-			else {
-				checkedRowKeys.value = [row?.[_fields.value]];
+				checkedRowKeys.value = [rowValue];
 				checkedRows.value = [row];
 			}
 		}
@@ -107,20 +104,26 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
 			emit("update:value", null, null);
 		}
 		const _label = computed(() => {
-			if (Array.isArray(__props.value) && __props.value.length > 0) return typeof __props.fallbackLabel === "string" ? __props.fallbackLabel : __props.value.map((m) => {
-				const item = checkedRows.value.find((f) => f?.[_fields.value] === m);
-				return item && item?.[_fields.label] ? item[_fields.label] : typeof __props.fallbackLabel === "function" ? __props.fallbackLabel(m) : m;
-			}).join(",");
-			if (__props.value && !Array.isArray(__props.value)) {
-				const item = checkedRows.value.find((f) => f?.[_fields.value] === __props.value);
-				return item && item?.[_fields.label] ? item?.[_fields.label] : typeof __props.fallbackLabel === "function" ? __props.fallbackLabel(__props.value) : __props.fallbackLabel ?? __props.value;
+			if (Array.isArray(__props.value)) {
+				if (__props.value.length === 0) return __props.placeholder;
+				if (typeof __props.fallbackLabel === "string") return __props.fallbackLabel;
+				return __props.value.map((m) => {
+					return checkedRows.value.find((f) => f?.[_fields.value] === m)?.[_fields.label] ?? (typeof __props.fallbackLabel === "function" ? __props.fallbackLabel(m) : m);
+				}).join(",");
 			}
+			if (__props.value !== void 0 && __props.value !== null) return checkedRows.value.find((f) => f?.[_fields.value] === __props.value)?.[_fields.label] ?? (typeof __props.fallbackLabel === "function" ? __props.fallbackLabel(__props.value) : __props.fallbackLabel ?? __props.value);
 			return __props.placeholder;
 		});
 		const showClearButton = computed(() => {
 			return __props.clearable && (Array.isArray(__props.value) ? __props.value.length > 0 : !!__props.value);
 		});
 		const checkedCount = computed(() => Array.isArray(__props.value) ? __props.value.length : void 0);
+		function handleLoadedRows(rows) {
+			const newRows = rows.filter((f) => {
+				return checkedRowKeys.value.includes(f?.[_fields.value]) && !checkedRows.value.some((s) => s?.[_fields.value] === f?.[_fields.value]);
+			});
+			checkedRows.value.push(...newRows);
+		}
 		const expose = {
 			showModalFlag,
 			checkedRowKeys,
@@ -140,10 +143,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
 		const templateBind = computed(() => {
 			return {
 				...expose,
-				showModalFlag: toValue(showModalFlag),
-				checkedRowKeys: toValue(checkedRowKeys),
-				checkedRows: toValue(checkedRows),
-				columns: toValue(_columns)
+				showModalFlag: showModalFlag.value,
+				checkedRowKeys: checkedRowKeys.value,
+				checkedRows: checkedRows.value,
+				columns: _columns
 			};
 		});
 		__expose(expose);
@@ -184,19 +187,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
 							"negative-text": "取消"
 						}, __props.modalProps, {
 							onPositiveClick,
-							onNegativeClick,
-							onClose: _cache[1] || (_cache[1] = ($event) => emit("close")),
-							onAfterEnter: _cache[2] || (_cache[2] = ($event) => emit("afterEnter")),
-							onAfterLeave: _cache[3] || (_cache[3] = ($event) => emit("afterLeave")),
-							onEsc: _cache[4] || (_cache[4] = ($event) => emit("esc")),
-							onMaskClick: _cache[5] || (_cache[5] = ($event) => emit("maskClick")),
-							"onUpdate:show": _cache[6] || (_cache[6] = (val) => emit("update:show", val))
+							onNegativeClick
 						}), {
 							action: withCtx(() => [renderSlot(_ctx.$slots, "modal-action")]),
 							header: withCtx(() => [renderSlot(_ctx.$slots, "modal-header")]),
 							icon: withCtx(() => [renderSlot(_ctx.$slots, "modal-icon")]),
 							close: withCtx(() => [renderSlot(_ctx.$slots, "modal-close")]),
-							default: withCtx(() => [renderSlot(_ctx.$slots, "default", normalizeProps(guardReactiveProps(templateBind.value)))]),
+							default: withCtx(() => [renderSlot(_ctx.$slots, "default", mergeProps(templateBind.value, { onLoadedRows: handleLoadedRows }))]),
 							_: 3
 						}, 16, ["show", "title"])
 					]),