Skip to content

Z
zeroing-editor
Commit 43ac21cb authored by 张晨辰's avatar 张晨辰
Browse files
Options

Merge branch 'dev' into feature/20190923-feature

parents 5d30bd2e 837757e1
Hide whitespace changes
Inline Side-by-side
Showing with 70 additions and 30 deletions
src/config.js
View file @ 43ac21cb
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
* Created by rockyl on 2019-09-19. * 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 API_HOST = 'http://localhost:3002';
export const UPLOAD_FILE_URL = API_HOST + '/api/uploadFile'; export const UPLOAD_FILE_URL = API_HOST + '/api/uploadFile';
......
src/store/modules/project.js
View file @ 43ac21cb
...@@ -61,8 +61,6 @@ export const projectStore = { ...@@ -61,8 +61,6 @@ export const projectStore = {
if (data) { if (data) {
const {views, assets, dataMapping, processes, options,} = JSON.parse(data); const {views, assets, dataMapping, processes, options,} = JSON.parse(data);
console.log(processes);
Vue.set(localData, 'options', options || getDefaultOptions()); Vue.set(localData, 'options', options || getDefaultOptions());
Vue.set(localData, 'views', views || []); Vue.set(localData, 'views', views || []);
Vue.set(localData, 'assets', assets || []); Vue.set(localData, 'assets', assets || []);
......
src/template.js
View file @ 43ac21cb
...@@ -3,7 +3,11 @@ ...@@ -3,7 +3,11 @@
*/ */
export const template = export const template =
` <meta charset="UTF-8"> `<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>$PAGE_TITLE$</title> <title>$PAGE_TITLE$</title>
<meta name="viewport" <meta name="viewport"
content="width=device-width,initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no"/> content="width=device-width,initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no"/>
...@@ -13,25 +17,27 @@ content="width=device-width,initial-scale=1, minimum-scale=1, maximum-scale=1, u ...@@ -13,25 +17,27 @@ content="width=device-width,initial-scale=1, minimum-scale=1, maximum-scale=1, u
<meta name="x5-fullscreen" content="true"/> <meta name="x5-fullscreen" content="true"/>
<meta name="360-fullscreen" content="true"/> <meta name="360-fullscreen" content="true"/>
<style> <style>
html, html,
body { body {
padding: 0; padding: 0;
margin: 0; margin: 0;
border: 0; border: 0;
width: 100%; width: 100%;
height: 100%; height: 100%;
overflow: hidden; overflow: hidden;
position: absolute; position: absolute;
background-color: white; background-color: white;
} }
</style> </style>
</head> </head>
<body> <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 src="http://10.10.94.134:4002/dist/index.js"></script>
<script> <script>
engine.launch('http://10.10.94.134:4002/examples/mock/test.json'); engine.launch('//yun.duiba.com.cn/aurora/$VERSION$-data.json');
</script> </script>
</body>
</html>
`; `;
src/utils/events.js
View file @ 43ac21cb
export default ['init', 'awake', 'sleep', 'dataevent', 'click', 'touchstart', 'touchend', 'touchmove'] export default ['init', 'awake', 'sleep', 'datacenter', 'click', 'touchstart', 'touchend', 'touchmove']
\ No newline at end of file \ No newline at end of file
src/utils/properties.js
View file @ 43ac21cb
...@@ -55,6 +55,16 @@ export default { ...@@ -55,6 +55,16 @@ export default {
}, },
value: 0 value: 0
}, },
anchorX: {
title: '锚点X',
type: 'inputNumber',
value: 0
},
anchorY: {
title: '锚点Y',
type: 'inputNumber',
value: 0
},
scaleX: { scaleX: {
title: 'X轴缩放', title: 'X轴缩放',
type: 'inputNumber', type: 'inputNumber',
...@@ -81,6 +91,22 @@ export default { ...@@ -81,6 +91,22 @@ export default {
step: 0.1 step: 0.1
} }
}, },
mouseEnabled: {
title: '可否交互',
type: 'switch',
props: {
width: 40
},
value: true
},
mouseChildren: {
title: '子集交互',
type: 'switch',
props: {
width: 40
},
value: true
},
visible: { visible: {
title: '是否可见', title: '是否可见',
type: 'switch', type: 'switch',
......
src/views/Editor/Inspector/BehaviorTab.vue
View file @ 43ac21cb
<template> <template>
<div class="zero-inspector-behavior-form" v-if="activeComponent.uuid"> <div class="zero-inspector-behavior-form" v-if="activeComponent.uuid">
<el-scrollbar class="scrollbar" wrap-class="wrap-x-hidden"> <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"> <div v-for="(evn, key) in eventsObj" :key="key">
<el-form-item :label="$t('Event') + ':'"> <el-form-item :label="$t('Event') + ':'">
<div>{{key}}</div> <div>{{key}}</div>
......
src/views/Editor/Inspector/PropsTab.vue
View file @ 43ac21cb
<template> <template>
<div class="zero-inspector-props-form" v-if="activeComponent.uuid"> <div class="zero-inspector-props-form" v-if="activeComponent.uuid">
<el-scrollbar class="scrollbar" wrap-class="wrap-x-hidden"> <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 v-model="configColl">
<el-collapse-item title="配置" name="properties"> <el-collapse-item title="配置" name="properties">
<el-form-item label="名称"> <el-form-item label="名称">
......
src/views/Editor/Inspector/ScriptsTab.vue
View file @ 43ac21cb
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="zero-inspector-script-form" v-if="activeComponent.uuid"> <div class="zero-inspector-script-form" v-if="activeComponent.uuid">
<el-collapse v-model="configColl"> <el-collapse v-model="configColl">
<el-collapse-item title="配置" name="properties"> <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-form-item label="名称">
<el-input v-model="form.name" @input="v => handleChange('name', v)"></el-input> <el-input v-model="form.name" @input="v => handleChange('name', v)"></el-input>
</el-form-item> </el-form-item>
......
src/views/Editor/behavior-editor/Board.vue
View file @ 43ac21cb
...@@ -285,7 +285,7 @@ ...@@ -285,7 +285,7 @@
if (key.startsWith('pn_')) { if (key.startsWith('pn_')) {
const processNode = this.$refs[key][0]; const processNode = this.$refs[key][0];
if (processNode.meta.id === metaID) { if (processNode && processNode.meta.id === metaID) {
this.onProcessMetaModified(processNode.data, processNode.meta); this.onProcessMetaModified(processNode.data, processNode.meta);
processNode.updateSize(); processNode.updateSize();
processNode.updateDockPointPos(); processNode.updateDockPointPos();
......
src/views/Editor/behavior-editor/MetaEditorDialog.vue
View file @ 43ac21cb
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
:close-on-click-modal="false" :close-on-click-modal="false"
:append-to-body="true"> :append-to-body="true">
<div class="meta-editor-wrapper"> <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> <template>
<el-form-item prop="id" label="ID"> <el-form-item prop="id" label="ID">
<el-input v-model="meta.id" :placeholder="$t('ID')" :readonly="!editable"/> <el-input v-model="meta.id" :placeholder="$t('ID')" :readonly="!editable"/>
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
</div> </div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<div class="button-bar"> <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="cancel">Cancel</el-button>
<el-button size="mini" plain @click="save">Save</el-button> <el-button size="mini" plain @click="save">Save</el-button>
</div> </div>
...@@ -101,7 +102,10 @@ ...@@ -101,7 +102,10 @@
}, },
cancel() { cancel() {
this.visible = false; this.visible = false;
} },
printMeta() {
console.log(JSON.stringify(this.meta));
},
} }
} }
</script> </script>
......
src/views/Editor/behavior-editor/PropertiesEditor.vue
View file @ 43ac21cb
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
</el-input> </el-input>
<el-scrollbar class="scrollbar" wrap-class="wrap-x-hidden" <el-scrollbar class="scrollbar" wrap-class="wrap-x-hidden"
view-class="scrollbar-view"> 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" <component v-for="(property, key) in process.meta.props"
:is="getEditor(property)" :is="getEditor(property)"
v-model="process.data.props[key]" v-model="process.data.props[key]"
......
src/views/Editor/dialogs/ProjectDetailsDialog.vue
View file @ 43ac21cb
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
:show-close="false" :show-close="false"
> >
<div class="project-details-dialog"> <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-form-item prop="pageTitle" :label="$t('Page title')">
<el-input v-model="options.pageTitle"/> <el-input v-model="options.pageTitle"/>
</el-form-item> </el-form-item>
...@@ -61,7 +62,7 @@ ...@@ -61,7 +62,7 @@
</template> </template>
<script> <script>
import {mapState, mapGetters} from 'vuex'; import {mapState, mapGetters, mapMutations} from 'vuex';
import {RENDERER_TYPES, SCALE_MODES} from "../../../utils"; import {RENDERER_TYPES, SCALE_MODES} from "../../../utils";
export default { export default {
...@@ -91,10 +92,14 @@ ...@@ -91,10 +92,14 @@
}, },
onConfirm() { onConfirm() {
this.visible = false; this.visible = false;
this.modifyProject();
}, },
onOpen() { onOpen() {
}, },
...mapMutations([
'modifyProject',
]),
} }
} }
</script> </script>
......
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