6 years ago · 44002e157b
--- a/src/components/NumberDrop/index.jsx
+++ b/src/components/NumberDrop/index.jsx
@@ -194,7 +194,7 @@ class NumberDrop extends Component{
 
				       <span onFocus={this.handleNumFocus}
			
 
				             onClick={allClick?null:this.handleNumClick}
			
 
				             contentEditable={true}
			
 
				-            style={{minWidth:'10px',display:'inline-block'}}
			
 
				+            style={{minWidth:'10px',display:'inline-block',textAlign:'center'}}
			
 
				             ref = {this.$span}
			
 
				             onBlur={this.numInpBlur}
			
 
				             onInput={this.handleSpanInp}
			
--- a/src/components/NumberUnitDrop/index.jsx
+++ b/src/components/NumberUnitDrop/index.jsx
@@ -41,7 +41,7 @@ class NumberUnitDrop extends Component{
 
				     this.changeToEdit = this.changeToEdit.bind(this);
			
 
				   }
			
 
				   select(obj){         //选中键盘上数字事件
			
 
				-    const {handleSelect,ikey,suffix,prefix,mainSaveText} = this.props;
			
 
				+    const {handleSelect,ikey,suffix,prefix,mainSaveText,formulaCode} = this.props;
			
 
				     this.setState({
			
 
				       hasSelect:true
			
 
				     });
			
@@ -50,7 +50,7 @@ class NumberUnitDrop extends Component{
 
				         value:''
			
 
				       });
			
 
				     }
			
 
				-    handleSelect&&handleSelect({ikey,text:obj.text,suffix,prefix,mainSaveText,mark:obj.mark});
			
 
				+    handleSelect&&handleSelect({ikey,text:obj.text,suffix,prefix,mainSaveText,mark:obj.mark,formulaCode});
			
 
				   }
			
 
				   
			
 
				   handleNumClick(e){ 
			
@@ -85,13 +85,13 @@ class NumberUnitDrop extends Component{
 
				   //数字框失焦，保存值到store中
			
 
				   numInpBlur(e){
			
 
				     e.stopPropagation();
			
 
				-    const {handleSelect,ikey,suffix,prefix,mainSaveText,handleLabelChange,boxMark} = this.props;
			
 
				+    const {handleSelect,ikey,suffix,prefix,mainSaveText,handleLabelChange,boxMark,formulaCode} = this.props;
			
 
				     const {editable} = this.state;
			
 
				     if(editable){
			
 
				       const text = e.target.innerText || e.target.innerHTML;
			
 
				       // this.$span.current.innerText='';      //修改生成文字变成输入的2倍bug 
			
 
				       // handleSelect&&handleSelect({ikey,text,suffix,prefix,mainSaveText});
			
 
				-      handleLabelChange&&handleLabelChange({ikey,changeVal:text,suffix,prefix,mainSaveText,type:boxMark});
			
 
				+      handleLabelChange&&handleLabelChange({ikey,changeVal:text,suffix,prefix,mainSaveText,type:boxMark,formulaCode});
			
 
				       
			
 
				     }
			
 
				     this.setState({
			
--- a/src/components/RadioInpDrop/index.jsx
+++ b/src/components/RadioInpDrop/index.jsx
@@ -182,7 +182,7 @@ class RadioInpDrop extends Component{
 
				     return list;
			
 
				   }
			
 
				   render(){
			
 
				-    const {data,show} = this.props;
			
 
				+    const {data,show,vals,placeholder} = this.props;
			
 
				     const {boxLeft,boxTop} = this.state;
			
 
				     return <div className={style['container']} ref = {this.$cont}>
			
 
				       <div className={this.getClass()}
			
@@ -191,7 +191,7 @@ class RadioInpDrop extends Component{
 
				            onDoubleClick={this.handledbClick}
			
 
				            onClick={(e)=>this.handleShow(e,true)}
			
 
				            onkeydown={handleEnter}>
			
 
				-        {this.parseInputDom()}
			
 
				+        {vals?this.parseInputDom():<span>{placeholder}</span>}
			
 
				       </div>
			
 
				       <DropList onSelect={this.handleSelect} data={data} left={boxLeft} top={boxTop} show={show}/>
			
 
				     </div>
			
--- a/src/containers/OtherHistory.js
+++ b/src/containers/OtherHistory.js
@@ -52,6 +52,7 @@ function mapDispatchToProps(dispatch,store){
 
				           type:SETDATA,
			
 
				           data:listObj.newArr,
			
 
				           selecteds:selects,
			
 
				+          period:initData.period,
			
 
				           save:listObj.saveText,
			
 
				           isEmpty:false
			
 
				         });
			
--- a/src/store/async-actions/fetchModules.js
+++ b/src/store/async-actions/fetchModules.js
@@ -87,7 +87,7 @@ export const getOtherHisRecord = ()=>{
 
				         const data = res.data.data;
			
 
				         const obj = JSON.parse(data.dataJson||'{}');
			
 
				         const objStr = JSON.parse(data.otherStr||'[]');
			
 
				-        let arr = [];
			
 
				+        let arr = [];//console.log(obj)
			
 
				         if((!obj||!obj.other||obj.other.length==0)&&!objStr[0]){        //无其他史历史记录用默认模板
			
 
				           if(mode=='1'){      //文本模式
			
 
				             dispatch({
			
@@ -113,6 +113,12 @@ export const getOtherHisRecord = ()=>{
 
				             dispatch({
			
 
				               type:SETOTHERHISTORY,
			
 
				               data:arr,
			
 
				+              period:{
			
 
				+                yjs_1: obj.yjs_1,
			
 
				+                yjs_2: obj.yjs_2,
			
 
				+                yjs_3: obj.yjs_3,
			
 
				+                yjs_4: obj.yjs_4,
			
 
				+              },
			
 
				               selecteds:obj.otherHistorySelecteds,
			
 
				               save:objStr
			
 
				             });
			
--- a/src/store/reducers/homePage.js
+++ b/src/store/reducers/homePage.js
@@ -50,6 +50,7 @@ export default function (state=initState,action) {
 
				       res.initData.otherHisSave = action.save;
			
 
				       res.initData.otherSelecteds = action.selecteds||[];
			
 
				       res.initData.otherIsHis = action.otherIsHis!=undefined?action.otherIsHis:true;
			
 
				+      res.initData.period = action.period;
			
 
				       return res;
			
 
				     /*case SETTEXTFOCUS:
			
 
				       res.focusTextIndex = action.index;
			
--- a/src/store/reducers/otherHistory.js
+++ b/src/store/reducers/otherHistory.js
@@ -21,6 +21,13 @@ export default function(state=initState,action){//console.log(state)
 
				     case SETDATA:
			
 
				       res.data = action.data;
			
 
				       res.selecteds = action.selecteds||[];
			
 
				+      const period = action.period;
			
 
				+      if(period){
			
 
				+        res.yjs_1=period.yjs_1;
			
 
				+        res.yjs_2=period.yjs_2;
			
 
				+        res.yjs_3=period.yjs_3;
			
 
				+        res.yjs_4=period.yjs_4;
			
 
				+      }
			
 
				       res.saveText = action.save||[];
			
 
				       res.isEmpty = action.isEmpty;
			
 
				       return res;