From fd62ebea0f11a505287877d03e3769fd1fd470ab Mon Sep 17 00:00:00 2001
From: Argo-Lenovo <Argo@163.com>
Date: Fri, 24 Mar 2017 12:58:24 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E5=AD=97=E5=85=B8=E8=A1=A8UI?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=84=E8=8C=83=E5=88=97=E6=A0=87=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Bootstrap.Admin/Content/site-responsive.css |  4 ++
 Bootstrap.Admin/Models/QueryDictOption.cs   |  3 ++
 Bootstrap.Admin/Scripts/Dicts.js            | 11 +++--
 Bootstrap.Admin/Views/Admin/Dicts.cshtml    | 52 +++++++++++----------
 4 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/Bootstrap.Admin/Content/site-responsive.css b/Bootstrap.Admin/Content/site-responsive.css
index f40f91cc..d7865981 100644
--- a/Bootstrap.Admin/Content/site-responsive.css
+++ b/Bootstrap.Admin/Content/site-responsive.css
@@ -28,6 +28,10 @@
         top: 94px;
         overflow: auto;
     }
+
+    .form-horizontal .control-label {
+        text-align: left;
+    }
 }
 
 @media (min-height: 672px) {
diff --git a/Bootstrap.Admin/Models/QueryDictOption.cs b/Bootstrap.Admin/Models/QueryDictOption.cs
index e193e10b..1eb49ee4 100644
--- a/Bootstrap.Admin/Models/QueryDictOption.cs
+++ b/Bootstrap.Admin/Models/QueryDictOption.cs
@@ -48,6 +48,9 @@ namespace Bootstrap.Admin.Models
                 case "Name":
                     data = Order == "asc" ? data.OrderBy(t => t.Name) : data.OrderByDescending(t => t.Name);
                     break;
+                case "Code":
+                    data = Order == "asc" ? data.OrderBy(t => t.Code) : data.OrderByDescending(t => t.Code);
+                    break;
                 case "Define":
                     data = Order == "asc" ? data.OrderBy(t => t.Define) : data.OrderByDescending(t => t.Define);
                     break;
diff --git a/Bootstrap.Admin/Scripts/Dicts.js b/Bootstrap.Admin/Scripts/Dicts.js
index fb47f3e1..0b880b3b 100644
--- a/Bootstrap.Admin/Scripts/Dicts.js
+++ b/Bootstrap.Admin/Scripts/Dicts.js
@@ -17,12 +17,13 @@
         url: Dicts.url,
         sortName: 'Category',
         queryParams: function (params) { return $.extend(params, { category: $('#txt_dict_cate').val(), name: $("#txt_dict_name").val(), define: $("#txt_dict_define").val() }); },
-        columns: [{ checkbox: true },
+        columns: [
+            { checkbox: true },
             { title: "Id", field: "ID", events: bsa.idEvents(), formatter: BootstrapAdmin.idFormatter },
-            { title: "字典分项", field: "Category", sortable: true },
-            { title: "字典名称", field: "Name", sortable: false },
-            { title: "字典代码", field: "Code", sortable: false },
-            { title: "字典类别", field: "Define", sortable: true, formatter: function (value, row, index) { return value == "0" ? "系统使用" : "自定义"; } }
+            { title: "字典标签", field: "Category", sortable: true },
+            { title: "字典名称", field: "Name", sortable: true },
+            { title: "字典代码", field: "Code", sortable: true },
+            { title: "字典分类", field: "Define", sortable: true, formatter: function (value, row, index) { return value == "0" ? "系统使用" : "自定义"; } }
         ]
     });
 
diff --git a/Bootstrap.Admin/Views/Admin/Dicts.cshtml b/Bootstrap.Admin/Views/Admin/Dicts.cshtml
index e3a06007..5c975f26 100644
--- a/Bootstrap.Admin/Views/Admin/Dicts.cshtml
+++ b/Bootstrap.Admin/Views/Admin/Dicts.cshtml
@@ -11,7 +11,7 @@
     <form class="form-inline" role="form">
         <div class="row">
             <div class="form-group col-sm-6 col-lg-3">
-                <label class="control-label" for="txt_dict_cate">字典分项</label>
+                <label class="control-label" for="txt_dict_cate">字典标签</label>
                 <input type="text" class="form-control" id="txt_dict_cate" data-provide="typeahead" />
             </div>
             <div class="form-group col-sm-6 col-lg-3">
@@ -53,32 +53,36 @@
         <h4 class="modal-title" id="myModalLabel">字典编辑窗口</h4>
     </div>
     <div class="modal-body">
-        <form class="form-inline" id="dataForm" name="dataForm" role="form">
-            <div class="row">
-                <div class="form-group col-lg-6">
-                    <input type="text" class="form-control hidden" id="dictID" name="dictID" />
-                    <label class="control-label" for="dictName">字典名称</label>
-                    <input type="text" class="form-control" id="dictName" name="dictName" placeholder="不可为空" maxlength="50" />
+        <form class="form-horizontal" id="dataForm" name="dataForm" role="form">
+            <input type="text" class="form-control hidden" id="dictID" name="dictID" />
+            <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" name="dictCate" placeholder="不可为空，50字以内" maxlength="50" />
                 </div>
-                <div class="form-group col-lg-6">
-                    <label class="control-label" for="dictCode">字典代码</label>
-                    <input type="text" class="form-control" id="dictCode" name="dictCode" placeholder="不可为空" maxlength="50" />
+            </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" name="dictName" placeholder="不可为空，50字以内" maxlength="50" />
                 </div>
-                <div class="form-group col-lg-6">
-                    <label class="control-label" for="dictCate">字典分项</label>
-                    <input type="text" class="form-control" id="dictCate" name="dictCate" placeholder="不可为空" maxlength="50" />
+            </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" name="dictCode" placeholder="不可为空，50字以内" maxlength="50" />
                 </div>
-                <div class="form-group col-lg-6">
-                    <label class="control-label" for="dictDefine">字典类别</label>
-                    <div class="dropdown lgbDropdown dropup">
-                        <a id="dictDefine" class="btn btn-success" data-toggle="dropdown" data-default-val="1">
-                            <span>全部</span><span class="caret"></span>
-                        </a>
-                        <ul class="dropdown-menu" role="menu">
-                            <li><a href="#" data-val="0">系统使用</a></li>
-                            <li><a href="#" data-val="1">自定义</a></li>
-                        </ul>
-                    </div>
+            </div>
+            <div class="form-group">
+                <label class="control-label col-sm-2" for="dictDefine">字典类型</label>
+                <div class="dropdown lgbDropdown dropup col-sm-10">
+                    <a id="dictDefine" class="btn btn-success" data-toggle="dropdown" data-default-val="1">
+                        <span>全部</span><span class="caret"></span>
+                    </a>
+                    <ul class="dropdown-menu" role="menu">
+                        <li><a href="#" data-val="0">系统使用</a></li>
+                        <li><a href="#" data-val="1">自定义</a></li>
+                    </ul>
                 </div>
             </div>
         </form>