ngx-axis-appforge 0.0.49 → 0.0.50

package/axis-components/edit-table/index.d.ts

@@ -1,16 +1,20 @@
 import * as _angular_core from '@angular/core';
 import { OnInit, OnDestroy, WritableSignal } from '@angular/core';
 import { ValueAccessOptions, ValueAccess, RegisteValueAccessOptions } from 'ngx-axis-appforge/core';
-import { BaseTableOptions, SelectableTableOptions, BaseTableFieldOptions, TableService, SelectService } from 'ngx-axis-appforge/axis-components/table-helper';
+import { BaseTableOptions, SelectableTableOptions, ExpandableTableOptions, BaseTableFieldOptions, TableService, SelectService, ExpandService } from 'ngx-axis-appforge/axis-components/table-helper';
 import { UntypedFormGroup, FormArray, AbstractControl } from '@angular/forms';
 import { Subscription } from 'rxjs';
 
-declare class EditTableOptions extends ValueAccessOptions implements BaseTableOptions, SelectableTableOptions {
+declare class EditTableOptions extends ValueAccessOptions implements BaseTableOptions, SelectableTableOptions, ExpandableTableOptions {
     readonly disabledAppend: _angular_core.WritableSignal<boolean>;
     readonly disabledRemove: _angular_core.WritableSignal<boolean>;
     readonly disabledRemoveFn: _angular_core.WritableSignal<string>;
     readonly maxLength: _angular_core.WritableSignal<number | null>;
     readonly addInitData: _angular_core.WritableSignal<any>;
+    readonly showExpand: _angular_core.WritableSignal<boolean>;
+    readonly expandMode: _angular_core.WritableSignal<"custom" | "tree">;
+    readonly treeChildrenFun: _angular_core.WritableSignal<string>;
+    readonly expandFormName: _angular_core.WritableSignal<string | undefined>;
     readonly size: _angular_core.WritableSignal<"middle" | "small" | "default">;
     readonly showOrder: _angular_core.WritableSignal<boolean>;
     readonly showDataSize: _angular_core.WritableSignal<boolean>;
@@ -31,6 +35,7 @@ declare class EditTableOptions extends ValueAccessOptions implements BaseTableOp
     readonly showSizeChanger: _angular_core.WritableSignal<boolean>;
     readonly pageSizeOptions: _angular_core.WritableSignal<string>;
     readonly fields: _angular_core.WritableSignal<any[]>;
+    readonly expandRow: _angular_core.WritableSignal<any>;
 }
 declare class EditTableFieldOptions implements BaseTableFieldOptions {
     readonly inuse: _angular_core.WritableSignal<boolean>;
@@ -53,7 +58,8 @@ declare class EditTableFieldOptions implements BaseTableFieldOptions {
 declare class EditTable extends ValueAccess<EditTableOptions> implements OnInit, OnDestroy {
     tableSvc: TableService<EditTableOptions, EditTableFieldOptions>;
     select: SelectService;
-    constructor(tableSvc: TableService<EditTableOptions, EditTableFieldOptions>, select: SelectService);
+    expand: ExpandService;
+    constructor(tableSvc: TableService<EditTableOptions, EditTableFieldOptions>, select: SelectService, expand: ExpandService, parentSelect?: SelectService);
     options: EditTableOptions;
     private readonly fb;
     readonly fg: UntypedFormGroup;
@@ -76,6 +82,7 @@ declare class EditTable extends ValueAccess<EditTableOptions> implements OnInit,
     setInitValue(value: any): void;
     childRegisteValueAccess(opt: RegisteValueAccessOptions, index: number, field: EditTableFieldOptions): void;
     valueToFormValue(): void;
+    formValueToSelect(): void;
     formValueToValue(): void;
     buildRow(): EditTableRowData;
     addRow(): void;
@@ -83,7 +90,7 @@ declare class EditTable extends ValueAccess<EditTableOptions> implements OnInit,
     refreshStatus(row: EditTableRowData): void;
     ngOnDestroy(): void;
     onSelectedChange(checkedIds: Set<any>): void;
-    static ɵfac: _angular_core.ɵɵFactoryDeclaration<EditTable, never>;
+    static ɵfac: _angular_core.ɵɵFactoryDeclaration<EditTable, [null, null, null, { optional: true; skipSelf: true; }]>;
     static ɵcmp: _angular_core.ɵɵComponentDeclaration<EditTable, "axis-edit-table", never, { "pageIndex": { "alias": "pageIndex"; "required": false; "isSignal": true; }; }, { "pageIndex": "pageIndexChange"; }, never, never, true, never>;
 }
 interface EditTableRowData {

package/axis-components/table/index.d.ts

@@ -1,7 +1,7 @@
 import * as _angular_core from '@angular/core';
 import { OnDestroy, ElementRef } from '@angular/core';
 import { DataOptions, Base } from 'ngx-axis-appforge/core';
-import { BaseTableOptions, SelectableTableOptions, ExpandableTableOptions, StatisticTableOptions, BaseTableFieldOptions, StatisticTableFieldOptions, TableService, SelectService, ExpandService, StatisticService } from 'ngx-axis-appforge/axis-components/table-helper';
+import { BaseTableOptions, SelectableTableOptions, ExpandableTableOptions, StatisticTableOptions, BaseTableFieldOptions, StatisticTableFieldOptions, TableService, ExpandService, StatisticService, SelectService } from 'ngx-axis-appforge/axis-components/table-helper';
 import { CdkDragDrop } from '@angular/cdk/drag-drop';
 import { NzResizeEvent } from 'ng-zorro-antd/resizable';
 import { Subject, Subscription } from 'rxjs';
@@ -112,11 +112,11 @@ declare class TableSetter implements OnDestroy {
 declare class Table extends Base<TableOptions> {
     private elementRef;
     tableSvc: TableService<TableOptions, TableFieldOptions>;
-    select: SelectService;
     expand: ExpandService;
     statistic: StatisticService;
-    constructor(elementRef: ElementRef, tableSvc: TableService<TableOptions, TableFieldOptions>, select: SelectService, expand: ExpandService, statistic: StatisticService);
+    constructor(elementRef: ElementRef, tableSvc: TableService<TableOptions, TableFieldOptions>, select: SelectService, expand: ExpandService, statistic: StatisticService, parentSelect?: SelectService);
     options: TableOptions;
+    select: SelectService;
     readonly scroll: _angular_core.WritableSignal<{
         x: string;
         y: string;
@@ -140,7 +140,7 @@ declare class Table extends Base<TableOptions> {
     rowspan(field: string, index: number): number;
     onSelectedChange(): void;
     ngOnDestroy(): void;
-    static ɵfac: _angular_core.ɵɵFactoryDeclaration<Table, never>;
+    static ɵfac: _angular_core.ɵɵFactoryDeclaration<Table, [null, null, null, null, null, { optional: true; skipSelf: true; }]>;
     static ɵcmp: _angular_core.ɵɵComponentDeclaration<Table, "axis-table", never, { "pageIndex": { "alias": "pageIndex"; "required": false; "isSignal": true; }; }, { "pageIndex": "pageIndexChange"; }, never, never, true, never>;
 }
 

package/axis-components/table-helper/index.d.ts

@@ -1,5 +1,5 @@
 import * as i0 from '@angular/core';
-import { WritableSignal, Signal } from '@angular/core';
+import { WritableSignal, Signal, InjectionToken } from '@angular/core';
 import { NzTableFilterList } from 'ng-zorro-antd/table';
 import { DatePipe, DecimalPipe, PercentPipe } from '@angular/common';
 import { ScopeDirective } from 'ngx-axis-appforge/core';
@@ -27,6 +27,7 @@ interface ExpandableTableOptions extends BaseTableOptions {
     readonly showExpand: WritableSignal<boolean>;
     readonly expandMode: WritableSignal<"custom" | "tree">;
     readonly treeChildrenFun: WritableSignal<string>;
+    readonly expandRow: WritableSignal<any>;
 }
 interface StatisticTableOptions extends BaseTableOptions {
     readonly showStatistic: WritableSignal<boolean>;
@@ -102,30 +103,50 @@ declare class TableService<T extends BaseTableOptions, F extends BaseTableFieldO
     static ɵprov: i0.ɵɵInjectableDeclaration<TableService<any, any>>;
 }
 
+declare const AXIS_TABLE_SELECT_TOKEN: InjectionToken<SelectService>;
+declare enum ChangeScene {
+    userClick = 0,
+    linkage = 1
+}
 declare class SelectService {
     private scope?;
     constructor(scope?: ScopeDirective | undefined);
+    readonly ready: i0.WritableSignal<boolean>;
     private options;
-    private keyField;
+    keyField: string;
     private data;
-    private onSelectedChange;
+    private readonly changeSubject;
+    private parent?;
+    private subSelectKeyFun?;
+    private registToParent;
     readonly headerChecked: i0.WritableSignal<"none" | "checked" | "indeterminate">;
-    setOfCheckedId: Set<unknown>;
-    setOfIndeterminateId: Set<unknown>;
-    setOfDisabledId: Signal<Set<any>>;
+    readonly setOfCheckedId: i0.WritableSignal<Set<any>>;
+    readonly setOfIndeterminateId: i0.WritableSignal<Set<any>>;
+    readonly setOfDisabledId: Signal<Set<any>>;
+    private subs;
+    private readonly subSelects;
     init(opts: {
         options: SelectableTableOptions;
         keyField: string;
         data: Signal<any[] | null>;
         onSelectedChange: (checkedIds: Set<any>) => void;
+        parent?: SelectService;
+        scope?: ScopeDirective | null;
+        subSelectKeyFun?: (scope: ScopeDirective) => string;
+        registToParent?: boolean;
     }): void;
+    findSubSelect(key: string): SelectService | undefined;
+    getSubSelectKey(scope: ScopeDirective): string;
+    private initCheckboxLinkageForExpand;
     private buildDisabledId;
-    onAllChecked(checked: boolean): void;
-    toggleChecked(row: any): void;
-    onItemChecked(row: any, checked: boolean): void;
-    updateCheckedSet(row: any, checked: boolean): void;
-    refreshCheckedStatus(): void;
+    onAllChecked(checked: boolean, scene?: ChangeScene): void;
+    toggleChecked(row: any, scene?: ChangeScene): void;
+    onItemChecked(row: any, checked: boolean, scene?: ChangeScene): void;
+    onSetItemsChecked(rows: any[], scene?: ChangeScene): void;
+    updateCheckedSet(key: string, checked: boolean, indeterminate?: boolean): void;
+    refreshCheckedStatus(scene: ChangeScene): void;
     getSelectedData(): any[] | undefined;
+    close(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<SelectService, [{ optional: true; }]>;
     static ɵprov: i0.ɵɵInjectableDeclaration<SelectService>;
 }
@@ -181,5 +202,5 @@ declare class StatisticService {
     static ɵprov: i0.ɵɵInjectableDeclaration<StatisticService>;
 }
 
-export { ExpandService, SelectService, StatisticService, TableFieldDisplayService, TableService };
+export { AXIS_TABLE_SELECT_TOKEN, ChangeScene, ExpandService, SelectService, StatisticService, TableFieldDisplayService, TableService };
 export type { BaseTableFieldOptions, BaseTableOptions, ExpandableTableOptions, SelectableTableOptions, StatisticTableFieldOptions, StatisticTableOptions };

package/fesm2022/ngx-axis-appforge-axis-components-design.mjs

@@ -332,7 +332,7 @@ class Tree {
         let nextNodeId;
         for (const nodeId of this.selectListSelection.selected) {
             const node = this.optionsNodes().get(nodeId);
-            if (node) {
+            if (node?.canSetting) {
                 changed = true;
                 if (node.isRoot) {
                     next = null;