ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into master

This commit is contained in:
小光 2020-12-22 15:25:46 +08:00
parent 9fcc2f66c1 d6a2d09f95
commit 2fe87d1ef5
4 changed files with 762 additions and 755 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-treetable/bootstrap-treetable.js vendored
View File

@ -128,7 +128,7 @@
target.hasSelectItem = true; target.hasSelectItem = true;
$th = $('<th style="width:36px"></th>'); $th = $('<th style="width:36px"></th>');
} else { } else {
$th = $('<th style="' + ((column.width) ? ('width:' + column.width) : '') + '" class="' + column.field + '_cls"></th>'); $th = $('<th style="' + ((column.width) ? ('width:' + column.width + ((column.widthUnit) ? column.widthUnit : 'px')) : '') + '" class="' + column.field + '_cls"></th>');
} }
if((!target.isFixWidth)&& column.width){ if((!target.isFixWidth)&& column.width){
target.isFixWidth = column.width.indexOf("px")>-1?true:false; target.isFixWidth = column.width.indexOf("px")>-1?true:false;
@ -334,7 +334,7 @@
} else { } else {
var $td = $('<td name="' + column.field + '" class="' + column.field + '_cls"></td>'); var $td = $('<td name="' + column.field + '" class="' + column.field + '_cls"></td>');
if(column.width){ if(column.width){
$td.css("width",column.width); $td.css("width",column.width + (column.widthUnit ? column.widthUnit : 'px'));
} }
if(column.align){ if(column.align){
$td.css("text-align",column.align); $td.css("text-align",column.align);

2
ruoyi-admin/src/main/resources/static/ruoyi/js/common.js
View File

@ -422,7 +422,7 @@ var sub = {
editColumn: function() { editColumn: function() {
var count = $("#" + table.options.id).bootstrapTable('getData').length; var count = $("#" + table.options.id).bootstrapTable('getData').length;
var params = new Array(); var params = new Array();
for (var dataIndex = 0; dataIndex <= count; dataIndex++) { for (var dataIndex = 0; dataIndex < count; dataIndex++) {
var columns = $('#' + table.options.id + ' tr[data-index="' + dataIndex + '"] td'); var columns = $('#' + table.options.id + ' tr[data-index="' + dataIndex + '"] td');
var obj = new Object(); var obj = new Object();
for (var i = 0; i < columns.length; i++) { for (var i = 0; i < columns.length; i++) {

2
ruoyi-admin/src/main/resources/templates/demo/table/print.html
View File

@ -83,7 +83,7 @@
} }
// 自定义打印页面模板 // 自定义打印页面模板
function printPageBuilder(table){ function printPageBuilder(table) {
return ` return `
<html> <html>
<head> <head>

21
ruoyi-admin/src/main/resources/templates/system/menu/menu.html
View File

@ -72,7 +72,8 @@
{ {
title: '菜单名称', title: '菜单名称',
field: 'menuName', field: 'menuName',
width: '20%', width: '20',
widthUnit: '%',
formatter: function(value, row, index) { formatter: function(value, row, index) {
if ($.common.isEmpty(row.icon)) { if ($.common.isEmpty(row.icon)) {
return row.menuName; return row.menuName;
@ -84,13 +85,15 @@
{ {
field: 'orderNum', field: 'orderNum',
title: '排序', title: '排序',
width: '10%', width: '10',
widthUnit: '%',
align: "left" align: "left"
}, },
{ {
field: 'url', field: 'url',
title: '请求地址', title: '请求地址',
width: '15%', width: '15',
widthUnit: '%',
align: "left", align: "left",
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.tooltip(value); return $.table.tooltip(value);
@ -99,7 +102,8 @@
{ {
title: '类型', title: '类型',
field: 'menuType', field: 'menuType',
width: '10%', width: '10',
widthUnit: '%',
align: "left", align: "left",
formatter: function(value, item, index) { formatter: function(value, item, index) {
if (item.menuType == 'M') { if (item.menuType == 'M') {
@ -116,7 +120,8 @@
{ {
field: 'visible', field: 'visible',
title: '可见', title: '可见',
width: '10%', width: '10',
widthUnit: '%',
align: "left", align: "left",
formatter: function(value, row, index) { formatter: function(value, row, index) {
if (row.menuType == 'F') { if (row.menuType == 'F') {
@ -128,7 +133,8 @@
{ {
field: 'perms', field: 'perms',
title: '权限标识', title: '权限标识',
width: '15%', width: '15',
widthUnit: '%',
align: "left", align: "left",
formatter: function(value, row, index) { formatter: function(value, row, index) {
return $.table.tooltip(value); return $.table.tooltip(value);
@ -136,7 +142,8 @@
}, },
{ {
title: '操作', title: '操作',
width: '20%', width: '20',
widthUnit: '%',
align: "left", align: "left",
formatter: function(value, row, index) { formatter: function(value, row, index) {
var actions = []; var actions = [];