@veltra/desktop 1.1.24 → 1.1.25

package/dist/components/action/action-group.vue.d.ts

@@ -11,9 +11,9 @@ declare const __VLS_base: _$vue.DefineComponent<ActionGroupProps, _ActionGroupEx
   type: _$_veltra_utils0.ColorType;
   size: "small" | "default" | "large";
   max: number;
+  circle: boolean;
   text: boolean;
   loading: boolean;
-  circle: boolean;
 }, {}, {}, {}, string, _$vue.ComponentProvideOptions, false, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
 declare const _default: typeof __VLS_export;

package/dist/components/action/action.vue.d.ts

@@ -17,9 +17,9 @@ declare const __VLS_base: _$vue.DefineComponent<ActionProps, {}, {}, {}, {}, _$v
 }>, {
   type: ButtonType;
   size: _$_veltra_utils0.ComponentSize;
+  circle: boolean;
   text: boolean;
   loading: boolean;
-  circle: boolean;
   inDropdown: boolean;
 }, {}, {}, {}, string, _$vue.ComponentProvideOptions, false, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;

package/dist/components/batch-edit/batch-edit.vue.d.ts

@@ -9,12 +9,12 @@ declare const __VLS_export: <Model extends FormModel>(__VLS_props: NonNullable<A
   props: _$vue.PublicProps & __VLS_PrettifyLocal<BatchEditProps<Model> & {
     "onUpdate:selected"?: ((value: Record<string, any> | undefined) => any) | undefined;
     "onUpdate:checked"?: ((value: Record<string, any>[]) => any) | undefined;
-    "onUpdate:data"?: ((value: Record<string, any>[]) => any) | undefined;
+    "onUpdate:current"?: ((row?: TableRow | undefined) => any) | undefined;
     "onUpdate:rows"?: ((rows: TableRow[]) => any) | undefined;
     "onUpdate:forest"?: ((rows?: _$_cat_kit_core0.Forest<Record<string, unknown>, any> | undefined) => any) | undefined;
-    "onUpdate:current"?: ((row?: TableRow | undefined) => any) | undefined;
     "onCell-click"?: ((row: TableRow, column: TableColumn, ev: MouseEvent) => any) | undefined;
     "onRow-click"?: ((row: TableRow, ev: MouseEvent) => any) | undefined;
+    "onUpdate:data"?: ((value: Record<string, any>[]) => any) | undefined;
   }> & (typeof globalThis extends {
     __VLS_PROPS_FALLBACK: infer P;
   } ? P : {});

package/dist/components/cascade/cascade.vue.d.ts

@@ -4,12 +4,12 @@ import * as _$vue from "vue";
 //#region src/components/cascade/cascade.vue.d.ts
 declare const __VLS_export: _$vue.DefineComponent<CascadeProps, {}, {}, {}, {}, _$vue.ComponentOptionsMixin, _$vue.ComponentOptionsMixin, {} & {
   "update:modelValue": (value?: string | string[] | undefined) => any;
-  clear: () => any;
   change: (...args: [value?: string | undefined, label?: string | undefined, item?: Record<string, any> | undefined] | [value: string[], label: string[], data: Record<string, any>[]]) => any;
+  clear: () => any;
 }, string, _$vue.PublicProps, Readonly<CascadeProps> & Readonly<{
   "onUpdate:modelValue"?: ((value?: string | string[] | undefined) => any) | undefined;
-  onClear?: (() => any) | undefined;
   onChange?: ((...args: [value?: string | undefined, label?: string | undefined, item?: Record<string, any> | undefined] | [value: string[], label: string[], data: Record<string, any>[]]) => any) | undefined;
+  onClear?: (() => any) | undefined;
 }>, {
   labelKey: string;
   valueKey: string;
@@ -19,9 +19,9 @@ declare const __VLS_export: _$vue.DefineComponent<CascadeProps, {}, {}, {}, {},
   readonly: boolean;
   placeholder: string;
   clearable: boolean;
-  separator: string;
   filterable: boolean;
   visibilityLimit: number;
+  separator: string;
 }, {}, {}, {}, string, _$vue.ComponentProvideOptions, false, {}, any>;
 declare const _default: typeof __VLS_export;
 //#endregion

package/dist/components/file-picker/file-picker.vue.d.ts

@@ -13,8 +13,8 @@ declare const __VLS_base: _$vue.DefineComponent<UploaderProps, {}, {}, {}, {}, _
 }, string, _$vue.PublicProps, Readonly<UploaderProps> & Readonly<{
   onPick?: ((files: File[]) => any) | undefined;
 }>, {
-  tag: string;
   multiple: boolean;
+  tag: string;
 }, {}, {}, {}, string, _$vue.ComponentProvideOptions, false, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
 declare const _default: typeof __VLS_export;

package/dist/components/form/dynamic-form-model.d.ts

@@ -1,4 +1,4 @@
-import { DataSettingConfig, FormModelItem } from "../../types/form.js";
+import { DataSettingConfig, FormModelField } from "../../types/form.js";
 //#region src/components/form/dynamic-form-model.d.ts
 /**
  * 动态表单模型
@@ -9,7 +9,8 @@ declare class DynamicFormModel {
   set data(v: Record<string, any>);
   get data(): Record<string, any>;
   /** 表单规则 */
-  readonly fields: Record<string, FormModelItem>;
+  readonly fields: Record<string, FormModelField>;
+  private flatFields;
   private validator;
   /**
    * 不同表单对应的key
@@ -24,6 +25,7 @@ declare class DynamicFormModel {
   private _allKeys;
   /** 所有的键 */
   get allKeys(): string[];
+  private updateFlatFields;
   private getAllKeys;
   /** 初始数据 */
   readonly initialData: Record<string, any>;
@@ -31,15 +33,15 @@ declare class DynamicFormModel {
    * 变更前的值
    */
   private readonly oldData;
-  constructor(fields?: Record<string, FormModelItem>);
+  constructor(fields?: Record<string, FormModelField>);
   private watchData;
-  append(fields: Record<string, FormModelItem>): void;
+  append(fields: Record<string, FormModelField>): void;
   /**
    * 添加字段
    * @param field 字段
    * @param item 字段配置项
    */
-  add(field: string, item: FormModelItem): void;
+  add(field: string, item: FormModelField): void;
   /**
    * 移除字段
    * @param field 字段

package/dist/components/form/dynamic-form-model.js

@@ -2,6 +2,16 @@ import { isReactive, reactive, shallowReactive, watch } from "vue";
 import { Validator } from "@veltra/utils";
 import { o } from "@cat-kit/core";
 //#region src/components/form/dynamic-form-model.ts
+function flattenFields(fields, prefix = "") {
+	const result = {};
+	for (const key in fields) {
+		const item = fields[key];
+		const fullPath = prefix ? `${prefix}.${key}` : key;
+		if (item && typeof item === "object" && "__isNested" in item && item.__isNested) Object.assign(result, flattenFields(item.fields, fullPath));
+		else result[fullPath] = item;
+	}
+	return result;
+}
 /**
 * 动态表单模型
 */
@@ -21,6 +31,7 @@ var DynamicFormModel = class {
 	}
 	/** 表单规则 */
 	fields = shallowReactive({});
+	flatFields;
 	validator;
 	/**
 	* 不同表单对应的key
@@ -37,8 +48,14 @@ var DynamicFormModel = class {
 	get allKeys() {
 		return this._allKeys;
 	}
+	updateFlatFields() {
+		for (const key in this.flatFields) delete this.flatFields[key];
+		const flatted = flattenFields(this.fields);
+		Object.assign(this.flatFields, flatted);
+		this.getAllKeys();
+	}
 	getAllKeys() {
-		this._allKeys = Object.keys(this.fields);
+		this._allKeys = Object.keys(this.flatFields);
 	}
 	/** 初始数据 */
 	initialData = {};
@@ -47,9 +64,9 @@ var DynamicFormModel = class {
 	*/
 	oldData = {};
 	constructor(fields) {
+		this.flatFields = shallowReactive({});
+		this.validator = new Validator(this.flatFields);
 		this.append(fields ?? {});
-		this.validator = new Validator(this.fields);
-		this.getAllKeys();
 		this.watchData();
 	}
 	watchData() {
@@ -70,7 +87,7 @@ var DynamicFormModel = class {
 		});
 	}
 	append(fields) {
-		for (const key in fields) this.add(key, fields[key] ?? {});
+		for (const key in fields) this.add(key, fields[key]);
 	}
 	/**
 	* 添加字段
@@ -79,13 +96,15 @@ var DynamicFormModel = class {
 	*/
 	add(field, item) {
 		this.fields[field] = item;
-		const { value } = item;
-		const v = typeof value === "function" ? value() : value;
-		/** 这是有bug的 */
-		if (v !== void 0) this.initialData[field] = JSON.parse(JSON.stringify(v));
-		o(this.data).set(field, v);
-		o(this.oldData).set(field, v);
-		this.getAllKeys();
+		const flatItem = flattenFields({ [field]: item });
+		for (const key in flatItem) {
+			const { value } = flatItem[key];
+			const v = typeof value === "function" ? value() : value;
+			if (v !== void 0) o(this.initialData).set(key, JSON.parse(JSON.stringify(v)));
+			o(this.data).set(key, v);
+			o(this.oldData).set(key, v);
+		}
+		this.updateFlatFields();
 	}
 	/**
 	* 移除字段
@@ -93,7 +112,7 @@ var DynamicFormModel = class {
 	*/
 	delete(field) {
 		delete this.fields[field];
-		this.getAllKeys();
+		this.updateFlatFields();
 	}
 	/**
 	* 监听值变更

package/dist/components/form/dynamic-form-model.js.map

@@ -1 +1 @@
-{"version":3,"file":"dynamic-form-model.js","names":[],"sources":["../../../src/components/form/dynamic-form-model.ts"],"sourcesContent":["import { o } from '@cat-kit/core'\nimport { Validator } from '@veltra/utils'\nimport { isReactive, reactive, shallowReactive, watch } from 'vue'\n\nimport type { FormModelItem, DataSettingConfig } from '../../types'\n\n/**\n * 动态表单模型\n */\nexport class DynamicFormModel {\n  /** 表单数据 */\n  private _data: Record<string, any> = reactive({})\n\n  set data(v: Record<string, any>) {\n    if (!isReactive(v)) {\n      console.error(`data不是一个响应式对象`)\n      return\n    }\n    this._data = v\n    this.watchData()\n  }\n\n  get data() {\n    return this._data\n  }\n\n  /** 表单规则 */\n  readonly fields: Record<string, FormModelItem> = shallowReactive(\n    {} as Record<string, FormModelItem>\n  )\n\n  private validator: Validator\n\n  /**\n   * 不同表单对应的key\n   */\n  formKeys: Map<number, string[]> = new Map()\n\n  readonly errors: Map<string, string[] | undefined> = shallowReactive(new Map())\n\n  /**\n   * 是否在表单值更新时校验\n   */\n  private validateOnFieldChange = true\n\n  private modelChangeCallback: Set<(fields: string, val: any) => void> = new Set()\n\n  private _allKeys: string[] = []\n\n  /** 所有的键 */\n  get allKeys(): string[] {\n    return this._allKeys\n  }\n\n  private getAllKeys(): void {\n    this._allKeys = Object.keys(this.fields)\n  }\n\n  /** 初始数据 */\n  readonly initialData: Record<string, any> = {}\n\n  /**\n   * 变更前的值\n   */\n  private readonly oldData: Record<string, any> = {}\n\n  constructor(fields?: Record<string, FormModelItem>) {\n    this.append(fields ?? {})\n    this.validator = new Validator(this.fields)\n    this.getAllKeys()\n    this.watchData()\n  }\n\n  private watchData(): void {\n    const { oldData } = this\n    watch(this.data, (data) => {\n      let changedKeys: string[] = []\n\n      this.allKeys.forEach((key) => {\n        const oldVal = o(oldData).get(key)\n        const newVal = o(data).get(key)\n        if (oldVal !== newVal) {\n          this.modelChangeCallback.forEach((cb) => cb(key, newVal))\n          changedKeys.push(key)\n          o(oldData).set(key, newVal)\n        }\n      })\n\n      if (this.validateOnFieldChange) {\n        this.validate(changedKeys)\n      } else {\n        this.validateOnFieldChange = true\n      }\n    })\n  }\n\n  append(fields: Record<string, FormModelItem>): void {\n    for (const key in fields) {\n      this.add(key, fields[key] ?? {})\n    }\n  }\n\n  /**\n   * 添加字段\n   * @param field 字段\n   * @param item 字段配置项\n   */\n  add(field: string, item: FormModelItem): void {\n    this.fields[field] = item\n    const { value } = item\n    const v = typeof value === 'function' ? value() : value\n    /** 这是有bug的 */\n    if (v !== undefined) {\n      this.initialData[field] = JSON.parse(JSON.stringify(v))\n    }\n    o(this.data).set(field, v)\n    o(this.oldData).set(field, v)\n    this.getAllKeys()\n  }\n\n  /**\n   * 移除字段\n   * @param field 字段\n   */\n  delete(field: string): void {\n    delete this.fields[field]\n    this.getAllKeys()\n  }\n\n  /**\n   * 监听值变更\n   * @param cb 回调\n   */\n  onChange(cb: (field: string, val: any) => void): void {\n    this.modelChangeCallback.add(cb)\n  }\n\n  offChange(cb: (field: string, val: any) => void): void {\n    this.modelChangeCallback.delete(cb)\n  }\n\n  async validate(fields?: string | string[]): Promise<boolean> {\n    const { errors, validator, data } = this\n\n    const results = await validator.validate(data, this.getValidateFields(fields))\n\n    // 设置错误提示\n    if (!fields) {\n      errors.clear()\n      for (const field in results) {\n        errors.set(field, results[field])\n      }\n    } else {\n      ~(Array.isArray(fields) ? fields : [fields]).forEach((field) => {\n        const errs = results[field]\n        if (errs?.length) {\n          errors.set(field, errs)\n        } else {\n          errors.delete(field)\n        }\n      })\n    }\n\n    return errors.size === 0\n  }\n\n  private getValidateFields(fields?: string | string[]) {\n    if (!fields) {\n      if (this.formKeys.size) {\n        let _fields: string[] = []\n        this.formKeys.forEach((fields) => {\n          _fields = _fields.concat(fields)\n        })\n        return _fields\n      } else {\n        return this.allKeys\n      }\n    }\n\n    if (!Array.isArray(fields)) {\n      return [fields]\n    }\n    return fields\n  }\n\n  /**\n   * 重置数据\n   * @param fields 需要重置的字段\n   */\n  resetData(keys?: string | string[]): void {\n    if (typeof keys === 'string') {\n      keys = [keys]\n    } else if (Array.isArray(keys)) {\n    } else {\n      keys = this.allKeys\n    }\n\n    this.clearValidate()\n\n    this.validateOnFieldChange = false\n\n    keys.forEach((field) => {\n      o(this.data).set(field as string, o(this.initialData).get(field as string))\n    })\n  }\n\n  /**\n   * 设置值\n   * @param formData 表单值\n   * @param options 配置\n   */\n  setData(formData: Record<string, any>, config?: DataSettingConfig): void {\n    const { validate = true } = config || {}\n\n    if (!validate) {\n      this.validateOnFieldChange = false\n    }\n\n    this.allKeys.forEach((key) => {\n      const value = o(formData).get(key)\n      if (value !== undefined) {\n        o(this.data).set(key, value)\n      }\n    })\n  }\n\n  clearValidate(): void {\n    this.errors.clear()\n  }\n}\n"],"mappings":";;;;;;;AASA,IAAa,mBAAb,MAA8B;;CAE5B,QAAqC,SAAS,EAAE,CAAC;CAEjD,IAAI,KAAK,GAAwB;EAC/B,IAAI,CAAC,WAAW,EAAE,EAAE;GAClB,QAAQ,MAAM,gBAAgB;GAC9B;;EAEF,KAAK,QAAQ;EACb,KAAK,WAAW;;CAGlB,IAAI,OAAO;EACT,OAAO,KAAK;;;CAId,SAAiD,gBAC/C,EAAE,CACH;CAED;;;;CAKA,2BAAkC,IAAI,KAAK;CAE3C,SAAqD,gCAAgB,IAAI,KAAK,CAAC;;;;CAK/E,wBAAgC;CAEhC,sCAAuE,IAAI,KAAK;CAEhF,WAA6B,EAAE;;CAG/B,IAAI,UAAoB;EACtB,OAAO,KAAK;;CAGd,aAA2B;EACzB,KAAK,WAAW,OAAO,KAAK,KAAK,OAAO;;;CAI1C,cAA4C,EAAE;;;;CAK9C,UAAgD,EAAE;CAElD,YAAY,QAAwC;EAClD,KAAK,OAAO,UAAU,EAAE,CAAC;EACzB,KAAK,YAAY,IAAI,UAAU,KAAK,OAAO;EAC3C,KAAK,YAAY;EACjB,KAAK,WAAW;;CAGlB,YAA0B;EACxB,MAAM,EAAE,YAAY;EACpB,MAAM,KAAK,OAAO,SAAS;GACzB,IAAI,cAAwB,EAAE;GAE9B,KAAK,QAAQ,SAAS,QAAQ;IAC5B,MAAM,SAAS,EAAE,QAAQ,CAAC,IAAI,IAAI;IAClC,MAAM,SAAS,EAAE,KAAK,CAAC,IAAI,IAAI;IAC/B,IAAI,WAAW,QAAQ;KACrB,KAAK,oBAAoB,SAAS,OAAO,GAAG,KAAK,OAAO,CAAC;KACzD,YAAY,KAAK,IAAI;KACrB,EAAE,QAAQ,CAAC,IAAI,KAAK,OAAO;;KAE7B;GAEF,IAAI,KAAK,uBACP,KAAK,SAAS,YAAY;QAE1B,KAAK,wBAAwB;IAE/B;;CAGJ,OAAO,QAA6C;EAClD,KAAK,MAAM,OAAO,QAChB,KAAK,IAAI,KAAK,OAAO,QAAQ,EAAE,CAAC;;;;;;;CASpC,IAAI,OAAe,MAA2B;EAC5C,KAAK,OAAO,SAAS;EACrB,MAAM,EAAE,UAAU;EAClB,MAAM,IAAI,OAAO,UAAU,aAAa,OAAO,GAAG;;EAElD,IAAI,MAAM,KAAA,GACR,KAAK,YAAY,SAAS,KAAK,MAAM,KAAK,UAAU,EAAE,CAAC;EAEzD,EAAE,KAAK,KAAK,CAAC,IAAI,OAAO,EAAE;EAC1B,EAAE,KAAK,QAAQ,CAAC,IAAI,OAAO,EAAE;EAC7B,KAAK,YAAY;;;;;;CAOnB,OAAO,OAAqB;EAC1B,OAAO,KAAK,OAAO;EACnB,KAAK,YAAY;;;;;;CAOnB,SAAS,IAA6C;EACpD,KAAK,oBAAoB,IAAI,GAAG;;CAGlC,UAAU,IAA6C;EACrD,KAAK,oBAAoB,OAAO,GAAG;;CAGrC,MAAM,SAAS,QAA8C;EAC3D,MAAM,EAAE,QAAQ,WAAW,SAAS;EAEpC,MAAM,UAAU,MAAM,UAAU,SAAS,MAAM,KAAK,kBAAkB,OAAO,CAAC;EAG9E,IAAI,CAAC,QAAQ;GACX,OAAO,OAAO;GACd,KAAK,MAAM,SAAS,SAClB,OAAO,IAAI,OAAO,QAAQ,OAAO;SAGnC,EAAE,MAAM,QAAQ,OAAO,GAAG,SAAS,CAAC,OAAO,EAAE,SAAS,UAAU;GAC9D,MAAM,OAAO,QAAQ;GACrB,IAAI,MAAM,QACR,OAAO,IAAI,OAAO,KAAK;QAEvB,OAAO,OAAO,MAAM;IAEtB;EAGJ,OAAO,OAAO,SAAS;;CAGzB,kBAA0B,QAA4B;EACpD,IAAI,CAAC,QACH,IAAI,KAAK,SAAS,MAAM;GACtB,IAAI,UAAoB,EAAE;GAC1B,KAAK,SAAS,SAAS,WAAW;IAChC,UAAU,QAAQ,OAAO,OAAO;KAChC;GACF,OAAO;SAEP,OAAO,KAAK;EAIhB,IAAI,CAAC,MAAM,QAAQ,OAAO,EACxB,OAAO,CAAC,OAAO;EAEjB,OAAO;;;;;;CAOT,UAAU,MAAgC;EACxC,IAAI,OAAO,SAAS,UAClB,OAAO,CAAC,KAAK;OACR,IAAI,MAAM,QAAQ,KAAK,EAAE,QAE9B,OAAO,KAAK;EAGd,KAAK,eAAe;EAEpB,KAAK,wBAAwB;EAE7B,KAAK,SAAS,UAAU;GACtB,EAAE,KAAK,KAAK,CAAC,IAAI,OAAiB,EAAE,KAAK,YAAY,CAAC,IAAI,MAAgB,CAAC;IAC3E;;;;;;;CAQJ,QAAQ,UAA+B,QAAkC;EACvE,MAAM,EAAE,WAAW,SAAS,UAAU,EAAE;EAExC,IAAI,CAAC,UACH,KAAK,wBAAwB;EAG/B,KAAK,QAAQ,SAAS,QAAQ;GAC5B,MAAM,QAAQ,EAAE,SAAS,CAAC,IAAI,IAAI;GAClC,IAAI,UAAU,KAAA,GACZ,EAAE,KAAK,KAAK,CAAC,IAAI,KAAK,MAAM;IAE9B;;CAGJ,gBAAsB;EACpB,KAAK,OAAO,OAAO"}
+{"version":3,"file":"dynamic-form-model.js","names":[],"sources":["../../../src/components/form/dynamic-form-model.ts"],"sourcesContent":["import { o } from '@cat-kit/core'\nimport { Validator } from '@veltra/utils'\nimport { isReactive, reactive, shallowReactive, watch } from 'vue'\n\nimport type { FormModelField, FormModelItem, DataSettingConfig } from '../../types'\n\nfunction flattenFields(fields: Record<string, any>, prefix = ''): Record<string, FormModelItem> {\n  const result: Record<string, FormModelItem> = {}\n  for (const key in fields) {\n    const item = fields[key]\n    const fullPath = prefix ? `${prefix}.${key}` : key\n    if (item && typeof item === 'object' && '__isNested' in item && item.__isNested) {\n      Object.assign(result, flattenFields((item as any).fields, fullPath))\n    } else {\n      result[fullPath] = item\n    }\n  }\n  return result\n}\n\n/**\n * 动态表单模型\n */\nexport class DynamicFormModel {\n  /** 表单数据 */\n  private _data: Record<string, any> = reactive({})\n\n  set data(v: Record<string, any>) {\n    if (!isReactive(v)) {\n      console.error(`data不是一个响应式对象`)\n      return\n    }\n    this._data = v\n    this.watchData()\n  }\n\n  get data() {\n    return this._data\n  }\n\n  /** 表单规则 */\n  readonly fields: Record<string, FormModelField> = shallowReactive(\n    {} as Record<string, FormModelField>\n  )\n\n  private flatFields: Record<string, FormModelItem>\n\n  private validator: Validator\n\n  /**\n   * 不同表单对应的key\n   */\n  formKeys: Map<number, string[]> = new Map()\n\n  readonly errors: Map<string, string[] | undefined> = shallowReactive(new Map())\n\n  /**\n   * 是否在表单值更新时校验\n   */\n  private validateOnFieldChange = true\n\n  private modelChangeCallback: Set<(fields: string, val: any) => void> = new Set()\n\n  private _allKeys: string[] = []\n\n  /** 所有的键 */\n  get allKeys(): string[] {\n    return this._allKeys\n  }\n\n  private updateFlatFields(): void {\n    for (const key in this.flatFields) {\n      delete this.flatFields[key]\n    }\n    const flatted = flattenFields(this.fields)\n    Object.assign(this.flatFields, flatted)\n    this.getAllKeys()\n  }\n\n  private getAllKeys(): void {\n    this._allKeys = Object.keys(this.flatFields)\n  }\n\n  /** 初始数据 */\n  readonly initialData: Record<string, any> = {}\n\n  /**\n   * 变更前的值\n   */\n  private readonly oldData: Record<string, any> = {}\n\n  constructor(fields?: Record<string, FormModelField>) {\n    this.flatFields = shallowReactive({} as Record<string, FormModelItem>)\n    this.validator = new Validator(this.flatFields)\n    this.append(fields ?? {})\n    this.watchData()\n  }\n\n  private watchData(): void {\n    const { oldData } = this\n    watch(this.data, (data) => {\n      let changedKeys: string[] = []\n\n      this.allKeys.forEach((key) => {\n        const oldVal = o(oldData).get(key)\n        const newVal = o(data).get(key)\n        if (oldVal !== newVal) {\n          this.modelChangeCallback.forEach((cb) => cb(key, newVal))\n          changedKeys.push(key)\n          o(oldData).set(key, newVal)\n        }\n      })\n\n      if (this.validateOnFieldChange) {\n        this.validate(changedKeys)\n      } else {\n        this.validateOnFieldChange = true\n      }\n    })\n  }\n\n  append(fields: Record<string, FormModelField>): void {\n    for (const key in fields) {\n      this.add(key, fields[key]!)\n    }\n  }\n\n  /**\n   * 添加字段\n   * @param field 字段\n   * @param item 字段配置项\n   */\n  add(field: string, item: FormModelField): void {\n    this.fields[field] = item\n    const flatItem = flattenFields({ [field]: item })\n    for (const key in flatItem) {\n      const fieldItem = flatItem[key]!\n      const { value } = fieldItem\n      const v = typeof value === 'function' ? value() : value\n      if (v !== undefined) {\n        o(this.initialData).set(key, JSON.parse(JSON.stringify(v)))\n      }\n      o(this.data).set(key, v)\n      o(this.oldData).set(key, v)\n    }\n    this.updateFlatFields()\n  }\n\n  /**\n   * 移除字段\n   * @param field 字段\n   */\n  delete(field: string): void {\n    delete this.fields[field]\n    this.updateFlatFields()\n  }\n\n  /**\n   * 监听值变更\n   * @param cb 回调\n   */\n  onChange(cb: (field: string, val: any) => void): void {\n    this.modelChangeCallback.add(cb)\n  }\n\n  offChange(cb: (field: string, val: any) => void): void {\n    this.modelChangeCallback.delete(cb)\n  }\n\n  async validate(fields?: string | string[]): Promise<boolean> {\n    const { errors, validator, data } = this\n\n    const results = await validator.validate(data, this.getValidateFields(fields))\n\n    // 设置错误提示\n    if (!fields) {\n      errors.clear()\n      for (const field in results) {\n        errors.set(field, results[field])\n      }\n    } else {\n      ~(Array.isArray(fields) ? fields : [fields]).forEach((field) => {\n        const errs = results[field]\n        if (errs?.length) {\n          errors.set(field, errs)\n        } else {\n          errors.delete(field)\n        }\n      })\n    }\n\n    return errors.size === 0\n  }\n\n  private getValidateFields(fields?: string | string[]) {\n    if (!fields) {\n      if (this.formKeys.size) {\n        let _fields: string[] = []\n        this.formKeys.forEach((fields) => {\n          _fields = _fields.concat(fields)\n        })\n        return _fields\n      } else {\n        return this.allKeys\n      }\n    }\n\n    if (!Array.isArray(fields)) {\n      return [fields]\n    }\n    return fields\n  }\n\n  /**\n   * 重置数据\n   * @param fields 需要重置的字段\n   */\n  resetData(keys?: string | string[]): void {\n    if (typeof keys === 'string') {\n      keys = [keys]\n    } else if (Array.isArray(keys)) {\n    } else {\n      keys = this.allKeys\n    }\n\n    this.clearValidate()\n\n    this.validateOnFieldChange = false\n\n    keys.forEach((field) => {\n      o(this.data).set(field as string, o(this.initialData).get(field as string))\n    })\n  }\n\n  /**\n   * 设置值\n   * @param formData 表单值\n   * @param options 配置\n   */\n  setData(formData: Record<string, any>, config?: DataSettingConfig): void {\n    const { validate = true } = config || {}\n\n    if (!validate) {\n      this.validateOnFieldChange = false\n    }\n\n    this.allKeys.forEach((key) => {\n      const value = o(formData).get(key)\n      if (value !== undefined) {\n        o(this.data).set(key, value)\n      }\n    })\n  }\n\n  clearValidate(): void {\n    this.errors.clear()\n  }\n}\n"],"mappings":"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"}

package/dist/components/form/form-model.d.ts

@@ -1,11 +1,11 @@
-import { DataSettingConfig, FormModelItem, IFormModel, ModelData } from "../../types/form.js";
+import { AllKeys, DataSettingConfig, IFormModel, ModelData } from "../../types/form.js";
 import { Reactive } from "vue";
 
 //#region src/components/form/form-model.d.ts
 /**
  * 表单模型
  */
-declare class FormModel<Fields extends Record<string, FormModelItem> = Record<string, FormModelItem>> implements IFormModel<Fields> {
+declare class FormModel<Fields extends Record<string, any> = Record<string, any>> implements IFormModel<Fields> {
   /** 表单数据 */
   data: ModelData<Fields>;
   /** 表单规则 */
@@ -17,10 +17,10 @@ declare class FormModel<Fields extends Record<string, FormModelItem> = Record<st
    * @description
    * 这个值会在表单组件渲染时由表单设置，因为只有真正渲染的组件才应该被校验
    */
-  formKeys: Map<number, (keyof Fields)[]>;
+  formKeys: Map<number, AllKeys<Fields>[]>;
   /** 初始数据 */
   readonly initialData: ModelData<Fields>;
-  readonly errors: Map<keyof Fields, string[] | undefined>;
+  readonly errors: Map<AllKeys<Fields>, string[] | undefined>;
   private validator;
   /**
    * 是否在表单值更新时校验
@@ -40,12 +40,12 @@ declare class FormModel<Fields extends Record<string, FormModelItem> = Record<st
    * @param fields 需要校验的字段, 不传则校验所有字段
    * @returns
    */
-  validate(fields?: keyof Fields | (keyof Fields)[]): Promise<boolean>;
+  validate(fields?: AllKeys<Fields> | AllKeys<Fields>[]): Promise<boolean>;
   /**
    * 重置数据
    * @param fields 需要重置的字段
    */
-  resetData(keys?: keyof Fields | (keyof Fields)[]): void;
+  resetData(keys?: AllKeys<Fields> | AllKeys<Fields>[]): void;
   /**
    * 设置值
    * @param formData 表单值
@@ -64,9 +64,9 @@ declare class FormModel<Fields extends Record<string, FormModelItem> = Record<st
    * 监听值变更
    * @param cb 回调
    */
-  onChange(cb: (field: keyof Fields, val: any) => void): void;
+  onChange(cb: (field: AllKeys<Fields>, val: any) => void): void;
   /** 关闭监听值变更 */
-  offChange(cb: (field: keyof Fields, val: any) => void): void;
+  offChange(cb: (field: AllKeys<Fields>, val: any) => void): void;
 }
 //#endregion
 export { FormModel };

package/dist/components/form/form-model.js

@@ -3,6 +3,19 @@ import { Validator, middleProxy } from "@veltra/utils";
 import { o } from "@cat-kit/core";
 //#region src/components/form/form-model.ts
 /**
+* 递归展平字段逻辑
+*/
+function flattenFields(fields, prefix = "") {
+	const result = {};
+	for (const key in fields) {
+		const item = fields[key];
+		const fullPath = prefix ? `${prefix}.${key}` : key;
+		if (item && typeof item === "object" && "__isNested" in item && item.__isNested) Object.assign(result, flattenFields(item.fields, fullPath));
+		else result[fullPath] = item;
+	}
+	return result;
+}
+/**
 * 表单模型
 */
 var FormModel = class {
@@ -29,10 +42,11 @@ var FormModel = class {
 	modelChangeCallback = /* @__PURE__ */ new Set();
 	constructor(fields) {
 		this.fields = fields;
+		const flatFields = flattenFields(fields);
 		const rawData = {};
 		const allKeys = [];
-		for (const key in fields) {
-			const fieldItem = fields[key];
+		for (const key in flatFields) {
+			const fieldItem = flatFields[key];
 			allKeys.push(key);
 			const { value } = fieldItem;
 			let v = value;
@@ -47,7 +61,7 @@ var FormModel = class {
 		this.allKeys = allKeys;
 		this.initialData = JSON.parse(JSON.stringify(rawData));
 		this.setProxyData(reactive(rawData));
-		this.validator = new Validator(this.fields);
+		this.validator = new Validator(flatFields);
 		return shallowReactive(this);
 	}
 	/**

package/dist/components/form/form-model.js.map

@@ -1 +1 @@
-{"version":3,"file":"form-model.js","names":[],"sources":["../../../src/components/form/form-model.ts"],"sourcesContent":["import { o } from '@cat-kit/core'\nimport { middleProxy, Validator } from '@veltra/utils'\nimport { nextTick, reactive, shallowReactive, watch, type Reactive } from 'vue'\n\nimport type {\n  FormModelItem,\n  ModelData,\n  ModelRules,\n  DataSettingConfig,\n  IFormModel\n} from '../../types'\n\n/**\n * 表单模型\n */\nexport class FormModel<\n  Fields extends Record<string, FormModelItem> = Record<string, FormModelItem>\n> implements IFormModel<Fields> {\n  /** 表单数据 */\n  data!: ModelData<Fields>\n\n  /** 表单规则 */\n  readonly fields: Fields\n\n  /** 所有的键 */\n  readonly allKeys: string[]\n\n  /**\n   * 不同表单所需要校验的字段\n   * @description\n   * 这个值会在表单组件渲染时由表单设置，因为只有真正渲染的组件才应该被校验\n   */\n  formKeys: Map<number, (keyof Fields)[]> = new Map()\n\n  /** 初始数据 */\n  readonly initialData: ModelData<Fields>\n\n  readonly errors: Map<keyof Fields, string[] | undefined> = shallowReactive(new Map())\n\n  private validator: Validator<ModelRules<Fields>>\n\n  /**\n   * 是否在表单值更新时校验\n   */\n  private validateOnFieldChange = true\n\n  private modelChangeCallback: Set<(fields: string, val: any) => void> = new Set()\n\n  constructor(fields: Fields) {\n    this.fields = fields\n    const rawData = {} as ModelData<Fields>\n    const allKeys: string[] = []\n\n    for (const key in fields) {\n      const fieldItem = fields[key]!\n      allKeys.push(key)\n      const { value } = fieldItem\n      let v = value\n\n      if (typeof value === 'function') {\n        watch(value, (v) => {\n          o(this.initialData).set(key, v)\n        })\n        v = value()\n      }\n\n      o(rawData).set(key, v)\n    }\n\n    this.allKeys = allKeys\n    this.initialData = JSON.parse(JSON.stringify(rawData))\n\n    this.setProxyData(reactive(rawData))\n\n    this.validator = new Validator(this.fields)\n\n    return shallowReactive(this)\n  }\n\n  /**\n   * 设置响应式值, 替换掉原有的数据\n   * @description 设置响应式值时，会自动监听值的变化，并进行校验\n   * @param proxyData 响应式的值\n   */\n  setProxyData(proxyData: ModelData<Fields> | Reactive<ModelData<Fields>>): void {\n    const data = middleProxy(proxyData, {\n      set: (field, val) => {\n        this.modelChangeCallback.forEach((cb) => cb(field, val))\n      },\n\n      changed: (fields) => {\n        if (!this.validateOnFieldChange) {\n          this.validateOnFieldChange = true\n          return\n        }\n        this.validate(fields)\n      }\n    })\n\n    this.data = data as ModelData<Fields>\n  }\n\n  private getValidateFields(fields?: keyof Fields | (keyof Fields)[]) {\n    if (!fields) {\n      if (this.formKeys.size) {\n        let _fields: (keyof Fields)[] = []\n        this.formKeys.forEach((fields) => {\n          _fields = _fields.concat(fields)\n        })\n        return _fields\n      } else {\n        return this.allKeys\n      }\n    }\n\n    if (!Array.isArray(fields)) {\n      return [fields]\n    }\n    return fields\n  }\n\n  /**\n   * 模型校验\n   * @param fields 需要校验的字段, 不传则校验所有字段\n   * @returns\n   */\n  async validate(fields?: keyof Fields | (keyof Fields)[]): Promise<boolean> {\n    const { errors, validator, data } = this\n\n    const results = await validator.validate(data, this.getValidateFields(fields))\n\n    // 全量校验\n    if (!fields) {\n      errors.clear()\n\n      for (const field in results) {\n        errors.set(field, results[field])\n      }\n    }\n    // 局部校验\n    else {\n      ~(Array.isArray(fields) ? fields : [fields]).forEach((field) => {\n        const errs = results[field]\n        if (errs?.length) {\n          errors.set(field, errs)\n        } else {\n          errors.delete(field)\n        }\n      })\n    }\n\n    if (errors.size > 0) {\n      if (!fields) {\n        nextTick(() => {\n          document.querySelector('.u-form-item.is-error')?.scrollIntoView({ block: 'nearest' })\n        })\n      }\n      return Promise.reject(false)\n    }\n\n    return true\n  }\n\n  /**\n   * 重置数据\n   * @param fields 需要重置的字段\n   */\n  resetData(keys?: keyof Fields | (keyof Fields)[]): void {\n    if (typeof keys === 'string') {\n      keys = [keys]\n    } else if (Array.isArray(keys)) {\n    } else {\n      keys = this.allKeys\n    }\n\n    this.clearValidate()\n\n    this.validateOnFieldChange = false\n\n    keys.forEach((field) => {\n      o(this.data).set(field as string, o(this.initialData).get(field as string))\n    })\n  }\n\n  /**\n   * 设置值\n   * @param formData 表单值\n   * @param options 配置\n   */\n  setData(\n    formData: Partial<ModelData<Fields> & Record<string, any>>,\n    config?: DataSettingConfig\n  ): FormModel<Fields> {\n    const { validate = true } = config || {}\n\n    if (!validate) {\n      this.validateOnFieldChange = false\n    }\n\n    this.allKeys.forEach((key) => {\n      const value = o(formData).get(key)\n      if (value !== undefined) {\n        o(this.data).set(key, value)\n      }\n    })\n\n    return this\n  }\n\n  /**\n   * 设置初始值\n   * @description 初始值在重置数据和查看原始数据时会用到\n   * @param data 初始值\n   */\n  setInitialData(data: Partial<ModelData<Fields>>): FormModel<Fields> {\n    this.allKeys.forEach((key) => {\n      o(this.initialData).set(key, o(data).get(key))\n    })\n\n    return this\n  }\n\n  /** 清除校验 */\n  clearValidate(): void {\n    this.errors.clear()\n  }\n\n  /**\n   * 监听值变更\n   * @param cb 回调\n   */\n  onChange(cb: (field: keyof Fields, val: any) => void): void {\n    this.modelChangeCallback.add(cb)\n  }\n\n  /** 关闭监听值变更 */\n  offChange(cb: (field: keyof Fields, val: any) => void): void {\n    this.modelChangeCallback.delete(cb)\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"form-model.js","names":[],"sources":["../../../src/components/form/form-model.ts"],"sourcesContent":["import { o } from '@cat-kit/core'\nimport { middleProxy, Validator } from '@veltra/utils'\nimport { nextTick, reactive, shallowReactive, watch, type Reactive } from 'vue'\n\nimport type { ModelData, DataSettingConfig, IFormModel, AllKeys, FormModelItem } from '../../types'\n\n/**\n * 递归展平字段逻辑\n */\nfunction flattenFields(fields: Record<string, any>, prefix = ''): Record<string, FormModelItem> {\n  const result: Record<string, FormModelItem> = {}\n  for (const key in fields) {\n    const item = fields[key]\n    const fullPath = prefix ? `${prefix}.${key}` : key\n    if (item && typeof item === 'object' && '__isNested' in item && item.__isNested) {\n      Object.assign(result, flattenFields((item as any).fields, fullPath))\n    } else {\n      result[fullPath] = item\n    }\n  }\n  return result\n}\n\n/**\n * 表单模型\n */\nexport class FormModel<\n  Fields extends Record<string, any> = Record<string, any>\n> implements IFormModel<Fields> {\n  /** 表单数据 */\n  data!: ModelData<Fields>\n\n  /** 表单规则 */\n  readonly fields: Fields\n\n  /** 所有的键 */\n  readonly allKeys: string[]\n\n  /**\n   * 不同表单所需要校验的字段\n   * @description\n   * 这个值会在表单组件渲染时由表单设置，因为只有真正渲染的组件才应该被校验\n   */\n  formKeys: Map<number, AllKeys<Fields>[]> = new Map()\n\n  /** 初始数据 */\n  readonly initialData: ModelData<Fields>\n\n  readonly errors: Map<AllKeys<Fields>, string[] | undefined> = shallowReactive(new Map())\n\n  private validator: Validator<Record<string, FormModelItem>>\n\n  /**\n   * 是否在表单值更新时校验\n   */\n  private validateOnFieldChange = true\n\n  private modelChangeCallback: Set<(fields: string, val: any) => void> = new Set()\n\n  constructor(fields: Fields) {\n    this.fields = fields\n    const flatFields = flattenFields(fields)\n    const rawData = {} as ModelData<Fields>\n    const allKeys: string[] = []\n\n    for (const key in flatFields) {\n      const fieldItem = flatFields[key]!\n      allKeys.push(key)\n      const { value } = fieldItem\n      let v = value\n\n      if (typeof value === 'function') {\n        watch(value, (v) => {\n          o(this.initialData).set(key, v)\n        })\n        v = value()\n      }\n\n      o(rawData).set(key, v)\n    }\n\n    this.allKeys = allKeys\n    this.initialData = JSON.parse(JSON.stringify(rawData))\n\n    this.setProxyData(reactive(rawData))\n\n    this.validator = new Validator(flatFields)\n\n    return shallowReactive(this)\n  }\n\n  /**\n   * 设置响应式值, 替换掉原有的数据\n   * @description 设置响应式值时，会自动监听值的变化，并进行校验\n   * @param proxyData 响应式的值\n   */\n  setProxyData(proxyData: ModelData<Fields> | Reactive<ModelData<Fields>>): void {\n    const data = middleProxy(proxyData, {\n      set: (field, val) => {\n        this.modelChangeCallback.forEach((cb) => cb(field, val))\n      },\n\n      changed: (fields) => {\n        if (!this.validateOnFieldChange) {\n          this.validateOnFieldChange = true\n          return\n        }\n        this.validate(fields as any)\n      }\n    })\n\n    this.data = data as ModelData<Fields>\n  }\n\n  private getValidateFields(fields?: AllKeys<Fields> | AllKeys<Fields>[]) {\n    if (!fields) {\n      if (this.formKeys.size) {\n        let _fields: AllKeys<Fields>[] = []\n        this.formKeys.forEach((fields) => {\n          _fields = _fields.concat(fields)\n        })\n        return _fields\n      } else {\n        return this.allKeys as AllKeys<Fields>[]\n      }\n    }\n\n    if (!Array.isArray(fields)) {\n      return [fields]\n    }\n    return fields\n  }\n\n  /**\n   * 模型校验\n   * @param fields 需要校验的字段, 不传则校验所有字段\n   * @returns\n   */\n  async validate(fields?: AllKeys<Fields> | AllKeys<Fields>[]): Promise<boolean> {\n    const { errors, validator, data } = this\n\n    const results = await validator.validate(data, this.getValidateFields(fields) as any)\n\n    // 全量校验\n    if (!fields) {\n      errors.clear()\n\n      for (const field in results) {\n        errors.set(field as any, results[field])\n      }\n    }\n    // 局部校验\n    else {\n      ~(Array.isArray(fields) ? fields : [fields]).forEach((field) => {\n        const errs = results[field as string]\n        if (errs?.length) {\n          errors.set(field, errs)\n        } else {\n          errors.delete(field)\n        }\n      })\n    }\n\n    if (errors.size > 0) {\n      if (!fields) {\n        nextTick(() => {\n          document.querySelector('.u-form-item.is-error')?.scrollIntoView({ block: 'nearest' })\n        })\n      }\n      return Promise.reject(false)\n    }\n\n    return true\n  }\n\n  /**\n   * 重置数据\n   * @param fields 需要重置的字段\n   */\n  resetData(keys?: AllKeys<Fields> | AllKeys<Fields>[]): void {\n    if (typeof keys === 'string') {\n      keys = [keys]\n    } else if (Array.isArray(keys)) {\n    } else {\n      keys = this.allKeys as AllKeys<Fields>[]\n    }\n\n    this.clearValidate()\n\n    this.validateOnFieldChange = false\n\n    keys.forEach((field) => {\n      o(this.data).set(field as string, o(this.initialData).get(field as string))\n    })\n  }\n\n  /**\n   * 设置值\n   * @param formData 表单值\n   * @param options 配置\n   */\n  setData(\n    formData: Partial<ModelData<Fields> & Record<string, any>>,\n    config?: DataSettingConfig\n  ): FormModel<Fields> {\n    const { validate = true } = config || {}\n\n    if (!validate) {\n      this.validateOnFieldChange = false\n    }\n\n    this.allKeys.forEach((key) => {\n      const value = o(formData).get(key)\n      if (value !== undefined) {\n        o(this.data).set(key, value)\n      }\n    })\n\n    return this\n  }\n\n  /**\n   * 设置初始值\n   * @description 初始值在重置数据和查看原始数据时会用到\n   * @param data 初始值\n   */\n  setInitialData(data: Partial<ModelData<Fields>>): FormModel<Fields> {\n    this.allKeys.forEach((key) => {\n      o(this.initialData).set(key, o(data).get(key))\n    })\n\n    return this\n  }\n\n  /** 清除校验 */\n  clearValidate(): void {\n    this.errors.clear()\n  }\n\n  /**\n   * 监听值变更\n   * @param cb 回调\n   */\n  onChange(cb: (field: AllKeys<Fields>, val: any) => void): void {\n    this.modelChangeCallback.add(cb as any)\n  }\n\n  /** 关闭监听值变更 */\n  offChange(cb: (field: AllKeys<Fields>, val: any) => void): void {\n    this.modelChangeCallback.delete(cb as any)\n  }\n}\n"],"mappings":"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"}

package/dist/components/form/helper.d.ts

@@ -6,6 +6,11 @@ import { FormModelItem } from "../../types/form.js";
  * @returns
  */
 declare function formField<Val = unknown>(item?: FormModelItem<Val>): FormModelItem<Val>;
+interface NestedFieldMarker<T extends Record<string, any> = Record<string, any>> {
+  __isNested: true;
+  fields: T;
+}
+declare function nestField<T extends Record<string, any>>(fields: T): NestedFieldMarker<T>;
 //#endregion
-export { formField };
+export { NestedFieldMarker, formField, nestField };
 //# sourceMappingURL=helper.d.ts.map

package/dist/components/form/helper.js

@@ -8,7 +8,13 @@ function formField(item) {
 	if (!item) return {};
 	return item;
 }
+function nestField(fields) {
+	return {
+		__isNested: true,
+		fields
+	};
+}
 //#endregion
-export { formField };
+export { formField, nestField };
 
 //# sourceMappingURL=helper.js.map

package/dist/components/form/helper.js.map

@@ -1 +1 @@
-{"version":3,"file":"helper.js","names":[],"sources":["../../../src/components/form/helper.ts"],"sourcesContent":["import type { FormModelItem } from '../../types'\n\n/**\n * 定义表单项\n * @param item 表单项\n * @returns\n */\nexport function formField<Val = unknown>(item?: FormModelItem<Val>): FormModelItem<Val> {\n  if (!item) {\n    return {}\n  }\n\n  return item\n}\n"],"mappings":";;;;;;AAOA,SAAgB,UAAyB,MAA+C;CACtF,IAAI,CAAC,MACH,OAAO,EAAE;CAGX,OAAO"}
+{"version":3,"file":"helper.js","names":[],"sources":["../../../src/components/form/helper.ts"],"sourcesContent":["import type { FormModelItem } from '../../types'\n\n/**\n * 定义表单项\n * @param item 表单项\n * @returns\n */\nexport function formField<Val = unknown>(item?: FormModelItem<Val>): FormModelItem<Val> {\n  if (!item) {\n    return {}\n  }\n\n  return item\n}\n\nexport interface NestedFieldMarker<T extends Record<string, any> = Record<string, any>> {\n  __isNested: true\n  fields: T\n}\n\nexport function nestField<T extends Record<string, any>>(fields: T): NestedFieldMarker<T> {\n  return { __isNested: true, fields }\n}\n"],"mappings":";;;;;;AAOA,SAAgB,UAAyB,MAA+C;CACtF,IAAI,CAAC,MACH,OAAO,EAAE;CAGX,OAAO;;AAQT,SAAgB,UAAyC,QAAiC;CACxF,OAAO;EAAE,YAAY;EAAM;EAAQ"}

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

@@ -1,4 +1,4 @@
+import { NestedFieldMarker, formField, nestField } from "./helper.js";
 import { DynamicFormModel } from "./dynamic-form-model.js";
 import { FormModel } from "./form-model.js";
-import { _default } from "./form.vue.js";
-import { formField } from "./helper.js";
+import { _default } from "./form.vue.js";

package/dist/components/index.d.ts

@@ -1,3 +1,4 @@
+import { NestedFieldMarker, formField, nestField } from "./form/helper.js";
 import { _default } from "./condition-editor/condition-editor.vue.js";
 import { EvaluateOptions, createEmptyGroup, createEmptyLeaf, evaluate } from "./condition-editor/core/evaluator.js";
 import { _default as _default$1 } from "./tabs/tabs.vue.js";
@@ -11,7 +12,6 @@ import { _default as _default$8 } from "./drawer/drawer.vue.js";
 import { DynamicFormModel } from "./form/dynamic-form-model.js";
 import { FormModel } from "./form/form-model.js";
 import { _default as _default$9 } from "./form/form.vue.js";
-import { formField } from "./form/helper.js";
 import { _default as _default$10 } from "./message-confirm/message-confirm.vue.js";
 import { _default as _default$11 } from "./message-confirm/message-confirm.js";
 import { _default as _default$12 } from "./calendar/calendar.vue.js";

package/dist/components/index.js

@@ -21,7 +21,7 @@ import _sfc_main$15 from "./grid/grid.js";
 import _sfc_main$16 from "./grid/grid-item.js";
 import form_item_default from "./form-item/form-item.js";
 import form_default from "./form/form.js";
-import { formField } from "./form/helper.js";
+import { formField, nestField } from "./form/helper.js";
 import { FormModel } from "./form/form-model.js";
 import { DynamicFormModel } from "./form/dynamic-form-model.js";
 import _sfc_main$17 from "./button/button.js";
@@ -200,6 +200,7 @@ var components_exports = /* @__PURE__ */ __exportAll({
 	evaluateConditionExpression: () => evaluate,
 	formField: () => formField,
 	message: () => message,
+	nestField: () => nestField,
 	vLoading: () => vLoading
 });
 //#endregion

package/dist/components/input/input.vue.d.ts

@@ -17,8 +17,8 @@ declare const __VLS_base: _$vue.DefineComponent<__VLS_PublicProps, _InputExposed
   "update:modelValue": (value: string | undefined) => any;
 } & {
   "update:modelValue": (value: string) => any;
-  clear: () => any;
   change: (value: string) => any;
+  clear: () => any;
   "suffix:click": (value?: string | undefined) => any;
   "prefix:click": (value?: string | undefined) => any;
   focus: (value?: string | undefined) => any;
@@ -26,8 +26,8 @@ declare const __VLS_base: _$vue.DefineComponent<__VLS_PublicProps, _InputExposed
   "native:input": (ev: Event) => any;
 }, string, _$vue.PublicProps, Readonly<__VLS_PublicProps> & Readonly<{
   "onUpdate:modelValue"?: ((value: string) => any) | undefined;
-  onClear?: (() => any) | undefined;
   onChange?: ((value: string) => any) | undefined;
+  onClear?: (() => any) | undefined;
   "onSuffix:click"?: ((value?: string | undefined) => any) | undefined;
   "onPrefix:click"?: ((value?: string | undefined) => any) | undefined;
   onFocus?: ((value?: string | undefined) => any) | undefined;

package/dist/components/multi-select/multi-select.vue.d.ts

@@ -32,9 +32,9 @@ declare const __VLS_base: _$vue.DefineComponent<__VLS_PublicProps, {}, {}, {}, {
   valueKey: string;
   disabled: boolean;
   readonly: boolean;
-  minWidth: string;
   placeholder: string;
   clearable: boolean;
+  minWidth: string;
   visibilityLimit: number;
 }, {}, {}, {}, string, _$vue.ComponentProvideOptions, false, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;

package/dist/components/multi-tree-select/multi-tree-select.vue.d.ts

@@ -15,22 +15,22 @@ declare const __VLS_base: _$vue.DefineComponent<__VLS_PublicProps, {}, {}, {}, {
   "update:modelValue": (value: (string | number)[]) => any;
 } & {
   "update:modelValue": (value: any[]) => any;
-  clear: () => any;
   change: (checked: Record<string, any>[]) => any;
+  clear: () => any;
 }, string, _$vue.PublicProps, Readonly<__VLS_PublicProps> & Readonly<{
   "onUpdate:modelValue"?: ((value: any[]) => any) | undefined;
-  onClear?: (() => any) | undefined;
   onChange?: ((checked: Record<string, any>[]) => any) | undefined;
+  onClear?: (() => any) | undefined;
 }>, {
   expandAll: boolean;
   labelKey: string;
   valueKey: string;
   disabled: boolean;
   readonly: boolean;
-  minWidth: string;
   placeholder: string;
   clearable: boolean;
   filterable: boolean;
+  minWidth: string;
   visibilityLimit: number;
 }, {}, {}, {}, string, _$vue.ComponentProvideOptions, false, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;

package/dist/components/notification/notification.vue.d.ts

@@ -4,11 +4,11 @@ import * as _$_veltra_utils0 from "@veltra/utils";
 
 //#region src/components/notification/notification.vue.d.ts
 declare const __VLS_export: _$vue.DefineComponent<NotificationProps, _$_veltra_utils0.DeconstructValue<_NotificationExposed>, {}, {}, {}, _$vue.ComponentOptionsMixin, _$vue.ComponentOptionsMixin, {}, string, _$vue.PublicProps, Readonly<NotificationProps> & Readonly<{}>, {
-  duration: number;
   closable: boolean;
+  position: "top-left" | "top-right" | "bottom-left" | "bottom-right";
+  duration: number;
   offset: number;
   buttonText: string;
-  position: "top-left" | "top-right" | "bottom-left" | "bottom-right";
 }, {}, {}, {}, string, _$vue.ComponentProvideOptions, false, {}, any>;
 declare const _default: typeof __VLS_export;
 //#endregion

package/dist/components/number/number.vue.d.ts

@@ -3,8 +3,8 @@ import * as _$vue from "vue";
 
 //#region src/components/number/number.vue.d.ts
 declare const __VLS_export: _$vue.DefineComponent<NumberProps, {}, {}, {}, {}, _$vue.ComponentOptionsMixin, _$vue.ComponentOptionsMixin, {}, string, _$vue.PublicProps, Readonly<NumberProps> & Readonly<{}>, {
-  format: "currency" | "percent" | "decimal";
   duration: number;
+  format: "currency" | "percent" | "decimal";
 }, {}, {}, {}, string, _$vue.ComponentProvideOptions, false, {}, any>;
 declare const _default: typeof __VLS_export;
 //#endregion

package/dist/components/number-input/number-input.vue.d.ts

@@ -15,12 +15,12 @@ declare const __VLS_base: _$vue.DefineComponent<__VLS_PublicProps, {}, {}, {}, {
   "update:modelValue": (value: number | undefined) => any;
 } & {
   "update:modelValue": (value?: number | undefined) => any;
-  clear: () => any;
   change: (value?: number | undefined) => any;
+  clear: () => any;
 }, string, _$vue.PublicProps, Readonly<__VLS_PublicProps> & Readonly<{
   "onUpdate:modelValue"?: ((value?: number | undefined) => any) | undefined;
-  onClear?: (() => any) | undefined;
   onChange?: ((value?: number | undefined) => any) | undefined;
+  onClear?: (() => any) | undefined;
 }>, {
   disabled: boolean;
   readonly: boolean;

package/dist/components/pop-confirm/pop-confirm.vue.d.ts

@@ -15,8 +15,8 @@ declare const __VLS_base: _$vue.DefineComponent<PopConfirmProps, {}, {}, {}, {},
   onCancel?: (() => any) | undefined;
 }>, {
   trigger: "hover" | "click";
-  icon: _$vue.Component;
   direction: TipDirection;
+  icon: _$vue.Component;
   iconColor: string;
   confirmText: string;
   cancelText: string;

package/dist/components/table/table.vue.d.ts

@@ -25,17 +25,17 @@ type __VLS_Slots = {
 declare const __VLS_base: _$vue.DefineComponent<TableProps, _TableExposed, {}, {}, {}, _$vue.ComponentOptionsMixin, _$vue.ComponentOptionsMixin, {} & {
   "update:selected": (value: Record<string, any> | undefined) => any;
   "update:checked": (value: Record<string, any>[]) => any;
+  "update:current": (row?: TableRow | undefined) => any;
   "update:rows": (rows: TableRow[]) => any;
   "update:forest": (rows?: _$_cat_kit_core0.Forest<Record<string, unknown>, any> | undefined) => any;
-  "update:current": (row?: TableRow | undefined) => any;
   "cell-click": (row: TableRow, column: TableColumn, ev: MouseEvent) => any;
   "row-click": (row: TableRow, ev: MouseEvent) => any;
 }, string, _$vue.PublicProps, Readonly<TableProps> & Readonly<{
   "onUpdate:selected"?: ((value: Record<string, any> | undefined) => any) | undefined;
   "onUpdate:checked"?: ((value: Record<string, any>[]) => any) | undefined;
+  "onUpdate:current"?: ((row?: TableRow | undefined) => any) | undefined;
   "onUpdate:rows"?: ((rows: TableRow[]) => any) | undefined;
   "onUpdate:forest"?: ((rows?: _$_cat_kit_core0.Forest<Record<string, unknown>, any> | undefined) => any) | undefined;
-  "onUpdate:current"?: ((row?: TableRow | undefined) => any) | undefined;
   "onCell-click"?: ((row: TableRow, column: TableColumn, ev: MouseEvent) => any) | undefined;
   "onRow-click"?: ((row: TableRow, ev: MouseEvent) => any) | undefined;
 }>, {