@piying/view-vue 1.1.0 → 1.1.2

package/formly/builder.d.ts

@@ -1,6 +1,4 @@
 import { FormBuilder } from '@piying/view-core';
-import type { PiResolvedFormlyFieldConfig } from './type/group';
 import type { VueSchemaHandle } from './vue-schema';
 export declare class VueFormBuilder extends FormBuilder<VueSchemaHandle> {
-    afterResolveConfig(rawConfig: VueSchemaHandle, config: PiResolvedFormlyFieldConfig): PiResolvedFormlyFieldConfig;
 }

package/formly/component/group.vue.d.ts

@@ -1,6 +1,6 @@
-import type { PiResolvedFormlyFieldConfig } from '../type/group';
+import type { PiResolvedViewFieldConfig } from '../type/group';
 type __VLS_Props = {
-    fields: PiResolvedFormlyFieldConfig[];
+    fields: PiResolvedViewFieldConfig[];
 };
 declare const _default: import("vue").DefineComponent<__VLS_TypePropsToOption<__VLS_Props>, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<__VLS_TypePropsToOption<__VLS_Props>>>, {}, {}>;
 export default _default;

package/formly/field-template.vue.d.ts

@@ -1,6 +1,6 @@
-import type { PiResolvedFormlyFieldConfig } from './type/group';
+import type { PiResolvedViewFieldConfig } from './type/group';
 type __VLS_Props = {
-    field: PiResolvedFormlyFieldConfig;
+    field: PiResolvedViewFieldConfig;
 };
 declare const _default: import("vue").DefineComponent<__VLS_TypePropsToOption<__VLS_Props>, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<__VLS_TypePropsToOption<__VLS_Props>>>, {}, {}>;
 export default _default;

package/formly/token.d.ts

@@ -1,5 +1,5 @@
 import type { Injector } from 'static-injector';
 import type { ComputedRef, InjectionKey } from 'vue';
-import type { PiResolvedFormlyFieldConfig } from './type/group';
+import type { PiResolvedViewFieldConfig } from './type/group';
 export declare const InjectorToken: InjectionKey<Injector>;
-export declare const FieldToken: InjectionKey<ComputedRef<PiResolvedFormlyFieldConfig>>;
+export declare const FieldToken: InjectionKey<ComputedRef<PiResolvedViewFieldConfig>>;

package/formly/type/group.d.ts

@@ -2,7 +2,7 @@ import type { ConfigMergeStrategyObject, 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: PiResolvedFormlyFieldConfig) => void;
+    [name: string]: (event: any, field: PiResolvedViewFieldConfig) => void;
 }
 export type RawWrapperDefine = {
     inputs?: Record<string, any>;
@@ -20,21 +20,21 @@ export interface ComponentFieldConfig {
     contents?: any[];
 }
 export type ResolvedComponentFieldConfig = Omit<ComponentFieldConfig, 'inputs' | 'outputs' | 'directives' | 'wrappers'>;
-export type PiDefaultRawFormlyFieldConfig = Pick<VueSchemaHandle, 'inputs' | 'outputs' | 'wrappers' | 'formConfig' | 'renderConfig' | 'props'>;
-export type PiResolvedFormlyFieldConfig = PiResolvedCommonViewFieldConfig<() => PiResolvedFormlyFieldConfig, CoreResolvedComponentDefine> & ResolvedComponentFieldConfig & {
+export type PiDefaultRawViewFieldConfig = Pick<VueSchemaHandle, 'inputs' | 'outputs' | 'wrappers' | 'formConfig' | 'renderConfig' | 'props'>;
+export type PiResolvedViewFieldConfig = PiResolvedCommonViewFieldConfig<() => PiResolvedViewFieldConfig, CoreResolvedComponentDefine> & ResolvedComponentFieldConfig & {
     /** 除了无component的控件,其他情况下都应该有define,group/array会赋值默认 */
     define?: RawComponentDefine;
 };
 export type PiComponentDefaultConfig = {
     type: any | (() => Promise<any>);
-} & Omit<SetOptional<PiDefaultRawFormlyFieldConfig, 'formConfig'>, 'type'>;
-export interface PiFormlyConfig {
+} & Omit<SetOptional<PiDefaultRawViewFieldConfig, 'formConfig'>, 'type'>;
+export interface PiViewConfig {
     types?: Record<string, PiComponentDefaultConfig>;
     wrappers?: Record<string, {
         type: any | (() => Promise<any>);
         inputs?: Record<string, any>;
     }>;
-    defaultConfig?: PiDefaultRawFormlyFieldConfig;
+    defaultConfig?: PiDefaultRawViewFieldConfig;
     /** merge 数组/对象会合并 replace 优先自身/组件/全局 */
     defaultConfigMergeStrategy?: ConfigMergeStrategy | ConfigMergeStrategyObject;
 }

package/formly/util/index.d.ts

@@ -0,0 +1,3 @@
+export * from './init-listen';
+export * from './signal-convert';
+export * from './use-control-value-accessor';

package/formly/util/signal-convert.d.ts

@@ -1,5 +1 @@
-import { type Injector, type Signal } from 'static-injector';
-import type { UnWrapSignal } from '@piying/view-core';
-import { type ShallowRef } from 'vue';
-export declare function useSignalConvert<T>(value: Signal<T> | undefined, injector: Injector): T extends undefined ? ShallowRef<undefined> : ShallowRef<UnWrapSignal<T>>;
-export declare function watchChange<T>(value: () => T | undefined, injector: Injector): import("vue").Ref<any> extends T ? T extends T & import("vue").Ref<any> ? import("@vue/shared").IfAny<T, ShallowRef<T>, T> : ShallowRef<T> : ShallowRef<T>;
+export declare function watchChange<T>(value: () => T | undefined): import("vue").Ref<any> extends T ? T extends T & import("vue").Ref<any> ? import("@vue/shared").IfAny<T, import("vue").ShallowRef<T>, T> : import("vue").ShallowRef<T> : import("vue").ShallowRef<T>;

package/formly/util/use-control-value-accessor.d.ts

@@ -0,0 +1,8 @@
+import type { ControlValueAccessor } from '@piying/view-core';
+export declare function useControlValueAccessor(): {
+    cva: ControlValueAccessor;
+    value: import("vue").Ref<any>;
+    disabled: import("vue").Ref<boolean>;
+    valueChange: (value: any) => void;
+    touchedChange: () => void;
+};

package/formly/vue-schema.d.ts

@@ -1,6 +1,6 @@
 import { CoreSchemaHandle, type ConfigMergeStrategy } from '@piying/view-core';
-import type { PiResolvedFormlyFieldConfig } from './type/group';
-export declare class VueSchemaHandle extends CoreSchemaHandle<VueSchemaHandle, () => PiResolvedFormlyFieldConfig> {
+import type { PiResolvedViewFieldConfig } from './type/group';
+export declare class VueSchemaHandle extends CoreSchemaHandle<VueSchemaHandle, () => PiResolvedViewFieldConfig> {
     type?: any;
     contents?: any[];
 }

package/index.d.ts

@@ -1,3 +1,9 @@
 import PiyingView from './formly/piying-view.vue';
 export { PiyingView };
 export * from '@piying/view-core';
+export * from './formly/util';
+import PiyingFieldTemplate from './formly/field-template.vue';
+export { PiyingFieldTemplate };
+import PiyingViewGroup from './formly/component/group.vue';
+export { PiyingViewGroup };
+export * from './formly/type';

package/index.js

@@ -1,151 +1,126 @@
-var U = Object.defineProperty;
-var q = (r, e, t) => e in r ? U(r, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : r[e] = t;
-var E = (r, e, t) => q(r, typeof e != "symbol" ? e + "" : e, t);
-import { shallowRef as F, watchEffect as R, defineComponent as T, inject as G, computed as m, createBlock as y, renderSlot as N, openBlock as c, resolveDynamicComponent as C, mergeProps as $, unref as a, toHandlers as g, withCtx as D, createVNode as z, normalizeProps as L, guardReactiveProps as W, defineAsyncComponent as J, provide as H, createElementBlock as x, createCommentVNode as P, Fragment as S, createTextVNode as K, watch as M } from "vue";
-import { CoreSchemaHandle as Q, FormBuilder as X, isFieldControl as Y, convert as Z } from "@piying/view-core";
+var J = Object.defineProperty;
+var K = (n, e, o) => e in n ? J(n, e, { enumerable: !0, configurable: !0, writable: !0, value: o }) : n[e] = o;
+var R = (n, e, o) => K(n, typeof e != "symbol" ? e + "" : e, o);
+import { inject as T, shallowRef as G, watchEffect as O, defineComponent as j, computed as v, createBlock as y, renderSlot as A, openBlock as c, resolveDynamicComponent as V, mergeProps as I, unref as d, toHandlers as b, withCtx as S, createVNode as L, normalizeProps as M, guardReactiveProps as Q, defineAsyncComponent as X, provide as H, ref as x, watch as N, onUnmounted as Y, createElementBlock as D, createCommentVNode as B, Fragment as E, renderList as Z } from "vue";
+import { CoreSchemaHandle as ee, FormBuilder as te, isFieldControl as oe, createViewControlLink as ne, convert as re } from "@piying/view-core";
 export * from "@piying/view-core";
-import { effect as B, createRootInjector as ee, ChangeDetectionSchedulerImpl as te, ChangeDetectionScheduler as oe, createInjector as ne, DestroyRef as le, untracked as re } from "static-injector";
-import { deepEqual as se } from "fast-equals";
-class ue extends Q {
+import { effect as q, createRootInjector as le, ChangeDetectionSchedulerImpl as ae, ChangeDetectionScheduler as ue, createInjector as se, DestroyRef as ce, untracked as ie } from "static-injector";
+import { deepEqual as de } from "fast-equals";
+class pe extends ee {
   constructor() {
     super(...arguments);
-    E(this, "contents");
+    R(this, "contents");
   }
 }
-class ae extends X {
-  afterResolveConfig(e, t) {
-    var n;
-    const o = e;
-    return e.type, {
-      ...t,
-      contents: (n = o.contents) == null ? void 0 : n.sort((l, u) => l.nodes && u.nodes ? 0 : l.nodes ? -1 : 1)
-      // define,
-    };
-  }
+class fe extends te {
 }
-const A = Symbol(), ie = Symbol();
-function f(r, e) {
-  const t = F(void 0);
-  return R((o) => {
-    t.value = r();
-    const n = B(
+const F = Symbol(), me = Symbol();
+function m(n) {
+  const e = T(F), o = G(void 0);
+  return O((r) => {
+    o.value = n();
+    const l = q(
       () => {
-        const l = r();
-        Object.is(t.value, l) || (t.value = l);
+        const t = n();
+        Object.is(o.value, t) || (o.value = t);
       },
       { injector: e }
     );
-    o(() => {
-      n.destroy();
-    });
-  }), t;
-}
-function ce(r) {
-  const e = F(void 0);
-  let t = !1, o;
-  return R((l) => {
-    let u = !0;
-    if (o = r(), o && Y(o))
-      t = !0, e.value = o.modelValueToViewValue$$();
-    else {
-      t = !1;
-      return;
-    }
-    const s = B(
-      () => {
-        const i = o.modelValueToViewValue$$();
-        u ? (u = !1, Object.is(e.value, i) || (e.value = i)) : e.value = i;
-      },
-      { injector: o.injector }
-    );
-    l(() => {
-      s.destroy();
+    r(() => {
+      l.destroy();
     });
-  }), [e, (l) => {
-    t && o.setViewValue(l);
-  }];
+  }), o;
 }
-const O = /* @__PURE__ */ T({
+const z = /* @__PURE__ */ j({
   __name: "wrapper",
   props: {
     wrappers: {}
   },
-  setup(r) {
-    const e = G(A), t = r, o = m(() => t.wrappers.slice(1)), n = m(() => t.wrappers[0]), l = f(
-      () => {
-        var s, i;
-        return { ...(s = n.value) == null ? void 0 : s.inputs(), ...(i = n.value) == null ? void 0 : i.attributes() };
-      },
-      e
-    ), u = m(() => {
-      var s;
-      return ((s = n.value) == null ? void 0 : s.outputs) ?? {};
+  setup(n) {
+    const e = n, o = v(() => e.wrappers.slice(1)), r = v(() => e.wrappers[0]), l = m(() => {
+      var a, p;
+      return { ...(a = r.value) == null ? void 0 : a.inputs(), ...(p = r.value) == null ? void 0 : p.attributes() };
+    }), t = v(() => {
+      var a;
+      return ((a = r.value) == null ? void 0 : a.outputs) ?? {};
     });
-    return (s, i) => n.value ? (c(), y(C(n.value.type), $({ key: 0 }, a(l), g(u.value)), {
-      default: D(() => [
-        z(O, L(W({ wrappers: o.value })), {
-          default: D(() => [
-            N(s.$slots, "default")
+    return (a, p) => r.value ? (c(), y(V(r.value.type), I({ key: 0 }, d(l), b(t.value)), {
+      default: S(() => [
+        L(z, M(Q({ wrappers: o.value })), {
+          default: S(() => [
+            A(a.$slots, "default")
           ]),
           _: 3
         }, 16)
       ]),
       _: 3
-    }, 16)) : N(s.$slots, "default", { key: 1 });
+    }, 16)) : A(a.$slots, "default", { key: 1 });
   }
-}), de = /* @__PURE__ */ T({
+}), U = /* @__PURE__ */ j({
   __name: "field-template",
   props: {
     field: {}
   },
-  setup(r) {
-    const e = r, t = G(A), o = f(() => e.field.inputs(), t), n = f(() => e.field.outputs(), t), l = f(() => e.field.renderConfig(), t), [u, s] = ce(() => e.field.form.control), i = f(() => e.field.attributes(), t), I = m(() => ({ ...o.value, fields: e.field.fieldGroup() })), V = m(() => ({ ...o.value, fields: e.field.fieldArray() })), _ = f(() => e.field.wrappers$$(), t), h = f(() => {
-      var d, p;
-      return (p = (d = e.field).fieldGroup) == null ? void 0 : p.call(d);
-    }, t), w = f(() => {
-      var d, p;
-      return (p = (d = e.field).fieldArray) == null ? void 0 : p.call(d);
-    }, t), j = m(() => ({ ...i.value, ...o.value })), v = m(
+  setup(n) {
+    const e = n, o = T(F), r = m(() => e.field.inputs()), l = m(() => e.field.outputs()), t = m(() => e.field.renderConfig()), a = m(() => e.field.attributes()), p = v(() => ({ ...r.value, fields: e.field.fieldGroup() })), P = v(() => ({ ...r.value, fields: e.field.fieldArray() })), $ = m(() => e.field.wrappers()), g = m(() => {
+      var u, s;
+      return (s = (u = e.field).fieldGroup) == null ? void 0 : s.call(u);
+    }), w = m(() => {
+      var u, s;
+      return (s = (u = e.field).fieldArray) == null ? void 0 : s.call(u);
+    }), h = v(() => ({ ...a.value, ...r.value })), i = v(
       () => {
-        var d, p, k;
-        return typeof ((d = e.field.define) == null ? void 0 : d.type) == "function" ? J((p = e.field.define) == null ? void 0 : p.type) : (k = e.field.define) == null ? void 0 : k.type;
+        var u, s, k;
+        return typeof ((u = e.field.define) == null ? void 0 : u.type) == "function" ? X((s = e.field.define) == null ? void 0 : s.type) : (k = e.field.define) == null ? void 0 : k.type;
       }
-    ), b = m(() => e.field);
-    return H(ie, b), (d, p) => {
+    ), _ = v(() => e.field);
+    H(me, _);
+    const C = x(null), W = oe(_.value.form.control);
+    let f;
+    return N(
+      C,
+      (u) => {
+        f == null || f.forEach((s) => s()), W && u && (f = ne(
+          () => _.value.form.control,
+          u.cva,
+          o
+        ));
+      },
+      { immediate: !0 }
+    ), Y(() => {
+      f == null || f.forEach((u) => u()), f = [];
+    }), (u, s) => {
       var k;
-      return a(l).hidden ? P("", !0) : (c(), x(S, { key: 0 }, [
-        (k = b.value.define) != null && k.type ? (c(), y(O, {
+      return d(t).hidden ? B("", !0) : (c(), D(E, { key: 0 }, [
+        (k = _.value.define) != null && k.type ? (c(), y(z, {
           key: 0,
-          wrappers: a(_)
+          wrappers: d($)
         }, {
-          default: D(() => [
-            a(h) ? (c(), y(C(v.value), $({ key: 0 }, I.value, g(a(n))), null, 16)) : a(w) ? (c(), y(C(v.value), $({ key: 1 }, V.value, g(a(n))), null, 16)) : (c(), x(S, { key: 2 }, [
-              b.value.form.control ? (c(), x(S, { key: 0 }, [
-                K(" 111 "),
-                (c(), y(C(v.value), $(j.value, g(a(n)), {
-                  modelValue: a(u),
-                  "onUpdate:modelValue": a(s)
-                }), null, 16, ["modelValue", "onUpdate:modelValue"]))
-              ], 64)) : (c(), y(C(v.value), $({ key: 1 }, j.value, g(a(n))), null, 16))
+          default: S(() => [
+            d(g) ? (c(), y(V(i.value), I({ key: 0 }, p.value, b(d(l))), null, 16)) : d(w) ? (c(), y(V(i.value), I({ key: 1 }, P.value, b(d(l))), null, 16)) : (c(), D(E, { key: 2 }, [
+              _.value.form.control ? (c(), y(V(i.value), I({ key: 0 }, h.value, b(d(l)), {
+                ref_key: "childRef",
+                ref: C
+              }), null, 16)) : (c(), y(V(i.value), I({ key: 1 }, h.value, b(d(l))), null, 16))
             ], 64))
           ]),
           _: 1
-        }, 8, ["wrappers"])) : P("", !0)
+        }, 8, ["wrappers"])) : B("", !0)
       ], 64));
     };
   }
 });
-function pe(r, e, t, o) {
-  let n = !0;
-  return B(
+function ve(n, e, o, r) {
+  let l = !0;
+  return q(
     () => {
-      const l = e.value$$();
-      n ? (se(l, r) || o(l), n = !1) : o(l);
+      const t = e.value$$();
+      l ? (de(t, n) || r(t), l = !1) : r(t);
     },
-    { injector: t }
+    { injector: o }
   );
 }
-const _e = /* @__PURE__ */ T({
+const Ce = /* @__PURE__ */ j({
   __name: "piying-view",
   props: {
     schema: {},
@@ -153,60 +128,106 @@ const _e = /* @__PURE__ */ T({
     options: {}
   },
   emits: ["update:modelValue"],
-  setup(r, { emit: e }) {
-    const t = r, o = e, n = ee({
+  setup(n, { emit: e }) {
+    const o = n, r = e, l = le({
       providers: [
         {
-          provide: oe,
-          useClass: te
+          provide: ue,
+          useClass: ae
         }
       ]
     });
-    H(A, n);
-    const l = F(void 0);
-    return M(
-      () => [t.schema, t.options],
-      ([u, s], i, I) => {
-        const V = ne({ providers: [], parent: n }), _ = Z(u, {
-          handle: ue,
-          builder: ae,
-          injector: V,
-          registerOnDestroy: (w) => {
-            V.get(le).onDestroy(() => {
-              w();
+    H(F, l);
+    const t = G(void 0);
+    return N(
+      () => [o.schema, o.options],
+      ([a, p], P, $) => {
+        const g = se({ providers: [], parent: l }), w = re(a, {
+          handle: pe,
+          builder: fe,
+          injector: g,
+          registerOnDestroy: (i) => {
+            g.get(ce).onDestroy(() => {
+              i();
             });
           },
-          ...s
+          ...p
         });
-        l.value = _;
+        t.value = w;
         let h;
-        if (_.form.control) {
-          const w = t.modelValue;
-          h = pe(
-            typeof w < "u" ? w : void 0,
-            _.form.control,
-            V,
-            (j) => {
-              re(() => {
-                var v;
-                (v = _.form.control) != null && v.valueNoError$$() && o("update:modelValue", j);
+        if (w.form.control) {
+          const i = o.modelValue;
+          h = ve(
+            typeof i < "u" ? i : void 0,
+            w.form.control,
+            g,
+            (_) => {
+              ie(() => {
+                var C;
+                (C = w.form.control) != null && C.valueNoError$$() && r("update:modelValue", _);
               });
             }
           );
         }
-        I(() => {
-          V.destroy(), h == null || h.destroy();
+        $(() => {
+          g.destroy(), h == null || h.destroy();
         });
       },
       { immediate: !0 }
-    ), R(() => {
-      var u;
-      (u = l.value.form.control) == null || u.updateValue(t.modelValue);
-    }), (u, s) => (c(), y(de, {
-      field: l.value
+    ), O(() => {
+      var a;
+      (a = t.value.form.control) == null || a.updateValue(o.modelValue);
+    }), (a, p) => (c(), y(U, {
+      field: t.value
     }, null, 8, ["field"]));
   }
 });
+function ke() {
+  const n = x(), e = x(!1);
+  let o, r;
+  return {
+    cva: {
+      writeValue(t) {
+        n.value = t;
+      },
+      registerOnChange(t) {
+        o = t;
+      },
+      registerOnTouched(t) {
+        r = t;
+      },
+      setDisabledState(t) {
+        e.value = t;
+      }
+    },
+    value: n,
+    disabled: e,
+    valueChange: (t) => {
+      o(t);
+    },
+    touchedChange: () => {
+      r();
+    }
+  };
+}
+const Ve = /* @__PURE__ */ j({
+  __name: "group",
+  props: {
+    fields: {}
+  },
+  setup(n) {
+    const e = n;
+    return (o, r) => (c(!0), D(E, null, Z(e.fields, (l, t) => (c(), y(U, {
+      key: t,
+      field: l
+    }, null, 8, ["field"]))), 128));
+  }
+});
 export {
-  _e as PiyingView
+  U as PiyingFieldTemplate,
+  Ce as PiyingView,
+  Ve as PiyingViewGroup,
+  ve as initListen,
+  ke as useControlValueAccessor,
+  m as watchChange
 };

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@piying/view-vue",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "type": "module",
   "dependencies": {
-    "@piying/view-core": "^0.6.5",
+    "@piying/view-core": "^0.6.22",
     "fast-equals": "^5.2.2",
     "rfdc": "^1.4.1",
     "static-injector": "^6.1.2"

package/components/HelloWorld.vue.d.ts

@@ -1,2 +0,0 @@
-declare const _default: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}, {}>;
-export default _default;

package/formly/util/field-connect.d.ts

@@ -1,2 +0,0 @@
-import { type AbstractControl } from '@piying/view-core';
-export declare function useFieldConnect(controlFn: () => AbstractControl | undefined): readonly [import("vue").ShallowRef<any>, (value: any) => void];