Merge branch 'dev' of http://gitlab2.dui88.com/laoqifeng/zeroing-editor into feature/huhu

public/index.html

@@ -17,7 +17,7 @@
 </noscript>
 <script>
 	window.__data = {
-		token : "<%= process.env.NODE_ENV === 'development' ? 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MjU0NywibmFtZSI6IuWNnum-meS6rSIsImFjY291bnQiOiJiaWFubG9uZ3RpbmciLCJlbWFpbCI6ImJpYW5sb25ndGluZ0BkdWliYS5jb20uY24iLCJtb2JpbGUiOiIxNTg2OTE3NDMxMSIsImRpbmdVc2VySWQiOiIwMTE1MTgyMTEyMjE3OTYzNzAiLCJtb2RlbEF1dGhvcml6ZSI6ZmFsc2UsImxvZ2luVGltZW91dCI6NzczNjEsImdtdENyZWF0ZSI6MTU1OTUyNjcxNDAwMCwiZ210TW9kaWZpZWQiOjE1NzM3NDk1OTEwMDAsInN5c3RlbUlkU2V0IjpbMCwxLDM0LDM2LDM3LDIzMSwyMDMsNDQsMTksMjEsMjQ2LDIzLDI0OSwyNSwyNywzMF0sImlhdCI6MTU3Nzk1MjgxNH0.GNeP25ZZK5ca7rvwtj2BaQ3GZatGNSR3CthSN98PSD4' : '$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/MetaEditorDialog.vue

@@ -99,12 +99,13 @@
         :options="cmOptions"
         @cursorActivity="onCodeChange"
       />-->
-      <monaco-editor
+      <!--<monaco-editor
         ref="codeEditor"
         v-if="meta"
         :code="meta.script"
         :options="monacoConfig"
-      />
+      />-->
+      <code-editor v-if="meta" v-model="meta.script"/>
     </div>
     <div slot="footer" class="dialog-footer">
       <div class="button-bar">
@@ -133,23 +134,23 @@
 <script>
 import ElFormItem from "./inputs/form-item";
 import PropsEditorDialog from "./PropsEditorDialog";
-import * as monaco from "monaco-editor";
-import MonacoEditor from "../components/MonacoEditor";
+//import MonacoEditor from "../components/MonacoEditor";
 import copy from "copy-to-clipboard";
 import { clonePureObj } from "../../../utils";
 import events from "../../../global-events";
 import CodeSyncIndicator from "../BottomBar/CodeSyncIndicator";
+import CodeEditor from "./CodeEditor";
 
 const exposeVariables = ["args", "props", "target", "global", "vm", "engine"];
 
 export default {
   name: "MetaEditorDialog",
   components: {
+    CodeEditor,
     CodeSyncIndicator,
     PropsEditorDialog,
     ElFormItem,
-    monaco,
-    "monaco-editor": MonacoEditor
+    //"monaco-editor": MonacoEditor
   },
   data() {
     return {

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"

vue.config.js

@@ -28,7 +28,7 @@ module.exports = {
     plugins: [
       new MonacoWebpackPlugin({
         languages: ['javascript', 'typescript', 'json'],
-        output: "/monaco"
+        publicPath: process.env.NODE_ENV === 'production' ? "/monaco" : "",
       })
     ]
   }