冲突

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

@@ -114,7 +114,7 @@ class MaskContent extends Component {
       <div className="mask-content">
         <AmosWebSocket ref={node => this.aws = node} url={wsURL} onMessage={this.handleData} reconnect debug />
         { !alarmStarted && sideControlShow && <SideControl multiple={multiple} errorAreaId={errorAreaId} onItemClick={onItemClick} layerConfig={layerConfig} animationProps={controlAnimation} activeAction={activeAction}/>}
-        { !alarmStarted && isShowActionBar && <SearchPane visible={searchPaneVisible} focusPosition={focusPosition} changeSearchPaneVisible={() => this.changeSearchPaneVisible} />}
+        { !alarmStarted && isShowActionBar && <SearchPane visible={searchPaneVisible} focusPosition={focusPosition} changeSearchPaneVisible={this.changeSearchPaneVisible} />}
         <TopMsg alarmStart={alarmStart} />
         { !alarmStarted && !isShowActionBar && <ModelHeader animationProps={controlAnimation} headerName={headerName} handleExceptModel={this.handleExceptModel} />}
         { !alarmStarted && isShowActionBar && <ActionBar activeAction={activeAction} onActionItemClick={(e) => this.actionBarClick(e)} animationProps={controlAnimation} /> }

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

@@ -61,9 +61,9 @@ class AreaLeftTree extends Component {
     });
   }
 
-  onSearchChange = e => {
+  onSearchChange = (e,v) => {
     const { treeDataList, treeData } = this.state;
-    const value = e.target.value;
+    let value = v ? v : '';
     const expandedKeys = treeDataList
       .map(item => {
         if (item.title.indexOf(value) > -1) {

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

@@ -66,8 +66,9 @@ class PointLeftTree extends Component {
     this.setState({ pointType: value });
     this.props.pointTypeChange(value);
   }
-  onSearchChange = (e,value) => {
+  onSearchChange = (e,v) => {
     const { treeDataList,treeData } = this.state;
+    let value = v ? v : '';
     const expandedKeys = treeDataList
      .map(item => {
        if (item.title.indexOf(value) > -1) {