Merge branch 'dev/v4.8.78_yf' of qmx/jy into feature/v4.8.78

src/web/staticres/dataExport/js/conditions_order.js

@@ -270,20 +270,20 @@ function fixLeft(){
     if(one.children('div').length === 0) {
         two.css('margin-left','0')
     }else {
-        two.css('margin-left','8px')
+        // two.css('margin-left','8px')
     }
     if(two.children('div').length === 0) {
-        two.css('margin-left','8px')
+        // two.css('margin-left','8px')
         if(one.children('div').length === 0){
             three.css('margin-left','0')
         }else {
-            three.css('margin-left','8px')
+            // three.css('margin-left','8px')
         }
     }else {
-        three.css('margin-left','8px')
+        // three.css('margin-left','8px')
     }
     if(three.children('div').length === 0) {
-        three.css('margin-left','8px')
+        // three.css('margin-left','8px')
     }
 }
 
@@ -297,7 +297,7 @@ $("#inputDel_0 .column").on('DOMNodeRemoved','div',function(){
 function addDelInput(t,type) {
   var d = document.createElement('div')
   var text = $(t).prev().val()
-  if(!text){
+  if(!text.trim()){
       return;
   }
   $(d).html(text)
@@ -365,7 +365,7 @@ function addDelInputB(t,type) {
     $('.winner-search-list').hide()
     var d = document.createElement('div');
     var text = $(t).val();
-    if(!text){
+    if(!text.trim()){
         return;
     }
     $(d).html(text);

src/web/templates/pc/dataExport_sieve.html

@@ -2455,7 +2455,7 @@
             // console.log(window["inputDel_0"]);
             // console.log($(".edit-user-input").css("display"));
             window["inputDel_0"] = [];
-            var ad = $(this).val();
+            var ad = $(this).val().trim();
             if (ad !== "") {
                 $(".edit-user-input > button.sussecc").attr("disabled", false);
             }
@@ -3119,7 +3119,7 @@
     });
 
     $("#keyInput").on('input', function () {
-        if($(this).val()) {
+        if($(this).val().trim()) {
           $(this).next().show()
         } else {
           $(this).next().hide()
@@ -3308,6 +3308,8 @@
         window['inputDel_2'] = [];
         $("#addWinner").hide();
         $("#winnerInput").show();
+        // 隐藏超出限制
+        $('.data-more-tips').hide()
     });
 
     function GetQueryString(name) {