Merge branch 'dev' into rjf_test

public/index.html

@@ -14,7 +14,7 @@
 </noscript>
 <script>
 	window.__data = {
-		token : "<%= process.env.NODE_ENV === 'development' ? 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MjQ1LCJuYW1lIjoi5byg5pmo6L6wIiwiYWNjb3VudCI6InpjYyIsImVtYWlsIjoiemNjQGR1aWJhLmNvbS5jbiIsIm1vYmlsZSI6IjE4NzU3MTU1NzUxIiwiZGluZ1VzZXJJZCI6IjAyMDcxMTUyNjgyNDI1MTc1MiIsIm1vZGVsQXV0aG9yaXplIjpmYWxzZSwibG9naW5UaW1lb3V0Ijo4NjMxMCwiZ210Q3JlYXRlIjoxNTM0NDEyMDA4MDAwLCJnbXRNb2RpZmllZCI6MTU3NDA0OTAwODAwMCwic3lzdGVtSWRTZXQiOlswLDEsMzQsMzYsMzcsMjMxLDIwMywxOSwyMSwyNDYsMjMsMjQ5LDI1LDI3LDMwXSwiaWF0IjoxNTc0ODU5OTA5fQ.OIOZDSSdJRPHeDI_YPY6lBFWvNoRZZ2O4uByG6rDOxk' : '$TOKEN$' %>",
+		token : "<%= process.env.NODE_ENV === 'development' ? 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MjA4NSwibmFtZSI6IuWKs-eQquWzsCIsImFjY291bnQiOiJsYW9xaWZlbmciLCJlbWFpbCI6Imxhb3FpZmVuZ0BkdWliYS5jb20uY24iLCJtb2JpbGUiOiIxMzQ1Njc3NDE1MyIsImRpbmdVc2VySWQiOiI1MDY5MDYyOTIxMjkxMDAxIiwibW9kZWxBdXRob3JpemUiOmZhbHNlLCJsb2dpblRpbWVvdXQiOjE0ODA5LCJnbXRDcmVhdGUiOjE1MzQ0MTIwMTUwMDAsImdtdE1vZGlmaWVkIjoxNTczODgyMDk2MDAwLCJzeXN0ZW1JZFNldCI6WzAsMSwzNCwyMjcsMzYsMzcsMjMxLDIwMywxOSwyMSwyNDYsMjMsMjUsMjQ5LDI3LDMwXSwiaWF0IjoxNTc1MzQwMzg2fQ.2JEYMRx6wbJsMIMh3quyM14OsoMz_iJRq4Az_xz-WTc' : '$TOKEN$' %>",
 		apiHost : "<%= process.env.NODE_ENV === 'development' ? 'http://beacon.duibadev.com.cn' : '$API_HOST$' %>"
 	}
 </script>

src/themes/light/behavior.scss

@@ -9,6 +9,7 @@ $dock-pin-width: 9px;
 
 	.el-dialog__body {
 		flex: 1;
+		height: 0;
 		padding: 5px;
 	}
 
@@ -320,8 +321,9 @@ $dock-pin-width: 9px;
 }
 
 .meta-editor-wrapper {
-	height: 40vh;
+	//height: 40vh;
 	display: flex;
+	height: 100%;
 	padding: 5px;
 	flex-direction: column;
 
@@ -332,6 +334,15 @@ $dock-pin-width: 9px;
 	.script-editor {
 		flex: 1;
 	}
+
+	.vue-codemirror{
+		flex: 1;
+		height: 0;
+	}
+
+	.CodeMirror {
+		height: 100%;
+	}
 }
 
 .props-editor-dialog {

src/themes/light/editor.scss

@@ -4,10 +4,6 @@
 @import "assets";
 @import "behavior";
 
-.CodeMirror {
-	height: 200px !important;
-}
-
 .editor {
 	display: flex;
 	flex: 1;

src/utils/properties.js

@@ -134,6 +134,11 @@ export default {
       type: 'input',
       value: ''
     },
+    htmlText: {
+      title: 'HTML内容',
+      type: 'input',
+      value: ''
+    },
     fillColor: {
       title: '颜色',
       type: 'colorPicker',
@@ -261,11 +266,11 @@ export default {
       value: 20,
     },
   },
-  htmlView: {
+  /*htmlView: {
     groupName: 'HTML视图',
     htmlElement: {
       title: 'HTML内容',
       type: 'input',
     },
-  }
+  }*/
 }

src/views/Editor/behavior-editor/Board.vue

@@ -175,7 +175,7 @@
 
 				const data = await this.addSubProcessData(processId, {
 					x: e.offsetX - this.boardOffset.x - 9,
-					y: e.offsetY - this.boardOffset.y,
+					y: e.offsetY - this.boardOffset.y - 20,
 				});
 				if (!data) {
 					return;

src/views/Editor/behavior-editor/MetaEditorDialog.vue

@@ -3,7 +3,10 @@
 	           :close-on-click-modal="false"
 	           :close-on-press-escape="false"
 	           :show-close="false"
-	           :append-to-body="true">
+	           fullscreen
+	           :append-to-body="true"
+	           custom-class="behavior-editor-dialog"
+	>
 		<div class="meta-editor-wrapper">
 			<el-form ref="form" v-if="meta" :model="meta" :rules="rules" :show-message="false" class="info-editor" size="mini" label-position="right" label-width="70px" @submit.native.prevent>
 				<template>