@veltra/desktop 1.1.24 → 1.1.26

package/src/components/watermark/watermark.vue

@@ -15,23 +15,14 @@ import { onBeforeUnmount, onMounted, reactive, useTemplateRef } from 'vue'
 
 import type { WatermarkProps, WatermarkEmits } from '../../types'
 
-defineOptions({
-  name: 'Watermark'
-})
+defineOptions({ name: 'Watermark' })
 const cls = bem('watermark')
-const props = withDefaults(defineProps<WatermarkProps>(), {
-  route: -30,
-  fontSize: 60
-})
+const props = withDefaults(defineProps<WatermarkProps>(), { route: -30, fontSize: 60 })
 defineEmits<WatermarkEmits>()
 
 const watermarkRef = useTemplateRef('watermark')
 
-const styles = reactive({
-  fontColor: 'rgba(0,0,0,.1)',
-  fontFamily: 'Arial',
-  image: props.image
-})
+const styles = reactive({ fontColor: 'rgba(0,0,0,.1)', fontFamily: 'Arial', image: props.image })
 
 const setWatermark = debounce(async () => {
   const str = props.text
@@ -69,9 +60,7 @@ const setWatermark = debounce(async () => {
   // 编制文字
   ctx.fillText(str, 0, (textWidth - props.fontSize) / 2)
 
-  setStyles(container, {
-    background: `url(${canvas.toDataURL('image/png')}) repeat`
-  })
+  setStyles(container, { background: `url(${canvas.toDataURL('image/png')}) repeat` })
 
   ctx.clearRect(0, 0, canvas.width, canvas.height)
   canvas = null

package/src/types/form.ts

@@ -1,15 +1,35 @@
 import type { ComponentProps, DeconstructValue, ValidateRule } from '@veltra/utils'
 import type { ShallowRef } from 'vue'
 
+import type { NestedFieldMarker } from '../components/form/helper'
+
 export interface FormModelItem<Val = any> extends ValidateRule {
   /** 模型值 */
   value?: Val
 }
 
-export type ModelData<Fields extends Record<string, FormModelItem>> = {
-  [key in keyof Fields]: Fields[key]['value'] extends () => infer T ? T : Fields[key]['value']
+export type FormModelField = FormModelItem | NestedFieldMarker
+
+// 最终暴露的 ModelData 类型
+export type ModelData<Fields extends Record<string, any>> = {
+  [key in keyof Fields]: Fields[key] extends NestedFieldMarker<infer SubFields>
+    ? ModelData<SubFields>
+    : Fields[key] extends FormModelItem
+      ? Fields[key]['value'] extends () => infer T
+        ? T
+        : Fields[key]['value']
+      : never
 }
 
+// 获取所有的扁平路径 Union（如 'name' | 'contact.email'）
+export type AllKeys<Fields extends Record<string, any>> = {
+  [K in keyof Fields]: K extends string
+    ? Fields[K] extends NestedFieldMarker<infer SubFields>
+      ? `${K}.${AllKeys<SubFields>}`
+      : K
+    : never
+}[keyof Fields]
+
 export type ModelRules<Fields extends Record<string, FormModelItem>> = {
   [key in keyof Fields]: Omit<Fields[key], 'value'>
 }
@@ -22,9 +42,7 @@ export interface DataSettingConfig {
   validate?: boolean
 }
 
-export type IFormModel<
-  Fields extends Record<string, FormModelItem> = Record<string, FormModelItem>
-> = {
+export type IFormModel<Fields extends Record<string, any> = Record<string, any>> = {
   /** 表单数据 */
   readonly data: ModelData<Fields>
   /** 字段校验规则 */
@@ -34,16 +52,16 @@ export type IFormModel<
    */
   readonly allKeys: string[]
   /** 需要校验的key */
-  formKeys: Map<number, (keyof Fields)[]>
+  formKeys: Map<number, AllKeys<Fields>[]>
   /** 错误 */
-  readonly errors: Map<keyof Fields, string[] | undefined>
+  readonly errors: Map<AllKeys<Fields>, string[] | undefined>
   /**
    * 字段校验
    * @param fields 字段， 如果不传入时将会使用keyFields来进行校验
    */
-  validate: (fields?: keyof Fields | (keyof Fields)[]) => Promise<boolean>
+  validate: (fields?: AllKeys<Fields> | AllKeys<Fields>[]) => Promise<boolean>
   /** 重置数据 */
-  resetData(fields?: keyof Fields | (keyof Fields)[]): void
+  resetData(fields?: AllKeys<Fields> | AllKeys<Fields>[]): void
 
   /**
    * 设置数据
@@ -54,9 +72,9 @@ export type IFormModel<
   /** 清除校验 */
   clearValidate(): void
   /** 监听值变更 */
-  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
 }
 
 /** 表单组件属性 */