Commit 96011827 authored by 任建锋's avatar 任建锋

--

parents 6182920b c4b1baed
...@@ -141,10 +141,11 @@ export default { ...@@ -141,10 +141,11 @@ export default {
}, },
size: { size: {
title: '字体大小', title: '字体大小',
type: 'swSelect', type: 'inputNumber',
/*type: 'swSelect',
props: { props: {
optionType: 'fontSize' optionType: 'fontSize'
}, },*/
value: 12 value: 12
}, },
textAlign: { textAlign: {
......
...@@ -204,7 +204,12 @@ ...@@ -204,7 +204,12 @@
type: 'success', type: 'success',
duration: 1000, duration: 1000,
}); });
if(debug){setTimeout(()=>{
window.open(packResult.tplUrl, 'blank');
}, 500);
}else{
this.$refs.packResultDialog.show(packResult); this.$refs.packResultDialog.show(packResult);
}
/*this.$confirm(this.$t('Pack project successfully'), this.$t('Alert'), { /*this.$confirm(this.$t('Pack project successfully'), this.$t('Alert'), {
confirmButtonText: this.$t('Open in new tab'), confirmButtonText: this.$t('Open in new tab'),
cancelButtonText: this.$t('Close'), cancelButtonText: this.$t('Close'),
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
@click="onClickProcessNode(process, key)" @click="onClickProcessNode(process, key)"
@hover-pin="onPinHover" @hover-pin="onPinHover"
@leave-pin="onPinLeave" @leave-pin="onPinLeave"
@down-pin="onPintDown" @down-pin="onPinDown"
@delete="onProcessNodeDelete" @delete="onProcessNodeDelete"
@copy="onProcessNodeCopy" @copy="onProcessNodeCopy"
@edit-meta="onEditMeta" @edit-meta="onEditMeta"
...@@ -200,6 +200,9 @@ ...@@ -200,6 +200,9 @@
avatar.uuid = generateUUID(); avatar.uuid = generateUUID();
avatar.design.x += 20; avatar.design.x += 20;
avatar.design.y += 20; avatar.design.y += 20;
avatar.output = {};
delete avatar.design['output'];
delete avatar.design['input'];
this.$set(this.process.meta.sub, avatar.uuid, avatar); this.$set(this.process.meta.sub, avatar.uuid, avatar);
this.addSubProcess(avatar.uuid, avatar); this.addSubProcess(avatar.uuid, avatar);
...@@ -254,7 +257,7 @@ ...@@ -254,7 +257,7 @@
onPinLeave(x, y, pin) { onPinLeave(x, y, pin) {
this.$refs.toolTip.hide(); this.$refs.toolTip.hide();
}, },
onPintDown(e, process, pin) { onPinDown(e, process, pin) {
document.addEventListener("mousemove", this.onMouseMove); document.addEventListener("mousemove", this.onMouseMove);
document.addEventListener("mouseup", this.onMouseUp); document.addEventListener("mouseup", this.onMouseUp);
......
...@@ -72,6 +72,7 @@ ...@@ -72,6 +72,7 @@
import 'codemirror/mode/javascript/javascript.js' import 'codemirror/mode/javascript/javascript.js'
import 'codemirror/lib/codemirror.css' import 'codemirror/lib/codemirror.css'
import 'codemirror/theme/monokai.css' import 'codemirror/theme/monokai.css'
import 'codemirror/addon/edit/closebrackets.js'
const exposeVariables = ['args', 'props', 'target', 'global', 'vm', 'engine']; const exposeVariables = ['args', 'props', 'target', 'global', 'vm', 'engine'];
...@@ -101,6 +102,8 @@ ...@@ -101,6 +102,8 @@
theme: 'default', theme: 'default',
lineNumbers: true, lineNumbers: true,
line: true, line: true,
matchBrackets: true,
autoCloseBrackets: true,
// more codemirror options, 更多 codemirror 的高级配置... // more codemirror options, 更多 codemirror 的高级配置...
} }
} }
......
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