@yibozhang/pro-table 0.0.4 → 0.0.6

package/bundles/yibozhang-pro-table.umd.js

@@ -669,8 +669,10 @@
             };
             this._loading = false;
             this._selectedTableRow = null;
-            // 选中的行数据（用于复选框选择）
+            // 选中的行数据（用于复选框选择）- 保留用于兼容性
             this._selectedRows = [];
+            // 使用 Set 存储选中项的 ID，支持跨页选中
+            this._selectedRowIds = new Set();
             // 全选状态
             this._checkedAll = false;
             // 半选状态（部分选中）
@@ -1267,7 +1269,12 @@
             return this._selectedTableRow;
         };
         ProTableComponent.prototype.getCheckedRows = function () {
-            return this._selectedRows;
+            if (!this.showCheckbox) {
+                return [];
+            }
+            // 返回当前数据源中所有 checked 为 true 的项
+            // 注意：如果需要获取所有页的选中项，需要遍历所有数据源或使用 _selectedRowIds
+            return this.dataSource.filter(function (row) { return row.checked === true; });
         };
         // 获取指定名称的模板
         ProTableComponent.prototype.getTemplate = function (name) {
@@ -1314,14 +1321,16 @@
                 return false;
             return this.rowDisabled ? this.rowDisabled(data) : false;
         };
-        // 检查行是否被复选框选中
+        // 检查行是否被复选框选中（数据驱动模式）
         ProTableComponent.prototype.isRowChecked = function (data) {
             if (!this.showCheckbox)
                 return false;
-            return this._selectedRows.some(function (row) { return JSON.stringify(row) === JSON.stringify(data); });
+            // 直接读取数据对象的 checked 属性
+            return data.checked === true;
         };
-        // 切换行的选中状态
+        // 切换行的选中状态（数据驱动模式，保留用于兼容）
         ProTableComponent.prototype.toggleRowChecked = function (data, checked, event) {
+            var _this = this;
             if (event) {
                 event.stopPropagation(); // 阻止事件冒泡，避免触发行点击
             }
@@ -1329,9 +1338,21 @@
             if (this.isRowDisabled(data)) {
                 return;
             }
-            var index = this._selectedRows.findIndex(function (row) { return JSON.stringify(row) === JSON.stringify(data); });
+            // 直接设置数据对象的 checked 属性
+            data.checked = checked;
+            // 同步更新 _selectedRowIds（用于跨页选中）
+            var id = this.getRowId(data);
+            if (id !== undefined) {
+                if (checked) {
+                    this._selectedRowIds.add(id);
+                }
+                else {
+                    this._selectedRowIds.delete(id);
+                }
+            }
+            // 同步更新 _selectedRows（用于兼容性）
+            var index = this._selectedRows.findIndex(function (row) { return _this.isSameRow(row, data); });
             if (checked) {
-                // 选中
                 if (index === -1) {
                     this._selectedRows.push(data);
                 }
@@ -1339,19 +1360,18 @@
                 this._selectedTableRow = data;
             }
             else {
-                // 取消选中
                 if (index > -1) {
                     this._selectedRows.splice(index, 1);
                 }
                 // 若当前高亮行为该行，则取消高亮
                 if (this._selectedTableRow &&
-                    JSON.stringify(this._selectedTableRow) === JSON.stringify(data)) {
+                    this.isSameRow(this._selectedTableRow, data)) {
                     this._selectedTableRow = null;
                 }
             }
             this.updateCheckAllStatus();
         };
-        // 更新全选状态
+        // 更新全选状态（数据驱动模式）
         ProTableComponent.prototype.updateCheckAllStatus = function () {
             var _this = this;
             if (!this.showCheckbox || !Array.isArray(this.dataSource)) {
@@ -1361,40 +1381,122 @@
             }
             // 只计算可用的行（未禁用的行）
             var availableRows = this.dataSource.filter(function (row) { return !_this.isRowDisabled(row); });
-            var checkedCount = this._selectedRows.length;
+            // 基于数据对象的 checked 属性计算
+            var checkedCount = availableRows.filter(function (row) { return row.checked === true; }).length;
             var totalCount = availableRows.length;
             this._checkedAll =
                 totalCount > 0 && checkedCount > 0 && checkedCount === totalCount;
             this._indeterminate = checkedCount > 0 && checkedCount < totalCount;
         };
-        // 全选/取消全选
+        // 全选/取消全选（数据驱动模式）
         ProTableComponent.prototype.toggleCheckAll = function (checked, event) {
             var _this = this;
             if (event) {
                 event.stopPropagation();
             }
+            // 只处理可用的行（未禁用的行）
+            var availableRows = this.dataSource.filter(function (row) { return !_this.isRowDisabled(row); });
+            // 批量设置 checked 属性
+            availableRows.forEach(function (row) {
+                row.checked = checked;
+                // 同步更新 _selectedRowIds（用于跨页选中）
+                var id = _this.getRowId(row);
+                if (id !== undefined) {
+                    if (checked) {
+                        _this._selectedRowIds.add(id);
+                    }
+                    else {
+                        _this._selectedRowIds.delete(id);
+                    }
+                }
+            });
+            // 同步更新 _selectedRows（用于兼容性）
             if (checked) {
-                // 全选：只选中未禁用的行
-                this._selectedRows = this.dataSource.filter(function (row) { return !_this.isRowDisabled(row); });
+                this._selectedRows = __spread(availableRows);
                 // 同步设置高亮选中行为第一条可选数据
-                var availableRows = this._selectedRows;
                 this._selectedTableRow =
                     availableRows.length > 0 ? availableRows[0] : null;
             }
             else {
-                // 取消全选
                 this._selectedRows = [];
                 // 取消高亮
                 this._selectedTableRow = null;
             }
             this.updateCheckAllStatus();
         };
-        // 获取选中的行数据
+        // 获取选中的行数据（保留用于兼容性）
         ProTableComponent.prototype.getSelectedRows = function () {
-            return this._selectedRows;
+            return this.getCheckedRows();
+        };
+        // 处理行 checkbox 变化事件（数据驱动模式）
+        ProTableComponent.prototype.handleRowCheckedChange = function (data, checked) {
+            var _this = this;
+            if (this.isRowDisabled(data)) {
+                return;
+            }
+            // 数据对象的 checked 属性已经通过双向绑定自动更新
+            // 这里只需要同步更新 _selectedRowIds 和 _selectedRows
+            // 同步更新 _selectedRowIds（用于跨页选中）
+            var id = this.getRowId(data);
+            if (id !== undefined) {
+                if (checked) {
+                    this._selectedRowIds.add(id);
+                }
+                else {
+                    this._selectedRowIds.delete(id);
+                }
+            }
+            // 同步更新 _selectedRows（用于兼容性）
+            var index = this._selectedRows.findIndex(function (row) { return _this.isSameRow(row, data); });
+            if (checked) {
+                if (index === -1) {
+                    this._selectedRows.push(data);
+                }
+                // 勾选复选框时同步设置高亮选中行
+                this._selectedTableRow = data;
+            }
+            else {
+                if (index > -1) {
+                    this._selectedRows.splice(index, 1);
+                }
+                // 若当前高亮行为该行，则取消高亮
+                if (this._selectedTableRow &&
+                    this.isSameRow(this._selectedTableRow, data)) {
+                    this._selectedTableRow = null;
+                }
+            }
+            // 更新全选状态
+            this.updateCheckAllStatus();
         };
-        // 清空选中的行
+        // 刷新全选状态（用于其他场景）
+        ProTableComponent.prototype.refreshCheckAllStatus = function () {
+            this.updateCheckAllStatus();
+        };
+        // 获取行的唯一标识（用于跨页选中）
+        ProTableComponent.prototype.getRowId = function (data) {
+            var _a, _b;
+            return (_b = (_a = data.id) !== null && _a !== void 0 ? _a : data.key) !== null && _b !== void 0 ? _b : undefined;
+        };
+        // 判断两行是否为同一行
+        ProTableComponent.prototype.isSameRow = function (row1, row2) {
+            var id1 = this.getRowId(row1);
+            var id2 = this.getRowId(row2);
+            if (id1 !== undefined && id2 !== undefined) {
+                return id1 === id2;
+            }
+            // fallback 到 JSON 比较
+            return JSON.stringify(row1) === JSON.stringify(row2);
+        };
+        // 清空选中的行（数据驱动模式）
         ProTableComponent.prototype.clearSelectedRows = function () {
+            // 清空当前数据源中所有项的 checked 状态
+            if (Array.isArray(this.dataSource)) {
+                this.dataSource.forEach(function (row) {
+                    row.checked = false;
+                });
+            }
+            // 清空选中集合
+            this._selectedRowIds.clear();
             this._selectedRows = [];
             this._checkedAll = false;
             this._indeterminate = false;
@@ -1466,7 +1568,8 @@
         };
         ProTableComponent.prototype.handleQuery = function (afterDelete) {
             return __awaiter(this, void 0, void 0, function () {
-                var result, error_4;
+                var previousDataSource, result, newDataIds_1, error_4;
+                var _this = this;
                 return __generator(this, function (_d) {
                     switch (_d.label) {
                         case 0:
@@ -1477,6 +1580,7 @@
                                 this._pageInfo.pageIndex > 1) {
                                 this._pageInfo.pageIndex = this._pageInfo.pageIndex - 1;
                             }
+                            previousDataSource = afterDelete && this.showCheckbox ? __spread(this.dataSource) : [];
                             this._loading = true;
                             if (!this.request) return [3 /*break*/, 6];
                             _d.label = 1;
@@ -1490,7 +1594,38 @@
                                     : {})))];
                         case 2:
                             result = _d.sent();
-                            this.dataSource = result.data || [];
+                            // 自动注入 checked 字段，支持跨页选中
+                            if (this.showCheckbox) {
+                                this.dataSource = (result.data || []).map(function (item) {
+                                    var id = _this.getRowId(item);
+                                    // 如果数据已有 checked 属性，保留；否则根据 _selectedRowIds 判断
+                                    var checked = item.checked !== undefined
+                                        ? item.checked
+                                        : id !== undefined
+                                            ? _this._selectedRowIds.has(id)
+                                            : false;
+                                    return Object.assign(Object.assign({}, item), { checked: checked });
+                                });
+                                // 删除后查询：移除被删除项的选中状态
+                                if (afterDelete && previousDataSource.length > 0) {
+                                    newDataIds_1 = new Set(this.dataSource.map(function (item) { return _this.getRowId(item); }));
+                                    // 遍历之前的数据源，如果不在新数据源中，说明被删除了，需要清除其选中状态
+                                    previousDataSource.forEach(function (oldItem) {
+                                        var oldId = _this.getRowId(oldItem);
+                                        if (oldId !== undefined && !newDataIds_1.has(oldId)) {
+                                            // 被删除的项，从选中集合中移除
+                                            _this._selectedRowIds.delete(oldId);
+                                            // 如果数据对象还在其他地方引用，清除其选中状态
+                                            if (oldItem.checked !== undefined) {
+                                                oldItem.checked = false;
+                                            }
+                                        }
+                                    });
+                                }
+                            }
+                            else {
+                                this.dataSource = result.data || [];
+                            }
                             this.summaryData = result.summaryData || null;
                             // 本地排序模式：拿到数据后在前端排序
                             if (this.sortMode === "local") {
@@ -1518,9 +1653,7 @@
                             console.warn("未提供 _request 回调函数");
                             this._loading = false;
                             _d.label = 7;
-                        case 7:
-                            this.clearSelectedRows();
-                            return [2 /*return*/];
+                        case 7: return [2 /*return*/];
                     }
                 });
             });
@@ -1632,7 +1765,7 @@
     ProTableComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: "app-pro-table",
-                    template: "<app-page-container [title]=\"title\">\r\n  <ng-template #header>\r\n    <app-table-search-bar\r\n      *ngIf=\"showSearchBar\"\r\n      [labelWidth]=\"labelWidth\"\r\n      [labelAlign]=\"labelAlign\"\r\n    >\r\n      <ng-template #leftContent>\r\n        <nz-form-item\r\n          *ngFor=\"let column of _searchFiledColumns\"\r\n          [ngClass]=\"getFormItemClassName(column)\"\r\n        >\r\n          <nz-form-label *ngIf=\"!getFieldProps(column).hideLabel\" nzNoColon>\r\n            <!-- \u68C0\u67E5\u662F\u5426\u6709\u81EA\u5B9A\u4E49label\u6A21\u677F -->\r\n            <ng-container\r\n              *ngIf=\"\r\n                column.customLabelRender &&\r\n                  getLabelTemplate(column.customLabelRender);\r\n                else defaultLabel\r\n              \"\r\n            >\r\n              <ng-container\r\n                [ngTemplateOutlet]=\"getLabelTemplate(column.customLabelRender)\"\r\n                [ngTemplateOutletContext]=\"{\r\n                  $implicit: column,\r\n                  column: column,\r\n                  fieldProps: getFieldProps(column)\r\n                }\"\r\n              >\r\n              </ng-container>\r\n            </ng-container>\r\n            <ng-template #defaultLabel>\r\n              {{ getFieldProps(column).label || column.title }}\r\n            </ng-template>\r\n          </nz-form-label>\r\n          <nz-form-control *ngIf=\"column.valueType === 'input'\">\r\n            <input\r\n              nz-input\r\n              [name]=\"getFieldProps(column).name || column.prop\"\r\n              [placeholder]=\"getFieldProps(column).placeHolder\"\r\n              [disabled]=\"getFieldProps(column).disabled\"\r\n              [(ngModel)]=\"\r\n                _searchParams[getFieldProps(column).name || column.prop]\r\n              \"\r\n            />\r\n          </nz-form-control>\r\n          <nz-form-control *ngIf=\"column.valueType === 'inputPlate'\">\r\n            <app-plate-input\r\n              [name]=\"getFieldProps(column).name || column.prop\"\r\n              [(ngModel)]=\"\r\n                _searchParams[getFieldProps(column).name || column.prop]\r\n              \"\r\n            ></app-plate-input>\r\n          </nz-form-control>\r\n          <nz-form-control *ngIf=\"column.valueType === 'select'\">\r\n            <nz-select\r\n              [(ngModel)]=\"\r\n                _searchParams[getFieldProps(column).name || column.prop]\r\n              \"\r\n              [nzAllowClear]=\"getFieldProps(column).allowClear\"\r\n              [nzPlaceHolder]=\"getFieldProps(column).placeHolder\"\r\n              [name]=\"getFieldProps(column).name || column.prop\"\r\n              [nzOptions]=\"getFieldProps(column).options\"\r\n              [nzDisabled]=\"getFieldProps(column).disabled\"\r\n            >\r\n            </nz-select>\r\n          </nz-form-control>\r\n          <nz-form-control *ngIf=\"column.valueType === 'selectMultiple'\">\r\n            <nz-select\r\n              [(ngModel)]=\"\r\n                _searchParams[getFieldProps(column).name || column.prop]\r\n              \"\r\n              [nzAllowClear]=\"getFieldProps(column).allowClear\"\r\n              [nzPlaceHolder]=\"getFieldProps(column).placeHolder\"\r\n              [name]=\"getFieldProps(column).name || column.prop\"\r\n              [nzOptions]=\"getFieldProps(column).options\"\r\n              [nzDisabled]=\"getFieldProps(column).disabled\"\r\n              nzMode=\"multiple\"\r\n            >\r\n            </nz-select>\r\n          </nz-form-control>\r\n          <nz-form-control *ngIf=\"column.valueType === 'date'\">\r\n            <nz-date-picker\r\n              [nzShowTime]=\"getFieldProps(column).showTime\"\r\n              [nzFormat]=\"getFieldProps(column).format\"\r\n              [nzPlaceHolder]=\"getFieldProps(column).placeHolder\"\r\n              [nzAllowClear]=\"getFieldProps(column).allowClear\"\r\n              [nzDisabled]=\"getFieldProps(column).disabled\"\r\n              [(ngModel)]=\"\r\n                _searchParams[getFieldProps(column).name || column.prop]\r\n              \"\r\n              [nzMode]=\"getFieldProps(column).mode\"\r\n            ></nz-date-picker>\r\n          </nz-form-control>\r\n          <nz-form-control *ngIf=\"column.valueType === 'checkbox'\">\r\n            <nz-checkbox-group\r\n              [class]=\"\r\n                getFieldProps(column).noStyle\r\n                  ? 'pro-table-checkboxgroup-nostyle'\r\n                  : ''\r\n              \"\r\n              [(ngModel)]=\"getFieldProps(column).options\"\r\n              [nzDisabled]=\"getFieldProps(column).disabled\"\r\n              (ngModelChange)=\"\r\n                handleFieldCheckBoxChange(\r\n                  $event,\r\n                  getFieldProps(column).name || column.prop\r\n                )\r\n              \"\r\n            ></nz-checkbox-group>\r\n          </nz-form-control>\r\n          <nz-form-control *ngIf=\"column.valueType === 'autoComplete'\">\r\n            <input\r\n              nz-input\r\n              [(ngModel)]=\"\r\n                _searchParams[getFieldProps(column)?.name || column.prop]\r\n              \"\r\n              (input)=\"handleAutoCompleteInput($event, column)\"\r\n              [nzAutocomplete]=\"auto\"\r\n              [disabled]=\"getFieldProps(column)?.disabled\"\r\n              [placeholder]=\"getFieldProps(column)?.placeHolder\"\r\n            />\r\n            <nz-autocomplete\r\n              [nzBackfill]=\"getFieldProps(column).backFill\"\r\n              [nzDefaultActiveFirstOption]=\"\r\n                getFieldProps(column).defaultActiveFirstOption\r\n              \"\r\n              [nzWidth]=\"getFieldProps(column).width\"\r\n              #auto\r\n            >\r\n              <nz-auto-option\r\n                *ngFor=\"let option of getAutoCompleteDataSource(column)\"\r\n                [nzValue]=\"\r\n                  getFieldProps(column).returnFullData ? option : option.value\r\n                \"\r\n                [nzLabel]=\"option.label\"\r\n                [nzDisabled]=\"option.disabled\"\r\n              >\r\n                {{ option.label }}\r\n              </nz-auto-option>\r\n            </nz-autocomplete>\r\n          </nz-form-control>\r\n          <nz-form-control *ngIf=\"column.valueType === 'custom'\">\r\n            <app-dynamic-search-field\r\n              [component]=\"getFieldProps(column).component\"\r\n              [value]=\"_searchParams[getFieldProps(column).name || column.prop]\"\r\n              [props]=\"getFieldProps(column)\"\r\n              (valueChange)=\"\r\n                setFieldValue(getFieldProps(column).name || column.prop, $event)\r\n              \"\r\n            ></app-dynamic-search-field>\r\n          </nz-form-control>\r\n          <nz-form-control *ngIf=\"column.valueType === 'inputNumber'\">\r\n            <nz-input-number\r\n              [style.width]=\"'100%'\"\r\n              [(ngModel)]=\"\r\n                _searchParams[getFieldProps(column).name || column.prop]\r\n              \"\r\n              [nzPlaceHolder]=\"getFieldProps(column).placeHolder\"\r\n              [nzDisabled]=\"getFieldProps(column).disabled\"\r\n              [nzFormatter]=\"getFieldProps(column).formatterPercent\"\r\n              [nzParser]=\"getFieldProps(column).parserPercent\"\r\n            ></nz-input-number>\r\n          </nz-form-control>\r\n        </nz-form-item>\r\n      </ng-template>\r\n      <ng-template #actionTextBtn>\r\n        <nz-space [nzSize]=\"4\">\r\n          <nz-space-item *ngIf=\"showSearchBtn\">\r\n            <button nz-button nzType=\"primary\" (click)=\"handleSearch()\">\r\n              {{ confirmBtnText }}\r\n            </button>\r\n          </nz-space-item>\r\n          <nz-space-item *ngIf=\"showClearBtn\">\r\n            <button nz-button (click)=\"handleResetForm()\">\r\n              {{ clearBtnText }}\r\n            </button>\r\n          </nz-space-item>\r\n        </nz-space>\r\n      </ng-template>\r\n      <ng-template #actionImgBtn>\r\n        <nz-space>\r\n          <ng-container *ngTemplateOutlet=\"imgActionBarTpl\"></ng-container>\r\n          <nz-space-item class=\"setting-space-item\" *ngIf=\"showColumnSetting\">\r\n            <app-colmuns-setting\r\n              [columns]=\"columns\"\r\n              [selectedColumns]=\"_serverColumns\"\r\n              [tableName]=\"tableName\"\r\n              (afterConfirm)=\"handleColumnsSettingConfirm()\"\r\n            ></app-colmuns-setting>\r\n          </nz-space-item>\r\n        </nz-space>\r\n      </ng-template>\r\n    </app-table-search-bar>\r\n  </ng-template>\r\n  <ng-template #body>\r\n    <div class=\"mb-12\">\r\n      <ng-container *ngIf=\"showActionBar\">\r\n        <ng-container *ngTemplateOutlet=\"actionBarTpl\"></ng-container>\r\n      </ng-container>\r\n    </div>\r\n    <ng-container *ngIf=\"customTableRender\">\r\n      <ng-container *ngTemplateOutlet=\"customTableRender\"></ng-container>\r\n    </ng-container>\r\n    <nz-table\r\n      *ngIf=\"!customTableRender\"\r\n      #basicTable\r\n      nzSize=\"small\"\r\n      nzShowSizeChanger\r\n      [nzBordered]=\"bordered\"\r\n      [nzOuterBordered]=\"outerBordered\"\r\n      [nzData]=\"dataSource\"\r\n      [nzPageIndex]=\"_pageInfo.pageIndex\"\r\n      [nzPageSize]=\"_pageInfo.pageSize\"\r\n      [nzTotal]=\"_pageInfo.total\"\r\n      [nzPageSizeOptions]=\"_pageInfo.pageSizeOptions\"\r\n      [nzShowPagination]=\"showPagination\"\r\n      [nzShowTotal]=\"totalTemplate\"\r\n      [nzLoading]=\"_loading\"\r\n      [nzFrontPagination]=\"frontPagination\"\r\n      [nzScroll]=\"scroll\"\r\n      (nzPageIndexChange)=\"handlePageIndexChange($event)\"\r\n      (nzPageSizeChange)=\"handlePageSizeChange($event)\"\r\n    >\r\n      <thead>\r\n        <tr>\r\n          <!-- \u590D\u9009\u6846\u5217\uFF08\u5F53 showCheckbox=true \u65F6\u663E\u793A\uFF09 -->\r\n          <th\r\n            *ngIf=\"showCheckbox\"\r\n            [nzWidth]=\"'50px'\"\r\n            [nzAlign]=\"'center'\"\r\n            style=\"text-align: center\"\r\n          >\r\n            <label\r\n              nz-checkbox\r\n              [(ngModel)]=\"_checkedAll\"\r\n              [nzIndeterminate]=\"_indeterminate\"\r\n              (ngModelChange)=\"toggleCheckAll($event)\"\r\n              (click)=\"$event.stopPropagation()\"\r\n            ></label>\r\n          </th>\r\n          <th\r\n            *ngFor=\"let column of _columns\"\r\n            [nzWidth]=\"column.width\"\r\n            [nzAlign]=\"column.align\"\r\n            [nzLeft]=\"column.fixedLeft\"\r\n            [nzRight]=\"column.fixedRight\"\r\n            [nzShowSort]=\"!!column.sorter\"\r\n            [nzSortOrder]=\"getSortOrder(column.prop)\"\r\n            (nzSortOrderChange)=\"onSortChange(column.prop, $event)\"\r\n          >\r\n            {{ column.title }}\r\n          </th>\r\n        </tr>\r\n      </thead>\r\n\r\n      <tbody>\r\n        <tr\r\n          style=\"cursor: pointer\"\r\n          *ngFor=\"let data; let i = index; of: basicTable.data\"\r\n          [ngClass]=\"{\r\n            'ant-table-custom-row-selected': !!getTableRowChecked(data),\r\n            'ant-table-custom-row-even': i % 2 === 0,\r\n            'ant-table-custom-row-odd': i % 2 !== 0\r\n          }\"\r\n          (click)=\"handleTableRowClick(data)\"\r\n          (dblclick)=\"handleTableRowDbClick(data)\"\r\n        >\r\n          <!-- \u590D\u9009\u6846\u5217\uFF08\u5F53 showCheckbox=true \u65F6\u663E\u793A\uFF09 -->\r\n          <td\r\n            *ngIf=\"showCheckbox\"\r\n            [nzAlign]=\"'center'\"\r\n            style=\"text-align: center\"\r\n            (click)=\"$event.stopPropagation()\"\r\n          >\r\n            <label\r\n              nz-checkbox\r\n              [ngModel]=\"isRowChecked(data)\"\r\n              [nzDisabled]=\"isRowDisabled(data)\"\r\n              (ngModelChange)=\"toggleRowChecked(data, $event)\"\r\n            ></label>\r\n          </td>\r\n          <td\r\n            *ngFor=\"let column of _columns\"\r\n            [nzLeft]=\"column.fixedLeft\"\r\n            [nzRight]=\"column.fixedRight\"\r\n            [nzAlign]=\"column.align\"\r\n            class=\"pro-ellipsis\"\r\n            [title]=\"data[column.prop]\"\r\n          >\r\n            <!-- \u68C0\u67E5\u662F\u5426\u6709\u81EA\u5B9A\u4E49\u6A21\u677F -->\r\n            <ng-container\r\n              *ngIf=\"\r\n                column.customRender && getTemplate(column.customRender);\r\n                let template\r\n              \"\r\n            >\r\n              <ng-template\r\n                [ngTemplateOutlet]=\"template\"\r\n                [ngTemplateOutletContext]=\"{\r\n                  $implicit: data,\r\n                  data: data,\r\n                  column: column,\r\n                  index: i,\r\n                  pageInfo: _pageInfo\r\n                }\"\r\n              >\r\n              </ng-template>\r\n            </ng-container>\r\n\r\n            <!-- \u9ED8\u8BA4\u6E32\u67D3\u903B\u8F91 -->\r\n            <ng-container\r\n              *ngIf=\"!column.customRender || !getTemplate(column.customRender)\"\r\n            >\r\n              {{ data[column.prop] }}\r\n            </ng-container>\r\n          </td>\r\n        </tr>\r\n        <tr *ngIf=\"summaryData && _pageInfo.total > 0\">\r\n          <!-- \u6C47\u603B\u884C\u7684\u590D\u9009\u6846\u5217\uFF08\u5F53 showCheckbox=true \u65F6\u663E\u793A\uFF0C\u4F46\u4E3A\u7A7A\uFF09 -->\r\n          <td\r\n            *ngIf=\"showCheckbox\"\r\n            style=\"font-weight: bold; border-right: 1px solid #e8e8e8\"\r\n          ></td>\r\n          <td\r\n            *ngFor=\"let column; let i = index; of: _columns\"\r\n            [nzLeft]=\"column.fixedLeft\"\r\n            [nzRight]=\"column.fixedRight\"\r\n            style=\"font-weight: bold; border-right: 1px solid #e8e8e8\"\r\n            [nzAlign]=\"column.align\"\r\n          >\r\n            <span *ngIf=\"i === 0\">\u603B\u8BA1</span>\r\n            <ng-container *ngIf=\"i !== 0 && column.summary\">\r\n              {{\r\n                column.summary?.format\r\n                  ? column.summary?.format(\r\n                      summaryData[column.summary?.name || column.prop]\r\n                    )\r\n                  : summaryData[column.summary?.name || column.prop]\r\n              }}\r\n            </ng-container>\r\n          </td>\r\n        </tr>\r\n      </tbody>\r\n      <ng-template #totalTemplate let-total\r\n        >\u5171 {{ _pageInfo.total }} \u6761\u8BB0\u5F55</ng-template\r\n      >\r\n    </nz-table>\r\n  </ng-template>\r\n</app-page-container>\r\n",
+                    template: "<app-page-container\r\n  [title]=\"title\"\r\n  [showHeader]=\"showSearchBar\"\r\n  ngClass=\"pro-table-container\"\r\n>\r\n  <ng-template #header>\r\n    <app-table-search-bar\r\n      *ngIf=\"showSearchBar\"\r\n      [labelWidth]=\"labelWidth\"\r\n      [labelAlign]=\"labelAlign\"\r\n    >\r\n      <ng-template #leftContent>\r\n        <nz-form-item\r\n          *ngFor=\"let column of _searchFiledColumns\"\r\n          [ngClass]=\"getFormItemClassName(column)\"\r\n        >\r\n          <nz-form-label *ngIf=\"!getFieldProps(column).hideLabel\" nzNoColon>\r\n            <!-- \u68C0\u67E5\u662F\u5426\u6709\u81EA\u5B9A\u4E49label\u6A21\u677F -->\r\n            <ng-container\r\n              *ngIf=\"\r\n                column.customLabelRender &&\r\n                  getLabelTemplate(column.customLabelRender);\r\n                else defaultLabel\r\n              \"\r\n            >\r\n              <ng-container\r\n                [ngTemplateOutlet]=\"getLabelTemplate(column.customLabelRender)\"\r\n                [ngTemplateOutletContext]=\"{\r\n                  $implicit: column,\r\n                  column: column,\r\n                  fieldProps: getFieldProps(column)\r\n                }\"\r\n              >\r\n              </ng-container>\r\n            </ng-container>\r\n            <ng-template #defaultLabel>\r\n              {{ getFieldProps(column).label || column.title }}\r\n            </ng-template>\r\n          </nz-form-label>\r\n          <nz-form-control *ngIf=\"column.valueType === 'input'\">\r\n            <input\r\n              nz-input\r\n              [name]=\"getFieldProps(column).name || column.prop\"\r\n              [placeholder]=\"getFieldProps(column).placeHolder\"\r\n              [disabled]=\"getFieldProps(column).disabled\"\r\n              [(ngModel)]=\"\r\n                _searchParams[getFieldProps(column).name || column.prop]\r\n              \"\r\n            />\r\n          </nz-form-control>\r\n          <nz-form-control *ngIf=\"column.valueType === 'inputPlate'\">\r\n            <app-plate-input\r\n              [name]=\"getFieldProps(column).name || column.prop\"\r\n              [(ngModel)]=\"\r\n                _searchParams[getFieldProps(column).name || column.prop]\r\n              \"\r\n            ></app-plate-input>\r\n          </nz-form-control>\r\n          <nz-form-control *ngIf=\"column.valueType === 'select'\">\r\n            <nz-select\r\n              [(ngModel)]=\"\r\n                _searchParams[getFieldProps(column).name || column.prop]\r\n              \"\r\n              [nzAllowClear]=\"getFieldProps(column).allowClear\"\r\n              [nzPlaceHolder]=\"getFieldProps(column).placeHolder\"\r\n              [name]=\"getFieldProps(column).name || column.prop\"\r\n              [nzOptions]=\"getFieldProps(column).options\"\r\n              [nzDisabled]=\"getFieldProps(column).disabled\"\r\n            >\r\n            </nz-select>\r\n          </nz-form-control>\r\n          <nz-form-control *ngIf=\"column.valueType === 'selectMultiple'\">\r\n            <nz-select\r\n              [(ngModel)]=\"\r\n                _searchParams[getFieldProps(column).name || column.prop]\r\n              \"\r\n              [nzAllowClear]=\"getFieldProps(column).allowClear\"\r\n              [nzPlaceHolder]=\"getFieldProps(column).placeHolder\"\r\n              [name]=\"getFieldProps(column).name || column.prop\"\r\n              [nzOptions]=\"getFieldProps(column).options\"\r\n              [nzDisabled]=\"getFieldProps(column).disabled\"\r\n              nzMode=\"multiple\"\r\n            >\r\n            </nz-select>\r\n          </nz-form-control>\r\n          <nz-form-control *ngIf=\"column.valueType === 'date'\">\r\n            <nz-date-picker\r\n              [nzShowTime]=\"getFieldProps(column).showTime\"\r\n              [nzFormat]=\"getFieldProps(column).format\"\r\n              [nzPlaceHolder]=\"getFieldProps(column).placeHolder\"\r\n              [nzAllowClear]=\"getFieldProps(column).allowClear\"\r\n              [nzDisabled]=\"getFieldProps(column).disabled\"\r\n              [(ngModel)]=\"\r\n                _searchParams[getFieldProps(column).name || column.prop]\r\n              \"\r\n              [nzMode]=\"getFieldProps(column).mode\"\r\n            ></nz-date-picker>\r\n          </nz-form-control>\r\n          <nz-form-control *ngIf=\"column.valueType === 'checkbox'\">\r\n            <nz-checkbox-group\r\n              [class]=\"\r\n                getFieldProps(column).noStyle\r\n                  ? 'pro-table-checkboxgroup-nostyle'\r\n                  : ''\r\n              \"\r\n              [(ngModel)]=\"getFieldProps(column).options\"\r\n              [nzDisabled]=\"getFieldProps(column).disabled\"\r\n              (ngModelChange)=\"\r\n                handleFieldCheckBoxChange(\r\n                  $event,\r\n                  getFieldProps(column).name || column.prop\r\n                )\r\n              \"\r\n            ></nz-checkbox-group>\r\n          </nz-form-control>\r\n          <nz-form-control *ngIf=\"column.valueType === 'autoComplete'\">\r\n            <input\r\n              nz-input\r\n              [(ngModel)]=\"\r\n                _searchParams[getFieldProps(column)?.name || column.prop]\r\n              \"\r\n              (input)=\"handleAutoCompleteInput($event, column)\"\r\n              [nzAutocomplete]=\"auto\"\r\n              [disabled]=\"getFieldProps(column)?.disabled\"\r\n              [placeholder]=\"getFieldProps(column)?.placeHolder\"\r\n            />\r\n            <nz-autocomplete\r\n              [nzBackfill]=\"getFieldProps(column).backFill\"\r\n              [nzDefaultActiveFirstOption]=\"\r\n                getFieldProps(column).defaultActiveFirstOption\r\n              \"\r\n              [nzWidth]=\"getFieldProps(column).width\"\r\n              #auto\r\n            >\r\n              <nz-auto-option\r\n                *ngFor=\"let option of getAutoCompleteDataSource(column)\"\r\n                [nzValue]=\"\r\n                  getFieldProps(column).returnFullData ? option : option.value\r\n                \"\r\n                [nzLabel]=\"option.label\"\r\n                [nzDisabled]=\"option.disabled\"\r\n              >\r\n                {{ option.label }}\r\n              </nz-auto-option>\r\n            </nz-autocomplete>\r\n          </nz-form-control>\r\n          <nz-form-control *ngIf=\"column.valueType === 'custom'\">\r\n            <app-dynamic-search-field\r\n              [component]=\"getFieldProps(column).component\"\r\n              [value]=\"_searchParams[getFieldProps(column).name || column.prop]\"\r\n              [props]=\"getFieldProps(column)\"\r\n              (valueChange)=\"\r\n                setFieldValue(getFieldProps(column).name || column.prop, $event)\r\n              \"\r\n            ></app-dynamic-search-field>\r\n          </nz-form-control>\r\n          <nz-form-control *ngIf=\"column.valueType === 'inputNumber'\">\r\n            <nz-input-number\r\n              [style.width]=\"'100%'\"\r\n              [(ngModel)]=\"\r\n                _searchParams[getFieldProps(column).name || column.prop]\r\n              \"\r\n              [nzPlaceHolder]=\"getFieldProps(column).placeHolder\"\r\n              [nzDisabled]=\"getFieldProps(column).disabled\"\r\n              [nzFormatter]=\"getFieldProps(column).formatterPercent\"\r\n              [nzParser]=\"getFieldProps(column).parserPercent\"\r\n            ></nz-input-number>\r\n          </nz-form-control>\r\n        </nz-form-item>\r\n      </ng-template>\r\n      <ng-template #actionTextBtn>\r\n        <nz-space [nzSize]=\"4\">\r\n          <nz-space-item *ngIf=\"showSearchBtn\">\r\n            <button nz-button nzType=\"primary\" (click)=\"handleSearch()\">\r\n              {{ confirmBtnText }}\r\n            </button>\r\n          </nz-space-item>\r\n          <nz-space-item *ngIf=\"showClearBtn\">\r\n            <button nz-button (click)=\"handleResetForm()\">\r\n              {{ clearBtnText }}\r\n            </button>\r\n          </nz-space-item>\r\n        </nz-space>\r\n      </ng-template>\r\n      <ng-template #actionImgBtn>\r\n        <nz-space>\r\n          <ng-container *ngTemplateOutlet=\"imgActionBarTpl\"></ng-container>\r\n          <nz-space-item class=\"setting-space-item\" *ngIf=\"showColumnSetting\">\r\n            <app-colmuns-setting\r\n              [columns]=\"columns\"\r\n              [selectedColumns]=\"_serverColumns\"\r\n              [tableName]=\"tableName\"\r\n              (afterConfirm)=\"handleColumnsSettingConfirm()\"\r\n            ></app-colmuns-setting>\r\n          </nz-space-item>\r\n        </nz-space>\r\n      </ng-template>\r\n    </app-table-search-bar>\r\n  </ng-template>\r\n\r\n  <ng-template #body>\r\n    <div class=\"mb-12\">\r\n      <ng-container *ngIf=\"showActionBar\">\r\n        <ng-container *ngTemplateOutlet=\"actionBarTpl\"></ng-container>\r\n      </ng-container>\r\n    </div>\r\n    <ng-container *ngIf=\"customTableRender\">\r\n      <ng-container *ngTemplateOutlet=\"customTableRender\"></ng-container>\r\n    </ng-container>\r\n    <nz-table\r\n      *ngIf=\"!customTableRender\"\r\n      #dynamicTable\r\n      nzSize=\"small\"\r\n      nzShowSizeChanger\r\n      [nzBordered]=\"bordered\"\r\n      [nzOuterBordered]=\"outerBordered\"\r\n      [nzData]=\"dataSource\"\r\n      [nzPageIndex]=\"_pageInfo.pageIndex\"\r\n      [nzPageSize]=\"_pageInfo.pageSize\"\r\n      [nzTotal]=\"_pageInfo.total\"\r\n      [nzPageSizeOptions]=\"_pageInfo.pageSizeOptions\"\r\n      [nzShowPagination]=\"showPagination\"\r\n      [nzShowTotal]=\"totalTemplate\"\r\n      [nzLoading]=\"_loading\"\r\n      [nzFrontPagination]=\"frontPagination\"\r\n      [nzScroll]=\"scroll\"\r\n      (nzPageIndexChange)=\"handlePageIndexChange($event)\"\r\n      (nzPageSizeChange)=\"handlePageSizeChange($event)\"\r\n    >\r\n      <thead>\r\n        <tr>\r\n          <!-- \u590D\u9009\u6846\u5217\uFF08\u5F53 showCheckbox=true \u65F6\u663E\u793A\uFF09 -->\r\n          <th\r\n            *ngIf=\"showCheckbox\"\r\n            [nzWidth]=\"'50px'\"\r\n            [nzAlign]=\"'center'\"\r\n            style=\"text-align: center\"\r\n            [(nzChecked)]=\"_checkedAll\"\r\n            [nzIndeterminate]=\"_indeterminate\"\r\n            (nzCheckedChange)=\"toggleCheckAll($event)\"\r\n            (click)=\"$event.stopPropagation()\"\r\n          ></th>\r\n          <th\r\n            *ngFor=\"let column of _columns\"\r\n            [nzWidth]=\"column.width\"\r\n            [nzAlign]=\"column.align\"\r\n            [nzLeft]=\"column.fixedLeft\"\r\n            [nzRight]=\"column.fixedRight\"\r\n            [nzShowSort]=\"!!column.sorter\"\r\n            [nzSortOrder]=\"getSortOrder(column.prop)\"\r\n            (nzSortOrderChange)=\"onSortChange(column.prop, $event)\"\r\n          >\r\n            {{ column.title }}\r\n          </th>\r\n        </tr>\r\n      </thead>\r\n\r\n      <tbody>\r\n        <tr\r\n          style=\"cursor: pointer\"\r\n          *ngFor=\"let data; let i = index; of: dynamicTable.data\"\r\n          [ngClass]=\"{\r\n            'ant-table-custom-row-selected': !!getTableRowChecked(data),\r\n            'ant-table-custom-row-even': i % 2 === 0,\r\n            'ant-table-custom-row-odd': i % 2 !== 0\r\n          }\"\r\n          (click)=\"handleTableRowClick(data)\"\r\n          (dblclick)=\"handleTableRowDbClick(data)\"\r\n        >\r\n          <!-- \u590D\u9009\u6846\u5217\uFF08\u5F53 showCheckbox=true \u65F6\u663E\u793A\uFF09 -->\r\n          <td\r\n            *ngIf=\"showCheckbox\"\r\n            [nzAlign]=\"'center'\"\r\n            style=\"text-align: center\"\r\n            [(nzChecked)]=\"data.checked\"\r\n            [nzDisabled]=\"isRowDisabled(data)\"\r\n            (nzCheckedChange)=\"handleRowCheckedChange(data, $event)\"\r\n            (click)=\"$event.stopPropagation()\"\r\n          ></td>\r\n          <td\r\n            *ngFor=\"let column of _columns\"\r\n            [nzLeft]=\"column.fixedLeft\"\r\n            [nzRight]=\"column.fixedRight\"\r\n            [nzAlign]=\"column.align\"\r\n            class=\"pro-ellipsis\"\r\n            [title]=\"data[column.prop]\"\r\n          >\r\n            <!-- \u68C0\u67E5\u662F\u5426\u6709\u81EA\u5B9A\u4E49\u6A21\u677F -->\r\n            <ng-container\r\n              *ngIf=\"\r\n                column.customRender && getTemplate(column.customRender);\r\n                let template\r\n              \"\r\n            >\r\n              <ng-template\r\n                [ngTemplateOutlet]=\"template\"\r\n                [ngTemplateOutletContext]=\"{\r\n                  $implicit: data,\r\n                  data: data,\r\n                  column: column,\r\n                  index: i,\r\n                  pageInfo: _pageInfo\r\n                }\"\r\n              >\r\n              </ng-template>\r\n            </ng-container>\r\n\r\n            <!-- \u9ED8\u8BA4\u6E32\u67D3\u903B\u8F91 -->\r\n            <ng-container\r\n              *ngIf=\"!column.customRender || !getTemplate(column.customRender)\"\r\n            >\r\n              {{ data[column.prop] }}\r\n            </ng-container>\r\n          </td>\r\n        </tr>\r\n        <tr *ngIf=\"summaryData && _pageInfo.total > 0\">\r\n          <!-- \u6C47\u603B\u884C\u7684\u590D\u9009\u6846\u5217\uFF08\u5F53 showCheckbox=true \u65F6\u663E\u793A\uFF0C\u4F46\u4E3A\u7A7A\uFF09 -->\r\n          <td\r\n            *ngIf=\"showCheckbox\"\r\n            style=\"font-weight: bold; border-right: 1px solid #e8e8e8\"\r\n          ></td>\r\n          <td\r\n            *ngFor=\"let column; let i = index; of: _columns\"\r\n            [nzLeft]=\"column.fixedLeft\"\r\n            [nzRight]=\"column.fixedRight\"\r\n            style=\"font-weight: bold; border-right: 1px solid #e8e8e8\"\r\n            [nzAlign]=\"column.align\"\r\n          >\r\n            <span *ngIf=\"i === 0\">\u603B\u8BA1</span>\r\n            <ng-container *ngIf=\"i !== 0 && column.summary\">\r\n              {{\r\n                column.summary?.format\r\n                  ? column.summary?.format(\r\n                      summaryData[column.summary?.name || column.prop]\r\n                    )\r\n                  : summaryData[column.summary?.name || column.prop]\r\n              }}\r\n            </ng-container>\r\n          </td>\r\n        </tr>\r\n      </tbody>\r\n      <ng-template #totalTemplate let-total\r\n        >\u5171 {{ _pageInfo.total }} \u6761\u8BB0\u5F55</ng-template\r\n      >\r\n    </nz-table>\r\n  </ng-template>\r\n</app-page-container>\r\n",
                     styles: [".pro-ellipsis{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}::ng-deep .setting-space-item{margin-right:0!important}::ng-deep .pro-table-checkboxgroup-nostyle{white-space:nowrap}::ng-deep .ant-table-bordered .ant-table-container .ant-table-content .ant-table-body table{border-collapse:separate;border-spacing:0}::ng-deep .ant-table-bordered .ant-table-container .ant-table-content .ant-table-body .ant-table-tbody>tr>td{border-right:1px solid #e8e8e8!important}::ng-deep .ant-table-bordered .ant-table-container .ant-table-content .ant-table-body .ant-table-thead>tr>th{border-bottom:1px solid #e8e8e8!important;border-right:1px solid #e8e8e8!important;white-space:nowrap}::ng-deep .ant-table-bordered .ant-table-container .ant-table-content .ant-table-body .ant-table-tbody>tr>td:first-child,::ng-deep .ant-table-bordered .ant-table-container .ant-table-content .ant-table-body .ant-table-thead>tr>th:first-child{border-left:none!important}::ng-deep .ant-table-bordered .ant-table-container .ant-table-content .ant-table-body .ant-table-cell-fix-left,::ng-deep .ant-table-bordered .ant-table-container .ant-table-content .ant-table-body .ant-table-cell-fix-right,::ng-deep .ant-table-bordered .ant-table-container .ant-table-content .ant-table-header .ant-table-thead>tr>th.ant-table-cell-fix-left,::ng-deep .ant-table-bordered .ant-table-container .ant-table-content .ant-table-header .ant-table-thead>tr>th.ant-table-cell-fix-right{border-bottom:1px solid #e8e8e8!important;border-right:1px solid #e8e8e8!important}::ng-deep .ant-table-bordered .ant-table-container .ant-table-content .ant-table-header .ant-table-thead>tr>th{border-top:1px solid #e8e8e8!important}::ng-deep .ant-table-bordered .ant-table-container .ant-table-content .ant-table-body .ant-table-tbody>tr>td:last-child,::ng-deep .ant-table-bordered .ant-table-container .ant-table-content .ant-table-body .ant-table-thead>tr>th:last-child{border-right:1px solid #e8e8e8!important}::ng-deep .ant-table-bordered .ant-table-container .ant-table-content .ant-table-body .ant-table-tbody>tr:last-child>td{border-bottom:1px solid #e8e8e8!important}::ng-deep .table-search-bar-left .ant-form-item{margin-bottom:8px}"]
                 },] }
     ];
@@ -1679,6 +1812,7 @@
     var PageContainerComponent = /** @class */ (function () {
         function PageContainerComponent() {
             this.title = "";
+            this.showHeader = true;
         }
         PageContainerComponent.prototype.ngOnInit = function () { };
         return PageContainerComponent;
@@ -1686,13 +1820,14 @@
     PageContainerComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: "app-page-container",
-                    template: "<nz-card\r\n  [nzBorderless]=\"true\"\r\n  [nzBodyStyle]=\"{ padding: '10px', width: '100%' }\"\r\n>\r\n  <div class=\"page-container-title\" *ngIf=\"title\">{{ title }}</div>\r\n  <div class=\"page-container-header\">\r\n    <ng-container *ngTemplateOutlet=\"headerTpl\"></ng-container>\r\n  </div>\r\n  <div class=\"page-container-body\">\r\n    <ng-container *ngTemplateOutlet=\"bodyTpl\"></ng-container>\r\n  </div>\r\n</nz-card>\r\n",
+                    template: "<nz-card\r\n  [nzBorderless]=\"true\"\r\n  [nzBodyStyle]=\"{ padding: '10px', width: '100%' }\"\r\n>\r\n  <div class=\"page-container-title\" *ngIf=\"title\">{{ title }}</div>\r\n  <div class=\"page-container-header\" *ngIf=\"showHeader\">\r\n    <ng-container *ngTemplateOutlet=\"headerTpl\"></ng-container>\r\n  </div>\r\n  <div class=\"page-container-body\">\r\n    <ng-container *ngTemplateOutlet=\"bodyTpl\"></ng-container>\r\n  </div>\r\n</nz-card>\r\n",
                     styles: [".page-container-title{border-left:3px solid #096dd9;color:#1d1d1d;font-size:16px;margin-bottom:16px;padding-left:10px}.page-container-body,.page-container-header{box-sizing:border-box;padding:7px}"]
                 },] }
     ];
     PageContainerComponent.ctorParameters = function () { return []; };
     PageContainerComponent.propDecorators = {
         title: [{ type: i0.Input }],
+        showHeader: [{ type: i0.Input }],
         headerTpl: [{ type: i0.ContentChild, args: ["header",] }],
         bodyTpl: [{ type: i0.ContentChild, args: ["body",] }]
     };
@@ -2324,6 +2459,7 @@
             this.formStore = {};
             this.formModifyType = "create";
             // ==================== 私有属性 ====================
+            this.formRegisterStore = {};
             this.labelWidth = "120px";
             this.labelAlign = "right";
             this.labelObservers = {};
@@ -2338,6 +2474,37 @@
             };
         }
         // ==================== 表单创建和初始化 ====================
+        // 判断是否为嵌套 FormGroup 配置
+        AntdFormService.prototype.isFormGroupConfig = function (config) {
+            return (typeof config === "object" &&
+                config !== null &&
+                "type" in config &&
+                config.type === "group");
+        };
+        // 递归创建嵌套 FormGroup
+        AntdFormService.prototype.createNestedFormGroup = function (fields, disabled) {
+            var _this = this;
+            var groupConfig = {};
+            Object.entries(fields).forEach(function (_f) {
+                var _g = __read(_f, 2), key = _g[0], fieldConfig = _g[1];
+                var _a, _b, _c, _d, _e;
+                if (_this.isFormGroupConfig(fieldConfig)) {
+                    // 递归创建嵌套的 FormGroup
+                    groupConfig[key] = _this.createNestedFormGroup(fieldConfig.fields, (_a = fieldConfig.disabled) !== null && _a !== void 0 ? _a : disabled);
+                }
+                else {
+                    // 创建普通 FormControl
+                    groupConfig[key] = [
+                        {
+                            value: fieldConfig.value,
+                            disabled: (_c = (_b = fieldConfig.disabled) !== null && _b !== void 0 ? _b : disabled) !== null && _c !== void 0 ? _c : false,
+                        },
+                        (_e = (_d = fieldConfig.validators) === null || _d === void 0 ? void 0 : _d.call(fieldConfig)) !== null && _e !== void 0 ? _e : [],
+                    ];
+                }
+            });
+            return this.fb.group(groupConfig);
+        };
         // 初始化表单
         AntdFormService.prototype.createFormGroup = function (name, config, options) {
             var _this = this;
@@ -2346,12 +2513,27 @@
             Object.entries(config).forEach(function (_f) {
                 var _g = __read(_f, 2), key = _g[0], fieldConfig = _g[1];
                 var _a, _b, _c;
-                groupConfig[key] = [
-                    { value: fieldConfig.value, disabled: (_a = fieldConfig.disabled) !== null && _a !== void 0 ? _a : false },
-                    (_c = (_b = fieldConfig.validators) === null || _b === void 0 ? void 0 : _b.call(fieldConfig)) !== null && _c !== void 0 ? _c : [],
-                ];
-                if (fieldConfig.errorMessages) {
-                    _this.errorMessageStore[name][key] = fieldConfig.errorMessages;
+                if (_this.isFormGroupConfig(fieldConfig)) {
+                    // 处理嵌套 FormGroup
+                    var nestedGroup = _this.createNestedFormGroup(fieldConfig.fields, fieldConfig.disabled);
+                    groupConfig[key] = nestedGroup;
+                    // 存储嵌套 FormGroup 的错误消息（如果需要）
+                    if (fieldConfig.errorMessages) {
+                        _this.errorMessageStore[name][key] = fieldConfig.errorMessages;
+                    }
+                }
+                else {
+                    // 处理普通字段
+                    groupConfig[key] = [
+                        {
+                            value: fieldConfig.value,
+                            disabled: (_a = fieldConfig.disabled) !== null && _a !== void 0 ? _a : false,
+                        },
+                        (_c = (_b = fieldConfig.validators) === null || _b === void 0 ? void 0 : _b.call(fieldConfig)) !== null && _c !== void 0 ? _c : [],
+                    ];
+                    if (fieldConfig.errorMessages) {
+                        _this.errorMessageStore[name][key] = fieldConfig.errorMessages;
+                    }
                 }
             });
             if (options === null || options === void 0 ? void 0 : options.labelWidth) {
@@ -2361,6 +2543,7 @@
                 this.labelAlign = options.labelAlign;
             }
             this.formStore[name] = this.fb.group(groupConfig);
+            this.formRegisterStore[name] = true;
             this.setCSSVariablesToTarget(name);
             return this.formStore[name];
         };
@@ -2370,6 +2553,58 @@
             var _a;
             (_a = this.formStore[name]) === null || _a === void 0 ? void 0 : _a.reset(value);
         };
+        // 检测表单是否完成注册
+        AntdFormService.prototype.isFormRegistered = function (name) {
+            var _a;
+            return (_a = this.formRegisterStore[name]) !== null && _a !== void 0 ? _a : false;
+        };
+        // 销毁对应的表单
+        AntdFormService.prototype.destory = function (names) {
+            var _this = this;
+            names.forEach(function (name) {
+                // 2. 清理错误消息存储
+                if (_this.errorMessageStore[name]) {
+                    delete _this.errorMessageStore[name];
+                }
+                // 3. 清理表单注册标记
+                if (_this.formRegisterStore[name]) {
+                    delete _this.formRegisterStore[name];
+                }
+                // 4. 清理表单组（Angular 会自动处理 FormGroup 的清理）
+                if (_this.formStore[name]) {
+                    delete _this.formStore[name];
+                }
+            });
+        };
+        // 根据路径获取嵌套的 FormGroup
+        AntdFormService.prototype.getNestedFormGroup = function (formGroup, path) {
+            var e_1, _f;
+            if (!path || path.trim() === "") {
+                return formGroup;
+            }
+            var pathParts = path.split(".").filter(function (p) { return p.trim() !== ""; });
+            var currentGroup = formGroup;
+            try {
+                for (var pathParts_1 = __values(pathParts), pathParts_1_1 = pathParts_1.next(); !pathParts_1_1.done; pathParts_1_1 = pathParts_1.next()) {
+                    var part = pathParts_1_1.value;
+                    if (!currentGroup || !(currentGroup instanceof i1.FormGroup)) {
+                        return null;
+                    }
+                    currentGroup = currentGroup.get(part);
+                    if (!currentGroup || !(currentGroup instanceof i1.FormGroup)) {
+                        return null;
+                    }
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (pathParts_1_1 && !pathParts_1_1.done && (_f = pathParts_1.return)) _f.call(pathParts_1);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+            return currentGroup instanceof i1.FormGroup ? currentGroup : null;
+        };
         // 批量添加字段配置
         AntdFormService.prototype.addFieldsConfig = function (formName, fieldsConfig, options) {
             var _this = this;
@@ -2380,8 +2615,8 @@
                 failed: [],
             };
             // 1. 验证表单是否存在
-            var formGroup = this.formStore[formName];
-            if (!formGroup) {
+            var rootFormGroup = this.formStore[formName];
+            if (!rootFormGroup) {
                 // 如果表单不存在，所有字段都失败
                 Object.keys(fieldsConfig).forEach(function (fieldName) {
                     var _a;
@@ -2395,21 +2630,42 @@
                 result.success = false;
                 return result;
             }
-            // 2. 初始化 errorMessageStore（如果不存在）
+            // 2. 获取目标 FormGroup（支持嵌套路径）
+            var targetPath = options === null || options === void 0 ? void 0 : options.targetPath;
+            var targetFormGroup = targetPath
+                ? this.getNestedFormGroup(rootFormGroup, targetPath)
+                : rootFormGroup;
+            if (!targetFormGroup) {
+                // 如果目标 FormGroup 不存在，所有字段都失败
+                Object.keys(fieldsConfig).forEach(function (fieldName) {
+                    var _a;
+                    var error = targetPath
+                        ? "Target FormGroup at path \"" + targetPath + "\" not found"
+                        : "FormGroup not found";
+                    result.failed.push({
+                        fieldName: fieldName,
+                        error: error,
+                    });
+                    (_a = options === null || options === void 0 ? void 0 : options.onFieldAdded) === null || _a === void 0 ? void 0 : _a.call(options, fieldName, false, error);
+                });
+                result.success = false;
+                return result;
+            }
+            // 3. 初始化 errorMessageStore（如果不存在）
             if (!this.errorMessageStore[formName]) {
                 this.errorMessageStore[formName] = {};
             }
-            // 3. 批量构建控件配置
+            // 4. 批量构建控件配置
             var controlsToAdd = {};
             var errorMessagesToAdd = {};
-            // 4. 遍历所有字段配置，进行验证和构建
+            // 5. 遍历所有字段配置，进行验证和构建
             Object.entries(fieldsConfig).forEach(function (_f) {
                 var _g = __read(_f, 2), fieldName = _g[0], fieldConfig = _g[1];
                 var _a, _b, _c, _d, _e;
                 try {
-                    // 4.1 检查字段是否已存在
-                    if (formGroup.get(fieldName)) {
-                        var error = "Field \"" + fieldName + "\" already exists";
+                    // 5.1 检查字段是否已存在
+                    if (targetFormGroup.get(fieldName)) {
+                        var error = "Field \"" + fieldName + "\" already exists" + (targetPath ? " in \"" + targetPath + "\"" : "");
                         result.failed.push({
                             fieldName: fieldName,
                             error: error,
@@ -2417,20 +2673,38 @@
                         (_a = options === null || options === void 0 ? void 0 : options.onFieldAdded) === null || _a === void 0 ? void 0 : _a.call(options, fieldName, false, error);
                         return;
                     }
-                    // 4.2 创建控件
-                    var controlOptions = {
-                        validators: (_c = (_b = fieldConfig.validators) === null || _b === void 0 ? void 0 : _b.call(fieldConfig)) !== null && _c !== void 0 ? _c : [],
-                    };
-                    var control = _this.fb.control(fieldConfig.value, controlOptions);
-                    // 设置 disabled 状态
-                    if (fieldConfig.disabled) {
-                        control.disable();
+                    // 5.2 创建控件
+                    var control = void 0;
+                    if (_this.isFormGroupConfig(fieldConfig)) {
+                        // 创建嵌套 FormGroup
+                        control = _this.createNestedFormGroup(fieldConfig.fields, fieldConfig.disabled);
+                        // 存储嵌套 FormGroup 的错误消息（如果需要）
+                        if (fieldConfig.errorMessages) {
+                            var errorMessageKey = targetPath
+                                ? targetPath + "." + fieldName
+                                : fieldName;
+                            errorMessagesToAdd[errorMessageKey] = fieldConfig.errorMessages;
+                        }
                     }
-                    controlsToAdd[fieldName] = control;
-                    // 存储错误消息
-                    if (fieldConfig.errorMessages) {
-                        errorMessagesToAdd[fieldName] = fieldConfig.errorMessages;
+                    else {
+                        // 创建普通 FormControl
+                        var controlOptions = {
+                            validators: (_c = (_b = fieldConfig.validators) === null || _b === void 0 ? void 0 : _b.call(fieldConfig)) !== null && _c !== void 0 ? _c : [],
+                        };
+                        control = _this.fb.control(fieldConfig.value, controlOptions);
+                        // 设置 disabled 状态
+                        if (fieldConfig.disabled) {
+                            control.disable();
+                        }
+                        // 存储错误消息
+                        if (fieldConfig.errorMessages) {
+                            var errorMessageKey = targetPath
+                                ? targetPath + "." + fieldName
+                                : fieldName;
+                            errorMessagesToAdd[errorMessageKey] = fieldConfig.errorMessages;
+                        }
                     }
+                    controlsToAdd[fieldName] = control;
                     result.added.push(fieldName);
                     (_d = options === null || options === void 0 ? void 0 : options.onFieldAdded) === null || _d === void 0 ? void 0 : _d.call(options, fieldName, true);
                 }
@@ -2443,20 +2717,20 @@
                     (_e = options === null || options === void 0 ? void 0 : options.onFieldAdded) === null || _e === void 0 ? void 0 : _e.call(options, fieldName, false, errorMessage);
                 }
             });
-            // 5. 批量添加到 FormGroup
+            // 6. 批量添加到目标 FormGroup
             if (Object.keys(controlsToAdd).length > 0) {
                 Object.entries(controlsToAdd).forEach(function (_f) {
                     var _g = __read(_f, 2), fieldName = _g[0], control = _g[1];
-                    formGroup.addControl(fieldName, control);
+                    targetFormGroup.addControl(fieldName, control);
                 });
-                // 6. 批量存储错误消息
+                // 7. 批量存储错误消息
                 Object.entries(errorMessagesToAdd).forEach(function (_f) {
                     var _g = __read(_f, 2), key = _g[0], messages = _g[1];
                     _this.errorMessageStore[formName][key] = messages;
                 });
-                // 7. 更新表单验证状态
+                // 8. 更新表单验证状态
                 if (options === null || options === void 0 ? void 0 : options.updateValueAndValidity) {
-                    formGroup.updateValueAndValidity({
+                    targetFormGroup.updateValueAndValidity({
                         emitEvent: (_a = options === null || options === void 0 ? void 0 : options.emitEvent) !== null && _a !== void 0 ? _a : true,
                     });
                 }
@@ -2587,7 +2861,7 @@
         // ==================== 错误消息相关 ====================
         // 获取字段首条错误提示
         AntdFormService.prototype.getFieldErrorMessage = function (name, controlName) {
-            var e_1, _f;
+            var e_2, _f;
             var _a;
             var formGroup = this.formStore[name];
             if (!formGroup) {
@@ -2615,12 +2889,12 @@
                     }
                 }
             }
-            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            catch (e_2_1) { e_2 = { error: e_2_1 }; }
             finally {
                 try {
                     if (_h && !_h.done && (_f = _g.return)) _f.call(_g);
                 }
-                finally { if (e_1) throw e_1.error; }
+                finally { if (e_2) throw e_2.error; }
             }
             return "";
         };
@@ -2666,10 +2940,17 @@
                 var appliedCount = 0;
                 dom.forEach(function (item) {
                     var target = item;
-                    if (target.style.width !== _this.labelWidth ||
-                        target.style.textAlign !== _this.labelAlign) {
-                        target.style.width = _this.labelWidth;
-                        target.style.textAlign = _this.labelAlign;
+                    if (target.closest(".pro-table-container")) {
+                        return;
+                    }
+                    var customWidth = target.getAttribute("custom-width");
+                    var customAlign = target.getAttribute("custom-align");
+                    var finalWidth = customWidth || _this.labelWidth;
+                    var finalTextAlign = customAlign || _this.labelAlign;
+                    if (target.style.width !== finalWidth ||
+                        target.style.textAlign !== finalTextAlign) {
+                        target.style.width = finalWidth;
+                        target.style.textAlign = finalTextAlign;
                         appliedCount++;
                     }
                 });
@@ -2742,60 +3023,90 @@
         { type: i1.FormBuilder }
     ]; };
 
-    /**
-     * 数组型数据收集基础服务
-     *
-     * 功能：
-     * 1. 支持通过 ngModel 绑定对应行的数据源
-     * 2. 自动为数组数据添加 isEdit 和 uid 字段
-     * 3. 支持每个字段的自定义校验方法，返回 'success' | 'warning' | 'error'
-     * 4. 提供公共方法支持删除、新增、编辑等操作
-     */
+    /** 数组型数据收集基础服务 */
     var ArrayFormService = /** @class */ (function () {
         function ArrayFormService() {
             this.formStore = {};
         }
-        /**
-         * 初始化数组数据
-         * 为现有数据添加 uid 和 isEdit 字段
-         *
-         * @param data 原始数据数组
-         * @param config 表单配置
-         * @returns 初始化后的数据数组
-         */
+        /** 深度克隆值 */
+        ArrayFormService.prototype.cloneValue = function (value) {
+            var e_1, _c;
+            var _this = this;
+            if (value === null || value === undefined) {
+                return value;
+            }
+            if (Array.isArray(value)) {
+                return value.map(function (item) { return _this.cloneValue(item); });
+            }
+            if (typeof value === "object") {
+                var cloned = {};
+                try {
+                    for (var _d = __values(Object.keys(value)), _e = _d.next(); !_e.done; _e = _d.next()) {
+                        var key = _e.value;
+                        cloned[key] = this.cloneValue(value[key]);
+                    }
+                }
+                catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                finally {
+                    try {
+                        if (_e && !_e.done && (_c = _d.return)) _c.call(_d);
+                    }
+                    finally { if (e_1) throw e_1.error; }
+                }
+                return cloned;
+            }
+            return value;
+        };
+        /** 比较两个值是否相等 */
+        ArrayFormService.prototype.isEqual = function (a, b) {
+            var _this = this;
+            if (a === b)
+                return true;
+            if (a === null || b === null)
+                return a === b;
+            if (a === undefined || b === undefined)
+                return a === b;
+            if (typeof a !== typeof b)
+                return false;
+            if (Array.isArray(a) && Array.isArray(b)) {
+                if (a.length !== b.length)
+                    return false;
+                return a.every(function (item, index) { return _this.isEqual(item, b[index]); });
+            }
+            if (typeof a === "object" && typeof b === "object") {
+                var keysA = Object.keys(a);
+                var keysB = Object.keys(b);
+                if (keysA.length !== keysB.length)
+                    return false;
+                return keysA.every(function (key) { return _this.isEqual(a[key], b[key]); });
+            }
+            return false;
+        };
+        /** 创建行的初始值快照 */
+        ArrayFormService.prototype.createRowSnapshot = function (row, fields) {
+            var _this = this;
+            var snapshot = {};
+            fields.forEach(function (field) {
+                snapshot[field.name] = _this.cloneValue(row[field.name]);
+            });
+            return snapshot;
+        };
+        /** 初始化数组数据，添加 uid 和 isEdit 字段 */
         ArrayFormService.prototype.initializeData = function (data) {
             var _this = this;
             return data.map(function (item) { return _this.enrichRow(item); });
         };
-        /**
-         * 为单行数据添加 uid 和 isEdit 字段
-         *
-         * @param row 原始行数据
-         * @returns 增强后的行数据
-         */
+        /** 为单行数据添加 uid 和 isEdit 字段 */
         ArrayFormService.prototype.enrichRow = function (row) {
-            return Object.assign(Object.assign({}, row), { uid: row.uid || uuid.v4(), isEdit: row.isEdit !== undefined ? row.isEdit : false });
+            return Object.assign(Object.assign({}, row), { uid: row.uid || uuid.v4(), isEdit: row.isEdit !== undefined ? row.isEdit : false, disabled: row.disabled !== undefined ? row.disabled : false });
         };
-        /**
-         * 新增一行数据
-         *
-         * @param data 数据数组引用
-         * @param defaultValues 默认值
-         * @returns 新增的行数据
-         */
+        /** 新增一行数据 */
         ArrayFormService.prototype.addRow = function (data, defaultValues) {
-            var newRow = Object.assign(Object.assign({}, defaultValues), { uid: uuid.v4(), isEdit: true, isAdd: true });
+            var newRow = Object.assign(Object.assign({}, defaultValues), { uid: uuid.v4(), isEdit: true, isAdd: true, disabled: false });
             data.push(newRow);
             return newRow;
         };
-        /**
-         * 校验单个字段
-         *
-         * @param row 行数据
-         * @param fieldName 字段名
-         * @param config 表单配置
-         * @returns 校验结果
-         */
+        /** 校验单个字段 */
         ArrayFormService.prototype.validateField = function (row, fieldName, config) {
             var fieldConfig = config.fields.find(function (f) { return f.name === fieldName; });
             if (!fieldConfig) {
@@ -2806,13 +3117,7 @@
             }
             return "";
         };
-        /**
-         * 校验整行数据
-         *
-         * @param row 行数据
-         * @param config 表单配置
-         * @returns 校验结果对象，key为字段名，value为校验结果
-         */
+        /** 校验整行数据 */
         ArrayFormService.prototype.validateRow = function (row, config) {
             var _this = this;
             var results = {};
@@ -2821,13 +3126,7 @@
             });
             return results;
         };
-        /**
-         * 校验整个数组
-         *
-         * @param data 数据数组
-         * @param config 表单配置
-         * @returns 校验结果对象，key为行的uid，value为该行的校验结果
-         */
+        /** 校验整个数组 */
         ArrayFormService.prototype.validateData = function (data, config) {
             var _this = this;
             var results = {};
@@ -2836,90 +3135,149 @@
             });
             return results;
         };
-        /**
-         * 注册表单到存储
-         * 如果表单已存在，则更新其配置
-         *
-         * @param formName 表单名称
-         * @param data 数据数组
-         * @param config 表单配置
-         */
+        /** 注册表单到存储 */
         ArrayFormService.prototype.registerForm = function (formName, data, config) {
+            var _this = this;
+            var initializedData = this.initializeData(data);
+            // 记录初始值快照
+            var initialSnapshot = {};
+            initializedData.forEach(function (row) {
+                initialSnapshot[row.uid] = _this.createRowSnapshot(row, config.fields);
+            });
             this.formStore[formName] = {
-                data: this.initializeData(data),
+                data: initializedData,
                 config: config,
                 validationResults: {},
+                initialSnapshot: initialSnapshot,
+                editingSnapshot: {},
+                allTouched: false,
+                rowTouched: {},
             };
             // 如果配置了自动更新，立即更新一次
             this.autoUpdateArrayReference(formName);
         };
-        /**
-         * 从存储中获取表单
-         *
-         * @param formName 表单名称
-         * @returns 表单存储项或undefined
-         */
+        /** 从存储中获取表单 */
         ArrayFormService.prototype.getForm = function (formName) {
             return this.formStore[formName];
         };
-        /**
-         * 向表单添加行
-         *
-         * @param formName 表单名称
-         * @param defaultValues 默认值
-         * @returns 新增的行数据或undefined
-         */
+        /** 从存储中获取表单数据 */
+        ArrayFormService.prototype.getFormData = function (formName) {
+            var form = this.formStore[formName];
+            if (!form) {
+                return undefined;
+            }
+            return form.data.map(function (item) {
+                delete item.isEdit;
+                delete item.isAdd;
+                delete item.uid;
+                return item;
+            });
+        };
+        /** 向表单添加行 */
         ArrayFormService.prototype.addRowToForm = function (formName, defaultValues) {
             var form = this.formStore[formName];
             if (!form) {
                 return undefined;
             }
             var newRow = this.addRow(form.data, defaultValues);
+            // 为新行记录初始值快照
+            form.initialSnapshot[newRow.uid] = this.createRowSnapshot(newRow, form.config.fields);
             // 自动更新外部数组引用
             this.autoUpdateArrayReference(formName);
             return newRow;
         };
-        /**
-         * 校验表单
-         *
-         * @param formName 表单名称
-         * @returns 校验结果或undefined
-         */
+        /** 校验表单，自动标记所有字段为已触碰 */
         ArrayFormService.prototype.validateForm = function (formName) {
+            var e_2, _c, e_3, _d;
             var form = this.formStore[formName];
             if (!form) {
-                return undefined;
+                return true;
             }
+            // 标记所有字段为已触碰
+            form.allTouched = true;
             var results = this.validateData(form.data, form.config);
             form.validationResults = results;
-            return results;
+            try {
+                // 检查是否有任何错误
+                for (var _e = __values(Object.keys(results)), _f = _e.next(); !_f.done; _f = _e.next()) {
+                    var uid = _f.value;
+                    try {
+                        for (var _g = (e_3 = void 0, __values(Object.keys(results[uid]))), _h = _g.next(); !_h.done; _h = _g.next()) {
+                            var fieldName = _h.value;
+                            if (results[uid][fieldName]) {
+                                return false;
+                            }
+                        }
+                    }
+                    catch (e_3_1) { e_3 = { error: e_3_1 }; }
+                    finally {
+                        try {
+                            if (_h && !_h.done && (_d = _g.return)) _d.call(_g);
+                        }
+                        finally { if (e_3) throw e_3.error; }
+                    }
+                }
+            }
+            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+            finally {
+                try {
+                    if (_f && !_f.done && (_c = _e.return)) _c.call(_e);
+                }
+                finally { if (e_2) throw e_2.error; }
+            }
+            return true;
         };
-        /**
-         * 开启指定行的编辑模式
-         *
-         * @param row 行数据
-         */
-        ArrayFormService.prototype.enableEdit = function (row) {
+        /** 开启编辑模式，保存快照用于取消恢复 */
+        ArrayFormService.prototype.enableEdit = function (formName, row) {
+            var form = this.formStore[formName];
+            if (form && row.uid) {
+                // 保存编辑前的快照
+                form.editingSnapshot[row.uid] = this.createRowSnapshot(row, form.config.fields);
+            }
             row.isEdit = true;
         };
-        /**
-         * 关闭指定行的编辑模式
-         *
-         * @param row 行数据
-         */
-        ArrayFormService.prototype.disableEdit = function (row) {
+        /** 取消编辑，恢复到编辑前的数据 */
+        ArrayFormService.prototype.disableEdit = function (formName, row) {
+            var _this = this;
+            var form = this.formStore[formName];
+            if (form && row.uid && form.editingSnapshot[row.uid]) {
+                // 恢复编辑前的数据
+                var snapshot_1 = form.editingSnapshot[row.uid];
+                form.config.fields.forEach(function (field) {
+                    row[field.name] = _this.cloneValue(snapshot_1[field.name]);
+                });
+                // 更新初始快照为恢复后的值，消除 touched 状态
+                form.initialSnapshot[row.uid] = this.cloneValue(snapshot_1);
+                // 清理编辑快照和 touched 状态
+                delete form.editingSnapshot[row.uid];
+                delete form.rowTouched[row.uid];
+                // 清理该行的校验结果
+                if (form.validationResults) {
+                    delete form.validationResults[row.uid];
+                }
+            }
             row.isEdit = false;
         };
-        /**
-         * 从表单中删除指定行
-         *
-         * @param formName 表单名称
-         * @param row 行的uid
-         * @returns 是否删除成功
-         */
+        /** 确认编辑，保留修改后的数据 */
+        ArrayFormService.prototype.confirmEdit = function (formName, row) {
+            var form = this.formStore[formName];
+            if (form && row.uid) {
+                // 清理编辑快照（保留当前数据）
+                if (form.editingSnapshot[row.uid]) {
+                    delete form.editingSnapshot[row.uid];
+                }
+                // 更新初始快照为当前值（用于后续 touched 检测）
+                form.initialSnapshot[row.uid] = this.createRowSnapshot(row, form.config.fields);
+                // 清除 touched 状态，基于新的 initialSnapshot 重新判断
+                delete form.rowTouched[row.uid];
+            }
+            row.isEdit = false;
+            row.isAdd = false;
+        };
+        /** 从表单中删除指定行 */
         ArrayFormService.prototype.deleteRowFromForm = function (formName, row) {
             var form = this.formStore[formName];
-            if (!form) {
+            if (!form || !row.uid) {
                 return false;
             }
             var index = form.data.findIndex(function (item) { return item.uid === row.uid; });
@@ -2927,31 +3285,44 @@
                 return false;
             }
             form.data.splice(index, 1);
-            if (form.validationResults && form.validationResults[row.uid]) {
+            // 清理该行的所有快照、touched 状态和校验结果
+            delete form.initialSnapshot[row.uid];
+            delete form.editingSnapshot[row.uid];
+            delete form.rowTouched[row.uid];
+            if (form.validationResults) {
                 delete form.validationResults[row.uid];
             }
             // 自动更新外部数组引用
             this.autoUpdateArrayReference(formName);
             return true;
         };
-        /**
-         * 校验指定行的指定字段并返回校验结果
-         * 实时执行校验，用于模板中的实时校验显示
-         *
-         * @param formName 表单名称
-         * @param row 行数据
-         * @param fieldName 字段名
-         * @returns 校验结果
-         */
+        /** 检测字段是否已被触碰 */
+        ArrayFormService.prototype.isFieldTouched = function (form, row, fieldName) {
+            var _a;
+            // 整个表单已 touched（整个表单提交时）
+            if (form.allTouched) {
+                return true;
+            }
+            // 当前行已 touched（单行保存时）
+            if (form.rowTouched[row.uid]) {
+                return true;
+            }
+            // 检测当前值与初始值是否不同
+            var initialValue = (_a = form.initialSnapshot[row.uid]) === null || _a === void 0 ? void 0 : _a[fieldName];
+            var currentValue = row[fieldName];
+            return !this.isEqual(initialValue, currentValue);
+        };
+        /** 校验指定行的指定字段，未修改时不显示校验状态 */
         ArrayFormService.prototype.validateFieldInRow = function (formName, row, fieldName) {
             var form = this.formStore[formName];
             if (!form) {
-                return "success";
+                return "";
             }
             var fieldConfig = form.config.fields.find(function (f) { return f.name === fieldName; });
             if (!fieldConfig) {
-                return "success";
+                return "";
             }
+            // 执行校验
             var result = "";
             if (fieldConfig.validator) {
                 result = fieldConfig.validator(row[fieldName], row, fieldName);
@@ -2964,21 +3335,36 @@
                 form.validationResults[row.uid] = {};
             }
             form.validationResults[row.uid][fieldName] = result;
+            // 如果字段未被触碰，不显示校验状态
+            if (!this.isFieldTouched(form, row, fieldName)) {
+                return "";
+            }
             return result ? "error" : "success";
         };
-        /**
-         * 校验指定行的所有字段
-         *
-         * @param formName 表单名称
-         * @param row 行数据
-         * @returns 是否所有字段都通过校验
-         */
+        /** 获取指定行指定字段的校验错误信息 */
+        ArrayFormService.prototype.getFieldErrorMessage = function (formName, row, fieldName) {
+            var _a, _b;
+            var form = this.formStore[formName];
+            if (!form || !row.uid) {
+                return "";
+            }
+            // 如果字段未被触碰，不显示错误信息
+            if (!this.isFieldTouched(form, row, fieldName)) {
+                return "";
+            }
+            return ((_b = (_a = form.validationResults) === null || _a === void 0 ? void 0 : _a[row.uid]) === null || _b === void 0 ? void 0 : _b[fieldName]) || "";
+        };
+        /** 校验指定行的所有字段 */
         ArrayFormService.prototype.validateRowAllFields = function (formName, row) {
             var _this = this;
             var form = this.formStore[formName];
-            if (!form) {
+            if (!form || !row.uid) {
                 return true;
             }
+            // 更新初始快照为当前值
+            form.initialSnapshot[row.uid] = this.createRowSnapshot(row, form.config.fields);
+            // 标记当前行为 touched（只影响当前行，不影响其他行）
+            form.rowTouched[row.uid] = true;
             var hasError = false;
             form.config.fields.forEach(function (fieldConfig) {
                 var result = _this.validateFieldInRow(formName, row, fieldConfig.name);
@@ -2988,12 +3374,7 @@
             });
             return !hasError;
         };
-        /**
-         * 自动更新外部数组引用（如果配置了）
-         * 私有方法，在数据变化时自动调用
-         *
-         * @param formName 表单名称
-         */
+        /** 自动更新外部数组引用 */
         ArrayFormService.prototype.autoUpdateArrayReference = function (formName) {
             var form = this.formStore[formName];
             if (!form || !form.config.targetObject || !form.config.arrayPropertyName) {
@@ -3003,6 +3384,43 @@
             // 更新目标对象的数组属性为新数组引用
             form.config.targetObject[form.config.arrayPropertyName] = newArray;
         };
+        /** 是否有正在编辑的行 */
+        ArrayFormService.prototype.hasEditingRow = function (formName) {
+            var form = this.formStore[formName];
+            if (!form) {
+                return false;
+            }
+            return form.data.some(function (item) { return item.isEdit; });
+        };
+        // 销毁对应的表单
+        ArrayFormService.prototype.destory = function (names) {
+            var _this = this;
+            names.forEach(function (name) {
+                if (_this.formStore[name]) {
+                    // 清理表单数据
+                    delete _this.formStore[name];
+                }
+            });
+        };
+        // 重置表单数组
+        ArrayFormService.prototype.resetFormArray = function (name) {
+            var form = this.formStore[name];
+            if (!form) {
+                return;
+            }
+            // 1. 清空数据数组
+            form.data = [];
+            // 2. 清理所有快照
+            form.initialSnapshot = {};
+            form.editingSnapshot = {};
+            // 3. 清理校验结果
+            form.validationResults = {};
+            // 4. 重置 touched 状态
+            form.allTouched = false;
+            form.rowTouched = {};
+            // 5. 如果配置了自动更新，更新外部数组引用
+            this.autoUpdateArrayReference(name);
+        };
         return ArrayFormService;
     }());
     ArrayFormService.ɵprov = i0.ɵɵdefineInjectable({ factory: function ArrayFormService_Factory() { return new ArrayFormService(); }, token: ArrayFormService, providedIn: "root" });