@piying-lib/angular-daisyui 1.0.4 → 1.0.6

package/extension/index.d.ts

@@ -165,6 +165,7 @@ declare class TableRowFGC extends PiyingViewGroupBase {
 }
 
 declare class TableResourceWC {
+    #private;
     static __version: number;
     templateRef: _angular_core.Signal<unknown>;
     field$$: _angular_core.Signal<_piying_view_angular.PiResolvedViewFieldConfig>;
@@ -231,7 +232,9 @@ declare class TableStatusWC {
 
 declare class TableStatusService {
     expanded: BehaviorSubject<undefined>;
+    updateIndex$: _angular_core.WritableSignal<number>;
     toggleExpand(value: any): void;
+    needUpdate(): void;
     static ɵfac: _angular_core.ɵɵFactoryDeclaration<TableStatusService, never>;
     static ɵprov: _angular_core.ɵɵInjectableDeclaration<TableStatusService>;
 }

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

@@ -1,6 +1,6 @@
 import { NgTemplateOutlet, NgClass, JsonPipe } from '@angular/common';
 import * as i0 from '@angular/core';
-import { viewChild, input, inject, computed, Component, model, InjectionToken, Injector, untracked, signal, resource, Injectable, ElementRef, HostListener, Directive, linkedSignal, NgZone, EventEmitter, TemplateRef, ViewContainerRef, Output, forwardRef, ChangeDetectionStrategy, effect } from '@angular/core';
+import { viewChild, input, inject, computed, Component, model, InjectionToken, Injector, untracked, signal, Injectable, HostListener, Directive, resource, ElementRef, linkedSignal, NgZone, EventEmitter, TemplateRef, ViewContainerRef, Output, forwardRef, ChangeDetectionStrategy, effect } from '@angular/core';
 import { SelectorlessOutlet } from '@cyia/ngx-common/directive';
 import { StrOrTemplateComponent, isSchema, computedWithPrev, DefaultOptionConvert, transformOption } from '@piying-lib/angular-core';
 import { CssPrefixPipe, MergeClassPipe, TwPrefixPipe } from '@piying-lib/angular-daisyui/pipe';
@@ -16,7 +16,7 @@ import clsx from 'clsx';
 import * as v from 'valibot';
 import { setComponent, NFCSchema, actions } from '@piying/view-angular-core';
 import { ThWC, TdWC } from '@piying-lib/angular-daisyui/wrapper';
-import { Subject, filter, BehaviorSubject, Subscription } from 'rxjs';
+import { BehaviorSubject, Subject, filter, Subscription } from 'rxjs';
 import { Directionality } from '@angular/cdk/bidi';
 import { ESCAPE, hasModifierKey } from '@angular/cdk/keycodes';
 import { createRepositionScrollStrategy, createOverlayRef, OverlayConfig, createFlexibleConnectedPositionStrategy } from '@angular/cdk/overlay';
@@ -379,14 +379,74 @@ function localData(data) {
     };
 }
 
+class TableStatusService {
+    expanded = new BehaviorSubject(undefined);
+    updateIndex$ = signal(0, ...(ngDevMode ? [{ debugName: "updateIndex$" }] : []));
+    toggleExpand(value) {
+        this.expanded.next(value === this.expanded.value ? undefined : value);
+    }
+    needUpdate() {
+        this.updateIndex$.update((a) => ++a);
+    }
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.14", ngImport: i0, type: TableStatusService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.14", ngImport: i0, type: TableStatusService });
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.14", ngImport: i0, type: TableStatusService, decorators: [{
+            type: Injectable
+        }] });
+
+class ExpandRowDirective {
+    #field = inject(PI_VIEW_FIELD_TOKEN);
+    #status = inject(TableStatusService);
+    a(event) {
+        if (event.target instanceof HTMLInputElement) {
+            return;
+        }
+        this.#status.toggleExpand(this.#field().context['item$']());
+    }
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.14", ngImport: i0, type: ExpandRowDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
+    static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "20.3.14", type: ExpandRowDirective, isStandalone: true, selector: "app-expand", host: { listeners: { "click": "a($event)" } }, ngImport: i0 });
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.14", ngImport: i0, type: ExpandRowDirective, decorators: [{
+            type: Directive,
+            args: [{
+                    selector: 'app-expand',
+                }]
+        }], propDecorators: { a: [{
+                type: HostListener,
+                args: ['click', ['$event']]
+            }] } });
+
+// 切换状态演示,继承TABLE_STATUS_TOKEN自定义
+class TableStatusWC {
+    static __version = 2;
+    templateRef = viewChild.required('templateRef');
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.14", ngImport: i0, type: TableStatusWC, deps: [], target: i0.ɵɵFactoryTarget.Component });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.2.0", version: "20.3.14", type: TableStatusWC, isStandalone: true, selector: "app-table-status", providers: [TableStatusService, { provide: TABLE_STATUS_TOKEN, useExisting: TableStatusService }], viewQueries: [{ propertyName: "templateRef", first: true, predicate: ["templateRef"], descendants: true, isSignal: true }], ngImport: i0, template: "<ng-template #templateRef let-attr=\"attributes\">\n  <ng-container insertField></ng-container>\n</ng-template>\n", dependencies: [{ kind: "directive", type: InsertFieldDirective, selector: "[insertField]", exportAs: ["insertField"] }] });
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.14", ngImport: i0, type: TableStatusWC, decorators: [{
+            type: Component,
+            args: [{ selector: 'app-table-status', providers: [TableStatusService, { provide: TABLE_STATUS_TOKEN, useExisting: TableStatusService }], imports: [InsertFieldDirective], template: "<ng-template #templateRef let-attr=\"attributes\">\n  <ng-container insertField></ng-container>\n</ng-template>\n" }]
+        }], propDecorators: { templateRef: [{ type: i0.ViewChild, args: ['templateRef', { isSignal: true }] }] } });
+
 class TableResourceWC {
     static __version = 2;
     templateRef = viewChild.required('templateRef');
     field$$ = inject(PI_VIEW_FIELD_TOKEN);
+    #status = inject(TableStatusService);
     props$$ = computed(() => this.field$$().props(), ...(ngDevMode ? [{ debugName: "props$$" }] : []));
+    #data$$ = computed(() => this.field$$().props()['data'], ...(ngDevMode ? [{ debugName: "#data$$" }] : []));
     rawData$$ = computed(() => {
-        const data = this.field$$().props()['data'];
-        return Array.isArray(data) || !data ? localData(data ?? []) : data;
+        const data = this.#data$$();
+        this.#status.updateIndex$();
+        return Array.isArray(data) || !data
+            ? Promise.resolve(localData(data ?? []))
+            : data().then((value) => {
+                if (Array.isArray(value) || !value) {
+                    return localData(value ?? []);
+                }
+                return value;
+            });
     }, ...(ngDevMode ? [{ debugName: "rawData$$" }] : []));
     queryParams$$ = computed(() => {
         return this.field$$().props()['queryParams'];
@@ -401,7 +461,8 @@ class TableResourceWC {
         }),
         loader: async (res) => {
             const { params } = res;
-            return params.data(res).then((data) => {
+            let dataResult = await params.data;
+            return dataResult(res).then((data) => {
                 return dataConvert(data);
             });
         },
@@ -604,52 +665,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.14", ngImpo
                 }]
         }], ctorParameters: () => [], propDecorators: { templateRef: [{ type: i0.ViewChild, args: ['templateRef', { isSignal: true }] }] } });
 
-class TableStatusService {
-    expanded = new BehaviorSubject(undefined);
-    toggleExpand(value) {
-        this.expanded.next(value === this.expanded.value ? undefined : value);
-    }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.14", ngImport: i0, type: TableStatusService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.14", ngImport: i0, type: TableStatusService });
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.14", ngImport: i0, type: TableStatusService, decorators: [{
-            type: Injectable
-        }] });
-
-class ExpandRowDirective {
-    #field = inject(PI_VIEW_FIELD_TOKEN);
-    #status = inject(TableStatusService);
-    a(event) {
-        if (event.target instanceof HTMLInputElement) {
-            return;
-        }
-        this.#status.toggleExpand(this.#field().context['item$']());
-    }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.14", ngImport: i0, type: ExpandRowDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
-    static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "20.3.14", type: ExpandRowDirective, isStandalone: true, selector: "app-expand", host: { listeners: { "click": "a($event)" } }, ngImport: i0 });
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.14", ngImport: i0, type: ExpandRowDirective, decorators: [{
-            type: Directive,
-            args: [{
-                    selector: 'app-expand',
-                }]
-        }], propDecorators: { a: [{
-                type: HostListener,
-                args: ['click', ['$event']]
-            }] } });
-
-// 切换状态演示,继承TABLE_STATUS_TOKEN自定义
-class TableStatusWC {
-    static __version = 2;
-    templateRef = viewChild.required('templateRef');
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.14", ngImport: i0, type: TableStatusWC, deps: [], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.2.0", version: "20.3.14", type: TableStatusWC, isStandalone: true, selector: "app-table-status", providers: [TableStatusService, { provide: TABLE_STATUS_TOKEN, useExisting: TableStatusService }], viewQueries: [{ propertyName: "templateRef", first: true, predicate: ["templateRef"], descendants: true, isSignal: true }], ngImport: i0, template: "<ng-template #templateRef let-attr=\"attributes\">\n  <ng-container insertField></ng-container>\n</ng-template>\n", dependencies: [{ kind: "directive", type: InsertFieldDirective, selector: "[insertField]", exportAs: ["insertField"] }] });
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.14", ngImport: i0, type: TableStatusWC, decorators: [{
-            type: Component,
-            args: [{ selector: 'app-table-status', providers: [TableStatusService, { provide: TABLE_STATUS_TOKEN, useExisting: TableStatusService }], imports: [InsertFieldDirective], template: "<ng-template #templateRef let-attr=\"attributes\">\n  <ng-container insertField></ng-container>\n</ng-template>\n" }]
-        }], propDecorators: { templateRef: [{ type: i0.ViewChild, args: ['templateRef', { isSignal: true }] }] } });
-
 class CheckboxTableWC {
     static __version = 2;
     templateRef = viewChild.required('templateRef');