Merge remote-tracking branch 'origin/testedMerge' into version6.0

# Conflicts:
#	src/common/components/Textarea/index.jsx
#	src/utils/config.js

src/components/Operation/index.jsx

@@ -375,9 +375,9 @@ class Operation extends Component {
     const { diagShowTmp } = this.props;
     const { type } = this.state;
     if (type == 3){
-      diagShowTmp(false)
       this.setState({ title: '',deptId:"",value:"",folderListShow:false,folderNameVal:'未分类文件夹',folderId:'',fstName:''})
     }
+    diagShowTmp(false)
   }
   setDeptId(id,name){
     this.props.handleClearValue()

src/components/PushContainer/index.jsx

@@ -111,8 +111,9 @@ class PushContainer extends Component {
    * @param {tab组件切换id} id
    */
   handleActiveClick(id) {
+    store.dispatch(allCheckedShowAdmin(false))
     if (id == '2') {
-      document.getElementById("searchTmp").value = ""
+        document.getElementById("searchTmp").value = ""
       // let searchVal = document.getElementById("searchTmp").value
       store.dispatch(initItemList(1,0));
       store.dispatch(getFloderListAll())
@@ -654,9 +655,9 @@ class PushContainer extends Component {
             <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>
-                <span id="maleSex" onClick={this.changeRadio.bind(this,2)}><img src={check_circle} alt=""/><i>男</i></span>
-                <span id="femaleSex" onClick={this.changeRadio.bind(this,3)}><img src={check_circle} alt=""/><i>女</i></span>
+                <span className={style['commonSex']} id="commonSex" onClick={this.changeRadio.bind(this,1)}><img src={this.state.sex == 3 ? check_right:check_circle } alt=""/><i style={{color:'#000'}}>通用</i></span>
+                <span id="maleSex" onClick={this.changeRadio.bind(this,2)}><img src={this.state.sex == 1 ? check_right:check_circle } alt=""/><i>男</i></span>
+                <span id="femaleSex" onClick={this.changeRadio.bind(this,3)}><img src={this.state.sex == 2 ? check_right:check_circle } alt=""/><i>女</i></span>
                 <span style={{paddingRight:0,color:'#777777'}}>(注：错误引用，显示可能有误)</span>
               </div>
             </div>

src/components/TemplateItems/index.less

@@ -35,8 +35,8 @@
         .check-box {
             height: 14px;
             // width: 18px;
-            margin-top: 10px;
-            padding-right: 10px;
+            margin: 10px 10px 0 0;
+            // padding-right: 10px;
             box-sizing: content-box;
             float: left;
         }