Merge remote-tracking branch 'origin/dev/otherHis' into dev/new1

# Conflicts:
#	src/components/NumberDrop/index.jsx

src/components/MultSpread/index.less

@@ -7,6 +7,9 @@
 }
 .selected{
   .selected-tag;
+  span{           //ie8子标签灰显bug
+    color: @text-color;
+  }
   position: relative;
   padding: 0;
   &:before{

src/components/OtherHistory/index.jsx

@@ -20,7 +20,6 @@ class OtherHistory extends Component{
     this.handleClick = this.handleClick.bind(this);
     this.handleSearchSelect = this.handleSearchSelect.bind(this);
     this.getData = this.getData.bind(this);
-    this.handleInput = this.handleInput.bind(this);
   }
   toggleEditable(){
     this.setState({
@@ -40,12 +39,12 @@ class OtherHistory extends Component{
     });
     return list;
   }
-  handleInput(e){     //主诉未填无法输入
+  /*handleInput(e){   console.log(221)  //主诉未填无法输入
     const {type,hasMain} = this.props;
     if(+type===0&&!hasMain){
       e.target.innerText='';
     }
-  }
+  }*/
   getData(){
     //第一次聚焦其他史时，主诉有数据则获取最近一次其他史记录（没有的话显示初始模板），主诉无数据则显示提示；其他时间其他史模板数据不调接口
     const {hasMain,type,setInitData,data,saveText,changeEditClear} = this.props;
@@ -111,7 +110,7 @@ class OtherHistory extends Component{
                        hasMain={hasMain}/>;
     }
     return  <div>
-      <ItemBox title='其他史' editable={hasData?false:true} isRead={isRead} handleClick={this.handleClick} handleFocus={this.getData} onchange={this.handleInput}>
+      <ItemBox title='其他史' editable={hasData?false:true} isRead={isRead} handleClick={this.handleClick} handleFocus={this.getData}>
         {this.getLabels()}
         {searchData && searchData.length>0?<SearchDrop data={searchData} show={!totalHide} left={boxLeft} top={boxTop} onSelect={this.handleSearchSelect}></SearchDrop>:''}
       </ItemBox>

src/components/RadioDrop/index.jsx

@@ -29,6 +29,7 @@ class RadioDrop extends Component{
       tmpTop:0,
     };
     this.$cont = React.createRef();
+    this.isIE = navigator.appName=="Microsoft Internet Explorer" && navigator.appVersion.split(";")[1].replace(/[ ]/g,"")=="MSIE8.0";
     this.handleSelect = this.handleSelect.bind(this);
     this.handleShow = this.handleShow.bind(this);
     this.handledbClick = this.handledbClick.bind(this);
@@ -119,7 +120,9 @@ class RadioDrop extends Component{
    // 更改标签的value值
     const ev = e || window.event;
     let changeVal = ev.target.innerText;
-    ev.target.innerText = '';
+    if(!this.isIE){
+      ev.target.innerText = '';
+    }
     handleLabelEdit && handleLabelEdit({ikey,changeVal,type:boxMark});
   }
   handledbClick(e){

src/containers/CheckBody.js

@@ -4,10 +4,11 @@ import {getModule,getInitData} from '@store/async-actions/fetchModules.js';
 import {HIDE,RESET,SETDROPSHOW,ISREAD} from '@store/types/homePage.js';
 import {SELECTSEARCHDATA} from "@store/types/checkBody";
 import {billing} from '@store/async-actions/pushMessage';
+import {filterDataArr} from '@utils/tools.js';
 
 function mapStateToProps(state){ 
   const {homePage,mainSuit,checkBody} = state;
-  const hasMain = mainSuit.saveText.join('');//||mainSuit.data.length;
+  const hasMain = filterDataArr(mainSuit.saveText);//||mainSuit.data.length;
   return {
     data:checkBody.data,
     isEmpty:checkBody.isEmpty,

src/containers/OtherHistory.js

@@ -6,11 +6,11 @@ import {HIDE,RESET,ISREAD} from '@store/types/homePage.js';
 import {getModule} from '@store/async-actions/fetchModules.js';
 import {billing} from '@store/async-actions/pushMessage';
 import {fullfillText} from '@common/js/func';
-import {didPushParamChange} from '@utils/tools.js';
+import {didPushParamChange,filterDataArr} from '@utils/tools.js';
 
 function mapStateToProps(state){
   const {otherHistory,homePage,typeConfig,mainSuit} = state;
-  const hasMain = mainSuit.saveText.join('');//||mainSuit.data.length;
+  const hasMain = filterDataArr(mainSuit.saveText);//||mainSuit.data.length;
   return {
     data: otherHistory.data,
     //initData:state.homePage.initData.otherHis,