@piying/view-angular-core 1.2.2 → 1.3.1

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

@@ -258,6 +258,9 @@ class AbstractControl {
         (!this.selfDisabled$$() ||
             (this.selfDisabled$$() && this.config$().disabledValue === 'reserve')));
     injector;
+    /** model的value */
+    value$$;
+    children$$;
     /** disabled */
     selfDisabled$$ = computed(() => this.config$?.().disabled ?? false);
     /** `self` || `parent` */
@@ -454,6 +457,7 @@ class AbstractControl {
     markAsPristine() {
         this.selfDirty$.set(false);
     }
+    reset(value) { }
     getRawValue() {
         return this.value;
     }
@@ -474,13 +478,19 @@ class AbstractControl {
         }
         return x;
     }
+    /** @internal */
+    _forEachChild(cb) { }
+    updateValue(value) { }
     config$ = signal({});
+    /** @internal */
     initConfig(config) {
         this.config$ = config;
     }
     getInitValue(value) {
         return value ?? this.config$().defaultValue;
     }
+    /** @internal */
+    updateInitValue(value) { }
     find(name) {
         return null;
     }
@@ -551,101 +561,152 @@ class AbstractControl {
     }
 }
 
-class FieldArray extends AbstractControl {
+var UpdateType;
+(function (UpdateType) {
+    UpdateType[UpdateType["init"] = 0] = "init";
+    UpdateType[UpdateType["update"] = 1] = "update";
+    UpdateType[UpdateType["reset"] = 2] = "reset";
+})(UpdateType || (UpdateType = {}));
+
+class FieldGroupbase extends AbstractControl {
+    /** @internal */
+    getResetValue(value = []) { }
+    /** @internal */
+    beforeUpdateList = [];
+    resetValue$ = signal(undefined);
+    /** @internal */
+    _updateValue(value, type) {
+        const viewValue = this.config$().transfomer?.toView?.(value, this) ?? value;
+        if (type === UpdateType.init) {
+            this.initedValue = viewValue;
+        }
+        if (this.config$().groupMode === 'reset') {
+            const restValue = this.getResetValue(viewValue);
+            this.beforeUpdateList.forEach((fn) => fn(restValue, type !== UpdateType.init));
+        }
+        else if (this.config$().groupMode === 'loose') {
+            const resetValue = this.getResetValue(viewValue);
+            this.resetValue$.set(resetValue);
+        }
+        this._forEachChild((control, key) => {
+            if (type === UpdateType.init) {
+                control.updateInitValue(viewValue?.[key]);
+            }
+            else if (type === UpdateType.update) {
+                control.updateValue(viewValue?.[key]);
+            }
+            else {
+                control.reset(viewValue ? viewValue[key] : undefined);
+            }
+        });
+    }
+    updateValue(value) {
+        if (deepEqual(value, this.value$$())) {
+            return;
+        }
+        this._updateValue(value, UpdateType.update);
+    }
+    inited = false;
+    /** @internal */
+    initedValue;
+    /** @internal */
+    updateInitValue(value) {
+        this.inited = true;
+        const initValue = this.getInitValue(value);
+        this._updateValue(initValue, UpdateType.init);
+    }
+    reset(value) {
+        const initValue = this.getInitValue(value);
+        this._updateValue(initValue, UpdateType.reset);
+    }
+    /** @internal */
+    _reduceChildren(initValue, fn) {
+        let res = initValue;
+        this._forEachChild((control, name) => {
+            res = fn(res, control, name);
+        });
+        return res;
+    }
+}
+
+class FieldArray extends FieldGroupbase {
     #deletionMode$$ = computed(() => this.config$().deletionMode ?? 'shrink');
     value$$ = computed(() => {
-        const list = [];
-        for (const control of this.controls$()) {
+        let list = [];
+        this._reduceChildren(list, (acc, control, name) => {
             if (control && control.shouldInclude$$()) {
                 list.push(control.value$$());
             }
             else {
                 if (this.#deletionMode$$() === 'shrink') {
-                    continue;
+                    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.controls$());
-    controls$ = signal([]);
+    children$$ = computed(() => [
+        ...this.fixedControls$(),
+        ...this.resetControls$(),
+    ]);
+    fixedControls$ = signal([]);
+    resetControls$ = signal([]);
     get controls() {
-        return this.controls$();
-    }
-    removeAt(index) {
-        const adjustedIndex = this._adjustIndex(index);
-        if (this.controls$()[adjustedIndex]) {
-            this.controls$.update((list) => {
-                list = list.slice();
-                list.splice(adjustedIndex, 1);
-                return list;
-            });
+        return this.children$$();
+    }
+    removeRestControl(key) {
+        if (!this.resetControls$()[key]) {
+            return;
         }
+        this.resetControls$.update((controls) => {
+            controls = controls.slice();
+            controls.splice(key, 1);
+            return controls;
+        });
     }
-    setControl(index, control) {
-        const adjustedIndex = this._adjustIndex(index);
-        this.controls$.update((list) => {
+    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[adjustedIndex] = control;
+            list[key] = control;
             return list;
         });
         control.setParent(this);
     }
     get length() {
-        return this.controls$().length;
-    }
-    reset(value) {
-        let initValue = this.getInitValue(value);
-        const viewValue = this.config$().transfomer?.toView?.(initValue, this) ?? initValue;
-        this.beforeUpdateList.forEach((item) => item(viewValue));
-        this._forEachChild((control, index) => {
-            control.reset(initValue[index]);
-        });
+        return this.controls.length;
     }
     getRawValue() {
-        return this.controls$().map((control) => control.getRawValue());
+        return this._reduceChildren([], (acc, control, key) => {
+            acc[key] = control.getRawValue();
+            return acc;
+        });
     }
     clear() {
-        if (this.controls$().length < 1)
+        if (this.resetControls$().length < 1)
             return;
-        this.controls$.update(() => []);
-    }
-    _adjustIndex(index) {
-        return index < 0 ? Math.max(index + this.length, 0) : index;
+        this.beforeUpdateList.forEach((fn) => fn([], false));
     }
     /** @internal */
     _forEachChild(cb) {
-        this.controls$().forEach((control, index) => {
+        this.children$$().forEach((control, index) => {
             if (control) {
                 cb(control, index);
             }
         });
     }
-    find(name) {
-        return this.controls$()[this._adjustIndex(name)];
+    find(key) {
+        return this.children$$()[key];
     }
-    beforeUpdateList = [];
-    updateValue(value = []) {
-        if (deepEqual(value, this.value$$())) {
-            return;
-        }
-        const viewValue = this.config$().transfomer?.toView?.(value, this) ?? value;
-        this.beforeUpdateList.forEach((item) => item(viewValue));
-        this.controls$().forEach((control, i) => {
-            control.updateValue(viewValue[i]);
-        });
-    }
-    updateInitValue(value) {
-        let initValue = this.getInitValue(value);
-        const viewValue = this.config$().transfomer?.toView?.(initValue, this) ?? initValue;
-        this.beforeUpdateList.forEach((item) => item(viewValue));
-        this.controls$().forEach((control, i) => {
-            control.updateInitValue(viewValue?.[i]);
-        });
+    getResetValue(value = []) {
+        return value.slice(this.fixedControls$().length);
     }
 }
 
@@ -656,7 +717,6 @@ const InitPendingValue = {
 };
 class FieldControl extends AbstractControl {
     pendingStatus = signal(InitPendingValue);
-    children$$;
     #viewIndex = 0;
     /** 视图变化时model值不变也要更新view */
     viewIndex$ = signal(0);
@@ -682,8 +742,6 @@ class FieldControl extends AbstractControl {
         this.markAsPristine();
         this.markAsUntouched();
     }
-    /** @internal */
-    _forEachChild(cb) { }
     #initInput = true;
     #viewSubject$$ = computed(() => {
         const subject = new Subject();
@@ -761,7 +819,7 @@ class FieldControl extends AbstractControl {
         this.pendingStatus.set(InitPendingValue);
     }
     updateInitValue(value) {
-        let initValue = this.getInitValue(value);
+        const initValue = this.getInitValue(value);
         this.modelValue$.set(initValue);
         this.value$$.set(initValue);
     }
@@ -777,16 +835,16 @@ class FieldLogicGroup extends FieldArray {
         const returnResult = this.getValue(false);
         return (this.config$().transfomer?.toModel?.(returnResult, this) ?? returnResult);
     });
-    getActivateControls() {
+    #getActivateControls() {
         let list;
         if (this.activateControl$()) {
             list = this.activateControl$();
         }
         else if (this.type() === 'and') {
-            list = this.controls$();
+            list = this.fixedControls$();
         }
         else if (this.type() === 'or') {
-            list = [this.controls$()[this.activateIndex$()]];
+            list = [this.fixedControls$()[this.activateIndex$()]];
         }
         else {
             throw new Error('');
@@ -795,8 +853,8 @@ class FieldLogicGroup extends FieldArray {
     }
     getValue(rawData) {
         const controls = rawData
-            ? this.getActivateControls()
-            : this.getActivateControls().filter((control) => control.shouldInclude$$());
+            ? this.#getActivateControls()
+            : this.#getActivateControls().filter((control) => control.shouldInclude$$());
         const control = controls[0];
         if (controls.length === 0) {
             return this.emptyValue$$();
@@ -808,9 +866,9 @@ class FieldLogicGroup extends FieldArray {
         return Object.keys(result).length ? result : this.emptyValue$$();
     }
     reset(value) {
-        let initValue = this.getInitValue(value);
+        const initValue = this.getInitValue(value);
         const viewValue = this.config$().transfomer?.toView?.(initValue, this) ?? initValue;
-        this.controls$().forEach((control, i) => {
+        this.fixedControls$().forEach((control, i) => {
             control.reset(viewValue);
         });
     }
@@ -822,14 +880,15 @@ class FieldLogicGroup extends FieldArray {
             return;
         }
         const viewValue = this.config$().transfomer?.toView?.(value, this) ?? value;
-        this.controls$().forEach((control, i) => {
+        this.fixedControls$().forEach((control, i) => {
             control.updateValue(viewValue);
         });
     }
+    /** @internal */
     updateInitValue(value) {
-        let initValue = this.getInitValue(value);
+        const initValue = this.getInitValue(value);
         const viewValue = this.config$().transfomer?.toView?.(initValue, this) ?? initValue;
-        this.controls$().forEach((control, i) => {
+        this.fixedControls$().forEach((control, i) => {
             control.updateInitValue(viewValue);
         });
     }
@@ -848,125 +907,83 @@ function isFieldLogicGroup(input) {
     return input instanceof FieldLogicGroup;
 }
 
-class FieldGroup extends AbstractControl {
+class FieldGroup extends FieldGroupbase {
     value$$ = computed(() => {
-        const acc = {};
-        const value = this._reduceChildren(acc, (acc, control, name) => {
+        const result = this._reduceChildren({ ...this.#looseValue$$() }, (acc, control, name) => {
             if (control.shouldInclude$$()) {
                 acc[name] = control.value;
             }
             return acc;
         });
-        const result = { ...value, ...this.looseValue$$() };
         const returnResult = Object.keys(result).length
             ? result
             : this.emptyValue$$();
         return (this.config$().transfomer?.toModel?.(returnResult, this) ?? returnResult);
     });
-    children$$ = computed(() => Object.values(this.controls$()));
-    controls$ = signal({});
+    #controls$$ = computed(() => ({
+        ...this.fixedControls$(),
+        ...this.resetControls$(),
+    }));
+    fixedControls$ = signal({});
+    resetControls$ = signal({});
     get controls() {
-        return this.controls$();
+        return this.#controls$$();
     }
-    registerControl(name, control) {
-        if (this.controls$()[name])
-            return this.controls$()[name];
-        this.controls$.update((controls) => ({ ...controls, [name]: control }));
-        control.setParent(this);
-        return control;
-    }
-    removeControl(name) {
-        if (this.controls$()[name]) {
-            this.controls$.update((controls) => {
-                controls = { ...controls };
-                delete controls[name];
-                return controls;
-            });
+    children$$ = computed(() => Object.values(this.#controls$$()));
+    removeRestControl(key) {
+        if (!this.resetControls$()[key]) {
+            return;
         }
-    }
-    setControl(name, control) {
-        this.controls$.update((controls) => {
+        this.resetControls$.update((controls) => {
             controls = { ...controls };
-            delete controls[name];
+            delete controls[key];
             return controls;
         });
-        if (control)
-            this.registerControl(name, control);
     }
-    reset(value) {
-        let initValue = this.getInitValue(value);
-        const viewValue = this.config$().transfomer?.toView?.(initValue, this) ?? initValue;
-        this._forEachChild((control, name) => {
-            control.reset(viewValue ? viewValue[name] : undefined);
-        });
+    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, name) => {
-            acc[name] = control.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) {
-        Object.keys(this.controls$()).forEach((key) => {
-            const control = this.controls$()[key];
-            control && cb(control, key);
+        const controls = this.#controls$$();
+        Object.keys(controls).forEach((key) => {
+            cb(controls[key], key);
         });
     }
-    /** @internal */
-    _reduceChildren(initValue, fn) {
-        let res = initValue;
-        this._forEachChild((control, name) => {
-            res = fn(res, control, name);
-        });
-        return res;
+    find(key) {
+        return this.#controls$$()[key];
     }
-    find(name) {
-        return this.controls$()[name];
+    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.#inputValue$();
+    #looseValue$$ = computed(() => {
+        const resetValue = this.resetValue$();
         if (!resetValue || isFieldLogicGroup(this.parent)) {
-            return {};
-        }
-        const controls = this.controls$();
-        const looseValue = {};
-        for (const key in resetValue) {
-            if (!(key in controls)) {
-                looseValue[key] = resetValue[key];
-            }
+            return undefined;
         }
-        return looseValue;
+        return resetValue;
     });
-    /**
-     * loose object
-     * todo 动态添加
-     *  */
-    #inputValue$ = signal({});
-    #setInputValue(obj) {
-        this.#inputValue$.set(obj);
-    }
-    updateValue(value) {
-        if (deepEqual(value, this.value$$())) {
-            return;
-        }
-        if (!deepEqual(value, this.#inputValue$())) {
-            this.#setInputValue(value);
-        }
-        const viewValue = this.config$().transfomer?.toView?.(value, this) ?? value;
-        for (const key in this.controls$()) {
-            const control = this.controls$()[key];
-            control.updateValue(viewValue?.[key]);
-        }
-    }
-    updateInitValue(value) {
-        let initValue = this.getInitValue(value);
-        const viewValue = this.config$().transfomer?.toView?.(initValue, this) ?? initValue;
-        for (const key in this.controls$()) {
-            const control = this.controls$()[key];
-            control.updateInitValue(viewValue?.[key]);
-        }
-    }
 }
 
 function isGroup(schema) {
@@ -1045,8 +1062,8 @@ class ParentMap extends Map {
 
 function* groupGenerator(list) {
     for (const item of list) {
-        if (!item.keyPath?.length && item.fieldGroup?.().length) {
-            yield* groupGenerator(item.fieldGroup());
+        if (!item.keyPath?.length && item.fixedChildren?.().length) {
+            yield* groupGenerator(item.fixedChildren());
         }
         else if (item.keyPath?.length) {
             yield item;
@@ -1068,14 +1085,12 @@ function fieldQuery(keyPath, field, aliasMap, root) {
         const queryField = aliasMap.get(firstPath.slice(1));
         list = [{ field: queryField, level: 1 }];
     }
-    else if (field.fieldGroup) {
-        list = groupGenerator(field.fieldGroup())
-            .filter((field) => field.keyPath && arrayStartsWith(keyPath, field.keyPath))
-            .map((field) => ({ field: field, level: field.keyPath?.length }));
-    }
-    else if (field.fieldArray) {
-        list = field
-            .fieldArray()
+    else if (field.fixedChildren || field.restChildren) {
+        const children = [
+            ...(field.fixedChildren?.() ?? []),
+            ...(field.restChildren?.() ?? []),
+        ];
+        list = groupGenerator(children)
             .filter((field) => field.keyPath && arrayStartsWith(keyPath, field.keyPath))
             .map((field) => ({ field: field, level: field.keyPath?.length }));
     }
@@ -1094,6 +1109,7 @@ function fieldQuery(keyPath, field, aliasMap, root) {
     return undefined;
 }
 
+var _a;
 class FormBuilder {
     #scopeMap = inject(PI_FORM_BUILDER_ALIAS_MAP, { optional: true }) ??
         new ParentMap();
@@ -1103,7 +1119,7 @@ class FormBuilder {
     #globalConfig = inject(PI_VIEW_CONFIG_TOKEN);
     #allFieldInitHookList = [];
     buildRoot(item) {
-        let field = this.#buildControl({
+        const field = this.#buildControl({
             type: 'root',
             field: { fullPath: [] },
             form: undefined,
@@ -1119,12 +1135,20 @@ class FormBuilder {
         list.forEach((fn) => fn());
     }
     #buildField(item) {
+        item.field.fixedChildren = signal(new SortedArray((a, b) => a.priority - b.priority));
+        for (let index = 0; index < item.fields.length; index++) {
+            this.#buildControl(item, item.fields[index], index);
+        }
         if (item.type === 'group') {
             this.#buildGroup(item);
         }
         else {
             this.#buildArray(item);
         }
+        item.field.children = computed(() => [
+            ...item.field.fixedChildren(),
+            ...(item.field.restChildren?.() ?? []),
+        ]);
     }
     afterResolveConfig(rawConfig, config) {
         return;
@@ -1181,7 +1205,7 @@ class FormBuilder {
         let control;
         let keyPath = field.key;
         if (isFieldLogicGroup(parent.form)) {
-            keyPath ??= parent.form.controls$().length;
+            keyPath ??= parent.form.fixedControls$().length;
         }
         else if (isFieldArray(parent.form)) {
             keyPath ??= index;
@@ -1231,7 +1255,10 @@ class FormBuilder {
             this.#moveViewField(field.movePath, resolvedConfig);
         }
         else {
-            parent.append(resolvedConfig);
+            if ((parent.type === 'group' || parent.type === 'array') &&
+                !parent.skipAppend) {
+                parent.append(resolvedConfig);
+            }
         }
         if (field.alias) {
             this.#scopeMap.set(field.alias, resolvedConfig);
@@ -1241,28 +1268,28 @@ class FormBuilder {
             parent.resolvedField$.set(resolvedConfig);
         }
         // 递归进行解析
-        if (isGroup(field) ||
-            field.isLogicAnd ||
-            field.isLogicOr ||
-            field.isTuple) {
-            resolvedConfig.fieldGroup = signal(new SortedArray((a, b) => a.priority - b.priority));
+        if (isGroup(field) || field.isLogicAnd || field.isLogicOr) {
             this.#buildField({
                 type: 'group',
+                templateField: field.arrayChild,
                 fields: field.children,
                 field: resolvedConfig,
                 form: (control || parent.form),
                 append: (field) => {
-                    resolvedConfig.fieldGroup().push(field);
+                    resolvedConfig.fixedChildren().push(field);
                 },
             });
         }
-        else if (isArray(field)) {
+        else if (isArray(field) || field.isTuple) {
             this.#buildField({
                 type: 'array',
                 templateField: field.arrayChild,
+                fields: field.children,
                 field: resolvedConfig,
                 form: control,
-                append: (field) => { },
+                append: (field) => {
+                    resolvedConfig.fixedChildren().push(field);
+                },
             });
         }
         if (resolvedConfig.hooks?.allFieldsResolved) {
@@ -1272,16 +1299,136 @@ class FormBuilder {
         }
         return resolvedConfig;
     }
-    #buildGroup(groupItem) {
-        for (let index = 0; index < groupItem.fields.length; index++) {
-            const field = groupItem.fields[index];
-            this.#buildControl(groupItem, field, index);
+    #buildGroup(buildItem) {
+        const { templateField, form, field } = buildItem;
+        if (templateField && field.form.control) {
+            field.restChildren = signal([]);
+            const updateItem = (key, initValue) => {
+                const result = this.#createObjectRestItem({ ...buildItem, skipAppend: true }, {
+                    ...templateField,
+                    key,
+                });
+                field.restChildren.update((list) => [...list, result]);
+                if (initValue) {
+                    result.form.control?.updateInitValue(form.initedValue?.[key]);
+                }
+                return result;
+            };
+            function removeItem(key) {
+                field.restChildren.update((list) => {
+                    const index = list.findIndex((item) => item.keyPath.slice(-1)[0] === key);
+                    list = [...list];
+                    list.splice(index, 1);
+                    return list;
+                });
+                form.removeRestControl(key);
+            }
+            form.beforeUpdateList.push((restValue = {}, initUpdate) => {
+                const restControl = form.resetControls$();
+                for (const key in restControl) {
+                    if (key in restValue) {
+                        continue;
+                    }
+                    removeItem(key);
+                }
+                let isUpdateItem = false;
+                for (const key in restValue) {
+                    if (key in restControl) {
+                        continue;
+                    }
+                    isUpdateItem = true;
+                    updateItem(key, initUpdate);
+                }
+                if (isUpdateItem) {
+                    this.allFieldInitHookCall();
+                }
+            });
+            field.action = {
+                set: (value, key) => {
+                    untracked(() => {
+                        const result = updateItem(key, true);
+                        this.allFieldInitHookCall();
+                        result.form.control.updateValue(value);
+                    });
+                },
+                remove: (key) => {
+                    untracked(() => {
+                        removeItem(key);
+                    });
+                },
+            };
         }
-        /** 虚拟group不存在hooks */
-        const field = groupItem.field;
-        field.hooks?.afterChildrenInit?.(field);
     }
-    createArrayItem(parent, 
+    #createObjectRestItem(parent, 
+    // 单独一项
+    field) {
+        const result = this.#buildControl(parent, field, 0);
+        this.#allFieldInitHookList.push(() => this.allFieldInitHookCall());
+        return result;
+    }
+    #buildArray(buildItem) {
+        const { templateField, form, field } = buildItem;
+        if (templateField && field.form.control) {
+            const fixedLength = field.fixedChildren?.().length ?? 0;
+            field.restChildren = signal([]);
+            const updateItem = (list, index, initValue) => {
+                const result = this.#createArrayItem(buildItem, templateField, fixedLength + index);
+                list[index] = result;
+                if (initValue) {
+                    result.form.control?.updateInitValue(form.initedValue?.[fixedLength + index]);
+                }
+                return result;
+            };
+            function removeItem(list, index) {
+                const [deletedItem] = list.splice(index, 1);
+                form.removeRestControl(index);
+                if (deletedItem) {
+                    deletedItem.injector.destroy();
+                    deletedItem.injector = undefined;
+                }
+            }
+            form.beforeUpdateList.push((resetValue = [], initUpdate) => {
+                const controlLength = form.resetControls$().length;
+                if (resetValue.length < controlLength) {
+                    const list = [...field.restChildren()];
+                    for (let index = list.length - 1; index >= resetValue.length; index--) {
+                        removeItem(list, index);
+                    }
+                    field.restChildren.set(list);
+                }
+                else if (controlLength < resetValue.length) {
+                    const list = [...field.restChildren()];
+                    for (let index = controlLength; index < resetValue.length; index++) {
+                        updateItem(list, index, initUpdate);
+                    }
+                    field.restChildren.set(list);
+                    this.allFieldInitHookCall();
+                }
+            });
+            field.action = {
+                set: (value, index) => {
+                    untracked(() => {
+                        index = (typeof index === 'number'
+                            ? index
+                            : (field.restChildren?.().length ?? 0));
+                        const list = [...field.restChildren()];
+                        const result = updateItem(list, index, true);
+                        field.restChildren.set(list);
+                        this.allFieldInitHookCall();
+                        result.form.control.updateValue(value);
+                    });
+                },
+                remove: (index) => {
+                    untracked(() => {
+                        const list = [...field.restChildren()];
+                        removeItem(list, index);
+                        field.restChildren.set(list);
+                    });
+                },
+            };
+        }
+    }
+    #createArrayItem(parent, 
     // 单独一项
     field, index) {
         const Builder = this.constructor;
@@ -1300,69 +1447,11 @@ class FormBuilder {
             result.injector?.destroy();
         });
         const instance = injector.get(Builder);
-        const result = instance.#buildControl(parent, field, index);
+        const result = instance.#buildControl({ ...parent, skipAppend: true }, field, index);
         this.#allFieldInitHookList.push(() => instance.allFieldInitHookCall());
         result.injector = injector.get(EnvironmentInjector);
         return result;
     }
-    #buildArray(arrayItem) {
-        const { templateField, form } = arrayItem;
-        arrayItem.field.action = {
-            // 因为数组需要有动态添加的能力,所以才加上,group不需要
-            set: (value, index) => {
-                untracked(() => {
-                    index = (typeof index === 'number'
-                        ? index
-                        : (arrayItem.field.fieldArray?.().length ?? 0));
-                    const result = this.createArrayItem(arrayItem, templateField, index);
-                    const list = [...arrayItem.field.fieldArray()];
-                    list[index] = result;
-                    arrayItem.field.fieldArray.set(list);
-                    result.form.control?.updateInitValue(arrayItem.field.form.control?.config$().defaultValue?.[index]);
-                    this.allFieldInitHookCall();
-                    result.form.control.updateValue(value);
-                });
-            },
-            remove: (index) => {
-                untracked(() => {
-                    const list = [...arrayItem.field.fieldArray()];
-                    const [deletedItem] = list.splice(index, 1);
-                    arrayItem.field.fieldArray.set(list);
-                    form.removeAt(index);
-                    if (deletedItem) {
-                        deletedItem.injector.destroy();
-                        deletedItem.injector = undefined;
-                    }
-                });
-            },
-        };
-        arrayItem.field.fieldArray = signal([]);
-        arrayItem.field.hooks?.afterChildrenInit?.(arrayItem.field);
-        form.beforeUpdateList.push((input = []) => {
-            const controlLength = form.controls$().length;
-            if (controlLength < input.length) {
-                const list = arrayItem.field.fieldArray().slice();
-                for (let index = controlLength; index < input.length; index++) {
-                    const result = this.createArrayItem(arrayItem, arrayItem.templateField, index);
-                    list[index] = result;
-                }
-                arrayItem.field.fieldArray.set(list);
-            }
-            else if (input.length < controlLength) {
-                const list = arrayItem.field.fieldArray().slice();
-                for (let index = arrayItem.field.fieldArray().length - 1; index >= input.length; index--) {
-                    const [deletedItem] = list.splice(index, 1);
-                    form.removeAt(index);
-                    if (deletedItem) {
-                        deletedItem.injector?.destroy();
-                        deletedItem.injector = undefined;
-                    }
-                }
-                arrayItem.field.fieldArray.set(list);
-            }
-            this.allFieldInitHookCall();
-        });
-    }
     #resolveComponent(type) {
         let define;
         let defaultConfig;
@@ -1431,7 +1520,7 @@ class FormBuilder {
         const newKeyPath = inputField.fullPath.slice(parent.fullPath.length);
         inputField.keyPath = newKeyPath;
         inputField.parent = parent;
-        parent.fieldGroup().push(inputField);
+        parent.fixedChildren().push(inputField);
     }
     #resolveWrappers(wrappers) {
         const result = (wrappers ?? []).map((wrapper) => {
@@ -1471,6 +1560,7 @@ class FormBuilder {
         return signal(result);
     }
 }
+_a = FormBuilder;
 
 function layout(value) {
     return {
@@ -1966,10 +2056,11 @@ class CoreSchemaHandle extends BaseSchemaHandle {
         }
         else {
             this.isArray = true;
-            const sh = new this.globalConfig.handle(this.globalConfig, this, schema);
+            const sh = new this.globalConfig.handle(this.globalConfig, this, schema.item);
             sh.parent = this;
             this.arrayChild = sh;
             convertSchema(schema.item, sh);
+            this.formConfig.groupMode = 'reset';
         }
     }
     defaultSchema(schema) {
@@ -1978,6 +2069,41 @@ class CoreSchemaHandle extends BaseSchemaHandle {
     tupleDefault(schema) {
         super.tupleDefault(schema);
         this.isTuple = true;
+        if (schema.type === 'tuple') {
+            this.formConfig.groupMode = 'default';
+        }
+        else if (schema.type === 'loose_tuple') {
+            this.formConfig.groupMode = 'loose';
+        }
+        else if (schema.type === 'strict_tuple') {
+            this.formConfig.groupMode = 'strict';
+        }
+    }
+    objectDefault(schema) {
+        super.objectDefault(schema);
+        if (schema.type === 'object') {
+            this.formConfig.groupMode = 'default';
+        }
+        else if (schema.type === 'loose_object') {
+            this.formConfig.groupMode = 'loose';
+        }
+        else if (schema.type === 'strict_object') {
+            this.formConfig.groupMode = 'strict';
+        }
+    }
+    recordSchema(key, value) {
+        super.recordSchema(key, value);
+        this.isGroup = true;
+        // equal {[name:string]:v.InferOutput< typeof value>}
+        this.restSchema(value);
+    }
+    restSchema(schema) {
+        super.restSchema(schema);
+        const sh = new this.globalConfig.handle(this.globalConfig, this, schema);
+        sh.parent = this;
+        this.arrayChild = sh;
+        convertSchema(schema, sh);
+        this.formConfig.groupMode = 'reset';
     }
     enumSchema(schema) {
         this.props ??= {};
@@ -2091,5 +2217,5 @@ const NFCSchema = v.optional(v.void());
  * Generated bundle index. Do not edit.
  */
 
-export { AbstractControl, CoreSchemaHandle, FieldArray, FieldControl, FieldGroup, FieldLogicGroup, FormBuilder, INVALID, NFCSchema, PENDING, PI_CONTEXT_TOKEN, PI_FORM_BUILDER_ALIAS_MAP, PI_FORM_BUILDER_OPTIONS_TOKEN, PI_VIEW_CONFIG_TOKEN, SortedArray, VALID, arrayStartsWith, asyncInputMerge, clone, componentClass, controlStatusList, convert, createViewControlLink, disableWhen, effectListen, fieldControlStatusClass, formConfig, hideWhen, isArray, isFieldArray, isFieldControl, isFieldGroup, isFieldLogicGroup, isGroup, layout, mergeHooks, mergeHooksFn, mergeOutputFn, mergeOutputs, nonFieldControl, outputChange, outputChangeFn, patchAsyncAttributes, patchAsyncFn, patchAsyncInputs, patchAsyncProps, patchAttributes, patchHooks, patchInputs, patchOutputs, patchProps, patchWrappers, rawConfig, removeAttributes, removeHooks, removeInputs, removeOutputs, removeProps, removeWrappers, renderConfig, setAlias, setAttributes, setComponent, setHooks, setInputs, setOutputs, setProps, setWrappers, toArray, toObservable, topClass, unWrapSignal$1 as unWrapSignal, valueChange, valueChangeFn };
+export { AbstractControl, CoreSchemaHandle, FieldArray, FieldControl, FieldGroup, FieldLogicGroup, FormBuilder, INVALID, NFCSchema, PENDING, PI_CONTEXT_TOKEN, PI_FORM_BUILDER_ALIAS_MAP, PI_FORM_BUILDER_OPTIONS_TOKEN, PI_VIEW_CONFIG_TOKEN, SortedArray, UpdateType, VALID, arrayStartsWith, asyncInputMerge, clone, componentClass, controlStatusList, convert, createViewControlLink, disableWhen, effectListen, fieldControlStatusClass, formConfig, hideWhen, isArray, isFieldArray, isFieldControl, isFieldGroup, isFieldLogicGroup, isGroup, layout, mergeHooks, mergeHooksFn, mergeOutputFn, mergeOutputs, nonFieldControl, outputChange, outputChangeFn, patchAsyncAttributes, patchAsyncFn, patchAsyncInputs, patchAsyncProps, patchAttributes, patchHooks, patchInputs, patchOutputs, patchProps, patchWrappers, rawConfig, removeAttributes, removeHooks, removeInputs, removeOutputs, removeProps, removeWrappers, renderConfig, setAlias, setAttributes, setComponent, setHooks, setInputs, setOutputs, setProps, setWrappers, toArray, toObservable, topClass, unWrapSignal$1 as unWrapSignal, valueChange, valueChangeFn };
 //# sourceMappingURL=piying-view-angular-core.mjs.map