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

若依3.3

Browse Source
This commit is contained in:
RuoYi
2019-03-31 12:56:04 +08:00
parent 7e67c233dc
commit 87b7e8665a
88 changed files with 1738 additions and 619 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/bootstrap-table.min.js vendored
View File

File diff suppressed because one or more lines are too long

124
ruoyi-admin/src/main/resources/static/ruoyi/css/ry-ui.css
View File

@ -50,6 +50,130 @@
margin-left: 20px;
}
.section-content {
min-height: 250px;
margin-right: auto;
margin-left: auto;
padding: 5px 5px 5px 5px;
width: 100%;
height: 100%;
position: absolute;
}
.ibox {
margin-bottom: 25px;
background-color: #fff;
border: 1px solid #ddd;
border-radius: 4px;
height: 100%;
-webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, .05);
}
.list-group-striped > .list-group-item {
border-left: 0;
border-right: 0;
border-radius: 0;
padding-left: 0;
padding-right: 0
}
.ibox-title-gray {
height: 41px;
background-color: #f0f3f4;
color: #333;
font-weight: 700;
border-radius: 2px 2px 0 0;
padding: 13px !important;
border-bottom: 1px solid #eee;
display: block;
clear: both;
}
.dashboard-header h5 {
padding: 8px 0 0 0;
display: inline-block;
font-size: 14px;
text-overflow: ellipsis;
float: left;
font-weight: 400;
}
.ibox-title-gray h5 {
display: inline-block;
font-size: 14px;
margin: 0 0 7px;
padding: 0;
text-overflow: ellipsis;
float: left;
}
/* 导航页签 */
.nav-tabs-custom {
margin-bottom: 20px;
background: #fff;
box-shadow: 0 1px 1px rgba(0,0,0,0.1);
border-radius: 3px
}
.nav-tabs-custom>.nav-tabs {
margin: 0;
border-bottom-color: #f4f4f4;
border-top-right-radius: 3px;
border-top-left-radius: 3px
}
.nav-tabs-custom>.nav-tabs>li {
border-top: 3px solid transparent;
margin-bottom: -2px;
margin-right: 5px
}
.nav-tabs-custom>.nav-tabs>li.disabled>a {
color: #777
}
.nav-tabs-custom>.nav-tabs>li>a {
color: #444;
font-weight: normal;
border-radius: 0
}
.nav-tabs-custom>.nav-tabs>li>a,.nav-tabs-custom>.nav-tabs>li>a:hover {
background: transparent;
margin: 0
}
.nav-tabs-custom>.nav-tabs>li>a:hover {
color: #999
}
.nav-tabs-custom>.nav-tabs>li:not(.active)>a:hover,.nav-tabs-custom>.nav-tabs>li:not(.active)>a:focus,.nav-tabs-custom>.nav-tabs>li:not(.active)>a:active {
border-color: transparent
}
.nav-tabs-custom>.nav-tabs>li.active {
border-top-color: #1890ff
}
.nav-tabs-custom>.nav-tabs>li.active>a,.nav-tabs-custom>.nav-tabs>li.active:hover>a {
background-color: #fff;
color: #444
}
.nav-tabs-custom>.nav-tabs>li.active>a {
border-top-color: transparent;
border-bottom-color: transparent;
border-left-color: #f4f4f4;
border-right-color: #f4f4f4
}
.nav-tabs-custom>.tab-content {
background: #fff;
padding: 10px;
border-bottom-right-radius: 3px;
border-bottom-left-radius: 3px
}
/** 弹层组件 禁用样式 **/
.layer-disabled {
border: 1px #dedede solid !important;

131
ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
View File

@ -32,6 +32,7 @@
showToggle: true,
showExport: false,
clickToSelect: false,
rememberSelected: false,
fixedColumns: false,
fixedNumber: 0,
rightFixedColumns: false,
@ -68,6 +69,7 @@
showToggle: options.showToggle, // 是否显示详细视图和列表视图的切换按钮
showExport: options.showExport, // 是否支持导出文件
clickToSelect: options.clickToSelect, // 是否启用点击选中行
rememberSelected: options.rememberSelected, // 启用翻页记住前面的选择
fixedColumns: options.fixedColumns, // 是否启用冻结列（左侧）
fixedNumber: options.fixedNumber, // 列冻结的个数（左侧）
rightFixedColumns: options.rightFixedColumns, // 是否启用冻结列（右侧）
@ -106,11 +108,21 @@
onLoadSuccess: function(data) {
// 浮动提示框特效
$("[data-toggle='tooltip']").tooltip();
// 触发行点击事件
// 触发行点击事件 加载成功事件
$("#" + $.table._option.id).on("check.bs.table uncheck.bs.table check-all.bs.table uncheck-all.bs.table load-success.bs.table", function () {
var ids = $("#" + $.table._option.id).bootstrapTable("getSelections");
$('#' + $.table._option.toolbar + ' .btn-del').toggleClass('disabled', !ids.length);
$('#' + $.table._option.toolbar + ' .btn-edit').toggleClass('disabled', ids.length!=1);
// 工具栏按钮控制
var rows = $.common.isEmpty($.table._option.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns($.table._option.uniqueId);
$('#' + $.table._option.toolbar + ' .btn-del').toggleClass('disabled', !rows.length);
$('#' + $.table._option.toolbar + ' .btn-edit').toggleClass('disabled', rows.length!=1);
});
// 绑定选中事件、取消事件、全部选中、全部取消
$("#" + $.table._option.id).on("check.bs.table check-all.bs.table uncheck.bs.table uncheck-all.bs.table", function (e, rows) {
// 复选框分页保留保存选中数组
var rows = $.common.isEmpty($.table._option.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns($.table._option.uniqueId);
if ($.common.isNotEmpty($.table._option.rememberSelected) && $.table._option.rememberSelected) {
func = $.inArray(e.type, ['check', 'check-all']) > -1 ? 'union' : 'difference';
selectionIds = _[func](selectionIds, rows);
}
});
},
// 表格销毁
@ -169,15 +181,19 @@
},
// 导出数据
exportExcel: function(formId) {
var currentId = $.common.isEmpty(formId) ? $('form').attr('id') : formId;
$.modal.loading("正在导出数据，请稍后...");
$.post($.table._option.exportUrl, $("#" + currentId).serializeArray(), function(result) {
if (result.code == web_status.SUCCESS) {
window.location.href = ctx + "common/download?fileName=" + encodeURI(result.msg) + "&delete=" + true;
} else {
$.modal.alertError(result.msg);
}
$.modal.closeLoading();
$.modal.confirm("确定导出所有" + $.table._option.modalName + "吗？", function() {
var currentId = $.common.isEmpty(formId) ? $('form').attr('id') : formId;
$.modal.loading("正在导出数据，请稍后...");
$.post($.table._option.exportUrl, $("#" + currentId).serializeArray(), function(result) {
if (result.code == web_status.SUCCESS) {
window.location.href = ctx + "common/download?fileName=" + encodeURI(result.msg) + "&delete=" + true;
} else if (result.code == web_status.WARNING) {
$.modal.alertWarning(result.msg)
} else {
$.modal.alertError(result.msg);
}
$.modal.closeLoading();
});
});
},
// 下载模板
@ -185,7 +201,9 @@
$.get($.table._option.importTemplateUrl, function(result) {
if (result.code == web_status.SUCCESS) {
window.location.href = ctx + "common/download?fileName=" + encodeURI(result.msg) + "&delete=" + true;
} else {
} else if (result.code == web_status.WARNING) {
$.modal.alertWarning(result.msg)
} else {
$.modal.alertError(result.msg);
}
});
@ -229,7 +247,11 @@
$.modal.closeAll();
$.modal.alertSuccess(result.msg);
$.table.refresh();
} else {
} else if (result.code == web_status.WARNING) {
layer.close(index);
$.modal.enable();
$.modal.alertWarning(result.msg)
} else {
layer.close(index);
$.modal.enable();
$.modal.alertError(result.msg);
@ -247,15 +269,23 @@
},
// 查询表格指定列值
selectColumns: function(column) {
return $.map($('#' + $.table._option.id).bootstrapTable('getSelections'), function (row) {
var rows = $.map($('#' + $.table._option.id).bootstrapTable('getSelections'), function (row) {
return row[column];
});
if ($.common.isNotEmpty($.table._option.rememberSelected) && $.table._option.rememberSelected) {
rows = rows.concat(selectionIds);
}
return $.common.uniqueFn(rows);
},
// 查询表格首列值
selectFirstColumns: function() {
return $.map($('#' + $.table._option.id).bootstrapTable('getSelections'), function (row) {
var rows = $.map($('#' + $.table._option.id).bootstrapTable('getSelections'), function (row) {
return row[$.table._option.columns[1].field];
});
if ($.common.isNotEmpty($.table._option.rememberSelected) && $.table._option.rememberSelected) {
rows = rows.concat(selectionIds);
}
return $.common.uniqueFn(rows);
},
// 回显数据字典
selectDictLabel: function(datas, value) {
@ -736,7 +766,7 @@
}
return url;
},
// 保存信息
// 保存信息 刷新表格
save: function(url, data) {
var config = {
url: url,
@ -753,6 +783,29 @@
};
$.ajax(config)
},
// 保存信息 弹出提示框
saveModal: function(url, data) {
var config = {
url: url,
type: "post",
dataType: "json",
data: data,
beforeSend: function () {
$.modal.loading("正在处理中，请稍后...");
},
success: function(result) {
if (result.code == web_status.SUCCESS) {
$.modal.alertSuccess(result.msg)
} else if (result.code == web_status.WARNING) {
$.modal.alertWarning(result.msg)
} else {
$.modal.alertError(result.msg);
}
$.modal.closeLoading();
}
};
$.ajax(config)
},
// 保存选项卡信息
saveTab: function(url, data) {
var config = {
@ -777,7 +830,9 @@
} else if (result.code == web_status.SUCCESS && $.table._option.type == table_type.bootstrapTreeTable) {
$.modal.msgSuccess(result.msg);
$.treeTable.refresh();
} else {
} else if (result.code == web_status.WARNING) {
$.modal.alertWarning(result.msg)
} else {
$.modal.alertError(result.msg);
}
$.modal.closeLoading();
@ -786,7 +841,9 @@
saveSuccess: function (result) {
if (result.code == web_status.SUCCESS) {
$.modal.msgReload("保存成功,正在刷新数据请稍后……", modal_status.SUCCESS);
} else {
} else if (result.code == web_status.WARNING) {
$.modal.alertWarning(result.msg)
} else {
$.modal.alertError(result.msg);
}
$.modal.closeLoading();
@ -806,7 +863,9 @@
} else {
$.modal.msgReload("保存成功,正在刷新数据请稍后……", modal_status.SUCCESS);
}
} else {
} else if (result.code == web_status.WARNING) {
$.modal.alertWarning(result.msg)
} else {
$.modal.alertError(result.msg);
}
$.modal.closeLoading();
@ -827,6 +886,8 @@
$contentWindow.$.treeTable.refresh();
}
closeItem();
} else if (result.code == web_status.WARNING) {
$.modal.alertWarning(result.msg)
} else {
$.modal.alertError(result.msg);
}
@ -1057,6 +1118,19 @@
}
return value.toString().replace(/(^\s*)|(\s*$)|\r|\n/g, "");
},
// 字符串格式化(%s )
sprintf: function (str) {
var args = arguments, flag = true, i = 1;
str = str.replace(/%s/g, function () {
var arg = args[i++];
if (typeof arg === 'undefined') {
flag = false;
return '';
}
return arg;
});
return flag ? str : '';
},
// 指定随机数返回
random: function (min, max) {
return Math.floor((Math.random() * max) + min);
@ -1070,6 +1144,18 @@
endWith: function(value, end) {
var reg = new RegExp(end + "$");
return reg.test(value)
},
// 数组去重
uniqueFn: function(array) {
var result = [];
var hashObj = {};
for (var i = 0; i < array.length; i++) {
if (!hashObj[array[i]]) {
hashObj[array[i]] = true;
result.push(array[i]);
}
}
return result;
}
}
});
@ -1084,7 +1170,8 @@ table_type = {
/** 消息状态码 */
web_status = {
SUCCESS: 0,
FAIL: 500
FAIL: 500,
WARNING: 301
};
/** 弹窗状态码 */