@piying/view-core 2.6.0 → 2.6.2

package/fesm2022/piying-view-core.mjs

@@ -147,8 +147,6 @@ class AbstractControl {
         const result = this.#schemaCheck$$();
         return result.success ? result.output : value;
     });
-    /** 已激活的子级,用于校验获得返回值之类 */
-    activatedChildren$$;
     /** 通用的子级,用于查询之类 */
     children$$;
     /** disabled */
@@ -428,27 +426,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() {
@@ -622,6 +613,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 +790,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;
@@ -847,7 +850,8 @@ class FieldArray extends FieldGroupbase {
 class FieldLogicGroup extends FieldArray {
     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 +865,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 +881,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$$()