Merge branch 'master' into lcq

src/common/components/Textarea/index.jsx

@@ -73,7 +73,7 @@ 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.replace(/&nbsp;+/g,' ').replace(/<br>$/,'');
+    const text = e.target.innerHTML.replace(/&nbsp;+/g,' ').replace(/<br>$/,'');
     const stimer = this.state.timer;//console.log(e.target,text)
     if(!editable){
       e.target.innerText='';