From 2e5a18de257b2beb4b1c9eaa91d7876a5b30ca6e Mon Sep 17 00:00:00 2001
From: Argo-Lenovo <Argo@163.com>
Date: Wed, 29 Mar 2017 13:59:17 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E4=BB=A3=E7=A0=81=EF=BC=9A?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=8F=9C=E5=8D=95=E9=A1=B5=E9=9D=A2=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97UI=E6=91=86=E6=94=BE=E4=BD=8D=E7=BD=AE=EF=BC=8C?=
 =?UTF-8?q?=E6=95=B0=E5=AD=97=E5=8C=96=E8=8F=9C=E5=8D=95=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E9=95=BF=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Bootstrap.Admin/Content/admin-responsive.css |  6 ++-
 Bootstrap.Admin/Scripts/Menus.js             | 17 +++++---
 Bootstrap.Admin/Views/Admin/Menus.cshtml     | 44 +++++++++++---------
 3 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/Bootstrap.Admin/Content/admin-responsive.css b/Bootstrap.Admin/Content/admin-responsive.css
index 45e9a18a..82afa8c0 100644
--- a/Bootstrap.Admin/Content/admin-responsive.css
+++ b/Bootstrap.Admin/Content/admin-responsive.css
@@ -32,7 +32,7 @@
     }
 
     .form-group .form-control-url {
-        width: 85%;
+        width: 442px;
     }
 }
 
@@ -67,6 +67,10 @@
     .modal-dialog {
         width: 900px;
     }
+
+    .form-group .form-control-url {
+        width: 742px;
+    }
 }
 
 @media (min-height: 672px) {
diff --git a/Bootstrap.Admin/Scripts/Menus.js b/Bootstrap.Admin/Scripts/Menus.js
index c92646f0..cd33ce5c 100644
--- a/Bootstrap.Admin/Scripts/Menus.js
+++ b/Bootstrap.Admin/Scripts/Menus.js
@@ -132,7 +132,18 @@
     });
 
     // validate
-    $('#dataForm').autoValidate({
+    $('#dataForm').on('click', '[data-method]', function () {
+        var $this = $(this);
+        var $input = $this.parent().prev();
+        switch ($this.attr('data-method')) {
+            case 'clear':
+                $input.val("");
+                break;
+            case 'sel':
+                $input.select();
+                break;
+        }
+    }).autoValidate({
         name: {
             required: true,
             maxlength: 50
@@ -202,10 +213,6 @@
         $dialogNew.show();
     });
 
-    $('#btnClearIcon, #btnMenuClearParent').on('click', function () {
-        $(this).parent().prev().val("");
-    });
-
     $btnSubmitMenu.on('click', function () {
         var type = $(this).data('type');
         switch (type) {
diff --git a/Bootstrap.Admin/Views/Admin/Menus.cshtml b/Bootstrap.Admin/Views/Admin/Menus.cshtml
index 4ae87e29..975a139f 100644
--- a/Bootstrap.Admin/Views/Admin/Menus.cshtml
+++ b/Bootstrap.Admin/Views/Admin/Menus.cshtml
@@ -14,14 +14,14 @@
 @section query {
     <form class="form-inline" role="form">
         <div class="row">
-            <div class="form-group col-sm-6 col-md-3">
-                <label class="control-label" for="txt_parent_menus_name">父级菜单</label>
-                <input type="text" class="form-control" id="txt_parent_menus_name" />
-            </div>
             <div class="form-group col-sm-6 col-md-3">
                 <label class="control-label" for="txt_menus_name">菜单名称</label>
                 <input type="text" class="form-control" id="txt_menus_name" />
             </div>
+            <div class="form-group col-sm-6 col-md-3">
+                <label class="control-label" for="txt_parent_menus_name">父级菜单</label>
+                <input type="text" class="form-control" id="txt_parent_menus_name" />
+            </div>
             <div class="form-group col-sm-6 col-md-2">
                 <label class="control-label" for="sel_menus_category">菜单类别</label>
                 <div class="dropdown lgbDropdown">
@@ -78,41 +78,47 @@
     <div class="modal-body">
         <form class="form-inline" id="dataForm" name="dataForm" role="form">
             <div class="row">
+                <div class="form-group col-sm-6">
+                    <input type="text" class="form-control hidden" id="menuID" name="menuID" />
+                    <label class="control-label" for="name">菜单名称</label>
+                    <div class="input-group">
+                        <input type="text" class="form-control" id="name" name="name" placeholder="不可为空" maxlength="50" />
+                        <span class="input-group-btn">
+                            <button data-method="clear" class="btn btn-default" type="button"><i class="fa fa-remove"></i></button>
+                            <button data-method="sel" class="btn btn-default" type="button"><i class="fa fa-edit"></i>全选</button>
+                        </span>
+                    </div>
+                </div>
                 <div class="form-group col-sm-6">
                     <input type="text" class="form-control hidden" id="parentId" name="parentId" />
                     <label class="control-label" for="parentName">父级菜单</label>
                     <div class="input-group">
                         <input type="text" class="form-control" readonly id="parentName" name="parentName" placeholder="请选择...(可为空)" maxlength="50" />
                         <span class="input-group-btn">
-                            <button id="btnMenuClearParent" class="btn btn-default" type="button"><i class="fa fa-remove"></i></button>
+                            <button data-method="clear" class="btn btn-default" type="button"><i class="fa fa-remove"></i></button>
                             <button id="btnMenuParent" class="btn btn-default" type="button"><i class="fa fa-hand-o-up"></i>选择</button>
                         </span>
                     </div>
                 </div>
-                <div class="form-group col-sm-6">
-                    <label class="control-label" for="icon">菜单图标</label>
-                    <div class="input-group">
-                        <input type="text" class="form-control" readonly id="icon" name="icon" placeholder="请选择...(可为空)" maxlength="50" />
-                        <span class="input-group-btn">
-                            <button id="btnClearIcon" class="btn btn-default" type="button"><i class="fa fa-remove"></i></button>
-                            <button id="btnIcon" class="btn btn-default" type="button"><i class="fa fa-dashboard"></i>选择</button>
-                        </span>
-                    </div>
-                </div>
                 <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" />
                         <span class="input-group-btn">
-                            <button id="btnClearIcon" class="btn btn-default" type="button"><i class="fa fa-remove"></i></button>
+                            <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>
                         </span>
                     </div>
                 </div>
                 <div class="form-group col-sm-6">
-                    <input type="text" class="form-control hidden" id="menuID" name="menuID" />
-                    <label class="control-label" for="name">菜单名称</label>
-                    <input type="text" class="form-control" id="name" name="name" placeholder="不可为空" maxlength="50" />
+                    <label class="control-label" for="icon">菜单图标</label>
+                    <div class="input-group">
+                        <input type="text" class="form-control" readonly id="icon" name="icon" placeholder="请选择...(可为空)" maxlength="50" />
+                        <span class="input-group-btn">
+                            <button data-method="clear" class="btn btn-default" type="button"><i class="fa fa-remove"></i></button>
+                            <button id="btnIcon" class="btn btn-default" type="button"><i class="fa fa-dashboard"></i>选择</button>
+                        </span>
+                    </div>
                 </div>
                 <div class="form-group col-xs-12">
                     <label class="control-label" for="url">路径</label>