刷新图片之后清空图片缓存数据

client/actions/refreshImg.js

@@ -73,5 +73,11 @@ const deleteImg = (errorId,type,fileId)=>{
 
 }
 
-export {getRefreshImg,deleteImg}
+const emptyImg = ()=>{
+    return {
+        type:actionTypes.EMPTYIMG
+    }
+}
+
+export {getRefreshImg,deleteImg,emptyImg}
 

client/actiontype/refreshImg.js

 const actionTypes = {
-    REFRESHIMG : 'REFRESHIMG'
+    REFRESHIMG : 'REFRESHIMG',
+    EMPTYIMG : 'EMPTYIMG'
 }
 export default actionTypes
\ No newline at end of file

client/containers/PageContainer/PageContainer.jsx

@@ -7,7 +7,7 @@ import {getTroubleList,updateTroubleList} from "../../actions/getTroubles";
 import {initGetOtherProblem,addNewProbem,deleteProblem,editProblemItem,submitProblemList} from "../../actions/otherQuestion"
 import {scanBarCodeGetProductInfo,submitProductInfo,saveEditProductInfo,submitProductSuccess,clearProductSuccess} from "../../actions/ScanBarCode"
 import {getReportDamageList,deleteDamageItem} from '../../actions/reportDamageList'
-import {getRefreshImg,deleteImg} from "../../actions/refreshImg"
+import {getRefreshImg,deleteImg,emptyImg} from "../../actions/refreshImg"
 import {uploadError,addErrorInfo} from '../../actions/uploadError'
 import {getUserinfo,logoutUser} from '../../actions/userinfo'
 import PopupComponent from '../../components/CommonComponent/PopupComponent/PopupComponent'
@@ -425,6 +425,7 @@ class PageContainer extends React.Component {
                     getRefreshImg={(errorId,type)=>dispatch(getRefreshImg(errorId,type))}
                     deleteImg={(errorId,type,fileId)=>dispatch(deleteImg(errorId,type,fileId))}
                     updateTroubleList={(info)=>dispatch(updateTroubleList(info,state.headerInfo))}
+                    emptyImg={()=>dispatch(emptyImg())}
                 />;
                 break;
             case showPage[2]:

client/containers/TroubleContainer/TroubleContainer.jsx

@@ -53,7 +53,6 @@ export default class TroubleContainer extends React.Component{
     }
 
     componentWillReceiveProps(nextProps){
-        console.log("troubleList in")
         let troubleList = nextProps.troubleList;
         let nowTroubleList = this.state.troubleList;
         let troubleErrorCodeList = Array.isArray(troubleList.details) ? troubleList.details.map(i=>i.errorCode) : [];
@@ -71,27 +70,31 @@ export default class TroubleContainer extends React.Component{
             })
         }
         let refreshImg = nextProps.refreshImg;
-        let lastRefreshImg = this.props.refreshImg;
-        if(
-            (
-                !lastRefreshImg && (refreshImg && refreshImg.errorId && refreshImg.type && refreshImg.files)
-            ) ||
-            (
-                lastRefreshImg && refreshImg && lastRefreshImg.errorId !== refreshImg.errorId
-            ) ||
-            (
-                lastRefreshImg && refreshImg && lastRefreshImg.type !== refreshImg.type
-            ) ||
-            (
-                lastRefreshImg && refreshImg && lastRefreshImg.files && refreshImg.files && refreshImg.files.length !== lastRefreshImg.files.length
-            )
-
-        ){
+        if(refreshImg && refreshImg.files &&  refreshImg.errorId && refreshImg.type){
             this.updateImg(refreshImg);
         }
+        // let lastRefreshImg = this.props.refreshImg;
+        // if(
+        //     (
+        //         !lastRefreshImg && (refreshImg && refreshImg.errorId && refreshImg.type && refreshImg.files)
+        //     ) ||
+        //     (
+        //         lastRefreshImg && refreshImg && lastRefreshImg.errorId !== refreshImg.errorId
+        //     ) ||
+        //     (
+        //         lastRefreshImg && refreshImg && lastRefreshImg.type !== refreshImg.type
+        //     ) ||
+        //     (
+        //         lastRefreshImg && refreshImg && lastRefreshImg.files && refreshImg.files && refreshImg.files.length !== lastRefreshImg.files.length
+        //     )
+        //
+        // ){
+        //     this.updateImg(refreshImg);
+        // }
     }
 
     updateImg(info){
+        let {emptyImg} = this.props;
         let id = info.errorId;
         let type = info.type;
         let files = info.files;
@@ -99,7 +102,9 @@ export default class TroubleContainer extends React.Component{
         let details = troubleList.details;
         let indexInfo = details.find(d=>d.id === id && d.type === type);
         if(indexInfo && indexInfo.id){
-            this.setItem(indexInfo.errorCode,"files",files);
+            this.setItem(indexInfo.errorCode,"files",files,()=>{
+                emptyImg()
+            });
         }
     }
 
@@ -108,7 +113,6 @@ export default class TroubleContainer extends React.Component{
         let details = troubleList.details;
         let indexInfo = details.find(d=>d.errorCode === errcode);
         let index = details.findIndex(d=>d.errorCode === errcode);
-        console.log("showText index ", index)
         if(indexInfo && indexInfo.id){
             let text = indexInfo.explanation;
             this.setState({
@@ -125,7 +129,6 @@ export default class TroubleContainer extends React.Component{
         let details = troubleList.details;
         let indexInfo = details.find(d=>d.errorCode === errcode);
         let index = details.findIndex(d=>d.errorCode === errcode);
-        console.log("showQrcode index ", index)
         if(indexInfo && indexInfo.id){
             this.setState({
                 currentErrorCode : errcode,
@@ -152,7 +155,7 @@ export default class TroubleContainer extends React.Component{
 
     }
 
-    setItem(errcode,option,info){
+    setItem(errcode,option,info,callback){
         let troubleList = this.state.troubleList;
         let details = troubleList.details;
         let index = details.findIndex(d=>d.errorCode === errcode);
@@ -162,13 +165,20 @@ export default class TroubleContainer extends React.Component{
         this.setState({
             troubleList : troubleList,
         },()=>{
-            this.goBack()
+            if(callback && callback instanceof Function){
+                callback()
+            }else{
+                this.abandonSaveText()
+            }
+
         })
     }
 
     saveText(text){
         let errcode = this.state.currentErrorCode;
-        this.setItem(errcode,'explanation',text);
+        this.setItem(errcode,'explanation',text,()=>{
+            this.abandonSaveText()
+        });
     }
 
     abandonSaveText(){
@@ -235,7 +245,6 @@ export default class TroubleContainer extends React.Component{
         let showTrouble = Array.isArray(troubleList.details) && troubleList.details.length > 0;
         let details = Array.isArray(troubleList.details) ? troubleList.details : [];
         let imgLength = details.map(d=>Array.isArray(d.files) ? d.files.length : 0).reduce((pre,next)=>{return pre + next},0);
-        console.log("imgLength ",imgLength);
         let dom = details.map((i,k)=>{
             return <TroubleItem key={k} item={i} num={k+1} setItem={this.setItem}
                                 showText={this.showText} showQrcode={this.showQrcode}

client/reducers/refreshImg.js

@@ -2,12 +2,18 @@ import actionTypes from '../actiontype/refreshImg';
 
 const refreshImg = (content,data)=>{
     return Object.assign({},content,data);
+};
+
+const emptyImg = ()=>{
+    return {}
 }
 
 export default function(state={}, action) {
     switch (action.type) {
         case actionTypes.REFRESHIMG:
             return refreshImg(state,action.data)
+        case actionTypes.EMPTYIMG:
+            return emptyImg();
         default:
             return state;
     }