From 6c0b17efd67cfb0ca0981009637473f832148822 Mon Sep 17 00:00:00 2001
From: samuelben <895827676@qq.com>
Date: Wed, 6 Sep 2017 22:53:18 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix=20import=20tree=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5tree=E5=87=BA=E9=94=99=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/pages/editor/modals/import.controller.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/app/pages/editor/modals/import.controller.js b/src/app/pages/editor/modals/import.controller.js
index c143901a..a1facb29 100644
--- a/src/app/pages/editor/modals/import.controller.js
+++ b/src/app/pages/editor/modals/import.controller.js
@@ -57,6 +57,9 @@
           i.projectAsData(data);
         }
         else if (vm.type === 'tree' && vm.format === 'json') {
+          var project = editor.project.get();
+          if (!project) throw new Error("cannot find project");
+          project.trees.add(data.id);
           i.treeAsData(data);
         }
         else if (vm.type === 'nodes' && vm.format === 'json') {

From 39b9ccd3acf78edacb2a7df66f68fcb15c8c7a41 Mon Sep 17 00:00:00 2001
From: samuelben <895827676@qq.com>
Date: Wed, 6 Sep 2017 23:01:26 +0800
Subject: [PATCH 2/3] fix import nested tree

---
 src/editor/editor/managers/ImportManager.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/editor/editor/managers/ImportManager.js b/src/editor/editor/managers/ImportManager.js
index e14a617f..60757a59 100644
--- a/src/editor/editor/managers/ImportManager.js
+++ b/src/editor/editor/managers/ImportManager.js
@@ -17,7 +17,7 @@ b3e.editor.ImportManager = function(editor) {
     var project = editor.project.get();
     if (!project) return;
 
-    var tree = project.trees.add(data.id);
+    var tree = project.trees.get(data.id);
     var root = tree.blocks.getRoot();
     var first = null;
 
@@ -98,6 +98,10 @@ b3e.editor.ImportManager = function(editor) {
   };
 
   this.treesAsData = function(data) {
+	var project = editor.project.get();
+	data.forEach(function(tree){
+		project.trees.add(tree.id);
+	});
     for (var i=0; i<data.length; i++) {
       this.treeAsData(data[i]);
     }

From 10e611289c3d9899862f15fcd76fdae3c2953168 Mon Sep 17 00:00:00 2001
From: samuelben <895827676@qq.com>
Date: Mon, 2 Apr 2018 11:29:12 +0800
Subject: [PATCH 3/3] edit node template without change old node instance.

---
 src/editor/tree/managers/BlockManager.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/editor/tree/managers/BlockManager.js b/src/editor/tree/managers/BlockManager.js
index e4226af7..92fb8942 100644
--- a/src/editor/tree/managers/BlockManager.js
+++ b/src/editor/tree/managers/BlockManager.js
@@ -110,22 +110,22 @@ b3e.tree.BlockManager = function(editor, project, tree) {
     if (typeof template.name !== 'undefined') {
       block.name = template.name;
     } else {
-      block.name = node.name || block.name;
+      block.name = block.name || node.name;
     }
     if (typeof template.title !== 'undefined') {
       block.title = template.title;
     } else {
-      block.title = node.title || block.title;
+      block.title = block.title || node.title;
     }
     if (typeof template.description !== 'undefined') {
       block.description = template.description;
     } else {
-      block.description = node.description || block.description;
+      block.description = block.description || node.description;
     }
     if (typeof template.properties !== 'undefined') {
       block.properties = tine.merge({}, node.properties, template.properties);
     } else {
-      block.properties = tine.merge({}, node.properties, block.properties);
+      //block.properties = tine.merge({}, node.properties, block.properties);
     }
     block._redraw();
 
@@ -224,4 +224,4 @@ b3e.tree.BlockManager = function(editor, project, tree) {
       block._applySettings(settings);
     });
   };
-};
\ No newline at end of file
+};