ngx-axis-appforge 0.0.45 → 0.0.47

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

@@ -249,7 +249,7 @@ declare class Design extends ValueAccess<DesignOptions> implements OnDestroy {
     onTreeSelect(nodeIds: string[]): void;
     onPreviewSelect(nodeIds: string[]): void;
     private updateScopeWithNodeId;
-    loadSetting(nodeId: string): void;
+    loadSetting(nodeId: string, force?: boolean): void;
     private buildScopeInfosGetter;
     private buildScopeInfoSubject;
     private buildComponentInfoForSetting;

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

@@ -1,6 +1,6 @@
 import * as _angular_core from '@angular/core';
 import { OnInit, OnDestroy, WritableSignal } from '@angular/core';
-import { ValueAccessOptions, ValueAccess } from 'ngx-axis-appforge/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 { UntypedFormGroup, FormArray, AbstractControl } from '@angular/forms';
 import { Subscription } from 'rxjs';
@@ -74,6 +74,7 @@ declare class EditTable extends ValueAccess<EditTableOptions> implements OnInit,
     private buildScoll;
     writeValue(value: any): void;
     setInitValue(value: any): void;
+    childRegisteValueAccess(opt: RegisteValueAccessOptions, index: number, field: EditTableFieldOptions): void;
     valueToFormValue(): void;
     formValueToValue(): void;
     buildRow(): EditTableRowData;

package/axis-components/tree-selector/index.d.ts

@@ -2,6 +2,7 @@ import * as _angular_core from '@angular/core';
 import { ValueAccessOptions, TriggeEventsOptions, ValueAccess } from 'ngx-axis-appforge/core';
 import { NzTreeNodeOptions } from 'ng-zorro-antd/tree';
 import { NzTreeNodeKey, NzFormatEmitEvent, NzTreeNode } from 'ng-zorro-antd/core/tree';
+import { NzTreeSelectComponent } from 'ng-zorro-antd/tree-select';
 import { NzCascaderOption } from 'ng-zorro-antd/cascader';
 
 declare class TreeSelectorOptions extends ValueAccessOptions {
@@ -56,12 +57,14 @@ declare class TreeSelector extends ValueAccess<TreeSelectorOptions> {
     readonly selectedKeys: _angular_core.WritableSignal<NzTreeNodeKey[]>;
     readonly selectValue: _angular_core.ModelSignal<any>;
     readonly treeNodeMap: _angular_core.Signal<Map<NzTreeNodeKey, NzTreeNodeOptions>>;
+    readonly inputTree?: NzTreeSelectComponent;
     readonly changeOn: (option: NzCascaderOption, level: number) => boolean;
     setInitValue(value: any): void;
     writeValue(value: any): void;
     private buildTreeData;
     private valueToComponentValue;
     nodeClick(e: NzFormatEmitEvent): void;
+    internalTreeNode(node: NzTreeNode, e: Event): void;
     private treeNodeToValue;
     private fullArrayToValue;
     hasExpanded(node: NzTreeNode): boolean;

package/core/index.d.ts

@@ -192,6 +192,7 @@ interface FunFieldOptions {
 }
 
 declare abstract class FunFieldBase {
+    private init;
     private orivalue;
     protected readonly fb: FormBuilder;
     abstract fg: UntypedFormGroup;
@@ -201,6 +202,8 @@ declare abstract class FunFieldBase {
     valid(): boolean;
     buildFunField(obj: any, funFields?: FunFieldOptions): any;
     recoverFunField(obj: any, funFields?: FunFieldOptions, oriObj?: any): any;
+    static ɵfac: _angular_core.ɵɵFactoryDeclaration<FunFieldBase, never>;
+    static ɵdir: _angular_core.ɵɵDirectiveDeclaration<FunFieldBase, never, never, {}, {}, never, never, true, never>;
 }
 
 declare abstract class FunFieldValueBase extends FunFieldBase implements OnInit, OnDestroy, ControlValueAccessor {

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

@@ -1252,7 +1252,10 @@ class ShortcutKey {
     }
     copy() {
         const { selected } = this.design.tree.selectListSelection;
-        const options = selected.map(nodeId => this.design.optionsNodes.get(nodeId)).map(node => node?.options);
+        let options = selected.map(nodeId => this.design.optionsNodes.get(nodeId)).map(node => node?.options);
+        if (options.length == 1) {
+            options = options[0];
+        }
         this.design.clipboard.copy(JSON.stringify(options, null, 2));
     }
     cut() {
@@ -1562,25 +1565,29 @@ class Design extends ValueAccess {
             scopeId = this.scopeInfos.get(scopeId)?.parentScopeId;
         }
     }
-    loadSetting(nodeId) {
+    loadSetting(nodeId, force = false) {
         if (nodeId && this.optionsNodes.has(nodeId)) {
-            if (this.settingOptionsNodeId == nodeId) {
-                return;
-            }
-            else if (this.settingOptionsNodeId) {
-                const oldNode = this.optionsNodes.get(this.settingOptionsNodeId);
-                const newNode = this.optionsNodes.get(nodeId);
-                if (newNode.canSetting && oldNode && oldNode.parentId == newNode.parentId && oldNode.settingType == newNode.settingType) {
-                    this.settingOptionsNodeId = nodeId;
-                    this.settingOptionsStr.set(JSON.stringify(newNode.options, null, "  "));
-                    Object.keys(oldNode.options).filter(k => !k.startsWith("$")).forEach(k => newNode.options[k] ??= undefined);
-                    this.settingRef?.instance.writeValue(newNode.options);
+            if (!force) {
+                if (this.settingOptionsNodeId == nodeId) {
                     return;
                 }
+                else if (this.settingOptionsNodeId) {
+                    const oldNode = this.optionsNodes.get(this.settingOptionsNodeId);
+                    const newNode = this.optionsNodes.get(nodeId);
+                    if (newNode.canSetting && oldNode && oldNode.parentId == newNode.parentId && oldNode.settingType == newNode.settingType) {
+                        this.settingOptionsNodeId = nodeId;
+                        this.settingOptionsStr.set(JSON.stringify(newNode.options, null, "  "));
+                        this.settingRef?.instance.writeValue(newNode.options);
+                        return;
+                    }
+                }
             }
             this.resetSetting();
-            this.settingOptionsNodeId = nodeId;
             const optionsNode = this.optionsNodes.get(nodeId);
+            if (!optionsNode.canSetting) {
+                return;
+            }
+            this.settingOptionsNodeId = nodeId;
             this.settingOptionsStr.set(JSON.stringify(optionsNode.options, null, "  "));
             if (optionsNode.settingType) {
                 const injector = Injector.create({
@@ -1804,8 +1811,12 @@ class Design extends ValueAccess {
         if (this.settingOptionsNodeId) {
             const optionsNode = this.optionsNodes.get(this.settingOptionsNodeId);
             if (optionsNode) {
-                const instance = this.setting.get(0)?.context;
-                instance?.writeValue(optionsNode.options);
+                if (optionsNode.canSetting && this.settingRef?.componentType == optionsNode.settingType) {
+                    this.settingRef?.instance?.writeValue(optionsNode.options);
+                }
+                else {
+                    this.loadSetting(optionsNode.id, true);
+                }
             }
         }
     }