@veltra/desktop 1.2.0 → 1.2.1

package/src/components/form-item/validate.ts

@@ -1,29 +1,5 @@
 import { isEmpty, o } from '@cat-kit/core'
-import type { Undef } from '@veltra/utils'
-
-export type PresetRule = 'email' | 'phone' | 'num' | 'url' | 'idCard'
-
-/** 字段校验规则 */
-export interface ValidateRule {
-  /** 是否必填 */
-  required?: boolean | string
-  /** 长度单位 */
-  length?: number | [number, string]
-  /** 最小值 */
-  min?: number | [number, string]
-  /** 最大值 */
-  max?: number | [number, string]
-  /** 最小长度 */
-  minLen?: number | [number, string]
-  /** 最大长度 */
-  maxLen?: number | [number, string]
-  /** 匹配 */
-  match?: RegExp | [RegExp, string] | string
-  /** 预设 */
-  preset?: PresetRule
-  /** 自定义校验 */
-  validator?: (value: any, data: Record<string, any>) => Promise<string> | string
-}
+import type { PresetRule, Undef, ValidateRule } from '@veltra/utils'
 
 const presetRules: Record<PresetRule, (value: string) => string | undefined> = {
   email(v) {

package/src/types/auto-complete.ts

@@ -1,9 +1,7 @@
-import type { DeconstructValue } from '@veltra/utils'
-
-import type { FormFieldComponentProps } from './form-field'
+import type { DeconstructValue, FormComponentProps } from '@veltra/utils'
 
 /** 自动补全组件组件属性 */
-export interface AutoCompleteProps extends FormFieldComponentProps {
+export interface AutoCompleteProps extends FormComponentProps {
   modelValue?: string
   /** 占位符 */
   placeholder?: string

package/src/types/cascade.ts

@@ -1,7 +1,5 @@
 import type { TreeNode } from '@cat-kit/core'
-import type { DeconstructValue } from '@veltra/utils'
-
-import type { FormFieldComponentProps } from './form-field'
+import type { DeconstructValue, FormComponentProps } from '@veltra/utils'
 
 export interface CascadeNode<
   Data extends Record<string, any> = Record<string, any>
@@ -12,7 +10,7 @@ export interface CascadeNode<
 }
 
 /** 级联选择器组件属性 */
-export interface CascadeProps extends FormFieldComponentProps {
+export interface CascadeProps extends FormComponentProps {
   /**
    * 分隔符
    * @default '/'

package/src/types/checkbox-group.ts

@@ -1,7 +1,7 @@
-import type { FormFieldComponentProps } from './form-field'
+import type { FormComponentProps } from '@veltra/utils'
 
 /** 复选框组, 用来选择一组数据组件属性 */
-export interface CheckboxGroupProps extends FormFieldComponentProps {
+export interface CheckboxGroupProps extends FormComponentProps {
   /** 值 */
   modelValue?: Array<any>
   /** 复选框项 */

package/src/types/checkbox.ts

@@ -1,16 +1,14 @@
-import type { ColorType } from '@veltra/utils'
-
-import type { FormFieldComponentProps } from './form-field'
+import type { ColorType, FormComponentProps } from '@veltra/utils'
 
 /** 复选框组件属性 */
-export interface CheckboxProps extends FormFieldComponentProps {
+export interface CheckboxProps extends FormComponentProps {
   /** 部分选中 */
   indeterminate?: boolean
   /** 是否选中  */
   modelValue?: boolean
 }
 
-export interface CheckboxButtonProps extends FormFieldComponentProps {
+export interface CheckboxButtonProps extends FormComponentProps {
   /** 是否选中  */
   modelValue?: boolean
   /** 是否圆角 */

package/src/types/code-editor.ts

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

package/src/types/date-picker.ts

@@ -1,10 +1,8 @@
 import type { Dater } from '@cat-kit/core'
-import type { DeconstructValue } from '@veltra/utils'
-
-import type { FormFieldComponentProps } from './form-field'
+import type { DeconstructValue, FormComponentProps } from '@veltra/utils'
 
 /** date-picker组件属性 */
-export interface DatePickerProps extends FormFieldComponentProps {
+export interface DatePickerProps extends FormComponentProps {
   modelValue?: string | number | Date
   /** 占位 */
   placeholder?: string

package/src/types/date-range-picker.ts

@@ -1,10 +1,8 @@
 import type { Dater } from '@cat-kit/core'
-import type { DeconstructValue } from '@veltra/utils'
-
-import type { FormFieldComponentProps } from './form-field'
+import type { DeconstructValue, FormComponentProps } from '@veltra/utils'
 
 /** date-range-picker组件属性 */
-export interface DateRangePickerProps extends FormFieldComponentProps {
+export interface DateRangePickerProps extends FormComponentProps {
   modelValue?: [string, string]
   /** 占位 */
   placeholder?: [string, string]

package/src/types/expression-editor.ts

@@ -1,6 +1,4 @@
-import type { DeconstructValue } from '@veltra/utils'
-
-import type { FormFieldComponentProps } from './form-field'
+import type { DeconstructValue, FormComponentProps } from '@veltra/utils'
 
 export interface VariableItem {
   label: string
@@ -15,7 +13,7 @@ export interface VariableItem {
 export type ExpressionSelectableLevels = 'leaf' | 'any'
 
 /** 表达式编辑器组件属性 */
-export interface ExpressionEditorProps extends FormFieldComponentProps {
+export interface ExpressionEditorProps extends FormComponentProps {
   modelValue?: string
   placeholder?: string
   /** 变量列表 */

package/src/types/file-picker.ts

@@ -1,9 +1,7 @@
-import type { DeconstructValue } from '@veltra/utils'
-
-import type { FormFieldComponentProps } from './form-field'
+import type { DeconstructValue, FormComponentProps } from '@veltra/utils'
 
 /** 文件上传器组件属性 */
-export interface UploaderProps extends FormFieldComponentProps {
+export interface UploaderProps extends FormComponentProps {
   /** 渲染标签 */
   tag?: string
   /** 允许上传的文件类型 */

package/src/types/form-item.ts

@@ -1,7 +1,7 @@
-import type { FormFieldComponentProps } from './form-field'
+import type { FormComponentProps } from '@veltra/utils'
 
 /** 组件项组件属性 */
-export interface FormItemProps extends FormFieldComponentProps {
+export interface FormItemProps extends FormComponentProps {
   /** 标签宽度 */
   labelWidth?: string | number
 }

package/src/types/group-input.ts

@@ -1,12 +1,10 @@
-import type { DeconstructValue } from '@veltra/utils'
+import type { DeconstructValue, FormComponentProps } from '@veltra/utils'
 import type { StyleValue } from 'vue'
 
-import type { FormFieldComponentProps } from './form-field'
-
 /** 分组输入组件属性 */
 export interface GroupInputProps<
   GroupItem extends Record<string, any> = Record<string, any>
-> extends FormFieldComponentProps {
+> extends FormComponentProps {
   modelValue?: GroupItem[]
   /** 最大数量 */
   max?: number

package/src/types/index.ts

@@ -63,7 +63,6 @@ export * from './number-range-input'
 export * from './theme'
 export * from './loading'
 export * from './badge'
-export * from './form-field'
 export * from './form-item'
 export * from './group-input'
 export * from './paginator'

package/src/types/input.ts

@@ -1,10 +1,8 @@
-import type { DeconstructValue } from '@veltra/utils'
+import type { DeconstructValue, FormComponentProps } from '@veltra/utils'
 import type { ShallowRef } from 'vue'
 
-import type { FormFieldComponentProps } from './form-field'
-
 /** 输入框组件属性 */
-export interface InputProps extends FormFieldComponentProps {
+export interface InputProps extends FormComponentProps {
   /** modelValue */
   modelValue?: string
   /** 占位符 */

package/src/types/multi-select.ts

@@ -1,10 +1,8 @@
-import type { DeconstructValue } from '@veltra/utils'
+import type { DeconstructValue, FormComponentProps } from '@veltra/utils'
 import type { CSSProperties } from 'vue'
 
-import type { FormFieldComponentProps } from './form-field'
-
 /** multi-select组件属性 */
-export interface MultiSelectProps extends FormFieldComponentProps {
+export interface MultiSelectProps extends FormComponentProps {
   /** 绑定值 */
   modelValue?: Array<any>
   /** 列表选项 */

package/src/types/multi-tree-select.ts

@@ -1,13 +1,10 @@
-import type { DeconstructValue } from '@veltra/utils'
+import type { DeconstructValue, FormComponentProps } from '@veltra/utils'
 import type { CSSProperties } from 'vue'
 
-import type { FormFieldComponentProps } from './form-field'
 import type { TreeProps } from './tree'
 /** 树形多选组件组件属性 */
 export interface MultiTreeSelectProps
-  extends
-    FormFieldComponentProps,
-    Omit<TreeProps, 'selected' | 'checked' | 'selectable' | 'checkable'> {
+  extends FormComponentProps, Omit<TreeProps, 'selected' | 'checked' | 'selectable' | 'checkable'> {
   modelValue?: (string | number)[]
 
   /**自定义占位文字 */

package/src/types/palette.ts

@@ -1,6 +1,4 @@
-import type { DeconstructValue } from '@veltra/utils'
-
-import type { FormFieldComponentProps } from './form-field'
+import type { DeconstructValue, FormComponentProps } from '@veltra/utils'
 
 /** 色调 */
 export interface PaletteRGB {
@@ -20,7 +18,7 @@ export interface PaletteHSV {
 export type PaletteColorType = 'HEX' | 'RGB'
 
 /** 调色盘组件属性 */
-export interface PaletteProps extends FormFieldComponentProps {
+export interface PaletteProps extends FormComponentProps {
   modelValue?: string
   disabled?: boolean
   readonly?: boolean

package/src/types/radio-group.ts

@@ -1,8 +1,7 @@
-import type { DeconstructValue } from '@veltra/utils'
+import type { DeconstructValue, FormComponentProps } from '@veltra/utils'
 
-import type { FormFieldComponentProps } from './form-field'
 /** 单选框默认父组件组件属性 */
-export interface RadioGroupProps extends FormFieldComponentProps {
+export interface RadioGroupProps extends FormComponentProps {
   /** 值 */
   modelValue?: any
   /** 单选框项 */

package/src/types/radio.ts

@@ -1,8 +1,7 @@
-import type { DeconstructValue } from '@veltra/utils'
+import type { DeconstructValue, FormComponentProps } from '@veltra/utils'
 
-import type { FormFieldComponentProps } from './form-field'
 /** 单选框组件属性 */
-export interface RadioProps extends FormFieldComponentProps {
+export interface RadioProps extends FormComponentProps {
   /** 单选框值 */
   value?: any
   /** 文本 */

package/src/types/rich-text-editor.ts

@@ -1,6 +1,4 @@
-import type { DeconstructValue } from '@veltra/utils'
-
-import type { FormFieldComponentProps } from './form-field'
+import type { DeconstructValue, FormComponentProps } from '@veltra/utils'
 
 /** 富文本数据格式 */
 export type RichTextFormat = 'html' | 'json'
@@ -23,7 +21,7 @@ export type ToolbarItem =
   | '|'
 
 /** 富文本编辑器组件属性 */
-export interface RichTextEditorProps extends FormFieldComponentProps {
+export interface RichTextEditorProps extends FormComponentProps {
   modelValue?: string
   /** 数据格式：html 或 json */
   format?: RichTextFormat

package/src/types/select.ts

@@ -1,10 +1,8 @@
-import type { DeconstructValue } from '@veltra/utils'
+import type { DeconstructValue, FormComponentProps } from '@veltra/utils'
 import type { CSSProperties, ShallowRef } from 'vue'
 
-import type { FormFieldComponentProps } from './form-field'
-
 /** 选择器组件属性 */
-export interface SelectProps extends FormFieldComponentProps {
+export interface SelectProps extends FormComponentProps {
   /** 绑定值 */
   modelValue?: any
   /** 文本内容 */

package/src/types/slider.ts

@@ -1,9 +1,7 @@
-import type { DeconstructValue } from '@veltra/utils'
-
-import type { FormFieldComponentProps } from './form-field'
+import type { DeconstructValue, FormComponentProps } from '@veltra/utils'
 
 /** 滑块组件属性 */
-export interface SliderProps<T extends number | [number, number]> extends FormFieldComponentProps {
+export interface SliderProps<T extends number | [number, number]> extends FormComponentProps {
   modelValue?: T
   /**
    * 最小值

package/src/types/switch.ts

@@ -1,9 +1,7 @@
-import type { DeconstructValue } from '@veltra/utils'
-
-import type { FormFieldComponentProps } from './form-field'
+import type { DeconstructValue, FormComponentProps } from '@veltra/utils'
 
 /** 开关组件属性 */
-export interface SwitchProps extends FormFieldComponentProps {
+export interface SwitchProps extends FormComponentProps {
   /** 开关状态 */
   modelValue?: boolean
   /** 打开时显示的文字 */

package/src/types/text-editor.ts

@@ -1,6 +1,4 @@
-import type { DeconstructValue } from '@veltra/utils'
-
-import type { FormFieldComponentProps } from './form-field'
+import type { DeconstructValue, FormComponentProps } from '@veltra/utils'
 
 /** text-editor组件属性 */
 export interface BarType {
@@ -8,7 +6,7 @@ export interface BarType {
   bar: string
 }
 
-export interface TextEditorProps extends FormFieldComponentProps {
+export interface TextEditorProps extends FormComponentProps {
   modelValue?: string
   placeholder?: string
   toolbar?: BarType[]

package/src/types/textarea.ts

@@ -1,9 +1,7 @@
-import type { DeconstructValue } from '@veltra/utils'
-
-import type { FormFieldComponentProps } from './form-field'
+import type { DeconstructValue, FormComponentProps } from '@veltra/utils'
 
 /** textarea组件属性 */
-export interface TextareaProps extends FormFieldComponentProps {
+export interface TextareaProps extends FormComponentProps {
   /**
    * 文本域的值
    */

package/src/types/tree-select.ts

@@ -1,14 +1,11 @@
-import type { DeconstructValue } from '@veltra/utils'
+import type { DeconstructValue, FormComponentProps } from '@veltra/utils'
 import type { CSSProperties } from 'vue'
 
-import type { FormFieldComponentProps } from './form-field'
 import type { TreeProps } from './tree'
 
 /** 树形选择器组件属性 */
 export interface TreeSelectProps
-  extends
-    FormFieldComponentProps,
-    Omit<TreeProps, 'selected' | 'checked' | 'selectable' | 'checkable'> {
+  extends FormComponentProps, Omit<TreeProps, 'selected' | 'checked' | 'selectable' | 'checkable'> {
   modelValue?: string | number
 
   /** 自定义占位文字 */

package/dist/components/form-item/validate.d.ts

@@ -1,26 +0,0 @@
-//#region src/components/form-item/validate.d.ts
-type PresetRule = 'email' | 'phone' | 'num' | 'url' | 'idCard';
-/** 字段校验规则 */
-interface ValidateRule {
-  /** 是否必填 */
-  required?: boolean | string;
-  /** 长度单位 */
-  length?: number | [number, string];
-  /** 最小值 */
-  min?: number | [number, string];
-  /** 最大值 */
-  max?: number | [number, string];
-  /** 最小长度 */
-  minLen?: number | [number, string];
-  /** 最大长度 */
-  maxLen?: number | [number, string];
-  /** 匹配 */
-  match?: RegExp | [RegExp, string] | string;
-  /** 预设 */
-  preset?: PresetRule;
-  /** 自定义校验 */
-  validator?: (value: any, data: Record<string, any>) => Promise<string> | string;
-}
-//#endregion
-export { PresetRule, ValidateRule };
-//# sourceMappingURL=validate.d.ts.map

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

@@ -1,12 +0,0 @@
-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/src/types/form-field.ts

@@ -1,11 +0,0 @@
-import type { FormComponentProps } from '@veltra/utils'
-
-import type { ValidateRule } from '../components/form-item/validate'
-
-export type { PresetRule, ValidateRule } from '../components/form-item/validate'
-
-/** 带校验规则的表单控件通用属性 */
-export interface FormFieldComponentProps extends FormComponentProps {
-  /** 校验规则 */
-  rules?: ValidateRule
-}