@piying/view-core 2.6.1 → 2.6.3

package/fesm2022/piying-view-core.mjs

@@ -134,6 +134,7 @@ const InitPendingValue = {
     value: undefined,
 };
 class AbstractControl {
+    skipValuePath;
     pendingStatus = signal(InitPendingValue);
     emptyValue$$ = computed(() => clone(this.config$().emptyValue));
     /** 父级取值时,当前子级是否包含在内 */
@@ -147,8 +148,6 @@ class AbstractControl {
         const result = this.#schemaCheck$$();
         return result.success ? result.output : value;
     });
-    /** 已激活的子级,用于校验获得返回值之类 */
-    activatedChildren$$;
     /** 通用的子级,用于查询之类 */
     children$$;
     /** disabled */
@@ -189,6 +188,15 @@ class AbstractControl {
     /** validator */
     #validators$$ = computed(() => this.config$().validators ?? []);
     #asyncValidators$$ = computed(() => this.config$().asyncValidators ?? []);
+    #undefinedable$$ = computed(() => this.config$().undefinedable);
+    #nullable$$ = computed(() => this.config$().nullable);
+    #isOptionalEmpty = computed(() => {
+        if (this.required$$()) {
+            return false;
+        }
+        return ((this.#undefinedable$$() && this.originValue$$() === undefined) ||
+            (this.#nullable$$() && this.originValue$$() === null));
+    });
     resetIndex$ = signal(0);
     syncError$ = linkedSignal(computed(() => {
         const disabled = this.disabled$$();
@@ -197,23 +205,24 @@ class AbstractControl {
         }
         // 请求同级
         this.resetIndex$();
-        this.originValue$$();
-        const childrenResult = this.reduceChildren([], (child, value, key) => {
-            if ((!child.selfDisabled$$() ||
-                (child.selfDisabled$$() &&
-                    child.config$().disabledValue === 'reserve')) &&
-                child.errors) {
-                value.push({
-                    kind: 'descendant',
-                    key: key,
-                    metadata: child.errors,
-                    field: child,
-                });
+        if (!this.#isOptionalEmpty()) {
+            const childrenResult = this.reduceChildren([], (child, value, key) => {
+                if ((!child.selfDisabled$$() ||
+                    (child.selfDisabled$$() &&
+                        child.config$().disabledValue === 'reserve')) &&
+                    child.errors) {
+                    value.push({
+                        kind: 'descendant',
+                        key: key,
+                        metadata: child.errors,
+                        field: child,
+                    });
+                }
+                return value;
+            });
+            if (childrenResult.length) {
+                return childrenResult;
             }
-            return value;
-        });
-        if (childrenResult.length) {
-            return childrenResult;
         }
         const result = this.#validators$$().flatMap((item) => {
             const result = untracked(() => item(this));
@@ -327,6 +336,40 @@ class AbstractControl {
     get parent() {
         return this._parent;
     }
+    #getPath(parentPath, skip) {
+        if (!this.parent) {
+            return [];
+        }
+        if (skip()) {
+            return parentPath();
+        }
+        const parentChildren = this.parent.children$$();
+        let index;
+        if (Array.isArray(parentChildren)) {
+            index = parentChildren.findIndex((item) => item === this);
+            if (index === -1) {
+                throw new Error('child index not found');
+            }
+        }
+        else {
+            for (const key in parentChildren) {
+                if (parentChildren[key] === this) {
+                    index = key;
+                    break;
+                }
+            }
+            if (!index) {
+                throw new Error('child index not found');
+            }
+        }
+        return [...parentPath(), index];
+    }
+    get valuePath() {
+        return this.#getPath(() => this.parent.valuePath, () => !!this.parent.skipValuePath);
+    }
+    get formPath() {
+        return this.#getPath(() => this.parent.formPath, () => false);
+    }
     get value() {
         return this.value$$();
     }
@@ -428,27 +471,20 @@ class AbstractControl {
         return null;
     }
     setControl(name, control) { }
+    *activatedChildrenIterable() { }
     /** 校验和获得值用 */
     reduceChildren(initialValue, fn, shortCircuit) {
-        const childrenMap = (this.activatedChildren$$ ?? this.children$$)?.();
-        if (!childrenMap) {
-            return initialValue;
-        }
-        let value = initialValue;
-        const list = Object.entries(childrenMap);
-        const isArray = Array.isArray(childrenMap);
-        for (let index = 0; index < list.length; index++) {
-            if (!list[index][1]) {
+        let result = initialValue;
+        for (const [key, child] of this.activatedChildrenIterable()) {
+            if (!child) {
                 continue;
             }
-            const key = isArray ? index : list[index][0];
-            const item = list[index][1];
-            if (shortCircuit?.(value)) {
+            if (shortCircuit?.(result)) {
                 break;
             }
-            value = fn(item, value, key);
+            result = fn(child, result, key);
         }
-        return value;
+        return result;
     }
     #valueChange;
     get valueChanges() {
@@ -464,15 +500,18 @@ class AbstractControl {
         if (this.disabled$$()) {
             return VALID;
         }
-        const childStatus = this.reduceChildren(VALID, (child, value) => {
-            if (value === INVALID || child.status$$() === INVALID) {
-                return INVALID;
-            }
-            else if (value === PENDING || child.status$$() === PENDING) {
-                return PENDING;
-            }
-            return VALID;
-        }, (v) => v === INVALID || v === PENDING);
+        let childStatus = VALID;
+        if (!this.#isOptionalEmpty()) {
+            childStatus = this.reduceChildren(VALID, (child, value) => {
+                if (value === INVALID || child.status$$() === INVALID) {
+                    return INVALID;
+                }
+                else if (value === PENDING || child.status$$() === PENDING) {
+                    return PENDING;
+                }
+                return VALID;
+            }, (v) => v === INVALID || v === PENDING);
+        }
         if (childStatus === VALID) {
             if (this.rawError$$()) {
                 if (this.rawError$$() !== PENDING) {
@@ -622,6 +661,12 @@ class FieldGroup extends FieldGroupbase {
         return this.#controls$$();
     }
     children$$ = computed(() => this.#controls$$());
+    *activatedChildrenIterable() {
+        const children = this.children$$();
+        for (const key in children) {
+            yield [key, children[key]];
+        }
+    }
     removeRestControl(key) {
         if (!this.resetControls$()[key]) {
             return;
@@ -793,6 +838,12 @@ class FieldArray extends FieldGroupbase {
     get controls() {
         return this.children$$();
     }
+    *activatedChildrenIterable() {
+        const children = this.children$$();
+        for (let index = 0; index < children.length; index++) {
+            yield [index, children[index]];
+        }
+    }
     removeRestControl(key) {
         if (!this.resetControls$()[key]) {
             return;
@@ -845,9 +896,11 @@ class FieldArray extends FieldGroupbase {
 
 // 切换索引后,理论上应该触发下值变更,否则不知道值是什么
 class FieldLogicGroup extends FieldArray {
+    skipValuePath = true;
     activateIndex$ = signal(0);
     type = signal('and');
-    activateControls$ = signal(undefined);
+    /** 过滤激活控件 */
+    filterActivateControl$ = signal(undefined);
     #childUpdate() {
         const returnResult = this.getValue(false);
         return this.transformToModel(returnResult, this);
@@ -861,8 +914,9 @@ class FieldLogicGroup extends FieldArray {
     });
     #getActivateControls() {
         let list;
-        if (this.activateControls$()) {
-            list = this.activateControls$();
+        const fn = this.filterActivateControl$();
+        if (fn) {
+            list = this.children$$().filter(fn);
         }
         else if (this.type() === 'and') {
             list = this.fixedControls$();
@@ -876,6 +930,26 @@ class FieldLogicGroup extends FieldArray {
         return list;
     }
     activatedChildren$$ = computed(() => this.#getActivateControls());
+    activatedChildrenIterable = computed(() => {
+        const filterFn = this.filterActivateControl$();
+        const type = this.type();
+        if (filterFn) {
+            const children = this.children$$();
+            return children
+                .map((element, index) => [index, element])
+                .filter(([index, item]) => !!filterFn(item, index, children));
+        }
+        else if (type === 'and') {
+            return this.fixedControls$().map((control, index) => [index, control]);
+        }
+        else if (type === 'or') {
+            const index = this.activateIndex$();
+            return [
+                [index, this.fixedControls$()[index]],
+            ];
+        }
+        return [];
+    });
     getValue(rawData) {
         const controls = rawData
             ? this.activatedChildren$$()
@@ -2505,7 +2579,7 @@ function AnyDefault(input, schemahandle) {
             : input;
 }
 const checkOverride = {
-    logicGroup: (schemahandle) => v.pipe(AnyDefault(v.pipe(AnyDefine, v.check(Boolean)), schemahandle)),
+    logicGroup: (schemahandle) => v.pipe(AnyDefault(AnyDefine, schemahandle)),
     array: (schemahandle) => {
         const source = schemahandle.coreSchema;
         const length = source &&
@@ -2682,6 +2756,8 @@ class CoreSchemaHandle extends BaseSchemaHandle {
     beforeSchemaType(schema) {
         super.beforeSchemaType(schema);
         this.formConfig.required = !this.undefinedable && !this.nullable;
+        this.formConfig.undefinedable = this.undefinedable;
+        this.formConfig.nullable = this.nullable;
     }
     voidSchema(schema) {
         this.nonFieldControl = true;