Merge remote-tracking branch 'origin/dev' into dev

src/config.js

@@ -2,8 +2,8 @@
  * Created by rockyl on 2019-09-19.
  */
 
-//export const API_HOST = 'http://10.10.95.74:7777';
-export const API_HOST = 'http://localhost:3002';
+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';
 export const PARSE_BUNDLE_URL = API_HOST + '/api/parsePSD';

src/utils/common.js

@@ -60,7 +60,7 @@ const attrShortMapper = {
 
 // 编辑时想拖拽组件需要生成的css属性
 // 只需要位置，不需要来源透明度等等
-const operatProps = ['x', 'y', 'width', 'height', 'rotation'];
+const operatProps = ['x', 'y', 'left', 'top', 'width', 'height', 'rotation'];
 
 // 属性单位 对照表, 如果是数值的时候需要添加单位
 const attrUnitMapper = {
@@ -93,7 +93,7 @@ function getParentCmps(uuid, list) {
 	return _self.parent ? parentLoop(_self.parent, list) : [];
 }
 
-export {getParentCmps, completeSelfProps};
+export { getParentCmps, completeSelfProps };
 
 export const getCmpByUUID = function (uuid, views) {
 	if (!uuid) {

src/utils/properties.js

@@ -111,23 +111,23 @@ export default {
     textAlign: {
       title: '文本对齐',
       type: 'select',
-      props: [
+      options: [
         { label: '靠左', value: 'left' },
         { label: '居中', value: 'center' },
         { label: '靠右', value: 'right' }
       ],
       value: 'left'
     },
-    /*verticalAlign: {
+    verticalAlign: {
       title: '纵向对齐',
       type: 'select',
-      props: [
-        { label: '靠上', value: 'up' },
+      options: [
+        { label: '靠上', value: 'top' },
         { label: '居中', value: 'middle' },
-        { label: '靠下', value: 'down' }
+        { label: '靠下', value: 'bottom' }
       ],
-      value: 'up'
-    },*/
+      value: 'top'
+    },
   },
   image: {
     groupName: '来源',
@@ -156,6 +156,14 @@ export default {
       props: {
         min: 0
       }
+    },
+    borderRadius: {
+      title: '圆角',
+      type: 'inputNumber',
+      value: 0,
+      props: {
+        min: 0
+      }
     }
   },
   circle: {