feat(core): add setSources to DragSource

alibaba · Jun 7, 2021 · 5dc81b5 · 5dc81b5
1 parent 91d1d84
commit 5dc81b5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/packages/core/src/models/DragSource.ts b/packages/core/src/models/DragSource.ts
@@ -1,11 +1,20 @@
+import { each, uid } from '@designable/shared'
 import { TreeNode, ITreeNode } from './TreeNode'
 
 export class DragSource {
   tree: TreeNode
+  prefix: string
   constructor() {
     this.tree = new TreeNode({
       componentName: 'SourceRoot',
     })
+    this.prefix = uid()
+  }
+
+  setSources(sources: Record<string, ITreeNode[]>) {
+    each(sources, (data, group) => {
+      this.setSourcesByGroup(group, data)
+    })
   }
 
   setSourcesByGroup(group: string, sources: ITreeNode[]) {
@@ -16,7 +25,7 @@ export class DragSource {
     } else {
       const newParent = new TreeNode({
         componentName: 'SourceGroup',
-        id: group,
+        id: `${this.prefix}_${group}`,
       })
       newParent.setNodeChildren(...nodes)
       this.tree.appendNode(newParent)
@@ -31,15 +40,15 @@ export class DragSource {
     } else {
       const newParent = new TreeNode({
         componentName: 'SourceGroup',
-        id: group,
+        id: `${this.prefix}_${group}`,
       })
       newParent.setNodeChildren(...nodes)
       this.tree.appendNode(newParent)
     }
   }
 
   getSourcesByGroup(group: string) {
-    const parent = this.tree.findById(group)
+    const parent = this.tree.findById(`${this.prefix}_${group}`)
     return parent?.children
   }
 
@@ -54,7 +63,7 @@ export class DragSource {
   }
 
   reduceSourcesByGroup<T>(
-    id: string,
+    group: string,
     callback?: (
       previousValue: T,
       currentValue: TreeNode,
@@ -63,7 +72,7 @@ export class DragSource {
     ) => T,
     init?: T
   ) {
-    const sources = this.getSourcesByGroup(id)
+    const sources = this.getSourcesByGroup(group)
     return sources?.reduce?.(callback, init)
   }
 }

diff --git a/packages/react/src/widgets/DragSourceWidget/index.tsx b/packages/react/src/widgets/DragSourceWidget/index.tsx
@@ -59,7 +59,7 @@ export const DragSourceWidget: React.FC<IDragSourceWidgetProps> = observer(
             <IconWidget infer="Expand" />
           </div>
           <div className={prefix + '-header-content'}>
-            <TextWidget>{props.title}</TextWidget>
+            <TextWidget>{props.title || `sources.${props.name}`}</TextWidget>
           </div>
         </div>
         <div className={prefix + '-content'}>