Skip to content

K
kityminder-core
Commit 1a3034cd authored by 吴志俊's avatar 吴志俊
Browse files
Options

chaos

parent 7aabc8d7
Expand all Show whitespace changes
Inline Side-by-side
Showing with 14895 additions and 214 deletions
bundle.js 0 → 100644
View file @ 1a3034cd
This diff is collapsed.
dev.html
View file @ 1a3034cd
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>KityMinder Example</title> <title>KityMinder Example</title>
...@@ -22,11 +23,17 @@ ...@@ -22,11 +23,17 @@
bottom: 10px; bottom: 10px;
right: 10px; right: 10px;
} }
#png {
position: absolute;
}
</style> </style>
<script type="text/javascript" src="node_modules/kity/dist/kity.js"></script> <script type="text/javascript" src="node_modules/kity/dist/kity.js"></script>
</head> </head>
<body> <body>
<!-- <script> -->
<script id="minder-view" type="application/kityminder" minder-data-type="json"> <script id="minder-view" type="application/kityminder" minder-data-type="json">
{ {
"root": { "root": {
...@@ -36,16 +43,16 @@ ...@@ -36,16 +43,16 @@
"imageSize": { "width": 270, "height": 129 } "imageSize": { "width": 270, "height": 129 }
}, },
"children": [ "children": [
{ "data": { "text": "新闻" } }, { "data": { "text": "新闻", "priority": 0, "progress": 9 } },
{ "data": { "text": "网页", "priority": 1 } }, { "data": { "text": "网页", "priority": 1, "progress": 8 } },
{ "data": { "text": "贴吧", "priority": 2 } }, { "data": { "text": "贴吧", "priority": 2, "progress": 7 } },
{ "data": { "text": "知道", "priority": 2 } }, { "data": { "text": "知道", "priority": 3, "progress": 6 } },
{ "data": { "text": "音乐", "priority": 3 } }, { "data": { "text": "音乐", "priority": 4, "progress": 5 } },
{ "data": { "text": "图片", "priority": 3 } }, { "data": { "text": "图片", "priority": 5, "progress": 4 } },
{ "data": { "text": "视频", "priority": 3 } }, { "data": { "text": "视频", "priority": 6, "progress": 3 } },
{ "data": { "text": "地图", "priority": 3 } }, { "data": { "text": "地图", "priority": 7, "progress": 2 } },
{ "data": { "text": "百科", "priority": 3 } }, { "data": { "text": "百科", "priority": 8, "progress": 1 } },
{ "data": { "text": "更多", "hyperlink": "http://www.baidu.com/more" } } { "data": { "text": "更多", "priority": 9, "progress": 0, "hyperlink": "http://www.baidu.com/more" } }
] ]
} }
} }
...@@ -59,7 +66,7 @@ ...@@ -59,7 +66,7 @@
seajs.config({ seajs.config({
base: './src' base: './src'
}); });
define('start', function(require) { define('start', function (require) {
var Minder = require('kityminder').Minder; var Minder = require('kityminder').Minder;
// 创建 km 实例 // 创建 km 实例
...@@ -68,4 +75,82 @@ ...@@ -68,4 +75,82 @@
}); });
seajs.use('start'); seajs.use('start');
</script> </script>
<script>
setTimeout(async () => {
km.importJson({
"root": {
"data": {
"id": "01296369916a",
"created": 1629452083,
"text": "新建脑图",
"resource": [],
"expandState": "expand",
"priority": null,
"note": "",
"image": "http://yun.duiba.com.cn/duiba-trigram-web-node/static/logo4.png",
"imageTitle": "logo4.png",
"imageSize": {
"width": 200,
"height": 55
}
},
"children": [
{
"data": {
"id": "cdo8nuv2pa80",
"created": 1629452383225,
"text": "todo",
"progress": 1,
"resource": [
"✔"
],
"layout": null,
"expandState": "collapse",
"priority": 1,
"image": "http://yun.duiba.com.cn/duiba-trigram-web-node/static/logo4.png",
"imageTitle": "logo4.png",
"imageSize": {
"width": 200,
"height": 55
},
"hyperlink": "https://www.example.com/",
"note": "Hi!"
},
"children": [
{
"data": {
"id": "ce5c8wh0aqw0",
"created": 1631189014969,
"text": "Todo",
"layout": null
},
"children": []
},
{
"data": {
"id": "ce5c8xophq80",
"created": 1631189017611,
"text": "Todo",
"layout": null
},
"children": []
}
]
}
]
},
"template": "structure",
"theme": "snow",
"version": "1.4.43"
})
window._ = new Image()
_.id = 'png'
_.src = await km.exportData('png')
document.body.appendChild(_)
}, 2000);
const reload = async () => {
_.src = await km.exportData('png')
}
</script>
</html> </html>
\ No newline at end of file
dist/kityminder.core.js
View file @ 1a3034cd
/*! /*!
* ==================================================== * ====================================================
* Kity Minder Core - v1.4.50 - 2018-09-17 * Kity Minder Core - v1.4.50 - 2021-10-09
* https://github.com/fex-team/kityminder-core * https://github.com/fex-team/kityminder-core
* GitHub: https://github.com/fex-team/kityminder-core.git * GitHub: https://github.com/fex-team/kityminder-core.git
* Copyright (c) 2018 Baidu FEX; Licensed BSD-3-Clause * Copyright (c) 2021 Baidu FEX; Licensed BSD-3-Clause
* ==================================================== * ====================================================
*/ */
...@@ -420,6 +420,7 @@ _p[9] = { ...@@ -420,6 +420,7 @@ _p[9] = {
var Minder = _p.r(19); var Minder = _p.r(19);
var MinderNode = _p.r(21); var MinderNode = _p.r(21);
var MinderEvent = _p.r(13); var MinderEvent = _p.r(13);
var Promise = _p.r(25);
var COMMAND_STATE_NORMAL = 0; var COMMAND_STATE_NORMAL = 0;
var COMMAND_STATE_DISABLED = -1; var COMMAND_STATE_DISABLED = -1;
var COMMAND_STATE_ACTIVED = 1; var COMMAND_STATE_ACTIVED = 1;
...@@ -534,11 +535,16 @@ _p[9] = { ...@@ -534,11 +535,16 @@ _p[9] = {
if (!stoped) { if (!stoped) {
this._fire(new MinderEvent("preExecCommand", eventParams, false)); this._fire(new MinderEvent("preExecCommand", eventParams, false));
result = cmd.execute.apply(cmd, [ me ].concat(cmdArgs)); result = cmd.execute.apply(cmd, [ me ].concat(cmdArgs));
var rest = function() {
this._fire(new MinderEvent("execCommand", eventParams, false)); this._fire(new MinderEvent("execCommand", eventParams, false));
if (cmd.isContentChanged()) { if (cmd.isContentChanged()) {
this._firePharse(new MinderEvent("contentchange")); this._firePharse(new MinderEvent("contentchange"));
} }
this._interactChange(); this._interactChange();
}.bind(this);
if (result && result.then) {
result.then(rest, rest);
} else rest();
} }
this._hasEnterExecCommand = false; this._hasEnterExecCommand = false;
} else { } else {
...@@ -1460,6 +1466,7 @@ _p[16] = { ...@@ -1460,6 +1466,7 @@ _p[16] = {
if (this._keyReceiver) return; if (this._keyReceiver) return;
var receiver = this._keyReceiver = document.createElement("input"); var receiver = this._keyReceiver = document.createElement("input");
receiver.classList.add("km-receiver"); receiver.classList.add("km-receiver");
receiver.readOnly = true;
var renderTarget = this._renderTarget; var renderTarget = this._renderTarget;
renderTarget.appendChild(receiver); renderTarget.appendChild(receiver);
var minder = this; var minder = this;
...@@ -1478,7 +1485,6 @@ _p[16] = { ...@@ -1478,7 +1485,6 @@ _p[16] = {
break; break;
} }
minder._firePharse(e); minder._firePharse(e);
e.preventDefault();
}); });
this.on("focus", function() { this.on("focus", function() {
receiver.select(); receiver.select();
...@@ -5216,8 +5222,8 @@ _p[46] = { ...@@ -5216,8 +5222,8 @@ _p[46] = {
if (!node.parent) return; if (!node.parent) return;
var visible = node.parent.isExpanded(); var visible = node.parent.isExpanded();
expander.setState(visible && node.children.length ? node.getData(EXPAND_STATE_DATA) : "hide"); expander.setState(visible && node.children.length ? node.getData(EXPAND_STATE_DATA) : "hide");
var vector = node.getLayoutVectorIn().normalize(expander.radius + node.getStyle("stroke-width")); var vector = node.getLayoutVectorOut().normalize(expander.radius + node.getStyle("stroke-width"));
var position = node.getVertexIn().offset(vector.reverse()); var position = node.getVertexOut().offset(vector);
this.expander.setTranslate(position); this.expander.setTranslate(position);
} }
}); });
...@@ -5683,6 +5689,7 @@ _p[50] = { ...@@ -5683,6 +5689,7 @@ _p[50] = {
var Command = _p.r(9); var Command = _p.r(9);
var Module = _p.r(20); var Module = _p.r(20);
var Renderer = _p.r(27); var Renderer = _p.r(27);
var Promise = _p.r(25);
Module.register("image", function() { Module.register("image", function() {
function loadImageSize(url, callback) { function loadImageSize(url, callback) {
var img = document.createElement("img"); var img = document.createElement("img");
...@@ -5723,6 +5730,18 @@ _p[50] = { ...@@ -5723,6 +5730,18 @@ _p[50] = {
base: Command, base: Command,
execute: function(km, url, title) { execute: function(km, url, title) {
var nodes = km.getSelectedNodes(); var nodes = km.getSelectedNodes();
return new Promise(function(res, rej) {
if (!url) {
nodes.forEach(function(n) {
n.setData("image");
n.setData("imageTitle");
n.setData("imageSize");
n.render();
});
km.fire("saveScene");
km.layout(300);
return rej();
}
loadImageSize(url, function(width, height) { loadImageSize(url, function(width, height) {
nodes.forEach(function(n) { nodes.forEach(function(n) {
var size = fitImageSize(width, height, km.getOption("maxImageWidth"), km.getOption("maxImageHeight")); var size = fitImageSize(width, height, km.getOption("maxImageWidth"), km.getOption("maxImageHeight"));
...@@ -5733,6 +5752,8 @@ _p[50] = { ...@@ -5733,6 +5752,8 @@ _p[50] = {
}); });
km.fire("saveScene"); km.fire("saveScene");
km.layout(300); km.layout(300);
res();
});
}); });
}, },
queryState: function(km) { queryState: function(km) {
...@@ -6447,7 +6468,7 @@ _p[56] = { ...@@ -6447,7 +6468,7 @@ _p[56] = {
back.fill(color[1]); back.fill(color[1]);
mask.fill(color[0]); mask.fill(color[0]);
} }
number.setContent(value); number.setContent("P" + (value - 1));
} }
}); });
/** /**
...@@ -6562,17 +6583,42 @@ _p[57] = { ...@@ -6562,17 +6583,42 @@ _p[57] = {
create: function() { create: function() {
var bg, pie, shadow, frame, check; var bg, pie, shadow, frame, check;
bg = new kity.Circle(9).fill(BG_COLOR); bg = new kity.Circle(9).fill(BG_COLOR);
pie = new kity.Pie(9, 0).fill(PIE_COLOR); pie = new kity.Pie(9, 0).rotate(180).fill(PIE_COLOR);
shadow = new kity.Path().setPathData(SHADOW_PATH).setTranslate(-10, -10).fill(SHADOW_COLOR); shadow = new kity.Path().setPathData(SHADOW_PATH).setTranslate(-10, -10).fill(SHADOW_COLOR);
frame = new kity.Path().setTranslate(-10, -10).setPathData(FRAME_PATH).fill(FRAME_GRAD); frame = new kity.Path().setTranslate(-10, -10).setPathData(FRAME_PATH).fill(FRAME_GRAD);
check = new kity.Path().setTranslate(-10, -10).setPathData(CHECK_PATH).fill(CHECK_COLOR); check = new kity.Path().setTranslate(-10, -10).setPathData(CHECK_PATH).fill(CHECK_COLOR);
this.addShapes([ bg, pie, shadow, check, frame ]); cross = new kity.Path().setTranslate(-10, -10).setPathData("M5,5l.7,-.7l4.3,4.3l4.3,-4.3l1.4,1.4l-4.3,4.3l4.3,4.3l-1.4,1.4l-4.3,-4.3l-4.3,4.3l-1.4,-1.4l4.3,-4.3l-4.3,-4.3l.7,-.7z").fill("#d81e06");
skip = new kity.Path().setTranslate(-8, -8).setScale(.016).setPathData("M747.3152 415.6416a256.0512 256.0512 0 0 0-489.472 96.768H341.504a170.6496 170.6496 0 0 1 327.6288-58.624l-115.0976 20.9408 227.84 116.736 48.2816-251.392-82.8416 75.5712zM0 512C0 229.2224 229.1712 0 512 0c282.7776 0 512 229.1712 512 512 0 282.7776-229.1712 512-512 512-282.7776 0-512-229.1712-512-512z").fill("#BE96F9");
this.addShapes([ bg, pie, shadow, check, frame, cross, skip ]);
this.pie = pie; this.pie = pie;
this.check = check; this.check = check;
this.cross = cross;
this.skip = skip;
}, },
setValue: function(value) { setValue: function(value) {
this.pie.setAngle(-360 * (value - 1) / 8); this.check.setVisible(false);
this.check.setVisible(value == 9); this.cross.setVisible(false);
this.skip.setVisible(false);
this.pie.setVisible(false);
switch (value) {
case 1:
this.check.setVisible(true);
this.pie.setAngle(360).fill(PIE_COLOR).setVisible(true);
break;
case 2:
this.cross.setVisible(true);
break;
case 3:
this.pie.setAngle(180).fill("#d81e06").setVisible(true);
break;
case 4:
this.skip.setVisible(true);
this.pie.setAngle(360).fill("#fff").setVisible(true);
break;
}
} }
}); });
/** /**
...@@ -8189,7 +8235,8 @@ _p[66] = { ...@@ -8189,7 +8235,8 @@ _p[66] = {
paper.shapeNode.setAttribute("transform", "translate(0.5, 0.5)"); paper.shapeNode.setAttribute("transform", "translate(0.5, 0.5)");
renderContainer.translate(-renderBox.x, -renderBox.y); renderContainer.translate(-renderBox.x, -renderBox.y);
// 获取当前的 XML 代码 // 获取当前的 XML 代码
svgXml = paper.container.innerHTML; // svgXml = paper.container.innerHTML;
svgXml = paper.node.outerHTML;
// 回复原始变换及位置 // 回复原始变换及位置
renderContainer.translate(renderBox.x, renderBox.y); renderContainer.translate(renderBox.x, renderBox.y);
paper.shapeNode.setAttribute("transform", paperTransform); paper.shapeNode.setAttribute("transform", paperTransform);
...@@ -8210,6 +8257,7 @@ _p[66] = { ...@@ -8210,6 +8257,7 @@ _p[66] = {
// fix title issue in safari // fix title issue in safari
// @ http://stackoverflow.com/questions/30273775/namespace-prefix-ns1-for-href-on-tagelement-is-not-defined-setattributens // @ http://stackoverflow.com/questions/30273775/namespace-prefix-ns1-for-href-on-tagelement-is-not-defined-setattributens
svgXml = svgXml.replace(/NS\d+:title/gi, "xlink:title"); svgXml = svgXml.replace(/NS\d+:title/gi, "xlink:title");
svgXml = svgXml.replace(/<image .*?><\/image>/gi, "");
blob = new Blob([ svgXml ], { blob = new Blob([ svgXml ], {
type: "image/svg+xml" type: "image/svg+xml"
}); });
...@@ -8292,7 +8340,8 @@ _p[66] = { ...@@ -8292,7 +8340,8 @@ _p[66] = {
// 加载节点上的图片 // 加载节点上的图片
function loadImages(imagesInfo) { function loadImages(imagesInfo) {
var imagePromises = imagesInfo.map(function(imageInfo) { var imagePromises = imagesInfo.map(function(imageInfo) {
return xhrLoadImage(imageInfo); // return xhrLoadImage(imageInfo);
return loadImage(imageInfo);
}); });
return Promise.all(imagePromises); return Promise.all(imagePromises);
} }
...@@ -8315,7 +8364,8 @@ _p[66] = { ...@@ -8315,7 +8364,8 @@ _p[66] = {
}, function(err) { }, function(err) {
// 这里处理 reject，出错基本上是因为跨域， // 这里处理 reject，出错基本上是因为跨域，
// 出错后依然导出，只不过没有图片。 // 出错后依然导出，只不过没有图片。
alert("脑图的节点中包含跨域图片，导出的 png 中节点图片不显示，你可以替换掉这些跨域的图片并重试。"); console.warn("error: ", err);
console.warn("脑图的节点中包含跨域图片，导出的 png 中节点图片不显示，你可以替换掉这些跨域的图片并重试。");
DomURL.revokeObjectURL(svgDataUrl); DomURL.revokeObjectURL(svgDataUrl);
document.body.appendChild(canvas); document.body.appendChild(canvas);
var pngBase64 = generateDataUrl(canvas); var pngBase64 = generateDataUrl(canvas);
......
dist/kityminder.core.min.js
View file @ 1a3034cd
This source diff could not be displayed because it is too large. You can view the blob instead.
package-lock.json
View file @ 1a3034cd
...@@ -1279,7 +1279,8 @@ ...@@ -1279,7 +1279,8 @@
"ansi-regex": { "ansi-regex": {
"version": "2.1.1", "version": "2.1.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"aproba": { "aproba": {
"version": "1.1.1", "version": "1.1.1",
...@@ -1330,7 +1331,8 @@ ...@@ -1330,7 +1331,8 @@
"balanced-match": { "balanced-match": {
"version": "0.4.2", "version": "0.4.2",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"bcrypt-pbkdf": { "bcrypt-pbkdf": {
"version": "1.0.1", "version": "1.0.1",
...@@ -1345,6 +1347,7 @@ ...@@ -1345,6 +1347,7 @@
"version": "0.0.9", "version": "0.0.9",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"inherits": "~2.0.0" "inherits": "~2.0.0"
} }
...@@ -1353,6 +1356,7 @@ ...@@ -1353,6 +1356,7 @@
"version": "2.10.1", "version": "2.10.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"hoek": "2.x.x" "hoek": "2.x.x"
} }
...@@ -1361,6 +1365,7 @@ ...@@ -1361,6 +1365,7 @@
"version": "1.1.7", "version": "1.1.7",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"balanced-match": "^0.4.1", "balanced-match": "^0.4.1",
"concat-map": "0.0.1" "concat-map": "0.0.1"
...@@ -1369,7 +1374,8 @@ ...@@ -1369,7 +1374,8 @@
"buffer-shims": { "buffer-shims": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"caseless": { "caseless": {
"version": "0.12.0", "version": "0.12.0",
...@@ -1386,12 +1392,14 @@ ...@@ -1386,12 +1392,14 @@
"code-point-at": { "code-point-at": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"combined-stream": { "combined-stream": {
"version": "1.0.5", "version": "1.0.5",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"delayed-stream": "~1.0.0" "delayed-stream": "~1.0.0"
} }
...@@ -1399,22 +1407,26 @@ ...@@ -1399,22 +1407,26 @@
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"cryptiles": { "cryptiles": {
"version": "2.0.5", "version": "2.0.5",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"boom": "2.x.x" "boom": "2.x.x"
} }
...@@ -1454,7 +1466,8 @@ ...@@ -1454,7 +1466,8 @@
"delayed-stream": { "delayed-stream": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"delegates": { "delegates": {
"version": "1.0.0", "version": "1.0.0",
...@@ -1486,7 +1499,8 @@ ...@@ -1486,7 +1499,8 @@
"extsprintf": { "extsprintf": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"forever-agent": { "forever-agent": {
"version": "0.6.1", "version": "0.6.1",
...@@ -1508,12 +1522,14 @@ ...@@ -1508,12 +1522,14 @@
"fs.realpath": { "fs.realpath": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"fstream": { "fstream": {
"version": "1.0.11", "version": "1.0.11",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"graceful-fs": "^4.1.2", "graceful-fs": "^4.1.2",
"inherits": "~2.0.0", "inherits": "~2.0.0",
...@@ -1569,6 +1585,7 @@ ...@@ -1569,6 +1585,7 @@
"version": "7.1.2", "version": "7.1.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"fs.realpath": "^1.0.0", "fs.realpath": "^1.0.0",
"inflight": "^1.0.4", "inflight": "^1.0.4",
...@@ -1581,7 +1598,8 @@ ...@@ -1581,7 +1598,8 @@
"graceful-fs": { "graceful-fs": {
"version": "4.1.11", "version": "4.1.11",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"har-schema": { "har-schema": {
"version": "1.0.5", "version": "1.0.5",
...@@ -1609,6 +1627,7 @@ ...@@ -1609,6 +1627,7 @@
"version": "3.1.3", "version": "3.1.3",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"boom": "2.x.x", "boom": "2.x.x",
"cryptiles": "2.x.x", "cryptiles": "2.x.x",
...@@ -1619,7 +1638,8 @@ ...@@ -1619,7 +1638,8 @@
"hoek": { "hoek": {
"version": "2.16.3", "version": "2.16.3",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"http-signature": { "http-signature": {
"version": "1.1.1", "version": "1.1.1",
...@@ -1636,6 +1656,7 @@ ...@@ -1636,6 +1656,7 @@
"version": "1.0.6", "version": "1.0.6",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"once": "^1.3.0", "once": "^1.3.0",
"wrappy": "1" "wrappy": "1"
...@@ -1644,7 +1665,8 @@ ...@@ -1644,7 +1665,8 @@
"inherits": { "inherits": {
"version": "2.0.3", "version": "2.0.3",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"ini": { "ini": {
"version": "1.3.4", "version": "1.3.4",
...@@ -1656,6 +1678,7 @@ ...@@ -1656,6 +1678,7 @@
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"number-is-nan": "^1.0.0" "number-is-nan": "^1.0.0"
} }
...@@ -1669,7 +1692,8 @@ ...@@ -1669,7 +1692,8 @@
"isarray": { "isarray": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"isstream": { "isstream": {
"version": "0.1.2", "version": "0.1.2",
...@@ -1742,12 +1766,14 @@ ...@@ -1742,12 +1766,14 @@
"mime-db": { "mime-db": {
"version": "1.27.0", "version": "1.27.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"mime-types": { "mime-types": {
"version": "2.1.15", "version": "2.1.15",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"mime-db": "~1.27.0" "mime-db": "~1.27.0"
} }
...@@ -1756,6 +1782,7 @@ ...@@ -1756,6 +1782,7 @@
"version": "3.0.4", "version": "3.0.4",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
...@@ -1763,12 +1790,14 @@ ...@@ -1763,12 +1790,14 @@
"minimist": { "minimist": {
"version": "0.0.8", "version": "0.0.8",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"mkdirp": { "mkdirp": {
"version": "0.5.1", "version": "0.5.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"minimist": "0.0.8" "minimist": "0.0.8"
} }
...@@ -1823,7 +1852,8 @@ ...@@ -1823,7 +1852,8 @@
"number-is-nan": { "number-is-nan": {
"version": "1.0.1", "version": "1.0.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"oauth-sign": { "oauth-sign": {
"version": "0.8.2", "version": "0.8.2",
...@@ -1841,6 +1871,7 @@ ...@@ -1841,6 +1871,7 @@
"version": "1.4.0", "version": "1.4.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
...@@ -1870,7 +1901,8 @@ ...@@ -1870,7 +1901,8 @@
"path-is-absolute": { "path-is-absolute": {
"version": "1.0.1", "version": "1.0.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"performance-now": { "performance-now": {
"version": "0.2.0", "version": "0.2.0",
...@@ -1881,7 +1913,8 @@ ...@@ -1881,7 +1913,8 @@
"process-nextick-args": { "process-nextick-args": {
"version": "1.0.7", "version": "1.0.7",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"punycode": { "punycode": {
"version": "1.4.1", "version": "1.4.1",
...@@ -1919,6 +1952,7 @@ ...@@ -1919,6 +1952,7 @@
"version": "2.2.9", "version": "2.2.9",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"buffer-shims": "~1.0.0", "buffer-shims": "~1.0.0",
"core-util-is": "~1.0.0", "core-util-is": "~1.0.0",
...@@ -1963,6 +1997,7 @@ ...@@ -1963,6 +1997,7 @@
"version": "2.6.1", "version": "2.6.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"glob": "^7.0.5" "glob": "^7.0.5"
} }
...@@ -1970,7 +2005,8 @@ ...@@ -1970,7 +2005,8 @@
"safe-buffer": { "safe-buffer": {
"version": "5.0.1", "version": "5.0.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"semver": { "semver": {
"version": "5.3.0", "version": "5.3.0",
...@@ -1994,6 +2030,7 @@ ...@@ -1994,6 +2030,7 @@
"version": "1.0.9", "version": "1.0.9",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"hoek": "2.x.x" "hoek": "2.x.x"
} }
...@@ -2027,6 +2064,7 @@ ...@@ -2027,6 +2064,7 @@
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",
...@@ -2037,6 +2075,7 @@ ...@@ -2037,6 +2075,7 @@
"version": "1.0.1", "version": "1.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.0.1" "safe-buffer": "^5.0.1"
} }
...@@ -2051,6 +2090,7 @@ ...@@ -2051,6 +2090,7 @@
"version": "3.0.1", "version": "3.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "^2.0.0"
} }
...@@ -2065,6 +2105,7 @@ ...@@ -2065,6 +2105,7 @@
"version": "2.2.1", "version": "2.2.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"block-stream": "*", "block-stream": "*",
"fstream": "^1.0.2", "fstream": "^1.0.2",
...@@ -2120,7 +2161,8 @@ ...@@ -2120,7 +2161,8 @@
"util-deprecate": { "util-deprecate": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"uuid": { "uuid": {
"version": "3.0.1", "version": "3.0.1",
...@@ -2149,7 +2191,8 @@ ...@@ -2149,7 +2191,8 @@
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
} }
} }
}, },
......
src/core/command.js
View file @ 1a3034cd
define(function(require, exports, module) { define(function (require, exports, module) {
var kity = require('./kity'); var kity = require('./kity');
var utils = require('./utils'); var utils = require('./utils');
var Minder = require('./minder'); var Minder = require('./minder');
var MinderNode = require('./node'); var MinderNode = require('./node');
var MinderEvent = require('./event'); var MinderEvent = require('./event');
var Promise = require('./promise');
var COMMAND_STATE_NORMAL = 0; var COMMAND_STATE_NORMAL = 0;
var COMMAND_STATE_DISABLED = -1; var COMMAND_STATE_DISABLED = -1;
...@@ -13,40 +14,40 @@ define(function(require, exports, module) { ...@@ -13,40 +14,40 @@ define(function(require, exports, module) {
* 表示一个命令，包含命令的查询及执行 * 表示一个命令，包含命令的查询及执行
*/ */
var Command = kity.createClass('Command', { var Command = kity.createClass('Command', {
constructor: function() { constructor: function () {
this._isContentChange = true; this._isContentChange = true;
this._isSelectionChange = false; this._isSelectionChange = false;
}, },
execute: function(minder, args) { execute: function (minder, args) {
throw new Error('Not Implement: Command.execute()'); throw new Error('Not Implement: Command.execute()');
}, },
setContentChanged: function(val) { setContentChanged: function (val) {
this._isContentChange = !!val; this._isContentChange = !!val;
}, },
isContentChanged: function() { isContentChanged: function () {
return this._isContentChange; return this._isContentChange;
}, },
setSelectionChanged: function(val) { setSelectionChanged: function (val) {
this._isSelectionChange = !!val; this._isSelectionChange = !!val;
}, },
isSelectionChanged: function() { isSelectionChanged: function () {
return this._isContentChange; return this._isContentChange;
}, },
queryState: function(km) { queryState: function (km) {
return COMMAND_STATE_NORMAL; return COMMAND_STATE_NORMAL;
}, },
queryValue: function(km) { queryValue: function (km) {
return 0; return 0;
}, },
isNeedUndo: function() { isNeedUndo: function () {
return true; return true;
} }
}); });
...@@ -56,11 +57,11 @@ define(function(require, exports, module) { ...@@ -56,11 +57,11 @@ define(function(require, exports, module) {
Command.STATE_DISABLED = COMMAND_STATE_DISABLED; Command.STATE_DISABLED = COMMAND_STATE_DISABLED;
kity.extendClass(Minder, { kity.extendClass(Minder, {
_getCommand: function(name) { _getCommand: function (name) {
return this._commands[name.toLowerCase()]; return this._commands[name.toLowerCase()];
}, },
_queryCommand: function(name, type, args) { _queryCommand: function (name, type, args) {
var cmd = this._getCommand(name); var cmd = this._getCommand(name);
if (cmd) { if (cmd) {
var queryCmd = cmd['query' + type]; var queryCmd = cmd['query' + type];
...@@ -84,7 +85,7 @@ define(function(require, exports, module) { ...@@ -84,7 +85,7 @@ define(function(require, exports, module) {
* 0: 命令可用 * 0: 命令可用
* 1: 命令当前可用并且已经执行过 * 1: 命令当前可用并且已经执行过
*/ */
queryCommandState: function(name) { queryCommandState: function (name) {
return this._queryCommand(name, 'State', [].slice.call(arguments, 1)); return this._queryCommand(name, 'State', [].slice.call(arguments, 1));
}, },
...@@ -101,7 +102,7 @@ define(function(require, exports, module) { ...@@ -101,7 +102,7 @@ define(function(require, exports, module) {
* 如果命令不存在，返回 undefined * 如果命令不存在，返回 undefined
* 不同命令具有不同返回值，具体请查看 [Command](command) 章节 * 不同命令具有不同返回值，具体请查看 [Command](command) 章节
*/ */
queryCommandValue: function(name) { queryCommandValue: function (name) {
return this._queryCommand(name, 'Value', [].slice.call(arguments, 1)); return this._queryCommand(name, 'Value', [].slice.call(arguments, 1));
}, },
...@@ -115,7 +116,7 @@ define(function(require, exports, module) { ...@@ -115,7 +116,7 @@ define(function(require, exports, module) {
* @param {string} name 要执行的命令名称 * @param {string} name 要执行的命令名称
* @param {argument} args 要传递给命令的其它参数 * @param {argument} args 要传递给命令的其它参数
*/ */
execCommand: function(name) { execCommand: function (name) {
if (!name) return null; if (!name) return null;
name = name.toLowerCase(); name = name.toLowerCase();
...@@ -144,6 +145,7 @@ define(function(require, exports, module) { ...@@ -144,6 +145,7 @@ define(function(require, exports, module) {
result = cmd.execute.apply(cmd, [me].concat(cmdArgs)); result = cmd.execute.apply(cmd, [me].concat(cmdArgs));
var rest = function () {
this._fire(new MinderEvent('execCommand', eventParams, false)); this._fire(new MinderEvent('execCommand', eventParams, false));
if (cmd.isContentChanged()) { if (cmd.isContentChanged()) {
...@@ -151,6 +153,10 @@ define(function(require, exports, module) { ...@@ -151,6 +153,10 @@ define(function(require, exports, module) {
} }
this._interactChange(); this._interactChange();
}.bind(this);
if (result && result.then) {
result.then(rest, rest);
} else rest();
} }
this._hasEnterExecCommand = false; this._hasEnterExecCommand = false;
} else { } else {
......
src/core/keyreceiver.js
View file @ 1a3034cd
define(function(require, exports, module) { define(function (require, exports, module) {
var kity = require('./kity'); var kity = require('./kity');
var utils = require('./utils'); var utils = require('./utils');
var Minder = require('./minder'); var Minder = require('./minder');
function listen(element, type, handler) { function listen(element, type, handler) {
type.split(' ').forEach(function(name) { type.split(' ').forEach(function (name) {
element.addEventListener(name, handler, false); element.addEventListener(name, handler, false);
}); });
} }
Minder.registerInitHook(function(option) { Minder.registerInitHook(function (option) {
this.setDefaultOptions({ this.setDefaultOptions({
enableKeyReceiver: true enableKeyReceiver: true
}); });
if (this.getOption('enableKeyReceiver')) { if (this.getOption('enableKeyReceiver')) {
this.on('paperrender', function() { this.on('paperrender', function () {
this._initKeyReceiver(); this._initKeyReceiver();
}); });
} }
}); });
kity.extendClass(Minder, { kity.extendClass(Minder, {
_initKeyReceiver: function() { _initKeyReceiver: function () {
if (this._keyReceiver) return; if (this._keyReceiver) return;
var receiver = this._keyReceiver = document.createElement('input'); var receiver = this._keyReceiver = document.createElement('input');
receiver.classList.add('km-receiver'); receiver.classList.add('km-receiver');
receiver.readOnly = true
var renderTarget = this._renderTarget; var renderTarget = this._renderTarget;
renderTarget.appendChild(receiver); renderTarget.appendChild(receiver);
var minder = this; var minder = this;
listen(receiver, 'keydown keyup keypress copy paste blur focus input', function(e) { listen(receiver, 'keydown keyup keypress copy paste blur focus input', function (e) {
switch (e.type) { switch (e.type) {
case 'blur': case 'blur':
minder.blur(); minder.blur();
...@@ -46,14 +46,14 @@ define(function(require, exports, module) { ...@@ -46,14 +46,14 @@ define(function(require, exports, module) {
break; break;
} }
minder._firePharse(e); minder._firePharse(e);
e.preventDefault(); // e.preventDefault();
}); });
this.on('focus', function() { this.on('focus', function () {
receiver.select(); receiver.select();
receiver.focus(); receiver.focus();
}); });
this.on('blur', function() { this.on('blur', function () {
receiver.blur(); receiver.blur();
}); });
......
src/module/expand.js
View file @ 1a3034cd
define(function(require, exports, module) { define(function (require, exports, module) {
var kity = require('../core/kity'); var kity = require('../core/kity');
var utils = require('../core/utils'); var utils = require('../core/utils');
var keymap = require('../core/keymap'); var keymap = require('../core/keymap');
...@@ -7,7 +7,7 @@ define(function(require, exports, module) { ...@@ -7,7 +7,7 @@ define(function(require, exports, module) {
var Module = require('../core/module'); var Module = require('../core/module');
var Renderer = require('../core/render'); var Renderer = require('../core/render');
Module.register('Expand', function() { Module.register('Expand', function () {
var minder = this; var minder = this;
var EXPAND_STATE_DATA = 'expandState', var EXPAND_STATE_DATA = 'expandState',
STATE_EXPAND = 'expand', STATE_EXPAND = 'expand',
...@@ -20,7 +20,7 @@ define(function(require, exports, module) { ...@@ -20,7 +20,7 @@ define(function(require, exports, module) {
* 展开节点 * 展开节点
* @param {Policy} policy 展开的策略，默认为 KEEP_STATE * @param {Policy} policy 展开的策略，默认为 KEEP_STATE
*/ */
expand: function() { expand: function () {
this.setData(EXPAND_STATE_DATA, STATE_EXPAND); this.setData(EXPAND_STATE_DATA, STATE_EXPAND);
return this; return this;
}, },
...@@ -28,7 +28,7 @@ define(function(require, exports, module) { ...@@ -28,7 +28,7 @@ define(function(require, exports, module) {
/** /**
* 收起节点 * 收起节点
*/ */
collapse: function() { collapse: function () {
this.setData(EXPAND_STATE_DATA, STATE_COLLAPSE); this.setData(EXPAND_STATE_DATA, STATE_COLLAPSE);
return this; return this;
}, },
...@@ -36,7 +36,7 @@ define(function(require, exports, module) { ...@@ -36,7 +36,7 @@ define(function(require, exports, module) {
/** /**
* 判断节点当前的状态是否为展开 * 判断节点当前的状态是否为展开
*/ */
isExpanded: function() { isExpanded: function () {
var expanded = this.getData(EXPAND_STATE_DATA) !== STATE_COLLAPSE; var expanded = this.getData(EXPAND_STATE_DATA) !== STATE_COLLAPSE;
return expanded && (this.isRoot() || this.parent.isExpanded()); return expanded && (this.isRoot() || this.parent.isExpanded());
}, },
...@@ -44,7 +44,7 @@ define(function(require, exports, module) { ...@@ -44,7 +44,7 @@ define(function(require, exports, module) {
/** /**
* 判断节点当前的状态是否为收起 * 判断节点当前的状态是否为收起
*/ */
isCollapsed: function() { isCollapsed: function () {
return !this.isExpanded(); return !this.isExpanded();
} }
}); });
...@@ -62,7 +62,7 @@ define(function(require, exports, module) { ...@@ -62,7 +62,7 @@ define(function(require, exports, module) {
var ExpandCommand = kity.createClass('ExpandCommand', { var ExpandCommand = kity.createClass('ExpandCommand', {
base: Command, base: Command,
execute: function(km, justParents) { execute: function (km, justParents) {
var node = km.getSelectedNode(); var node = km.getSelectedNode();
if (!node) return; if (!node) return;
if (justParents) { if (justParents) {
...@@ -76,7 +76,7 @@ define(function(require, exports, module) { ...@@ -76,7 +76,7 @@ define(function(require, exports, module) {
km.layout(100); km.layout(100);
}, },
queryState: function(km) { queryState: function (km) {
var node = km.getSelectedNode(); var node = km.getSelectedNode();
return node && !node.isRoot() && !node.isExpanded() ? 0 : -1; return node && !node.isRoot() && !node.isExpanded() ? 0 : -1;
} }
...@@ -91,8 +91,8 @@ define(function(require, exports, module) { ...@@ -91,8 +91,8 @@ define(function(require, exports, module) {
*/ */
var ExpandToLevelCommand = kity.createClass('ExpandToLevelCommand', { var ExpandToLevelCommand = kity.createClass('ExpandToLevelCommand', {
base: Command, base: Command,
execute: function(km, level) { execute: function (km, level) {
km.getRoot().traverse(function(node) { km.getRoot().traverse(function (node) {
if (node.getLevel() < level) node.expand(); if (node.getLevel() < level) node.expand();
if (node.getLevel() == level && !node.isLeaf()) node.collapse(); if (node.getLevel() == level && !node.isLeaf()) node.collapse();
}); });
...@@ -111,7 +111,7 @@ define(function(require, exports, module) { ...@@ -111,7 +111,7 @@ define(function(require, exports, module) {
var CollapseCommand = kity.createClass('CollapseCommand', { var CollapseCommand = kity.createClass('CollapseCommand', {
base: Command, base: Command,
execute: function(km) { execute: function (km) {
var node = km.getSelectedNode(); var node = km.getSelectedNode();
if (!node) return; if (!node) return;
...@@ -120,7 +120,7 @@ define(function(require, exports, module) { ...@@ -120,7 +120,7 @@ define(function(require, exports, module) {
km.layout(); km.layout();
}, },
queryState: function(km) { queryState: function (km) {
var node = km.getSelectedNode(); var node = km.getSelectedNode();
return node && !node.isRoot() && node.isExpanded() ? 0 : -1; return node && !node.isRoot() && node.isExpanded() ? 0 : -1;
} }
...@@ -129,7 +129,7 @@ define(function(require, exports, module) { ...@@ -129,7 +129,7 @@ define(function(require, exports, module) {
var Expander = kity.createClass('Expander', { var Expander = kity.createClass('Expander', {
base: kity.Group, base: kity.Group,
constructor: function(node) { constructor: function (node) {
this.callBase(); this.callBase();
this.radius = 6; this.radius = 6;
this.outline = new kity.Circle(this.radius).stroke('gray').fill('white'); this.outline = new kity.Circle(this.radius).stroke('gray').fill('white');
...@@ -140,8 +140,8 @@ define(function(require, exports, module) { ...@@ -140,8 +140,8 @@ define(function(require, exports, module) {
this.setStyle('cursor', 'pointer'); this.setStyle('cursor', 'pointer');
}, },
initEvent: function(node) { initEvent: function (node) {
this.on('mousedown', function(e) { this.on('mousedown', function (e) {
minder.select([node], true); minder.select([node], true);
if (node.isExpanded()) { if (node.isExpanded()) {
node.collapse(); node.collapse();
...@@ -153,13 +153,13 @@ define(function(require, exports, module) { ...@@ -153,13 +153,13 @@ define(function(require, exports, module) {
e.stopPropagation(); e.stopPropagation();
e.preventDefault(); e.preventDefault();
}); });
this.on('dblclick click mouseup', function(e) { this.on('dblclick click mouseup', function (e) {
e.stopPropagation(); e.stopPropagation();
e.preventDefault(); e.preventDefault();
}); });
}, },
setState: function(state) { setState: function (state) {
if (state == 'hide') { if (state == 'hide') {
this.setVisible(false); this.setVisible(false);
return; return;
...@@ -176,7 +176,7 @@ define(function(require, exports, module) { ...@@ -176,7 +176,7 @@ define(function(require, exports, module) {
var ExpanderRenderer = kity.createClass('ExpanderRenderer', { var ExpanderRenderer = kity.createClass('ExpanderRenderer', {
base: Renderer, base: Renderer,
create: function(node) { create: function (node) {
if (node.isRoot()) return; if (node.isRoot()) return;
this.expander = new Expander(node); this.expander = new Expander(node);
node.getRenderContainer().prependShape(this.expander); node.getRenderContainer().prependShape(this.expander);
...@@ -185,19 +185,19 @@ define(function(require, exports, module) { ...@@ -185,19 +185,19 @@ define(function(require, exports, module) {
return this.expander; return this.expander;
}, },
shouldRender: function(node) { shouldRender: function (node) {
return !node.isRoot(); return !node.isRoot();
}, },
update: function(expander, node, box) { update: function (expander, node, box) {
if (!node.parent) return; if (!node.parent) return;
var visible = node.parent.isExpanded(); var visible = node.parent.isExpanded();
expander.setState(visible && node.children.length ? node.getData(EXPAND_STATE_DATA) : 'hide'); expander.setState(visible && node.children.length ? node.getData(EXPAND_STATE_DATA) : 'hide');
var vector = node.getLayoutVectorIn().normalize(expander.radius + node.getStyle('stroke-width')); var vector = node.getLayoutVectorOut().normalize(expander.radius + node.getStyle('stroke-width'));
var position = node.getVertexIn().offset(vector.reverse()); var position = node.getVertexOut().offset(vector)
this.expander.setTranslate(position); this.expander.setTranslate(position);
} }
...@@ -210,13 +210,13 @@ define(function(require, exports, module) { ...@@ -210,13 +210,13 @@ define(function(require, exports, module) {
'collapse': CollapseCommand 'collapse': CollapseCommand
}, },
events: { events: {
'layoutapply': function(e) { 'layoutapply': function (e) {
var r = e.node.getRenderer('ExpanderRenderer'); var r = e.node.getRenderer('ExpanderRenderer');
if (r.getRenderShape()) { if (r.getRenderShape()) {
r.update(r.getRenderShape(), e.node); r.update(r.getRenderShape(), e.node);
} }
}, },
'beforerender': function(e) { 'beforerender': function (e) {
var node = e.node; var node = e.node;
var visible = !node.parent || node.parent.isExpanded(); var visible = !node.parent || node.parent.isExpanded();
var minder = this; var minder = this;
...@@ -224,13 +224,13 @@ define(function(require, exports, module) { ...@@ -224,13 +224,13 @@ define(function(require, exports, module) {
node.getRenderContainer().setVisible(visible); node.getRenderContainer().setVisible(visible);
if (!visible) e.stopPropagation(); if (!visible) e.stopPropagation();
}, },
'normal.keydown': function(e) { 'normal.keydown': function (e) {
if (this.getStatus() == 'textedit') return; if (this.getStatus() == 'textedit') return;
if (e.originEvent.keyCode == keymap['/']) { if (e.originEvent.keyCode == keymap['/']) {
var node = this.getSelectedNode(); var node = this.getSelectedNode();
if (!node || node == this.getRoot()) return; if (!node || node == this.getRoot()) return;
var expanded = node.isExpanded(); var expanded = node.isExpanded();
this.getSelectedNodes().forEach(function(node) { this.getSelectedNodes().forEach(function (node) {
if (expanded) node.collapse(); if (expanded) node.collapse();
else node.expand(); else node.expand();
node.renderTree(); node.renderTree();
...@@ -255,34 +255,34 @@ define(function(require, exports, module) { ...@@ -255,34 +255,34 @@ define(function(require, exports, module) {
}, },
contextmenu: [{ contextmenu: [{
command: 'expandtoleaf', command: 'expandtoleaf',
query: function() { query: function () {
return !minder.getSelectedNode(); return !minder.getSelectedNode();
}, },
fn: function(minder) { fn: function (minder) {
minder.execCommand('expandtolevel', 9999); minder.execCommand('expandtolevel', 9999);
} }
}, { }, {
command: 'expandtolevel1', command: 'expandtolevel1',
query: function() { query: function () {
return !minder.getSelectedNode(); return !minder.getSelectedNode();
}, },
fn: function(minder) { fn: function (minder) {
minder.execCommand('expandtolevel', 1); minder.execCommand('expandtolevel', 1);
} }
}, { }, {
command: 'expandtolevel2', command: 'expandtolevel2',
query: function() { query: function () {
return !minder.getSelectedNode(); return !minder.getSelectedNode();
}, },
fn: function(minder) { fn: function (minder) {
minder.execCommand('expandtolevel', 2); minder.execCommand('expandtolevel', 2);
} }
},{ }, {
command: 'expandtolevel3', command: 'expandtolevel3',
query: function() { query: function () {
return !minder.getSelectedNode(); return !minder.getSelectedNode();
}, },
fn: function(minder) { fn: function (minder) {
minder.execCommand('expandtolevel', 3); minder.execCommand('expandtolevel', 3);
} }
}, { }, {
......
src/module/image.js
View file @ 1a3034cd
define(function(require, exports, module) { define(function (require, exports, module) {
var kity = require('../core/kity'); var kity = require('../core/kity');
var utils = require('../core/utils'); var utils = require('../core/utils');
...@@ -7,14 +7,15 @@ define(function(require, exports, module) { ...@@ -7,14 +7,15 @@ define(function(require, exports, module) {
var Command = require('../core/command'); var Command = require('../core/command');
var Module = require('../core/module'); var Module = require('../core/module');
var Renderer = require('../core/render'); var Renderer = require('../core/render');
var Promise = require('../core/promise');
Module.register('image', function() { Module.register('image', function () {
function loadImageSize(url, callback) { function loadImageSize(url, callback) {
var img = document.createElement('img'); var img = document.createElement('img');
img.onload = function() { img.onload = function () {
callback(img.width, img.height); callback(img.width, img.height);
}; };
img.onerror = function() { img.onerror = function () {
callback(null); callback(null);
}; };
img.src = url; img.src = url;
...@@ -52,11 +53,23 @@ define(function(require, exports, module) { ...@@ -52,11 +53,23 @@ define(function(require, exports, module) {
var ImageCommand = kity.createClass('ImageCommand', { var ImageCommand = kity.createClass('ImageCommand', {
base: Command, base: Command,
execute: function(km, url, title) { execute: function (km, url, title) {
var nodes = km.getSelectedNodes(); var nodes = km.getSelectedNodes();
loadImageSize(url, function(width, height) { return new Promise(function (res, rej) {
nodes.forEach(function(n) { if (!url) {
nodes.forEach(function (n) {
n.setData('image');
n.setData('imageTitle');
n.setData('imageSize');
n.render();
});
km.fire('saveScene');
km.layout(300);
return rej();
}
loadImageSize(url, function (width, height) {
nodes.forEach(function (n) {
var size = fitImageSize( var size = fitImageSize(
width, height, width, height,
km.getOption('maxImageWidth'), km.getOption('maxImageWidth'),
...@@ -68,16 +81,17 @@ define(function(require, exports, module) { ...@@ -68,16 +81,17 @@ define(function(require, exports, module) {
}); });
km.fire('saveScene'); km.fire('saveScene');
km.layout(300); km.layout(300);
res();
}); });
})
}, },
queryState: function(km) { queryState: function (km) {
var nodes = km.getSelectedNodes(), var nodes = km.getSelectedNodes(),
result = 0; result = 0;
if (nodes.length === 0) { if (nodes.length === 0) {
return -1; return -1;
} }
nodes.forEach(function(n) { nodes.forEach(function (n) {
if (n && n.getData('image')) { if (n && n.getData('image')) {
result = 0; result = 0;
return false; return false;
...@@ -85,7 +99,7 @@ define(function(require, exports, module) { ...@@ -85,7 +99,7 @@ define(function(require, exports, module) {
}); });
return result; return result;
}, },
queryValue: function(km) { queryValue: function (km) {
var node = km.getSelectedNode(); var node = km.getSelectedNode();
return { return {
url: node.getData('image'), url: node.getData('image'),
...@@ -97,15 +111,15 @@ define(function(require, exports, module) { ...@@ -97,15 +111,15 @@ define(function(require, exports, module) {
var ImageRenderer = kity.createClass('ImageRenderer', { var ImageRenderer = kity.createClass('ImageRenderer', {
base: Renderer, base: Renderer,
create: function(node) { create: function (node) {
return new kity.Image(node.getData('image')); return new kity.Image(node.getData('image'));
}, },
shouldRender: function(node) { shouldRender: function (node) {
return node.getData('image'); return node.getData('image');
}, },
update: function(image, node, box) { update: function (image, node, box) {
var url = node.getData('image'); var url = node.getData('image');
var title = node.getData('imageTitle'); var title = node.getData('imageTitle');
var size = node.getData('imageSize'); var size = node.getData('imageSize');
......
src/module/priority.js
View file @ 1a3034cd
define(function(require, exports, module) { define(function (require, exports, module) {
var kity = require('../core/kity'); var kity = require('../core/kity');
var utils = require('../core/utils'); var utils = require('../core/utils');
...@@ -8,7 +8,7 @@ define(function(require, exports, module) { ...@@ -8,7 +8,7 @@ define(function(require, exports, module) {
var Module = require('../core/module'); var Module = require('../core/module');
var Renderer = require('../core/render'); var Renderer = require('../core/render');
Module.register('PriorityModule', function() { Module.register('PriorityModule', function () {
var minder = this; var minder = this;
// Designed by Akikonata // Designed by Akikonata
...@@ -34,18 +34,18 @@ define(function(require, exports, module) { ...@@ -34,18 +34,18 @@ define(function(require, exports, module) {
var PriorityIcon = kity.createClass('PriorityIcon', { var PriorityIcon = kity.createClass('PriorityIcon', {
base: kity.Group, base: kity.Group,
constructor: function() { constructor: function () {
this.callBase(); this.callBase();
this.setSize(20); this.setSize(20);
this.create(); this.create();
this.setId(utils.uuid('node_priority')); this.setId(utils.uuid('node_priority'));
}, },
setSize: function(size) { setSize: function (size) {
this.width = this.height = size; this.width = this.height = size;
}, },
create: function() { create: function () {
var white, back, mask, number; // 4 layer var white, back, mask, number; // 4 layer
white = new kity.Path().setPathData(MASK_PATH).fill('white'); white = new kity.Path().setPathData(MASK_PATH).fill('white');
...@@ -66,7 +66,7 @@ define(function(require, exports, module) { ...@@ -66,7 +66,7 @@ define(function(require, exports, module) {
this.number = number; this.number = number;
}, },
setValue: function(value) { setValue: function (value) {
var back = this.back, var back = this.back,
mask = this.mask, mask = this.mask,
number = this.number; number = this.number;
...@@ -78,7 +78,7 @@ define(function(require, exports, module) { ...@@ -78,7 +78,7 @@ define(function(require, exports, module) {
mask.fill(color[0]); mask.fill(color[0]);
} }
number.setContent(value); number.setContent('P' + (value - 1));
} }
}); });
...@@ -94,14 +94,14 @@ define(function(require, exports, module) { ...@@ -94,14 +94,14 @@ define(function(require, exports, module) {
*/ */
var PriorityCommand = kity.createClass('SetPriorityCommand', { var PriorityCommand = kity.createClass('SetPriorityCommand', {
base: Command, base: Command,
execute: function(km, value) { execute: function (km, value) {
var nodes = km.getSelectedNodes(); var nodes = km.getSelectedNodes();
for (var i = 0; i < nodes.length; i++) { for (var i = 0; i < nodes.length; i++) {
nodes[i].setData(PRIORITY_DATA, value || null).render(); nodes[i].setData(PRIORITY_DATA, value || null).render();
} }
km.layout(); km.layout();
}, },
queryValue: function(km) { queryValue: function (km) {
var nodes = km.getSelectedNodes(); var nodes = km.getSelectedNodes();
var val; var val;
for (var i = 0; i < nodes.length; i++) { for (var i = 0; i < nodes.length; i++) {
...@@ -111,7 +111,7 @@ define(function(require, exports, module) { ...@@ -111,7 +111,7 @@ define(function(require, exports, module) {
return val || null; return val || null;
}, },
queryState: function(km) { queryState: function (km) {
return km.getSelectedNodes().length ? 0 : -1; return km.getSelectedNodes().length ? 0 : -1;
} }
}); });
...@@ -123,15 +123,15 @@ define(function(require, exports, module) { ...@@ -123,15 +123,15 @@ define(function(require, exports, module) {
left: kity.createClass('PriorityRenderer', { left: kity.createClass('PriorityRenderer', {
base: Renderer, base: Renderer,
create: function(node) { create: function (node) {
return new PriorityIcon(); return new PriorityIcon();
}, },
shouldRender: function(node) { shouldRender: function (node) {
return node.getData(PRIORITY_DATA); return node.getData(PRIORITY_DATA);
}, },
update: function(icon, node, box) { update: function (icon, node, box) {
var data = node.getData(PRIORITY_DATA); var data = node.getData(PRIORITY_DATA);
var spaceLeft = node.getStyle('space-left'), var spaceLeft = node.getStyle('space-left'),
x, y; x, y;
......
src/module/progress.js
View file @ 1a3034cd
define(function(require, exports, module) { define(function (require, exports, module) {
var kity = require('../core/kity'); var kity = require('../core/kity');
var utils = require('../core/utils'); var utils = require('../core/utils');
...@@ -8,7 +8,7 @@ define(function(require, exports, module) { ...@@ -8,7 +8,7 @@ define(function(require, exports, module) {
var Module = require('../core/module'); var Module = require('../core/module');
var Renderer = require('../core/render'); var Renderer = require('../core/render');
Module.register('ProgressModule', function() { Module.register('ProgressModule', function () {
var minder = this; var minder = this;
var PROGRESS_DATA = 'progress'; var PROGRESS_DATA = 'progress';
...@@ -22,7 +22,7 @@ define(function(require, exports, module) { ...@@ -22,7 +22,7 @@ define(function(require, exports, module) {
// jscs:disable maximumLineLength // jscs:disable maximumLineLength
var FRAME_PATH = 'M10,0C4.477,0,0,4.477,0,10c0,5.523,4.477,10,10,10s10-4.477,10-10C20,4.477,15.523,0,10,0zM10,18c-4.418,0-8-3.582-8-8s3.582-8,8-8s8,3.582,8,8S14.418,18,10,18z'; var FRAME_PATH = 'M10,0C4.477,0,0,4.477,0,10c0,5.523,4.477,10,10,10s10-4.477,10-10C20,4.477,15.523,0,10,0zM10,18c-4.418,0-8-3.582-8-8s3.582-8,8-8s8,3.582,8,8S14.418,18,10,18z';
var FRAME_GRAD = new kity.LinearGradient().pipe(function(g) { var FRAME_GRAD = new kity.LinearGradient().pipe(function (g) {
g.setStartPosition(0, 0); g.setStartPosition(0, 0);
g.setEndPosition(0, 1); g.setEndPosition(0, 1);
g.addStop(0, '#fff'); g.addStop(0, '#fff');
...@@ -37,7 +37,7 @@ define(function(require, exports, module) { ...@@ -37,7 +37,7 @@ define(function(require, exports, module) {
var ProgressIcon = kity.createClass('ProgressIcon', { var ProgressIcon = kity.createClass('ProgressIcon', {
base: kity.Group, base: kity.Group,
constructor: function(value) { constructor: function (value) {
this.callBase(); this.callBase();
this.setSize(20); this.setSize(20);
this.create(); this.create();
...@@ -46,18 +46,18 @@ define(function(require, exports, module) { ...@@ -46,18 +46,18 @@ define(function(require, exports, module) {
this.translate(0.5, 0.5); this.translate(0.5, 0.5);
}, },
setSize: function(size) { setSize: function (size) {
this.width = this.height = size; this.width = this.height = size;
}, },
create: function() { create: function () {
var bg, pie, shadow, frame, check; var bg, pie, shadow, frame, check;
bg = new kity.Circle(9) bg = new kity.Circle(9)
.fill(BG_COLOR); .fill(BG_COLOR);
pie = new kity.Pie(9, 0) pie = new kity.Pie(9, 0).rotate(180)
.fill(PIE_COLOR); .fill(PIE_COLOR);
shadow = new kity.Path() shadow = new kity.Path()
...@@ -75,14 +75,49 @@ define(function(require, exports, module) { ...@@ -75,14 +75,49 @@ define(function(require, exports, module) {
.setPathData(CHECK_PATH) .setPathData(CHECK_PATH)
.fill(CHECK_COLOR); .fill(CHECK_COLOR);
this.addShapes([bg, pie, shadow, check, frame]); cross = new kity.Path()
.setTranslate(-10, -10)
.setPathData(
"M5,5l.7,-.7l4.3,4.3l4.3,-4.3l1.4,1.4l-4.3,4.3l4.3,4.3l-1.4,1.4l-4.3,-4.3l-4.3,4.3l-1.4,-1.4l4.3,-4.3l-4.3,-4.3l.7,-.7z"
)
.fill("#d81e06")
skip = new kity.Path()
.setTranslate(-8, -8)
.setScale(0.016)
.setPathData(
"M747.3152 415.6416a256.0512 256.0512 0 0 0-489.472 96.768H341.504a170.6496 170.6496 0 0 1 327.6288-58.624l-115.0976 20.9408 227.84 116.736 48.2816-251.392-82.8416 75.5712zM0 512C0 229.2224 229.1712 0 512 0c282.7776 0 512 229.1712 512 512 0 282.7776-229.1712 512-512 512-282.7776 0-512-229.1712-512-512z"
)
.fill('#BE96F9')
this.addShapes([bg, pie, shadow, check, frame, cross, skip]);
this.pie = pie; this.pie = pie;
this.check = check; this.check = check;
this.cross = cross;
this.skip = skip;
}, },
setValue: function(value) { setValue: function (value) {
this.pie.setAngle(-360 * (value - 1) / 8); this.check.setVisible(false)
this.check.setVisible(value == 9); this.cross.setVisible(false)
this.skip.setVisible(false)
this.pie.setVisible(false)
switch (value) {
case 1:
this.check.setVisible(true)
this.pie.setAngle(360).fill(PIE_COLOR).setVisible(true)
break;
case 2:
this.cross.setVisible(true)
break
case 3:
this.pie.setAngle(180).fill('#d81e06').setVisible(true)
break
case 4:
this.skip.setVisible(true)
this.pie.setAngle(360).fill('#fff').setVisible(true)
break
}
} }
}); });
...@@ -102,14 +137,14 @@ define(function(require, exports, module) { ...@@ -102,14 +137,14 @@ define(function(require, exports, module) {
*/ */
var ProgressCommand = kity.createClass('ProgressCommand', { var ProgressCommand = kity.createClass('ProgressCommand', {
base: Command, base: Command,
execute: function(km, value) { execute: function (km, value) {
var nodes = km.getSelectedNodes(); var nodes = km.getSelectedNodes();
for (var i = 0; i < nodes.length; i++) { for (var i = 0; i < nodes.length; i++) {
nodes[i].setData(PROGRESS_DATA, value || null).render(); nodes[i].setData(PROGRESS_DATA, value || null).render();
} }
km.layout(); km.layout();
}, },
queryValue: function(km) { queryValue: function (km) {
var nodes = km.getSelectedNodes(); var nodes = km.getSelectedNodes();
var val; var val;
for (var i = 0; i < nodes.length; i++) { for (var i = 0; i < nodes.length; i++) {
...@@ -119,7 +154,7 @@ define(function(require, exports, module) { ...@@ -119,7 +154,7 @@ define(function(require, exports, module) {
return val || null; return val || null;
}, },
queryState: function(km) { queryState: function (km) {
return km.getSelectedNodes().length ? 0 : -1; return km.getSelectedNodes().length ? 0 : -1;
} }
}); });
...@@ -132,15 +167,15 @@ define(function(require, exports, module) { ...@@ -132,15 +167,15 @@ define(function(require, exports, module) {
left: kity.createClass('ProgressRenderer', { left: kity.createClass('ProgressRenderer', {
base: Renderer, base: Renderer,
create: function(node) { create: function (node) {
return new ProgressIcon(); return new ProgressIcon();
}, },
shouldRender: function(node) { shouldRender: function (node) {
return node.getData(PROGRESS_DATA); return node.getData(PROGRESS_DATA);
}, },
update: function(icon, node, box) { update: function (icon, node, box) {
var data = node.getData(PROGRESS_DATA); var data = node.getData(PROGRESS_DATA);
var spaceLeft = node.getStyle('space-left'); var spaceLeft = node.getStyle('space-left');
var x, y; var x, y;
......
src/protocol/png.js
View file @ 1a3034cd
define(function(require, exports, module) { define(function (require, exports, module) {
var kity = require('../core/kity'); var kity = require('../core/kity');
var data = require('../core/data'); var data = require('../core/data');
var Promise = require('../core/promise'); var Promise = require('../core/promise');
...@@ -6,9 +6,9 @@ define(function(require, exports, module) { ...@@ -6,9 +6,9 @@ define(function(require, exports, module) {
var DomURL = window.URL || window.webkitURL || window; var DomURL = window.URL || window.webkitURL || window;
function loadImage(info, callback) { function loadImage(info, callback) {
return new Promise(function(resolve, reject) { return new Promise(function (resolve, reject) {
var image = document.createElement("img"); var image = document.createElement("img");
image.onload = function() { image.onload = function () {
resolve({ resolve({
element: this, element: this,
x: info.x, x: info.x,
...@@ -17,7 +17,7 @@ define(function(require, exports, module) { ...@@ -17,7 +17,7 @@ define(function(require, exports, module) {
height: info.height height: info.height
}); });
}; };
image.onerror = function(err) { image.onerror = function (err) {
reject(err); reject(err);
}; };
...@@ -82,7 +82,8 @@ define(function(require, exports, module) { ...@@ -82,7 +82,8 @@ define(function(require, exports, module) {
renderContainer.translate(-renderBox.x, -renderBox.y); renderContainer.translate(-renderBox.x, -renderBox.y);
// 获取当前的 XML 代码 // 获取当前的 XML 代码
svgXml = paper.container.innerHTML; // svgXml = paper.container.innerHTML;
svgXml = paper.node.outerHTML;
// 回复原始变换及位置 // 回复原始变换及位置
renderContainer.translate(renderBox.x, renderBox.y); renderContainer.translate(renderBox.x, renderBox.y);
...@@ -112,6 +113,8 @@ define(function(require, exports, module) { ...@@ -112,6 +113,8 @@ define(function(require, exports, module) {
// @ http://stackoverflow.com/questions/30273775/namespace-prefix-ns1-for-href-on-tagelement-is-not-defined-setattributens // @ http://stackoverflow.com/questions/30273775/namespace-prefix-ns1-for-href-on-tagelement-is-not-defined-setattributens
svgXml = svgXml.replace(/NS\d+:title/gi, 'xlink:title'); svgXml = svgXml.replace(/NS\d+:title/gi, 'xlink:title');
svgXml = svgXml.replace(/<image .*?><\/image>/gi, '')
blob = new Blob([svgXml], { blob = new Blob([svgXml], {
type: 'image/svg+xml' type: 'image/svg+xml'
}); });
...@@ -183,8 +186,8 @@ define(function(require, exports, module) { ...@@ -183,8 +186,8 @@ define(function(require, exports, module) {
var svgInfo = getSVGInfo(minder); var svgInfo = getSVGInfo(minder);
var width = option && option.width && option.width > svgInfo.width ? option.width : svgInfo.width; var width = option && option.width && option.width > svgInfo.width ? option.width : svgInfo.width;
var height = option && option.height && option.height > svgInfo.height ? option.height : svgInfo.height; var height = option && option.height && option.height > svgInfo.height ? option.height : svgInfo.height;
var offsetX = option && option.width && option.width > svgInfo.width ? (option.width - svgInfo.width)/2 : 0; var offsetX = option && option.width && option.width > svgInfo.width ? (option.width - svgInfo.width) / 2 : 0;
var offsetY = option && option.height && option.height > svgInfo.height ? (option.height - svgInfo.height)/2 : 0; var offsetY = option && option.height && option.height > svgInfo.height ? (option.height - svgInfo.height) / 2 : 0;
var svgDataUrl = svgInfo.dataUrl; var svgDataUrl = svgInfo.dataUrl;
var imagesInfo = svgInfo.imagesInfo; var imagesInfo = svgInfo.imagesInfo;
...@@ -215,21 +218,22 @@ define(function(require, exports, module) { ...@@ -215,21 +218,22 @@ define(function(require, exports, module) {
// 加载节点上的图片 // 加载节点上的图片
function loadImages(imagesInfo) { function loadImages(imagesInfo) {
var imagePromises = imagesInfo.map(function(imageInfo) { var imagePromises = imagesInfo.map(function (imageInfo) {
return xhrLoadImage(imageInfo); // return xhrLoadImage(imageInfo);
return loadImage(imageInfo);
}); });
return Promise.all(imagePromises); return Promise.all(imagePromises);
} }
function drawSVG() { function drawSVG() {
var svgData = {url: svgDataUrl}; var svgData = { url: svgDataUrl };
return loadImage(svgData).then(function($image) { return loadImage(svgData).then(function ($image) {
drawImage(ctx, $image.element, offsetX, offsetY, $image.width, $image.height); drawImage(ctx, $image.element, offsetX, offsetY, $image.width, $image.height);
return loadImages(imagesInfo); return loadImages(imagesInfo);
}).then(function($images) { }).then(function ($images) {
for(var i = 0; i < $images.length; i++) { for (var i = 0; i < $images.length; i++) {
drawImage(ctx, $images[i].element, $images[i].x + offsetX, $images[i].y + offsetY, $images[i].width, $images[i].height); drawImage(ctx, $images[i].element, $images[i].x + offsetX, $images[i].y + offsetY, $images[i].width, $images[i].height);
} }
...@@ -239,10 +243,11 @@ define(function(require, exports, module) { ...@@ -239,10 +243,11 @@ define(function(require, exports, module) {
document.body.removeChild(canvas); document.body.removeChild(canvas);
return pngBase64; return pngBase64;
}, function(err) { }, function (err) {
// 这里处理 reject，出错基本上是因为跨域， // 这里处理 reject，出错基本上是因为跨域，
// 出错后依然导出，只不过没有图片。 // 出错后依然导出，只不过没有图片。
alert('脑图的节点中包含跨域图片，导出的 png 中节点图片不显示，你可以替换掉这些跨域的图片并重试。'); console.warn('error: ', err)
console.warn('脑图的节点中包含跨域图片，导出的 png 中节点图片不显示，你可以替换掉这些跨域的图片并重试。');
DomURL.revokeObjectURL(svgDataUrl); DomURL.revokeObjectURL(svgDataUrl);
document.body.appendChild(canvas); document.body.appendChild(canvas);
...@@ -253,8 +258,8 @@ define(function(require, exports, module) { ...@@ -253,8 +258,8 @@ define(function(require, exports, module) {
} }
if (bgUrl) { if (bgUrl) {
var bgInfo = {url: bgUrl[1]}; var bgInfo = { url: bgUrl[1] };
return loadImage(bgInfo).then(function($image) { return loadImage(bgInfo).then(function ($image) {
fillBackground(ctx, ctx.createPattern($image.element, "repeat")); fillBackground(ctx, ctx.createPattern($image.element, "repeat"));
return drawSVG(); return drawSVG();
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment