ngx-axis-appforge 0.0.46 → 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/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,24 +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, "  "));
-                    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({
@@ -1803,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);
+                }
             }
         }
     }