@piying/view-angular-core 1.9.3 → 1.9.4

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, distinctUntilChanged, skip, combineLatest } from 'rxjs';
+import { merge, map, BehaviorSubject, switchMap, distinctUntilChanged, combineLatest } from 'rxjs';
 import { schema } from '@piying/valibot-visit';
 import rfdc from 'rfdc';
 
@@ -627,6 +627,7 @@ function toFixedList(data, labelFn = (a) => a) {
     return data.map((item) => ({ label: labelFn(item), value: item }));
 }
 
+const EMPTY_DEFINE = v.pipe(v.any(), jsonActions.setComponent(''));
 function arrayIntersection(a, b) {
     if (!isNil(a) && !isNil(b)) {
         a = Array.isArray(a) ? a : [a];
@@ -827,34 +828,32 @@ class CommonTypeService extends BaseTypeService {
             });
         }
         else if ('if' in schema$1) {
-            /**
-             * 当前设计中if/then/else是采用的分离显示
-             * 也就是then/else都会合并base,然后按条件展示,
-             */
-            const useThen$ = new BehaviorSubject(undefined);
-            let base1Schema = v.pipe(this.#jsonSchemaBase(schema$1, () => [
-                ...this.getValidationActionList(schema$1),
-            ]));
-            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.pipe(v.any(), v.check(() => !!schema$1.if));
             }
             else {
-                const ifSchema = this.#mergeSchema(schema$1, schema$1.if);
-                ifVSchema = v.pipe(this.#jsonSchemaBase(ifSchema.schema, () => ifSchema.actionList));
+                const ifSchema = this.resolveSchema2(schema$1.if);
+                ifVSchema = v.pipe(this.#jsonSchemaBase(ifSchema, () => this.getValidationActionList(ifSchema)));
             }
+            /**
+             * 当前设计中if/then/else是采用的分离显示
+             * 也就是then/else都会合并base,然后按条件展示,
+             */
+            const useThen$ = new BehaviorSubject(undefined);
+            const baseSchema = this.#jsonSchemaBase(schema$1, () => [
+                ...this.getValidationActionList(schema$1),
+                jsonActions.valueChange((fn) => {
+                    fn().subscribe(({ 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);
+                    });
+                }),
+            ]);
             function hideAction(isThen) {
                 return [
                     jsonActions.renderConfig({ hidden: true }),
@@ -864,57 +863,58 @@ class CommonTypeService extends BaseTypeService {
                             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);
-                            });
-                        },
-                    }),
                 ];
             }
             let thenSchema;
             if (schema$1.then && !isBoolean(schema$1.then)) {
-                const subSchema = this.#mergeSchema(schema$1, schema$1.then);
-                thenSchema = v.pipe(this.#jsonSchemaBase(subSchema.schema, () => [
-                    ...subSchema.actionList,
+                const subSchema = this.resolveSchema2(schema$1.then);
+                thenSchema = v.pipe(this.#jsonSchemaBase(subSchema, () => [
+                    ...this.getValidationActionList(subSchema),
+                    ...hideAction(true),
                 ]));
+                if (!subSchema.__resolved.type.types.includes('object')) {
+                    thenSchema = v.pipe(thenSchema, jsonActions.setComponent(''), jsonActions.renderConfig({ hidden: true }));
+                }
             }
             else {
-                thenSchema = base1Schema;
+                thenSchema = EMPTY_DEFINE;
             }
-            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,
+                const subSchema = this.resolveSchema2(schema$1.else);
+                elseSchema = v.pipe(this.#jsonSchemaBase(subSchema, () => [
+                    ...this.getValidationActionList(subSchema),
+                    ...hideAction(false),
                 ]));
+                if (!subSchema.__resolved.type.types.includes('object')) {
+                    elseSchema = v.pipe(elseSchema, jsonActions.setComponent(''), jsonActions.renderConfig({ hidden: true }));
+                }
             }
             else {
-                elseSchema = base1Schema;
+                elseSchema = EMPTY_DEFINE;
             }
-            elseSchema = v.pipe(elseSchema, ...hideAction(false));
             // 这种逻辑没问题,因为jsonschema验证中,也会出现base和子级架构一起验证
             vSchema = v.pipe(v.union([baseSchema, thenSchema, elseSchema]), jsonActions.formConfig({ disableOrUpdateActivate: true }), v.rawCheck(({ dataset, addIssue }) => {
                 if (dataset.issues) {
                     return;
                 }
+                const result = v.safeParse(baseSchema, dataset.value);
+                if (!result.success) {
+                    addIssue({ label: `if:default` });
+                    return;
+                }
                 const status = useThen$.value;
                 if (status && thenSchema) {
                     const result = v.safeParse(thenSchema, dataset.value);
                     if (!result.success) {
-                        addIssue();
+                        addIssue({ label: `if:then` });
                         return;
                     }
                 }
                 if (!status && elseSchema) {
                     const result = v.safeParse(elseSchema, dataset.value);
                     if (!result.success) {
-                        addIssue();
+                        addIssue({ label: `if:else` });
                         return;
                     }
                 }