feat(release): release v1.4.43

fex-team · May 24, 2017 · 833dffa · 833dffa
1 parent 88d7014
commit 833dffa
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 19 deletions.
diff --git a/bower.json b/bower.json
@@ -2,7 +2,7 @@
     "name": "kityminder-core",
     "title": "Kity Minder Core",
     "description": "Powerful online mind graphic visualization and editor (command based)",
-    "version": "1.4.42",
+    "version": "1.4.43",
     "main": [
         "dist/kityminder.core.min.js",
         "dist/kityminder.core.css"

diff --git a/dist/kityminder.core.js b/dist/kityminder.core.js
@@ -1,6 +1,6 @@
 /*!
  * ====================================================
- * kityminder - v1.4.42 - 2017-05-24
+ * kityminder - v1.4.43 - 2017-05-24
  * https://github.com/fex-team/kityminder-core
  * GitHub: https://github.com/fex-team/kityminder-core.git 
  * Copyright (c) 2017 Baidu FEX; Licensed MIT
@@ -1969,7 +1969,7 @@ _p[19] = {
                 this.fire("finishInitHook");
             }
         });
-        Minder.version = "1.4.42";
+        Minder.version = "1.4.43";
         Minder.registerInitHook = function(hook) {
             _initHooks.push(hook);
         };
@@ -8104,19 +8104,17 @@ _p[65] = {
             });
             svgUrl = DomURL.createObjectURL(blob);
             //svgUrl = 'data:image/svg+xml;charset=utf-8,' + encodeURIComponent(svgXml);
-            var allNodes = minder.getAllNode();
             var imagesInfo = [];
-            for (var i = 0; i < allNodes.length; i++) {
-                var nodeData = allNodes[i].data;
-                if (nodeData.image && nodeData.expandState === "expand") {
-                    /*
-                * 导出之前渲染这个节点，否则取出的 contentBox 不对
-                * by zhangbobell
-                * */
-                    minder.renderNode(allNodes[i]);
+            // 遍历取出图片信息
+            traverse(minder.getRoot());
+            function traverse(node) {
+                var nodeData = node.data;
+                if (nodeData.image) {
+                    minder.renderNode(node);
+                    var nodeData = node.data;
                     var imageUrl = nodeData.image;
                     var imageSize = nodeData.imageSize;
-                    var imageRenderBox = allNodes[i].getRenderBox("ImageRenderer", minder.getRenderContainer());
+                    var imageRenderBox = node.getRenderBox("ImageRenderer", minder.getRenderContainer());
                     var imageInfo = {
                         url: imageUrl,
                         width: imageSize.width,
@@ -8126,6 +8124,14 @@ _p[65] = {
                     };
                     imagesInfo.push(imageInfo);
                 }
+                // 若节点折叠，则直接返回
+                if (nodeData.expandState === "collapse") {
+                    return;
+                }
+                var children = node.getChildren();
+                for (var i = 0; i < children.length; i++) {
+                    traverse(children[i]);
+                }
             }
             return {
                 width: width,

diff --git a/dist/kityminder.core.min.js b/dist/kityminder.core.min.js
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "kityminder",
   "title": "kityminder",
   "description": "KityMinder Core Implement",
-  "version": "1.4.42",
+  "version": "1.4.43",
   "homepage": "https://github.com/fex-team/kityminder-core",
   "author": {
     "name": "Baidu FEX",

diff --git a/src/core/minder.js b/src/core/minder.js
@@ -30,7 +30,7 @@ define(function(require, exports, module) {
         }
     });
 
-    Minder.version = '1.4.42';
+    Minder.version = '1.4.43';
 
     Minder.registerInitHook = function(hook) {
         _initHooks.push(hook);