@piying/view-vue 1.10.4 → 2.0.0

package/component/wrapper.vue.d.ts

@@ -1,6 +1,6 @@
-import type { CoreResolvedWrapperConfig } from '@piying/view-core';
+import type { CoreWrapperConfig } from '@piying/view-core';
 type __VLS_Props = {
-    wrappers: CoreResolvedWrapperConfig[];
+    wrappers: CoreWrapperConfig[];
 };
 declare var __VLS_9: {}, __VLS_11: {};
 type __VLS_Slots = {} & {

package/const.d.ts

@@ -1,10 +1 @@
 export declare const EMPTY_ARRAY: never[];
-export declare const NG_CONFIG_DEFAULT_MERGE_STRAGEGY: {
-    directives: string;
-    formConfig: string;
-    inputs: string;
-    outputs: string;
-    props: string;
-    renderConfig: string;
-    wrappers: string;
-};

package/index.js

@@ -41,8 +41,8 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
       return { ...(_a = wrapper.value) == null ? void 0 : _a.inputs(), ...(_b = wrapper.value) == null ? void 0 : _b.attributes() };
     });
     const outputs = computed(() => {
-      var _a;
-      return ((_a = wrapper.value) == null ? void 0 : _a.outputs) ?? {};
+      var _a, _b;
+      return ((_b = (_a = wrapper.value) == null ? void 0 : _a.outputs) == null ? void 0 : _b.call(_a)) ?? {};
     });
     return (_ctx, _cache) => {
       return wrapper.value ? (openBlock(), createBlock(resolveDynamicComponent(wrapper.value.type), mergeProps({ key: 0 }, unref(inputs), toHandlers(outputs.value)), {

package/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../packages/vue/src/vue-schema.ts","../../packages/vue/src/builder.ts","../../packages/vue/src/token.ts","../../packages/vue/src/util/signal-convert.ts","../../packages/vue/src/component/wrapper.vue","../../packages/vue/src/component/field-template.vue","../../packages/vue/src/component/piying-view.vue","../../packages/vue/src/util/use-control-value-accessor.ts","../../packages/vue/src/component/group.vue"],"sourcesContent":["import { CoreSchemaHandle } from '@piying/view-core';\nimport type { PiResolvedViewFieldConfig } from './type/group';\n\nexport class VueSchemaHandle extends CoreSchemaHandle<\n  VueSchemaHandle,\n  () => PiResolvedViewFieldConfig\n> {\n  declare type?: any;\n}\n","import { FormBuilder } from '@piying/view-core';\nimport type { VueSchemaHandle } from './vue-schema';\n\nexport class VueFormBuilder extends FormBuilder<VueSchemaHandle> {}\n","import type { Injector } from 'static-injector';\nimport type { ComputedRef, InjectionKey } from 'vue';\nimport type { PiResolvedViewFieldConfig } from './type/group';\n\nexport const InjectorToken: InjectionKey<Injector> = Symbol();\nexport const PI_VIEW_FIELD_TOKEN: InjectionKey<ComputedRef<PiResolvedViewFieldConfig>> = Symbol();\n","import { effect } from 'static-injector';\nimport { shallowRef, watchEffect, inject as vInject } from 'vue';\nimport { InjectorToken } from '../token';\n\n// signal=>ref\nexport function signalToRef<T>(value: () => T | undefined) {\n  const injector = vInject(InjectorToken)!;\n\n  const dataRef = shallowRef<T>(undefined as any);\n  watchEffect((onWatcherCleanup) => {\n    dataRef.value = value();\n    const ref = effect(\n      () => {\n        const currentValue = value();\n        if (!Object.is(dataRef.value, currentValue)) {\n          dataRef.value = currentValue;\n        }\n      },\n      { injector: injector },\n    );\n    onWatcherCleanup(() => {\n      ref.destroy();\n    });\n  });\n  return dataRef;\n}\n","<script setup lang=\"ts\">\nimport { computed } from 'vue';\nimport SelfComponent from './wrapper.vue';\nimport type { CoreResolvedWrapperConfig } from '@piying/view-core';\nimport { signalToRef } from '../util/signal-convert';\n\nconst dInputs = defineProps<{\n  wrappers: CoreResolvedWrapperConfig[];\n}>();\nconst restWrappers = computed(() => dInputs.wrappers!.slice(1));\nconst wrapper = computed(() => dInputs.wrappers[0]);\nconst inputs = signalToRef(() => ({ ...wrapper.value?.inputs(), ...wrapper.value?.attributes() }));\nconst outputs = computed(() => wrapper.value?.outputs ?? {});\n</script>\n\n<template>\n  <template v-if=\"wrapper\">\n    <component :is=\"wrapper.type\" v-bind=\"inputs\" v-on=\"outputs\">\n      <self-component v-bind=\"{ wrappers: restWrappers }\">\n        <slot></slot>\n      </self-component>\n    </component>\n  </template>\n  <template v-else>\n    <slot></slot>\n  </template>\n</template>\n\n<style scoped></style>\n","<script setup lang=\"ts\">\nimport {\n  computed,\n  defineAsyncComponent,\n  onUnmounted,\n  provide,\n  ref,\n  inject as vInject,\n  watch,\n} from 'vue';\nimport type { PiResolvedViewFieldConfig } from '../type/group';\nimport { signalToRef } from '../util/signal-convert';\nimport { PI_VIEW_FIELD_TOKEN, InjectorToken } from '../token';\nimport PiWrapper from './wrapper.vue';\nimport {\n  createViewControlLink,\n  getLazyImport,\n  isFieldControl,\n  isLazyMark,\n} from '@piying/view-core';\nconst props = defineProps<{\n  field: PiResolvedViewFieldConfig;\n}>();\nconst injector = vInject(InjectorToken)!;\n\nconst inputs = signalToRef(() => props.field.inputs());\nconst outputs = signalToRef(() => props.field.outputs());\nconst renderConfig = signalToRef(() => props.field.renderConfig());\n\nconst attributes = signalToRef(() => props.field.attributes());\nconst fieldInput = computed(() => ({ ...attributes.value, ...inputs.value }));\nconst fieldChildren = signalToRef(() => props.field.children?.());\n\nconst wrappers = signalToRef(() => props.field.wrappers());\nconst define = signalToRef(() => props.field.define?.());\nconst componentType = computed(() =>\n  typeof define.value?.type === 'function' || isLazyMark(define.value?.type)\n    ? defineAsyncComponent(getLazyImport<any>(define.value?.type))\n    : define.value?.type,\n);\nconst field = computed(() => props.field);\nprovide(PI_VIEW_FIELD_TOKEN, field);\n// 使用cva\nconst childRef = ref<any>(null);\nconst isControl = isFieldControl(field.value.form.control);\nlet dispose: ((destroy?: boolean) => void) | undefined;\n\nwatch(\n  [childRef, field],\n  ([childRef, field]) => {\n    dispose?.();\n    if (isControl && childRef) {\n      dispose = createViewControlLink((() => field.form.control) as any, childRef['cva'], injector);\n    }\n  },\n  { immediate: true },\n);\nonUnmounted(() => {\n  dispose?.(true);\n  dispose = undefined;\n});\n</script>\n\n<template>\n  <template v-if=\"!renderConfig!.hidden\">\n    <template v-if=\"define?.type\">\n      <pi-wrapper v-bind:wrappers=\"wrappers!\">\n        <!-- group -->\n        <template v-if=\"fieldChildren\">\n          <component :is=\"componentType\" v-bind=\"fieldInput\" v-on=\"outputs\"></component>\n        </template>\n        <!-- control -->\n        <template v-else>\n          <template v-if=\"field.form.control\">\n            <component\n              :is=\"componentType\"\n              v-bind=\"fieldInput\"\n              v-on=\"outputs\"\n              ref=\"childRef\"\n            ></component>\n          </template>\n          <template v-else>\n            <component :is=\"componentType\" v-bind=\"fieldInput\" v-on=\"outputs\"></component>\n          </template>\n        </template>\n      </pi-wrapper>\n    </template>\n  </template>\n</template>\n\n<style scoped></style>\n","<script setup lang=\"ts\">\nimport * as v from 'valibot';\nimport { convert } from '@piying/view-core';\nimport { computed, onUnmounted, provide, watch } from 'vue';\nimport {\n  ChangeDetectionScheduler,\n  ChangeDetectionSchedulerImpl,\n  createInjector,\n  createRootInjector,\n  DestroyRef,\n  untracked,\n  type EffectRef,\n} from 'static-injector';\nimport { VueSchemaHandle } from '../vue-schema';\nimport { VueFormBuilder } from '../builder';\nimport { InjectorToken } from '../token';\nimport FieldTemplate from './field-template.vue';\nimport type { Injector } from 'static-injector';\nimport { initListen } from '@piying/view-core';\nconst dProps = defineProps<{\n  schema: v.BaseSchema<any, any, any> | v.SchemaWithPipe<any>;\n  modelValue?: any;\n  options: any;\n}>();\n\nconst emit = defineEmits(['update:modelValue']);\nconst rootInjector = createRootInjector({\n  providers: [\n    {\n      provide: ChangeDetectionScheduler,\n      useClass: ChangeDetectionSchedulerImpl,\n    },\n  ],\n});\nprovide(InjectorToken, rootInjector);\n\nlet injectorDispose: (() => any) | undefined;\nconst initResult = computed(() => {\n  injectorDispose?.();\n  const subInjector = createInjector({ providers: [], parent: rootInjector });\n  injectorDispose = () => {\n    subInjector.destroy();\n    injectorDispose = undefined;\n  };\n  const field = convert(dProps.schema as any, {\n    handle: VueSchemaHandle as any,\n    builder: VueFormBuilder,\n    injector: subInjector,\n    registerOnDestroy: (fn) => {\n      subInjector!.get(DestroyRef).onDestroy(() => {\n        fn();\n      });\n    },\n    ...dProps.options,\n  });\n  return [field, subInjector] as const;\n});\nonUnmounted(() => {\n  injectorDispose?.();\n});\nconst field = computed(() => initResult.value[0]);\n\nwatch(\n  () => [initResult.value, dProps.modelValue],\n  ([[field, subInjector], modelValue], _1, onWatcherCleanup) => {\n    let ref: EffectRef | undefined;\n    if (field.form.control) {\n      ref = initListen(modelValue, field!.form.control!, subInjector as Injector, (value) => {\n        untracked(() => {\n          if (field!.form.control?.valueNoError$$()) {\n            emit('update:modelValue', value);\n          }\n        });\n      });\n      field!.form.control!.updateValue(dProps.modelValue);\n    }\n    onWatcherCleanup(() => {\n      ref?.destroy();\n    });\n  },\n  { immediate: true },\n);\n</script>\n\n<template>\n  <field-template :field=\"field!\"></field-template>\n</template>\n\n<style scoped></style>\n","import type { ControlValueAccessor } from '@piying/view-core';\nimport { ref } from 'vue';\n\nexport function useControlValueAccessor() {\n  const value = ref();\n  const disabled = ref(false);\n  let onChange: (input: any) => void;\n  let touched: () => void;\n  const instance: ControlValueAccessor = {\n    writeValue(obj) {\n      value.value = obj;\n    },\n    registerOnChange(fn) {\n      onChange = fn;\n    },\n    registerOnTouched(fn) {\n      touched = fn;\n    },\n    setDisabledState(value) {\n      disabled.value = value;\n    },\n  };\n  return {\n    cva: instance,\n    cvaa: {\n      value: value,\n      disabled: disabled,\n      valueChange: (input: any) => {\n        onChange(input);\n        value.value = input;\n      },\n      touchedChange: () => {\n        touched();\n      },\n    },\n  };\n}\n","<script setup lang=\"ts\">\nimport FieldTemplate from './field-template.vue';\nimport { inject } from 'vue';\nimport { PI_VIEW_FIELD_TOKEN } from '../token';\nimport { signalToRef } from '../util';\n\nconst field = inject(PI_VIEW_FIELD_TOKEN)!;\nconst children = signalToRef(() => field?.value.children!());\n</script>\n\n<template>\n  <template v-for=\"(field, index) in children\" :key=\"index\">\n    <field-template :field=\"field!\"></field-template>\n  </template>\n</template>\n\n<style scoped></style>\n"],"names":["vInject","ref","childRef","field","value"],"mappings":"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"}
+{"version":3,"file":"index.js","sources":["../../packages/vue/src/vue-schema.ts","../../packages/vue/src/builder.ts","../../packages/vue/src/token.ts","../../packages/vue/src/util/signal-convert.ts","../../packages/vue/src/component/wrapper.vue","../../packages/vue/src/component/field-template.vue","../../packages/vue/src/component/piying-view.vue","../../packages/vue/src/util/use-control-value-accessor.ts","../../packages/vue/src/component/group.vue"],"sourcesContent":["import { CoreSchemaHandle } from '@piying/view-core';\nimport type { PiResolvedViewFieldConfig } from './type/group';\n\nexport class VueSchemaHandle extends CoreSchemaHandle<\n  VueSchemaHandle,\n  () => PiResolvedViewFieldConfig\n> {\n  declare type?: any;\n}\n","import { FormBuilder } from '@piying/view-core';\nimport type { VueSchemaHandle } from './vue-schema';\n\nexport class VueFormBuilder extends FormBuilder<VueSchemaHandle> {}\n","import type { Injector } from 'static-injector';\nimport type { ComputedRef, InjectionKey } from 'vue';\nimport type { PiResolvedViewFieldConfig } from './type/group';\n\nexport const InjectorToken: InjectionKey<Injector> = Symbol();\nexport const PI_VIEW_FIELD_TOKEN: InjectionKey<ComputedRef<PiResolvedViewFieldConfig>> = Symbol();\n","import { effect } from 'static-injector';\nimport { shallowRef, watchEffect, inject as vInject } from 'vue';\nimport { InjectorToken } from '../token';\n\n// signal=>ref\nexport function signalToRef<T>(value: () => T | undefined) {\n  const injector = vInject(InjectorToken)!;\n\n  const dataRef = shallowRef<T>(undefined as any);\n  watchEffect((onWatcherCleanup) => {\n    dataRef.value = value();\n    const ref = effect(\n      () => {\n        const currentValue = value();\n        if (!Object.is(dataRef.value, currentValue)) {\n          dataRef.value = currentValue;\n        }\n      },\n      { injector: injector },\n    );\n    onWatcherCleanup(() => {\n      ref.destroy();\n    });\n  });\n  return dataRef;\n}\n","<script setup lang=\"ts\">\nimport { computed } from 'vue';\nimport SelfComponent from './wrapper.vue';\nimport type { CoreWrapperConfig } from '@piying/view-core';\nimport { signalToRef } from '../util/signal-convert';\n\nconst dInputs = defineProps<{\n  wrappers: CoreWrapperConfig[];\n}>();\nconst restWrappers = computed(() => dInputs.wrappers!.slice(1));\nconst wrapper = computed(() => dInputs.wrappers[0]);\nconst inputs = signalToRef(() => ({ ...wrapper.value?.inputs(), ...wrapper.value?.attributes() }));\nconst outputs = computed(() => wrapper.value?.outputs?.() ?? {});\n</script>\n\n<template>\n  <template v-if=\"wrapper\">\n    <component :is=\"wrapper.type\" v-bind=\"inputs\" v-on=\"outputs\">\n      <self-component v-bind=\"{ wrappers: restWrappers }\">\n        <slot></slot>\n      </self-component>\n    </component>\n  </template>\n  <template v-else>\n    <slot></slot>\n  </template>\n</template>\n\n<style scoped></style>\n","<script setup lang=\"ts\">\nimport {\n  computed,\n  defineAsyncComponent,\n  onUnmounted,\n  provide,\n  ref,\n  inject as vInject,\n  watch,\n} from 'vue';\nimport type { PiResolvedViewFieldConfig } from '../type/group';\nimport { signalToRef } from '../util/signal-convert';\nimport { PI_VIEW_FIELD_TOKEN, InjectorToken } from '../token';\nimport PiWrapper from './wrapper.vue';\nimport {\n  createViewControlLink,\n  getLazyImport,\n  isFieldControl,\n  isLazyMark,\n} from '@piying/view-core';\nconst props = defineProps<{\n  field: PiResolvedViewFieldConfig;\n}>();\nconst injector = vInject(InjectorToken)!;\n\nconst inputs = signalToRef(() => props.field.inputs());\nconst outputs = signalToRef(() => props.field.outputs());\nconst renderConfig = signalToRef(() => props.field.renderConfig());\n\nconst attributes = signalToRef(() => props.field.attributes());\nconst fieldInput = computed(() => ({ ...attributes.value, ...inputs.value }));\nconst fieldChildren = signalToRef(() => props.field.children?.());\n\nconst wrappers = signalToRef(() => props.field.wrappers());\nconst define = signalToRef(() => props.field.define?.());\nconst componentType = computed(() =>\n  typeof define.value?.type === 'function' || isLazyMark(define.value?.type)\n    ? defineAsyncComponent(getLazyImport<any>(define.value?.type))\n    : define.value?.type,\n);\nconst field = computed(() => props.field);\nprovide(PI_VIEW_FIELD_TOKEN, field);\n// 使用cva\nconst childRef = ref<any>(null);\nconst isControl = isFieldControl(field.value.form.control);\nlet dispose: ((destroy?: boolean) => void) | undefined;\n\nwatch(\n  [childRef, field],\n  ([childRef, field]) => {\n    dispose?.();\n    if (isControl && childRef) {\n      dispose = createViewControlLink((() => field.form.control) as any, childRef['cva'], injector);\n    }\n  },\n  { immediate: true },\n);\nonUnmounted(() => {\n  dispose?.(true);\n  dispose = undefined;\n});\n</script>\n\n<template>\n  <template v-if=\"!renderConfig!.hidden\">\n    <template v-if=\"define?.type\">\n      <pi-wrapper v-bind:wrappers=\"wrappers!\">\n        <!-- group -->\n        <template v-if=\"fieldChildren\">\n          <component :is=\"componentType\" v-bind=\"fieldInput\" v-on=\"outputs\"></component>\n        </template>\n        <!-- control -->\n        <template v-else>\n          <template v-if=\"field.form.control\">\n            <component\n              :is=\"componentType\"\n              v-bind=\"fieldInput\"\n              v-on=\"outputs\"\n              ref=\"childRef\"\n            ></component>\n          </template>\n          <template v-else>\n            <component :is=\"componentType\" v-bind=\"fieldInput\" v-on=\"outputs\"></component>\n          </template>\n        </template>\n      </pi-wrapper>\n    </template>\n  </template>\n</template>\n\n<style scoped></style>\n","<script setup lang=\"ts\">\nimport * as v from 'valibot';\nimport { convert } from '@piying/view-core';\nimport { computed, onUnmounted, provide, watch } from 'vue';\nimport {\n  ChangeDetectionScheduler,\n  ChangeDetectionSchedulerImpl,\n  createInjector,\n  createRootInjector,\n  DestroyRef,\n  untracked,\n  type EffectRef,\n} from 'static-injector';\nimport { VueSchemaHandle } from '../vue-schema';\nimport { VueFormBuilder } from '../builder';\nimport { InjectorToken } from '../token';\nimport FieldTemplate from './field-template.vue';\nimport type { Injector } from 'static-injector';\nimport { initListen } from '@piying/view-core';\nconst dProps = defineProps<{\n  schema: v.BaseSchema<any, any, any> | v.SchemaWithPipe<any>;\n  modelValue?: any;\n  options: any;\n}>();\n\nconst emit = defineEmits(['update:modelValue']);\nconst rootInjector = createRootInjector({\n  providers: [\n    {\n      provide: ChangeDetectionScheduler,\n      useClass: ChangeDetectionSchedulerImpl,\n    },\n  ],\n});\nprovide(InjectorToken, rootInjector);\n\nlet injectorDispose: (() => any) | undefined;\nconst initResult = computed(() => {\n  injectorDispose?.();\n  const subInjector = createInjector({ providers: [], parent: rootInjector });\n  injectorDispose = () => {\n    subInjector.destroy();\n    injectorDispose = undefined;\n  };\n  const field = convert(dProps.schema as any, {\n    handle: VueSchemaHandle as any,\n    builder: VueFormBuilder,\n    injector: subInjector,\n    registerOnDestroy: (fn) => {\n      subInjector!.get(DestroyRef).onDestroy(() => {\n        fn();\n      });\n    },\n    ...dProps.options,\n  });\n  return [field, subInjector] as const;\n});\nonUnmounted(() => {\n  injectorDispose?.();\n});\nconst field = computed(() => initResult.value[0]);\n\nwatch(\n  () => [initResult.value, dProps.modelValue],\n  ([[field, subInjector], modelValue], _1, onWatcherCleanup) => {\n    let ref: EffectRef | undefined;\n    if (field.form.control) {\n      ref = initListen(modelValue, field!.form.control!, subInjector as Injector, (value) => {\n        untracked(() => {\n          if (field!.form.control?.valueNoError$$()) {\n            emit('update:modelValue', value);\n          }\n        });\n      });\n      field!.form.control!.updateValue(dProps.modelValue);\n    }\n    onWatcherCleanup(() => {\n      ref?.destroy();\n    });\n  },\n  { immediate: true },\n);\n</script>\n\n<template>\n  <field-template :field=\"field!\"></field-template>\n</template>\n\n<style scoped></style>\n","import type { ControlValueAccessor } from '@piying/view-core';\nimport { ref } from 'vue';\n\nexport function useControlValueAccessor() {\n  const value = ref();\n  const disabled = ref(false);\n  let onChange: (input: any) => void;\n  let touched: () => void;\n  const instance: ControlValueAccessor = {\n    writeValue(obj) {\n      value.value = obj;\n    },\n    registerOnChange(fn) {\n      onChange = fn;\n    },\n    registerOnTouched(fn) {\n      touched = fn;\n    },\n    setDisabledState(value) {\n      disabled.value = value;\n    },\n  };\n  return {\n    cva: instance,\n    cvaa: {\n      value: value,\n      disabled: disabled,\n      valueChange: (input: any) => {\n        onChange(input);\n        value.value = input;\n      },\n      touchedChange: () => {\n        touched();\n      },\n    },\n  };\n}\n","<script setup lang=\"ts\">\nimport FieldTemplate from './field-template.vue';\nimport { inject } from 'vue';\nimport { PI_VIEW_FIELD_TOKEN } from '../token';\nimport { signalToRef } from '../util';\n\nconst field = inject(PI_VIEW_FIELD_TOKEN)!;\nconst children = signalToRef(() => field?.value.children!());\n</script>\n\n<template>\n  <template v-for=\"(field, index) in children\" :key=\"index\">\n    <field-template :field=\"field!\"></field-template>\n  </template>\n</template>\n\n<style scoped></style>\n"],"names":["vInject","ref","childRef","field","value"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@piying/view-vue",
-    "version": "1.10.4",
+    "version": "2.0.0",
     "description": "Piying view For Vue;Valibot to Component",
     "type": "module",
     "homepage": "https://piying-org.github.io/website/docs/client/intro",
@@ -36,7 +36,7 @@
     ],
     "license": "MIT",
     "dependencies": {
-        "@piying/view-core": "^1.10.4",
+        "@piying/view-core": "^2.0.0",
         "static-injector": "^6.1.2"
     },
     "sideEffects": false,

package/type/group.d.ts

@@ -1,37 +1,7 @@
-import type { VueSchemaHandle } from '../vue-schema';
-import type { ConfigMergeStrategy, CoreResolvedComponentDefine, PiResolvedCommonViewFieldConfig } from '@piying/view-core';
-import type { SetOptional } from '@piying/view-core';
-export interface RawDirectiveOutputs {
-    [name: string]: (event: any, field: PiResolvedViewFieldConfig) => void;
-}
-export type RawWrapperDefine = {
-    inputs?: Record<string, any>;
-    type: string;
-};
-export type ResolvedrapperDefine = {
-    inputs?: Record<string, any>;
-    type: any;
-};
-export interface RawComponentDefine {
-    type: string;
-}
+import type { CoreResolvedComponentDefine, LazyMarkType, PiCommonConfig, PiResolvedCommonViewFieldConfig } from '@piying/view-core';
 export interface ComponentFieldConfig {
     type?: string;
 }
 export type ResolvedComponentFieldConfig = Omit<ComponentFieldConfig, 'inputs' | 'outputs' | 'directives' | 'wrappers'>;
-export type PiDefaultRawViewFieldConfig = Pick<VueSchemaHandle, 'inputs' | 'outputs' | 'wrappers' | 'formConfig' | 'renderConfig' | 'props'>;
 export type PiResolvedViewFieldConfig = PiResolvedCommonViewFieldConfig<() => PiResolvedViewFieldConfig, CoreResolvedComponentDefine> & ResolvedComponentFieldConfig;
-export type PiComponentDefaultConfig = {
-    type: any | (() => Promise<any>);
-} & Omit<SetOptional<PiDefaultRawViewFieldConfig, 'formConfig'>, 'type'>;
-export interface PiViewConfig {
-    types?: Record<string, PiComponentDefaultConfig>;
-    wrappers?: Record<string, {
-        type: any | (() => Promise<any>);
-        inputs?: Record<string, any>;
-    }>;
-    defaultConfig?: PiDefaultRawViewFieldConfig;
-    /** merge 数组/对象会合并 replace 优先自身/组件/全局 */
-    defaultConfigMergeStrategy?: ConfigMergeStrategy | ConfigMergeStrategyObject;
-}
-export type ConfigMergeStrategyObject = Record<keyof PiDefaultRawViewFieldConfig, ConfigMergeStrategy>;
+export type PiViewConfig = PiCommonConfig<any | (() => Promise<any>) | LazyMarkType<any>, any | (() => Promise<any>) | LazyMarkType<any>>;