冲突

mods/components/3dviewConvertor/view/View3D.js

@@ -1038,10 +1038,11 @@ class View3D extends Component {
  */
   changeAreaPoint = (type) => {
     let { pointTypeArr } = this.state;
-    this.setState({treeDataList:[]})
+    this.setState({ treeDataList: [] });
+    this.stagePilot.positionCtl.clearDrag();//清除已有选中
     if (type === 'region') {
       getAreaTreeAction().then(data => {
-        this.generateList(data)
+        this.generateList(data);
         this.setState({
           treeData: data || [],
           pageType: 'region',
@@ -1109,6 +1110,7 @@ class View3D extends Component {
   }
 
   drop = (event) => {
+    this.stagePilot.positionCtl.clearDrag();
     event.preventDefault();
     this.setState({ isPointSave: false });
     let { dragItem,markers } = this.state;
@@ -1149,7 +1151,7 @@ class View3D extends Component {
       let selectPoints = {
         id: dragItem.id,
         type: dragItem.type
-      }
+      };
       markers[`${type}`] = markers[`${type}`].filter(e => e.id != dragItem.id );
       markers[`${type}`].push(addPointParam);
       this.setState({
@@ -1474,6 +1476,7 @@ class View3D extends Component {
         errorAreaId: areaId
       });
     } else if (type === 'out_except_model'){
+      this.stagePilot.positionCtl.clearDrag();
       if (!isPointSave){
         AmosAlert.confirm('提示', '有未保存数据，是否保存?', {
           callback: (flag) => {