fantasy-ngzorro 1.0.56 → 1.0.57

package/bundles/fantasy-ngzorro.umd.js

@@ -1902,7 +1902,9 @@
          */
         function () {
             var _this = this;
-            console.log('this.filterStr', this.filterStr);
+            if (this.storeFormLinesData.length < 1) {
+                return;
+            }
             this.tableLoading = true;
             // 如果没有输入搜索字符串，则显示缓存内的所有数据
             if (!this.filterStr) {
@@ -1912,10 +1914,8 @@
             }
             /** @type {?} */
             var filterValue = this.filterStr.trim().toLowerCase();
-            console.log('this.filterValue', filterValue);
             this.isFilterData = true;
             this.filterIndexStore = [];
-            console.log('this.storeFormLinesData', this.storeFormLinesData);
             // 根据搜索字符串过滤数据
             /** @type {?} */
             var filteredData = this.storeFormLinesData.filter((/**
@@ -1928,10 +1928,9 @@
                 try {
                     for (var _b = __values(_this.formLines), _c = _b.next(); !_c.done; _c = _b.next()) {
                         var item = _c.value;
-                        if (!item.hide) {
+                        if ((item.hide && item.canSearch) || (!item.hide && item.name !== 'uuid')) {
                             /** @type {?} */
                             var value = data[item.name] ? data[item.name].toString().toLowerCase() : '';
-                            console.log('value', value);
                             if (value.includes(filterValue)) {
                                 _this.filterIndexStore.push(index);
                                 return true;
@@ -2208,9 +2207,6 @@
             }));
             this.tableLoading = false;
             this.showForm = true;
-            if (this.formLinesData.length === 0) {
-                this.addFormLine();
-            }
         };
         /**
          * @param {?=} index
@@ -2304,86 +2300,93 @@
          */
         function (data) {
             var _this = this;
-            if (data && data.lines && this.filterIndexStore.length !== 0) {
-                /** @type {?} */
-                var lines_1 = data.lines;
-                if (lines_1.length === this.filterIndexStore.length) {
-                    this.filterIndexStore.forEach((/**
-                     * @param {?} item
-                     * @param {?} index
-                     * @return {?}
-                     */
-                    function (item, index) {
-                        _this.storeFormLinesData[item] = __assign({}, _this.filterStoreFormLinesData[index], lines_1[index]);
-                    }));
-                }
-                else if (lines_1.length > this.filterIndexStore.length) {
-                    // 有新增数据的情况
-                    // step 1: 先找新增的index下标
-                    /** @type {?} */
-                    var getNowLines = this.validateHdFormLines.getRawValue().lines;
+            if (this.isFilterData) {
+                if (data && data.lines && this.filterIndexStore.length !== 0) {
                     /** @type {?} */
-                    var addIndex = -1;
-                    for (var i = 0; i < getNowLines.length; i++) {
-                        if (getNowLines[i].isHdFormLineSearchAdd) {
-                            addIndex = i;
-                            break;
-                        }
-                    }
-                    if (addIndex !== -1) {
-                        this.storeFormLinesData.splice(this.filterIndexStore[addIndex - 1] + 1, 0, getNowLines[addIndex]);
-                    }
-                    this.filterIndexStore.push(this.filterIndexStore[addIndex - 1] + 1);
-                }
-                else {
-                    // 有删除数据的情况
-                    // step 1:先找到删除的index下标
-                    /** @type {?} */
-                    var deletedIndex_1 = -1;
-                    /** @type {?} */
-                    var count = 0;
-                    if (lines_1.length === 0) {
-                        deletedIndex_1 = 0;
-                    }
-                    else {
-                        for (var i = 0; i < lines_1.length; i++) {
-                            if (lines_1[i].lineIndex - count > 1) {
-                                deletedIndex_1 = i;
-                                break;
-                            }
-                            count++;
-                        }
-                    }
-                    if (deletedIndex_1 !== -1) {
-                        // step 2: 删除总数据中的对应数据, 把下标数组和lines长度对齐，同时把下标数组在deletedIndex后面的值全都-1
-                        this.storeFormLinesData = this.storeFormLinesData.filter((/**
+                    var lines_1 = data.lines;
+                    if (lines_1.length === this.filterIndexStore.length) {
+                        this.filterIndexStore.forEach((/**
                          * @param {?} item
                          * @param {?} index
                          * @return {?}
                          */
                         function (item, index) {
-                            return index !== _this.filterIndexStore[deletedIndex_1];
+                            _this.storeFormLinesData[item] = __assign({}, _this.filterStoreFormLinesData[index], lines_1[index]);
                         }));
-                        this.filterIndexStore.splice(deletedIndex_1, 1);
-                        for (var i = 0; i < this.filterIndexStore.length; i++) {
-                            if (i >= deletedIndex_1) {
-                                this.filterIndexStore[i]--;
+                    }
+                    else if (lines_1.length > this.filterIndexStore.length) {
+                        // 有新增数据的情况
+                        // step 1: 先找新增的index下标
+                        /** @type {?} */
+                        var getNowLines = this.validateHdFormLines.getRawValue().lines;
+                        /** @type {?} */
+                        var addIndex = -1;
+                        for (var i = 0; i < getNowLines.length; i++) {
+                            if (getNowLines[i].isHdFormLineSearchAdd) {
+                                addIndex = i;
+                                break;
                             }
                         }
+                        if (addIndex !== -1) {
+                            this.storeFormLinesData.splice(this.filterIndexStore[addIndex - 1] + 1, 0, getNowLines[addIndex]);
+                        }
+                        this.filterIndexStore.push(this.filterIndexStore[addIndex - 1] + 1);
                     }
                     else {
-                        // step 2: 没有找到deletedIndex说明删除操作在最后一行
+                        // 有删除数据的情况
+                        // step 1:先找到删除的index下标
                         /** @type {?} */
-                        var filterIndex_1 = this.filterIndexStore[this.filterIndexStore.length - 1];
-                        this.storeFormLinesData = this.storeFormLinesData.filter((/**
-                         * @param {?} item
-                         * @param {?} index
-                         * @return {?}
-                         */
-                        function (item, index) {
-                            return index !== filterIndex_1;
-                        }));
-                        this.filterIndexStore.pop();
+                        var deletedIndex_1 = -1;
+                        /** @type {?} */
+                        var count = 0;
+                        if (lines_1.length === 0) {
+                            deletedIndex_1 = 0;
+                        }
+                        else {
+                            for (var i = 0; i < lines_1.length; i++) {
+                                if (lines_1[i].lineIndex - count > 1) {
+                                    deletedIndex_1 = i;
+                                    break;
+                                }
+                                count++;
+                            }
+                        }
+                        if (deletedIndex_1 !== -1) {
+                            // step 2: 删除总数据中的对应数据, 把下标数组和lines长度对齐，同时把下标数组在deletedIndex后面的值全都-1
+                            this.storeFormLinesData = this.storeFormLinesData.filter((/**
+                             * @param {?} item
+                             * @param {?} index
+                             * @return {?}
+                             */
+                            function (item, index) {
+                                return index !== _this.filterIndexStore[deletedIndex_1];
+                            }));
+                            this.filterIndexStore.splice(deletedIndex_1, 1);
+                            for (var i = 0; i < this.filterIndexStore.length; i++) {
+                                if (i >= deletedIndex_1) {
+                                    this.filterIndexStore[i]--;
+                                }
+                            }
+                        }
+                        else {
+                            // step 2: 没有找到deletedIndex说明删除操作在最后一行
+                            /** @type {?} */
+                            var filterIndex_1 = this.filterIndexStore[this.filterIndexStore.length - 1];
+                            this.storeFormLinesData = this.storeFormLinesData.filter((/**
+                             * @param {?} item
+                             * @param {?} index
+                             * @return {?}
+                             */
+                            function (item, index) {
+                                return index !== filterIndex_1;
+                            }));
+                            this.filterIndexStore.pop();
+                        }
+                    }
+                }
+                else {
+                    if (data && data.lines) {
+                        this.storeFormLinesData = data.lines;
                     }
                 }
             }
@@ -2392,17 +2395,23 @@
                     this.storeFormLinesData = data.lines;
                 }
             }
-            if (this.formValid) {
-                // 如果整体表单是true，不管子表单是什么，都变成子表单的状态
+            // 总表单
+            if (!this.isFilterData) {
                 this.formValid = this.validateHdFormLines.valid;
             }
             else {
-                // 如果整体表单是false：1、子表单为true，需要重算；2、子表单为false，用子表单状态
-                if (this.validateHdFormLines.valid) {
-                    this.formValid = this.innerGetValid();
+                if (this.formValid) {
+                    // 如果整体表单是true，不管子表单是什么，都变成子表单的状态
+                    this.formValid = this.validateHdFormLines.valid;
                 }
                 else {
-                    this.formValid = this.validateHdFormLines.valid;
+                    // 如果整体表单是false：1、子表单为true，需要重算；2、子表单为false，用子表单状态
+                    if (this.validateHdFormLines.valid) {
+                        this.formValid = this.innerGetValid();
+                    }
+                    else {
+                        this.formValid = this.validateHdFormLines.valid;
+                    }
                 }
             }
             // this.calculateLineNumber();
@@ -3585,6 +3594,7 @@
             this.inputNumber = new InputNumber(); // number组件的min、max、step
             // 不可输入状态
             this.showTime = false; // 日期选择器是否包含时间
+            this.canSearch = false; // 指明hide 情况下的控件是否可以被搜索，默认false
         }
         return FormLine;
     }());
@@ -3635,6 +3645,8 @@
         FormLine.prototype.showTime;
         /** @type {?} */
         FormLine.prototype.style;
+        /** @type {?} */
+        FormLine.prototype.canSearch;
     }
     var ColorOption = /** @class */ (function () {
         function ColorOption() {