@piying/view-angular-core 1.9.1 → 1.9.3

package/fesm2022/piying-view-angular-core-adapter.mjs

@@ -3,7 +3,7 @@ import * as v from 'valibot';
 import * as jsonActions from '@piying/view-angular-core';
 import { hideWhen, patchInputs, asControl, setComponent } from '@piying/view-angular-core';
 import { computed } from '@angular/core';
-import { merge, map, BehaviorSubject, switchMap, combineLatest } from 'rxjs';
+import { merge, map, BehaviorSubject, switchMap, distinctUntilChanged, skip, combineLatest } from 'rxjs';
 import { schema } from '@piying/valibot-visit';
 import rfdc from 'rfdc';
 
@@ -355,7 +355,7 @@ class ObjectTypeService extends BaseTypeService {
                     });
                     const depList = schema$1.dependentRequired?.[key];
                     if (depList) {
-                        propVSchema = v.pipe(propVSchema, jsonActions.patchHooks({
+                        propVSchema = v.pipe(propVSchema, jsonActions.mergeHooks({
                             allFieldsResolved: (field) => {
                                 field.form.control.statusChanges.subscribe(() => {
                                     const valid = field.form.control.valid;
@@ -832,24 +832,24 @@ class CommonTypeService extends BaseTypeService {
              * 也就是then/else都会合并base,然后按条件展示,
              */
             const useThen$ = new BehaviorSubject(undefined);
-            const baseSchema = v.pipe(this.#jsonSchemaBase(schema$1, () => [
+            let base1Schema = v.pipe(this.#jsonSchemaBase(schema$1, () => [
                 ...this.getValidationActionList(schema$1),
-                jsonActions.hideWhen({
-                    disabled: false,
-                    listen: (fn) => fn({}).pipe(map(({ list: [value], field }) => {
-                        const isThen = isBoolean(schema$1.if)
-                            ? schema$1.if
-                            : v.safeParse(ifVSchema, value).success;
-                        field.form.parent.activateIndex$.set(isThen ? 1 : 2);
-                        useThen$.next(isThen);
-                        return !((isThen && !thenSchema) || (!isThen && !elseSchema));
-                    })),
-                }),
             ]));
+            const baseSchema = v.pipe(base1Schema, jsonActions.hideWhen({
+                disabled: false,
+                listen: (fn) => fn({}).pipe(map(({ list: [value], field }) => {
+                    const isThen = isBoolean(schema$1.if)
+                        ? schema$1.if
+                        : v.safeParse(ifVSchema, value).success;
+                    field.form.parent.activateIndex$.set(isThen ? 1 : 2);
+                    useThen$.next(isThen);
+                    return true;
+                })),
+            }));
             /** 仅为验证项,非显示用 */
             let ifVSchema;
             if (isBoolean(schema$1.if)) {
-                ifVSchema = v.literal(schema$1.if);
+                ifVSchema = v.pipe(v.any(), v.check(() => !!schema$1.if));
             }
             else {
                 const ifSchema = this.#mergeSchema(schema$1, schema$1.if);
@@ -861,7 +861,17 @@ class CommonTypeService extends BaseTypeService {
                     jsonActions.hideWhen({
                         disabled: true,
                         listen(fn) {
-                            return fn({ list: [['..', 0]] }).pipe(switchMap(({ list: [] }) => useThen$), map((a) => (a === undefined ? true : isThen ? !a : a)));
+                            return fn({ list: [['..', 0]] }).pipe(switchMap(({ list: [] }) => useThen$), map((a) => (a === undefined ? true : isThen ? !a : a)), distinctUntilChanged());
+                        },
+                    }),
+                    jsonActions.mergeHooks({
+                        allFieldsResolved: (field) => {
+                            let baseField = field.get(['..', 0]);
+                            field.form.control?.valueChanges
+                                .pipe(skip(1))
+                                .subscribe((value) => {
+                                baseField?.form.control?.updateValue(value);
+                            });
                         },
                     }),
                 ];
@@ -871,23 +881,25 @@ class CommonTypeService extends BaseTypeService {
                 const subSchema = this.#mergeSchema(schema$1, schema$1.then);
                 thenSchema = v.pipe(this.#jsonSchemaBase(subSchema.schema, () => [
                     ...subSchema.actionList,
-                    ...hideAction(true),
                 ]));
             }
+            else {
+                thenSchema = base1Schema;
+            }
+            thenSchema = v.pipe(thenSchema, ...hideAction(true));
             let elseSchema;
             if (schema$1.else && !isBoolean(schema$1.else)) {
                 const subSchema = this.#mergeSchema(schema$1, schema$1.else);
                 elseSchema = v.pipe(this.#jsonSchemaBase(subSchema.schema, () => [
                     ...subSchema.actionList,
-                    ...hideAction(false),
                 ]));
             }
+            else {
+                elseSchema = base1Schema;
+            }
+            elseSchema = v.pipe(elseSchema, ...hideAction(false));
             // 这种逻辑没问题,因为jsonschema验证中,也会出现base和子级架构一起验证
-            vSchema = v.pipe(v.union([
-                baseSchema,
-                thenSchema ?? baseSchema,
-                elseSchema ?? baseSchema,
-            ].filter(Boolean)), jsonActions.formConfig({ disableOrUpdateActivate: true }), v.rawCheck(({ dataset, addIssue }) => {
+            vSchema = v.pipe(v.union([baseSchema, thenSchema, elseSchema]), jsonActions.formConfig({ disableOrUpdateActivate: true }), v.rawCheck(({ dataset, addIssue }) => {
                 if (dataset.issues) {
                     return;
                 }
@@ -1036,7 +1048,7 @@ class CommonTypeService extends BaseTypeService {
                     }
                     conditionResult.conditionKeyList = excludeFixedConditionList;
                 }
-                const checkAction = jsonActions.patchHooks({
+                const checkAction = jsonActions.mergeHooks({
                     allFieldsResolved: (field) => {
                         const displayName = ['..', 2];
                         const list = [];