|
@@ -1,7 +1,7 @@
|
|
|
import {HIDE,RESET,SETINITDATA,SETDROPSHOW,SETADDITEMINIT,SETT0EDIT,SETREADDITEMS,SETPREDATA,
|
|
|
HIDEDROP,CLICKCOUNT,ISREAD,SETOTHERHISTORY,SETMINSCREEN,MODI_LOADING,GET_INSPECT_LIST,GET_ASSIST_LIST,
|
|
|
SETALLMODULES,SETSYSTEMCONFIG,SETPRE,RESET_SELECT_TAG,SET_SELECTED_AREA} from '../types/homePage.js';
|
|
|
-import {showDrop,setAddItemInit,setLabelToEdit,confirmHide,clickNum,getInspectList,getAssistList} from '../actions/homePage.js';
|
|
|
+import {showDrop,setAddItemInit,setLabelToEdit,confirmHide,clickNum,getInspectList,getAssistList,setSelectArea,resetSelectArea} from '../actions/homePage.js';
|
|
|
|
|
|
const initState = {
|
|
|
totalHide:false,
|
|
@@ -81,18 +81,9 @@ export default function (state=initState,action) {
|
|
|
case SETPREDATA:
|
|
|
res.preData = action.preData;
|
|
|
case SET_SELECTED_AREA:
|
|
|
- const {i,dir,boxMark} = action.data;
|
|
|
- if(dir==='start'){ //重新开始选取区域,结束位置清空
|
|
|
- delete res['select_end'];
|
|
|
- }
|
|
|
- res['select_'+dir]=i;
|
|
|
- res.select_boxMark=boxMark;
|
|
|
- return res;
|
|
|
+ return setSelectArea(state,action);
|
|
|
case RESET_SELECT_TAG:
|
|
|
- delete res.select_boxMark;
|
|
|
- delete res.select_start;
|
|
|
- delete res.select_end;
|
|
|
- return res;
|
|
|
+ return resetSelectArea(state,action);
|
|
|
default:
|
|
|
return res;
|
|
|
}
|