1删除

package.json

@@ -36,10 +36,10 @@
     "amos-gojs": "^2.0.15",
     "amos-icon": "^1.0.3",
     "amos-pluggable": "^1.0.6",
-    "amos-processor": "^1.2.17",
+    "amos-processor": "^2.x",
     "amos-richtext": "^1.0.1",
     "amos-rules-config": "^1.0.4",
-    
+
     "amos-tool": "^1.x",
     "amos-viz": "^1.x",
     "amos-websocket": "^1.0.3",

src/view/3dview/ModuleEdit.js

@@ -21,10 +21,6 @@ import PointsPoolEditPage from './PointsPoolEditPage';
 import { eventTopics, isControllerEvent, isManualOperate } from './consts';
 import { executeView3dCMD, parseManual, parseBubbleMarkers, tirggerPlanTopic, tirggerTransTopic } from './dataProcessor';
 // import PersonCurves from './PersonCurves';
-import AreaLeftTree from './moduleEditComponent/AreaLeftTree';
-import PointLeftTree from './moduleEditComponent/PointLeftTree';
-import RightEditPointPanel from './moduleEditComponent/RightEditPointPanel';
-import RightEditRegionPanel from './moduleEditComponent/RightEditRegionPanel';
 import { EVENTS_CONSTS, dispatchMouseDown } from './../../consts/EventConsts';
 
 const AmosConfig = endConf.AmosConfig;
@@ -106,7 +102,7 @@ class ModuleEdit extends Component {
 
   componentDidMount() {
     // this._registerEvents();
-    
+
 
   }
   genPenId = () => {
@@ -340,7 +336,7 @@ class ModuleEdit extends Component {
               ...pen.userParams,
               points: pen.getFmtPoints()
             },
-            position: pen.position 
+            position: pen.position
           });
           me.a3dRef.changeDrawState(PEN_STATE.FINISHED);
           this.state.routePathData.push({
@@ -498,7 +494,7 @@ class ModuleEdit extends Component {
       showRightPanel: true
     })
   }
-  
+
   getAreas = (treeData) => {
     // let { treeData } = this.state;
     // console.log(treeData)
@@ -507,10 +503,10 @@ class ModuleEdit extends Component {
       treeData.map((item) => {
         if (item.isRegion && item.isBind) {
           if (item.children&&item.children.length > 0) {
-            this.areas.push(<PolygonRegion  points={JSON.parse(item.routePath)} onCreated={this.onRegionCreated}/>) 
+            this.areas.push(<PolygonRegion  points={JSON.parse(item.routePath)} onCreated={this.onRegionCreated}/>)
             {this.getAreas(item.children)}
           }
-          this.areas.push(<PolygonRegion  points={JSON.parse(item.routePath)}  onCreated={this.onRegionCreated}/>) 
+          this.areas.push(<PolygonRegion  points={JSON.parse(item.routePath)}  onCreated={this.onRegionCreated}/>)
         } else {
           if (item.children&&item.children.length > 0) {
             {this.getAreas(item.children)}
@@ -548,7 +544,7 @@ class ModuleEdit extends Component {
     }, eer => {
       message.error('保存失败！');
     });
-  } 
+  }
   //保存点绑定
   savePointData = () => {
     let { markers } = this.state;
@@ -586,7 +582,7 @@ class ModuleEdit extends Component {
 
 
   }
-  
+
 
 /**
  * 切换区域和点页面
@@ -670,7 +666,7 @@ class ModuleEdit extends Component {
         label: dragItem.name,
         level:'1',
         levelStr: 'level_2',
-  
+
       }
       markers.riskSource.push(addPointParam)
       console.log(markers)
@@ -706,7 +702,7 @@ class ModuleEdit extends Component {
       simpleTipVisible: false
     })
   }
-  
+
 
   render() {
     const { fireEquipmentPosition, drawing, objs, markers, pageType, pointType, pointTypeArr, editFlag, showRightPanel, selectPoints, selectArea } = this.state;
@@ -743,9 +739,9 @@ class ModuleEdit extends Component {
 
     return (
       <div className='ModuleEditPage'>
-        <div 
+        <div
           className='designerBox'
-          onDragOver={(e) => {e.preventDefault();}} 
+          onDragOver={(e) => {e.preventDefault();}}
           onDrop={(e)=>this.drop(e)}
         >
           <A3DDesigner
@@ -763,19 +759,19 @@ class ModuleEdit extends Component {
           >
             <PointsPoolEditPage markers={markers} updateMarker={this.updateMarker} stagePilot={this.stagePilot}  />
             {this.renderAreas()}
-          </A3DDesigner> 
+          </A3DDesigner>
         </div>
         <div className="editButton" onClick={() => this.editButtonChange()}>编辑模式</div>
-        { editFlag && 
+        { editFlag &&
           <div>
             {
               pageType == 'region'?
-              <AreaLeftTree 
-                startDrow={this.startDrow} 
-                treeData={this.state.treeData} 
-                saveAreaData={this.saveAreaData} 
-                selectItemChange={this.selectItemChange} 
-                // stopDrowing={this.stopDrowing}  
+              <AreaLeftTree
+                startDrow={this.startDrow}
+                treeData={this.state.treeData}
+                saveAreaData={this.saveAreaData}
+                selectItemChange={this.selectItemChange}
+                // stopDrowing={this.stopDrowing}
                 pageType={pageType}
                 // pointType={pointType}
                 pointTypeArr={pointTypeArr}
@@ -783,10 +779,10 @@ class ModuleEdit extends Component {
                 dragItemChange={this.dragItemChange}
               />:
               <PointLeftTree
-                treeData={this.state.treeData} 
-                savePointData={this.savePointData} 
-                selectPointChange={this.selectPointChange} 
-                // stopDrowing={this.stopDrowing}  
+                treeData={this.state.treeData}
+                savePointData={this.savePointData}
+                selectPointChange={this.selectPointChange}
+                // stopDrowing={this.stopDrowing}
                 pageType={pageType}
                 // pointType={pointType}
                 pointTypeArr={pointTypeArr}
@@ -794,9 +790,9 @@ class ModuleEdit extends Component {
                 dragItemChange={this.dragItemChange}
                 deletePointBind={this.deletePointBind}
               />
-              
+
             }
-              
+
             <div className='topBox'>
               <span className='editTitle'>
                 <span className='titleText'>编辑模式</span>
@@ -827,7 +823,7 @@ class ModuleEdit extends Component {
           content={<div>内容区域...</div>}
         />
       </div>
-      
+
     );
   }
 }