@piying-lib/angular-daisyui 1.1.1 → 1.1.3

package/extension/index.d.ts

@@ -189,7 +189,7 @@ declare class SortService {
     #private;
     value$$: rxjs.Observable<SortList>;
     multiple: _angular_core.WritableSignal<boolean>;
-    sortList: _angular_core.WritableSignal<string[]>;
+    sortList: _angular_core.WritableSignal<string[] | undefined>;
     /** 设置初始值 */
     setInitValue(object: Record<string, SortDirection>): void;
     update(key: string, direction: SortDirection): void;
@@ -293,9 +293,10 @@ declare class CheckboxService<D = any> {
     static ɵprov: _angular_core.ɵɵInjectableDeclaration<CheckboxService<any>>;
 }
 
-type RequestFn = ((input: any) => Promise<[number, any[]]> | [number, any[]]) | undefined;
+type RequestFn = ((input: any, needUpdate: boolean) => Promise<[number, any[]]> | [number, any[]]) | undefined;
 declare class TableResourceService {
     #private;
+    EMPTY_VALUE: (number | never[])[];
     list$$: _angular_core.Signal<unknown>;
     count$$: _angular_core.Signal<unknown>;
     isLoading$$: _angular_core.Signal<boolean>;

package/fesm2022/piying-lib-angular-daisyui-extension.mjs

@@ -339,7 +339,7 @@ class SortService {
     })
         .filter(Boolean)), takeUntilDestroyed(), shareReplay(1));
     multiple = signal(true, ...(ngDevMode ? [{ debugName: "multiple" }] : []));
-    sortList = signal([], ...(ngDevMode ? [{ debugName: "sortList" }] : []));
+    sortList = signal(undefined, ...(ngDevMode ? [{ debugName: "sortList" }] : []));
     /** 设置初始值 */
     setInitValue(object) {
         this.#restore$.next(object);
@@ -675,13 +675,13 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.14", ngImpo
             }] } });
 
 class TableResourceService {
+    EMPTY_VALUE = [0, []];
     #requestFn$ = signal(undefined, ...(ngDevMode ? [{ debugName: "#requestFn$" }] : []));
     #queryParams$ = signal({}, ...(ngDevMode ? [{ debugName: "#queryParams$" }] : []));
     #data$ = resource({
         params: computed(() => {
             const params = this.#queryParams$();
             let requestFn = this.#requestFn$();
-            this.#updateIndex$();
             return {
                 requestFn,
                 params,
@@ -689,10 +689,14 @@ class TableResourceService {
             };
         }),
         loader: async (res) => {
+            let needUpdate = res.params.index !== this.#preUpdateIndex$();
+            if (needUpdate) {
+                this.#preUpdateIndex$.set(res.params.index);
+            }
             if (!res.params.requestFn) {
-                return [0, []];
+                return this.EMPTY_VALUE;
             }
-            return res.params.requestFn(res.params.params);
+            return res.params.requestFn(res.params.params, needUpdate);
         },
     });
     list$$ = computedWithPrev((value) => {
@@ -705,6 +709,7 @@ class TableResourceService {
         return this.#data$.isLoading();
     }, ...(ngDevMode ? [{ debugName: "isLoading$$" }] : []));
     #updateIndex$ = signal(0, ...(ngDevMode ? [{ debugName: "#updateIndex$" }] : []));
+    #preUpdateIndex$ = signal(0, ...(ngDevMode ? [{ debugName: "#preUpdateIndex$" }] : []));
     needUpdate() {
         this.#updateIndex$.update((a) => ++a);
     }