Merge branch 'mvvm' into code-diff

src/utils/common.js

@@ -33,10 +33,10 @@ const attrShortMapper = {
 	size: 'font-size',
 	font: 'font-family',
 	alpha: 'opacity',
-	'strokeColor': 'border-color',
-	'strokeWidth': 'border-width',
-	'fillColor': 'background-color',
-	'source': 'background-image'
+	strokeColor: 'border-color',
+	strokeWidth: 'border-width',
+	fillColor: 'background-color',
+	source: 'background-image'
 };
 
 // 编辑时想拖拽组件需要生成的css属性
@@ -277,6 +277,8 @@ export const styles = {
 			// 如果是label类型，把fillColor转换为color
 			cmpSelfProps.color = cmpSelfProps.fillColor;
 			delete cmpSelfProps.fillColor;
+			delete cmpSelfProps.stroke;
+			delete cmpSelfProps.strokeColor;
 			if (cmpSelfProps.italic) {  //斜体
 				delete cmpSelfProps.italic;
 				cmpSelfProps.fontStyle = 'italic';