Merge branch 'dev' into dep-lock

package.json

@@ -17,6 +17,8 @@
 		"indexdbwrapper": "^1.0.4",
 		"jszip": "^3.2.2",
 		"moment": "^2.24.0",
+		"monaco-editor": "^0.19.0",
+		"monaco-editor-webpack-plugin": "^1.8.1",
 		"path": "^0.12.7",
 		"querystringify": "^2.1.1",
 		"semver": "^7.1.1",

public/index.html

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

src/views/Editor.vue

@@ -88,12 +88,15 @@
 			});
 
 			await playWaiting(this.prepare(), this.$t('Preparing')).catch(e => {
+				console.log(e);
 			});
 			setTimeout(() => {
-				startCodeSyncServe(this.codeSyncServeConfig);
+				//startCodeSyncServe(this.codeSyncServeConfig);
 			}, 100);
 
-			this.loadProject();
+			this.loadProject().catch(e => {
+				console.log(e);
+			});
 		},
 		destroyed() {
 			document.removeEventListener('keydown', this.onKeyPress)

src/views/Editor/behavior-editor/inputs/NodeSelectInput.vue

@@ -13,6 +13,7 @@
 				<div>
 					<el-scrollbar class="tree-scrollbar" wrap-class="wrap-x-hidden">
 						<el-tree
+							v-if="popoverVisible"
 							:data="behavior_views"
 							:props="defaultProps"
 							:expand-on-click-node="false"

src/views/Editor/components/MonacoEditor.vue

+<template>
+  <div id="container"></div>
+</template>
+<script>
+import * as monaco from "monaco-editor";
+export default {
+  name: "MonacoEditor",
+  props: {
+    options: Object,
+    code: String
+  },
+  async mounted() {
+    const { options, code } = this;
+    const res = await fetch(
+      "http://yun.duiba.com.cn/editor/zeroing/types/types.d.ts"
+    );
+    const types = await res.text();
+
+    const defaultConfig = {
+      language: "javascript",
+      value: "",
+      minimap: {
+        enabled: false
+      }
+    };
+
+    // compiler options
+    monaco.languages.typescript.javascriptDefaults.setCompilerOptions({
+      target: monaco.languages.typescript.ScriptTarget.ES6,
+      allowNonTsExtensions: true,
+      allowJs: true
+    });
+    // extra libraries
+    monaco.languages.typescript.javascriptDefaults.addExtraLib(
+      [types].join("\n")
+    );
+    const config = Object.assign({}, defaultConfig, options, { value: code });
+    this.editor = monaco.editor.create(
+      document.getElementById("container"),
+      config
+    );
+  }
+};
+</script>
+<style lang="scss" scoped>
+#container {
+  width: 100%;
+  height: 100%;
+}
+</style>

vue.config.js

-const serverHost = 'http://10.10.95.74:7777';
+const serverHost = 'http://10.10.95.74:7777'
 
-//const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin');
+const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin')
 
 module.exports = {
   publicPath: process.env.NODE_ENV === 'production' ? '//yun.duiba.com.cn/editor/zeroing/v1/' : '',
@@ -26,9 +26,10 @@ module.exports = {
   },*/
   configureWebpack: {
     plugins: [
-      /*new MonacoWebpackPlugin({
-        languages: ['html', 'javascript', 'json']
-      })*/
+      new MonacoWebpackPlugin({
+        languages: ['javascript', 'typescript', 'json'],
+        publicPath: process.env.NODE_ENV === 'production' ? "/monaco" : "",
+      })
     ]
   }
-};
+}