Merge branch 'dev/byll' into dev/new1

src/common/components/EditableSpan/index.jsx

@@ -50,7 +50,7 @@ class EditableSpan extends Component{
         return ;
       }
     }
-    let text = e.target.innerText;
+    let text = e.target.innerText || e.target.innerHTML;
     setFocusIndex&&setFocusIndex({i,boxMark,dom:this.$span});
     this.setState({
       labelVal:text,
@@ -62,7 +62,7 @@ class EditableSpan extends Component{
     e.stopPropagation();
     const {handleChange,boxMark,i,handleSearch,value,mainSaveText,mainIds,handleClear} = this.props;
     const {labelVal,searchPre} = this.state;
-    const text1 =e.target.innerText? e.target.innerText : e.target.innerHTML;
+    const text1 = e.target.innerText || e.target.innerHTML;
     let mainText = filterDataArr(mainSaveText);//主诉字数
     if(+boxMark==1){
       if(mainText.length >= config.limited){
@@ -90,7 +90,7 @@ class EditableSpan extends Component{
     //延迟搜索
     clearTimeout(this.state.timer);
     const timer = setTimeout(function(){
-      let newText = e.target.innerText;
+      let newText = e.target.innerText || e.target.innerHTML;
       let temp = '',isEnd=false;
       let search='';
       clearTimeout(that.state.timer);
@@ -173,10 +173,14 @@ class EditableSpan extends Component{
     const {preVal,index} = this.state;
     const ev = e||window.event;
     const target = ev.target||ev.srcElement;
-    let innerVal = target.innerText? target.innerText : target.innerHTML;
+    let innerVal = target.innerText || target.innerHTML;
     if(ev.keyCode==8){
       const elem = ev.srcElement || ev.currentTarget;
       const nodeN = elem.nodeName;
+      
+      let ele = document.activeElement;
+      let boxTop = getPageCoordinate(e).boxTop;
+      setSearchLocation(boxTop,ele.offsetLeft)     //搜索框的位置动态获取
       if(nodeN != "SPAN"){//光标没落到span的时候阻止默认事件（backspace回退页面的情况）
         return this.stopIt(ev);
       }
@@ -215,23 +219,18 @@ class EditableSpan extends Component{
           index: null
         })
       }
-      let ele = document.activeElement;
-      let boxTop = getPageCoordinate(e).boxTop;
-      setSearchLocation(boxTop,ele.offsetLeft)     //搜索框的位置动态获取
     }
   }
   componentWillReceiveProps(next){
     const isRead = this.props.isRead;
     if(next.isRead != isRead){
-      this.$span.current.innerText = next.value||''
-      // this.$span.current.innerText?(this.$span.current.innerText = next.value||''):(this.$span.current.innerHTML = next.value||'');
+      this.$span.current.innerText?(this.$span.current.innerText = next.value||''):(this.$span.current.innerHTML = next.value||'');
     }
   }
   componentDidMount(){
     const {value} = this.props;
     if(value){
       this.$span.current.innerText?(this.$span.current.innerText = value||''):(this.$span.current.innerHTML = value||'');
-      // this.$span.current.innerText = value||''
     }
     if(isIE()){
       $(this.$span.current).onIe8Input(function(e){

src/common/components/InlineTag/index.jsx

@@ -46,7 +46,7 @@ class InlineTag extends Component {
     });
   }
   handleInput(e){       //输入时保存临时值，在修改灰显为黑色时判断用
-    const text = e.target.innerText;console.log(text)
+    const text = e.target.innerText || e.target.innerHTML;console.log(text)
     this.setState({
       value:text
     });

src/components/Operation/index.jsx

@@ -159,6 +159,12 @@ class Operation extends Component {
     let jsonStr = getAllDataStringList(baseList);
     let whichSign = baseList.typeConfig.typeConfig;
     let tmpLis = baseList.tabTemplate.items;
+    
+    let flg = isAllClear(jsonData,jsonStr,baseList)
+    if(!flg){
+      Notify.info('模板数据不能为空')
+      return false
+    }
     console.log(jsonStr,'文本')
     console.log(jsonData.chief,'结构')       //测试需要用到，不要删了
     for(let i = 0;i <tmpLis.length;i++){
@@ -189,13 +195,7 @@ class Operation extends Component {
         return false;
       }
     }
-    let flg = isAllClear(jsonData,jsonStr,baseList)
-    if(!flg){
-      Notify.info('模板数据不能为空')
-      return false
-    }else{
-      return true
-    }
+    return true;
   }
   changeTitle() {
     return <div className={style['box']}>