Merge remote-tracking branch 'origin/groupTypeStyle' into testedMerge

src/components/Operation/Search/index.jsx

@@ -29,7 +29,7 @@ class SearchList extends React.Component {
       const {windowHeight,pageTop,height,refreshScroller} = this.props;
     }
     handleClearVal(){
-        const { handleChangeValue,handleChangeIpt } = this.props;
+        const { handleChangeValue,handleChangeIpt,handleClearValue } = this.props;
         this.textInput.current.value = '';
         this.textInput.current.focus();
         this.setState({
@@ -38,6 +38,7 @@ class SearchList extends React.Component {
         });
         handleChangeIpt('');
         handleChangeValue('');
+        handleClearValue&&handleClearValue()
     }
     handleInput(e){
       const { handleChangeValue,handleChangeIpt } = this.props;

src/components/Operation/index.jsx

@@ -60,6 +60,7 @@ class Operation extends Component {
     this.changeTitle = this.changeTitle.bind(this);
     this.closeDiagBox = this.closeDiagBox.bind(this);
     this.spellFst = this.spellFst.bind(this);
+    this.hideFolderList = this.hideFolderList.bind(this)
     this.$inp = React.createRef()
   }
 
@@ -221,7 +222,7 @@ class Operation extends Component {
     }
   }
   changeTitle() {
-    return <div className={style['box']}>
+    return <div className={style['box']} onClick={()=>{this.props.handleClearValue(); this.hideFolderList()}}>
       <div className={style['iptWrap']}>
         <div className={style.name}>
           <span className={style.leftName}>模板名称：</span>
@@ -393,6 +394,11 @@ class Operation extends Component {
       folderListShow:false
     })
   }
+  hideFolderList(){
+    this.setState({
+      folderListShow:false
+    })
+  }
   componentWillReceiveProps(next){//监听滚动事件
     const that = this;
     if(next.winWidth <= 1024){
@@ -456,10 +462,10 @@ class Operation extends Component {
       >
         {this.state.msg}
         {
-          admin&&type==3?<div className={style.addList}>
-            <div className={style.department}>
+          admin&&type==3?<div className={style.addList} onClick={()=>{this.props.handleClearValue()}}>
+            <div className={style.department} onClick={()=>{this.hideFolderList()}}>
               <span className={style.leftName}>科室归属：</span>
-                <Search handleChangeValue={handleChangeValue} handleChangeIpt={handleChangeIpt} value={value} visible={true} zIndex={11}>
+                <Search handleChangeValue={handleChangeValue} handleChangeIpt={handleChangeIpt} handleClearValue={this.props.handleClearValue}  value={value} visible={true} zIndex={11}>
                 {
                   departLis.length>0&&value&&<ul className={style.departLis}>
                     {

src/components/PushContainer/index.jsx

@@ -92,6 +92,7 @@ class PushContainer extends Component {
     this.setDeptId = this.setDeptId.bind(this);
     this.handleClearValue = this.handleClearValue.bind(this);
     this.clearReset = this.clearReset.bind(this);
+    this.hideFolderList = this.hideFolderList.bind(this);
   }
   componentDidMount() {
     // const height = getWindowInnerHeight()-160;
@@ -228,7 +229,7 @@ class PushContainer extends Component {
     
   }
   changeTitle() {//模板名称修改
-    return <div className={style['box']}>
+    return <div className={style['box']} onClick={()=>{this.handleClearValue();this.hideFolderList()}}>
         <div className={style['iptWrap']}>
           <div className={style.name}>
             <span className={style.leftName}>模板名称：</span>
@@ -573,6 +574,11 @@ class PushContainer extends Component {
       value:name
     })
   }
+  hideFolderList(){
+    this.setState({
+      folderListShow:false
+    })
+  }
   handleClearValue () {
     store.dispatch(getDptLis([]))
   }
@@ -640,8 +646,8 @@ class PushContainer extends Component {
       >
         {message}
         {
-          admin&&type==3?<div>
-            <div  className={style.iptWrap}>
+          admin&&type==3?<div onClick={()=>{this.handleClearValue()}}>
+            <div  className={style.iptWrap} onClick={()=>{this.hideFolderList()}}>
               <div className={style.male}>
                 <span className={style.leftName}>性别归属：</span>
                 <span className={style['commonSex']} id="commonSex" onClick={this.changeRadio.bind(this,1)}><img src={check_right} alt=""/><i style={{color:'#000'}}>通用</i></span>
@@ -650,7 +656,7 @@ class PushContainer extends Component {
                 <span style={{paddingRight:0,color:'#777777'}}>(注：错误引用，显示可能有误)</span>
               </div>
             </div>
-            <div className={style.department}>
+            <div className={style.department}  onClick={()=>{this.hideFolderList()}}>
               <span className={style.leftName}>科室归属：</span>
                 <Search handleChangeValue={handleChangeValue} handleChangeIpt={handleChangeIpt} value={value} visible={true} zIndex={11}>
                 {