Merge remote-tracking branch 'origin/master'

# Conflicts:
#	server/test/SS-t-P1d6CwREny2/attach/sceneStore

src/graphic/History/History.js

@@ -623,8 +623,10 @@ export default class History {
       } else if (item.handle == HistoryEvents.DeleteCurveRoadEdge) {
         dataService.deleteCurveRoadEdge(item.curveRoadEdge.id);
       } else if (item.handle == HistoryEvents.ModifyCurveRoadEdge) {
-        const currentRoadEdge = item.curRoadEdge;
-        let preRoadEdge = dataService.getCurveRoadEdge(item.curRoadEdge.id);
+        const currentRoadEdge = item.curCurveRoadEdge;
+        let preRoadEdge = dataService.getCurveRoadEdge(
+          item.curCurveRoadEdge.id
+        );
         historyUtil.assignCurveRoadEdgeFromCurveRoadEdge(
           preRoadEdge,
           currentRoadEdge

src/graphic/History/HistoryUtil.js

@@ -718,6 +718,7 @@ export default class HistoryUtil {
     mathUtil.clonePoint(curveRoadEdge.start, curveRoadEdgeInfo.start);
     mathUtil.clonePoint(curveRoadEdge.end, curveRoadEdgeInfo.end);
     mathUtil.clonePoints(curveRoadEdge.points, curveRoadEdgeInfo.points);
+    curveRoadEdge.curves = JSON.parse(JSON.stringify(curveRoadEdgeInfo.curves));
     curveRoadEdge.name = curveRoadEdgeInfo.name;
   }