@piying/view-vue 1.1.1 → 1.1.2

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/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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@piying/view-vue",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "type": "module",
   "dependencies": {
     "@piying/view-core": "^0.6.22",