Luolei 6 rokov pred
rodič
commit
d5b450ff9b

+ 4 - 3
src/common/components/EditableSpan/index.jsx

@@ -177,6 +177,10 @@ class EditableSpan extends Component{
     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,9 +219,6 @@ class EditableSpan extends Component{
           index: null
         })
       }
-      let ele = document.activeElement;
-      let boxTop = getPageCoordinate(e).boxTop;
-      setSearchLocation(boxTop,ele.offsetLeft)     //搜索框的位置动态获取
     }
   }
   componentWillReceiveProps(next){

+ 7 - 7
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']}>