Merge branch 'master' of http://192.168.0.115:3000/bill/traffic-laser

# Conflicts:
#	src/graphic/History/History.js

src/graphic/History/History.js

@@ -224,7 +224,7 @@ export default class History {
         const preCircle = item.circle;
         let newCircle = circleService.create(
           preCircle.center,
-          preCircle.radiusX,
+          preCircle.radius || preCircle.radiusX,
           preCircle.id
         );
 
@@ -572,7 +572,7 @@ export default class History {
         const preCircle = item.circle;
         let newCircle = circleService.create(
           preCircle.center,
-          preCircle.radiusX,
+          preCircle.radius || preCircle.radiusX,
           preCircle.id
         );
         historyUtil.assignCircleFromCircle(newCircle, preCircle);

src/graphic/History/HistoryUtil.js

@@ -844,6 +844,8 @@ export default class HistoryUtil {
     circle.center = circleInfo.center;
     circle.radius = circleInfo.radius;
     circle.color = circleInfo.color;
+    circle.radiusX = circleInfo.radiusX;
+    circle.radiusY = circleInfo.radiusY;
     circle.points = circleInfo.points;
     return circle;
   }

src/graphic/Layer.js

@@ -171,8 +171,10 @@ export default class Layer {
         }
         break;
       case LayerEvents.AddCircle:
+       
         stateService.setEventName(LayerEvents.AddingCircle);
         addCircle.setCenter(position);
+        
         break;
       case LayerEvents.AddText:
         stateService.setEventName(LayerEvents.MoveText);