@piying/view-vue2-legacy 2.4.2 → 2.4.4

package/index.js

@@ -6796,7 +6796,7 @@ function signalToRef(value) {
           dataRef.value = currentValue;
         }
       },
-      { injector }
+      { injector: injector.value }
     );
     onWatcherCleanup(() => {
       ref2.destroy();
@@ -6918,11 +6918,11 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     const isControl = isFieldControl(field.value.form.control);
     let dispose;
     watch(
-      [childRef, field],
-      ([childRef2, field2]) => {
+      [childRef, field, injector],
+      ([childRef2, field2, injector2]) => {
         dispose?.();
         if (isControl && childRef2) {
-          dispose = createViewControlLink((() => field2.form.control), childRef2["cva"], injector);
+          dispose = createViewControlLink((() => field2.form.control), childRef2["cva"], injector2);
         }
       },
       { immediate: true }
@@ -6945,7 +6945,7 @@ var __component__$2 = /* @__PURE__ */ normalizeComponent(
   _sfc_staticRenderFns$2,
   false,
   null,
-  "ed62cd7c"
+  "97958aee"
 );
 const FieldTemplate = __component__$2.exports;
 const _sfc_main$1 = /* @__PURE__ */ defineComponent({
@@ -6958,13 +6958,16 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
   emits: ["update:modelValue"],
   setup(__props, { emit }) {
     const inputs = __props;
-    const rootInjector = inputs.options.injector ?? inject(PI_VIEW_FIELD_TOKEN, void 0)?.value.injector ?? createRootInjector({
-      providers: [
-        {
-          provide: ChangeDetectionScheduler,
-          useClass: ChangeDetectionSchedulerImpl
-        }
-      ]
+    const maybeParentField = inject(PI_VIEW_FIELD_TOKEN, void 0);
+    const rootInjector = computed(() => {
+      return inputs.options.injector ?? maybeParentField?.value.injector ?? createRootInjector({
+        providers: [
+          {
+            provide: ChangeDetectionScheduler,
+            useClass: ChangeDetectionSchedulerImpl
+          }
+        ]
+      });
     });
     provide(InjectorToken, rootInjector);
     provide(
@@ -6982,7 +6985,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     let injectorDispose;
     const initResult = computed(() => {
       injectorDispose?.();
-      const subInjector = createInjector({ providers: [], parent: rootInjector });
+      const subInjector = createInjector({ providers: [], parent: rootInjector.value });
       injectorDispose = () => {
         subInjector.destroy();
         injectorDispose = void 0;
@@ -7019,7 +7022,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       },
       { immediate: true }
     );
-    return { __sfc: true, inputs, emit, rootInjector, injectorDispose, initResult, field, FieldTemplate };
+    return { __sfc: true, inputs, emit, maybeParentField, rootInjector, injectorDispose, initResult, field, FieldTemplate };
   }
 });
 var _sfc_render$1 = function render3() {
@@ -7033,7 +7036,7 @@ var __component__$1 = /* @__PURE__ */ normalizeComponent(
   _sfc_staticRenderFns$1,
   false,
   null,
-  "bc6508a4"
+  "026c7115"
 );
 const piyingView = __component__$1.exports;
 function useControlValueAccessor(autoChange = true) {