@veltra/desktop 1.1.36 → 1.2.0

package/dist/types/checkbox.d.ts

@@ -1,14 +1,15 @@
-import { ColorType, FormComponentProps } from "@veltra/utils";
+import { FormFieldComponentProps } from "./form-field.js";
+import { ColorType } from "@veltra/utils";
 
 //#region src/types/checkbox.d.ts
 /** 复选框组件属性 */
-interface CheckboxProps extends FormComponentProps {
+interface CheckboxProps extends FormFieldComponentProps {
   /** 部分选中 */
   indeterminate?: boolean;
   /** 是否选中  */
   modelValue?: boolean;
 }
-interface CheckboxButtonProps extends FormComponentProps {
+interface CheckboxButtonProps extends FormFieldComponentProps {
   /** 是否选中  */
   modelValue?: boolean;
   /** 是否圆角 */

package/dist/types/code-editor.d.ts

@@ -1,9 +1,10 @@
-import { DeconstructValue, FormComponentProps } from "@veltra/utils";
+import { FormFieldComponentProps } from "./form-field.js";
+import { DeconstructValue } from "@veltra/utils";
 
 //#region src/types/code-editor.d.ts
 type CodeEditorLang = 'js' | 'sql' | 'java' | 'json';
 /** 代码编辑器组件属性（不支持 `size`） */
-interface CodeEditorProps extends Omit<FormComponentProps, 'size'> {
+interface CodeEditorProps extends Omit<FormFieldComponentProps, 'size'> {
   modelValue?: string;
   /** 定义语言 */
   language?: CodeEditorLang;

package/dist/types/date-picker.d.ts

@@ -1,9 +1,10 @@
-import { DeconstructValue, FormComponentProps } from "@veltra/utils";
+import { FormFieldComponentProps } from "./form-field.js";
+import { DeconstructValue } from "@veltra/utils";
 import { Dater } from "@cat-kit/core";
 
 //#region src/types/date-picker.d.ts
 /** date-picker组件属性 */
-interface DatePickerProps extends FormComponentProps {
+interface DatePickerProps extends FormFieldComponentProps {
   modelValue?: string | number | Date;
   /** 占位 */
   placeholder?: string;

package/dist/types/date-range-picker.d.ts

@@ -1,9 +1,10 @@
-import { DeconstructValue, FormComponentProps } from "@veltra/utils";
+import { FormFieldComponentProps } from "./form-field.js";
+import { DeconstructValue } from "@veltra/utils";
 import { Dater } from "@cat-kit/core";
 
 //#region src/types/date-range-picker.d.ts
 /** date-range-picker组件属性 */
-interface DateRangePickerProps extends FormComponentProps {
+interface DateRangePickerProps extends FormFieldComponentProps {
   modelValue?: [string, string];
   /** 占位 */
   placeholder?: [string, string];

package/dist/types/expression-editor.d.ts

@@ -1,4 +1,5 @@
-import { DeconstructValue, FormComponentProps } from "@veltra/utils";
+import { FormFieldComponentProps } from "./form-field.js";
+import { DeconstructValue } from "@veltra/utils";
 
 //#region src/types/expression-editor.d.ts
 interface VariableItem {
@@ -12,7 +13,7 @@ interface VariableItem {
 /** 选中范围：仅叶子节点，或允许任意层级（含分支） */
 type ExpressionSelectableLevels = 'leaf' | 'any';
 /** 表达式编辑器组件属性 */
-interface ExpressionEditorProps extends FormComponentProps {
+interface ExpressionEditorProps extends FormFieldComponentProps {
   modelValue?: string;
   placeholder?: string;
   /** 变量列表 */

package/dist/types/file-picker.d.ts

@@ -1,8 +1,9 @@
-import { DeconstructValue, FormComponentProps } from "@veltra/utils";
+import { FormFieldComponentProps } from "./form-field.js";
+import { DeconstructValue } from "@veltra/utils";
 
 //#region src/types/file-picker.d.ts
 /** 文件上传器组件属性 */
-interface UploaderProps extends FormComponentProps {
+interface UploaderProps extends FormFieldComponentProps {
   /** 渲染标签 */
   tag?: string;
   /** 允许上传的文件类型 */

package/dist/types/form-field.d.ts

@@ -0,0 +1,12 @@
+import { PresetRule, ValidateRule } from "../components/form-item/validate.js";
+import { FormComponentProps } from "@veltra/utils";
+
+//#region src/types/form-field.d.ts
+/** 带校验规则的表单控件通用属性 */
+interface FormFieldComponentProps extends FormComponentProps {
+  /** 校验规则 */
+  rules?: ValidateRule;
+}
+//#endregion
+export { FormFieldComponentProps };
+//# sourceMappingURL=form-field.d.ts.map

package/dist/types/form-item.d.ts

@@ -1,8 +1,8 @@
-import { FormComponentProps } from "@veltra/utils";
+import { FormFieldComponentProps } from "./form-field.js";
 
 //#region src/types/form-item.d.ts
 /** 组件项组件属性 */
-interface FormItemProps extends FormComponentProps {
+interface FormItemProps extends FormFieldComponentProps {
   /** 标签宽度 */
   labelWidth?: string | number;
 }

package/dist/types/form.d.ts

@@ -1,59 +1,16 @@
-import { NestedFieldMarker } from "../components/form/helper.js";
 import { ShallowRef } from "vue";
-import { ComponentProps, DeconstructValue, ValidateRule } from "@veltra/utils";
+import { ComponentProps, DeconstructValue } from "@veltra/utils";
 
 //#region src/types/form.d.ts
-interface FormModelItem<Val = any> extends ValidateRule {
-  /** 模型值 */
-  value?: Val;
-}
-type FormModelField = FormModelItem | NestedFieldMarker;
-type ModelData<Fields extends Record<string, any>> = { [key in keyof Fields]: Fields[key] extends NestedFieldMarker<infer SubFields> ? ModelData<SubFields> : Fields[key] extends FormModelItem ? Fields[key]['value'] extends (() => infer T) ? T : Fields[key]['value'] : never };
-type AllKeys<Fields extends Record<string, any>> = { [K in keyof Fields]: K extends string ? Fields[K] extends NestedFieldMarker<infer SubFields> ? `${K}.${AllKeys<SubFields>}` : K : never }[keyof Fields];
-type ModelRules<Fields extends Record<string, FormModelItem>> = { [key in keyof Fields]: Omit<Fields[key], 'value'> };
-interface DataSettingConfig {
-  /**
-   * 是否校验
-   * @default true
-   */
-  validate?: boolean;
-}
-type IFormModel<Fields extends Record<string, any> = Record<string, any>> = {
-  /** 表单数据 */readonly data: ModelData<Fields>; /** 字段校验规则 */
-  readonly fields: Fields;
-  /**
-   * 字段键
-   */
-  readonly allKeys: string[]; /** 需要校验的key */
-  formKeys: Map<number, string[]>; /** 错误 */
-  readonly errors: Map<string, string[] | undefined>;
-  /**
-   * 字段校验
-   * @param fields 字段， 如果不传入时将会使用keyFields来进行校验
-   */
-  validate: (fields?: string | string[]) => Promise<boolean>; /** 重置数据 */
-  resetData(fields?: string | string[]): void;
-  /**
-   * 设置数据
-   * @param formData 表单值
-   * @param options 配置
-   */
-  setData(formData: Partial<Record<string, any>>, config?: DataSettingConfig): void; /** 清除校验 */
-  clearValidate(): void; /** 监听值变更 */
-  onChange(cb: (field: string, val: any) => void): void; /** 关闭监听值变更 */
-  offChange(cb: (field: string, val: any) => void): void;
-};
 /** 表单组件属性 */
-interface FormProps<Model extends IFormModel = IFormModel> extends ComponentProps {
+interface FormProps extends ComponentProps {
   /**
    * 自定义表单列数
    * - 默认根据尺寸断点自动排列
    */
   cols?: number;
-  /** 是否显示初始数据 */
-  showInitialData?: boolean;
-  /** 表单数据模型 */
-  model: Model;
+  /** 表单数据 */
+  model?: Record<string, any>;
   /** 表单项label宽度 */
   labelWidth?: string | number;
   /** 是否不显示tips */
@@ -65,8 +22,12 @@ interface FormProps<Model extends IFormModel = IFormModel> extends ComponentProp
 }
 interface _FormExposed {
   el: ShallowRef<HTMLElement | null | undefined>;
+  validate: (keys?: string[]) => Promise<boolean>;
+  clearValidate: () => void;
+  /** 将 model 恢复为最近一次 props.model 引用变更时的快照，并清除校验 */
+  reset: () => void;
 }
 type FormExposed = DeconstructValue<_FormExposed>;
 //#endregion
-export { AllKeys, DataSettingConfig, FormExposed, FormModelField, FormModelItem, FormProps, IFormModel, ModelData, ModelRules, _FormExposed };
+export { FormExposed, FormProps, _FormExposed };
 //# sourceMappingURL=form.d.ts.map

package/dist/types/group-input.d.ts

@@ -1,9 +1,10 @@
+import { FormFieldComponentProps } from "./form-field.js";
 import { StyleValue } from "vue";
-import { DeconstructValue, FormComponentProps } from "@veltra/utils";
+import { DeconstructValue } from "@veltra/utils";
 
 //#region src/types/group-input.d.ts
 /** 分组输入组件属性 */
-interface GroupInputProps<GroupItem extends Record<string, any> = Record<string, any>> extends FormComponentProps {
+interface GroupInputProps<GroupItem extends Record<string, any> = Record<string, any>> extends FormFieldComponentProps {
   modelValue?: GroupItem[];
   /** 最大数量 */
   max?: number;

package/dist/types/index.d.ts

@@ -1,3 +1,5 @@
+import { PresetRule, ValidateRule } from "../components/form-item/validate.js";
+import { FormFieldComponentProps } from "./form-field.js";
 import { CascadeEmits, CascadeExposed, CascadeNode, CascadeProps, PanelItem, _CascadeExposed } from "./cascade.js";
 import { Message, MessageEmits, MessageExposed, MessageInstance, MessageOptions, MessageProps, MessageType, _MessageExposed } from "./message.js";
 import { MultiSelectEmits, MultiSelectExposed, MultiSelectProps, _MultiSelectExposed } from "./multi-select.js";
@@ -23,7 +25,6 @@ import { ButtonEmits, ButtonExposed, ButtonProps, ButtonType, _ButtonExposed } f
 import { DatePanelEmits, DatePanelProps, PanelType } from "./date-panel.js";
 import { DialogEmits, DialogExposed, DialogProps, DialogTransition, _DialogExposed } from "./dialog.js";
 import { ActionEmits, ActionExposed, ActionGroupExposed, ActionGroupProps, ActionProps, _ActionExposed, _ActionGroupExposed } from "./action.js";
-import { AllKeys, DataSettingConfig, FormExposed, FormModelField, FormModelItem, FormProps, IFormModel, ModelData, ModelRules, _FormExposed } from "./form.js";
 import { TableColumn, TableColumnAlign, TableColumnNode, TableColumnRenderContext, TableColumnSlotsScope, TableEmits, TableExposed, TableProps, TableRow, TableRowSlotsScope, TableSummaryContext, _TableExposed } from "./table.js";
 import { BatchEditColumn, BatchEditEmits, BatchEditExposed, BatchEditFeature, BatchEditProps, _BatchEditExposed } from "./batch-edit.js";
 import { BreadcrumbEmits, BreadcrumbExposed, BreadcrumbItem, BreadcrumbProps, BreadcrumbSlotScope, _BreadcrumbExposed } from "./breadcrumb.js";
@@ -34,6 +35,7 @@ import { FloatButtonEmits, FloatButtonExposed, FloatButtonItem, FloatButtonProps
 import { CalendarDay, CalendarEmits, CalendarExposed, CalendarMonth, CalendarProps, CalendarYear, _CalendarExposed } from "./calendar.js";
 import { PaletteColorType, PaletteEmits, PaletteExposed, PaletteHSV, PaletteProps, PaletteRGB, _PaletteExposed } from "./palette.js";
 import { InputEmits, InputExposed, InputProps, _InputExposed } from "./input.js";
+import { FormExposed, FormProps, _FormExposed } from "./form.js";
 import { UploaderEmits, UploaderExposed, UploaderProps, _UploaderExposed } from "./file-picker.js";
 import { PopEmits, PopExposed, PopProps, _PopExposed } from "./pop.js";
 import { GridInputEmits, GridInputExposed, GridInputProps, _GridInputExposed } from "./grid-input.js";
@@ -81,7 +83,7 @@ export type * from "@veltra/utils";
 
 //#region src/types/index.d.ts
 declare namespace index_d_exports {
-  export { ActionEmits, ActionExposed, ActionGroupExposed, ActionGroupProps, ActionProps, AllKeys, AnimationEmits, AnimationExposed, AnimationProps, AutoCompleteEmits, AutoCompleteExposed, AutoCompleteProps, BadgeEmits, BadgeExposed, BadgeProps, BarType, BatchEditColumn, BatchEditEmits, BatchEditExposed, BatchEditFeature, BatchEditProps, BreadcrumbEmits, BreadcrumbExposed, BreadcrumbItem, BreadcrumbProps, BreadcrumbSlotScope, BreakCols, Breakpoint, ButtonEmits, ButtonExposed, ButtonProps, ButtonType, CalendarDay, CalendarEmits, CalendarExposed, CalendarMonth, CalendarProps, CalendarYear, CardActionProps, CardContentProps, CardCoverProps, CardEmits, CardExposed, CardProps, CascadeEmits, CascadeExposed, CascadeNode, CascadeProps, CheckTagEmits, CheckTagExposed, CheckTagProps, CheckboxButtonEmits, CheckboxButtonProps, CheckboxEmits, CheckboxExposed, CheckboxGroupEmits, CheckboxGroupExposed, CheckboxGroupProps, CheckboxProps, CodeEditorEmits, CodeEditorExposed, CodeEditorLang, CodeEditorProps, CollapseEmits, CollapseItemProps, CollapseModelValue, CollapseProps, CollapseValue, ConditionConnector, ConditionEditorEmits, ConditionEditorExposed, ConditionEditorProps, ConditionExpression, ConditionField, ConditionGroup, ConditionLeaf, ConditionNode, ConditionValue, ContextmenuEmits, ContextmenuExposed, ContextmenuItem, ContextmenuProps, CssTransitionEmits, CssTransitionExposed, CssTransitionProps, DataSettingConfig, DatePanelEmits, DatePanelProps, DatePickerEmits, DatePickerExposed, DatePickerProps, DateRangePickerEmits, DateRangePickerExposed, DateRangePickerProps, DialogEmits, DialogExposed, DialogProps, DialogTransition, DrawerDirection, DrawerEmits, DrawerExposed, DrawerMode, DrawerProps, DropdownEmits, DropdownExposed, DropdownProps, EmptyEmits, EmptyExposed, EmptyProps, ExpressionEditorEmits, ExpressionEditorExposed, ExpressionEditorProps, ExpressionSelectableLevels, FileViewerEmits, FileViewerExposed, FileViewerItem, FileViewerKind, FileViewerProps, FloatButtonEmits, FloatButtonExposed, FloatButtonItem, FloatButtonProps, FormExposed, FormItemEmits, FormItemExposed, FormItemProps, FormModelField, FormModelItem, FormProps, GanttChartEmits, GanttChartExposed, GanttChartProps, GridEmits, GridExposed, GridInputEmits, GridInputExposed, GridInputProps, GridItemProps, GridProps, GroupInputEmits, GroupInputExposed, GroupInputProps, IFormModel, IconEmits, IconExposed, IconProps, InputEmits, InputExposed, InputProps, LayoutEmits, LayoutExposed, LayoutProps, ListEmits, ListExposed, ListProps, LoadingEmits, LoadingExposed, LoadingProps, LoadingType, MenuEmits, MenuExposed, MenuItem, MenuProps, Message, MessageConfirmEmits, MessageConfirmExposed, MessageConfirmProps, MessageEmits, MessageExposed, MessageInstance, MessageOptions, MessageProps, MessageType, ModelData, ModelRules, MultiAutoCompleteEmits, MultiAutoCompleteExposed, MultiAutoCompleteProps, MultiSelectEmits, MultiSelectExposed, MultiSelectProps, MultiTreeSelectEmits, MultiTreeSelectExposed, MultiTreeSelectProps, NodeRenderExposed, NodeRenderProps, NotificationEmits, NotificationExposed, NotificationProps, NumberEmits, NumberExposed, NumberInputEmits, NumberInputExposed, NumberInputProps, NumberProps, NumberRangeInputEmits, NumberRangeInputExposed, NumberRangeInputProps, NumberRangeTuple, PaginatorEmits, PaginatorExposed, PaginatorProps, PaletteColorType, PaletteEmits, PaletteExposed, PaletteHSV, PaletteProps, PaletteRGB, PanelItem, PanelType, PasswordInputEmits, PasswordInputExposed, PasswordInputProps, PopConfirmEmits, PopConfirmExposed, PopConfirmProps, PopEmits, PopExposed, PopProps, ProgressEmits, ProgressExposed, ProgressNodesEmits, ProgressNodesExposed, ProgressNodesProps, ProgressProps, QuickBatchEditEmits, QuickBatchEditExposed, QuickBatchEditProps, RadioEmits, RadioExposed, RadioGroupEmits, RadioGroupExposed, RadioGroupProps, RadioProps, RichTextEditorEmits, RichTextEditorExposed, RichTextEditorProps, RichTextFormat, ScrollEmits, ScrollExposed, ScrollPosition, ScrollProps, SelectEmits, SelectExposed, SelectProps, SliderEmits, SliderExposed, SliderProps, StepsEmits, StepsExposed, StepsProps, StepsSlotScope, SwitchEmits, SwitchExposed, SwitchProps, TabItem, TableColumn, TableColumnAlign, TableColumnNode, TableColumnRenderContext, TableColumnSlotsScope, TableEditorEmits, TableEditorExposed, TableEditorProps, TableEmits, TableExposed, TableProps, TableRow, TableRowSlotsScope, TableSummaryContext, TabsEmits, TabsExposed, TabsHorizontalEmits, TabsHorizontalExposed, TabsHorizontalProps, TabsProps, TabsVerticalEmits, TabsVerticalExposed, TabsVerticalProps, TagEmits, TagExposed, TagProps, TextEditorEmits, TextEditorExposed, TextEditorProps, TextEmits, TextExposed, TextProps, TextareaEmits, TextareaExposed, TextareaProps, ThemeExposed, ThemeProps, TipAlign, TipDirection, TipEmits, TipExposed, TipProps, ToolbarItem, TreeEmit, TreeExposed, TreeNode, TreeNodeProps, TreeProps, TreeSelectEmits, TreeSelectExposed, TreeSelectProps, UploaderEmits, UploaderExposed, UploaderProps, VariableItem, WatermarkEmits, WatermarkExposed, WatermarkProps, _ActionExposed, _ActionGroupExposed, _AnimationExposed, _AutoCompleteExposed, _BadgeExposed, _BatchEditExposed, _BreadcrumbExposed, _ButtonExposed, _CalendarExposed, _CardExposed, _CascadeExposed, _CheckTagExposed, _CodeEditorExposed, _ConditionEditorExposed, _ContextmenuExposed, _CssTransitionExposed, _DatePickerExposed, _DateRangePickerExposed, _DialogExposed, _DrawerExposed, _DropdownExposed, _EmptyExposed, _ExpressionEditorExposed, _FileViewerExposed, _FloatButtonExposed, _FormExposed, _GanttChartExposed, _GridExposed, _GridInputExposed, _GroupInputExposed, _InputExposed, _LayoutExposed, _ListExposed, _LoadingExposed, _MenuExposed, _MessageConfirmExposed, _MessageExposed, _MultiAutoCompleteExposed, _MultiSelectExposed, _MultiTreeSelectExposed, _NotificationExposed, _PaginatorExposed, _PaletteExposed, _PasswordInputExposed, _PopConfirmExposed, _PopExposed, _ProgressExposed, _ProgressNodesExposed, _QuickBatchEditExposed, _RadioExposed, _RadioGroupExposed, _RichTextEditorExposed, _ScrollExposed, _SelectExposed, _SliderExposed, _StepsExposed, _SwitchExposed, _TableEditorExposed, _TableExposed, _TabsExposed, _TabsHorizontalExposed, _TabsVerticalExposed, _TextEditorExposed, _TextExposed, _TextareaExposed, _ThemeExposed, _TipExposed, _TreeExposed, _TreeSelectExposed, _UploaderExposed, _WatermarkExposed };
+  export { ActionEmits, ActionExposed, ActionGroupExposed, ActionGroupProps, ActionProps, AnimationEmits, AnimationExposed, AnimationProps, AutoCompleteEmits, AutoCompleteExposed, AutoCompleteProps, BadgeEmits, BadgeExposed, BadgeProps, BarType, BatchEditColumn, BatchEditEmits, BatchEditExposed, BatchEditFeature, BatchEditProps, BreadcrumbEmits, BreadcrumbExposed, BreadcrumbItem, BreadcrumbProps, BreadcrumbSlotScope, BreakCols, Breakpoint, ButtonEmits, ButtonExposed, ButtonProps, ButtonType, CalendarDay, CalendarEmits, CalendarExposed, CalendarMonth, CalendarProps, CalendarYear, CardActionProps, CardContentProps, CardCoverProps, CardEmits, CardExposed, CardProps, CascadeEmits, CascadeExposed, CascadeNode, CascadeProps, CheckTagEmits, CheckTagExposed, CheckTagProps, CheckboxButtonEmits, CheckboxButtonProps, CheckboxEmits, CheckboxExposed, CheckboxGroupEmits, CheckboxGroupExposed, CheckboxGroupProps, CheckboxProps, CodeEditorEmits, CodeEditorExposed, CodeEditorLang, CodeEditorProps, CollapseEmits, CollapseItemProps, CollapseModelValue, CollapseProps, CollapseValue, ConditionConnector, ConditionEditorEmits, ConditionEditorExposed, ConditionEditorProps, ConditionExpression, ConditionField, ConditionGroup, ConditionLeaf, ConditionNode, ConditionValue, ContextmenuEmits, ContextmenuExposed, ContextmenuItem, ContextmenuProps, CssTransitionEmits, CssTransitionExposed, CssTransitionProps, DatePanelEmits, DatePanelProps, DatePickerEmits, DatePickerExposed, DatePickerProps, DateRangePickerEmits, DateRangePickerExposed, DateRangePickerProps, DialogEmits, DialogExposed, DialogProps, DialogTransition, DrawerDirection, DrawerEmits, DrawerExposed, DrawerMode, DrawerProps, DropdownEmits, DropdownExposed, DropdownProps, EmptyEmits, EmptyExposed, EmptyProps, ExpressionEditorEmits, ExpressionEditorExposed, ExpressionEditorProps, ExpressionSelectableLevels, FileViewerEmits, FileViewerExposed, FileViewerItem, FileViewerKind, FileViewerProps, FloatButtonEmits, FloatButtonExposed, FloatButtonItem, FloatButtonProps, FormExposed, FormFieldComponentProps, FormItemEmits, FormItemExposed, FormItemProps, FormProps, GanttChartEmits, GanttChartExposed, GanttChartProps, GridEmits, GridExposed, GridInputEmits, GridInputExposed, GridInputProps, GridItemProps, GridProps, GroupInputEmits, GroupInputExposed, GroupInputProps, IconEmits, IconExposed, IconProps, InputEmits, InputExposed, InputProps, LayoutEmits, LayoutExposed, LayoutProps, ListEmits, ListExposed, ListProps, LoadingEmits, LoadingExposed, LoadingProps, LoadingType, MenuEmits, MenuExposed, MenuItem, MenuProps, Message, MessageConfirmEmits, MessageConfirmExposed, MessageConfirmProps, MessageEmits, MessageExposed, MessageInstance, MessageOptions, MessageProps, MessageType, MultiAutoCompleteEmits, MultiAutoCompleteExposed, MultiAutoCompleteProps, MultiSelectEmits, MultiSelectExposed, MultiSelectProps, MultiTreeSelectEmits, MultiTreeSelectExposed, MultiTreeSelectProps, NodeRenderExposed, NodeRenderProps, NotificationEmits, NotificationExposed, NotificationProps, NumberEmits, NumberExposed, NumberInputEmits, NumberInputExposed, NumberInputProps, NumberProps, NumberRangeInputEmits, NumberRangeInputExposed, NumberRangeInputProps, NumberRangeTuple, PaginatorEmits, PaginatorExposed, PaginatorProps, PaletteColorType, PaletteEmits, PaletteExposed, PaletteHSV, PaletteProps, PaletteRGB, PanelItem, PanelType, PasswordInputEmits, PasswordInputExposed, PasswordInputProps, PopConfirmEmits, PopConfirmExposed, PopConfirmProps, PopEmits, PopExposed, PopProps, PresetRule, ProgressEmits, ProgressExposed, ProgressNodesEmits, ProgressNodesExposed, ProgressNodesProps, ProgressProps, QuickBatchEditEmits, QuickBatchEditExposed, QuickBatchEditProps, RadioEmits, RadioExposed, RadioGroupEmits, RadioGroupExposed, RadioGroupProps, RadioProps, RichTextEditorEmits, RichTextEditorExposed, RichTextEditorProps, RichTextFormat, ScrollEmits, ScrollExposed, ScrollPosition, ScrollProps, SelectEmits, SelectExposed, SelectProps, SliderEmits, SliderExposed, SliderProps, StepsEmits, StepsExposed, StepsProps, StepsSlotScope, SwitchEmits, SwitchExposed, SwitchProps, TabItem, TableColumn, TableColumnAlign, TableColumnNode, TableColumnRenderContext, TableColumnSlotsScope, TableEditorEmits, TableEditorExposed, TableEditorProps, TableEmits, TableExposed, TableProps, TableRow, TableRowSlotsScope, TableSummaryContext, TabsEmits, TabsExposed, TabsHorizontalEmits, TabsHorizontalExposed, TabsHorizontalProps, TabsProps, TabsVerticalEmits, TabsVerticalExposed, TabsVerticalProps, TagEmits, TagExposed, TagProps, TextEditorEmits, TextEditorExposed, TextEditorProps, TextEmits, TextExposed, TextProps, TextareaEmits, TextareaExposed, TextareaProps, ThemeExposed, ThemeProps, TipAlign, TipDirection, TipEmits, TipExposed, TipProps, ToolbarItem, TreeEmit, TreeExposed, TreeNode, TreeNodeProps, TreeProps, TreeSelectEmits, TreeSelectExposed, TreeSelectProps, UploaderEmits, UploaderExposed, UploaderProps, ValidateRule, VariableItem, WatermarkEmits, WatermarkExposed, WatermarkProps, _ActionExposed, _ActionGroupExposed, _AnimationExposed, _AutoCompleteExposed, _BadgeExposed, _BatchEditExposed, _BreadcrumbExposed, _ButtonExposed, _CalendarExposed, _CardExposed, _CascadeExposed, _CheckTagExposed, _CodeEditorExposed, _ConditionEditorExposed, _ContextmenuExposed, _CssTransitionExposed, _DatePickerExposed, _DateRangePickerExposed, _DialogExposed, _DrawerExposed, _DropdownExposed, _EmptyExposed, _ExpressionEditorExposed, _FileViewerExposed, _FloatButtonExposed, _FormExposed, _GanttChartExposed, _GridExposed, _GridInputExposed, _GroupInputExposed, _InputExposed, _LayoutExposed, _ListExposed, _LoadingExposed, _MenuExposed, _MessageConfirmExposed, _MessageExposed, _MultiAutoCompleteExposed, _MultiSelectExposed, _MultiTreeSelectExposed, _NotificationExposed, _PaginatorExposed, _PaletteExposed, _PasswordInputExposed, _PopConfirmExposed, _PopExposed, _ProgressExposed, _ProgressNodesExposed, _QuickBatchEditExposed, _RadioExposed, _RadioGroupExposed, _RichTextEditorExposed, _ScrollExposed, _SelectExposed, _SliderExposed, _StepsExposed, _SwitchExposed, _TableEditorExposed, _TableExposed, _TabsExposed, _TabsHorizontalExposed, _TabsVerticalExposed, _TextEditorExposed, _TextExposed, _TextareaExposed, _ThemeExposed, _TipExposed, _TreeExposed, _TreeSelectExposed, _UploaderExposed, _WatermarkExposed };
 }
 import * as import__veltra_utils from "@veltra/utils";
 //#endregion

package/dist/types/input.d.ts

@@ -1,9 +1,10 @@
+import { FormFieldComponentProps } from "./form-field.js";
 import { ShallowRef } from "vue";
-import { DeconstructValue, FormComponentProps } from "@veltra/utils";
+import { DeconstructValue } from "@veltra/utils";
 
 //#region src/types/input.d.ts
 /** 输入框组件属性 */
-interface InputProps extends FormComponentProps {
+interface InputProps extends FormFieldComponentProps {
   /** modelValue */
   modelValue?: string;
   /** 占位符 */

package/dist/types/multi-select.d.ts

@@ -1,9 +1,10 @@
+import { FormFieldComponentProps } from "./form-field.js";
 import { CSSProperties } from "vue";
-import { DeconstructValue, FormComponentProps } from "@veltra/utils";
+import { DeconstructValue } from "@veltra/utils";
 
 //#region src/types/multi-select.d.ts
 /** multi-select组件属性 */
-interface MultiSelectProps extends FormComponentProps {
+interface MultiSelectProps extends FormFieldComponentProps {
   /** 绑定值 */
   modelValue?: Array<any>;
   /** 列表选项 */

package/dist/types/multi-tree-select.d.ts

@@ -1,10 +1,11 @@
+import { FormFieldComponentProps } from "./form-field.js";
 import { TreeProps } from "./tree.js";
 import { CSSProperties } from "vue";
-import { DeconstructValue, FormComponentProps } from "@veltra/utils";
+import { DeconstructValue } from "@veltra/utils";
 
 //#region src/types/multi-tree-select.d.ts
 /** 树形多选组件组件属性 */
-interface MultiTreeSelectProps extends FormComponentProps, Omit<TreeProps, 'selected' | 'checked' | 'selectable' | 'checkable'> {
+interface MultiTreeSelectProps extends FormFieldComponentProps, Omit<TreeProps, 'selected' | 'checked' | 'selectable' | 'checkable'> {
   modelValue?: (string | number)[];
   /**自定义占位文字 */
   placeholder?: string;

package/dist/types/palette.d.ts

@@ -1,4 +1,5 @@
-import { DeconstructValue, FormComponentProps } from "@veltra/utils";
+import { FormFieldComponentProps } from "./form-field.js";
+import { DeconstructValue } from "@veltra/utils";
 
 //#region src/types/palette.d.ts
 /** 色调 */
@@ -16,7 +17,7 @@ interface PaletteHSV {
 /** 调色盘组件颜色类型 */
 type PaletteColorType = 'HEX' | 'RGB';
 /** 调色盘组件属性 */
-interface PaletteProps extends FormComponentProps {
+interface PaletteProps extends FormFieldComponentProps {
   modelValue?: string;
   disabled?: boolean;
   readonly?: boolean;

package/dist/types/radio-group.d.ts

@@ -1,8 +1,9 @@
-import { DeconstructValue, FormComponentProps } from "@veltra/utils";
+import { FormFieldComponentProps } from "./form-field.js";
+import { DeconstructValue } from "@veltra/utils";
 
 //#region src/types/radio-group.d.ts
 /** 单选框默认父组件组件属性 */
-interface RadioGroupProps extends FormComponentProps {
+interface RadioGroupProps extends FormFieldComponentProps {
   /** 值 */
   modelValue?: any;
   /** 单选框项 */

package/dist/types/radio.d.ts

@@ -1,8 +1,9 @@
-import { DeconstructValue, FormComponentProps } from "@veltra/utils";
+import { FormFieldComponentProps } from "./form-field.js";
+import { DeconstructValue } from "@veltra/utils";
 
 //#region src/types/radio.d.ts
 /** 单选框组件属性 */
-interface RadioProps extends FormComponentProps {
+interface RadioProps extends FormFieldComponentProps {
   /** 单选框值 */
   value?: any;
   /** 文本 */

package/dist/types/rich-text-editor.d.ts

@@ -1,4 +1,5 @@
-import { DeconstructValue, FormComponentProps } from "@veltra/utils";
+import { FormFieldComponentProps } from "./form-field.js";
+import { DeconstructValue } from "@veltra/utils";
 
 //#region src/types/rich-text-editor.d.ts
 /** 富文本数据格式 */
@@ -6,7 +7,7 @@ type RichTextFormat = 'html' | 'json';
 /** 工具栏项 */
 type ToolbarItem = 'bold' | 'italic' | 'underline' | 'strikethrough' | 'code' | 'heading' | 'bullet-list' | 'ordered-list' | 'blockquote' | 'code-block' | 'link' | 'undo' | 'redo' | '|';
 /** 富文本编辑器组件属性 */
-interface RichTextEditorProps extends FormComponentProps {
+interface RichTextEditorProps extends FormFieldComponentProps {
   modelValue?: string;
   /** 数据格式：html 或 json */
   format?: RichTextFormat;

package/dist/types/select.d.ts

@@ -1,9 +1,10 @@
+import { FormFieldComponentProps } from "./form-field.js";
 import { CSSProperties, ShallowRef } from "vue";
-import { DeconstructValue, FormComponentProps } from "@veltra/utils";
+import { DeconstructValue } from "@veltra/utils";
 
 //#region src/types/select.d.ts
 /** 选择器组件属性 */
-interface SelectProps extends FormComponentProps {
+interface SelectProps extends FormFieldComponentProps {
   /** 绑定值 */
   modelValue?: any;
   /** 文本内容 */

package/dist/types/slider.d.ts

@@ -1,8 +1,9 @@
-import { DeconstructValue, FormComponentProps } from "@veltra/utils";
+import { FormFieldComponentProps } from "./form-field.js";
+import { DeconstructValue } from "@veltra/utils";
 
 //#region src/types/slider.d.ts
 /** 滑块组件属性 */
-interface SliderProps<T extends number | [number, number]> extends FormComponentProps {
+interface SliderProps<T extends number | [number, number]> extends FormFieldComponentProps {
   modelValue?: T;
   /**
    * 最小值

package/dist/types/switch.d.ts

@@ -1,8 +1,9 @@
-import { DeconstructValue, FormComponentProps } from "@veltra/utils";
+import { FormFieldComponentProps } from "./form-field.js";
+import { DeconstructValue } from "@veltra/utils";
 
 //#region src/types/switch.d.ts
 /** 开关组件属性 */
-interface SwitchProps extends FormComponentProps {
+interface SwitchProps extends FormFieldComponentProps {
   /** 开关状态 */
   modelValue?: boolean;
   /** 打开时显示的文字 */

package/dist/types/text-editor.d.ts

@@ -1,4 +1,5 @@
-import { DeconstructValue, FormComponentProps } from "@veltra/utils";
+import { FormFieldComponentProps } from "./form-field.js";
+import { DeconstructValue } from "@veltra/utils";
 
 //#region src/types/text-editor.d.ts
 /** text-editor组件属性 */
@@ -6,7 +7,7 @@ interface BarType {
   content: string;
   bar: string;
 }
-interface TextEditorProps extends FormComponentProps {
+interface TextEditorProps extends FormFieldComponentProps {
   modelValue?: string;
   placeholder?: string;
   toolbar?: BarType[];

package/dist/types/textarea.d.ts

@@ -1,8 +1,9 @@
-import { DeconstructValue, FormComponentProps } from "@veltra/utils";
+import { FormFieldComponentProps } from "./form-field.js";
+import { DeconstructValue } from "@veltra/utils";
 
 //#region src/types/textarea.d.ts
 /** textarea组件属性 */
-interface TextareaProps extends FormComponentProps {
+interface TextareaProps extends FormFieldComponentProps {
   /**
    * 文本域的值
    */

package/dist/types/tree-select.d.ts

@@ -1,10 +1,11 @@
+import { FormFieldComponentProps } from "./form-field.js";
 import { TreeProps } from "./tree.js";
 import { CSSProperties } from "vue";
-import { DeconstructValue, FormComponentProps } from "@veltra/utils";
+import { DeconstructValue } from "@veltra/utils";
 
 //#region src/types/tree-select.d.ts
 /** 树形选择器组件属性 */
-interface TreeSelectProps extends FormComponentProps, Omit<TreeProps, 'selected' | 'checked' | 'selectable' | 'checkable'> {
+interface TreeSelectProps extends FormFieldComponentProps, Omit<TreeProps, 'selected' | 'checked' | 'selectable' | 'checkable'> {
   modelValue?: string | number;
   /** 自定义占位文字 */
   placeholder?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@veltra/desktop",
-  "version": "1.1.36",
+  "version": "1.2.0",
   "files": [
     "dist",
     "src"
@@ -68,11 +68,11 @@
     "@cat-kit/core": ">=1.1.6",
     "@cat-kit/excel": ">=1.0.0",
     "@cat-kit/fe": "^1.1.6",
-    "@veltra/compositions": "1.1.36",
-    "@veltra/directives": "1.1.36",
-    "@veltra/icons": "1.1.36",
-    "@veltra/styles": "1.1.36",
-    "@veltra/utils": "1.1.36",
+    "@veltra/compositions": "1.2.0",
+    "@veltra/directives": "1.2.0",
+    "@veltra/icons": "1.2.0",
+    "@veltra/styles": "1.2.0",
+    "@veltra/utils": "1.2.0",
     "vue": ">=3.5.0"
   }
 }

package/src/components/batch-edit/batch-edit-form.vue

@@ -26,23 +26,20 @@
     <u-scroll always :class="cls.e('form-body')" :key="bodyKey">
       <transition name="fade" appear mode="out-in">
         <u-form
+          ref="formComponentRef"
           :model="props.model"
           :readonly="props.readonly"
           @keydown="handleFormKeydown"
           :label-width="props.labelWidth"
         >
-          <template #default="{ data, model }">
-            <slot
-              v-bind="{
-                data,
-                model,
-                row: state.row,
-                depth: state.depth,
-                indexes: insertIndexes,
-                index: state.row?.index
-              }"
-            />
-          </template>
+          <slot
+            v-bind="{
+              row: state.row,
+              depth: state.depth,
+              indexes: insertIndexes,
+              index: state.row?.index
+            }"
+          />
         </u-form>
       </transition>
     </u-scroll>
@@ -75,8 +72,9 @@
 <script lang="ts" setup>
 import { AddChild, Close, EditPen, Plus, View } from '@veltra/icons/normal'
 import { bem } from '@veltra/utils'
-import { computed, inject, type Component } from 'vue'
+import { computed, inject, shallowRef, toRef, type Component } from 'vue'
 
+import type { _FormExposed, FormExposed } from '../../types/form'
 import { UButton } from '../button'
 import { UForm } from '../form'
 import { UIcon } from '../icon'
@@ -97,6 +95,15 @@ const {
   dynamicFeatures
 } = inject(BatchEditDIKey)!
 
+const formComponentRef = shallowRef<FormExposed>()
+
+defineExpose<_FormExposed>({
+  el: toRef(() => formComponentRef.value?.el),
+  validate: () => formComponentRef.value?.validate() ?? Promise.resolve(true),
+  clearValidate: () => formComponentRef.value?.clearValidate(),
+  reset: () => formComponentRef.value?.reset()
+})
+
 const creatable = computed(() => {
   return (
     state.type === 'create' &&

package/src/components/batch-edit/batch-edit.vue

@@ -12,14 +12,14 @@
     <BatchEditList :slots="slots" />
 
     <!-- 编辑表单 -->
-    <BatchEditForm v-slot="scoped">
+    <BatchEditForm ref="formRef" v-slot="scoped">
       <!-- @vue-ignore -->
       <slot name="form" v-bind="scoped" />
     </BatchEditForm>
   </u-layout>
 </template>
 
-<script lang="ts" setup generic="Model extends IFormModel">
+<script lang="ts" setup>
 import { bem } from '@veltra/utils'
 import { computed, inject, provide, shallowRef, watch } from 'vue'
 
@@ -27,11 +27,11 @@ import type {
   BatchEditEmits,
   BatchEditFeature,
   BatchEditProps,
-  IFormModel,
   TableColumnSlotsScope,
   TableExposed,
   TableRow
 } from '../../types'
+import type { FormExposed } from '../../types/form'
 import { DialogDIKey } from '../dialog/di'
 import { ULayout } from '../layout'
 import BatchEditForm from './batch-edit-form.vue'
@@ -41,7 +41,7 @@ import { useEdit } from './use-edit'
 
 defineOptions({ name: 'BatchEdit' })
 
-const props = withDefaults(defineProps<BatchEditProps<Model>>(), {
+const props = withDefaults(defineProps<BatchEditProps>(), {
   cols: () => ['1fr', '420px'],
   mode: 'normal'
 })
@@ -99,9 +99,7 @@ const slots = defineSlots<
   {
     form?: (props: {
       /** 表单数据 */
-      data: Model['data']
-      /** 表单模型 */
-      model: Model
+      data: Record<string, any> | undefined
       /** 当前编辑的层级 */
       depth?: number
       /** 当前编辑的行 */
@@ -119,8 +117,9 @@ const slots = defineSlots<
 const cls = bem('batch-edit')
 
 const tableRef = shallowRef<TableExposed>()
+const formRef = shallowRef<FormExposed>()
 
-const editCtx = useEdit({ props, emit, tableRef })
+const editCtx = useEdit({ props, emit, tableRef, formRef })
 
 const { state, handleClose, handleSave, handleDelete, handleCreate } = editCtx
 

package/src/components/batch-edit/di.ts

@@ -5,7 +5,6 @@ import type {
   BatchEditEmits,
   BatchEditFeature,
   BatchEditProps,
-  IFormModel,
   TableExposed,
   TableRow
 } from '../../types'
@@ -13,7 +12,7 @@ import type { EditReturned } from './use-edit'
 export const BatchEditDIKey: InjectionKey<
   {
     cls: BEM<'batch-edit', 'u-'>
-    props: BatchEditProps<IFormModel>
+    props: BatchEditProps
     emit: BatchEditEmits
     tableRef: ShallowRef<TableExposed | undefined>
     staticFeatures: ComputedRef<Set<BatchEditFeature>>