数字键盘双击编辑处理函数删除-冗余代码删除

src/store/actions/checkBody.js

@@ -244,47 +244,6 @@ function hasNoSame(arr,text){
   return arr.findIndex((it)=>text==it.name)==-1;
 }
 
-// 数字键盘较特殊，有直接输入
-export const changeNumLabelVal = (state,action)=>{
-  const res = Object.assign({},state);
-  const {changeVal,totalVal,ikey,prefix,suffix} = action.data;
-  const index = ikey;
-  const newVal = changeVal;
-  let item = res.data[index];
-  const next = res.data[+index+1];
-  const next2 = res.data[+index + 2];
-  const nextVal = next.value||next.name;
-  //下一个非文本标签是数字组件
-  const next2IsNum = +next2.tagType === 1 && +next2.controlType === 7;
-  //标签后是不是标点符号标签,是的话删除本标签时一起删除
-  let nextIsDot = +next.tagType===8&&!nextVal.match(config.punctuationReg);
-  if(totalVal.trim()){
-    if(item){
-      item.value = newVal;
-      item.labelPrefix = prefix||'';
-      item.labelSuffix = suffix||'';
-    }
-    if(newVal){
-      res.saveText[index] = totalVal;
-    }else{
-      res.saveText[index] = "";
-    }
-    
-  }else{//删除完标签内容则删除该标签
-    let num = nextIsDot ? 2 : 1;
-    if (nextIsDot && next2IsNum) {      //解决连续2个相同的数字组件删除第一个，第二个显示异常bug--临时方案
-      next.value = '';
-      num = 1;
-    }
-    res.data.splice(index,num);
-    res.selecteds.splice(index,num);      //杂音类样式选中状态对应
-    res.saveText = checkFullfillText(res.data).saveText;
-  }
-
-  res.update = Math.random();
-  return res;
-}
-
 export function clearCheckBody(state,action){  //清空
   let res = Object.assign({},state);
   res.data = action.data;

src/store/actions/currentIll.js

@@ -474,41 +474,6 @@ export const changeLabelVal = (state,action)=>{
 function hasNoSame(arr,text){
   return arr.findIndex((it)=>text==it.name)==-1;
 }
-// 数字键盘较特殊，有直接输入
-export const changeNumLabelVal = (state,action)=>{
-  const res = Object.assign({},state);
-  const {changeVal,totalVal,ikey,prefix,suffix} = action.data;
-  const index = ikey;
-  const newVal = changeVal;
-  let item = res.data[index];
-  const next = res.data[+index+1];
-  const next2 = res.data[+index + 2];
-  const nextVal = next.value||next.name;
-  //下一个非文本标签是数字组件
-  const next2IsNum = +next2.tagType === 1 && +next2.controlType === 7;
-  //标签后是不是标点符号标签,是的话删除本标签时一起删除
-  let nextIsDot = +next.tagType===8&&!nextVal.match(config.punctuationReg);
-  // let labText = totalVal?totalVal:newVal;   //如单选没有前后缀
-  if(totalVal.trim()){
-    if(item){
-      item.value = newVal;
-      item.labelPrefix = prefix||'';
-      item.labelSuffix = suffix||'';
-    }
-    res.saveText[index] = totalVal;
-  }else{//删除完标签内容则删除该标签
-    let num = nextIsDot ? 2 : 1;
-    if (nextIsDot && next2IsNum) {      //解决连续2个相同的数字组件删除第一个，第二个显示异常bug--临时方案
-      next.value = '';
-      num = 1;
-    }
-    res.data.splice(index,num);
-    res.saveText.splice(index,num);
-    // res.saveText = fullfillText(res.data).saveText;
-  }
-  res.update = Math.random();
-  return res;
-}
 
 export const clearCurrentIll = (state,action)=>{
   const res = Object.assign({},state);

src/store/actions/mainSuit.js

@@ -601,34 +601,6 @@ export const changeLabelVal = (state,action)=>{
   return res;
 }
 
-// 数字键盘较特殊，有直接输入
-export const changeNumLabelVal = (state,action)=>{
-  const res = Object.assign({},state);
-  const {changeVal,totalVal,ikey,prefix,suffix} = action.data;
-  const index = ikey;
-  const newVal = changeVal;
-  // let labText = totalVal?totalVal:newVal;   //如单选没有前后缀
-  let item = res.data[index];
-  const next = res.data[+index+1];
-  const nextVal = next.value||next.name;
-  //标签后是不是标点符号标签,是的话删除本标签时一起删除
-  let nextIsDot = +next.tagType===8&&!nextVal.match(config.punctuationReg);
-  if(totalVal.trim()){
-    if(item){
-      item.value = newVal;
-      item.labelPrefix = prefix||'';
-      item.labelSuffix = suffix||'';
-      res.saveText[index] = totalVal;
-    }
-  }else{//删除完标签内容则删除该标签
-    const num = nextIsDot?2:1;
-    res.data.splice(index,num);
-    res.saveText = fullfillText(res.data).saveText;
-  }
-  res.update = Math.random();//console.log(44,action,res);
-  return res;
-}
-
 // 保存自由输入文本--无模板
 export const saveFreeVal = (state,action)=>{
   const res = Object.assign({},state);

src/store/actions/otherHistory.js

@@ -226,42 +226,6 @@ function hasNoSame(arr,text){
   return arr.findIndex((it)=>text==it.name)==-1;
 }
 
-// 数字键盘较特殊，有直接输入
-export const changeNumLabelVal = (state,action)=>{
-  const res = Object.assign({},state);
-  const {changeVal,totalVal,ikey,prefix,suffix} = action.data;
-  const index = ikey;
-  const newVal = changeVal;
-  let item = res.data[index];
-  const next = res.data[+index+1];
-  const next2 = res.data[+index + 2];
-  const nextVal = next.value||next.name;
-  //下一个非文本标签是数字组件
-  const next2IsNum = +next2.tagType === 1 && +next2.controlType === 7;
-  //标签后是不是标点符号标签,是的话删除本标签时一起删除
-  let nextIsDot = +next.tagType===8&&!nextVal.match(config.punctuationReg);
-  let labText = totalVal?totalVal:newVal;   //如单选没有前后缀
-  if(labText.trim()){
-    if(item){
-      item.value = newVal;
-      item.labelPrefix = prefix||'';
-      item.labelSuffix = suffix||'';
-    }
-    res.saveText[index] = labText;
-  }else{//删除完标签内容则删除该标签
-    let num = nextIsDot ? 2 : 1;
-    if (nextIsDot && next2IsNum) {      //解决连续2个相同的数字组件删除第一个，第二个显示异常bug--临时方案
-      next.value = '';
-      num = 1;
-    }
-    res.data.splice(index,num);
-    res.selecteds.splice(index,num);//杂音类样式选中状态对应
-    res.saveText = fullfillText(res.data).saveText;
-  };
-  res.update = Math.random();
-  return res;
-}
-
 export function clearOtherHistory(state,action){       //清空数据
   let res = Object.assign({},state);
   for(let it in action){

src/store/reducers/checkBody.js

@@ -1,10 +1,10 @@
 import {RECOVER_TAG_CHECK,SET,SETNUMBER4,SETSELECTED4,SETCHECKBOX,ADDLABELITEM,SETCHECKTEXT,SETSEARCHDATA,
   SELECTSEARCHDATA,CHANGECHECKTEXTLABEL,CLEARCHECKBODY,CHECK_FOCUS_INDEX,CHECKBODY_CLEAR,
-  SETCHECKINPUT,DEL_CHECKBODY,CHANGECHECKTEXTLABEL_NUMBER,CHECKCONFIRMSELECTED,
+  SETCHECKINPUT,DEL_CHECKBODY,CHECKCONFIRMSELECTED,
   CHECKBODY_MUL,DEL_CHECKBODY_LABLE,SET_CK_RADIO_INPUT_VAL,SET_IMPORT_CHECKBODY_LABEL,PRESET} from '../types/checkBody.js';
 import {recoveTag,set,setCheckBoxValue,addLabelItem,setCheckText,
-  setSearchData,insertLabelData,changeLabelVal,clearCheckBody,setInputLabel,backspaceText,
-  changeNumLabelVal,confirm,multipleComfirn,delSingleLable,setImportCheckbodyLabel,preSetCheckbody} from '../actions/checkBody.js';
+  setSearchData,insertLabelData,changeLabelVal,clearCheckBody,setInputLabel,backspaceText
+  ,confirm,multipleComfirn,delSingleLable,setImportCheckbodyLabel,preSetCheckbody} from '../actions/checkBody.js';
 import {setRadioInputValue,setRadioValue,setNumberValue} from '@utils/utils';
 import config from '@config/index.js';
 
@@ -47,8 +47,6 @@ export default function(state=initState,action){
       return changeLabelVal(state,action);
     case CHECKCONFIRMSELECTED:
       return confirm(state,action);
-    case CHANGECHECKTEXTLABEL_NUMBER://数字键盘
-      return changeNumLabelVal(state,action);
     case CHECK_FOCUS_INDEX:
       res.focusIndex = action.index;
       res.span = action.$span;

src/store/reducers/currentIll.js

@@ -2,10 +2,10 @@
 import {RECOVER_TAG_CURRENT,SET_CURRENT,CURRENT_CONFIRM,INSERT_PROCESS,SET_CURRENT_DATA,SET_LABEL_MODULE,SETMAINCHECKBOX,
   CURRENT_RADIO,CURRENT_NUMBER,CURRENT_TEXT_LABEL,CLEAR_CURRENT_ILL,SETTEXTMODEVALUE,CURRENT_GET_BIGDATAPUSH,CURRENT_CLEAR,
   SET_CURRENT_SEARCH,SETCURRENTTEXT,CURRENT_FOCUS_INDEX,SELECT_SEARCHDATA,CLEAR_CURRENT_EDIT,CURRENTADDLABELITEM,
-  SETCURRENTINPUT,DEL_CURRENT,CURRENT_TEXT_LABEL_NUMBER,REMOVE_CURR_ID,CURRENT_MUL,DEL_CURRENT_LABLE,SET_RADIO_INPUT_VALUE,CURRENT_CHRONIC,SAVE_CURR_FREE} from '../types/currentIll';
+  SETCURRENTINPUT,DEL_CURRENT,REMOVE_CURR_ID,CURRENT_MUL,DEL_CURRENT_LABLE,SET_RADIO_INPUT_VALUE,CURRENT_CHRONIC,SAVE_CURR_FREE} from '../types/currentIll';
 import {recoveTag,confirm,insertProcess,setData,setCheckBox,changeLabelVal,clearCurrentIll,
   setTextModeValue,setModule,bigDataSymptom,setCheckText,insertLabelData,clearCurrentEdit,addLabelItem,setInputLabel,
-  backspaceText,changeNumLabelVal,removeId,multipleComfirn,delSingleLable,fillChronicModule} from '../actions/currentIll';
+  backspaceText,removeId,multipleComfirn,delSingleLable,fillChronicModule} from '../actions/currentIll';
 import {setRadioInputValue,setRadioValue,setNumberValue} from '@utils/utils';
 
 const initState = {
@@ -46,8 +46,6 @@ export default function(state=initState,action){
       return setNumberValue(state,action);
     case CURRENT_TEXT_LABEL://标签双击编辑
       return changeLabelVal(state,action);
-    case CURRENT_TEXT_LABEL_NUMBER://数字键盘
-      return changeNumLabelVal(state,action);
     case CURRENT_GET_BIGDATAPUSH://标签双击编辑
       return bigDataSymptom(state,action);
     case SET_CURRENT_SEARCH://搜索结果

src/store/reducers/mainSuit.js

@@ -1,11 +1,11 @@
 import {RECOVER_TAG_MAIN,COMM_SYMPTOMS,CLEAR_COMSYMPTOMS,SHOW_TAIL,INSERT_MAIN,
   SET_SEARCH,CLEAR_SEARCH,GET_BIGDATAPUSH,SET_MAINSUIT,MIX_CONFIRM,NUMBER_SELECT,
   RADIO_SELECT,COMM_CONFIRM,CHANGE_LABELVAL,SAVE_FREE,CLEAR_MAIN_SUIT,SET_DATA,
-  INSERT_SEARCH,MAIN_FOCUS_INDEX,SETTEXTMODEVALUE,SETMAINTEXT,MAINADDLABELITEM,SETMAININPUT,DEL_MAIN,CHANGE_LABELVAL_NUMBER,
+  INSERT_SEARCH,MAIN_FOCUS_INDEX,SETTEXTMODEVALUE,SETMAINTEXT,MAINADDLABELITEM,SETMAININPUT,DEL_MAIN,
   REMOVE_MAIN_ID,MAINSUIT_MUL,DEL_MAIN_LABLE,SET_FEATURE,SET_MS_RADIO_INPUT_VAL,SAVE_CHRONIC,MAIN_REMOVE_SPAN,SET_ADD_SEARCH,CLEAR_ADD_SEARCH} from '../types/mainSuit'
 import {recoveTag,getCommSymptoms,handleTailClick,insertMain,setSearch,getBigSymptom,setMainMoudle,confirm,
   commConfirm,changeLabelVal,saveFreeVal,clearMainSuit,insertSearch,setTextModeValue,setCheckText,
-  addLabelItem,setInputLabel,backspaceText,changeNumLabelVal,removeId,multipleComfirn,delSingleLable,
+  addLabelItem,setInputLabel,backspaceText,removeId,multipleComfirn,delSingleLable,
   getSymptomFeature} from '../actions/mainSuit'
 import {setRadioInputValue,setNumberValue,setRadioValue} from '@utils/utils';
 
@@ -73,8 +73,6 @@ export default function(state=initState,action){
       return setRadioValue(state,action);
     case CHANGE_LABELVAL://改变标签值
       return changeLabelVal(state,action);
-    case CHANGE_LABELVAL_NUMBER://数字标签输入值
-      return changeNumLabelVal(state,action);
     case SAVE_FREE://自由输入
       return saveFreeVal(state,action);
     case MAIN_FOCUS_INDEX:

src/store/reducers/otherHistory.js

@@ -1,8 +1,8 @@
 import {RECOVER_TAG_OTHER,SETDATA,CONFIRMSELECTED,SETRADIO,SETNUMBER,SETOTHERCHECKBOX,SETOTHERTEXT,SETOTHERSEARCHDATA,
   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,OTHERHIS_MUL,REMOVE_OTHER_ID,DEL_OTHERHIS_LABLE,SET_OT_RADIO_INPUT_VAL} from '../types/otherHistory';
 import {recoveTag,confirm,setCheckBoxValue,setCheckText,setSearchData,insertLabelData,clearOtherHistory,
-  changeTextLabel,setOtherInput,setTextModeValue,addLabelItem,otherEditClear,backspaceText,changeNumLabelVal,multipleComfirn,
+  changeTextLabel,setOtherInput,setTextModeValue,addLabelItem,otherEditClear,backspaceText,multipleComfirn,
   removeId,delSingleLable} from '../actions/otherHistory';
 import {setRadioInputValue,setRadioValue,setNumberValue} from '@utils/utils';
 import config from '@config/index';
@@ -51,8 +51,6 @@ export default function(state=initState,action){//console.log(state)
       return clearOtherHistory(state,action);
     case CHANGEOTHERTEXTLABEL:
       return changeTextLabel(state,action);
-    case CHANGEOTHERTEXTLABEL_NUMBER:
-      return changeNumLabelVal(state,action);
     case SETOTHERINPUT:
       return setOtherInput(state,action);
     case SETTEXTMODEVALUE:

src/store/types/checkBody.js

@@ -13,7 +13,6 @@ export const CHECK_FOCUS_INDEX = 'check_focus_text_index';
 export const CHECKBODY_CLEAR = 'clear_search_check_body';
 export const SETCHECKINPUT = 'set_check_body_input_label';
 export const DEL_CHECKBODY = 'DEL_CHECKBODY';//backspace
-export const CHANGECHECKTEXTLABEL_NUMBER = 'CHANGECHECKTEXTLABEL_NUMBER';//数字键盘
 export const CHECKCONFIRMSELECTED = 'spread_check_body_labels';
 export const CHECKBODY_MUL = 'CHECKBODY_MUL';//单列多选
 export const DEL_CHECKBODY_LABLE = 'DEL_CHECKBODY_LABLE';

src/store/types/currentIll.js

@@ -21,7 +21,6 @@ export const CLEAR_CURRENT_EDIT = 'CLEAR_CURRENT_EDIT' ;
 export const CURRENTADDLABELITEM = 'current_add_label_item';    //带加号的标签复制
 export const SETCURRENTINPUT = 'SET_CURRENT_ILL_INPUT_LABEL';     //文本输入标签存值
 export const DEL_CURRENT = 'DEL_CURRENT';     //backspace删除
-export const CURRENT_TEXT_LABEL_NUMBER = 'CURRENT_TEXT_LABEL_NUMBER';     //数字键盘输入
 export const REMOVE_CURR_ID = 'REMOVE_CURR_ID';     //删除后移除id
 export const CURRENT_MUL = 'CURRENT_MUL';     //单列多选
 export const DEL_CURRENT_LABLE = 'DEL_CURRENT_LABLE';     //

src/store/types/mainSuit.js

@@ -22,7 +22,6 @@ export const SETMAINTEXT = 'SETMAINTEXT';  //模板下输入值
 export const MAINADDLABELITEM = 'MAIN_ADD_LABEL_ITEM';      //带加号的标签复制
 export const SETMAININPUT = 'SET_MAIN_INPUT_LABEL';     //文本输入标签存值
 export const DEL_MAIN = 'DEL_MAIN';     //删除标签
-export const CHANGE_LABELVAL_NUMBER = 'CHANGE_LABELVAL_NUMBER';     //数字键盘输入存值
 export const REMOVE_MAIN_ID = 'REMOVE_MAIN_ID';     //移除id
 export const MAINSUIT_MUL = 'MAINSUIT_MUL';     //单列多选
 export const DEL_MAIN_LABLE = 'DEL_MAIN_LABLE';     

src/store/types/otherHistory.js

@@ -17,7 +17,6 @@ export const OTHERHIS_CLEAR = 'OTHERHIS_CLEAR';  //清空搜索值
 export const OTHERADDLABELITEM = 'other_add_label_item';    //带加号的标签复制
 export const OTHEREDICLEAR = 'OTHEREDICLEAR';    //文本框是否可以编辑
 export const DEL_OTHERHIS = 'DEL_OTHERHIS';    //backspace
-export const CHANGEOTHERTEXTLABEL_NUMBER = 'CHANGEOTHERTEXTLABEL_NUMBER';    //数字键盘
 export const OTHERHIS_MUL = 'OTHERHIS_MUL';    //单列多选
 export const REMOVE_OTHER_ID = 'REMOVE_OTHER_ID';    
 export const DEL_OTHERHIS_LABLE = 'DEL_OTHERHIS_LABLE';

src/utils/utils.js

@@ -6,7 +6,7 @@ import {getLabelIndex} from './tools';
  * */
 
 //数字键盘选中事件
-export function setNumberValue(state,action){console.log(action)
+export function setNumberValue(state,action){
   let res = Object.assign({},state);
   const param = action.params;
   const ikey = param.ikey;