chongtu

mods/components/3dviewConvertor/view/moduleEditComponent/PointLeftTree.js

 /* eslint-disable react/prop-types */
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-<<<<<<< HEAD
-import { Connect,Tree,Select,Search,Button  } from 'amos-framework';
-=======
 import { Connect, Tree, Select, Search, Button } from 'amos-framework';
 import imgStatic from '../../consts/imgStatic';
 
 const moduleEditIcon = imgStatic.moduleEditIcon;
->>>>>>> 65a1bc65d6a063bb28ef1709a82cec0df2fe3505
 const eventConnect = Connect.eventConnect;
 const TreeNode = Tree.TreeNode;
 const Option = Select.Option;
@@ -48,23 +44,14 @@ class PointLeftTree extends Component {
   }
 
   componentDidMount() {
-<<<<<<< HEAD
-    let { treeData,pointTypeArr,treeDataList } = this.props;
-=======
     let { treeData, pointTypeArr, treeDataList } = this.props;
->>>>>>> 65a1bc65d6a063bb28ef1709a82cec0df2fe3505
     this.setState({
       treeData,
       treeDataList,
       pointTypeArr,
-<<<<<<< HEAD
-      pointType: pointTypeArr[0] ? pointTypeArr[0].code : ''
-    });
-=======
       pointType: pointTypeArr[0]?pointTypeArr[0].code:''
     });
     // console.log(this.props)
->>>>>>> 65a1bc65d6a063bb28ef1709a82cec0df2fe3505
   }
 
   componentWillReceiveProps(nextProps) {
@@ -134,47 +121,6 @@ class PointLeftTree extends Component {
           );
         if (item.children) {
           return (
-<<<<<<< HEAD
-            <TreeNode
-              title={
-                <div>
-                  {item.isRegion ?
-                    <span>
-                      {title}
-                      <span className='icon'>
-                        {
-                      // eslint-disable-next-line jsx-a11y/alt-text
-                      item.isRegion ? item.isBind ? <img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/bindedTip.png' /> :
-                      // eslint-disable-next-line jsx-a11y/alt-text
-                      <img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/nobindTip.png' /> :
-                      // eslint-disable-next-line jsx-a11y/alt-text
-                      item.isBind ? <img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/bindedTip.png' /> :
-                      // eslint-disable-next-line jsx-a11y/alt-text
-                      item.position3d ? <img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/noSaveTip.png' /> :
-                      // eslint-disable-next-line jsx-a11y/alt-text
-                      <img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/nobindTip.png' />
-                    }
-                      </span>
-                    </span> :
-                    <span
-                      draggable
-                      onDragStart={() => {
-                        this.props.dragItemChange(item);
-                      }}
-                    >
-                      {title}
-                      <span className='icon'>
-                        {
-                      item.isRegion ? item.isBind ? <img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/bindedTip.png' /> :
-                      <img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/nobindTip.png' /> :
-                      item.isBind ? <img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/bindedTip.png' /> :
-                      item.position3d ? <img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/noSaveTip.png' /> :
-                      <img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/nobindTip.png' />
-                    }
-                      </span>
-                    </span>}
-                </div>
-=======
           <TreeNode
             title={
               <div>
@@ -209,7 +155,6 @@ class PointLeftTree extends Component {
                     </span>
                 </span>}
               </div>
->>>>>>> 65a1bc65d6a063bb28ef1709a82cec0df2fe3505
             }
               key={item.id}
               dataRef={item}