ngx-axis-appforge 0.0.29 → 0.0.31

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

@@ -142,8 +142,6 @@ declare class ShortcutKey {
     cut(): void;
     paste(): Promise<void>;
     private isComponentObj;
-    private parseToExample;
-    private recursionParse;
 }
 
 declare class DesignOptions extends ValueAccessOptions {
@@ -238,7 +236,10 @@ declare class Design extends ValueAccess<DesignOptions> implements OnDestroy {
     private genNewComponentId;
     onCmplibDragStart(example: Example, element: HTMLElement): void;
     onCmplibDragEnd(): Promise<void>;
-    onExamplePaste(examples: Example[]): void;
+    onPaste(objs: any[]): void;
+    replaceExampleId(example: any): any;
+    private buildIdMap;
+    private isComponentObj;
     onNodesMove(nodeIds: string[]): void;
     onEditorChange(optionsStr: string): void;
     syncToSetting(): void;

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

@@ -59,7 +59,7 @@ declare class TreeSelector extends ValueAccess<TreeSelectorOptions> {
     readonly changeOn: (option: NzCascaderOption, level: number) => boolean;
     writeValue(value: any): void;
     private buildTreeData;
-    private initComponentValue;
+    private valueToComponentValue;
     nodeClick(e: NzFormatEmitEvent): void;
     private treeNodeToValue;
     private fullArrayToValue;

package/core/index.d.ts

@@ -447,7 +447,7 @@ interface ExampleDesc {
 }
 interface Example {
     name?: string;
-    builder: ExampleBuilder;
+    options: any;
 }
 type ExampleBuilder = (componentIdBuilder?: (component: string, offset?: number) => string) => any;
 

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

@@ -1053,7 +1053,7 @@ class Cmplib {
     }
     preloadDragElement(example, desc) {
         if (this.selectMode() == "drag") {
-            this.dragOptions.set(example.builder());
+            this.dragOptions.set(example.options);
             this.dragExample = example;
             if (desc) {
                 example.name ??= desc.component;
@@ -1206,8 +1206,7 @@ class ShortcutKey {
                         this.cutNodeIds = undefined;
                     }
                     else {
-                        const examples = objs.map(r => this.parseToExample(r));
-                        this.design.onExamplePaste(examples);
+                        this.design.onPaste(objs);
                     }
                 }
             }
@@ -1219,36 +1218,6 @@ class ShortcutKey {
     isComponentObj(obj) {
         return obj && obj.hasOwnProperty("id") && obj.hasOwnProperty("component");
     }
-    parseToExample(obj) {
-        return {
-            builder: componentIdBuilder => {
-                if (componentIdBuilder) {
-                    return this.recursionParse(obj, componentIdBuilder);
-                }
-                return obj;
-            }
-        };
-    }
-    recursionParse(obj, idBuilder, components = new Map()) {
-        if (this.isComponentObj(obj)) {
-            const offset = (components.get(obj.component) ?? 0) + 1;
-            components.set(obj.component, offset);
-            obj.id = idBuilder(obj.component, offset);
-        }
-        if (obj) {
-            if (Array.isArray(obj)) {
-                for (let i = 0; i < obj.length; i++) {
-                    obj[i] = this.recursionParse(obj[i], idBuilder, components);
-                }
-            }
-            else if (typeof obj == "object") {
-                for (const en of Object.entries(obj)) {
-                    obj[en[0]] = this.recursionParse(en[1], idBuilder, components);
-                }
-            }
-        }
-        return obj;
-    }
 }
 
 class DesignOptions extends ValueAccessOptions {
@@ -1645,7 +1614,7 @@ class Design extends ValueAccess {
         this.chooseComponentTags.set(tags);
         this.chooseComponentVisible.set(true);
         return this.chooseComponentSubject.asObservable()
-            .pipe(take(1), map((example) => example?.builder((component, offset) => this.genNewComponentId(component, offset))), switchMap(options => options ? from(this.loader.loadComponent(`${options.component}/design`)).pipe(map(config => ({ options, config }))) : of({})));
+            .pipe(take(1), map((example) => example ? this.replaceExampleId(example.options) : null), switchMap(options => options ? from(this.loader.loadComponent(`${options.component}/design`)).pipe(map(config => ({ options, config }))) : of({})));
     }
     genNewComponentId(component, offset = 1, existsIds) {
         let id;
@@ -1658,11 +1627,10 @@ class Design extends ValueAccess {
         if (existsIds?.has(id) || this.optionsNodes.has(id)) {
             return this.genNewComponentId(component, offset + 1, existsIds);
         }
-        existsIds?.add(id);
-        return id;
+        return { id, offset };
     }
     onCmplibDragStart(example, element) {
-        const options = example.builder((component, offset) => this.genNewComponentId(component, offset));
+        const options = this.replaceExampleId(example.options);
         const optionsNode = new OptionsNode({
             canDrag: true,
             dragType: "component",
@@ -1681,10 +1649,10 @@ class Design extends ValueAccess {
             this.loadSetting(nodeId);
         }
     }
-    onExamplePaste(examples) {
+    onPaste(objs) {
         const nodes = [];
-        for (const example of examples) {
-            const options = example.builder((component, offset) => this.genNewComponentId(component, offset));
+        for (const obj of objs) {
+            const options = this.replaceExampleId(obj);
             const optionsNode = new OptionsNode({
                 canDrag: true,
                 dragType: "component",
@@ -1695,6 +1663,45 @@ class Design extends ValueAccess {
         }
         this.tree.addNodeForSelected(nodes, undefined, `粘贴${nodes.length}个组件`);
     }
+    replaceExampleId(example) {
+        const idMap = new Map();
+        this.buildIdMap(example, idMap);
+        let exampleStr = JSON.stringify(example);
+        while (idMap.size > 0) {
+            idMap.forEach((newId, oldId) => {
+                if (!idMap.has(newId)) {
+                    exampleStr = exampleStr.replaceAll(oldId, newId);
+                    idMap.delete(oldId);
+                }
+            });
+        }
+        return JSON.parse(exampleStr);
+    }
+    buildIdMap(obj, idMap, offsetMap = new Map()) {
+        if (this.isComponentObj(obj)) {
+            const offset = (offsetMap.get(obj.component) ?? 0) + 1;
+            const res = this.genNewComponentId(obj.component, offset, new Set(idMap.values()));
+            offsetMap.set(obj.component, res.offset);
+            if (obj.id != res.id) {
+                idMap.set(obj.id, res.id);
+            }
+        }
+        if (obj) {
+            if (Array.isArray(obj)) {
+                for (let i = 0; i < obj.length; i++) {
+                    this.buildIdMap(obj[i], idMap, offsetMap);
+                }
+            }
+            else if (typeof obj == "object") {
+                for (const en of Object.entries(obj)) {
+                    this.buildIdMap(en[1], idMap, offsetMap);
+                }
+            }
+        }
+    }
+    isComponentObj(obj) {
+        return obj && obj.hasOwnProperty("id") && obj.hasOwnProperty("component");
+    }
     onNodesMove(nodeIds) {
         if (this.tree.selectListSelection.selected.length == 1) {
             this.tree.addNodeForSelected(nodeIds.map(id => this.optionsNodes.get(id)), true, `粘贴${nodeIds.length}个组件`);