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

# Conflicts:
#	src/components/AddAssistCheck/index.jsx
#	src/components/AddInspect/index.jsx
#	src/components/DiagResultSearch/index.jsx
#	src/components/Diagnosis/index.jsx
#	src/components/DiagnosticItem/index.jsx

src/common/components/ItemBox/index.jsx

@@ -53,7 +53,7 @@ componentWillReceiveProps(nextP){
       const that = this;
       //数据渲染后更新滚动条
       setTimeout(function(){
-        that.context.scrollArea.refresh();
+        that.context.scrollArea&&that.context.scrollArea.refresh();
       });
     }
 }

src/common/components/SearchOption/index.jsx

@@ -42,10 +42,10 @@ class SearchOption extends React.Component {
       this.textInput.current.focus();
       const {windowHeight,pageTop,height,refreshScroller} = this.props;
 
-      refreshScroller().refresh();    //点开搜索弹窗更新滚动条，
+      refreshScroller()&&refreshScroller().refresh();    //点开搜索弹窗更新滚动条，
       if(windowHeight - pageTop < height){
         //$("#searchOption")[0].scrollIntoView(false);
-        refreshScroller().scrollBottom();
+        refreshScroller()&&refreshScroller().scrollBottom();
       }
     }
     handleClearVal(){

src/components/AddAssistCheck/index.jsx

@@ -37,7 +37,7 @@ class AddAssistCheck extends React.Component {
       let _closeTil = $('#delTit')[0];   // 弹窗标题
       if (_con && searchWrapAssist != event.target && !_con.is(event.target) && _con.has(event.target).length === 0) { // Mark 1
         if(this.state.show){
-          this.props.setHighter(10)
+          this.props.setHighter(48)
         }
         this.setState({ show: false });
       }
@@ -92,9 +92,9 @@ class AddAssistCheck extends React.Component {
     this.setState({ show: !tmpShow,pageTop:getPageCoordinate(e).boxTop })
     // e.stopPropagation(); 
     if(tmpShow){
-      this.props.setHighter(10)
+      this.props.setHighter(48)
     }else{
-      setPosition(e,"#searchOption",this.props.setHighter)   
+      setPosition(e,"#searchOption",this.props.setHighter)
     }
   }
   handleShowDate(idx) {
@@ -106,14 +106,30 @@ class AddAssistCheck extends React.Component {
 
   getSearchList(list) {      //搜索列表
     const { handleSign } = this.props;
-    return <ul className={styles.searchLiUl}>
+    const contStyle={
+      opacity:'0.4',
+      right:'0',
+      top:'1px',
+      zIndex:'15',
+      width:'14px',
+      background:'#f1f1f1'};
+    const barStyle={background:'#777',width:'100%'};
+    return <ScrollArea speed={0.8}
+                       horizontal={false}
+                       stopScrollPropagation={list.length>6?true:false}
+                       style={{height:'225px'}}
+                       className={styles["area"]}
+                       verticalContainerStyle={contStyle}
+                       verticalScrollbarStyle={barStyle}
+                       contentClassName="content">
+      <ul className={styles.searchLiUl}>
       {
         list && list.map((item, idx) => {
           return <li key={item.id}
             className={styles.searchLi}
             title={(item.name == item.retrievalName || !item.retrievalName) ? null : '(' + item.retrievalName + ')'}
             onClick={() => {
-              this.props.setHighter(10)
+              this.props.setHighter(48)
               handleSign(item.conceptId,idx,'search');
               this.setState({ show: false })
             }}
@@ -122,7 +138,7 @@ class AddAssistCheck extends React.Component {
           </li>
         })
       }
-    </ul>
+      </ul></ScrollArea>;
   }
   getCommonList() {      //常用列表
     const { handleSign,assistList } = this.props;
@@ -133,7 +149,7 @@ class AddAssistCheck extends React.Component {
             className={styles.searchLi}
             title={item.name}
             onClick={() => {
-              this.props.setHighter(10)
+              this.props.setHighter(48)
               handleSign(item.conceptId, idx,'common');
               this.setState({ show: false })
             }}
@@ -256,25 +272,13 @@ class AddAssistCheck extends React.Component {
         <div id="searchWrapAssist" style={{ position: "relative", clear: 'both' }}>
           <Add showText="添加辅检项" handleClick={(e) => this.handleSearchShow(e)} id="assistCheck" />
           {this.state.show ? <SearchOption windowHeight={windowHeight} refreshScroller={refreshScroller }  pageTop={pageTop} height={280} handleChangeValue={handleChangeValue} visible={true}>
-            {list && list.length>0?
-              <ScrollArea speed={0.8}
-                horizontal={false}
-                stopScrollPropagation={true}
-                style={{height:'257px'}}
-                className={styles["area"]}
-                verticalContainerStyle={contStyle}
-                verticalScrollbarStyle={barStyle}
-                contentClassName="content">
-                {
-                  this.getSearchList(list)
-                }
-              </ScrollArea>:(assistVal == ''?'':<p style={{padding:'5px 30px',color:'#bfbfbf'}}>暂无筛选项</p>)}
+            {list && list.length>0?this.getSearchList(list):(assistVal == ''?'':<p style={{padding:'5px 30px',color:'#bfbfbf'}}>暂无筛选项</p>)}
             {
               (list && list.length>0) || (assistVal != '') || (assistList&&assistList.length==0)?'':<div>
                 <p style={{padding:'5px 30px',color:'#bfbfbf'}}>常用辅检项</p>
                 <ScrollArea speed={0.8}
                             horizontal={false}
-                            stopScrollPropagation={true}
+                            stopScrollPropagation={assistList.length>6?true:false}
                             style={{height:'225px'}}
                             className={styles["area"]}
                             verticalContainerStyle={contStyle}

src/components/AddInspect/SlideSelect/index.jsx

@@ -84,14 +84,17 @@ class SlideSelect extends Component {
     handleChangeDate&&handleChangeDate(date)
   }
   handleLabelSub(e,questionId,idx){
-    const {handleLabelSub,handleFillShow,windowHeight,listDom,setHighter} = this.props;
+    const {handleLabelSub,handleFillShow,setHighter,refreshScroller} = this.props;
     handleLabelSub(e,questionId,idx);
     handleFillShow(e,idx);
     //弹窗高度超出屏幕，增加页面高度
-    setPosition(e,"#inspectFill",setHighter)
+    setPosition(e,"#inspectFill",setHighter);
+    /*setTimeout(function(){//如果化验下面有很多数据，则会跳过头
+      refreshScroller()&&refreshScroller().scrollYTo(290);
+    })*/
   }
   render() {
-    const {getInfomation,handleConfirm,changeActivePart,handleDelClick,getItemList,date,item,idx,handleFillShow,showDetails,showFill,changeShowFill,handlePush,dateTime,currentIdx,currentData,fillActive,handleShowDate,handleChangeDate,showToast} = this.props;
+    const {windowWidth,getInfomation,handleConfirm,changeActivePart,getItemList,date,item,idx,showDetails,showFill,changeShowFill,handlePush,dateTime,currentIdx,currentData,fillActive,handleShowDate,showToast} = this.props;
     const {show,activeInd,activeName} = this.state;
     let numPlus = 0,numPlus1 = 0;
     let staticTime = {}
@@ -115,6 +118,8 @@ class SlideSelect extends Component {
       width:'14px',
       background:'#f1f1f1'};
     const barStyle={background:'#777',width:'100%'};
+    const listLen = currentData.details&&currentData.details.length;
+    const stopScroll =(windowWidth<1300&&listLen>12)||(windowWidth>1299&&listLen>24);
     return (
       <li key={item.questionId} className={styles.slideLi}> 
         {
@@ -133,7 +138,7 @@ class SlideSelect extends Component {
                 </i>
             </p>
         }
-        
+
         {
           item.details && item.details.map((val)=>{
             if(val.value && val.value != ''){
@@ -230,7 +235,7 @@ class SlideSelect extends Component {
                             {/* 填写单内容显示 */}
                       <ScrollArea speed={0.8}
                                   horizontal={false}
-                                  stopScrollPropagation={true}
+                                  stopScrollPropagation={stopScroll}
                                   style={{maxHeight:'358px'}}
                                   className={styles["area"]}
                                   verticalContainerStyle={contStyle}

src/components/AddInspect/index.jsx

@@ -91,7 +91,7 @@ class Inspect extends React.Component {
       if (searchOption) {
         if (searchOption != event.target && searchWrap != event.target && searchWrap != event.target.parentNode && !$.contains(searchOption, event.target)) { // Mark 1
           if(this.state.show){
-            this.props.setHighter(10)
+            this.props.setHighter(48)
           }
           this.setState({ show: false });
         }
@@ -99,7 +99,7 @@ class Inspect extends React.Component {
       if (inspectFill) {
         if ($(event.target).attr('id') != "getSureTime"&&event.target.getAttribute('data-flg') != 'current' && inspectFill != event.target && !$.contains(inspectFill, event.target)) { // Mark 1
           if(this.state.showFill){
-            this.props.setHighter(10)
+            this.props.setHighter(48)
           }
           this.setState({ showFill: false, date: false });
         }
@@ -123,7 +123,7 @@ class Inspect extends React.Component {
   }
   changeShowFill() {
     this.setState({ showFill: false })
-    this.props.setHighter(10)
+    this.props.setHighter(48)
   }
   handleChangeDate(info) {
     // let date = info.year+'-'+info.month.toString().padStart(2,'0')+'-'+info.day.toString().padStart(2,'0')
@@ -135,7 +135,7 @@ class Inspect extends React.Component {
     this.setState({ show: !tmpShow, pageTop: getPageCoordinate(e).boxTop })
     // e.stopPropagation();
     if(tmpShow){
-      this.props.setHighter(10)
+      this.props.setHighter(48)
     }else{
       setPosition(e,"#searchOption",this.props.setHighter)
     }
@@ -252,14 +252,30 @@ class Inspect extends React.Component {
   }
   getSearchList(list) {//搜索列表
     const { handleSign } = this.props;
-    return <ul className={styles.searchLiUl}>
+    const contStyle={
+      opacity:'0.4',
+      right:'0',
+      top:'1px',
+      zIndex:'15',
+      width:'14px',
+      background:'#f1f1f1'};
+    const barStyle={background:'#777',width:'100%'};
+    return <ScrollArea speed={0.8}
+                       horizontal={false}
+                       stopScrollPropagation={list.length>6?true:false}
+                       style={{height:'225px'}}
+                       className={styles["area"]}
+                       verticalContainerStyle={contStyle}
+                       verticalScrollbarStyle={barStyle}
+                       contentClassName="content">
+      <ul className={styles.searchLiUl}>
       {
         list && list.map((item, idx) => {
           return <li key={idx}
             className={styles.searchLi}
             title={(item.name == item.retrievalName || !item.retrievalName) ? item.name : item.name + '(' + item.retrievalName + ')'}
             onClick={() => {
-              this.props.setHighter(10)
+              this.props.setHighter(48)
               handleSign(item.questionId, idx, 'search');
               this.setState({ show: false })
             }}
@@ -268,7 +284,7 @@ class Inspect extends React.Component {
           </li>
         })
       }
-    </ul>
+      </ul></ScrollArea>;
   }
   getCommonList() {//常用列表
     const { handleSign, inspectList } = this.props;
@@ -279,7 +295,7 @@ class Inspect extends React.Component {
             className={styles.searchLi}
             title={item.name}
             onClick={() => {
-              this.props.setHighter(10)
+              this.props.setHighter(48)
               handleSign(item.questionId, idx, 'common');
               this.setState({ show: false })
             }}
@@ -329,7 +345,7 @@ class Inspect extends React.Component {
     }
   }
   render() {
-    const {setHighter,refreshScroller, getInfomation, handleChangeValue,inspectList, inspectVal, list, labelList, windowHeight, delPartItem, handleLabelSub, handleClear, handleConfirm, fillActive, getExcelDataList, handleCloseExcel, handlePush } = this.props;
+    const {setHighter,refreshScroller, getInfomation, handleChangeValue,inspectList, inspectVal, list, labelList, windowHeight, windowWidth,delPartItem, handleLabelSub, handleClear, handleConfirm, fillActive, getExcelDataList, handleCloseExcel, handlePush } = this.props;
     const { tmpId, tmpIdx, id, pageTop, impId } = this.state;
 
     const contStyle={
@@ -379,7 +395,8 @@ class Inspect extends React.Component {
                   item={item}
                   idx={idx}
                   listDom={this.$ul}
-                  windowHeight={windowHeight}
+                  windowWidth={windowWidth}
+                  refreshScroller={refreshScroller}
                   showToast={idx == id ? true : false}
                   showFill={this.state.showFill}
                   handlePush={handlePush}
@@ -409,19 +426,7 @@ class Inspect extends React.Component {
         <div style={{ position: "relative", clear: "both", top: "5px" }}>
           <Add showText="添加化验项" handleClick={(e) => this.handleSearchShow(e)} id="searchWrap" />
           {this.state.show ? <SearchOption windowHeight={windowHeight} height={280} refreshScroller={refreshScroller} pageTop={pageTop} handleChangeValue={handleChangeValue} visible={true}>
-            {list && list.length > 0 ? 
-            <ScrollArea speed={0.8}
-              horizontal={false}
-              stopScrollPropagation={true}
-              style={{height:'257px'}}
-              className={styles["area"]}
-              verticalContainerStyle={contStyle}
-              verticalScrollbarStyle={barStyle}
-              contentClassName="content">
-              {
-                this.getSearchList(list)
-              }
-            </ScrollArea> : (inspectVal == '' ? '' : <p style={{ padding: '5px 30px', color: '#bfbfbf' }}>暂无筛选项</p>)}
+            {list && list.length > 0 ? this.getSearchList(list) : (inspectVal == '' ? '' : <p style={{ padding: '5px 30px', color: '#bfbfbf' }}>暂无筛选项</p>)}
             {
               (list && list.length > 0) || (inspectVal != '') || (inspectList&&inspectList.length==0) ? '' : <div>
                 <p style={{ padding: '5px 30px', color: '#bfbfbf' }}>常用化验项</p>

src/components/AssessResult/index.less

@@ -62,6 +62,7 @@
       max-width: 100%;
       overflow: hidden;
       text-overflow: ellipsis;
+      vertical-align: top;
     }
     .blue{
       color:#3B9ED0;

src/components/DiagResultSearch/index.jsx

@@ -28,7 +28,7 @@ class DiagResultSearch extends Component {
         } else {
           if (e.target != diagSearch && e.target != addDiag && e.target.parentNode != addDiag && !$.contains(diagSearch, e.target)) {
             that.props.hideSearch();
-            that.props.setHighter(10)
+            that.props.setHighter(48)
           }
 
 
@@ -67,7 +67,7 @@ class DiagResultSearch extends Component {
         <SearchOption handleChangeValue={handleChangeValue} refreshScroller={refreshScroller} pageTop={pageTop} windowHeight={windowHeight} height={180} visible={true}>
           <ScrollArea speed={0.8}
                       horizontal={false}
-                      stopScrollPropagation={true}
+                      stopScrollPropagation={searchResult.length>6?true:false}
                       style={{height:'257px'}}
                       className={style["area"]}
                       verticalContainerStyle={contStyle}

src/components/Diagnosis/index.jsx

@@ -28,18 +28,18 @@ class Diagnosis extends Component {
 
 
   showSearch() {
-    const { showSearch } = this.props
+    const { showSearch } = this.props;
     showSearch && showSearch()
   }
   hideSearch() {
-    const { hideSearch } = this.props
+    const { hideSearch } = this.props;
     hideSearch && hideSearch()
   }
   handleshowSearch(e) {
     this.props.show ? this.hideSearch() : this.showSearch()
     this.setState({ pageTop:getPageCoordinate(e).boxTop })
     if(this.props.show){
-      this.props.setHighter(10)
+      this.props.setHighter(48)
     }else{
       setPosition(e,"#searchOption",this.props.setHighter)
     }
@@ -54,7 +54,7 @@ class Diagnosis extends Component {
   render() {
     return (<div id="diagnosisResult">
       <ItemBox id="diagnosis" title='诊断' boxHeight='auto' titleTop='22px' marginTop='9px' backgroundColor='#EAF7FD'>
-        <DiagnosticList></DiagnosticList>
+        <DiagnosticList refreshScroller={this.refreshScroller}></DiagnosticList>
         <div style={{ marginLeft: '10px', position: 'relative' }}>
           <Add showText="添加诊断结果" handleClick={this.handleshowSearch} id="addDiag" height="50px" />
           <DiagResultSearch

src/components/DiagnosticItem/index.jsx

@@ -25,13 +25,13 @@ class DiagnosticItem extends Component{
         this.getTips = this.getTips.bind(this)
     }
     confirm() {
-        this.props.setHighter&&this.props.setHighter(10)
+        this.props.setHighter&&this.props.setHighter(48)
         this.close();
         const diagType = 1;
         this.addDiagodal(diagType)
     }
     cancel() {
-        this.props.setHighter&&this.props.setHighter(10)
+        this.props.setHighter&&this.props.setHighter(48)
         this.close();
         const diagType = 2;
         this.addDiagodal(diagType)
@@ -74,7 +74,7 @@ class DiagnosticItem extends Component{
          addDiagnostic&&addDiagnostic(item);
          clearInput&&clearInput();
          hideSearch&&hideSearch();
-         this.context.scrollArea&&this.context.scrollArea.refresh();
+        this.context.scrollArea&&this.context.scrollArea.refresh();
          //document.getElementById("diagnosisResult").scrollIntoView(true)
     }
     handleMouseEnterDrug() {

src/components/DiagnosticList/index.jsx

@@ -248,7 +248,7 @@ class DiagnosticList extends Component {
       })
     }
     render(){
-        const { list, treatment, showReferRecord, showHistoryCase ,chronicMagItem,loading} = this.props;
+        const { list, treatment, showReferRecord, showHistoryCase ,chronicMagItem,loading,refreshScroller} = this.props;
         const {visible, treatTitle, showAssess, isAssessConfirm, assessId, disName, hasOndel, hasOnIndex} = this.state;
         const chronicList = JSON.parse(localStorage.getItem('chronic')||null);
         let isChronic = false;      //是否要显示管理评估
@@ -280,7 +280,7 @@ class DiagnosticList extends Component {
                                     <img className={style['diag-del']} src={hasOnIndex == index ? hasOndel ? del_on : del_icon : del_icon} onMouseEnter={this.handleEnterDel.bind(this,index)} onMouseLeave={this.handleLeaveDel.bind(this)} onClick={()=>{this.handleDeleteItem(item)}}/>
                         </div>)
                     })}
-                     {treatment&&<Treat title={treatTitle}></Treat>}
+                     {treatment&&<Treat title={treatTitle} refreshScroller={refreshScroller}></Treat>}
                      {showAssess?<ComplexModal onclose={this.showAssessFn.bind(this)} footer={footer}
                                                title='管理和评估'
                                                icon={manageIcon}

src/components/EMRContainer/index.less

@@ -7,7 +7,7 @@
   background: #fff;
   margin:60px 20px 0 0;
   // margin-right:@push-width + 10px;
-  padding: 0px 0 10px 0 ;
+  /*padding: 0px 0 10px 0 ;*/
   box-sizing: border-box;
   position: absolute;
   // min-width: 700px;

src/components/Inspect/index.jsx

@@ -201,14 +201,14 @@ class Inspect extends React.Component {
     })
   }
   refreshScroller(){
-    //更新滚动条状态，解决容器变大滚动条不更新bug
+    //滚动条对象
     return this.context.scrollArea;
     /*this.context.scrollArea.refresh();
     this.context.scrollArea.scrollBottom();*/
 
   }
   render() {
-    const {setHighter, fetchPushInfos,getInfomation, hospitalMsg, inspectVal, windowHeight, handleCloseExcel, handleChangeValue, labelListActive, list, handleSign, labelList, handleLabelSub, handleClear, handleConfirm, fillActive, changeActivePart, getExcelDataList, delPartItem, inspectList } = this.props;
+    const {setHighter, fetchPushInfos,getInfomation, hospitalMsg, inspectVal, windowHeight, windowWidth, handleCloseExcel, handleChangeValue, labelListActive, list, handleSign, labelList, handleLabelSub, handleClear, handleConfirm, fillActive, changeActivePart, getExcelDataList, delPartItem, inspectList } = this.props;
     const { ieVersion, isIE, hide,importLis } = this.state;
     const { checkSystemIpt, onClose,handleBindFileApi,closeInIcss,showSlideImport } = this;
     if(JSON.stringify(hospitalMsg) != {} && document.getElementById("choose")){//动态绑定只绑定一次
@@ -285,6 +285,7 @@ class Inspect extends React.Component {
               getInfomation={getInfomation}
               inspectVal={inspectVal}
               windowHeight={windowHeight}
+              windowWidth={windowWidth}
             >
             </AddInspect>
           </div>

src/components/Operation/index.jsx

@@ -286,7 +286,7 @@ class Operation extends Component {
       //更新滚动条
       const that = this;
       setTimeout(function(){
-        that.context.scrollArea.refresh();
+        that.context.scrollArea&&that.context.scrollArea.refresh();
       });
     } else if (type == 3) {
       if (this.state.title.trim() == '') {

src/components/Treat/index.jsx

@@ -46,11 +46,15 @@ class Treat extends Component {
     }
     handleDetermine() {
         const { title, treatment, advice, treatItem, adversReactionList, saveAllAdverseReaction, setAllFollowUp } = this.props
-        const { addScheme } = this.props
+        const { addScheme,refreshScroller } = this.props
         addScheme && addScheme(title, treatment);
         saveAllAdverseReaction && saveAllAdverseReaction(treatItem);
         setAllFollowUp && setAllFollowUp(treatItem)
-        this.hideTreat()
+        this.hideTreat();
+        //滚动条滚到最底部，避免直接上滚滚动条消失bug
+        setTimeout(function(){
+          refreshScroller()&&refreshScroller().scrollBottom();
+        },100);
     }
     showDrugInfo() {
         const {  showDrugInfo } = this.props;

src/containers/Inspect.js

@@ -31,6 +31,7 @@ function mapStateToProps(state) {//console.log(state)
     labelListActive: state.inspect.labelListActive,
     inspectList: state.homePage.inspectList,
     windowHeight: state.homePage.windowHeight,
+    windowWidth: state.homePage.windowWidth,
     inspectVal: state.inspect.inspectVal,
     message: state.patInfo.message,
     hospitalMsg: state.homePage.sysConfig || {},

src/store/actions/checkBody.js

@@ -507,7 +507,7 @@ export function backspaceText(state,action){
       res.saveText.splice(delIndex,1);
     }
     else{
-      handleLocalDelTag(4,delIndex,data[delIndex]);
+      handleLocalDelTag(4,delIndex,data[delIndex+1]);
       data.splice(delIndex,2);
       res.selecteds.splice(delIndex,2);  
       res.saveText.splice(delIndex,2);
@@ -571,8 +571,8 @@ export function setImportCheckbodyLabel(state,action) {
 export function recoveTag(state,action) {
   let res = Object.assign({},state);
   let arr = [...res.data];
-  const text = Object.assign({showInCheck:action.data.showInCheck},JSON.parse(config._textLabel));
-  arr.splice(action.index,0,action.data,text);
+  //const text = Object.assign({showInCheck:action.data.showInCheck},JSON.parse(config._textLabel));
+  arr.splice(action.index,0,action.data);
   res.data = checkFullfillText(arr).newArr;
   res.saveText = checkFullfillText(arr).saveText;
   shiftLocalDelTag();

src/store/actions/currentIll.js

@@ -915,7 +915,7 @@ export function backspaceText(state,action){
       res.saveText.splice(delIndex,1);
     }
     else{
-      handleLocalDelTag(2,delIndex,data[delIndex]);
+      handleLocalDelTag(2,delIndex,data[delIndex+1]);
       data.splice(delIndex,2);
       res.selecteds.splice(delIndex,2);  
       res.saveText.splice(delIndex,2);
@@ -1009,8 +1009,8 @@ export function delSingleLable(state,action){
 export function recoveTag(state,action) {
   let res = Object.assign({},state);
   let arr = [...res.data];
-  const text = Object.assign({},JSON.parse(config.textLabel));
-  arr.splice(action.index,0,action.data,text);
+  //const text = Object.assign({},JSON.parse(config.textLabel));
+  arr.splice(action.index,0,action.data);
   res.data = fullfillText(arr).newArr;
   res.saveText = fullfillText(arr).saveText;
   shiftLocalDelTag();

src/store/actions/mainSuit.js

@@ -858,7 +858,7 @@ export function backspaceText(state,action){
       res.saveText.splice(delIndex,1);
     }
     else{
-      handleLocalDelTag(1,delIndex,data[delIndex]);
+      handleLocalDelTag(1,delIndex,data[delIndex+1]);
       data.splice(delIndex,2);
       res.saveText.splice(delIndex,2);
     }
@@ -961,8 +961,8 @@ export function getSymptomFeature(state,action){
 export function recoveTag(state,action) {
   let res = Object.assign({},state);
   let arr = [...res.data];
-  const text = Object.assign({},JSON.parse(config.textLabel));
-  arr.splice(action.index,0,action.data,text);
+  //const text = Object.assign({},JSON.parse(config.textLabel));
+  arr.splice(action.index,0,action.data);
   res.data = fullfillText(arr).newArr;
   res.saveText = fullfillText(arr).saveText;
   shiftLocalDelTag();

src/store/actions/otherHistory.js

@@ -482,7 +482,7 @@ export function backspaceText(state,action){
       if(data[delIndex+1] &&data[delIndex+1].formulaCode){
         res[data[delIndex+1].formulaCode]=undefined;
       }
-      handleLocalDelTag(3,delIndex,data[delIndex]);
+      handleLocalDelTag(3,delIndex,data[delIndex+1]);
       data.splice(delIndex,2);
       res.selecteds.splice(delIndex,2);  
       res.saveText.splice(delIndex,2);
@@ -560,8 +560,8 @@ export function delSingleLable(state,action){
 export function recoveTag(state,action) {
   let res = Object.assign({},state);
   let arr = [...res.data];
-  const text = Object.assign({},JSON.parse(config.textLabel));
-  arr.splice(action.index,0,action.data,text);
+  //const text = Object.assign({},JSON.parse(config.textLabel));
+  arr.splice(action.index,0,action.data);
   res.data = fullfillText(arr).newArr;
   res.saveText = fullfillText(arr).saveText;
   shiftLocalDelTag();