@yibozhang/pro-table 16.1.6 → 16.1.8

package/fesm2022/yibozhang-pro-table.mjs

@@ -5,7 +5,7 @@ import { isObservable, lastValueFrom } from 'rxjs';
 import * as i1 from '@angular/common';
 import { CommonModule } from '@angular/common';
 import * as i2$2 from '@angular/forms';
-import { NG_VALUE_ACCESSOR, FormsModule, ReactiveFormsModule, UntypedFormGroup } from '@angular/forms';
+import { NG_VALUE_ACCESSOR, FormsModule, ReactiveFormsModule, UntypedFormArray, UntypedFormGroup } from '@angular/forms';
 import * as i3 from 'ng-zorro-antd/grid';
 import { NzGridModule } from 'ng-zorro-antd/grid';
 import * as i4$1 from 'ng-zorro-antd/form';
@@ -827,7 +827,6 @@ class ProTableComponent {
         }
     }
     async ngOnInit() {
-        console.log('aaa');
         this._searchParams = {};
         this.formateInnerColumns(this.columns);
         await this.setSearchParams(this.columns);
@@ -2025,6 +2024,9 @@ class AntdFormService {
     labelAlign = "right";
     labelObservers = {};
     errorMessageStore = {};
+    arrayEditingRows = {};
+    arrayRowSnapshots = {};
+    arrayItemConfigs = {};
     classPrefix = "ant-form-";
     defaultErrorMessages = {
         required: "该字段为必填项",
@@ -2036,6 +2038,7 @@ class AntdFormService {
     // ==================== 构造函数 ====================
     constructor(fb) {
         this.fb = fb;
+        console.log('aaaaaaa');
     }
     // ==================== 表单创建和初始化 ====================
     // 判断是否为嵌套 FormGroup 配置
@@ -2045,6 +2048,40 @@ class AntdFormService {
             "type" in config &&
             config.type === "group");
     }
+    // 判断是否为 FormArray 配置
+    isFormArrayConfig(config) {
+        return (typeof config === "object" &&
+            config !== null &&
+            "type" in config &&
+            config.type === "array");
+    }
+    // 根据路径获取嵌套的 FormArray
+    getNestedFormArray(formGroup, path) {
+        if (!path || path.trim() === "") {
+            return null;
+        }
+        const pathParts = path.split(".").filter((p) => p.trim() !== "");
+        let current = formGroup;
+        for (let i = 0; i < pathParts.length; i++) {
+            if (!current)
+                return null;
+            const part = pathParts[i];
+            if (i === pathParts.length - 1) {
+                const target = current.get
+                    ? current.get(part)
+                    : null;
+                return target instanceof UntypedFormArray ? target : null;
+            }
+            else {
+                current = current instanceof UntypedFormGroup ? current.get(part) : null;
+            }
+        }
+        return null;
+    }
+    // 根据 itemConfig 创建 FormArray 的单行 FormGroup
+    createArrayRowGroup(itemConfig, disabled) {
+        return this.createNestedFormGroup(itemConfig, disabled);
+    }
     // 递归创建嵌套 FormGroup
     createNestedFormGroup(fields, disabled) {
         const groupConfig = {};
@@ -2053,6 +2090,15 @@ class AntdFormService {
                 // 递归创建嵌套的 FormGroup
                 groupConfig[key] = this.createNestedFormGroup(fieldConfig.fields, fieldConfig.disabled ?? disabled);
             }
+            else if (this.isFormArrayConfig(fieldConfig)) {
+                // 创建 FormArray
+                const rows = [];
+                const rowCount = fieldConfig.initialRows ?? 0;
+                for (let i = 0; i < rowCount; i++) {
+                    rows.push(this.createArrayRowGroup(fieldConfig.itemConfig, fieldConfig.disabled ?? disabled));
+                }
+                groupConfig[key] = this.fb.array(rows, fieldConfig.validators?.() ?? []);
+            }
             else {
                 // 创建普通 FormControl
                 groupConfig[key] = [
@@ -2080,6 +2126,16 @@ class AntdFormService {
                     this.errorMessageStore[name][key] = fieldConfig.errorMessages;
                 }
             }
+            else if (this.isFormArrayConfig(fieldConfig)) {
+                // 处理 FormArray
+                const rows = [];
+                const rowCount = fieldConfig.initialRows ?? 0;
+                for (let i = 0; i < rowCount; i++) {
+                    rows.push(this.createArrayRowGroup(fieldConfig.itemConfig, fieldConfig.disabled));
+                }
+                groupConfig[key] = this.fb.array(rows, fieldConfig.validators?.() ?? []);
+                this._ensureArrayItemConfig(name, key, fieldConfig.itemConfig);
+            }
             else {
                 // 处理普通字段
                 groupConfig[key] = [
@@ -2117,18 +2173,30 @@ class AntdFormService {
     // 销毁对应的表单
     destory(names) {
         names.forEach((name) => {
-            // 2. 清理错误消息存储
+            // 清理错误消息存储
             if (this.errorMessageStore[name]) {
                 delete this.errorMessageStore[name];
             }
-            // 3. 清理表单注册标记
+            // 清理表单注册标记
             if (this.formRegisterStore[name]) {
                 delete this.formRegisterStore[name];
             }
-            // 4. 清理表单组（Angular 会自动处理 FormGroup 的清理）
+            // 清理表单组（Angular 会自动处理 FormGroup 的清理）
             if (this.formStore[name]) {
                 delete this.formStore[name];
             }
+            // 清理 FormArray 编辑状态
+            if (this.arrayEditingRows[name]) {
+                delete this.arrayEditingRows[name];
+            }
+            // 清理 FormArray 行快照
+            if (this.arrayRowSnapshots[name]) {
+                delete this.arrayRowSnapshots[name];
+            }
+            // 清理 FormArray itemConfig 缓存
+            if (this.arrayItemConfigs[name]) {
+                delete this.arrayItemConfigs[name];
+            }
         });
     }
     // 根据路径获取嵌套的 FormGroup
@@ -2224,6 +2292,16 @@ class AntdFormService {
                         errorMessagesToAdd[errorMessageKey] = fieldConfig.errorMessages;
                     }
                 }
+                else if (this.isFormArrayConfig(fieldConfig)) {
+                    // 创建 FormArray
+                    const rows = [];
+                    const rowCount = fieldConfig.initialRows ?? 0;
+                    for (let i = 0; i < rowCount; i++) {
+                        rows.push(this.createArrayRowGroup(fieldConfig.itemConfig, fieldConfig.disabled));
+                    }
+                    control = this.fb.array(rows, fieldConfig.validators?.() ?? []);
+                    this._ensureArrayItemConfig(formName, fieldName, fieldConfig.itemConfig);
+                }
                 else {
                     // 创建普通 FormControl
                     const controlOptions = {
@@ -2347,16 +2425,58 @@ class AntdFormService {
         result.success = result.failed.length === 0;
         return result;
     }
-    // 局部赋值
+    // 局部赋值（支持 FormArray 回填：自动重建行结构）
     patchFormValues(name, values, options) {
         const formGroup = this.formStore[name];
         if (!formGroup) {
             console.warn(`[AntdFormService] patchFormValues: form "${name}" not found.`);
             return;
         }
-        formGroup.patchValue(values, {
-            emitEvent: options?.emitEvent ?? true,
+        const arrayValues = {};
+        const plainValues = {};
+        // 区分 FormArray 字段和普通字段
+        Object.entries(values).forEach(([key, val]) => {
+            const ctrl = formGroup.get(key);
+            if (ctrl instanceof UntypedFormArray && Array.isArray(val)) {
+                arrayValues[key] = val;
+            }
+            else {
+                plainValues[key] = val;
+            }
+        });
+        // 处理 FormArray 回填：清空旧行，按 itemConfig 重建
+        Object.entries(arrayValues).forEach(([key, rows]) => {
+            const formArray = formGroup.get(key);
+            const itemConfig = this.arrayItemConfigs[name]?.[key];
+            // 清空现有行
+            while (formArray.length > 0) {
+                formArray.removeAt(0, { emitEvent: false });
+            }
+            // 清理该数组的编辑状态和快照
+            this._ensureArrayState(name, key);
+            this.arrayEditingRows[name][key] = new Set();
+            this.arrayRowSnapshots[name][key] = new Map();
+            // 按 itemConfig 创建行并回填
+            rows.forEach((rowData) => {
+                const newRow = itemConfig
+                    ? this.createArrayRowGroup(itemConfig)
+                    : this.fb.group({});
+                if (itemConfig) {
+                    newRow.patchValue(rowData, { emitEvent: false });
+                }
+                formArray.push(newRow, { emitEvent: false });
+            });
+            // 统一触发一次 valueChanges
+            if (options?.emitEvent !== false) {
+                formArray.updateValueAndValidity({ emitEvent: true });
+            }
         });
+        // 处理普通字段（含嵌套 FormGroup）
+        if (Object.keys(plainValues).length > 0) {
+            formGroup.patchValue(plainValues, {
+                emitEvent: options?.emitEvent ?? true,
+            });
+        }
     }
     // 表单校验（自动过滤内部字段）
     validateForm(name, options) {
@@ -2385,6 +2505,12 @@ class AntdFormService {
                 this.markAllControlsAsDirty(childControl, emitEvent, onlySelf);
             });
         }
+        // 如果是 FormArray，递归处理所有行
+        if (control instanceof UntypedFormArray) {
+            control.controls.forEach((childControl) => {
+                this.markAllControlsAsDirty(childControl, emitEvent, onlySelf);
+            });
+        }
     }
     // ==================== 错误消息相关 ====================
     // 获取字段首条错误提示
@@ -2402,8 +2528,9 @@ class AntdFormService {
         if (!control.errors) {
             return "";
         }
-        // 从 errorMessageStore 获取错误消息配置
-        const errorMessages = this.errorMessageStore[name]?.[controlName];
+        // 从 errorMessageStore 获取错误消息配置，回退查找 arrayItemConfigs
+        const errorMessages = this.errorMessageStore[name]?.[controlName]
+            ?? this._getArrayItemErrorMessages(name, controlName);
         const mergedMessages = {
             ...this.defaultErrorMessages,
             ...(errorMessages ?? {}),
@@ -2441,6 +2568,207 @@ class AntdFormService {
         }
         return this.setupValueChangeSubscription(control, handler, options);
     }
+    // ==================== FormArray 操作 ====================
+    // 获取指定路径的 FormArray 实例（供模板 ngFor 使用）
+    getFormArray(formName, arrayPath) {
+        const formGroup = this.formStore[formName];
+        if (!formGroup) {
+            console.warn(`[AntdFormService] getFormArray: form "${formName}" not found.`);
+            return null;
+        }
+        const formArray = this.getNestedFormArray(formGroup, arrayPath);
+        if (!formArray) {
+            console.warn(`[AntdFormService] getFormArray: FormArray at path "${arrayPath}" not found in form "${formName}".`);
+        }
+        return formArray;
+    }
+    // 向 FormArray 新增一行（自动进入编辑状态，无快照）
+    addArrayRow(formName, arrayPath) {
+        const formGroup = this.formStore[formName];
+        if (!formGroup) {
+            console.warn(`[AntdFormService] addArrayRow: form "${formName}" not found.`);
+            return;
+        }
+        const formArray = this.getNestedFormArray(formGroup, arrayPath);
+        if (!formArray) {
+            console.warn(`[AntdFormService] addArrayRow: FormArray at path "${arrayPath}" not found in form "${formName}".`);
+            return;
+        }
+        // 取第一行的结构作为模板，若无行则无法推断 itemConfig
+        // 新行默认为空 FormGroup（调用方应通过 itemConfig 传入具体结构）
+        // 实际行创建通过 _addArrayRowWithConfig 完成，此处保留空行兜底
+        const newRow = this.fb.group({});
+        formArray.push(newRow);
+        const newIndex = formArray.length - 1;
+        this._ensureArrayState(formName, arrayPath);
+        // 新增行无历史快照，cancelRowEdit 时直接删除
+        this.arrayEditingRows[formName][arrayPath].add(newIndex);
+    }
+    // 向 FormArray 新增一行（指定 itemConfig）
+    addArrayRowWithConfig(formName, arrayPath, itemConfig) {
+        const formGroup = this.formStore[formName];
+        if (!formGroup) {
+            console.warn(`[AntdFormService] addArrayRowWithConfig: form "${formName}" not found.`);
+            return;
+        }
+        const formArray = this.getNestedFormArray(formGroup, arrayPath);
+        if (!formArray) {
+            console.warn(`[AntdFormService] addArrayRowWithConfig: FormArray at path "${arrayPath}" not found in form "${formName}".`);
+            return;
+        }
+        const newRow = this.createArrayRowGroup(itemConfig);
+        formArray.push(newRow);
+        const newIndex = formArray.length - 1;
+        this._ensureArrayState(formName, arrayPath);
+        // 新增行无历史快照，cancelRowEdit 时直接删除
+        this.arrayEditingRows[formName][arrayPath].add(newIndex);
+    }
+    // 删除 FormArray 中指定行（同时清理编辑状态和快照，并重对齐索引）
+    removeArrayRow(formName, arrayPath, index) {
+        const formGroup = this.formStore[formName];
+        if (!formGroup) {
+            console.warn(`[AntdFormService] removeArrayRow: form "${formName}" not found.`);
+            return;
+        }
+        const formArray = this.getNestedFormArray(formGroup, arrayPath);
+        if (!formArray) {
+            console.warn(`[AntdFormService] removeArrayRow: FormArray at path "${arrayPath}" not found in form "${formName}".`);
+            return;
+        }
+        if (index < 0 || index >= formArray.length) {
+            console.warn(`[AntdFormService] removeArrayRow: index ${index} out of range.`);
+            return;
+        }
+        formArray.removeAt(index);
+        this._ensureArrayState(formName, arrayPath);
+        // 清理被删行的快照
+        const snapshotMap = this.arrayRowSnapshots[formName][arrayPath];
+        snapshotMap.delete(index);
+        // 重对齐：快照中 > index 的键全部 -1
+        const newSnapshotMap = new Map();
+        snapshotMap.forEach((value, key) => {
+            newSnapshotMap.set(key > index ? key - 1 : key, value);
+        });
+        this.arrayRowSnapshots[formName][arrayPath] = newSnapshotMap;
+        // 重对齐：editingRows 中 > index 的索引全部 -1
+        const editingSet = this.arrayEditingRows[formName][arrayPath];
+        const newEditingSet = new Set();
+        editingSet.forEach((i) => {
+            if (i !== index) {
+                newEditingSet.add(i > index ? i - 1 : i);
+            }
+        });
+        this.arrayEditingRows[formName][arrayPath] = newEditingSet;
+    }
+    // 存储 FormArray 的 itemConfig（用于回填时重建行结构）
+    _ensureArrayItemConfig(formName, arrayPath, itemConfig) {
+        if (!this.arrayItemConfigs[formName]) {
+            this.arrayItemConfigs[formName] = {};
+        }
+        this.arrayItemConfigs[formName][arrayPath] = itemConfig;
+    }
+    _getArrayItemErrorMessages(formName, controlName) {
+        const parts = controlName.split('.');
+        if (parts.length < 3)
+            return undefined;
+        const maybeIndex = parts[parts.length - 2];
+        if (!/^\d+$/.test(maybeIndex))
+            return undefined;
+        const fieldName = parts[parts.length - 1];
+        const arrayPath = parts.slice(0, -2).join('.');
+        const itemConfig = this.arrayItemConfigs[formName]?.[arrayPath];
+        const fieldConfig = itemConfig?.[fieldName];
+        if (!fieldConfig || this.isFormGroupConfig(fieldConfig) || this.isFormArrayConfig(fieldConfig)) {
+            return undefined;
+        }
+        return fieldConfig.errorMessages;
+    }
+    // 初始化 arrayEditingRows 和 arrayRowSnapshots 对应路径（若不存在则创建）
+    _ensureArrayState(formName, arrayPath) {
+        if (!this.arrayEditingRows[formName]) {
+            this.arrayEditingRows[formName] = {};
+        }
+        if (!this.arrayEditingRows[formName][arrayPath]) {
+            this.arrayEditingRows[formName][arrayPath] = new Set();
+        }
+        if (!this.arrayRowSnapshots[formName]) {
+            this.arrayRowSnapshots[formName] = {};
+        }
+        if (!this.arrayRowSnapshots[formName][arrayPath]) {
+            this.arrayRowSnapshots[formName][arrayPath] = new Map();
+        }
+    }
+    // ==================== FormArray 行级编辑 ====================
+    // 开启指定行的编辑模式（保存当前值为快照）
+    startRowEdit(formName, arrayPath, index) {
+        const formArray = this.getFormArray(formName, arrayPath);
+        if (!formArray)
+            return;
+        const rowControl = formArray.at(index);
+        if (!rowControl) {
+            console.warn(`[AntdFormService] startRowEdit: row ${index} not found in "${arrayPath}".`);
+            return;
+        }
+        this._ensureArrayState(formName, arrayPath);
+        // 保存快照（仅当快照不存在时，避免重复编辑覆盖原始值）
+        const snapshotMap = this.arrayRowSnapshots[formName][arrayPath];
+        if (!snapshotMap.has(index)) {
+            snapshotMap.set(index, JSON.parse(JSON.stringify(rowControl.getRawValue())));
+        }
+        this.arrayEditingRows[formName][arrayPath].add(index);
+    }
+    // 确认保存指定行（验证通过则清除快照并退出编辑状态，返回行数据；否则返回 false）
+    confirmRowEdit(formName, arrayPath, index) {
+        const formArray = this.getFormArray(formName, arrayPath);
+        if (!formArray)
+            return false;
+        const rowControl = formArray.at(index);
+        if (!rowControl) {
+            console.warn(`[AntdFormService] confirmRowEdit: row ${index} not found in "${arrayPath}".`);
+            return false;
+        }
+        if (rowControl.invalid) {
+            this.markAllControlsAsDirty(rowControl, true, false);
+            return false;
+        }
+        this._ensureArrayState(formName, arrayPath);
+        this.arrayRowSnapshots[formName][arrayPath].delete(index);
+        this.arrayEditingRows[formName][arrayPath].delete(index);
+        return this.excludeInternalFields(rowControl.getRawValue());
+    }
+    // 取消编辑指定行（从快照恢复值；若无快照则说明是新增行，直接删除该行）
+    cancelRowEdit(formName, arrayPath, index) {
+        const formArray = this.getFormArray(formName, arrayPath);
+        if (!formArray)
+            return;
+        this._ensureArrayState(formName, arrayPath);
+        const snapshotMap = this.arrayRowSnapshots[formName][arrayPath];
+        if (snapshotMap.has(index)) {
+            // 已有行：从快照恢复值
+            const snapshot = snapshotMap.get(index);
+            const rowControl = formArray.at(index);
+            if (rowControl) {
+                rowControl.patchValue(snapshot);
+                rowControl.markAsPristine();
+                rowControl.markAsUntouched();
+            }
+            snapshotMap.delete(index);
+            this.arrayEditingRows[formName][arrayPath].delete(index);
+        }
+        else {
+            // 新增行：直接删除
+            this.removeArrayRow(formName, arrayPath, index);
+        }
+    }
+    // 查询指定行是否处于编辑状态
+    isRowEditing(formName, arrayPath, index) {
+        return (this.arrayEditingRows[formName]?.[arrayPath]?.has(index) ?? false);
+    }
+    // 获取所有正在编辑的行索引列表
+    getEditingRowIndices(formName, arrayPath) {
+        const editingSet = this.arrayEditingRows[formName]?.[arrayPath];
+        return editingSet ? Array.from(editingSet).sort((a, b) => a - b) : [];
+    }
     // ==================== 工具方法 ====================
     // 获取表单类名
     getFormClassName(name) {