浏览代码

杂音类单选bug修改

zhouna 6 年之前
父节点
当前提交
581c9dbc6f
共有 2 个文件被更改,包括 15 次插入6 次删除
  1. 14 6
      src/components/SpreadDrop/index.jsx
  2. 1 0
      src/config/index.js

+ 14 - 6
src/components/SpreadDrop/index.jsx

@@ -197,7 +197,7 @@ class SpreadDrop extends Component{
     //点确定后隐藏弹窗
     //点确定后隐藏弹窗
     this.props.handleHide();
     this.props.handleHide();
   }
   }
-  handleSelect(item,isExclu,joint,listIndex,selected){
+  handleSelect(item,isExclu,joint,listIndex,selected){//console.log(item,selected)
     let {withOn,withs,noneOn,exclusion,exists,nowOn,nones,noneIds,ban} = this.state;
     let {withOn,withs,noneOn,exclusion,exists,nowOn,nones,noneIds,ban} = this.state;
     /*if(this.props.selecteds)
     /*if(this.props.selecteds)
     console.log(exists,this.props.selecteds.exists,exists===this.props.selecteds.exists)*/
     console.log(exists,this.props.selecteds.exists,exists===this.props.selecteds.exists)*/
@@ -222,9 +222,9 @@ class SpreadDrop extends Component{
     }
     }
     //操作单选项
     //操作单选项
     if(selected){
     if(selected){
-      const tIndex= exists.findIndex((it)=>it.id===selected.id);
+      const tIndex= exists.findIndex((it)=>it.questionId===item.questionId);
       if(tIndex!=-1){
       if(tIndex!=-1){
-        exists.splice(tIndex,1,{id,name,listIndex});
+        exists.splice(tIndex,1,item);
         this.setState({
         this.setState({
           exists,
           exists,
         })
         })
@@ -286,7 +286,7 @@ class SpreadDrop extends Component{
       }else if(nowOn=='with'){
       }else if(nowOn=='with'){
         withs.push({id:id,name:name});
         withs.push({id:id,name:name});
       }else{
       }else{
-        exists.push({id:id,name:name,listIndex});
+        exists.push({id:id,name:name,listIndex,questionId:item.questionId});
       }
       }
     }
     }
     this.setState({
     this.setState({
@@ -407,9 +407,17 @@ class ListItem extends Component{
     const index=listIndex+''+i;
     const index=listIndex+''+i;
     //列单选处理
     //列单选处理
     if(isRadio){
     if(isRadio){
-      const selected = data.find((it)=>{
-        return exists.findIndex((i)=>i.id===it.id)!==-1||noneIds.includes(it.id)||withs.findIndex((i)=>i.id===it.id)!==-1;
+      let selected = exists.find((i)=>{
+        return i.questionId===item.questionId;
+      })||withs.find((i)=>{
+        return i.questionId===item.questionId;
+      })||noneIds.find((i)=>{
+        return i.id===item.questionId;
       });
       });
+        console.log(noneIds)
+      /*const selected = data.find((it)=>{console.log(exists)
+        return exists.findIndex((i)=>i.questionId===it.id)!==-1||noneIds.includes(it.id)||withs.findIndex((i)=>i.questionId===it.id)!==-1;
+      });*/
       if(selected&&selected.id!=item.id){     //该列已有选中项,传回已选中的id,name取消选中
       if(selected&&selected.id!=item.id){     //该列已有选中项,传回已选中的id,name取消选中
         handleClick&&handleClick(item,isExclu,joint,index,{id:selected.id,name:selected.name});
         handleClick&&handleClick(item,isExclu,joint,index,{id:selected.id,name:selected.name});
       }else{
       }else{

+ 1 - 0
src/config/index.js

@@ -31,6 +31,7 @@ export default {
     delayPushTime:1000,    //延迟推送时间
     delayPushTime:1000,    //延迟推送时间
     pushDelay:1000,
     pushDelay:1000,
     punctuationReg:/[^,,.。;;、]/g,       //正则表达式,全局查找不是括号内标点的字符
     punctuationReg:/[^,,.。;;、]/g,       //正则表达式,全局查找不是括号内标点的字符
+    punReg:/[,,.。;;、]+/g,
     currentText:"患者XX因XX诊断为(**),经XX治疗后,目前XX症状已缓解,仍有XX,各项指标情况:XX,辅助检查:XX。今来复诊,进一步治疗",
     currentText:"患者XX因XX诊断为(**),经XX治疗后,目前XX症状已缓解,仍有XX,各项指标情况:XX,辅助检查:XX。今来复诊,进一步治疗",
     timeUnit:{
     timeUnit:{
       minute:"分",
       minute:"分",