fantasy-ngzorro 1.0.41 → 1.0.42

package/bundles/fantasy-ngzorro.umd.js

@@ -1793,89 +1793,84 @@
         function () {
             var _this = this;
             this.tableLoading = true;
-            /** @type {?} */
-            var filterValue = this.filterStr.trim().toLowerCase();
-            // 如果没有输入搜索字符串，则显示所有数据
-            if (!filterValue) {
-                this.hideForm();
-                this.addExistingFormLines(this.formLinesData);
-                this.tableLoading = false;
-                return;
-            }
-            // 根据搜索字符串过滤数据
-            /** @type {?} */
-            var filteredData = this.formLinesData.filter((/**
-             * @param {?} data
+            setTimeout((/**
              * @return {?}
              */
-            function (data) {
+            function () {
                 var e_1, _a;
-                try {
-                    for (var _b = __values(_this.formLines), _c = _b.next(); !_c.done; _c = _b.next()) {
-                        var item = _c.value;
-                        /** @type {?} */
-                        var value = data[item.name] ? data[item.name].toString().toLowerCase() : '';
-                        if (value.includes(filterValue)) {
-                            return true;
+                /** @type {?} */
+                var filterValue = _this.filterStr.trim().toLowerCase();
+                // 如果没有输入搜索字符串，则显示所有数据
+                if (!filterValue) {
+                    _this.tableLoading = false;
+                    return;
+                }
+                // 根据搜索字符串过滤数据
+                /** @type {?} */
+                var filteredData = _this.formLinesData.filter((/**
+                 * @param {?} data
+                 * @return {?}
+                 */
+                function (data) {
+                    var e_2, _a;
+                    try {
+                        for (var _b = __values(_this.formLines), _c = _b.next(); !_c.done; _c = _b.next()) {
+                            var item = _c.value;
+                            /** @type {?} */
+                            var value = data[item.name] ? data[item.name].toString().toLowerCase() : '';
+                            if (value.includes(filterValue)) {
+                                return true;
+                            }
+                        }
+                    }
+                    catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                    finally {
+                        try {
+                            if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                         }
+                        finally { if (e_2) throw e_2.error; }
                     }
+                    return false;
+                }));
+                // 如果没有匹配的数据，则显示空白表单行
+                if (filteredData.length === 0) {
+                    _this.tableLoading = false;
                 }
-                catch (e_1_1) { e_1 = { error: e_1_1 }; }
-                finally {
+                else {
+                    _this.validateHdFormLines = _this.fb.group({
+                        'lines': _this.fb.array([])
+                    });
+                    // 在这里把formlinesData里面匹配到的filteredData数据排序到最前面
+                    /** @type {?} */
+                    var sortedData = [];
                     try {
-                        if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                        for (var _b = __values(_this.formLinesData), _c = _b.next(); !_c.done; _c = _b.next()) {
+                            var item = _c.value;
+                            if (filteredData.includes(item)) {
+                                sortedData.unshift(item);
+                            }
+                            else {
+                                sortedData.push(item);
+                            }
+                        }
+                    }
+                    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                    finally {
+                        try {
+                            if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                        }
+                        finally { if (e_1) throw e_1.error; }
                     }
-                    finally { if (e_1) throw e_1.error; }
+                    _this.formLinesData = sortedData;
+                    _this.init();
+                    setTimeout((/**
+                     * @return {?}
+                     */
+                    function () {
+                        _this.tableLoading = false;
+                    }), 0);
                 }
-                return false;
-            }));
-            // 如果没有匹配的数据，则显示空白表单行
-            if (filteredData.length === 0) {
-                this.hideForm();
-                this.addFormLine();
-            }
-            else {
-                this.hideForm();
-                this.addExistingFormLines(filteredData);
-            }
-            this.tableLoading = false;
-        };
-        /**
-         * @return {?}
-         */
-        HdFormLinesComponent.prototype.hideForm = /**
-         * @return {?}
-         */
-        function () {
-            // 隐藏所有表单行
-            for (var i = 0; i < this.linesFormArray.controls.length; i++) {
-                this.linesFormArray.controls[i].get('hide').setValue(true);
-            }
-        };
-        /**
-         * @param {?} filteredData
-         * @return {?}
-         */
-        HdFormLinesComponent.prototype.addExistingFormLines = /**
-         * @param {?} filteredData
-         * @return {?}
-         */
-        function (filteredData) {
-            var _this = this;
-            // 显示匹配的数据行
-            filteredData.forEach((/**
-             * @param {?} formLinesDataItem
-             * @return {?}
-             */
-            function (formLinesDataItem) {
-                /** @type {?} */
-                var index = _this.formLinesData.findIndex((/**
-                 * @param {?} data
-                 * @return {?}
-                 */
-                function (data) { return data === formLinesDataItem; }));
-                _this.linesFormArray.controls[index].get('hide').setValue(false);
-            }));
+            }), 10);
         };
         /**
          * @param {?} line