Kaynağa Gözat

查体组合下拉选中状态bug修改858

zhouna 6 yıl önce
ebeveyn
işleme
85a726d216

+ 2 - 2
src/common/components/DropList/index.jsx

@@ -43,14 +43,14 @@ class DropList extends Component{
     onSelect&&onSelect(undefined);
     onSelect&&onSelect(undefined);
   }
   }
   render(){
   render(){
-    const {data} = this.props;
+    const {data,hideTag} = this.props;
     const domNode = document.getElementById('root');
     const domNode = document.getElementById('root');
     return ReactDom.createPortal(
     return ReactDom.createPortal(
       <div className={this.getClass()} style={this.getStyle()} contentEditable='false'>
       <div className={this.getClass()} style={this.getStyle()} contentEditable='false'>
         <ul>
         <ul>
           {data&&data.map((it)=>{
           {data&&data.map((it)=>{
             /*return <li onClick={(e)=>this.handleSelect(e,it)} className={it.selected||(it.selected!==false&&+it.defaultSelect===1)?style['selected']:''}>{it.labelPrefix}{it.questionDetailList&&it.questionDetailList.length>0?it.questionDetailList[0].name:it.name}{it.labelSuffix}</li>*/
             /*return <li onClick={(e)=>this.handleSelect(e,it)} className={it.selected||(it.selected!==false&&+it.defaultSelect===1)?style['selected']:''}>{it.labelPrefix}{it.questionDetailList&&it.questionDetailList.length>0?it.questionDetailList[0].name:it.name}{it.labelSuffix}</li>*/
-            return <li onClick={(e)=>this.handleSelect(e,it)} className={it.selected||(it.selected!==false&&+it.defaultSelect===1)?style['selected']:''}>{it.labelPrefix}{it.name}{it.labelSuffix}</li>
+            return <li onClick={(e)=>this.handleSelect(e,it)} className={it.selected||(!hideTag&&it.selected!==false&&+it.defaultSelect===1)?style['selected']:''}>{it.labelPrefix}{it.name}{it.labelSuffix}</li>
           })}
           })}
           <li onClick={(e)=>this.handleClear(e)} className='red'>清空选项</li>
           <li onClick={(e)=>this.handleClear(e)} className='red'>清空选项</li>
         </ul>
         </ul>

+ 2 - 2
src/components/RadioDrop/index.jsx

@@ -142,7 +142,7 @@ class RadioDrop extends Component{
     handleDbclick&&handleDbclick({id:patId||id});
     handleDbclick&&handleDbclick({id:patId||id});
   }
   }
   render(){
   render(){
-    const {data,prefix,suffix,placeholder,show,value} = this.props;
+    const {data,prefix,suffix,placeholder,show,value,hideTag} = this.props;
     const {boxLeft,boxTop} = this.state;
     const {boxLeft,boxTop} = this.state;
     return <div className={style['container']} ref = {this.$cont}>
     return <div className={style['container']} ref = {this.$cont}>
       {prefix}
       {prefix}
@@ -155,7 +155,7 @@ class RadioDrop extends Component{
         {value||placeholder}
         {value||placeholder}
       </div>
       </div>
       {suffix}
       {suffix}
-      <DropList onSelect={this.handleSelect} data={data} left={boxLeft} top={boxTop} show={show}/>
+      <DropList onSelect={this.handleSelect} data={data} left={boxLeft} top={boxTop} show={show} hideTag={hideTag}/>
     </div>
     </div>
   }
   }
 }
 }

+ 2 - 0
src/store/actions/checkBody.js

@@ -440,10 +440,12 @@ export function backspaceText(state,action){
     // 前一个是文本标签或者子模板 不做处理
     // 前一个是文本标签或者子模板 不做处理
   }else if(data[delIndex-1].tagType==8){
   }else if(data[delIndex-1].tagType==8){
     data.splice(delIndex,1);
     data.splice(delIndex,1);
+    res.selecteds.splice(delIndex,1);      //杂音类样式选中状态对应
     res.saveText.splice(delIndex,1);
     res.saveText.splice(delIndex,1);
   }
   }
   else{
   else{
     data.splice(delIndex-1,2);
     data.splice(delIndex-1,2);
+    res.selecteds.splice(delIndex-1,2);      //杂音类样式选中状态对应
     res.saveText.splice(delIndex-1,2);
     res.saveText.splice(delIndex-1,2);
   }
   }
   // res.saveText = fullfillText(data).saveText;
   // res.saveText = fullfillText(data).saveText;