@piying/view-angular-core 1.9.0 → 1.9.2

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, combineLatest } from 'rxjs';
 import { schema } from '@piying/valibot-visit';
 import rfdc from 'rfdc';
 
@@ -262,7 +262,7 @@ class ConstTypeService extends BaseTypeService {
     name = 'const';
     parseBase(actionList) {
         const value = this.schema.const;
-        const Define = v.pipe(v.optional(v.literal(value), value), ...this.getAllActionList(actionList));
+        const Define = v.pipe(v.literal(value), ...this.getAllActionList(actionList));
         return Define;
     }
 }
@@ -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,7 @@ 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());
                         },
                     }),
                 ];
@@ -871,23 +871,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;
                 }
@@ -1227,7 +1229,7 @@ class CommonTypeService extends BaseTypeService {
             properties: {},
             additionalProperties: false,
         };
-        const childConditionJSchemaList = childList.map(() => ({ properties: {} }));
+        const childConditionJSchemaList = childList.map(() => ({ properties: {}, required: [] }));
         const conditionKeyList = [];
         for (const key of childKeyList) {
             const parentItem = schema.properties?.[key];
@@ -1245,6 +1247,9 @@ class CommonTypeService extends BaseTypeService {
                 };
                 childConditionJSchemaList.forEach((item, i) => {
                     item.properties[key] = childList[i].properties[key];
+                    if (childList[i].required && childList[i].required.includes(key)) {
+                        item.required.push(key);
+                    }
                 });
             }
             else {
@@ -1255,6 +1260,9 @@ class CommonTypeService extends BaseTypeService {
                 };
                 childConditionJSchemaList.forEach((item, i) => {
                     item.properties[key] = childList[i].properties[key];
+                    if (childList[i].required && childList[i].required.includes(key)) {
+                        item.required.push(key);
+                    }
                 });
             }
         }