Merge remote-tracking branch 'origin/IE_test' into dev/new1

# Conflicts:
#	src/common/components/EditableSpan/index.jsx
#	src/store/reducers/checkBody.js
#	src/store/types/checkBody.js

src/components/Multiple/index.jsx

@@ -0,0 +1,226 @@
+import react from "react";
+import style from "./index.less";
+import $ from 'jquery';
+import classNames from 'classnames';
+import {handleEnter,isIE,filterArr,deepClone} from '@utils/tools.js';
+import {Notify} from '@commonComp';
+import config from '@config/index.js';
+/**
+  单列多选组件（tagtype=1,controlType=2）
+  2019-2-20 By_liucf
+  参数：
+  placeholder：标签名
+  value：标签选中的值
+  show：是否展示下拉
+  data：下拉数据
+  type：标识哪一项数据（1-主诉，2-现病史，3-其他史，4-查体）
+**/
+
+class Multiple extends react.Component{
+  constructor(props){
+    super(props);
+    const {seleData,seleId} = deepClone(props.selecteds||[]);
+    this.state={
+      editable:false,
+      timer:null,
+      labelVal:"",
+      seleData:seleData||"",
+      seleId:seleId||[],
+      boxLeft:null,
+      boxTop:null
+    }
+    this.$div = React.createRef();
+    this.handleShow = this.handleShow.bind(this);
+    this.changeToEdit = this.changeToEdit.bind(this);
+    this.handleSelect = this.handleSelect.bind(this);
+    this.onChange = this.onChange.bind(this);
+    this.handleBlur = this.handleBlur.bind(this);
+    this.handleClear = this.handleClear.bind(this);
+    this.handleComfirn = this.handleComfirn.bind(this);
+  }
+
+  getClass(){
+    if(this.props.show){
+      $(this.$div.current).addClass(style['borderd']);
+    }else{
+      $(this.$div.current).removeClass(style['borderd']);
+    }
+    if(this.props.value){
+      return style['selected-tag'];
+    }
+    return style['tag'];
+  }
+
+  getListClass(){
+    let name = style['text-list'];
+    let isHide = this.props.show?'':style['hide'];
+    return classNames(style['list'],name,isHide);
+  }
+
+  getSeleStyle(id){
+    const {seleId} = this.state;
+    if(seleId.includes(id)){
+      return style['selected'];
+    }
+    return '';
+  }
+
+  handleShow(e){//单击
+    e&&e.stopPropagation();
+    let boxLeft = e.pageX -133 + 'px';
+    let offsetTop = e.target.offsetTop;
+    const ht = e.target.offsetHeight;   //如杂音选中文字有多行时，写死会遮挡
+    let boxTop = offsetTop + ht +2 + 'px';
+    this.setState({
+      boxLeft:boxLeft,
+      boxTop:boxTop
+    })
+     this.setStateInit();
+    const {ikey,handleShow,placeholder,flag,id,value,tagType,type} = this.props;
+    const that = this;
+    clearTimeout(this.state.timer);
+    this.state.timer = setTimeout(function(){
+      if (that.state.editable) {//如果处于编辑状态点击不显示下拉框
+        return
+      }else{
+        handleShow&&handleShow({ikey,placeholder,flag,id,value,tagType,type});
+      }
+    },300)
+
+  }
+
+  setStateInit(){//恢复初始选中状态
+    const {seleData,seleId} = deepClone(this.props.selecteds||[]);
+    this.setState({
+      seleData:seleData||"",
+      seleId:seleId||[],
+    })
+  }
+
+  changeToEdit(e){//双击
+    const {value,id,placeholder,handleDbclick,handleHide} = this.props;
+    let text = e.target.innerText;
+    handleHide&&handleHide();       //展开情况下双击收起
+    // clearTimeout(this.state.timer);//取消延时的单击事件
+    e.stopPropagation();
+    if(value&&value.trim()){//有选中值的标签才能双击编辑
+      this.setState({
+        labelVal:text,
+        editable:true
+      });
+      e.target.focus();
+      handleDbclick && handleDbclick({value,id,placeholder});
+    }
+  }
+
+  handleSelect(e,item){
+    e&&e.stopPropagation();
+    let {seleData,seleId} = this.state;
+    const {name,id} = item;
+    if(seleId.includes(id)){
+      seleId.splice(seleId.indexOf(id),1);
+      seleData = seleData.replace(name,'');
+    }else{
+      seleId.push(id);
+      seleData += name;
+    }
+    this.setState({
+      seleData,
+      seleId
+    })
+  }
+
+  onChange(e){
+    const {mainSaveText,ikey,type,handleLabelChange} = this.props;
+    const {labelVal,editable} = this.state;
+    let mainText = filterArr(mainSaveText);//主诉字数
+    if(editable){//避免IE中点击标签也会触发
+      let val = e.target.innerText;
+      if(+type==1){// 主诉字数达到上限时不允许输入
+        if(mainText.length >= config.limited){
+          if(val.length > labelVal.length){
+            e.target.innerText = labelVal;
+            Notify.info(config.limitText);
+            return
+          }else if(val.length == labelVal.length){
+            this.setState({
+              labelVal:val
+            });
+          }else{
+            handleLabelChange && handleLabelChange({ikey,changeVal:val,type});
+          }
+        }
+      }
+    }
+  }
+
+  handleBlur(e){//修改存值
+    e.stopPropagation();
+    const {ikey,type,handleLabelChange} = this.props;
+    const {editable} = this.state;
+    const ev = e || window.event;
+    if(editable){
+      // 更改标签的value值
+      let changeVal = ev.target.innerText;
+      if(!isIE()){
+        e.target.innerText = '';      //避免出现重复输入值
+      }
+      handleLabelChange && handleLabelChange({ikey,changeVal,type});
+    }
+    this.setState({
+      editable:false
+    });
+  }
+
+  handleClear(e){
+    e&&e.stopPropagation();
+    this.setState({
+      seleData:"",
+      seleId:[]
+    })
+  }
+
+  handleComfirn(e){
+    e&&e.stopPropagation();
+    const {handleConfirm,ikey,order,mainSaveText,value,handleHide,type} = this.props;
+    const params = Object.assign({},this.state,{ikey,order,mainSaveText,value,type});
+    handleConfirm&&handleConfirm(params);
+    handleHide&&handleHide();
+  }
+
+  componentDidMount(){
+    if(isIE()){
+      $(this.$div.current).onIe8Input(function(e){
+        this.onChange(e)
+      },this);
+    }
+  }
+
+  render(){
+    const {placeholder,value,show,data} = this.props;
+    const {editable,boxTop,boxLeft} = this.state;
+    return <div className={style["container"]}>
+      <div className={this.getClass()}
+      ref={this.$div}
+      onClick={this.handleShow}
+      onDoubleClick={this.changeToEdit}
+      onBlur={this.handleBlur}
+      onInput={this.onChange}
+      onkeydown={handleEnter}
+      contentEditable={editable}>{value||placeholder}</div>
+      <div className={this.getListClass()} style={{top:boxTop,left:boxLeft}} contentEditable="false">
+        <ul>
+          {data&&data.map((it)=>{
+          return <li onClick={(e)=>this.handleSelect(e,it)} className={this.getSeleStyle(it.id)}>{it.labelPrefix}{it.name}{it.labelSuffix}</li>
+        })}
+          <li onClick={this.handleClear} className={style['mClear']}>清空选项</li>
+          <li onClick={this.handleComfirn} className={style['mConfirm']}>确定</li>
+        </ul>
+        
+      </div>
+    </div>
+  }
+
+}
+
+export default Multiple;

src/components/Multiple/index.less

@@ -0,0 +1,48 @@
+@import "~@less/mixin.less";
+.container{
+  display: inline-block;
+}
+.selected{
+    .select-li;
+  }
+.tag,.selected-tag{
+  cursor: pointer;
+  line-height: 20px;
+}
+
+.selected-tag{
+  padding: 0;
+  color: @text-color;
+  border-bottom: 1px @border-color solid;
+  line-height: 22px;
+}
+.list{
+  .pop;
+  padding: 0 0 10px;
+  color: @text-color;
+  li{
+    height: 32px;
+    line-height: 32px;
+    border:1px #fff solid;
+    padding: 0 20px;
+    white-space: nowrap;
+    cursor: pointer;
+  }
+  // li:hover,.selected{
+  li:hover{
+    border-color:#3B9ED0;
+  }
+}
+.hide{
+  display: none;
+}
+
+.mClear{
+  color:red;
+}
+.mConfirm{
+  color: #3B9ED0;
+  text-align: center;
+  border: 1px solid #3B9ED0;
+
+}

src/containers/Multiple.js

@@ -0,0 +1,182 @@
+// import React from "react";
+import {connect} from "react-redux";
+import Multiple from "@components/Multiple";
+import {RESET,SETDROPSHOW,HIDEDROP,CLICKCOUNT,ISREAD} from '@store/types/homePage.js';
+import {CURRENT_MUL,CURRENT_TEXT_LABEL} from '@types/currentIll';
+import {MAINSUIT_MUL,CHANGE_LABELVAL} from '@types/mainSuit';
+import {OTHERHIS_MUL,CHANGEOTHERTEXTLABEL} from '@types/otherHistory';
+import {CHECKBODY_MUL,CHANGECHECKTEXTLABEL} from '@types/checkBody';
+import {getLabelIndex,fullfillText,getIds} from '@common/js/func.js';
+import {filterArr} from '@utils/tools.js';
+import config from '@config/index.js';
+import {Notify} from '@commonComp';
+
+function handleMainSuit(dispatch,params){
+  const {ikey,seleData,seleId,value,mainSaveText} = params;
+  //字数限制
+  let mainText = filterArr(mainSaveText);
+  let lengths = value?mainText.length - value.length + seleData.length:mainText.length + seleData.length;
+  if(lengths > config.limited){
+    Notify.info(config.limitText);
+    return
+  }
+  const index = getLabelIndex(ikey);
+  dispatch({
+    type:MAINSUIT_MUL,
+    data:{seleData,seleId,ikey:index}
+  })
+}
+
+function handleCurrent(dispatch,params){
+  const {ikey,seleData,seleId} = params;
+  const index = getLabelIndex(ikey);
+  dispatch({
+    type:CURRENT_MUL,
+    data:{seleData,seleId,ikey:index}
+  })
+}
+
+function handleOtherHis(dispatch,params){
+  const {ikey,seleData,seleId} = params;
+  const index = getLabelIndex(ikey);
+  dispatch({
+    type:OTHERHIS_MUL,
+    data:{seleData,seleId,ikey:index}
+  })
+}
+
+function handleCheckBody(dispatch,params){
+  const {ikey,seleData,seleId} = params;
+  const index = getLabelIndex(ikey);
+  dispatch({
+    type:CHECKBODY_MUL,
+    data:{seleData,seleId,ikey:index}
+  })
+}
+
+function handleDiff(dispatch,params){
+  const {type} = params;
+  switch(+type){
+    case 1:
+      handleMainSuit(dispatch,params);
+      break;
+    case 2:
+      handleCurrent(dispatch,params);
+      break;
+    case 3:
+      handleOtherHis(dispatch,params);
+      break;
+    case 4:
+      handleCheckBody(dispatch,params);
+      break;
+    default:
+
+  }
+}
+
+/*****************双击标签改变值**********************/
+function changeMainSuit(dispatch,obj){
+  const {ikey,changeVal} = obj;
+  const index = getLabelIndex(ikey);
+  dispatch({
+    type:CHANGE_LABELVAL,
+    data:{changeVal,ikey:index}
+  })
+}
+
+function changeCurrent(dispatch,obj){
+  const {ikey,changeVal} = obj;
+  const index = getLabelIndex(ikey);
+  dispatch({
+    type:CURRENT_TEXT_LABEL,
+    data:{changeVal,ikey:index}
+  })
+}
+
+//其他史
+function changeOtherHis(dispatch,obj){
+  const {ikey,changeVal} = obj;
+  const index = getLabelIndex(ikey);
+  dispatch({
+    type:CHANGEOTHERTEXTLABEL,
+    data:{changeVal,ikey:index}
+  })
+}
+
+//查体
+function changeCheckBody(dispatch,obj){
+  const {ikey,changeVal} = obj;
+  const index = getLabelIndex(ikey);
+  dispatch({
+    type:CHANGECHECKTEXTLABEL,
+    data:{changeVal,ikey:index}
+  })
+}
+
+function handleLabel(dispatch,obj){
+  const {type} = obj;
+  switch (+type) {
+    case 1:
+      changeMainSuit(dispatch,obj);
+      break;
+    case 2:
+      changeCurrent(dispatch,obj);
+      break;
+    case 3:
+      changeOtherHis(dispatch,obj);
+      break;
+    case 4:
+      changeCheckBody(dispatch,obj);
+      break;
+    default:
+
+  }
+}
+
+function mapStateToProps(state){
+  return{
+    mainSaveText:state.mainSuit.saveText,
+  }
+}
+
+function mapDispatchToProps(dispatch){
+  return{
+    handleShow(obj){
+      dispatch({
+        type:CLICKCOUNT,
+        data:obj,
+        clickType:'单击',
+        num:1
+      });
+      dispatch({
+        type:SETDROPSHOW,
+        data:obj
+      });
+      dispatch({
+        type: RESET
+      });
+    },
+    handleHide(){
+      dispatch({
+        type:HIDEDROP
+      })
+    },
+    handleDbclick(obj){//双击统计
+      dispatch({
+        type:CLICKCOUNT,
+        data:obj,
+        clickType:'双击',
+        num:1
+      });
+    },
+    handleLabelChange(obj){//标签内输入
+      handleLabel(dispatch,obj);
+    },
+    handleConfirm(params){
+      handleDiff(dispatch,params);
+    }
+  }
+}
+
+const MultipleContainer = connect(mapStateToProps,mapDispatchToProps)(Multiple);
+export default MultipleContainer;

src/containers/eleType.js

@@ -6,6 +6,7 @@ import SpreadDrop from "@containers/SpreadDrop";
 import EditableSpan from '@containers/EditableSpan';
 import InlineTag from '@containers/InlineTag';
 import NumberUnitDrop from '@containers/NumberUnitDrop';
+import Multiple from '@containers/Multiple';
 
 /******
  * 下拉类型分发
@@ -17,8 +18,8 @@ import NumberUnitDrop from '@containers/NumberUnitDrop';
  * *******/
 //单选类型
 export function singleRadio(params){
-  const data = params.item;
-  const {i,hideTag,boxMark,showArr} = params;
+  const data = params.item;//console.log(111,data);
+  const {i,hideTag,boxMark,showArr,selecteds} = params;
   const showInx = boxMark+i+'0';    //单括号多标签的情况下需要识别同一个标签内多个下拉组件的显示状态
   switch (+data.controlType){
     case 0:
@@ -34,6 +35,20 @@ export function singleRadio(params){
                         id={data.id}
                         ikey={showInx}
                         hideTag={hideTag}></RadioDrop>;
+    case 2:
+      const dataList = data.questionDetailList&&data.questionDetailList.length>0?data.questionDetailList:data.questionMapping;
+      return <Multiple data={dataList}
+                     ikey={showInx}
+                     placeholder={data.name}
+                     value={data.value}
+                     copyType={data.copyType}
+                     selecteds={selecteds ?selecteds[i]:[]}
+                     show={showArr&&showArr[showInx]}
+                     order={data.textGenerate}
+                     type={boxMark}
+                     textPrefix={data.labelPrefix}
+                     textSuffix={data.labelSuffix}
+                     id={data.id}></Multiple>
     case 3:
       return <EditableSpan {...params} value={data.value||data.value==''?data.value:data.name} update={Math.random()}/>;
     case 5://带单位数字键盘

src/store/actions/checkBody.js

@@ -320,4 +320,16 @@ export function backspaceText(state,action){
   res.saveText = fullfillText(data).saveText;
   res.update = Math.random();
   return res;
+}
+
+// 单列多选
+export function multipleComfirn(state,action){
+  let res = Object.assign({},state);
+  const {ikey,seleData} = action.data;
+  let data = res.data;
+  data[ikey].value = seleData;
+  res.saveText[ikey] = seleData;
+  res.selecteds[ikey] = action.data;
+  res.update = Math.random();
+  return res;
 }

src/store/actions/currentIll.js

@@ -624,6 +624,18 @@ export function removeId(state,action){
     data[index].value = text;
   }
   
+  res.update = Math.random();
+  return res;
+}
+
+// 单列多选
+export function multipleComfirn(state,action){
+  let res = Object.assign({},state);
+  const {ikey,seleData} = action.data;
+  let data = res.data;
+  data[ikey].value = seleData;
+  res.saveText[ikey] = seleData;
+  res.selecteds[ikey] = action.data;
   res.update = Math.random();
   return res;
 }

src/store/actions/mainSuit.js

@@ -620,3 +620,15 @@ export function removeId(state,action){
   res.update = Math.random();
   return res;
 }
+
+// 单列多选
+export function multipleComfirn(state,action){
+  let res = Object.assign({},state);
+  const {ikey,seleData} = action.data;
+  let data = res.data;
+  data[ikey].value = seleData;
+  res.saveText[ikey] = seleData;
+  res.selecteds[ikey] = action.data;
+  res.update = Math.random();console.log(123,action,res);
+  return res;
+}

src/store/actions/otherHistory.js

@@ -303,4 +303,16 @@ export function backspaceText(state,action){
   res.saveText = fullfillText(data).saveText;
   res.update = Math.random();
   return res;
+}
+
+// 单列多选
+export function multipleComfirn(state,action){
+  let res = Object.assign({},state);
+  const {ikey,seleData} = action.data;
+  let data = res.data;
+  data[ikey].value = seleData;
+  res.saveText[ikey] = seleData;
+  res.selecteds[ikey] = action.data;
+  res.update = Math.random();
+  return res;
 }

src/store/reducers/checkBody.js

@@ -1,9 +1,9 @@
 import {SET,SETNUMBER4,SETSELECTED4,SETCHECKBOX,ADDLABELITEM,SETCHECKTEXT,SETSEARCHDATA,
   SELECTSEARCHDATA,CHANGECHECKTEXTLABEL,CLEARCHECKBODY,CHECK_FOCUS_INDEX,CHECKBODY_CLEAR,
-  SETCHECKINPUT,DEL_CHECKBODY,CHANGECHECKTEXTLABEL_NUMBER,CHECKCONFIRMSELECTED} from '../types/checkBody.js';
+  SETCHECKINPUT,DEL_CHECKBODY,CHANGECHECKTEXTLABEL_NUMBER,CHECKCONFIRMSELECTED,CHECKBODY_MUL} from '../types/checkBody.js';
 import {set,setNumberValue,setRadioValue,setCheckBoxValue,addLabelItem,setCheckText,
   setSearchData,insertLabelData,changeLabelVal,clearCheckBody,setInputLabel,backspaceText,
-  changeNumLabelVal,confirm} from '../actions/checkBody.js';
+  changeNumLabelVal,confirm,multipleComfirn} from '../actions/checkBody.js';
 import config from '@config/index.js';
 
 //const block = Object.assign(JSON.parse(config.textLabel),{full:false});//空白时保留一个自由文本标签
@@ -52,6 +52,8 @@ export default function(state=initState,action){
       return setInputLabel(state,action);
   case DEL_CHECKBODY:
       return backspaceText(state,action);
+    case CHECKBODY_MUL:
+      return multipleComfirn(state,action);
     default:
       return res;
   }

src/store/reducers/currentIll.js

@@ -1,9 +1,9 @@
 // 现病史
 import {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} from '../types/currentIll';
+  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} from '../types/currentIll';
 import {confirm,insertProcess,setData,setCheckBox,setRadioValue,setNumberValue,changeLabelVal,clearCurrentIll,
-  setTextModeValue,setModule,bigDataSymptom,setCheckText,insertLabelData,clearCurrentEdit,addLabelItem,setInputLabel,backspaceText,changeNumLabelVal,removeId} from '../actions/currentIll';
+  setTextModeValue,setModule,bigDataSymptom,setCheckText,insertLabelData,clearCurrentEdit,addLabelItem,setInputLabel,backspaceText,changeNumLabelVal,removeId,multipleComfirn} from '../actions/currentIll';
 
 const initState = {
   moduleData:[],
@@ -71,6 +71,8 @@ export default function(state=initState,action){
       return backspaceText(state,action);
     case REMOVE_CURR_ID:
       return removeId(state,action);
+    case CURRENT_MUL://单列多选
+      return multipleComfirn(state,action);
     default:
       return state;
   }

src/store/reducers/mainSuit.js

@@ -1,9 +1,9 @@
 import {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,REMOVE_MAIN_ID} from '../types/mainSuit'
+  INSERT_SEARCH,MAIN_FOCUS_INDEX,SETTEXTMODEVALUE,SETMAINTEXT,MAINADDLABELITEM,SETMAININPUT,DEL_MAIN,CHANGE_LABELVAL_NUMBER,REMOVE_MAIN_ID,MAINSUIT_MUL} from '../types/mainSuit'
 import {getCommSymptoms,handleTailClick,insertMain,setSearch,getBigSymptom,setMainMoudle,confirm,
-  setNumberValue,setRadioValue,commConfirm,changeLabelVal,saveFreeVal,clearMainSuit,insertSearch,setTextModeValue,setCheckText,changeEditClear,addLabelItem,setInputLabel,backspaceText,changeNumLabelVal,removeId} from '../actions/mainSuit'
+  setNumberValue,setRadioValue,commConfirm,changeLabelVal,saveFreeVal,clearMainSuit,insertSearch,setTextModeValue,setCheckText,changeEditClear,addLabelItem,setInputLabel,backspaceText,changeNumLabelVal,removeId,multipleComfirn} from '../actions/mainSuit'
 
 
 const initState = {
@@ -84,6 +84,8 @@ export default function(state=initState,action){
       return backspaceText(state,action);
     case REMOVE_MAIN_ID:
       return removeId(state,action);
+    case MAINSUIT_MUL://单列多选
+      return multipleComfirn(state,action);
     default:
       return state;
   }

src/store/reducers/otherHistory.js

@@ -1,6 +1,6 @@
 import {SETDATA,CONFIRMSELECTED,SETRADIO,SETNUMBER,SETOTHERCHECKBOX,SETOTHERTEXT,SETOTHERSEARCHDATA,
-  SELECTOTHERSEARCHDATA,CLEAROTHERHISTORY,CHANGEOTHERTEXTLABEL,SETOTHERINPUT,SETTEXTMODEVALUE,OTHER_FOCUS_INDEX,OTHERHIS_CLEAR,OTHERADDLABELITEM,OTHEREDICLEAR,DEL_OTHERHIS,CHANGEOTHERTEXTLABEL_NUMBER} from '../types/otherHistory';
-import {confirm,setRadioValue,setNumberValue,setCheckBoxValue,setCheckText,setSearchData,insertLabelData,clearOtherHistory,changeTextLabel,setOtherInput,setTextModeValue,addLabelItem,otherEditClear,backspaceText,changeNumLabelVal} from '../actions/otherHistory';
+  SELECTOTHERSEARCHDATA,CLEAROTHERHISTORY,CHANGEOTHERTEXTLABEL,SETOTHERINPUT,SETTEXTMODEVALUE,OTHER_FOCUS_INDEX,OTHERHIS_CLEAR,OTHERADDLABELITEM,OTHEREDICLEAR,DEL_OTHERHIS,CHANGEOTHERTEXTLABEL_NUMBER,OTHERHIS_MUL} from '../types/otherHistory';
+import {confirm,setRadioValue,setNumberValue,setCheckBoxValue,setCheckText,setSearchData,insertLabelData,clearOtherHistory,changeTextLabel,setOtherInput,setTextModeValue,addLabelItem,otherEditClear,backspaceText,changeNumLabelVal,multipleComfirn} from '../actions/otherHistory';
 
 const initState = {data:[],saveText:[],selecteds:[],focusIndex:'',editClear:true};/*mockData.OtherHis.moduleDetailDTOList;[
     mockData.radioData,
@@ -53,6 +53,8 @@ export default function(state=initState,action){//console.log(state)
         return otherEditClear(state,action);
     case DEL_OTHERHIS:
         return backspaceText(state,action);
+      case OTHERHIS_MUL:
+        return multipleComfirn(state,action);
     default:
       return res;
   }

src/store/types/checkBody.js

@@ -14,4 +14,5 @@ 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 CHECKCONFIRMSELECTED = 'spread_check_body_labels';
+export const CHECKBODY_MUL = 'CHECKBODY_MUL';//单列多选

src/store/types/currentIll.js

@@ -23,4 +23,5 @@ 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';     //单列多选
 

src/store/types/mainSuit.js

@@ -24,3 +24,4 @@ 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';     //单列多选

src/store/types/otherHistory.js

@@ -17,4 +17,5 @@ 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 CHANGEOTHERTEXTLABEL_NUMBER = 'CHANGEOTHERTEXTLABEL_NUMBER';    //数字键盘
+export const OTHERHIS_MUL = 'OTHERHIS_MUL';    //单列多选