fantasy-ngzorro 2.2.22 → 2.2.23

package/fesm2015/fantasy-ngzorro.js

@@ -7314,7 +7314,9 @@ class HdFormLinesComponent {
             }));
         }
         formGroupObj.lineIndex = this.fb.control(this.linesFormArray.controls.length + 1, []);
-        formGroupObj.isHdFormLineSearchAdd = this.fb.control(this.isFilterData, []);
+        // 仅真正新增/复制的行在插入前单独置 true；搜索重建已有行必须为 false，
+        // 否则筛选态下点「添加」会把第一行可见数据再插入一份
+        formGroupObj.isHdFormLineSearchAdd = this.fb.control(false, []);
         /** @type {?} */
         let formGroupSubmit = this.fb.group(formGroupObj);
         this.formLines.forEach((/**
@@ -7394,6 +7396,7 @@ class HdFormLinesComponent {
         const insertAt = this.getInsertIndexAfter(afterLine);
         /** @type {?} */
         const newLine = this.newLineItem();
+        this.markSearchAddedLine(newLine);
         this.linesFormArray.insert(insertAt, newLine);
         this.calculateLineNumber();
         this.addLineEvent.emit(newLine);
@@ -7429,7 +7432,10 @@ class HdFormLinesComponent {
         const sourceValues = line.getRawValue();
         /** @type {?} */
         const insertAt = sourceIndex + 1;
-        this.linesFormArray.insert(insertAt, this.createLineFromValues(sourceValues, false, true));
+        /** @type {?} */
+        const copiedLine = this.createLineFromValues(sourceValues, false, true);
+        this.markSearchAddedLine(copiedLine);
+        this.linesFormArray.insert(insertAt, copiedLine);
         this.calculateLineNumber();
         setTimeout((/**
          * @return {?}
@@ -7492,6 +7498,22 @@ class HdFormLinesComponent {
             this.collectDomData();
         }), 0);
     }
+    /**
+     * 筛选结果中新增/复制的行打标，写回全量数据后立即清掉
+     * @private
+     * @param {?} line
+     * @return {?}
+     */
+    markSearchAddedLine(line) {
+        if (!this.isFilterData || !line) {
+            return;
+        }
+        /** @type {?} */
+        const flag = line.get("isHdFormLineSearchAdd");
+        if (flag) {
+            flag.setValue(true, { emitEvent: false });
+        }
+    }
     /**
      * 在指定行后方的插入下标；无行则追加到末尾
      * @private
@@ -7562,8 +7584,7 @@ class HdFormLinesComponent {
                     }));
                 }
                 else if (lines.length > this.filterIndexStore.length) {
-                    // 有新增数据的情况
-                    // step 1: 先找新增的index下标
+                    // 有新增数据的情况：只认本次标记的新行，并插到筛选视图中的对应位置
                     /** @type {?} */
                     const getNowLines = this.validateHdFormLines.getRawValue().lines;
                     /** @type {?} */
@@ -7574,10 +7595,29 @@ class HdFormLinesComponent {
                             break;
                         }
                     }
-                    if (addIndex !== -1) {
-                        this.storeFormLinesData.splice(this.filterIndexStore[addIndex - 1] + 1, 0, getNowLines[addIndex]);
+                    if (addIndex !== -1 && this.filterIndexStore.length > 0) {
+                        /** @type {?} */
+                        const insertAt = addIndex <= 0
+                            ? this.filterIndexStore[0]
+                            : this.filterIndexStore[addIndex - 1] + 1;
+                        /** @type {?} */
+                        const addedLine = Object.assign({}, getNowLines[addIndex], { isHdFormLineSearchAdd: false });
+                        this.storeFormLinesData.splice(insertAt, 0, addedLine);
+                        for (let i = 0; i < this.filterIndexStore.length; i++) {
+                            if (this.filterIndexStore[i] >= insertAt) {
+                                this.filterIndexStore[i]++;
+                            }
+                        }
+                        this.filterIndexStore.splice(addIndex, 0, insertAt);
+                        if (this.filterStoreFormLinesData) {
+                            this.filterStoreFormLinesData.splice(addIndex, 0, addedLine);
+                        }
+                        /** @type {?} */
+                        const flagCtrl = ((/** @type {?} */ (this.linesFormArray.at(addIndex)))).get("isHdFormLineSearchAdd");
+                        if (flagCtrl) {
+                            flagCtrl.setValue(false, { emitEvent: false });
+                        }
                     }
-                    this.filterIndexStore.push(this.filterIndexStore[addIndex - 1] + 1);
                 }
                 else {
                     // 有删除数据的情况