Merge remote-tracking branch 'origin/dev5.3.1' into dev/new1

src/common/components/Textarea/index.less

@@ -23,8 +23,7 @@
     padding:5px;
     outline: none;
     border-bottom:1px @part-border-color dashed;
-    word-break: break-all;
-    word-wrap:break-word;
+    margin-right: 470px;
     textarea{
       width: 100%;
     }

src/components/CurrentIll/index.jsx

@@ -115,11 +115,14 @@ class CurrentIll extends Component{
     } 
   }
   componentWillReceiveProps(nextProps){
-    const contHeightDiff =  nextProps.data&&this.props.data&&nextProps.data.length!==this.props.data.length;
+    /*const contHeightDiff =  nextProps.data&&this.props.data&&nextProps.data.length!==this.props.data.length;
     const dataDiff = !!nextProps.data!==!!this.props.data;
-    if(contHeightDiff||dataDiff){
-      this.context.scrollArea.refresh();
+    if(contHeightDiff||dataDiff){*/     //走慢病否，现病史消失滚动才出现bug修改
+    if(this.props.data&&this.props.data.length>0){
+      return ;
     }
+      this.context.scrollArea.refresh();
+    //}
   }
   render(){
     const {hasMain,readMode,fuzhen,isChronic,type,fetchPushInfos,handleInput,isRead,saveText,searchData,totalHide,editClear,data} = this.props;

src/components/EMRContainer/index.jsx

@@ -25,13 +25,13 @@ class EMRContainer extends Component {
         const height = getWindowInnerHeight() - 175;
         const width = getWindowInnerWidth() - 20;
         this.$cont.current.style.height = height+"px";
-        this.$cont.current.style.width = width + "px";
+        this.$cont.current.style.minWidth = width + "px";
         windowEventHandler('resize', ()=>{
           const height = getWindowInnerHeight() - 175;
           const width = getWindowInnerWidth() - 20;
           if(this.$cont.current){
             this.$cont.current.style.height = height + "px";
-            this.$cont.current.style.width = width + "px";
+            this.$cont.current.style.minWidth = width + "px";
           }
         });
     }

src/components/Operation/index.less

@@ -1,7 +1,7 @@
 @import "~@less/variables.less";
 .container {
     .contentZIndex2;
-    padding-left: 80px;
+    padding-left: 20px;
     padding-top: 10px;
     position: fixed;
     bottom: 0;
@@ -60,18 +60,20 @@
         float: right;
         margin-right: 20px;
     }
-    .clearButton {
-        border: 1px solid #414141;
-        border-radius: 4px;
-        background-color: #fff;
-        color: #000;
-    }
     .minstyle{
         width: 60px;
         margin-left: 15px;
         margin-right: 10px;
         font-size: 13px;
     }
+    .clearButton {
+      border: 1px solid #414141;
+      border-radius: 4px;
+      background-color: #fff;
+      margin-left: 0;
+      margin-right: 0;
+      color: #000;
+    }
     .modal{
         position: fixed;
         left: 50%;

src/containers/EditableSpan.js

@@ -235,7 +235,13 @@ function mapDispatchToProps(dispatch,state) {
       // 更新文本标签
       dispatch({
         type:ISREAD
-      })
+      });
+      //右侧推送
+      setTimeout(function(){      //延迟待确定后的数据更新后推送，避免获取的参数还是旧的
+        if(didPushParamChange()){     //操作后内容有变化才推送
+          dispatch(billing());
+        }
+      },200);
     },
     removeId(obj){//删除时移除id
       if(obj.i==null){return}

src/containers/OperationContainer.js

@@ -17,6 +17,9 @@ import {RECOVER_TAG_CURRENT} from '@store/types/currentIll';
 import {RECOVER_TAG_OTHER} from '@store/types/otherHistory';
 import {RECOVER_TAG_CHECK} from '@store/types/checkBody';
 import {Notify} from '@commonComp';
+import {didPushParamChange} from '@utils/tools.js';
+import {billing} from '@store/async-actions/pushMessage';
+import {ISREAD} from '@store/types/homePage';
 
 // function mapStateToProps({print}) {
 function mapStateToProps(state) {
@@ -90,6 +93,16 @@ function mapDispatchToProps(dispatch) {
               data:deledTags[0],
               index:arr[1]
             });
+          dispatch({
+            type:ISREAD
+          });
+          //右侧推送
+          setTimeout(function(){      //延迟待确定后的数据更新后推送，避免获取的参数还是旧的
+            if(didPushParamChange()){     //操作后内容有变化才推送
+              dispatch(billing());
+            }
+          },200);
+
         }
     };
 }

src/store/actions/checkBody.js

@@ -546,7 +546,7 @@ export function setImportCheckbodyLabel(state,action) {
 export function recoveTag(state,action) {
   let res = Object.assign({},state);
   let arr = [...res.data];
-  const text = Object.assign({},JSON.parse(config.textLabel));
+  const text = Object.assign({showInCheck:action.data.showInCheck},JSON.parse(config._textLabel));
   arr.splice(action.index,0,action.data,text);
   res.data = checkFullfillText(arr).newArr;
   res.saveText = checkFullfillText(arr).saveText;

src/utils/tools.js

@@ -236,6 +236,8 @@ const getAllDataStringList =(baseList) =>{           //获取所有模块文本
 const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清空所有的数据
     if(action == 'clear'){     //清空
       const block = Object.assign(JSON.parse(config.textLabel),{full:true});//空白时保留一个自由文本标签
+      //清除已删除标签记录
+      localStorage.removeItem('deletedTags');
       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:[]});