NumberDrop点击标签消失的bug，其他史黑色文字未存到saveText

src/components/Inspect/index.jsx

@@ -40,12 +40,21 @@ class Inspect extends React.Component {
             visible:false,
             dom:[],
             isIE:isIE(),
+            ieVersion:null
         }
         this.handleImportExcel = this.handleImportExcel.bind(this)
         this.cancel = this.cancel.bind(this)
         this.getWarings = this.getWarings.bind(this)
     }
-    componentDidMount(){       
+    componentDidMount(){ 
+        var ua = navigator.userAgent;  
+        var _isIE = ua.indexOf("MSIE")>-1;
+        if(_isIE){  
+            let version =  ua.match(/MSIE ([\d.]+)/)[1];
+            this.setState({
+                ieVersion:version
+            })
+        }      
         $('iframe').bind( 'load', function(){} )
       const {fetchPushInfos} = this.props;
         // FileAPI.debug = true
@@ -68,7 +77,7 @@ class Inspect extends React.Component {
             },
             function (files, rejected){
                 if( files.length ){
-                    console.log(files[0])
+                    // console.log(files[0])
                     FileAPI.upload({
                         // url: '/api/icss/lisExcelRes/lisExcelAnalysis',
                         url: api.upload,
@@ -110,7 +119,8 @@ class Inspect extends React.Component {
         this.setState({visible:false})
     }
   getStyle(){
-        if(this.state.isIE){
+    const {ieVersion} = this.state;
+        if(ieVersion&&ieVersion<=9){
             return styles.disabledBtn;
         }else{
             return styles.button;
@@ -129,14 +139,16 @@ class Inspect extends React.Component {
     }
     render() {
         const {fetchPushInfos, handleCloseExcel, handleChangeValue, labelListActive, list, handleSign, labelList, handleLabelSub, handleClear, handleConfirm, fillActive, changeActivePart, getExcelDataList,delPartItem } = this.props;
+        const {ieVersion,isIE} = this.state;
         return (
             <div className={styles.wrapper} >
                 {/* 导入功能插件，ie8/9权限问题暂未解决，先隐藏 */}
 
                 <div className={styles.top}>
                     <span>化验结果数据</span>
-                    <div className={this.getStyle()} onClick={this.state.isIE?null:this.handleImportExcel}>
-                        <button disabled={this.state.isIE?true:false}>导入化验结果</button>
+                    <div className={this.getStyle()} onClick={ieVersion&&ieVersion<=9?null:this.handleImportExcel}>
+                       {/* <button disabled={ieVersion&&ieVersion>9?true:false}>导入化验结果</button>*/}
+                        <button>导入化验结果</button>
                         <input type="file" name="uploadfile" id="choose" style={{ display: 'none' }} ref={(DOM) => this.inputRef = DOM} />
                     </div>
                 </div>

src/components/NumberDrop/index.jsx

@@ -38,7 +38,7 @@ class NumberDrop extends Component{
     });
     handleSelect&&handleSelect({ikey,text,suffix,prefix,mainSaveText});
   }
-  handleNumFocus(e){        //数字框可编辑状态下聚集事件，处理是否显示下拉等
+  handleNumFocus(e){console.log(1);        //数字框可编辑状态下聚集事件，处理是否显示下拉等
     e.stopPropagation();
     const {show,handleShow,ikey,id,patId,handleHide,value} = this.props;
     const that = this;
@@ -58,7 +58,7 @@ class NumberDrop extends Component{
       timer
     });
   }
-  handleNumClick(e){      //数字框不可编辑的状态时点击事件，点击将数字框变为可输入且下拉不再显示直到失焦后再次聚集
+  handleNumClick(e){console.log(2);      //数字框不可编辑的状态时点击事件，点击将数字框变为可输入且下拉不再显示直到失焦后再次聚集
     e.stopPropagation();
     const {show,handleShow,ikey,id,patId,handleHide,value} = this.props;
     const {hasSelect} = this.state;
@@ -74,7 +74,7 @@ class NumberDrop extends Component{
       });
     }
   }
-  numInpBlur(e){        //数字框失焦，保存值到store中
+  numInpBlur(e){console.log(3);        //数字框失焦，保存值到store中
     e.stopPropagation();
     this.setState({
       isClosed:false,
@@ -85,7 +85,7 @@ class NumberDrop extends Component{
     const text = e.target.innerText===placeholder?'':e.target.innerText;
     handleSelect&&handleSelect({ikey,text,suffix,prefix,mainSaveText});
   }
-  handleSpanInp(e){      //数字框输入事件
+  handleSpanInp(e){ console.log(4);     //数字框输入事件
     e.stopPropagation();
     //const {value} = this.props;
   }
@@ -108,7 +108,7 @@ class NumberDrop extends Component{
       handleDbclick && handleDbclick({id:patId||id});
     }
   }
-  handleBlur(e){     //双击编辑blur
+  handleBlur(e){console.log(5);     //双击编辑blur
     const {handleLabelChange,ikey,boxMark} = this.props;
     //if(!this.state.editable) return;
     this.setState({

src/components/PushItems/index.jsx

@@ -95,7 +95,7 @@ class PushItems extends Component {
       showAdd,
       showTips
     } = this;
-    console.log('tipsDiscalimer', tipsDiscalimer)
+    // console.log('tipsDiscalimer', tipsDiscalimer)
     let assayNum = 0;
     let assayHide = assay.map((item, index) => {
       assayNum = assayNum + item.name.length + 2;

src/containers/NumberDrop.js

@@ -1,12 +1,12 @@
 import React from 'react';
 import {connect} from 'react-redux';
 import NumberDrop from "@components/NumberDrop";
-import {SETNUMBER,CHANGEOTHERTEXTLABEL} from '@types/otherHistory';
-import {SETNUMBER4,CHANGECHECKTEXTLABEL} from '@types/checkBody.js';
+import {SETNUMBER,CHANGEOTHERTEXTLABEL,CHANGEOTHERTEXTLABEL_NUMBER} from '@types/otherHistory';
+import {SETNUMBER4,CHANGECHECKTEXTLABEL,CHANGECHECKTEXTLABEL_NUMBER} from '@types/checkBody.js';
 import {SETDROPSHOW,CLICKCOUNT,HIDE,RESET,HIDEDROP} from '@types/homePage.js';
-import {NUMBER_SELECT,CHANGE_LABELVAL} from '@store/types/mainSuit.js';
+import {NUMBER_SELECT,CHANGE_LABELVAL,CHANGE_LABELVAL_NUMBER} from '@store/types/mainSuit.js';
 import {getLabelIndex} from '@common/js/func.js';
-import {CURRENT_NUMBER,CURRENT_TEXT_LABEL} from '@store/types/currentIll.js';
+import {CURRENT_NUMBER,CURRENT_TEXT_LABEL,CURRENT_TEXT_LABEL_NUMBER} from '@store/types/currentIll.js';
 import {billing} from '@store/async-actions/pushMessage';
 import {Notify} from '@commonComp';
 import {filterArr,didPushParamChange} from '@utils/tools.js';
@@ -77,7 +77,8 @@ function mainSuitLabel(dispatch,params){
   let ikey = getLabelIndex(index);
   const {changeVal,totalVal} = params;
   dispatch({
-    type:CHANGE_LABELVAL,
+    // type:CHANGE_LABELVAL,
+    type:CHANGE_LABELVAL_NUMBER,
     data:{changeVal:changeVal,ikey:ikey,totalVal}
   })
 }
@@ -86,7 +87,8 @@ function currentLabel(dispatch,params){
   const index = params.ikey;
   let ikey = getLabelIndex(index);
   dispatch({
-    type:CURRENT_TEXT_LABEL,
+    // type:CURRENT_TEXT_LABEL,
+    type:CURRENT_TEXT_LABEL_NUMBER,
     data:{changeVal:params.changeVal,ikey:ikey}
   })
 }
@@ -97,7 +99,8 @@ function otherHisLabelEdit(dispatch,params){
   const {changeVal,totalVal} = params;
   let ikey = getLabelIndex(index);
   dispatch({
-    type:CHANGEOTHERTEXTLABEL,
+    // type:CHANGEOTHERTEXTLABEL,
+    type:CHANGEOTHERTEXTLABEL_NUMBER,
     data:{changeVal:changeVal,ikey:ikey,totalVal}
   })
 }
@@ -108,7 +111,8 @@ function checkBodyLabelEdit(dispatch,params){
   let ikey = getLabelIndex(index);
   const {changeVal,totalVal} = params;
   dispatch({
-    type:CHANGECHECKTEXTLABEL,
+    // type:CHANGECHECKTEXTLABEL,
+    type:CHANGECHECKTEXTLABEL_NUMBER,
     data:{changeVal:changeVal,ikey:ikey,totalVal}
   })
 }

src/store/actions/checkBody.js

@@ -177,6 +177,20 @@ export const changeLabelVal = (state,action)=>{//双击标签输入改变值
   return res;
 }
 
+// 数字键盘较特殊，有直接输入
+export const changeNumLabelVal = (state,action)=>{
+  const res = Object.assign({},state);
+  const index = action.data.ikey;
+  const newVal = action.data.changeVal;
+  let item = res.data[index];
+  if(item){
+    item.value = newVal;
+  }
+  res.saveText[index] = newVal;
+  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

@@ -277,7 +277,7 @@ export function setNumberValue(state,action){
   let labelInx = getLabelIndex(index);
   const subInx = index.substr(index.length-1);
   let item = res.data[labelInx];
-  if(param.text.trim()){
+  // if(param.text.trim()){
     if(+item.tagType===1){
       item.value = param.text;
       res.saveText[labelInx] = param.text?item.labelPrefix+param.text+item.labelSuffix:'';
@@ -294,10 +294,10 @@ export function setNumberValue(state,action){
       res.saveText[labelInx] = hasValue?sub.join(''):'';
       item.value = sub.join('');
     }
-  }else{//删除完标签内容则删除该标签
+  /*}else{//删除完标签内容则删除该标签
     res.data.splice(labelInx,1);
     res.saveText = fullfillText(res.data).saveText;
-  }
+  }*/
   res.update = Math.random();
   return res;
 }
@@ -372,6 +372,20 @@ export const changeLabelVal = (state,action)=>{
   return res;
 }
 
+// 数字键盘较特殊，有直接输入
+export const changeNumLabelVal = (state,action)=>{
+  const res = Object.assign({},state);
+  const index = action.data.ikey;
+  const newVal = action.data.changeVal;
+  let item = res.data[index];
+  if(item){
+    item.value = newVal;
+  }
+  res.saveText[index] = newVal;
+  res.update = Math.random();
+  return res;
+}
+
 export const clearCurrentIll = (state,action)=>{
   const res = Object.assign({},state);
   res.data = action.data;

src/store/actions/mainSuit.js

@@ -280,7 +280,7 @@ export function setNumberValue(state,action){
   let labelInx = getLabelIndex(index);
   const subInx = index.substr(index.length-1);
   let item = res.data[labelInx];
-  if(param.text.trim()){
+  // if(param.text.trim()){
     if(+item.tagType===1){
       item.value = param.text;
       res.saveText[labelInx] = param.text?item.labelPrefix+param.text+item.labelSuffix:'';
@@ -297,10 +297,10 @@ export function setNumberValue(state,action){
       res.saveText[labelInx] = hasValue?sub.join(''):'';
       item.value = sub.join('');
     }
-  }else{//删除完标签内容则删除该标签
+  /*}else{//删除完标签内容则删除该标签
     res.data.splice(labelInx,1);
     res.saveText = fullfillText(res.data).saveText;
-  }
+  }*/
   res.update = Math.random();
   return res;
 }
@@ -372,6 +372,20 @@ export const changeLabelVal = (state,action)=>{
   return res;
 }
 
+// 数字键盘较特殊，有直接输入
+export const changeNumLabelVal = (state,action)=>{
+  const res = Object.assign({},state);
+  const index = action.data.ikey;
+  const newVal = action.data.changeVal;
+  let item = res.data[index];
+  if(item){
+    item.value = newVal;
+  }
+  res.saveText[index] = newVal;
+  res.update = Math.random();
+  return res;
+}
+
 
 // 保存自由输入文本--无模板
 export const saveFreeVal = (state,action)=>{

src/store/actions/otherHistory.js

@@ -44,7 +44,8 @@ export const confirm = (state,action) =>{
     }
     arr.splice(ikey-1,0,...exists,...withs);
     arr[ikey-1].value = text;
-    res.saveText[ikey-1] = text;
+    // res.saveText[ikey-1] = text;
+    res.saveText = fullfillText(arr).saveText;
     res.update=Math.random();         //用于触发组件更新（data变化了因在对象中无法被组件检测到）
     return res;
 };
@@ -214,6 +215,20 @@ export function changeTextLabel(state,action) {
   return res;
 }
 
+// 数字键盘较特殊，有直接输入
+export const changeNumLabelVal = (state,action)=>{
+  const res = Object.assign({},state);
+  const index = action.data.ikey;
+  const newVal = action.data.changeVal;
+  let item = res.data[index];
+  if(item){
+    item.value = newVal;
+  }
+  res.saveText[index] = newVal;
+  res.update = Math.random();
+  return res;
+}
+
 export function clearOtherHistory(state,action){       //清空数据
     let res = Object.assign({},state);
     res.data = action.data;

src/store/reducers/checkBody.js

@@ -1,6 +1,6 @@
 import {SET,SETNUMBER4,SETSELECTED4,SETCHECKBOX,ADDLABELITEM,SETCHECKTEXT,SETSEARCHDATA,
-  SELECTSEARCHDATA,CHANGECHECKTEXTLABEL,CLEARCHECKBODY,CHECK_FOCUS_INDEX,CHECKBODY_CLEAR,SETCHECKINPUT,DEL_CHECKBODY} from '../types/checkBody.js';
-import {set,setNumberValue,setRadioValue,setCheckBoxValue,addLabelItem,setCheckText,setSearchData,insertLabelData,changeLabelVal,clearCheckBody,setInputLabel,backspaceText} from '../actions/checkBody.js';
+  SELECTSEARCHDATA,CHANGECHECKTEXTLABEL,CLEARCHECKBODY,CHECK_FOCUS_INDEX,CHECKBODY_CLEAR,SETCHECKINPUT,DEL_CHECKBODY,CHANGECHECKTEXTLABEL_NUMBER} from '../types/checkBody.js';
+import {set,setNumberValue,setRadioValue,setCheckBoxValue,addLabelItem,setCheckText,setSearchData,insertLabelData,changeLabelVal,clearCheckBody,setInputLabel,backspaceText,changeNumLabelVal} from '../actions/checkBody.js';
 import config from '@config/index.js';
 
 const block = Object.assign(JSON.parse(config.textLabel),{full:true});
@@ -33,6 +33,8 @@ export default function(state=initState,action){
       return clearCheckBody(state,action);
     case CHANGECHECKTEXTLABEL://改变标签值
       return changeLabelVal(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

@@ -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} from '../types/currentIll';
+  SET_CURRENT_SEARCH,SETCURRENTTEXT,CURRENT_FOCUS_INDEX,SELECT_SEARCHDATA,CLEAR_CURRENT_EDIT,CURRENTADDLABELITEM,SETCURRENTINPUT,DEL_CURRENT,CURRENT_TEXT_LABEL_NUMBER} from '../types/currentIll';
 import {confirm,insertProcess,setData,setCheckBox,setRadioValue,setNumberValue,changeLabelVal,clearCurrentIll,
-  setTextModeValue,setModule,bigDataSymptom,setCheckText,insertLabelData,clearCurrentEdit,addLabelItem,setInputLabel,backspaceText} from '../actions/currentIll';
+  setTextModeValue,setModule,bigDataSymptom,setCheckText,insertLabelData,clearCurrentEdit,addLabelItem,setInputLabel,backspaceText,changeNumLabelVal} from '../actions/currentIll';
 
 const initState = {
   moduleData:[],
@@ -42,6 +42,8 @@ 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,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} from '../types/mainSuit'
+  INSERT_SEARCH,MAIN_FOCUS_INDEX,SETTEXTMODEVALUE,SETMAINTEXT,MAINADDLABELITEM,SETMAININPUT,DEL_MAIN,CHANGE_LABELVAL_NUMBER} from '../types/mainSuit'
 import {getCommSymptoms,handleTailClick,insertMain,setSearch,getBigSymptom,setMainMoudle,confirm,
-  setNumberValue,setRadioValue,commConfirm,changeLabelVal,saveFreeVal,clearMainSuit,insertSearch,setTextModeValue,setCheckText,changeEditClear,addLabelItem,setInputLabel,backspaceText} from '../actions/mainSuit'
+  setNumberValue,setRadioValue,commConfirm,changeLabelVal,saveFreeVal,clearMainSuit,insertSearch,setTextModeValue,setCheckText,changeEditClear,addLabelItem,setInputLabel,backspaceText,changeNumLabelVal} from '../actions/mainSuit'
 
 
 const initState = {
@@ -62,6 +62,8 @@ 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,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} from '../types/otherHistory';
-import {confirm,setRadioValue,setNumberValue,setCheckBoxValue,setCheckText,setSearchData,insertLabelData,clearOtherHistory,changeTextLabel,setOtherInput,setTextModeValue,addLabelItem,otherEditClear,backspaceText} from '../actions/otherHistory';
+  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';
 
 const initState = {data:[],saveText:[],selecteds:[],focusIndex:'',editClear:true};/*mockData.OtherHis.moduleDetailDTOList;[
     mockData.radioData,
@@ -35,6 +35,8 @@ 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

@@ -12,4 +12,5 @@ export const CLEARCHECKBODY = 'clear_check_body';
 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 DEL_CHECKBODY = 'DEL_CHECKBODY';//backspace
+export const CHANGECHECKTEXTLABEL_NUMBER = 'CHANGECHECKTEXTLABEL_NUMBER';//数字键盘

src/store/types/currentIll.js

@@ -21,4 +21,5 @@ 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';     //数字键盘输入
 

src/store/types/mainSuit.js

@@ -21,4 +21,5 @@ export const SETTEXTMODEVALUE = 'SET_TEXT_MODE_VALUE';  //文本模式下输入
 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 DEL_MAIN = 'DEL_MAIN';     //删除标签
+export const CHANGE_LABELVAL_NUMBER = 'CHANGE_LABELVAL_NUMBER';     //数字键盘输入存值

src/store/types/otherHistory.js

@@ -16,4 +16,5 @@ export const OTHER_FOCUS_INDEX = 'other_focus_text_index';
 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 DEL_OTHERHIS = 'DEL_OTHERHIS';    //backspace
+export const CHANGEOTHERTEXTLABEL_NUMBER = 'CHANGEOTHERTEXTLABEL_NUMBER';    //数字键盘