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

src/common/components/Textarea/index.jsx

@@ -73,8 +73,8 @@ class Textarea extends Component {
   handleInput(e){
     const {handleInput,boxMark,handlePush,value} = this.props;
     const {inpText,overFlag,editable} = this.state;
-    const text = e.target.innerText || e.target.innerHTML;
-    const stimer = this.state.timer;
+    const text = e.target.innerText || e.target.innerHTML.replace(/&nbsp;+/g,' ').replace(/<br>$/,'');
+    const stimer = this.state.timer;//console.log(e.target,text)
     if(!editable){
       e.target.innerText='';
       return ;
@@ -158,7 +158,8 @@ class Textarea extends Component {
   componentWillReceiveProps(next){
     const isRead = this.props.isRead;
     if(next.isRead != isRead||(next.value!=this.props.value&&next.value&&next.value.indexOf("复诊")!=-1)){    //value对比解决复诊不显示bug,复诊对比解决关标跳到前面bug
-      this.$dom.current.innerText?(this.$dom.current.innerText = next.value||''):(this.$dom.current.innerHTML = next.value||'');
+      //this.$dom.current.innerText?(this.$dom.current.innerText = next.value||''):(this.$dom.current.innerHTML = next.value||'');
+      this.$dom.current.innerHTML = next.value||'';   //ff26下不支持innerText，但ref会自动加上innerText属性，所以上面的判断不为空
       this.setState({
         inpText:''
       });
@@ -167,7 +168,8 @@ class Textarea extends Component {
   componentDidMount(){
     const {value} = this.props;
     if(value){
-      this.$dom.current.innerText?(this.$dom.current.innerText = value||''):(this.$dom.current.innerText=value||'');
+      //this.$dom.current.innerText?(this.$dom.current.innerText = value||''):(this.$dom.current.innerText=value||'');
+      this.$dom.current.innerText=value||'';
     }
     if(isIE()){
       $(this.$dom.current).onIe8Input(function(e){

src/components/MainSuit/index.jsx

@@ -138,7 +138,7 @@ class MainSuit extends Component{
 
   handleChange(e){
     const ev = e || window.event;
-    const data = ev.target.innerText || ev.target.innerHTML;
+    const data = ev.target.innerText || ev.target.innerHTML.replace(/ /g,' ');
     const {getSearchData,searchData,datas,pushMessage,reTotalHide,saveText,clearSearch,CommonSymptoms,getCommonSymptoms} = this.props;
     const {overFlag,inpText} = this.state;
     reTotalHide && reTotalHide();//重置homePage中的控制项
@@ -225,7 +225,7 @@ class MainSuit extends Component{
     const {freeText,saveText,datas,clearSearch,getSymptomFeature,currentData,saveChronic} = this.props;
     const that = this;
     let data = this.state.inpText;
-    const inner = e.target.innerText || e.target.innerHTML ;
+    const inner = e.target.innerText || e.target.innerHTML;
     //分词-现病史没有模板的时候才去获取
     if(inner.trim() && currentData&&currentData.length==0){
       getFeature(inner.replace('<br>','')).then((res)=>{

src/components/NumberDrop/index.jsx

@@ -98,7 +98,7 @@ class NumberDrop extends Component{
   }
   handleNumFocus(e){
     const {placeholder} = this.state;
-    const val = this.$span.current.innerText.trim();//console.log(33,e.target.innerText,placeholder,e.target.innerText.trim() == placeholder)
+    const val = this.$span.current.innerText?this.$span.current.innerText.trim():this.$span.current.innerHTML.trim();//console.log(33,e.target.innerText,placeholder,e.target.innerText.trim() == placeholder)
     if(val!=''&&val == placeholder){
       this.setState({
         placeholder:''

src/utils/ajax.js

@@ -15,11 +15,13 @@ axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded
     const securityCode = getUrlArgObject("code");
     const appKeyId = getUrlArgObject("appI");
     const appKeySecret = getUrlArgObject("appS");
+    const productId = getUrlArgObject("productId");
     axios.interceptors.request.use(
         req => {
           req.headers.appKeyId = appKeyId;
           req.headers.appKeySecret = appKeySecret;
           req.headers.securityCode = securityCode;
+          req.headers.productId = productId;
             return req;
         },
         error => {