瀏覽代碼

量表加入状态同步bug修改1384

zhouna 6 年之前
父節點
當前提交
ffb57a791e
共有 2 個文件被更改,包括 11 次插入5 次删除
  1. 2 2
      src/components/AssessResult/ScaleItem/index.jsx
  2. 9 3
      src/components/AssessResult/index.jsx

+ 2 - 2
src/components/AssessResult/ScaleItem/index.jsx

@@ -276,7 +276,7 @@ class ScaleItem extends Component {
           </li>:<li>
           <span>{item.name}:</span>
           <div className={style['row']}>{temp}</div>
-          <div className={style["recommend"]} onClick={()=>this.props.handleRemove(false,i,j,passId)}>
+          <div className={style["recommend"]} onClick={()=>this.props.handleRemove(false,i,passId,j)}>
             <img className={style["deleteIcon"]} src={deleteIcon} />
           </div>
         </li>;
@@ -306,7 +306,7 @@ class ScaleItem extends Component {
       </li>:<li>
         <span>相关量表:</span>
         <div className={style['row']}>{temp}</div>
-        <div className={style["recommend"]} onClick={()=>this.props.handleRemove(true,i)}>
+        <div className={style["recommend"]} onClick={()=>this.props.handleRemove(true,i,it.id)}>
           <img className={style["deleteIcon"]} src={deleteIcon} />
         </div>
       </li>;

+ 9 - 3
src/components/AssessResult/index.jsx

@@ -48,10 +48,9 @@ class AssessResult extends Component {
         wholeAssessText:obj
       })
   }
-  handleScaleDel(isList,i,j,id){
-    let ids = [],idIndex='';
+  handleScaleDel(isList,i,id,j){
+    let ids = [...this.state.addedScaleIds||[]],idIndex='';
     if(id){
-      ids = [...this.state.addedScaleIds||[]];
       idIndex = ids.findIndex((ii)=>id==ii);
       ids.splice(idIndex,1);
     }
@@ -111,6 +110,13 @@ class AssessResult extends Component {
       saveAssessInfos(this.state,readyKeepHistory());
     }
   }
+  componentWillReceiveProps(next){
+    if(JSON.stringify(next.addedScaleIds)!=JSON.stringify(this.props.addedScaleIds)){
+      this.setState({
+        addedScaleIds:[...next.addedScaleIds||[]]
+      })
+    }
+  }
   handoutTypes(item,i){
     const {getIndexData,indexData,timeTypes,wholeIndexs,closeAssess,showScaleFn,chronicPushItems,
       formulaResult,indexNames,disName} =this.props;