From fc0ba6fde9c8e6a0f6cfaebfadf23153ab299f7c Mon Sep 17 00:00:00 2001
From: Argo-MacBookPro <Argo@163.com>
Date: Thu, 19 Jul 2018 18:12:48 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E4=BB=A3=E7=A0=81=EF=BC=9A?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8Longbow.Validate=E4=BB=A3=E6=9B=BFJQuery.Vali?=
 =?UTF-8?q?date?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Bootstrap.Admin/Views/Admin/Dicts.cshtml  |  8 ++++----
 Bootstrap.Admin/Views/Admin/Groups.cshtml |  4 ++--
 Bootstrap.Admin/Views/Admin/Menus.cshtml  |  2 +-
 Bootstrap.Admin/Views/Admin/Roles.cshtml  |  4 ++--
 Bootstrap.Admin/wwwroot/js/Dicts.js       | 20 --------------------
 Bootstrap.Admin/wwwroot/js/Groups.js      |  8 --------
 Bootstrap.Admin/wwwroot/js/Roles.js       |  8 --------
 7 files changed, 9 insertions(+), 45 deletions(-)

diff --git a/Bootstrap.Admin/Views/Admin/Dicts.cshtml b/Bootstrap.Admin/Views/Admin/Dicts.cshtml
index f8aa23e4..392e0424 100644
--- a/Bootstrap.Admin/Views/Admin/Dicts.cshtml
+++ b/Bootstrap.Admin/Views/Admin/Dicts.cshtml
@@ -53,24 +53,24 @@
         <h4 class="modal-title" id="myModalLabel">字典编辑窗口</h4>
     </div>
     <div class="modal-body">
-        <form class="form-horizontal" id="dataForm" name="dataForm" role="form">
+        <form class="form-horizontal" role="form">
             <input type="text" class="form-control hidden" id="dictID" data-default-val="0" />
             <div class="form-group">
                 <label class="control-label col-sm-2" for="dictCate">字典标签</label>
                 <div class="col-sm-10">
-                    <input type="text" class="form-control" id="dictCate" placeholder="不可为空，50字以内" maxlength="50" />
+                    <input type="text" class="form-control" id="dictCate" placeholder="不可为空，50字以内" maxlength="50" data-valid="true" />
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label col-sm-2" for="dictName">字典名称</label>
                 <div class="col-sm-10">
-                    <input type="text" class="form-control" id="dictName" placeholder="不可为空，50字以内" maxlength="50" />
+                    <input type="text" class="form-control" id="dictName" placeholder="不可为空，50字以内" maxlength="50" data-valid="true" />
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label col-sm-2" for="dictCode">字典代码</label>
                 <div class="col-sm-10">
-                    <input type="text" class="form-control" id="dictCode" placeholder="不可为空，50字以内" maxlength="50" />
+                    <input type="text" class="form-control" id="dictCode" placeholder="不可为空，50字以内" maxlength="50" data-valid="true" />
                 </div>
             </div>
             <div class="form-group">
diff --git a/Bootstrap.Admin/Views/Admin/Groups.cshtml b/Bootstrap.Admin/Views/Admin/Groups.cshtml
index 9c95029b..4bd23e1b 100644
--- a/Bootstrap.Admin/Views/Admin/Groups.cshtml
+++ b/Bootstrap.Admin/Views/Admin/Groups.cshtml
@@ -45,11 +45,11 @@
         <h4 class="modal-title" id="myModalLabel">部门编辑窗口</h4>
     </div>
     <div class="modal-body">
-        <form class="form-inline" id="dataForm" name="dataForm" role="form">
+        <form class="form-inline" role="form">
             <div class="row">
                 <div class="form-group col-sm-6">
                     <label class="control-label" for="groupName">部门名称</label>
-                    <input type="text" class="form-control" id="groupName" name="groupName" placeholder="不可为空，50字以内" maxlength="50" />
+                    <input type="text" class="form-control" id="groupName" placeholder="不可为空，50字以内" maxlength="50" data-valid="true" />
                 </div>
                 <div class="form-group col-sm-6">
                     <input type="text" class="form-control hidden" id="groupID" data-default-val="0" />
diff --git a/Bootstrap.Admin/Views/Admin/Menus.cshtml b/Bootstrap.Admin/Views/Admin/Menus.cshtml
index 80876fb5..ab6b6d48 100644
--- a/Bootstrap.Admin/Views/Admin/Menus.cshtml
+++ b/Bootstrap.Admin/Views/Admin/Menus.cshtml
@@ -103,7 +103,7 @@
                 <div class="form-group col-sm-6">
                     <label class="control-label" for="order">菜单序号</label>
                     <div class="input-group">
-                        <input type="text" class="form-control" id="order" name="order" data-default-val="10" placeholder="默认为10" maxlength="8" data-valid="true" />
+                        <input type="text" class="form-control digits" id="order" name="order" data-default-val="10" placeholder="默认为10" maxlength="8" data-valid="true" />
                         <span class="input-group-btn">
                             <button data-method="clear" class="btn btn-default" type="button"><i class="fa fa-remove"></i></button>
                             <button id="btnMenuOrder" class="btn btn-default" type="button"><i class="fa fa-list-ol"></i>调整</button>
diff --git a/Bootstrap.Admin/Views/Admin/Roles.cshtml b/Bootstrap.Admin/Views/Admin/Roles.cshtml
index b0a3b4ad..2c244c7c 100644
--- a/Bootstrap.Admin/Views/Admin/Roles.cshtml
+++ b/Bootstrap.Admin/Views/Admin/Roles.cshtml
@@ -55,11 +55,11 @@
         <h4 class="modal-title" id="myModalLabel">角色编辑窗口</h4>
     </div>
     <div class="modal-body">
-        <form class="form-inline" id="dataForm" role="form">
+        <form class="form-inline" role="form">
             <div class="row">
                 <div class="form-group col-sm-6">
                     <label class="control-label" for="roleName">角色名称</label>
-                    <input type="text" class="form-control" id="roleName" placeholder="不可为空，50字以内" maxlength="50" />
+                    <input type="text" class="form-control" id="roleName" placeholder="不可为空，50字以内" maxlength="50" data-valid="true" />
                 </div>
                 <div class="form-group col-sm-6">
                     <input type="text" class="form-control hidden" id="roleID" data-default-val="0" />
diff --git a/Bootstrap.Admin/wwwroot/js/Dicts.js b/Bootstrap.Admin/wwwroot/js/Dicts.js
index faa4e326..49110b9a 100644
--- a/Bootstrap.Admin/wwwroot/js/Dicts.js
+++ b/Bootstrap.Admin/wwwroot/js/Dicts.js
@@ -27,26 +27,6 @@
         ]
     });
 
-    // validate
-    $('#dataForm').autoValidate({
-        dictCate: {
-            required: true,
-            maxlength: 50
-        },
-        dictName: {
-            required: true,
-            maxlength: 50
-        },
-        dictCode: {
-            required: true,
-            maxlength: 50
-        },
-        dictDefine: {
-            required: false,
-            maxlength: 50
-        }
-    });
-
     // autocomplete
     $.bc({
         url: "api/Category", swal: false, method: 'get',
diff --git a/Bootstrap.Admin/wwwroot/js/Groups.js b/Bootstrap.Admin/wwwroot/js/Groups.js
index 23cc4e18..dbbbdd65 100644
--- a/Bootstrap.Admin/wwwroot/js/Groups.js
+++ b/Bootstrap.Admin/wwwroot/js/Groups.js
@@ -84,12 +84,4 @@
             { title: "部门描述", field: "Description", sortable: false }
         ]
     });
-
-    // validate
-    $('#dataForm').autoValidate({
-        groupName: {
-            required: true,
-            maxlength: 50
-        }
-    });
 });
\ No newline at end of file
diff --git a/Bootstrap.Admin/wwwroot/js/Roles.js b/Bootstrap.Admin/wwwroot/js/Roles.js
index 2a18720d..e064fd3e 100644
--- a/Bootstrap.Admin/wwwroot/js/Roles.js
+++ b/Bootstrap.Admin/wwwroot/js/Roles.js
@@ -128,14 +128,6 @@
         ]
     });
 
-    // validate
-    $('#dataForm').autoValidate({
-        roleName: {
-            required: true,
-            maxlength: 50
-        }
-    });
-
     $nestMenu.nestMenu(function () {
         $nestMenuInput = $nestMenu.find('div.dd3-content');
         $nestMenuInput.on('click', ':checkbox', function () {