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

src/common/components/Textarea/index.jsx

@@ -49,7 +49,7 @@ class Textarea extends Component {
 
   }
   handleInput(e){
-    const {handleInput,boxMark,handlePush} = this.props;
+    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;

src/store/actions/typeConfig.js

@@ -19,6 +19,5 @@ export const confirmType=(state,action)=>{
 export const setReadMode=(state,action)=>{
   const res=Object.assign({},state);
   res.readMode = action.readMode;
-  res.typeConfig = action.typeConfig;
   return res;
 };

src/utils/tools.js

@@ -240,7 +240,7 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
       const block = Object.assign(JSON.parse(config.textLabel),{full:true});//空白时保留一个自由文本标签
       //清除已删除标签记录
       localStorage.removeItem('deletedTags');
-      store.dispatch({type: SET_READ_MODE, readMode: -1,typeConfig:whichSign});      //清除回读模式值
+      store.dispatch({type: SET_READ_MODE, readMode: -1});      //清除回读模式值
       store.dispatch({type: CLEAR_MAIN_SUIT,data:[],saveText:[],selecteds:[],editClear:true,mainIds:[],mainTailIds:[],clearAction:true,symptomFeature:[],chronicDesease:null,mainReadSonM:[]});
         store.dispatch({type: CLEAR_CURRENT_ILL,data:[],saveText:[],selecteds:[],editClear:true,symptomIds:[],currReadSonM:[]});
         store.dispatch({type: CLEAROTHERHISTORY,data:[block],isEmpty:true,saveText:[],selecteds:[],editClear:true,yjs_1:'',yjs_2:'',yjs_3:'',yjs_4:''});
@@ -290,7 +290,7 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
        // Notify.success('页面已清空')
     }else{
         //回读/引用设置回读模式值（主诉-其他史使用）
-        store.dispatch({type: SET_READ_MODE, readMode: whichSign,typeConfig:whichSign});
+        store.dispatch({type: SET_READ_MODE, readMode: whichSign});
         if (whichSign == 0) {
           let dataJson = JSON.parse(reData.dataJson);
           //其他史data