|
@@ -1,13 +1,20 @@
|
|
-import {SETDATA,CONFIRMSELECTED,SETRADIO,SETNUMBER,SETOTHERCHECKBOX,SETOTHERTEXT,SETOTHERSEARCHDATA,
|
|
|
|
|
|
+import {RECOVER_TAG_OTHER,SETDATA,CONFIRMSELECTED,SETRADIO,SETNUMBER,SETOTHERCHECKBOX,SETOTHERTEXT,SETOTHERSEARCHDATA,
|
|
SELECTOTHERSEARCHDATA,CLEAROTHERHISTORY,CHANGEOTHERTEXTLABEL,SETOTHERINPUT,SETTEXTMODEVALUE,OTHER_FOCUS_INDEX,OTHERHIS_CLEAR,
|
|
SELECTOTHERSEARCHDATA,CLEAROTHERHISTORY,CHANGEOTHERTEXTLABEL,SETOTHERINPUT,SETTEXTMODEVALUE,OTHER_FOCUS_INDEX,OTHERHIS_CLEAR,
|
|
OTHERADDLABELITEM,OTHEREDICLEAR,DEL_OTHERHIS,CHANGEOTHERTEXTLABEL_NUMBER,OTHERHIS_MUL,REMOVE_OTHER_ID,DEL_OTHERHIS_LABLE,SET_OT_RADIO_INPUT_VAL} from '../types/otherHistory';
|
|
OTHERADDLABELITEM,OTHEREDICLEAR,DEL_OTHERHIS,CHANGEOTHERTEXTLABEL_NUMBER,OTHERHIS_MUL,REMOVE_OTHER_ID,DEL_OTHERHIS_LABLE,SET_OT_RADIO_INPUT_VAL} from '../types/otherHistory';
|
|
-import {confirm,setRadioValue,setNumberValue,setCheckBoxValue,setCheckText,setSearchData,insertLabelData,clearOtherHistory,
|
|
|
|
|
|
+import {recoveTag,confirm,setRadioValue,setNumberValue,setCheckBoxValue,setCheckText,setSearchData,insertLabelData,clearOtherHistory,
|
|
changeTextLabel,setOtherInput,setTextModeValue,addLabelItem,otherEditClear,backspaceText,changeNumLabelVal,multipleComfirn,
|
|
changeTextLabel,setOtherInput,setTextModeValue,addLabelItem,otherEditClear,backspaceText,changeNumLabelVal,multipleComfirn,
|
|
removeId,delSingleLable,setRadioInputValue} from '../actions/otherHistory';
|
|
removeId,delSingleLable,setRadioInputValue} from '../actions/otherHistory';
|
|
import config from '@config/index';
|
|
import config from '@config/index';
|
|
|
|
|
|
const block = Object.assign(JSON.parse(config.textLabel),{full:true});//空白时保留一个自由文本标签
|
|
const block = Object.assign(JSON.parse(config.textLabel),{full:true});//空白时保留一个自由文本标签
|
|
-const initState = {data:[block],isEmpty:true,saveText:[],selecteds:[],focusIndex:'',editClear:true};
|
|
|
|
|
|
+const initState = {
|
|
|
|
+ data:[block],
|
|
|
|
+ isEmpty:true,
|
|
|
|
+ saveText:[],
|
|
|
|
+ selecteds:[],
|
|
|
|
+ deledTags:{},
|
|
|
|
+ focusIndex:'',
|
|
|
|
+ editClear:true};
|
|
|
|
|
|
export default function(state=initState,action){//console.log(state)
|
|
export default function(state=initState,action){//console.log(state)
|
|
const res = Object.assign({},state);
|
|
const res = Object.assign({},state);
|
|
@@ -69,6 +76,8 @@ export default function(state=initState,action){//console.log(state)
|
|
return delSingleLable(state,action);
|
|
return delSingleLable(state,action);
|
|
case SET_OT_RADIO_INPUT_VAL:
|
|
case SET_OT_RADIO_INPUT_VAL:
|
|
return setRadioInputValue(state,action);
|
|
return setRadioInputValue(state,action);
|
|
|
|
+ case RECOVER_TAG_OTHER:
|
|
|
|
+ return recoveTag(state,action);
|
|
default:
|
|
default:
|
|
return res;
|
|
return res;
|
|
}
|
|
}
|