@veltra/desktop 1.1.36 → 1.2.0

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

@@ -1,179 +0,0 @@
-import { nextTick, reactive, shallowReactive, watch } from "vue";
-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 {
-	/** 表单数据 */
-	data;
-	/** 表单规则 */
-	fields;
-	/** 所有的键 */
-	allKeys;
-	/**
-	* 不同表单所需要校验的字段
-	* @description
-	* 这个值会在表单组件渲染时由表单设置，因为只有真正渲染的组件才应该被校验
-	*/
-	formKeys = /* @__PURE__ */ new Map();
-	/** 初始数据 */
-	initialData;
-	errors = shallowReactive(/* @__PURE__ */ new Map());
-	validator;
-	/**
-	* 是否在表单值更新时校验
-	*/
-	validateOnFieldChange = true;
-	modelChangeCallback = /* @__PURE__ */ new Set();
-	constructor(fields) {
-		this.fields = fields;
-		const flatFields = flattenFields(fields);
-		const rawData = {};
-		const allKeys = [];
-		for (const key in flatFields) {
-			const fieldItem = flatFields[key];
-			allKeys.push(key);
-			const { value } = fieldItem;
-			let v = value;
-			if (typeof value === "function") {
-				watch(value, (v) => {
-					o(this.initialData).set(key, v);
-				});
-				v = value();
-			}
-			o(rawData).set(key, v);
-		}
-		this.allKeys = allKeys;
-		this.initialData = JSON.parse(JSON.stringify(rawData));
-		this.setProxyData(reactive(rawData));
-		this.validator = new Validator(flatFields);
-		return shallowReactive(this);
-	}
-	/**
-	* 设置响应式值, 替换掉原有的数据
-	* @description 设置响应式值时，会自动监听值的变化，并进行校验
-	* @param proxyData 响应式的值
-	*/
-	setProxyData(proxyData) {
-		const data = middleProxy(proxyData, {
-			set: (field, val) => {
-				this.modelChangeCallback.forEach((cb) => cb(field, val));
-			},
-			changed: (fields) => {
-				if (!this.validateOnFieldChange) {
-					this.validateOnFieldChange = true;
-					return;
-				}
-				this.validate(fields);
-			}
-		});
-		this.data = data;
-	}
-	getValidateFields(fields) {
-		if (!fields) if (this.formKeys.size) {
-			let _fields = [];
-			this.formKeys.forEach((keys) => {
-				_fields = _fields.concat(keys);
-			});
-			return _fields;
-		} else return this.allKeys;
-		if (!Array.isArray(fields)) return [fields];
-		return fields;
-	}
-	/**
-	* 模型校验
-	* @param fields 需要校验的字段, 不传则校验所有字段
-	* @returns
-	*/
-	async validate(fields) {
-		const { errors, validator, data } = this;
-		const results = await validator.validate(data, this.getValidateFields(fields));
-		if (!fields) {
-			errors.clear();
-			for (const field in results) errors.set(field, results[field]);
-		} else ~(Array.isArray(fields) ? fields : [fields]).forEach((field) => {
-			const errs = results[field];
-			if (errs?.length) errors.set(field, errs);
-			else errors.delete(field);
-		});
-		if (errors.size > 0) {
-			if (!fields) nextTick(() => {
-				document.querySelector(".u-form-item.is-error")?.scrollIntoView({ block: "nearest" });
-			});
-			return Promise.reject(false);
-		}
-		return true;
-	}
-	/**
-	* 重置数据
-	* @param fields 需要重置的字段
-	*/
-	resetData(keys) {
-		if (typeof keys === "string") keys = [keys];
-		else if (Array.isArray(keys)) {} else keys = this.allKeys;
-		this.clearValidate();
-		this.validateOnFieldChange = false;
-		keys.forEach((field) => {
-			o(this.data).set(field, o(this.initialData).get(field));
-		});
-	}
-	/**
-	* 设置值
-	* @param formData 表单值
-	* @param options 配置
-	*/
-	setData(formData, config) {
-		const { validate = true } = config || {};
-		if (!validate) this.validateOnFieldChange = false;
-		this.allKeys.forEach((key) => {
-			const value = o(formData).get(key);
-			if (value !== void 0) o(this.data).set(key, value);
-		});
-		return this;
-	}
-	/**
-	* 设置初始值
-	* @description 初始值在重置数据和查看原始数据时会用到
-	* @param data 初始值
-	*/
-	setInitialData(data) {
-		this.allKeys.forEach((key) => {
-			o(this.initialData).set(key, o(data).get(key));
-		});
-		return this;
-	}
-	/** 清除校验 */
-	clearValidate() {
-		this.errors.clear();
-	}
-	/**
-	* 监听值变更
-	* @param cb 回调
-	*/
-	onChange(cb) {
-		this.modelChangeCallback.add(cb);
-	}
-	/** 关闭监听值变更 */
-	offChange(cb) {
-		this.modelChangeCallback.delete(cb);
-	}
-};
-//#endregion
-export { FormModel };
-
-//# sourceMappingURL=form-model.js.map

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

@@ -1 +0,0 @@
-{"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  ModelData,\n  DataSettingConfig,\n  IFormModel,\n  FormModelItem,\n  FormModelField\n} 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, FormModelField> = Record<string, FormModelField>\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, string[]> = new Map()\n\n  /** 初始数据 */\n  readonly initialData: ModelData<Fields>\n\n  readonly errors: Map<string, 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?: string | string[]) {\n    if (!fields) {\n      if (this.formKeys.size) {\n        let _fields: string[] = []\n        this.formKeys.forEach((keys) => {\n          _fields = _fields.concat(keys)\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?: 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\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?: 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: Partial<Record<string, any>>, config?: DataSettingConfig): 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: string, val: any) => void): void {\n    this.modelChangeCallback.add(cb)\n  }\n\n  /** 关闭监听值变更 */\n  offChange(cb: (field: string, val: any) => void): void {\n    this.modelChangeCallback.delete(cb)\n  }\n}\n"],"mappings":"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"}

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

@@ -1,16 +0,0 @@
-import { FormModelItem } from "../../types/form.js";
-//#region src/components/form/helper.d.ts
-/**
- * 定义表单项
- * @param item 表单项
- * @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 { NestedFieldMarker, formField, nestField };
-//# sourceMappingURL=helper.d.ts.map

package/dist/components/form/helper.js

@@ -1,20 +0,0 @@
-//#region src/components/form/helper.ts
-/**
-* 定义表单项
-* @param item 表单项
-* @returns
-*/
-function formField(item) {
-	if (!item) return {};
-	return item;
-}
-function nestField(fields) {
-	return {
-		__isNested: true,
-		fields
-	};
-}
-//#endregion
-export { formField, nestField };
-
-//# sourceMappingURL=helper.js.map

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

@@ -1 +0,0 @@
-{"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,CAAC;CAGV,OAAO;AACT;AAOA,SAAgB,UAAyC,QAAiC;CACxF,OAAO;EAAE,YAAY;EAAM;CAAO;AACpC"}

package/src/components/form/__test__/form-model.test.ts

@@ -1,190 +0,0 @@
-import { describe, expect, it } from 'vitest'
-
-import { DynamicFormModel } from '../dynamic-form-model'
-import { FormModel } from '../form-model'
-import { formField, nestField } from '../helper'
-
-describe('FormModel with Nested Fields', () => {
-  it('should flatten fields and initialize data correctly', () => {
-    const model = new FormModel({
-      name: formField({ value: 'Alice' }),
-      contact: nestField({
-        email: formField({ value: 'alice@example.com' }),
-        phone: formField({ value: '12345678901' })
-      })
-    })
-
-    // Verify allKeys
-    expect(model.allKeys).toEqual(['name', 'contact.email', 'contact.phone'])
-
-    // Verify initialData and data
-    expect(model.data).toEqual({
-      name: 'Alice',
-      contact: { email: 'alice@example.com', phone: '12345678901' }
-    })
-    expect(model.initialData).toEqual({
-      name: 'Alice',
-      contact: { email: 'alice@example.com', phone: '12345678901' }
-    })
-  })
-
-  it('should validate flat and nested fields correctly', async () => {
-    const model = new FormModel({
-      name: formField({ value: '', required: 'Name is required' }),
-      contact: nestField({
-        email: formField({ value: 'invalid-email', preset: 'email' }),
-        phone: formField({ value: '12345678901', required: true })
-      })
-    })
-
-    // Expect initial validation to fail on name and contact.email
-    await expect(model.validate()).rejects.toBe(false)
-    expect(model.errors.get('name')).toEqual(['Name is required'])
-    expect(model.errors.get('contact.email')).toEqual(['邮箱格式不正确'])
-    expect(model.errors.get('contact.phone')).toBeUndefined()
-
-    // Fix name and contact.email, and trigger validation
-    model.data.name = 'Bob'
-    model.data.contact.email = 'bob@example.com'
-
-    // We need to wait for watch effects/nextTick if reactive triggers validation on change
-    // Since validate() is an async function, let's call it directly
-    const valid = await model.validate()
-    expect(valid).toBe(true)
-    expect(model.errors.size).toBe(0)
-  })
-
-  it('should set data and reset data correctly', () => {
-    const model = new FormModel({
-      name: formField({ value: 'Alice' }),
-      contact: nestField({
-        email: formField({ value: 'alice@example.com' }),
-        phone: formField({ value: '12345678901' })
-      })
-    })
-
-    // Update data via setData
-    model.setData({ name: 'Bob', contact: { email: 'bob@example.com', phone: '98765432109' } })
-
-    expect(model.data).toEqual({
-      name: 'Bob',
-      contact: { email: 'bob@example.com', phone: '98765432109' }
-    })
-
-    // Reset data
-    model.resetData()
-    expect(model.data).toEqual({
-      name: 'Alice',
-      contact: { email: 'alice@example.com', phone: '12345678901' }
-    })
-  })
-})
-
-describe('DynamicFormModel with Nested Fields', () => {
-  it('should flatten fields and initialize data correctly', () => {
-    const model = new DynamicFormModel({
-      name: formField({ value: 'Alice' }),
-      contact: nestField({
-        email: formField({ value: 'alice@example.com' }),
-        phone: formField({ value: '12345678901' })
-      })
-    })
-
-    // Verify allKeys
-    expect(model.allKeys).toEqual(['name', 'contact.email', 'contact.phone'])
-
-    // Verify initialData and data
-    expect(model.data).toEqual({
-      name: 'Alice',
-      contact: { email: 'alice@example.com', phone: '12345678901' }
-    })
-    expect(model.initialData).toEqual({
-      name: 'Alice',
-      contact: { email: 'alice@example.com', phone: '12345678901' }
-    })
-  })
-
-  it('should support dynamic add and delete on nested fields', () => {
-    const model = new DynamicFormModel({ name: formField({ value: 'Alice' }) })
-
-    expect(model.allKeys).toEqual(['name'])
-
-    // Dynamically add nested fields
-    model.add(
-      'contact',
-      nestField({
-        email: formField({ value: 'alice@example.com' }),
-        phone: formField({ value: '12345678901' })
-      })
-    )
-
-    expect(model.allKeys).toEqual(['name', 'contact.email', 'contact.phone'])
-    expect(model.data).toEqual({
-      name: 'Alice',
-      contact: { email: 'alice@example.com', phone: '12345678901' }
-    })
-    expect(model.initialData).toEqual({
-      name: 'Alice',
-      contact: { email: 'alice@example.com', phone: '12345678901' }
-    })
-
-    // Dynamically delete nested fields
-    model.delete('contact')
-
-    expect(model.allKeys).toEqual(['name'])
-    expect(model.data.name).toBe('Alice')
-    expect(model.fields.contact).toBeUndefined()
-  })
-
-  it('should validate flat and nested fields correctly', async () => {
-    const model = new DynamicFormModel()
-
-    model.add('name', formField({ value: '', required: 'Name is required' }))
-    model.add(
-      'contact',
-      nestField({
-        email: formField({ value: 'invalid-email', preset: 'email' }),
-        phone: formField({ value: '12345678901', required: true })
-      })
-    )
-
-    // Expect initial validation to fail on name and contact.email
-    await expect(model.validate()).resolves.toBe(false)
-    expect(model.errors.get('name')).toEqual(['Name is required'])
-    expect(model.errors.get('contact.email')).toEqual(['邮箱格式不正确'])
-    expect(model.errors.get('contact.phone')).toBeUndefined()
-
-    // Fix name and contact.email, and trigger validation
-    model.data.name = 'Bob'
-    model.data.contact.email = 'bob@example.com'
-
-    const valid = await model.validate()
-    expect(valid).toBe(true)
-    expect(model.errors.size).toBe(0)
-  })
-
-  it('should set data and reset data correctly for nested fields', () => {
-    const model = new DynamicFormModel({
-      name: formField({ value: 'Alice' }),
-      contact: nestField({
-        email: formField({ value: 'alice@example.com' }),
-        phone: formField({ value: '12345678901' })
-      })
-    })
-
-    // Update data via setData
-    model.setData({ name: 'Bob', contact: { email: 'bob@example.com', phone: '98765432109' } })
-
-    expect(model.data).toEqual({
-      name: 'Bob',
-      contact: { email: 'bob@example.com', phone: '98765432109' }
-    })
-
-    // Reset data
-    model.resetData()
-    expect(model.data).toEqual({
-      name: 'Alice',
-      contact: { email: 'alice@example.com', phone: '12345678901' }
-    })
-  })
-})

package/src/components/form/dynamic-form-model.ts

@@ -1,258 +0,0 @@
-import { o } from '@cat-kit/core'
-import { Validator } from '@veltra/utils'
-import { isReactive, reactive, shallowReactive, watch } from 'vue'
-
-import type { FormModelField, FormModelItem, DataSettingConfig } from '../../types'
-
-function flattenFields(fields: Record<string, any>, prefix = ''): Record<string, FormModelItem> {
-  const result: Record<string, FormModelItem> = {}
-  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 as any).fields, fullPath))
-    } else {
-      result[fullPath] = item
-    }
-  }
-  return result
-}
-
-/**
- * 动态表单模型
- */
-export class DynamicFormModel {
-  /** 表单数据 */
-  private _data: Record<string, any> = reactive({})
-
-  set data(v: Record<string, any>) {
-    if (!isReactive(v)) {
-      console.error(`data不是一个响应式对象`)
-      return
-    }
-    this._data = v
-    this.watchData()
-  }
-
-  get data() {
-    return this._data
-  }
-
-  /** 表单规则 */
-  readonly fields: Record<string, FormModelField> = shallowReactive(
-    {} as Record<string, FormModelField>
-  )
-
-  private flatFields: Record<string, FormModelItem>
-
-  private validator: Validator
-
-  /**
-   * 不同表单对应的key
-   */
-  formKeys: Map<number, string[]> = new Map()
-
-  readonly errors: Map<string, string[] | undefined> = shallowReactive(new Map())
-
-  /**
-   * 是否在表单值更新时校验
-   */
-  private validateOnFieldChange = true
-
-  private modelChangeCallback: Set<(fields: string, val: any) => void> = new Set()
-
-  private _allKeys: string[] = []
-
-  /** 所有的键 */
-  get allKeys(): string[] {
-    return this._allKeys
-  }
-
-  private updateFlatFields(): void {
-    for (const key in this.flatFields) {
-      delete this.flatFields[key]
-    }
-    const flatted = flattenFields(this.fields)
-    Object.assign(this.flatFields, flatted)
-    this.getAllKeys()
-  }
-
-  private getAllKeys(): void {
-    this._allKeys = Object.keys(this.flatFields)
-  }
-
-  /** 初始数据 */
-  readonly initialData: Record<string, any> = {}
-
-  /**
-   * 变更前的值
-   */
-  private readonly oldData: Record<string, any> = {}
-
-  constructor(fields?: Record<string, FormModelField>) {
-    this.flatFields = shallowReactive({} as Record<string, FormModelItem>)
-    this.validator = new Validator(this.flatFields)
-    this.append(fields ?? {})
-    this.watchData()
-  }
-
-  private watchData(): void {
-    const { oldData } = this
-    watch(this.data, (data) => {
-      let changedKeys: string[] = []
-
-      this.allKeys.forEach((key) => {
-        const oldVal = o(oldData).get(key)
-        const newVal = o(data).get(key)
-        if (oldVal !== newVal) {
-          this.modelChangeCallback.forEach((cb) => cb(key, newVal))
-          changedKeys.push(key)
-          o(oldData).set(key, newVal)
-        }
-      })
-
-      if (this.validateOnFieldChange) {
-        this.validate(changedKeys)
-      } else {
-        this.validateOnFieldChange = true
-      }
-    })
-  }
-
-  append(fields: Record<string, FormModelField>): void {
-    for (const key in fields) {
-      this.add(key, fields[key]!)
-    }
-  }
-
-  /**
-   * 添加字段
-   * @param field 字段
-   * @param item 字段配置项
-   */
-  add(field: string, item: FormModelField): void {
-    this.fields[field] = item
-    const flatItem = flattenFields({ [field]: item })
-    for (const key in flatItem) {
-      const fieldItem = flatItem[key]!
-      const { value } = fieldItem
-      const v = typeof value === 'function' ? value() : value
-      if (v !== undefined) {
-        o(this.initialData).set(key, JSON.parse(JSON.stringify(v)))
-      }
-      o(this.data).set(key, v)
-      o(this.oldData).set(key, v)
-    }
-    this.updateFlatFields()
-  }
-
-  /**
-   * 移除字段
-   * @param field 字段
-   */
-  delete(field: string): void {
-    delete this.fields[field]
-    this.updateFlatFields()
-  }
-
-  /**
-   * 监听值变更
-   * @param cb 回调
-   */
-  onChange(cb: (field: string, val: any) => void): void {
-    this.modelChangeCallback.add(cb)
-  }
-
-  offChange(cb: (field: string, val: any) => void): void {
-    this.modelChangeCallback.delete(cb)
-  }
-
-  async validate(fields?: string | string[]): Promise<boolean> {
-    const { errors, validator, data } = this
-
-    const results = await validator.validate(data, this.getValidateFields(fields))
-
-    // 设置错误提示
-    if (!fields) {
-      errors.clear()
-      for (const field in results) {
-        errors.set(field, results[field])
-      }
-    } else {
-      ~(Array.isArray(fields) ? fields : [fields]).forEach((field) => {
-        const errs = results[field]
-        if (errs?.length) {
-          errors.set(field, errs)
-        } else {
-          errors.delete(field)
-        }
-      })
-    }
-
-    return errors.size === 0
-  }
-
-  private getValidateFields(fields?: string | string[]) {
-    if (!fields) {
-      if (this.formKeys.size) {
-        let _fields: string[] = []
-        this.formKeys.forEach((fields) => {
-          _fields = _fields.concat(fields)
-        })
-        return _fields
-      } else {
-        return this.allKeys
-      }
-    }
-
-    if (!Array.isArray(fields)) {
-      return [fields]
-    }
-    return fields
-  }
-
-  /**
-   * 重置数据
-   * @param fields 需要重置的字段
-   */
-  resetData(keys?: string | string[]): void {
-    if (typeof keys === 'string') {
-      keys = [keys]
-    } else if (Array.isArray(keys)) {
-    } else {
-      keys = this.allKeys
-    }
-
-    this.clearValidate()
-
-    this.validateOnFieldChange = false
-
-    keys.forEach((field) => {
-      o(this.data).set(field as string, o(this.initialData).get(field as string))
-    })
-  }
-
-  /**
-   * 设置值
-   * @param formData 表单值
-   * @param options 配置
-   */
-  setData(formData: Record<string, any>, config?: DataSettingConfig): void {
-    const { validate = true } = config || {}
-
-    if (!validate) {
-      this.validateOnFieldChange = false
-    }
-
-    this.allKeys.forEach((key) => {
-      const value = o(formData).get(key)
-      if (value !== undefined) {
-        o(this.data).set(key, value)
-      }
-    })
-  }
-
-  clearValidate(): void {
-    this.errors.clear()
-  }
-}