Merge branch 'master' into Haozi

# Conflicts:
#	resources/js/queryForm/queryForm.js

resources/js/queryForm/queryForm.js

@@ -566,8 +566,9 @@ const query = function getQueryForm(data) {
         })
         ul_div.hide();
         ul_div.mouseleave(function () {
-            if(_data[condition.name].value){
+            if(_data[condition.name].value.length>0){
                 _this.onsubmit();
+                ul_div.hide();
             }
         });
         return div;
@@ -872,7 +873,7 @@ const query = function getQueryForm(data) {
                 }
             } else {
                 if (![undefined, null, ''].includes(_data[key].value)) {
-                    if(controlJsType(_data[key].value,'array') && _data[key].value.length === 0){
+                    if(controlJsType(_data[key].value,'array') && _data[key].value.length === 0 ){
                         continue;
                     }
                     bool = true;