@veltra/desktop 1.1.27 → 1.1.28

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

@@ -8,11 +8,11 @@ type __VLS_Slots = {
   default?: () => VNode[];
 };
 declare const __VLS_base: _$vue.DefineComponent<ActionGroupProps, _ActionGroupExposed, {}, {}, {}, _$vue.ComponentOptionsMixin, _$vue.ComponentOptionsMixin, {}, string, _$vue.PublicProps, Readonly<ActionGroupProps> & Readonly<{}>, {
-  size: "small" | "default" | "large";
   type: _$_veltra_utils0.ColorType;
-  circle: boolean;
-  max: number;
+  size: "small" | "default" | "large";
   text: boolean;
+  max: number;
+  circle: boolean;
   loading: boolean;
 }, {}, {}, {}, string, _$vue.ComponentProvideOptions, false, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;

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

@@ -15,10 +15,10 @@ declare const __VLS_base: _$vue.DefineComponent<ActionProps, {}, {}, {}, {}, _$v
 }, string, _$vue.PublicProps, Readonly<ActionProps> & Readonly<{
   onRun?: (() => any) | undefined;
 }>, {
-  size: _$_veltra_utils0.ComponentSize;
   type: ButtonType;
-  circle: boolean;
+  size: _$_veltra_utils0.ComponentSize;
   text: boolean;
+  circle: boolean;
   loading: boolean;
   inDropdown: boolean;
 }, {}, {}, {}, string, _$vue.ComponentProvideOptions, false, {}, any>;

package/dist/components/batch-edit/batch-edit.js.map

@@ -1 +1 @@
-{"version":3,"file":"batch-edit.js","names":[],"sources":["../../../src/components/batch-edit/batch-edit.vue"],"sourcesContent":["<template>\n  <u-layout\n    :class=\"cls.b\"\n    :cols=\"cols\"\n    rows=\"minmax(0, 1fr)\"\n    gap=\"8px\"\n    resizable\n    @keydown=\"handleKeydown\"\n    tabindex=\"-1\"\n  >\n    <!-- 编辑列表 -->\n    <BatchEditList :slots=\"slots\" />\n\n    <!-- 编辑表单 -->\n    <BatchEditForm v-slot=\"scoped\">\n      <!-- @vue-ignore -->\n      <slot name=\"form\" v-bind=\"scoped\" />\n    </BatchEditForm>\n  </u-layout>\n</template>\n\n<script lang=\"ts\" setup generic=\"Model extends FormModel\">\nimport { bem } from '@veltra/utils'\nimport { computed, inject, provide, shallowRef, watch } from 'vue'\n\nimport type {\n  BatchEditEmits,\n  BatchEditFeature,\n  BatchEditProps,\n  TableColumnSlotsScope,\n  TableExposed,\n  TableRow\n} from '../../types'\nimport { DialogDIKey } from '../dialog/di'\nimport type { FormModel } from '../form'\nimport { ULayout } from '../layout'\nimport BatchEditForm from './batch-edit-form.vue'\nimport BatchEditList from './batch-edit-list.vue'\nimport { BatchEditDIKey } from './di'\nimport { useEdit } from './use-edit'\n\ndefineOptions({ name: 'BatchEdit' })\n\nconst props = withDefaults(defineProps<BatchEditProps<Model>>(), {\n  cols: () => ['1fr', '420px'],\n  mode: 'normal'\n})\n\nconst emit = defineEmits<BatchEditEmits>()\n\nconst staticFeatures = computed(() => {\n  const { features } = props\n\n  if (Array.isArray(features)) {\n    return new Set(features)\n  }\n\n  const defaultFeatures = new Set<BatchEditFeature>(['create', 'delete', 'update', 'createChild'])\n\n  if (!features) {\n    return defaultFeatures\n  }\n\n  // 函数与 false 的特性视为关闭；显式 true 视为开启（即便不在默认集合内）\n  Object.entries(features).forEach(([key, value]) => {\n    const k = key as BatchEditFeature\n    if (typeof value === 'function' || value === false) {\n      defaultFeatures.delete(k)\n    } else if (value === true) {\n      defaultFeatures.add(k)\n    }\n  })\n  return defaultFeatures\n})\n\nconst dynamicFeatures = computed<\n  Record<BatchEditFeature, ((row?: TableRow) => boolean) | undefined>\n>(() => {\n  const { features } = props\n  if (!Array.isArray(features) && typeof features === 'object') {\n    const ret = Object.entries(features)\n      .filter(([_, value]) => {\n        return typeof value === 'function'\n      })\n      .reduce(\n        (acc, [key, value]) => {\n          acc[key] = value\n          return acc\n        },\n        {} as Record<BatchEditFeature, (row?: TableRow) => boolean>\n      )\n    return ret\n  }\n\n  return {} as Record<BatchEditFeature, ((row?: TableRow) => boolean) | undefined>\n})\n\nconst slots = defineSlots<\n  {\n    form?: (props: {\n      /** 表单数据 */\n      data: Model['data']\n      /** 表单模型 */\n      model: Model\n      /** 当前编辑的层级 */\n      depth?: number\n      /** 当前编辑的行 */\n      row?: TableRow\n      /** 当前编辑的行索引 */\n      index?: number\n      /** 操作的目标行索引路径 */\n      indexes?: number[]\n    }) => any\n\n    header?: () => any\n  } & Partial<{ [key: `column:${string}`]: (props: TableColumnSlotsScope) => any }>\n>()\n\nconst cls = bem('batch-edit')\n\nconst tableRef = shallowRef<TableExposed>()\n\nconst editCtx = useEdit({ props, emit, tableRef })\n\nconst { state, handleClose, handleSave, handleDelete, handleCreate } = editCtx\n\nprovide(BatchEditDIKey, { cls, props, emit, tableRef, staticFeatures, dynamicFeatures, ...editCtx })\n\nconst dialogCtx = inject(DialogDIKey, undefined)\n\ndialogCtx &&\n  watch(dialogCtx.visible, (visible) => {\n    !visible && editCtx.handleClose()\n  })\n\nconst cols = computed(() => {\n  return !!state.row || state.visible ? props.cols : undefined\n})\n\n/**\n * 键盘快捷键：\n * - Esc        关闭表单\n * - ⌘/Ctrl + S   保存\n * - ⌘/Ctrl + Backspace 删除当前编辑行\n * - ⌘/Ctrl + N   新增（仅在不在表单中时）\n */\nfunction handleKeydown(e: KeyboardEvent) {\n  if (props.readonly && e.key !== 'Escape') return\n\n  if (e.key === 'Escape') {\n    if (state.visible) {\n      e.preventDefault()\n      handleClose()\n    }\n    return\n  }\n\n  const meta = e.metaKey || e.ctrlKey\n  if (!meta) return\n\n  const key = e.key.toLowerCase()\n\n  if (key === 's' && state.visible) {\n    e.preventDefault()\n    handleSave()\n    return\n  }\n\n  if (e.key === 'Backspace' && state.row && state.type === 'update') {\n    e.preventDefault()\n    handleDelete(state.row)\n    return\n  }\n\n  if (key === 'n' && !state.visible) {\n    e.preventDefault()\n    handleCreate()\n  }\n}\n</script>\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA2CA,MAAM,QAAQ;EAKd,MAAM,OAAO;EAEb,MAAM,iBAAiB,eAAe;GACpC,MAAM,EAAE,aAAa;GAErB,IAAI,MAAM,QAAQ,SAAQ,EACxB,OAAO,IAAI,IAAI,SAAQ;GAGzB,MAAM,kBAAkB,IAAI,IAAsB;IAAC;IAAU;IAAU;IAAU;IAAc,CAAA;GAE/F,IAAI,CAAC,UACH,OAAO;GAIT,OAAO,QAAQ,SAAQ,CAAE,SAAS,CAAC,KAAK,WAAW;IACjD,MAAM,IAAI;IACV,IAAI,OAAO,UAAU,cAAc,UAAU,OAC3C,gBAAgB,OAAO,EAAC;SACnB,IAAI,UAAU,MACnB,gBAAgB,IAAI,EAAC;KAExB;GACD,OAAO;IACR;EAED,MAAM,kBAAkB,eAEhB;GACN,MAAM,EAAE,aAAa;GACrB,IAAI,CAAC,MAAM,QAAQ,SAAQ,IAAK,OAAO,aAAa,UAYlD,OAXY,OAAO,QAAQ,SAAQ,CAChC,QAAQ,CAAC,GAAG,WAAW;IACtB,OAAO,OAAO,UAAU;KACzB,CACA,QACE,KAAK,CAAC,KAAK,WAAW;IACrB,IAAI,OAAO;IACX,OAAO;MAET,EACF,CACK;GAGT,OAAO,EAAC;IACT;EAED,MAAM,QAAQ,UAAA;EAqBd,MAAM,MAAM,IAAI,aAAY;EAE5B,MAAM,WAAW,YAAyB;EAE1C,MAAM,UAAU,QAAQ;GAAE;GAAO;GAAM;GAAU,CAAA;EAEjD,MAAM,EAAE,OAAO,aAAa,YAAY,cAAc,iBAAiB;EAEvE,QAAQ,gBAAgB;GAAE;GAAK;GAAO;GAAM;GAAU;GAAgB;GAAiB,GAAG;GAAS,CAAA;EAEnG,MAAM,YAAY,OAAO,aAAa,KAAA,EAAS;EAE/C,aACE,MAAM,UAAU,UAAU,YAAY;GACpC,CAAC,WAAW,QAAQ,aAAY;IACjC;EAEH,MAAM,OAAO,eAAe;GAC1B,OAAO,CAAC,CAAC,MAAM,OAAO,MAAM,UAAU,MAAM,OAAO,KAAA;IACpD;;;;;;;;EASD,SAAS,cAAc,GAAkB;GACvC,IAAI,MAAM,YAAY,EAAE,QAAQ,UAAU;GAE1C,IAAI,EAAE,QAAQ,UAAU;IACtB,IAAI,MAAM,SAAS;KACjB,EAAE,gBAAe;KACjB,aAAY;;IAEd;;GAIF,IAAI,EADS,EAAE,WAAW,EAAE,UACjB;GAEX,MAAM,MAAM,EAAE,IAAI,aAAY;GAE9B,IAAI,QAAQ,OAAO,MAAM,SAAS;IAChC,EAAE,gBAAe;IACjB,YAAW;IACX;;GAGF,IAAI,EAAE,QAAQ,eAAe,MAAM,OAAO,MAAM,SAAS,UAAU;IACjE,EAAE,gBAAe;IACjB,aAAa,MAAM,IAAG;IACtB;;GAGF,IAAI,QAAQ,OAAO,CAAC,MAAM,SAAS;IACjC,EAAE,gBAAe;IACjB,cAAa;;;;uBA/Kf,YAiBW,MAAA,YAAA,EAAA;IAhBR,OAAK,eAAE,MAAA,IAAA,CAAI,EAAC;IACZ,MAAM,KAAA;IACP,MAAK;IACL,KAAI;IACJ,WAAA;IACC,WAAS;IACV,UAAS;;2BAEI;KAAb,mBAAA,SAAA;KACA,YAAgC,aAAA,EAAT,OAAK,CAAA;KAE5B,mBAAA,SAAA;KACA,YAGgB,aAAA,MAAA;wBAHO,WAAM,CAC3B,mBAAA,gBAAA,EACA,WAAoC,KAAA,QAAA,QAAA,eAAA,mBAAV,OAAM,CAAA,CAAA,CAAA,CAAA"}
+{"version":3,"file":"batch-edit.js","names":[],"sources":["../../../src/components/batch-edit/batch-edit.vue"],"sourcesContent":["<template>\n  <u-layout\n    :class=\"cls.b\"\n    :cols=\"cols\"\n    rows=\"minmax(0, 1fr)\"\n    gap=\"8px\"\n    resizable\n    @keydown=\"handleKeydown\"\n    tabindex=\"-1\"\n  >\n    <!-- 编辑列表 -->\n    <BatchEditList :slots=\"slots\" />\n\n    <!-- 编辑表单 -->\n    <BatchEditForm v-slot=\"scoped\">\n      <!-- @vue-ignore -->\n      <slot name=\"form\" v-bind=\"scoped\" />\n    </BatchEditForm>\n  </u-layout>\n</template>\n\n<script lang=\"ts\" setup generic=\"Model extends IFormModel\">\nimport { bem } from '@veltra/utils'\nimport { computed, inject, provide, shallowRef, watch } from 'vue'\n\nimport type {\n  BatchEditEmits,\n  BatchEditFeature,\n  BatchEditProps,\n  IFormModel,\n  TableColumnSlotsScope,\n  TableExposed,\n  TableRow\n} from '../../types'\nimport { DialogDIKey } from '../dialog/di'\nimport { ULayout } from '../layout'\nimport BatchEditForm from './batch-edit-form.vue'\nimport BatchEditList from './batch-edit-list.vue'\nimport { BatchEditDIKey } from './di'\nimport { useEdit } from './use-edit'\n\ndefineOptions({ name: 'BatchEdit' })\n\nconst props = withDefaults(defineProps<BatchEditProps<Model>>(), {\n  cols: () => ['1fr', '420px'],\n  mode: 'normal'\n})\n\nconst emit = defineEmits<BatchEditEmits>()\n\nconst staticFeatures = computed(() => {\n  const { features } = props\n\n  if (Array.isArray(features)) {\n    return new Set(features)\n  }\n\n  const defaultFeatures = new Set<BatchEditFeature>(['create', 'delete', 'update', 'createChild'])\n\n  if (!features) {\n    return defaultFeatures\n  }\n\n  // 函数与 false 的特性视为关闭；显式 true 视为开启（即便不在默认集合内）\n  Object.entries(features).forEach(([key, value]) => {\n    const k = key as BatchEditFeature\n    if (typeof value === 'function' || value === false) {\n      defaultFeatures.delete(k)\n    } else if (value === true) {\n      defaultFeatures.add(k)\n    }\n  })\n  return defaultFeatures\n})\n\nconst dynamicFeatures = computed<\n  Record<BatchEditFeature, ((row?: TableRow) => boolean) | undefined>\n>(() => {\n  const { features } = props\n  if (!Array.isArray(features) && typeof features === 'object') {\n    const ret = Object.entries(features)\n      .filter(([_, value]) => {\n        return typeof value === 'function'\n      })\n      .reduce(\n        (acc, [key, value]) => {\n          acc[key] = value\n          return acc\n        },\n        {} as Record<BatchEditFeature, (row?: TableRow) => boolean>\n      )\n    return ret\n  }\n\n  return {} as Record<BatchEditFeature, ((row?: TableRow) => boolean) | undefined>\n})\n\nconst slots = defineSlots<\n  {\n    form?: (props: {\n      /** 表单数据 */\n      data: Model['data']\n      /** 表单模型 */\n      model: Model\n      /** 当前编辑的层级 */\n      depth?: number\n      /** 当前编辑的行 */\n      row?: TableRow\n      /** 当前编辑的行索引 */\n      index?: number\n      /** 操作的目标行索引路径 */\n      indexes?: number[]\n    }) => any\n\n    header?: () => any\n  } & Partial<{ [key: `column:${string}`]: (props: TableColumnSlotsScope) => any }>\n>()\n\nconst cls = bem('batch-edit')\n\nconst tableRef = shallowRef<TableExposed>()\n\nconst editCtx = useEdit({ props, emit, tableRef })\n\nconst { state, handleClose, handleSave, handleDelete, handleCreate } = editCtx\n\nprovide(BatchEditDIKey, { cls, props, emit, tableRef, staticFeatures, dynamicFeatures, ...editCtx })\n\nconst dialogCtx = inject(DialogDIKey, undefined)\n\ndialogCtx &&\n  watch(dialogCtx.visible, (visible) => {\n    !visible && editCtx.handleClose()\n  })\n\nconst cols = computed(() => {\n  return !!state.row || state.visible ? props.cols : undefined\n})\n\n/**\n * 键盘快捷键：\n * - Esc        关闭表单\n * - ⌘/Ctrl + S   保存\n * - ⌘/Ctrl + Backspace 删除当前编辑行\n * - ⌘/Ctrl + N   新增（仅在不在表单中时）\n */\nfunction handleKeydown(e: KeyboardEvent) {\n  if (props.readonly && e.key !== 'Escape') return\n\n  if (e.key === 'Escape') {\n    if (state.visible) {\n      e.preventDefault()\n      handleClose()\n    }\n    return\n  }\n\n  const meta = e.metaKey || e.ctrlKey\n  if (!meta) return\n\n  const key = e.key.toLowerCase()\n\n  if (key === 's' && state.visible) {\n    e.preventDefault()\n    handleSave()\n    return\n  }\n\n  if (e.key === 'Backspace' && state.row && state.type === 'update') {\n    e.preventDefault()\n    handleDelete(state.row)\n    return\n  }\n\n  if (key === 'n' && !state.visible) {\n    e.preventDefault()\n    handleCreate()\n  }\n}\n</script>\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA2CA,MAAM,QAAQ;EAKd,MAAM,OAAO;EAEb,MAAM,iBAAiB,eAAe;GACpC,MAAM,EAAE,aAAa;GAErB,IAAI,MAAM,QAAQ,SAAQ,EACxB,OAAO,IAAI,IAAI,SAAQ;GAGzB,MAAM,kBAAkB,IAAI,IAAsB;IAAC;IAAU;IAAU;IAAU;IAAc,CAAA;GAE/F,IAAI,CAAC,UACH,OAAO;GAIT,OAAO,QAAQ,SAAQ,CAAE,SAAS,CAAC,KAAK,WAAW;IACjD,MAAM,IAAI;IACV,IAAI,OAAO,UAAU,cAAc,UAAU,OAC3C,gBAAgB,OAAO,EAAC;SACnB,IAAI,UAAU,MACnB,gBAAgB,IAAI,EAAC;KAExB;GACD,OAAO;IACR;EAED,MAAM,kBAAkB,eAEhB;GACN,MAAM,EAAE,aAAa;GACrB,IAAI,CAAC,MAAM,QAAQ,SAAQ,IAAK,OAAO,aAAa,UAYlD,OAXY,OAAO,QAAQ,SAAQ,CAChC,QAAQ,CAAC,GAAG,WAAW;IACtB,OAAO,OAAO,UAAU;KACzB,CACA,QACE,KAAK,CAAC,KAAK,WAAW;IACrB,IAAI,OAAO;IACX,OAAO;MAET,EACF,CACK;GAGT,OAAO,EAAC;IACT;EAED,MAAM,QAAQ,UAAA;EAqBd,MAAM,MAAM,IAAI,aAAY;EAE5B,MAAM,WAAW,YAAyB;EAE1C,MAAM,UAAU,QAAQ;GAAE;GAAO;GAAM;GAAU,CAAA;EAEjD,MAAM,EAAE,OAAO,aAAa,YAAY,cAAc,iBAAiB;EAEvE,QAAQ,gBAAgB;GAAE;GAAK;GAAO;GAAM;GAAU;GAAgB;GAAiB,GAAG;GAAS,CAAA;EAEnG,MAAM,YAAY,OAAO,aAAa,KAAA,EAAS;EAE/C,aACE,MAAM,UAAU,UAAU,YAAY;GACpC,CAAC,WAAW,QAAQ,aAAY;IACjC;EAEH,MAAM,OAAO,eAAe;GAC1B,OAAO,CAAC,CAAC,MAAM,OAAO,MAAM,UAAU,MAAM,OAAO,KAAA;IACpD;;;;;;;;EASD,SAAS,cAAc,GAAkB;GACvC,IAAI,MAAM,YAAY,EAAE,QAAQ,UAAU;GAE1C,IAAI,EAAE,QAAQ,UAAU;IACtB,IAAI,MAAM,SAAS;KACjB,EAAE,gBAAe;KACjB,aAAY;;IAEd;;GAIF,IAAI,EADS,EAAE,WAAW,EAAE,UACjB;GAEX,MAAM,MAAM,EAAE,IAAI,aAAY;GAE9B,IAAI,QAAQ,OAAO,MAAM,SAAS;IAChC,EAAE,gBAAe;IACjB,YAAW;IACX;;GAGF,IAAI,EAAE,QAAQ,eAAe,MAAM,OAAO,MAAM,SAAS,UAAU;IACjE,EAAE,gBAAe;IACjB,aAAa,MAAM,IAAG;IACtB;;GAGF,IAAI,QAAQ,OAAO,CAAC,MAAM,SAAS;IACjC,EAAE,gBAAe;IACjB,cAAa;;;;uBA/Kf,YAiBW,MAAA,YAAA,EAAA;IAhBR,OAAK,eAAE,MAAA,IAAA,CAAI,EAAC;IACZ,MAAM,KAAA;IACP,MAAK;IACL,KAAI;IACJ,WAAA;IACC,WAAS;IACV,UAAS;;2BAEI;KAAb,mBAAA,SAAA;KACA,YAAgC,aAAA,EAAT,OAAK,CAAA;KAE5B,mBAAA,SAAA;KACA,YAGgB,aAAA,MAAA;wBAHO,WAAM,CAC3B,mBAAA,gBAAA,EACA,WAAoC,KAAA,QAAA,QAAA,eAAA,mBAAV,OAAM,CAAA,CAAA,CAAA,CAAA"}

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

@@ -1,11 +1,11 @@
+import { IFormModel } from "../../types/form.js";
 import { TableColumn, TableColumnSlotsScope, TableRow } from "../../types/table.js";
 import { BatchEditEmits, BatchEditProps } from "../../types/batch-edit.js";
-import { FormModel } from "../form/form-model.js";
 import * as _$vue from "vue";
 import * as _$_cat_kit_core0 from "@cat-kit/core";
 
 //#region src/components/batch-edit/batch-edit.vue.d.ts
-declare const __VLS_export: <Model extends FormModel>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_exposed?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
+declare const __VLS_export: <Model extends IFormModel>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_exposed?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
   props: _$vue.PublicProps & __VLS_PrettifyLocal<BatchEditProps<Model> & {
     "onUpdate:selected"?: ((value: Record<string, any> | undefined) => any) | undefined;
     "onUpdate:checked"?: ((value: Record<string, any>[]) => any) | undefined;

package/dist/components/batch-edit/di.js.map

@@ -1 +1 @@
-{"version":3,"file":"di.js","names":[],"sources":["../../../src/components/batch-edit/di.ts"],"sourcesContent":["import type { BEM } from '@veltra/utils'\nimport type { ComputedRef, InjectionKey, ShallowRef } from 'vue'\n\nimport type {\n  BatchEditEmits,\n  BatchEditFeature,\n  BatchEditProps,\n  TableExposed,\n  TableRow\n} from '../../types'\nimport type { FormModel } from '../form'\nimport type { EditReturned } from './use-edit'\nexport const BatchEditDIKey: InjectionKey<\n  {\n    cls: BEM<'batch-edit', 'u-'>\n    props: BatchEditProps<FormModel>\n    emit: BatchEditEmits\n    tableRef: ShallowRef<TableExposed | undefined>\n    staticFeatures: ComputedRef<Set<BatchEditFeature>>\n    dynamicFeatures: ComputedRef<\n      Record<BatchEditFeature, ((row?: TableRow) => boolean) | undefined>\n    >\n  } & EditReturned\n> = Symbol('BatchEditDIKey')\n"],"mappings":";AAYA,MAAa,iBAWT,OAAO,iBAAiB"}
+{"version":3,"file":"di.js","names":[],"sources":["../../../src/components/batch-edit/di.ts"],"sourcesContent":["import type { BEM } from '@veltra/utils'\nimport type { ComputedRef, InjectionKey, ShallowRef } from 'vue'\n\nimport type {\n  BatchEditEmits,\n  BatchEditFeature,\n  BatchEditProps,\n  IFormModel,\n  TableExposed,\n  TableRow\n} from '../../types'\nimport type { EditReturned } from './use-edit'\nexport const BatchEditDIKey: InjectionKey<\n  {\n    cls: BEM<'batch-edit', 'u-'>\n    props: BatchEditProps<IFormModel>\n    emit: BatchEditEmits\n    tableRef: ShallowRef<TableExposed | undefined>\n    staticFeatures: ComputedRef<Set<BatchEditFeature>>\n    dynamicFeatures: ComputedRef<\n      Record<BatchEditFeature, ((row?: TableRow) => boolean) | undefined>\n    >\n  } & EditReturned\n> = Symbol('BatchEditDIKey')\n"],"mappings":";AAYA,MAAa,iBAWT,OAAO,iBAAiB"}

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

@@ -4,24 +4,24 @@ 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;
-  change: (...args: [value?: string | undefined, label?: string | undefined, item?: Record<string, any> | undefined] | [value: string[], label: string[], data: Record<string, any>[]]) => 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;
 }, string, _$vue.PublicProps, Readonly<CascadeProps> & Readonly<{
   "onUpdate:modelValue"?: ((value?: string | string[] | undefined) => 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;
+  onChange?: ((...args: [value?: string | undefined, label?: string | undefined, item?: Record<string, any> | undefined] | [value: string[], label: string[], data: Record<string, any>[]]) => any) | undefined;
 }>, {
   disabled: boolean;
   readonly: boolean;
+  placeholder: string;
+  clearable: boolean;
   labelKey: string;
   valueKey: string;
   childrenKey: string;
   data: Record<string, any>[];
-  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/checkbox/checkbox-button.vue.d.ts

@@ -20,9 +20,9 @@ declare const __VLS_base: _$vue.DefineComponent<__VLS_PublicProps, {}, {}, {}, {
   "onUpdate:modelValue"?: ((checked: boolean) => any) | undefined;
   onChange?: ((checked: boolean) => any) | undefined;
 }>, {
+  type: _$_veltra_utils0.ColorType;
   disabled: boolean;
   readonly: boolean;
-  type: _$_veltra_utils0.ColorType;
   round: boolean;
 }, {}, {}, {}, string, _$vue.ComponentProvideOptions, false, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;

package/dist/components/date-panel/date-panel.vue.d.ts

@@ -11,8 +11,8 @@ declare const __VLS_export: _$vue.DefineComponent<DatePanelProps, {}, {}, {}, {}
   "onSelect:range-date"?: ((rangeDate?: [_$_cat_kit_core0.Dater, _$_cat_kit_core0.Dater] | undefined) => any) | undefined;
   "onSelect:date"?: ((date: _$_cat_kit_core0.Dater) => any) | undefined;
 }>, {
-  size: _$_veltra_utils0.ComponentSize;
   type: "date" | "month" | "year";
+  size: _$_veltra_utils0.ComponentSize;
 }, {}, {}, {}, string, _$vue.ComponentProvideOptions, false, {}, any>;
 declare const _default: typeof __VLS_export;
 //#endregion

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

@@ -7,9 +7,9 @@ declare const __VLS_export: _$vue.DefineComponent<DatePickerProps, {}, {}, {}, {
 }, string, _$vue.PublicProps, Readonly<DatePickerProps> & Readonly<{
   "onUpdate:modelValue"?: ((value?: string | number | Date | undefined) => any) | undefined;
 }>, {
+  type: "date" | "month" | "year";
   disabled: boolean;
   readonly: boolean;
-  type: "date" | "month" | "year";
   placeholder: string;
   clearable: boolean;
 }, {}, {}, {}, string, _$vue.ComponentProvideOptions, false, {}, any>;

package/dist/components/date-range-picker/date-range-picker.vue.d.ts

@@ -7,9 +7,9 @@ declare const __VLS_export: _$vue.DefineComponent<DateRangePickerProps, {}, {},
 }, string, _$vue.PublicProps, Readonly<DateRangePickerProps> & Readonly<{
   "onUpdate:modelValue"?: ((value?: [string, string] | undefined) => any) | undefined;
 }>, {
+  type: "date" | "month" | "year";
   disabled: boolean;
   readonly: boolean;
-  type: "date" | "month" | "year";
   placeholder: [string, string];
   clearable: boolean;
 }, {}, {}, {}, string, _$vue.ComponentProvideOptions, false, {}, any>;

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

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

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

@@ -87,8 +87,8 @@ var FormModel = class {
 	getValidateFields(fields) {
 		if (!fields) if (this.formKeys.size) {
 			let _fields = [];
-			this.formKeys.forEach((fields) => {
-				_fields = _fields.concat(fields);
+			this.formKeys.forEach((keys) => {
+				_fields = _fields.concat(keys);
 			});
 			return _fields;
 		} else return this.allKeys;

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  ModelData,\n  DataSettingConfig,\n  IFormModel,\n  AllKeys,\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, 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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"}
+{"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/input/input.vue.d.ts

@@ -17,20 +17,20 @@ 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;
   "suffix:click": (value?: string | undefined) => any;
   "prefix:click": (value?: string | undefined) => any;
   focus: (value?: string | undefined) => any;
-  clear: () => any;
   blur: (value?: string | undefined) => any;
   "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;
   "onSuffix:click"?: ((value?: string | undefined) => any) | undefined;
   "onPrefix:click"?: ((value?: string | undefined) => any) | undefined;
   onFocus?: ((value?: string | undefined) => any) | undefined;
-  onClear?: (() => any) | undefined;
   onBlur?: ((value?: string | undefined) => any) | undefined;
   "onNative:input"?: ((ev: Event) => any) | undefined;
 }>, {

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

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

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

@@ -4,9 +4,9 @@ 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;
 }, {}, {}, {}, string, _$vue.ComponentProvideOptions, false, {}, any>;

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;
-  change: (value?: number | undefined) => any;
   clear: () => any;
+  change: (value?: number | undefined) => any;
 }, string, _$vue.PublicProps, Readonly<__VLS_PublicProps> & Readonly<{
   "onUpdate:modelValue"?: ((value?: number | undefined) => any) | undefined;
-  onChange?: ((value?: number | undefined) => any) | undefined;
   onClear?: (() => any) | undefined;
+  onChange?: ((value?: number | undefined) => 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/select/select.vue.d.ts

@@ -28,10 +28,10 @@ declare const __VLS_base: _$vue.DefineComponent<__VLS_PublicProps, {}, {}, {}, {
 }>, {
   disabled: boolean;
   readonly: boolean;
-  labelKey: string;
-  valueKey: string;
   placeholder: string;
   clearable: boolean;
+  labelKey: string;
+  valueKey: 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/tabs/tabs-horizontal.vue.d.ts

@@ -23,10 +23,10 @@ declare const __VLS_base: _$vue.DefineComponent<__VLS_PublicProps, {}, {}, {}, {
   onClose?: ((item: TabItem, index: number) => any) | undefined;
   onClick?: ((item: TabItem, index: number) => any) | undefined;
 }>, {
-  block: boolean;
   closable: boolean;
   rounded: boolean;
   position: "top" | "bottom";
+  block: 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/tabs/tabs.vue.d.ts

@@ -18,10 +18,10 @@ declare const __VLS_export: _$vue.DefineComponent<__VLS_PublicProps, {}, {}, {},
   onClose?: ((item: TabItem, index: number) => any) | undefined;
   onClick?: ((item: TabItem, index: number) => any) | undefined;
 }>, {
-  block: boolean;
   closable: boolean;
   rounded: boolean;
   position: "left" | "right" | "top" | "bottom";
+  block: boolean;
   keepAlive: boolean;
 }, {}, {}, {}, string, _$vue.ComponentProvideOptions, false, {}, any>;
 declare const _default: typeof __VLS_export;

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

@@ -11,20 +11,20 @@ declare const __VLS_export: _$vue.DefineComponent<__VLS_PublicProps, {}, {}, {},
   "update:modelValue": (value: string | undefined) => any;
 } & {
   "update:modelValue": (value: string) => any;
+  clear: () => any;
   change: (value: string) => any;
   focus: () => any;
-  clear: () => any;
   blur: () => any;
 }, string, _$vue.PublicProps, Readonly<__VLS_PublicProps> & Readonly<{
   "onUpdate:modelValue"?: ((value: string) => any) | undefined;
+  onClear?: (() => any) | undefined;
   onChange?: ((value: string) => any) | undefined;
   onFocus?: (() => any) | undefined;
-  onClear?: (() => any) | undefined;
   onBlur?: (() => any) | undefined;
 }>, {
+  resize: boolean;
   disabled: boolean;
   readonly: boolean;
-  resize: boolean;
   placeholder: string;
   clearable: boolean;
   autosize: boolean;

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

@@ -14,8 +14,8 @@ declare const __VLS_base: _$vue.DefineComponent<TipProps, {}, {}, {}, {}, _$vue.
   trigger: "hover" | "click";
   contentTag: string;
   visible: boolean;
-  content: string;
   direction: TipDirection;
+  content: string;
   alignment: TipAlign;
 }, {}, {}, {}, string, _$vue.ComponentProvideOptions, false, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;

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

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

package/dist/types/form.d.ts

@@ -25,23 +25,23 @@ type IFormModel<Fields extends Record<string, any> = Record<string, any>> = {
    * 字段键
    */
   readonly allKeys: string[]; /** 需要校验的key */
-  formKeys: Map<number, AllKeys<Fields>[]>; /** 错误 */
-  readonly errors: Map<AllKeys<Fields>, string[] | undefined>;
+  formKeys: Map<number, string[]>; /** 错误 */
+  readonly errors: Map<string, string[] | undefined>;
   /**
    * 字段校验
    * @param fields 字段， 如果不传入时将会使用keyFields来进行校验
    */
-  validate: (fields?: AllKeys<Fields> | AllKeys<Fields>[]) => Promise<boolean>; /** 重置数据 */
-  resetData(fields?: AllKeys<Fields> | AllKeys<Fields>[]): void;
+  validate: (fields?: string | string[]) => Promise<boolean>; /** 重置数据 */
+  resetData(fields?: string | string[]): void;
   /**
    * 设置数据
    * @param formData 表单值
    * @param options 配置
    */
-  setData(formData: Partial<ModelData<Fields>>, config?: DataSettingConfig): void; /** 清除校验 */
+  setData(formData: Partial<Record<string, any>>, config?: DataSettingConfig): void; /** 清除校验 */
   clearValidate(): void; /** 监听值变更 */
-  onChange(cb: (field: AllKeys<Fields>, val: any) => void): void; /** 关闭监听值变更 */
-  offChange(cb: (field: AllKeys<Fields>, val: any) => void): 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 {

package/package.json

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

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

@@ -19,7 +19,7 @@
   </u-layout>
 </template>
 
-<script lang="ts" setup generic="Model extends FormModel">
+<script lang="ts" setup generic="Model extends IFormModel">
 import { bem } from '@veltra/utils'
 import { computed, inject, provide, shallowRef, watch } from 'vue'
 
@@ -27,12 +27,12 @@ import type {
   BatchEditEmits,
   BatchEditFeature,
   BatchEditProps,
+  IFormModel,
   TableColumnSlotsScope,
   TableExposed,
   TableRow
 } from '../../types'
 import { DialogDIKey } from '../dialog/di'
-import type { FormModel } from '../form'
 import { ULayout } from '../layout'
 import BatchEditForm from './batch-edit-form.vue'
 import BatchEditList from './batch-edit-list.vue'

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

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

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

@@ -6,7 +6,6 @@ import type {
   ModelData,
   DataSettingConfig,
   IFormModel,
-  AllKeys,
   FormModelItem,
   FormModelField
 } from '../../types'
@@ -48,12 +47,12 @@ export class FormModel<
    * @description
    * 这个值会在表单组件渲染时由表单设置，因为只有真正渲染的组件才应该被校验
    */
-  formKeys: Map<number, AllKeys<Fields>[]> = new Map()
+  formKeys: Map<number, string[]> = new Map()
 
   /** 初始数据 */
   readonly initialData: ModelData<Fields>
 
-  readonly errors: Map<AllKeys<Fields>, string[] | undefined> = shallowReactive(new Map())
+  readonly errors: Map<string, string[] | undefined> = shallowReactive(new Map())
 
   private validator: Validator<Record<string, FormModelItem>>
 
@@ -119,16 +118,16 @@ export class FormModel<
     this.data = data as ModelData<Fields>
   }
 
-  private getValidateFields(fields?: AllKeys<Fields> | AllKeys<Fields>[]) {
+  private getValidateFields(fields?: string | string[]) {
     if (!fields) {
       if (this.formKeys.size) {
-        let _fields: AllKeys<Fields>[] = []
-        this.formKeys.forEach((fields) => {
-          _fields = _fields.concat(fields)
+        let _fields: string[] = []
+        this.formKeys.forEach((keys) => {
+          _fields = _fields.concat(keys)
         })
         return _fields
       } else {
-        return this.allKeys as AllKeys<Fields>[]
+        return this.allKeys
       }
     }
 
@@ -143,10 +142,10 @@ export class FormModel<
    * @param fields 需要校验的字段, 不传则校验所有字段
    * @returns
    */
-  async validate(fields?: AllKeys<Fields> | AllKeys<Fields>[]): Promise<boolean> {
+  async validate(fields?: string | string[]): Promise<boolean> {
     const { errors, validator, data } = this
 
-    const results = await validator.validate(data, this.getValidateFields(fields) as any)
+    const results = await validator.validate(data, this.getValidateFields(fields))
 
     // 全量校验
     if (!fields) {
@@ -184,12 +183,12 @@ export class FormModel<
    * 重置数据
    * @param fields 需要重置的字段
    */
-  resetData(keys?: AllKeys<Fields> | AllKeys<Fields>[]): void {
+  resetData(keys?: string | string[]): void {
     if (typeof keys === 'string') {
       keys = [keys]
     } else if (Array.isArray(keys)) {
     } else {
-      keys = this.allKeys as AllKeys<Fields>[]
+      keys = this.allKeys
     }
 
     this.clearValidate()
@@ -206,10 +205,7 @@ export class FormModel<
    * @param formData 表单值
    * @param options 配置
    */
-  setData(
-    formData: Partial<ModelData<Fields> & Record<string, any>>,
-    config?: DataSettingConfig
-  ): FormModel<Fields> {
+  setData(formData: Partial<Record<string, any>>, config?: DataSettingConfig): FormModel<Fields> {
     const { validate = true } = config || {}
 
     if (!validate) {
@@ -248,12 +244,12 @@ export class FormModel<
    * 监听值变更
    * @param cb 回调
    */
-  onChange(cb: (field: AllKeys<Fields>, val: any) => void): void {
-    this.modelChangeCallback.add(cb as any)
+  onChange(cb: (field: string, val: any) => void): void {
+    this.modelChangeCallback.add(cb)
   }
 
   /** 关闭监听值变更 */
-  offChange(cb: (field: AllKeys<Fields>, val: any) => void): void {
-    this.modelChangeCallback.delete(cb as any)
+  offChange(cb: (field: string, val: any) => void): void {
+    this.modelChangeCallback.delete(cb)
   }
 }

package/src/types/form.ts

@@ -52,29 +52,29 @@ export type IFormModel<Fields extends Record<string, any> = Record<string, any>>
    */
   readonly allKeys: string[]
   /** 需要校验的key */
-  formKeys: Map<number, AllKeys<Fields>[]>
+  formKeys: Map<number, string[]>
   /** 错误 */
-  readonly errors: Map<AllKeys<Fields>, string[] | undefined>
+  readonly errors: Map<string, string[] | undefined>
   /**
    * 字段校验
    * @param fields 字段， 如果不传入时将会使用keyFields来进行校验
    */
-  validate: (fields?: AllKeys<Fields> | AllKeys<Fields>[]) => Promise<boolean>
+  validate: (fields?: string | string[]) => Promise<boolean>
   /** 重置数据 */
-  resetData(fields?: AllKeys<Fields> | AllKeys<Fields>[]): void
+  resetData(fields?: string | string[]): void
 
   /**
    * 设置数据
    * @param formData 表单值
    * @param options 配置
    */
-  setData(formData: Partial<ModelData<Fields>>, config?: DataSettingConfig): void
+  setData(formData: Partial<Record<string, any>>, config?: DataSettingConfig): void
   /** 清除校验 */
   clearValidate(): void
   /** 监听值变更 */
-  onChange(cb: (field: AllKeys<Fields>, val: any) => void): void
+  onChange(cb: (field: string, val: any) => void): void
   /** 关闭监听值变更 */
-  offChange(cb: (field: AllKeys<Fields>, val: any) => void): void
+  offChange(cb: (field: string, val: any) => void): void
 }
 
 /** 表单组件属性 */