Merge branch 'master' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into …

…master-v32-lushangqing

@@ -225,7 +225,14 @@
             if (o.removeClass(s), layui.each(c, function (t, l) {
                 var c, f = "", v = "function" == typeof a[l];
                 if (a[l]) {
-                    var c = v ? f = a[l](d, r) : !a[l][0].test(d);
+                    // 资源，选择资源协议报错
+                   let regTest = function (itemVal){
+                       if(a[l][0] == ''){
+                           return false;
+                       }
+                       return !a[l][0].test(itemVal);
+                   }
+                    var c = v ? f = a[l](d, r) : regTest(d);
                     if (f = f || a[l][1], "required" === l && (f = o.attr("lay-reqText") || f), c) return "tips" === u ? i.tips(f, function () {
                         return "string" == typeof o.attr("lay-ignore") || "select" !== r.tagName.toLowerCase() && !/^checkbox|radio$/.test(r.type) ? o : o.next()
                     }(), {tips: 1}) : "alert" === u ? i.alert(f, {title: "提示", shadeClose: !0}) : i.msg(f, {
@@ -270,4 +277,4 @@
             f.render(null, e)
         }, 50)
     }), v.on("submit", r, d).on("click", "*[lay-submit]", d), e(l, f)
-});
\ No newline at end of file
+});