Merge branch 'iscs' of https://git.code.tencent.com/lian-cbtc/jl-client into iscs

src/iscs_new/core/form/form2Base.js

@@ -38,10 +38,11 @@ export default [
         value: false,
         description: '图形是否不可见，选中时不绘制图形。'
     },
-	{
-		prop: 'position',
+    {
+        prop: 'position',
         label: '位置',
-        type: types.Point,
+        type: types.NumberArray,
+        length:2,
         precision: 0,
         min:0,
         max:20000,
@@ -49,13 +50,14 @@ export default [
         rules:[
             { required: true, message:'请输入位置', trigger: 'blur' }
         ],
-        value: [0,0],
+        value: [0, 0],
         description: '控制图形的位置。'
-	},
-	{
-		prop: 'scale',
+    },
+    {
+        prop: 'scale',
         label: '缩放',
-        type: types.Point,
+        type: types.NumberArray,
+        length:2,
         precision: 0,
         min:0.1,
         max:1,
@@ -63,11 +65,11 @@ export default [
         rules:[
             { required: true, message:'请输入缩放', trigger: 'blur' }
         ],
-        value: [1,1],
+        value: [1, 1],
         description: '控制图形的缩放。'
-	},
-	{
-		prop: 'rotation',
+    },
+    {
+        prop: 'rotation',
         label: '旋转',
         type: types.Number,
         precision: 0,
@@ -79,5 +81,5 @@ export default [
         ],
         value: 0,
         description: '控制图形的旋转。'
-	}
+    }
 ];