ngx-axis-appforge 0.0.74 → 0.0.75

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

@@ -1,4 +1,5 @@
 import * as _angular_core from '@angular/core';
+import { WritableSignal } from '@angular/core';
 import { NzJustify, NzAlign, NzWrap } from 'ng-zorro-antd/flex';
 import { BaseOptions, Base } from 'ngx-axis-appforge/core';
 
@@ -13,6 +14,8 @@ declare class FlexOptions extends BaseOptions {
 
 declare class Flex extends Base<FlexOptions> {
     options: FlexOptions;
+    readonly loopMap: _angular_core.Signal<Map<string, WritableSignal<any[]>>>;
+    constructor();
     static ɵfac: _angular_core.ɵɵFactoryDeclaration<Flex, never>;
     static ɵcmp: _angular_core.ɵɵComponentDeclaration<Flex, "axis-flex", never, {}, {}, never, never, true, never>;
 }

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

@@ -1,5 +1,5 @@
 import * as _angular_core from '@angular/core';
-import { OnDestroy, ElementRef } from '@angular/core';
+import { OnDestroy, ElementRef, WritableSignal } from '@angular/core';
 import { DataOptions, Base, EventHandlerOptions } from 'ngx-axis-appforge/core';
 import { BaseTableOptions, SelectableTableOptions, ExpandableTableOptions, StatisticTableOptions, BaseTableFieldOptions, StatisticTableFieldOptions, TableFieldDisplayService, TableService, ExpandService, StatisticService, SelectService } from 'ngx-axis-appforge/axis-components/table-helper';
 import { CdkDragDrop } from '@angular/cdk/drag-drop';
@@ -51,6 +51,8 @@ declare class TableOptions extends DataOptions implements BaseTableOptions, Sele
     readonly expandRow: _angular_core.WritableSignal<any>;
 }
 declare class TableFieldOptions implements BaseTableFieldOptions, StatisticTableFieldOptions {
+    loop: boolean;
+    loopTarget: any[] | undefined;
     readonly inuse: _angular_core.WritableSignal<boolean>;
     readonly field: _angular_core.WritableSignal<string>;
     readonly title: _angular_core.WritableSignal<string>;
@@ -117,17 +119,19 @@ declare class Table extends Base<TableOptions> {
     constructor(elementRef: ElementRef, tableFieldDisplayService: TableFieldDisplayService, tableSvc: TableService<TableOptions, TableFieldOptions>, select: SelectService, expand: ExpandService, statistic: StatisticService, parentSelect?: SelectService);
     options: TableOptions;
     select: SelectService;
-    readonly scroll: _angular_core.WritableSignal<{
+    readonly scroll: WritableSignal<{
         x: string;
         y: string;
     }>;
     readonly fields: _angular_core.Signal<TableFieldOptions[]>;
     readonly rowActions: _angular_core.Signal<any[]>;
     readonly actionsFieldWidth: _angular_core.Signal<number>;
-    readonly fixFields: _angular_core.WritableSignal<TableFieldOptions[]>;
+    readonly fixFields: WritableSignal<TableFieldOptions[]>;
     readonly backendPageParamsChange: Subject<void>;
     readonly customExportDataSubject: Subject<any[]>;
     timer?: number;
+    readonly loopFieldMap: _angular_core.Signal<Map<string, WritableSignal<any[]>>>;
+    readonly loopFieldDataMap: WritableSignal<Map<TableFieldOptions, any>>;
     callFunction<T>(name: String, args?: any): T | undefined;
     resizeHandleOffsetX(field: TableFieldOptions): number;
     tableSetter?: TableSetter;

package/core/index.d.ts

@@ -34,6 +34,8 @@ declare class BaseOptions {
     requiredPermissions: string[];
     readonly triggeEvents: _angular_core.WritableSignal<TriggeEventsOptions | undefined>;
     readonly style: _angular_core.WritableSignal<any>;
+    loop: boolean;
+    loopTarget: any[] | undefined;
 }
 
 interface ApiOptions {
@@ -225,10 +227,12 @@ declare abstract class FunFieldValueBase extends FunFieldBase implements OnInit,
 
 declare class OptionsNode {
     protected config: OptionsNodeConfig;
+    canLoop: boolean;
     constructor(config: OptionsNodeConfig);
     get id(): string;
     get parentId(): string | undefined;
     get scopeId(): string | undefined;
+    set scopeId(scopeId: string);
     get name(): string | undefined;
     get dragType(): string | undefined;
     get dropType(): string | undefined;
@@ -382,6 +386,7 @@ interface NextInfo {
     indexOfParent?: string | number;
     parentId?: string;
     scopeId?: string;
+    canLoop?: boolean;
 }
 interface ScopeInfo {
     scopeId: string;
@@ -484,6 +489,7 @@ declare const AXIS_DESIGN_OPTIONS_NODE_FOR_MENU: InjectionToken<{
     current: OptionsNode;
     parent?: OptionsNode;
 }>;
+declare const AXIS_DESIGN_CAN_LOOP_TOKEN: InjectionToken<boolean>;
 declare const AXIS_DESIGN_SCOPE_INFOS_GETTER_TOKEN: InjectionToken<(scopeId?: string) => BehaviorSubject<ScopeInfo[]>>;
 declare const AXIS_DESIGN_COMPONENT_INFO_FOR_SETTING_TOKEN: InjectionToken<{
     component: string;
@@ -666,6 +672,7 @@ declare class BaseDesignSetting implements AfterViewInit {
     readonly scopeId: _angular_core.InputSignal<string | undefined>;
     readonly exclude: _angular_core.InputSignal<string[]>;
     readonly allPermissions: [string, string][];
+    readonly canLoop: boolean;
     fg: _angular_core.InputSignal<UntypedFormGroup>;
     ngAfterViewInit(): void;
     static ɵfac: _angular_core.ɵɵFactoryDeclaration<BaseDesignSetting, never>;
@@ -674,6 +681,8 @@ declare class BaseDesignSetting implements AfterViewInit {
 declare const baseFbConfig: {
     id: ((typeof FormValidators.required)[] | undefined)[];
     inuse: ((typeof FormValidators.requiredFun)[] | undefined)[];
+    loop: (boolean | (typeof FormValidators.required)[])[];
+    loopTarget: never[];
     requiredPermissions: never[];
     style: never[];
     triggeEvents: never[];
@@ -853,5 +862,5 @@ declare function fn(fnBody: string, argsObj: any, ignoreUndefined?: boolean, pri
 
 declare function sendApi(opt: ApiOptions, http: HttpClient): Observable<any>;
 
-export { AXIS_COMPONENTS_LOADER_TOKEN, AXIS_COMPONENTS_TOKEN, AXIS_CURRENT_USER_PERMISSIONS_TOKEN, AXIS_DESIGN_ALL_PERMISSIONS_TOKEN, AXIS_DESIGN_CHOOSE_COMPONENT_FUNC_TOKEN, AXIS_DESIGN_CMPLIBS_TOKEN, AXIS_DESIGN_COMPONENT_INFO_FOR_SETTING_TOKEN, AXIS_DESIGN_COMPONENT_REF_FOR_SETTING_TOKEN, AXIS_DESIGN_COMPONENT_REF_GETTER_TOKEN, AXIS_DESIGN_OPTIONS_NODE_FOR_MENU, AXIS_DESIGN_SCOPE_INFOS_GETTER_TOKEN, AXIS_EVENT_HANDLERS_TOKEN, AXIS_EVENT_HANDLER_DESCS_TOKEN, AXIS_FILE_BASE_URL_TOKEN, AXIS_FORM_REGISTE_CONTROL_TOKEN, AXIS_HTTP_CONTEXT_DATA_TOKEN, AXIS_HTTP_CONTEXT_TOKEN, AXIS_INJECT_DATA_TOKEN, AXIS_INJECT_FUNC_TOKEN, AXIS_SCRIPTS_TOKEN, Base, BaseDesignSetting, BaseMenu, BaseOptions, CommonMenu, ComponentsLoader, DataHandler, DataOptions, DesignBuilder, DynamicDirective, ElementNode, FilteredTreeResult, FormValidators, FunField, FunFieldBase, FunFieldValueBase, HowLongPipe, InputTrigger, InputValidator, OptionsNode, ScopeDirective, SimpleMenu, ValueAccess, ValueAccessOptions, ValueDesignSetting, assignDefaultField, baseFbConfig, baseFunField, buildValidators, codeName, copy, deepMerge, fn, isEquals, listSort, nameCode, obj2Arr, objDiff, rebuildObject, recursionArray, recursionObject, sendApi, trackByFn, updateAndValidAll, valueFbConfig, valueFunField };
+export { AXIS_COMPONENTS_LOADER_TOKEN, AXIS_COMPONENTS_TOKEN, AXIS_CURRENT_USER_PERMISSIONS_TOKEN, AXIS_DESIGN_ALL_PERMISSIONS_TOKEN, AXIS_DESIGN_CAN_LOOP_TOKEN, AXIS_DESIGN_CHOOSE_COMPONENT_FUNC_TOKEN, AXIS_DESIGN_CMPLIBS_TOKEN, AXIS_DESIGN_COMPONENT_INFO_FOR_SETTING_TOKEN, AXIS_DESIGN_COMPONENT_REF_FOR_SETTING_TOKEN, AXIS_DESIGN_COMPONENT_REF_GETTER_TOKEN, AXIS_DESIGN_OPTIONS_NODE_FOR_MENU, AXIS_DESIGN_SCOPE_INFOS_GETTER_TOKEN, AXIS_EVENT_HANDLERS_TOKEN, AXIS_EVENT_HANDLER_DESCS_TOKEN, AXIS_FILE_BASE_URL_TOKEN, AXIS_FORM_REGISTE_CONTROL_TOKEN, AXIS_HTTP_CONTEXT_DATA_TOKEN, AXIS_HTTP_CONTEXT_TOKEN, AXIS_INJECT_DATA_TOKEN, AXIS_INJECT_FUNC_TOKEN, AXIS_SCRIPTS_TOKEN, Base, BaseDesignSetting, BaseMenu, BaseOptions, CommonMenu, ComponentsLoader, DataHandler, DataOptions, DesignBuilder, DynamicDirective, ElementNode, FilteredTreeResult, FormValidators, FunField, FunFieldBase, FunFieldValueBase, HowLongPipe, InputTrigger, InputValidator, OptionsNode, ScopeDirective, SimpleMenu, ValueAccess, ValueAccessOptions, ValueDesignSetting, assignDefaultField, baseFbConfig, baseFunField, buildValidators, codeName, copy, deepMerge, fn, isEquals, listSort, nameCode, obj2Arr, objDiff, rebuildObject, recursionArray, recursionObject, sendApi, trackByFn, updateAndValidAll, valueFbConfig, valueFunField };
 export type { Cmplib, DataSourceOptions, DesignBindElementsResult, DesignBuildResult, DesignConfig, DynamicFnOptions, EventDesc, EventHandlerDesc, EventHandlerDescGroup, EventHandlerOptions, EventsHandler, Example, ExampleBuilder, ExampleDesc, ExampleGroup, FlatNode, FunFieldOptions, FunFieldValue, MyErrorsOptions, MyValidationErrors, NextInfo, OptionsChangeEvent, RegisteFormControlOptions, RegisteValueAccessOptions, ScopeInfo, TriggeEventsOptions };

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

@@ -18,7 +18,7 @@ import { BehaviorSubject, combineLatest, auditTime, tap, map, filter, take, debo
 import * as i3$1 from 'ng-zorro-antd/flex';
 import { NzFlexModule } from 'ng-zorro-antd/flex';
 import { SelectionModel } from '@angular/cdk/collections';
-import { FilteredTreeResult, AXIS_FILE_BASE_URL_TOKEN, AXIS_HTTP_CONTEXT_DATA_TOKEN, AXIS_COMPONENTS_LOADER_TOKEN, ScopeDirective, DynamicDirective, DesignBuilder, AXIS_INJECT_DATA_TOKEN, AXIS_INJECT_FUNC_TOKEN, AXIS_DESIGN_CMPLIBS_TOKEN, isEquals, ValueAccessOptions, copy, HowLongPipe, ValueAccess, AXIS_DESIGN_SCOPE_INFOS_GETTER_TOKEN, AXIS_DESIGN_COMPONENT_INFO_FOR_SETTING_TOKEN, AXIS_DESIGN_COMPONENT_REF_FOR_SETTING_TOKEN, AXIS_DESIGN_COMPONENT_REF_GETTER_TOKEN, AXIS_DESIGN_ALL_PERMISSIONS_TOKEN, AXIS_DESIGN_OPTIONS_NODE_FOR_MENU, AXIS_DESIGN_CHOOSE_COMPONENT_FUNC_TOKEN, OptionsNode } from 'ngx-axis-appforge/core';
+import { FilteredTreeResult, AXIS_FILE_BASE_URL_TOKEN, AXIS_HTTP_CONTEXT_DATA_TOKEN, AXIS_COMPONENTS_LOADER_TOKEN, ScopeDirective, DynamicDirective, DesignBuilder, AXIS_INJECT_DATA_TOKEN, AXIS_INJECT_FUNC_TOKEN, AXIS_DESIGN_CMPLIBS_TOKEN, isEquals, ValueAccessOptions, copy, HowLongPipe, ValueAccess, AXIS_DESIGN_CAN_LOOP_TOKEN, AXIS_DESIGN_SCOPE_INFOS_GETTER_TOKEN, AXIS_DESIGN_COMPONENT_INFO_FOR_SETTING_TOKEN, AXIS_DESIGN_COMPONENT_REF_FOR_SETTING_TOKEN, AXIS_DESIGN_COMPONENT_REF_GETTER_TOKEN, AXIS_DESIGN_ALL_PERMISSIONS_TOKEN, AXIS_DESIGN_OPTIONS_NODE_FOR_MENU, AXIS_DESIGN_CHOOSE_COMPONENT_FUNC_TOKEN, OptionsNode } from 'ngx-axis-appforge/core';
 import * as i6 from 'ng-zorro-antd/button';
 import { NzButtonModule } from 'ng-zorro-antd/button';
 import * as i9 from 'ng-zorro-antd/tooltip';
@@ -1433,6 +1433,20 @@ class Design extends ValueAccess {
         this.componentsCounter.set(nextInfo.currentObject.component, this.componentsCounter.get(nextInfo.currentObject.component) + 1);
         const res = config.buildOptionsNodes?.(nextInfo);
         if (res) {
+            res.treeNode.canLoop = nextInfo.canLoop ?? false;
+            if (nextInfo.canLoop && res.treeNode.options?.loop) {
+                const newScope = {
+                    scopeId: res.treeNode.id + ".loop",
+                    scopeName: "循环",
+                    parentScopeId: nextInfo.scopeId,
+                    ds: {
+                        loopRow: res.treeNode.options.loopTarget?.[0] ?? "示例数据"
+                    },
+                };
+                res.newScopes ??= [];
+                res.newScopes.push(newScope);
+                res.treeNode.scopeId = newScope.scopeId;
+            }
             let nodes = [res.treeNode];
             while (nodes.length) {
                 let next = [];
@@ -1600,6 +1614,7 @@ class Design extends ValueAccess {
             if (optionsNode.settingType) {
                 const injector = Injector.create({
                     providers: [
+                        { provide: AXIS_DESIGN_CAN_LOOP_TOKEN, useValue: optionsNode.canLoop },
                         { provide: AXIS_DESIGN_SCOPE_INFOS_GETTER_TOKEN, useValue: this.buildScopeInfosGetter(optionsNode) },
                         { provide: AXIS_DESIGN_COMPONENT_INFO_FOR_SETTING_TOKEN, useValue: this.buildComponentInfoForSetting(optionsNode) },
                         { provide: AXIS_DESIGN_COMPONENT_REF_FOR_SETTING_TOKEN, useFactory: () => this.buildComponentRefForSetting(optionsNode) },