1修改缺陷

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

@@ -483,7 +483,7 @@ class View3D extends Component {
 
   onAllDone = objGroup => {
     this.sceneFactory.level.change(objGroup);
-    this.cameraFactory.fitView(desigerHelperConfig.cameraEffect);
+    this.stagePilot.rendererFactory.setupUModelSahdow();//接受阴影
     this.setState({
       startAsyncLoad: true
     });
@@ -493,6 +493,8 @@ class View3D extends Component {
   onAfterWorkerInit = workerObjGroup => {
     // 处理跳跃
     this.lensJumpFactory.process(workerObjGroup);
+    // 子线程模型加上阴影
+    workerObjGroup.toggleShadow(true);
   };
 
   onComplete = obj => {
@@ -1128,7 +1130,8 @@ class View3D extends Component {
         title: dragItem.name,
         label: dragItem.name,
         level: dragItem.level,
-        levelStr: dragItem.levelStr,
+        isEdit: true,
+        levelStr: dragItem.levelStr
       };
       markers[`${type}`].push(addPointParam);
       this.setState({
@@ -1515,22 +1518,29 @@ class View3D extends Component {
     // 非法元素
     return object;
   }
-  addMarker=({extData,position})=>{
-    const {markers} =this.state
-    let paramsArr = [{
-      pointId: extData.id,
-      pointType: extData.type,
-      position3d: `${position[0]},${position[1]},${position[2]}`
-    }];
-    console.log(paramsArr)
-    savePointListAction(paramsArr).then(data => {
-    })
-    this.setState({
-      positionxyz: position,
-      showRightPanel:true,
-      selectPoints:extData
-    })
+
+  addMarker=({ extData, position })=>{
+    const me = this;
+    const { markers } = me;
+    const isInside = me.polygonRegion && extData.parentId && me.polygonRegion[extData.parentId].pointInPolygon([position.x,position.y,position.z]);
+    if (isInside){
+      markers[extData.type].forEach(e => {
+        if (e.id === extData.id){
+          e.position = `${position[0]},${position[1]},${position[2]}`;
+          e.isEdit = true;
+        }
+      });
+      this.setState({
+        markers,
+        positionxyz: position,
+        showRightPanel: true,
+        selectPoints: extData
+      });
+    } else {
+      message.error('不能放置非所在区域');
+    }
   }
+
   render() {
     const {
       objs,