Merge branch 'dev' into feature/20190923-feature

43ac21cb · 张晨辰 · 5d30bd2e · 837757e1 · 43ac21cb · 43ac21cb
Commit 43ac21cb authored Nov 14, 2019 by 张晨辰
12 changed files
--- a/src/config.js
+++ b/src/config.js
@@ -2,7 +2,8 @@
 * Created by rockyl on 2019-09-19.
 */

-export const API_HOST = 'http://10.10.95.74:7777';
+export const API_HOST = 'http://beacon.duibadev.com.cn';
+//export const API_HOST = 'http://10.10.95.74:7777';
 //export const API_HOST = 'http://localhost:3002';

 export const UPLOAD_FILE_URL = API_HOST + '/api/uploadFile';

--- a/src/store/modules/project.js
+++ b/src/store/modules/project.js
@@ -61,8 +61,6 @@ export const projectStore = {
 			if (data) {
 				const {views, assets, dataMapping, processes, options,} = JSON.parse(data);

-				console.log(processes);
-
 				Vue.set(localData, 'options', options || getDefaultOptions());
 				Vue.set(localData, 'views', views || []);
 				Vue.set(localData, 'assets', assets || []);

--- a/src/template.js
+++ b/src/template.js
@@ -3,7 +3,11 @@
 */

 export const template =
-	`	<meta charset="UTF-8">
+`<!DOCTYPE html>
+<html lang="en">
+
+	<head>
+	<meta charset="UTF-8">
 	<title>$PAGE_TITLE$</title>
 	<meta name="viewport"
 content="width=device-width,initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no"/>
@@ -24,14 +28,16 @@ content="width=device-width,initial-scale=1, minimum-scale=1, maximum-scale=1, u
 	overflow: hidden;
 	position: absolute;
 	background-color: white;
-	}
-	</style>
+}
+</style>
 </head>

 <body>
-	<div id="$CONTAINER_ID$" style="line-height:0;font-size:0"></div>
+<div id="$CONTAINER_ID$" style="line-height:0;font-size:0"></div>
 	<script src="http://10.10.94.134:4002/dist/index.js"></script>
 	<script>
-		engine.launch('http://10.10.94.134:4002/examples/mock/test.json');
-	</script>
+	engine.launch('//yun.duiba.com.cn/aurora/$VERSION$-data.json');
+</script>
+</body>
+</html>
 `;
--- a/src/utils/events.js
+++ b/src/utils/events.js
-export default ['init', 'awake', 'sleep', 'dataevent', 'click', 'touchstart', 'touchend', 'touchmove']
\ No newline at end of file
+export default ['init', 'awake', 'sleep', 'datacenter', 'click', 'touchstart', 'touchend', 'touchmove']
\ No newline at end of file
--- a/src/utils/properties.js
+++ b/src/utils/properties.js
@@ -55,6 +55,16 @@ export default {
      },
      value: 0
    },
+    anchorX: {
+      title: '锚点X',
+      type: 'inputNumber',
+      value: 0
+    },
+    anchorY: {
+      title: '锚点Y',
+      type: 'inputNumber',
+      value: 0
+    },
    scaleX: {
      title: 'X轴缩放',
      type: 'inputNumber',
@@ -81,6 +91,22 @@ export default {
        step: 0.1
      }
    },
+    mouseEnabled: {
+      title: '可否交互',
+      type: 'switch',
+      props: {
+        width: 40
+      },
+      value: true
+    },
+    mouseChildren: {
+      title: '子集交互',
+      type: 'switch',
+      props: {
+        width: 40
+      },
+      value: true
+    },
    visible: {
      title: '是否可见',
      type: 'switch',

--- a/src/views/Editor/Inspector/BehaviorTab.vue
+++ b/src/views/Editor/Inspector/BehaviorTab.vue
 <template>
 	<div class="zero-inspector-behavior-form" v-if="activeComponent.uuid">
 		<el-scrollbar class="scrollbar" wrap-class="wrap-x-hidden">
-		<el-form ref="form" size="mini" label-width="60px">
+		<el-form ref="form" size="mini" label-width="60px"v>
 			<div v-for="(evn, key) in eventsObj" :key="key">
 				<el-form-item :label="$t('Event') + ':'">
 					<div>{{key}}</div>

--- a/src/views/Editor/Inspector/PropsTab.vue
+++ b/src/views/Editor/Inspector/PropsTab.vue
 <template>
  <div class="zero-inspector-props-form" v-if="activeComponent.uuid">
    <el-scrollbar class="scrollbar" wrap-class="wrap-x-hidden">
-      <el-form ref="form" size="mini" :model="form" label-width="80px">
+      <el-form ref="form" size="mini" :model="form" label-width="80px" @submit.native.prevent>
        <el-collapse v-model="configColl">
          <el-collapse-item title="配置" name="properties">
            <el-form-item label="名称">

--- a/src/views/Editor/Inspector/ScriptsTab.vue
+++ b/src/views/Editor/Inspector/ScriptsTab.vue
@@ -2,7 +2,7 @@
  <div class="zero-inspector-script-form" v-if="activeComponent.uuid">
    <el-collapse v-model="configColl">
      <el-collapse-item title="配置" name="properties">
-        <el-form ref="form" size="mini" :model="form" label-width="80px">
+        <el-form ref="form" size="mini" :model="form" label-width="80px" @submit.native.prevent>
          <el-form-item label="名称">
            <el-input v-model="form.name" @input="v => handleChange('name', v)"></el-input>
          </el-form-item>

--- a/src/views/Editor/behavior-editor/Board.vue
+++ b/src/views/Editor/behavior-editor/Board.vue
@@ -285,7 +285,7 @@
 						if (key.startsWith('pn_')) {
 							const processNode = this.$refs[key][0];

-							if (processNode.meta.id === metaID) {
+							if (processNode && processNode.meta.id === metaID) {
 								this.onProcessMetaModified(processNode.data, processNode.meta);
 								processNode.updateSize();
 								processNode.updateDockPointPos();

--- a/src/views/Editor/behavior-editor/MetaEditorDialog.vue
+++ b/src/views/Editor/behavior-editor/MetaEditorDialog.vue
@@ -3,7 +3,7 @@
 	           :close-on-click-modal="false"
 	           :append-to-body="true">
 		<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">
+			<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>
 					<el-form-item prop="id" label="ID">
 						<el-input v-model="meta.id" :placeholder="$t('ID')" :readonly="!editable"/>
@@ -35,6 +35,7 @@
 		</div>
 		<div slot="footer" class="dialog-footer">
 			<div class="button-bar">
+				<el-button size="mini" plain @click="printMeta">PrintMeta</el-button>
 				<el-button size="mini" plain @click="cancel">Cancel</el-button>
 				<el-button size="mini" plain @click="save">Save</el-button>
 			</div>
@@ -101,7 +102,10 @@
 			},
 			cancel() {
 				this.visible = false;
-			}
+			},
+			printMeta() {
+				console.log(JSON.stringify(this.meta));
+			},
 		}
 	}
 </script>

--- a/src/views/Editor/behavior-editor/PropertiesEditor.vue
+++ b/src/views/Editor/behavior-editor/PropertiesEditor.vue
@@ -5,7 +5,7 @@
 		</el-input>
 		<el-scrollbar class="scrollbar" wrap-class="wrap-x-hidden"
 		              view-class="scrollbar-view">
-			<el-form v-model="process" size="mini" label-width="80px" label-position="left" @submit.prevent>
+			<el-form v-model="process" size="mini" label-width="80px" label-position="left" @submit.native.prevent>
 				<component v-for="(property, key) in process.meta.props"
 				           :is="getEditor(property)"
 				           v-model="process.data.props[key]"

--- a/src/views/Editor/dialogs/ProjectDetailsDialog.vue
+++ b/src/views/Editor/dialogs/ProjectDetailsDialog.vue
@@ -5,7 +5,8 @@
 	           :show-close="false"
 	>
 		<div class="project-details-dialog">
-			<el-form @submit.native.prevent ref="form" :model="options" size="mini" label-position="right" label-width="150px">
+			<el-form @submit.native.prevent ref="form" :model="options" size="mini" label-position="right"
+			         label-width="150px">
 				<el-form-item prop="pageTitle" :label="$t('Page title')">
 					<el-input v-model="options.pageTitle"/>
 				</el-form-item>
@@ -61,7 +62,7 @@
 </template>

 <script>
-	import {mapState, mapGetters} from 'vuex';
+	import {mapState, mapGetters, mapMutations} from 'vuex';
 	import {RENDERER_TYPES, SCALE_MODES} from "../../../utils";

 	export default {
@@ -91,10 +92,14 @@
 			},
 			onConfirm() {
 				this.visible = false;
+				this.modifyProject();
 			},
 			onOpen() {

 			},
+			...mapMutations([
+				'modifyProject',
+			]),
 		}
 	}
 </script>