Merge branch 'feature/20190923-feature' into dev

src/utils/common.js

@@ -268,6 +268,7 @@ export const styles = {
 			cmpSelfProps.height *= cmpSelfProps.scaleY;
 		}
 
+		// 获取拖拽组件的样式，只生成operatProps中的属性
 		if (onlyOpera) {
 			_.forIn(cmpSelfProps, (val, key) => {
 				if (operatProps.indexOf(key) === -1) {
@@ -276,6 +277,12 @@ export const styles = {
 			});
 		}
 
+		if (component.type === 'label') {
+			// 如果是label类型，把fillColor转换为color
+			cmpSelfProps.color = cmpSelfProps.fillColor;
+			delete cmpSelfProps.fillColor;
+		}
+
 		// console.log('cmpSelfProps after inherit ', cmpSelfProps);
 		cmpSelfProps = styles.getStylesFromObj(cmpSelfProps, project);
 		_.forIn(cmpSelfProps, (value, key) => {

src/utils/properties.js

@@ -134,7 +134,7 @@ export default {
       type: 'input',
       value: ''
     },
-    color: {
+    fillColor: {
       title: '颜色',
       type: 'colorPicker',
       value: '#000'