放假前提交一波

6bf68338 · rockyl · aa38e101 · 6bf68338 · 6bf68338 · 6bf68338
Commit 6bf68338 authored Jun 24, 2020 by rockyl
5 changed files
--- a/public/index.html
+++ b/public/index.html
@@ -8,8 +8,8 @@
 	<title>烽火台</title>

 	<script src="//yun.duiba.com.cn/js-libs/psd.js/3.2.0/psd.min.js"></script>
-<!--	<script src="http://0.0.0.0:4002/debug/engine.js"></script>-->
-	<script src="//yun.duiba.com.cn/editor/zeroing/libs/engine.cfb1f45ea0206b8e50e55213f624e81d67432f81.js"></script>
+	<!--<script src="http://0.0.0.0:4002/debug/engine.js"></script>-->
+	<script src="//yun.duiba.com.cn/editor/zeroing/libs/engine.da36f120e2f6937ed9812bb9538770e4505478d9.js"></script>
 	<script src="//yun.duiba.com.cn/editor/zeroing/libs/svga.469e6ae1d98c9017953cf9375559c2575b293b59.js"></script>
 </head>
 <body>

--- a/src/components/inputs/NumberInput.vue
+++ b/src/components/inputs/NumberInput.vue
@@ -68,7 +68,7 @@
 					} else {
 						this.isPercent = typeof v === 'string';
 						if (typeof v === 'string') {
-							v = parseInt(v);
+							v = parseFloat(v);
 						}
 						this.editValue = v;
 					}
@@ -85,7 +85,7 @@
 							value = v + '%';
 						}
 					} else {
-						value = parseInt(v);
+						value = parseFloat(v);
 					}
 					this.$emit('input', value, this.container, this.propertyName, this.value);
 				//}

--- a/src/store/modules/project.js
+++ b/src/store/modules/project.js
@@ -938,7 +938,7 @@ export const projectStore = {
 			if (action === 1 || action === 2) { //普通视图
 				result = await zipViewFile(file);
 			} else {  //psd
-				result = await toZeroing(file, {mode});
+				result = await toZeroing(file, {mode, singleView: action === 3});
 			}
 			let viewFile = new File([result], 'view.json');
 			await dispatch('uploadView', {originFile: file, viewFile, action})

--- a/src/views/Editor/Inspector/PropsTab.vue
+++ b/src/views/Editor/Inspector/PropsTab.vue
@@ -29,6 +29,7 @@
 					</el-collapse-item>
 					<el-collapse-item :title="$t('Function cmd') + `(${customCmdKeys.length})`" name="cmd">
 						<el-form-item v-for="key in customCmdKeys" :label="customCmdNames[key]" :key="key" label-width="50px">
+							<el-input class="cmd-input" v-model="activeComponent.properties[key]" @change="makeProjectDirty"/>
 							<el-popconfirm :title="$t('Are you sure to delete this cmd?')" @onConfirm="deleteCmd(key)">
 								<el-button slot="reference" plain icon="el-icon-delete"/>
 							</el-popconfirm>
@@ -85,8 +86,8 @@
 		computed: {
 			...mapGetters(['activeComponent', 'activeComponentCopy', 'componentList']),
 			propsMeta() {
-				
-				this.resetScrollType(this.activeComponent) 
+
+				this.resetScrollType(this.activeComponent)
 				console.log(this.activeComponent.type)
 				return getCmpProps(this.activeComponent.type);
 			},
@@ -140,7 +141,7 @@
 				let _prop = {};
 				_prop[propName] = value;
 				this.$store.dispatch('modifyProperties', _prop);
-				
+
 				let _keyv=JSON.parse(`{"${propName}":null}`)
 				_keyv[propName]=value
 				console.log({props:_keyv})
@@ -165,4 +166,4 @@

 <style lang="scss">

-</style>
\ No newline at end of file
+</style>
--- a/src/views/Editor/components/RuntimeLayer.vue
+++ b/src/views/Editor/components/RuntimeLayer.vue
@@ -52,7 +52,8 @@
 						entrySceneView: 'entry',
 						editorMode: true,
 						assetResolver: this.assetResolver,
-						frameRate: 30,
+						frameRate: 15,
+						rendererType: 'canvas',
 					},
 				}, null, () => {
 					this.onLaunched();