@sd-angular/core 1.3.1 → 1.3.2

package/fesm2015/sd-angular-core-grid-material.js

@@ -5,10 +5,10 @@ import { MatPaginator, MatPaginatorIntl, MatPaginatorModule } from '@angular/mat
 import { MatSort, MatSortModule } from '@angular/material/sort';
 import { trigger, state, style, transition, animate } from '@angular/animations';
 import { v4 } from 'uuid';
-import { Subject, Subscription, isObservable, defer, from } from 'rxjs';
+import { Subject, Subscription, isObservable } from 'rxjs';
 import { SdNotifyService } from '@sd-angular/core/notify';
 import { moveItemInArray, DragDropModule } from '@angular/cdk/drag-drop';
-import { startWith, debounceTime, map, switchMap } from 'rxjs/operators';
+import { startWith, map, debounceTime, switchMap } from 'rxjs/operators';
 import hash from 'object-hash';
 import { SdSettingService } from '@sd-angular/core/setting';
 import { DeviceDetectorService } from 'ngx-device-detector';
@@ -1483,41 +1483,37 @@ class SdGridMaterial {
                 pageSize: ((_j = __classPrivateFieldGet(this, _paginator)) === null || _j === void 0 ? void 0 : _j.pageSize) || ((_l = (_k = this.gridOption) === null || _k === void 0 ? void 0 : _k.paginate) === null || _l === void 0 ? void 0 : _l.pageSize) || 50
             });
         });
-        _load$1.set(this, (filterReq, force = true) => {
-            const func = () => __awaiter(this, void 0, void 0, function* () {
-                this.isLoading = true;
-                try {
-                    if (this.gridOption.type === 'server') {
-                        let result = this.gridOption.items(filterReq);
-                        if (isObservable(result)) {
-                            result = result.toPromise();
-                        }
-                        return yield result;
+        _load$1.set(this, (filterReq, force = true) => __awaiter(this, void 0, void 0, function* () {
+            this.isLoading = true;
+            try {
+                if (this.gridOption.type === 'server') {
+                    let result = this.gridOption.items(filterReq);
+                    if (isObservable(result)) {
+                        result = result.toPromise();
                     }
-                    else {
-                        if (force) {
-                            const results = this.gridOption.items();
-                            if (results instanceof Promise) {
-                                this.localItems = yield results;
-                            }
-                            else {
-                                this.localItems = results;
-                            }
+                    return yield result;
+                }
+                else {
+                    if (force) {
+                        const results = this.gridOption.items();
+                        if (results instanceof Promise) {
+                            this.localItems = yield results;
+                        }
+                        else {
+                            this.localItems = results;
                         }
-                        return __classPrivateFieldGet(this, _filterLocal).call(this, this.localItems, filterReq);
                     }
+                    return __classPrivateFieldGet(this, _filterLocal).call(this, this.localItems, filterReq);
                 }
-                catch (error) {
-                    this.notifyService.handle.error(error);
-                }
-                finally {
-                    this.isLoading = false;
-                    this.ref.detectChanges();
-                }
-            });
-            const obs = defer(() => from(func()));
-            return obs.pipe(debounceTime(200));
-        });
+            }
+            catch (error) {
+                this.notifyService.handle.error(error);
+            }
+            finally {
+                this.isLoading = false;
+                this.ref.detectChanges();
+            }
+        }));
         _render.set(this, (args) => __awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c, _d;
             (_a = this.sdScroll) === null || _a === void 0 ? void 0 : _a.scrollTop();
@@ -1532,7 +1528,7 @@ class SdGridMaterial {
             __classPrivateFieldGet(this, _updateSelectedItems).call(this);
         }));
         this.reload = (force = true) => __awaiter(this, void 0, void 0, function* () {
-            const data = yield __classPrivateFieldGet(this, _load$1).call(this, __classPrivateFieldGet(this, _getFilter).call(this), force).toPromise();
+            const data = yield __classPrivateFieldGet(this, _load$1).call(this, __classPrivateFieldGet(this, _getFilter).call(this), force);
             __classPrivateFieldGet(this, _render).call(this, data);
         });
         _exportedItems.set(this, (pageNumber = 0, pageSize = 10000) => __awaiter(this, void 0, void 0, function* () {
@@ -2100,10 +2096,11 @@ class SdGridMaterial {
     set _gridFilter(gridFilter) {
         if (gridFilter && this.gridFilter !== gridFilter) {
             this.gridFilter = gridFilter;
+            __classPrivateFieldGet(this, _reload).next(false);
             __classPrivateFieldGet(this, _subscription$1).add(gridFilter.filterChange.pipe(map(() => {
                 __classPrivateFieldGet(this, _paginator).pageIndex = 0;
-                return __classPrivateFieldGet(this, _getFilter).call(this);
-            }), switchMap(filterInfo => __classPrivateFieldGet(this, _load$1).call(this, filterInfo, false))).subscribe(__classPrivateFieldGet(this, _render)));
+                __classPrivateFieldGet(this, _reload).next(false);
+            })).subscribe());
         }
     }
     set option(option) {
@@ -2111,7 +2108,7 @@ class SdGridMaterial {
         if (option) {
             option = __classPrivateFieldGet(this, _initConfiguration).call(this, option);
             this.gridOption = option;
-            __classPrivateFieldGet(this, _optionChanges).emit();
+            __classPrivateFieldGet(this, _reload).next(true);
             (_a = option === null || option === void 0 ? void 0 : option.columns) === null || _a === void 0 ? void 0 : _a.forEach(col => {
                 var _a;
                 if ((_a = col.filter) === null || _a === void 0 ? void 0 : _a.default) {
@@ -2126,23 +2123,36 @@ class SdGridMaterial {
     set paginator(paginator) {
         if (paginator && __classPrivateFieldGet(this, _paginator) !== paginator) {
             __classPrivateFieldSet(this, _paginator, paginator);
-            __classPrivateFieldGet(this, _subscription$1).add(paginator.page.pipe(map(__classPrivateFieldGet(this, _getFilter)), switchMap(filterInfo => __classPrivateFieldGet(this, _load$1).call(this, filterInfo, false))).subscribe(__classPrivateFieldGet(this, _render)));
+            __classPrivateFieldGet(this, _subscription$1).add(paginator.page.pipe(map(() => {
+                __classPrivateFieldGet(this, _reload).next(false);
+            })).subscribe());
         }
     }
     set sort(sort) {
         if (sort && __classPrivateFieldGet(this, _sort) !== sort) {
             __classPrivateFieldSet(this, _sort, sort);
-            __classPrivateFieldGet(this, _subscription$1).add(sort.sortChange.pipe(map(__classPrivateFieldGet(this, _getFilter)), switchMap(filterInfo => __classPrivateFieldGet(this, _load$1).call(this, filterInfo, false))).subscribe(__classPrivateFieldGet(this, _render)));
+            __classPrivateFieldGet(this, _subscription$1).add(sort.sortChange.pipe(map(() => {
+                __classPrivateFieldGet(this, _reload).next(false);
+            })).subscribe());
         }
     }
     ngOnInit() {
         __classPrivateFieldGet(this, _initCellDef).call(this);
     }
     ngAfterViewInit() {
+        __classPrivateFieldGet(this, _subscription$1).add(__classPrivateFieldGet(this, _reload).pipe(startWith(true), debounceTime(200), switchMap(force => {
+            const filterInfo = __classPrivateFieldGet(this, _getFilter).call(this);
+            return __classPrivateFieldGet(this, _load$1).call(this, filterInfo, force);
+        })).subscribe(__classPrivateFieldGet(this, _render)));
         __classPrivateFieldGet(this, _subscription$1).add(this.sdCellDefs.changes.pipe(startWith([])).subscribe(__classPrivateFieldGet(this, _initCellDef)));
         __classPrivateFieldGet(this, _subscription$1).add(this.sdFooterDefs.changes.pipe(startWith([])).subscribe(__classPrivateFieldGet(this, _initFooterDef)));
         __classPrivateFieldGet(this, _subscription$1).add(this.sdFilterDefs.changes.pipe(startWith([])).subscribe(__classPrivateFieldGet(this, _initFilterDef)));
-        __classPrivateFieldGet(this, _subscription$1).add(__classPrivateFieldGet(this, _optionChanges).pipe(startWith({}), map(__classPrivateFieldGet(this, _getFilter)), switchMap(filterInfo => __classPrivateFieldGet(this, _load$1).call(this, filterInfo, true))).subscribe(__classPrivateFieldGet(this, _render)));
+        // this.#subscription.add(this.#optionChanges.pipe(
+        //   debounceTime(200),
+        //   startWith({}),
+        //   map(this.#getFilter),
+        //   switchMap(filterInfo => this.#load(filterInfo, true))
+        // ).subscribe(this.#render));
         this.ref.detectChanges();
     }
     ngOnDestroy() {