From ec8d651e3bd85367356d8e9a5fa9af5bbc779f05 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Fri, 1 Jun 2018 17:10:09 +0800
Subject: [PATCH] =?UTF-8?q?treegrid=E5=B1=85=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../libs/jqTreeGrid/jquery.treegrid.extension.js   | 14 +++++++-------
 .../resources/static/ruoyi/system/dept/dept.js     |  9 ++++++---
 .../resources/static/ruoyi/system/menu/menu.js     |  6 ++++++
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/main/resources/static/ajax/libs/jqTreeGrid/jquery.treegrid.extension.js b/src/main/resources/static/ajax/libs/jqTreeGrid/jquery.treegrid.extension.js
index 8f9bc367c..ec1a93dc9 100644
--- a/src/main/resources/static/ajax/libs/jqTreeGrid/jquery.treegrid.extension.js
+++ b/src/main/resources/static/ajax/libs/jqTreeGrid/jquery.treegrid.extension.js
@@ -73,16 +73,16 @@
                     hasSelectItem = true;
                     var td = $('<td style="text-align:center;width:36px"></td>');
                     if(column.radio){
-                        var _ipt = $('<input name="select_item" type="radio" value="'+item[options.id]+'"></input>');
+                        var _ipt = $('<input text="select_item" type="radio" value="'+item[options.id]+'"></input>');
                         td.append(_ipt);
                     }
                     if(column.checkbox){
-                        var _ipt = $('<input name="select_item" type="checkbox" value="'+item[options.id]+'"></input>');
+                        var _ipt = $('<input text="select_item" type="checkbox" value="'+item[options.id]+'"></input>');
                         td.append(_ipt);
                     }
                     tr.append(td);
                 }else{
-                    var td = $('<td style="'+((column.width)?('width:'+column.width):'')+'"></td>');
+                    var td = $('<td style="text-align:'+column.align+';'+((column.width)?('width:'+column.width):'')+'"></td>');
                     // 增加formatter渲染
                     if (column.formatter) {
                         td.html(column.formatter.call(this, item, index));
@@ -104,9 +104,9 @@
                 // 判断有没有选择列
                 if(i==0&&item.field=='selectItem'){
                     hasSelectItem = true;
-                    th = $('<th style="width:36px"></th>');
+                    th = $('<th style="text-align:'+item.valign+';width:36px"></th>');
                 }else{
-                    th = $('<th style="padding:10px;'+((item.width)?('width:'+item.width):'')+'"></th>');
+                    th = $('<th style="text-align:'+item.valign+';padding:10px;'+((item.width)?('width:'+item.width):'')+'"></th>');
                 }
                 th.text(item.title);
                 thr.append(th);
@@ -170,7 +170,7 @@
                     // 行点击选中事件
                     target.find("tbody").find("tr").click(function(){
                         if(hasSelectItem){
-                            var _ipt = $(this).find("input[name='select_item']");
+                            var _ipt = $(this).find("input[text='select_item']");
                             if(_ipt.attr("type")=="radio"){
                                 _ipt.prop('checked',true);
                                 target.find("tbody").find("tr").removeClass("treegrid-selected");
@@ -209,7 +209,7 @@
         // 为了兼容bootstrap-table的写法，统一返回数组，这里只返回了指定的id
         getSelections : function(target, data) {
             // 所有被选中的记录input
-            var _ipt = target.find("tbody").find("tr").find("input[name='select_item']:checked");
+            var _ipt = target.find("tbody").find("tr").find("input[text='select_item']:checked");
             var chk_value =[];
             // 如果是radio
             if(_ipt.attr("type")=="radio"){
diff --git a/src/main/resources/static/ruoyi/system/dept/dept.js b/src/main/resources/static/ruoyi/system/dept/dept.js
index d44548004..1a9df4bc4 100644
--- a/src/main/resources/static/ruoyi/system/dept/dept.js
+++ b/src/main/resources/static/ruoyi/system/dept/dept.js
@@ -7,15 +7,17 @@ window.onload = function() {
 function loading() {
 	var columns = [{
         	field : 'deptName',
-			title : '部门名称'
+			title : '部门名称',
         },
         {
         	field : 'orderNum',
-			title : '排序'
+			title : '排序',
+			align : "center"
         },
         {
         	field : 'status',
 			title : '状态',
+			align : "center",
 			formatter : function(item, index) {
 				if (item.status == '0') {
 					return '<span class="badge badge-primary">正常</span>';
@@ -26,7 +28,8 @@ function loading() {
         },
         {
         	field: 'createTimeStr',
-			title : '创建时间'
+			title : '创建时间',
+			align : "center"
         },
         {
         	title : '操作',
diff --git a/src/main/resources/static/ruoyi/system/menu/menu.js b/src/main/resources/static/ruoyi/system/menu/menu.js
index 0f48228b7..491249add 100644
--- a/src/main/resources/static/ruoyi/system/menu/menu.js
+++ b/src/main/resources/static/ruoyi/system/menu/menu.js
@@ -22,16 +22,19 @@ function loading() {
         	field : 'orderNum',
 			title : '排序',
 			width : '10%',
+			align : "center"
         },
         {
         	field : 'url',
 			title : '请求地址',
 			width : '15%',
+			align : "center"
         },
         {
 			title : '类型',
 			field : 'menuType',
 			width : '10%',
+			align : "center",
 			formatter : function(item, index) {
 				if (item.menuType == 'M') {
 					return '<span class="label label-success">目录</span>';
@@ -48,6 +51,7 @@ function loading() {
             field: 'visible',
             title: '可见',
             width : '10%',
+            align : "center",
             formatter: function(row, index) {
                 if (row.visible == 0) {
                     return '<span class="badge badge-primary">显示</span>';
@@ -60,10 +64,12 @@ function loading() {
         	field : 'perms',
 			title : '权限标识',
 			width : '15%',
+			align : "center",
         },
         {
         	title : '操作',
 			width : '20%',
+			align : "center",
 			formatter : function(row, index) {
 				var actions = [];
 				actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" mce_href="#" onclick="edit(\'' + row.menuId + '\')"><i class="fa fa-edit"></i>编辑</a> ');