@piying/view-angular-core 1.5.9 → 1.5.11

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

@@ -290,6 +290,9 @@ class AbstractControl {
     injector;
     /** model的value */
     value$$;
+    /** 已激活的子级,用于校验获得返回值之类 */
+    activatedChildren$$;
+    /** 通用的子级,用于查询之类 */
     children$$;
     /** disabled */
     selfDisabled$$ = computed(() => this.config$?.().disabled ?? false);
@@ -457,8 +460,8 @@ class AbstractControl {
     get pending() {
         return this.status$$() === PENDING;
     }
-    selfUpdateOn$$ = computed(() => this.config$?.().updateOn);
-    updateOn$$ = computed(() => (this.selfUpdateOn$$() || this.parent?.updateOn$$()) ?? 'change');
+    #selfUpdateOn$$ = computed(() => this.config$?.().updateOn);
+    updateOn$$ = computed(() => (this.#selfUpdateOn$$() || this.parent?.updateOn$$()) ?? 'change');
     markAsTouched() {
         this.selfTouched$.set(true);
     }
@@ -525,8 +528,9 @@ class AbstractControl {
         return null;
     }
     setControl(name, control) { }
+    /** 校验和获得值用 */
     reduceChildren(initialValue, fn, shortCircuit) {
-        const childrenMap = this.children$$?.();
+        const childrenMap = (this.activatedChildren$$ ?? this.children$$)?.();
         if (!childrenMap) {
             return initialValue;
         }
@@ -623,7 +627,9 @@ class FieldGroupbase extends AbstractControl {
             const restValue = this.getResetValue(viewValue);
             this.beforeUpdateList.forEach((fn) => fn(restValue, type !== UpdateType.init));
         }
-        else if (this.config$().groupMode === 'loose') {
+        else if (this.config$().groupMode === 'loose' ||
+            this.config$().groupMode === 'strict') {
+            // loose下为了输出值,strict下为了验证
             const resetValue = this.getResetValue(viewValue);
             this.resetValue$.set(resetValue);
         }
@@ -671,84 +677,75 @@ class FieldGroupbase extends AbstractControl {
     }
 }
 
-class FieldArray extends FieldGroupbase {
-    #deletionMode$$ = computed(() => this.config$().deletionMode ?? 'shrink');
+class FieldGroup extends FieldGroupbase {
     value$$ = computed(() => {
-        let list = [];
-        this._reduceChildren(list, (acc, control, name) => {
-            if (control && control.shouldInclude$$()) {
-                list.push(control.value$$());
-            }
-            else {
-                if (this.#deletionMode$$() === 'shrink') {
-                    return list;
-                }
-                else if (this.#deletionMode$$() === 'mark') {
-                    list.push(undefined);
-                }
+        const result = this._reduceChildren({ ...this.resetValue$() }, (acc, control, name) => {
+            if (control.shouldInclude$$()) {
+                acc[name] = control.value;
             }
-            return list;
+            return acc;
         });
-        list = [...list, ...(this.resetValue$() ?? [])];
-        const returnResult = list.length === 0 ? this.emptyValue$$() : list;
+        const returnResult = Object.keys(result).length
+            ? result
+            : this.emptyValue$$();
         return (this.config$().transfomer?.toModel?.(returnResult, this) ?? returnResult);
     });
-    children$$ = computed(() => [
+    #controls$$ = computed(() => ({
         ...this.fixedControls$(),
         ...this.resetControls$(),
-    ]);
-    fixedControls$ = signal([]);
-    resetControls$ = signal([]);
+    }));
+    fixedControls$ = signal({});
+    resetControls$ = signal({});
     get controls() {
-        return this.children$$();
+        return this.#controls$$();
     }
+    children$$ = computed(() => Object.values(this.#controls$$()));
     removeRestControl(key) {
         if (!this.resetControls$()[key]) {
             return;
         }
         this.resetControls$.update((controls) => {
-            controls = controls.slice();
-            controls.splice(key, 1);
+            controls = { ...controls };
+            delete controls[key];
             return controls;
         });
     }
     setControl(key, control) {
         const controls$ = this.inited ? this.resetControls$ : this.fixedControls$;
-        key = this.inited ? key - this.fixedControls$().length : key;
-        controls$.update((list) => {
-            list = list.slice();
-            list[key] = control;
-            return list;
-        });
+        controls$.update((controls) => ({ ...controls, [key]: control }));
         control.setParent(this);
     }
-    get length() {
-        return this.controls.length;
-    }
     getRawValue() {
-        return this._reduceChildren([], (acc, control, key) => {
+        return this._reduceChildren({}, (acc, control, key) => {
             acc[key] = control.getRawValue();
             return acc;
         });
     }
     clear() {
-        if (this.resetControls$().length < 1)
+        if (Object.keys(this.resetControls$()).length < 1)
             return;
-        this.beforeUpdateList.forEach((fn) => fn([], false));
+        this.beforeUpdateList.forEach((fn) => fn({}, false));
     }
     /** @internal */
     _forEachChild(cb) {
-        this.children$$().forEach((control, index) => {
-            if (control) {
-                cb(control, index);
-            }
+        const controls = this.#controls$$();
+        Object.keys(controls).forEach((key) => {
+            cb(controls[key], key);
         });
     }
     find(key) {
-        return this.children$$()[key];
+        return this.#controls$$()[key];
     }
-    getResetValue(value = []) {
-        return value.slice(this.fixedControls$().length);
+    getResetValue(inputValue) {
+        const controls = this.fixedControls$();
+        return inputValue
+            ? Object.keys(inputValue).reduce((obj, key) => {
+                if (!(key in controls)) {
+                    obj[key] = inputValue[key];
+                }
+                return obj;
+            }, {})
+            : {};
     }
 }
 
@@ -861,6 +858,87 @@ class FieldControl extends AbstractControl {
     }
 }
 
+class FieldArray extends FieldGroupbase {
+    #deletionMode$$ = computed(() => this.config$().deletionMode ?? 'shrink');
+    value$$ = computed(() => {
+        let list = [];
+        this._reduceChildren(list, (acc, control, name) => {
+            if (control && control.shouldInclude$$()) {
+                list.push(control.value$$());
+            }
+            else {
+                if (this.#deletionMode$$() === 'shrink') {
+                    return list;
+                }
+                else if (this.#deletionMode$$() === 'mark') {
+                    list.push(undefined);
+                }
+            }
+            return list;
+        });
+        list = [...list, ...(this.resetValue$() ?? [])];
+        const returnResult = list.length === 0 ? this.emptyValue$$() : list;
+        return (this.config$().transfomer?.toModel?.(returnResult, this) ?? returnResult);
+    });
+    children$$ = computed(() => [
+        ...this.fixedControls$(),
+        ...this.resetControls$(),
+    ]);
+    fixedControls$ = signal([]);
+    resetControls$ = signal([]);
+    get controls() {
+        return this.children$$();
+    }
+    removeRestControl(key) {
+        if (!this.resetControls$()[key]) {
+            return;
+        }
+        this.resetControls$.update((controls) => {
+            controls = controls.slice();
+            controls.splice(key, 1);
+            return controls;
+        });
+    }
+    setControl(key, control) {
+        const controls$ = this.inited ? this.resetControls$ : this.fixedControls$;
+        key = this.inited ? key - this.fixedControls$().length : key;
+        controls$.update((list) => {
+            list = list.slice();
+            list[key] = control;
+            return list;
+        });
+        control.setParent(this);
+    }
+    get length() {
+        return this.controls.length;
+    }
+    getRawValue() {
+        return this._reduceChildren([], (acc, control, key) => {
+            acc[key] = control.getRawValue();
+            return acc;
+        });
+    }
+    clear() {
+        if (this.resetControls$().length < 1)
+            return;
+        this.beforeUpdateList.forEach((fn) => fn([], false));
+    }
+    /** @internal */
+    _forEachChild(cb) {
+        this.children$$().forEach((control, index) => {
+            if (control) {
+                cb(control, index);
+            }
+        });
+    }
+    find(key) {
+        return this.children$$()[key];
+    }
+    getResetValue(value = []) {
+        return value.slice(this.fixedControls$().length);
+    }
+}
+
 // 切换索引后,理论上应该触发下值变更,否则不知道值是什么
 class FieldLogicGroup extends FieldArray {
     activateIndex$ = signal(0);
@@ -886,10 +964,13 @@ class FieldLogicGroup extends FieldArray {
         }
         return list;
     }
+    activatedChildren$$ = computed(() => {
+        return this.#getActivateControls();
+    });
     getValue(rawData) {
         const controls = rawData
-            ? this.#getActivateControls()
-            : this.#getActivateControls().filter((control) => control.shouldInclude$$());
+            ? this.activatedChildren$$()
+            : this.activatedChildren$$().filter((control) => control.shouldInclude$$());
         const control = controls[0];
         if (controls.length === 0) {
             return this.emptyValue$$();
@@ -958,85 +1039,6 @@ function isFieldLogicGroup(input) {
     return input instanceof FieldLogicGroup;
 }
 
-class FieldGroup extends FieldGroupbase {
-    value$$ = computed(() => {
-        const result = this._reduceChildren({ ...this.#looseValue$$() }, (acc, control, name) => {
-            if (control.shouldInclude$$()) {
-                acc[name] = control.value;
-            }
-            return acc;
-        });
-        const returnResult = Object.keys(result).length
-            ? result
-            : this.emptyValue$$();
-        return (this.config$().transfomer?.toModel?.(returnResult, this) ?? returnResult);
-    });
-    #controls$$ = computed(() => ({
-        ...this.fixedControls$(),
-        ...this.resetControls$(),
-    }));
-    fixedControls$ = signal({});
-    resetControls$ = signal({});
-    get controls() {
-        return this.#controls$$();
-    }
-    children$$ = computed(() => Object.values(this.#controls$$()));
-    removeRestControl(key) {
-        if (!this.resetControls$()[key]) {
-            return;
-        }
-        this.resetControls$.update((controls) => {
-            controls = { ...controls };
-            delete controls[key];
-            return controls;
-        });
-    }
-    setControl(key, control) {
-        const controls$ = this.inited ? this.resetControls$ : this.fixedControls$;
-        controls$.update((controls) => ({ ...controls, [key]: control }));
-        control.setParent(this);
-    }
-    getRawValue() {
-        return this._reduceChildren({}, (acc, control, key) => {
-            acc[key] = control.getRawValue();
-            return acc;
-        });
-    }
-    clear() {
-        if (Object.keys(this.resetControls$()).length < 1)
-            return;
-        this.beforeUpdateList.forEach((fn) => fn({}, false));
-    }
-    /** @internal */
-    _forEachChild(cb) {
-        const controls = this.#controls$$();
-        Object.keys(controls).forEach((key) => {
-            cb(controls[key], key);
-        });
-    }
-    find(key) {
-        return this.#controls$$()[key];
-    }
-    getResetValue(inputValue) {
-        const controls = this.fixedControls$();
-        return inputValue
-            ? Object.keys(inputValue).reduce((obj, item) => {
-                if (!(item in controls)) {
-                    obj[item] = inputValue[item];
-                }
-                return obj;
-            }, {})
-            : {};
-    }
-    #looseValue$$ = computed(() => {
-        const resetValue = this.resetValue$();
-        if (!resetValue || isFieldLogicGroup(this.parent)) {
-            return undefined;
-        }
-        return resetValue;
-    });
-}
-
 function isGroup(schema) {
     return schema.isGroup;
 }