diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/index.js b/ruoyi-admin/src/main/resources/static/ruoyi/index.js
index a4ff28f1..29f21242 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/index.js
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/index.js
@@ -24,9 +24,9 @@ $(function() {
// 菜单切换
$('.navbar-minimalize').click(function() {
if (isMobile) {
- $("body").toggleClass("canvas-menu");
+ $("body").toggleClass("canvas-menu");
} else {
- $("body").toggleClass("mini-navbar");
+ $("body").toggleClass("mini-navbar");
}
SmoothlyMenu();
});
@@ -62,12 +62,12 @@ $(window).bind("load resize", function() {
$('.navbar-static-side').fadeOut();
} else {
if($('body').hasClass('canvas-menu')) {
- $('body').addClass('fixed-sidebar');
- $('body').removeClass('canvas-menu');
- $("body").removeClass("mini-navbar");
- $("nav .logo").removeClass("hide");
- $(".slimScrollDiv").css({ "overflow": "visible" });
- $('.navbar-static-side').fadeIn();
+ $('body').addClass('fixed-sidebar');
+ $('body').removeClass('canvas-menu');
+ $("body").removeClass("mini-navbar");
+ $("nav .logo").removeClass("hide");
+ $(".slimScrollDiv").css({ "overflow": "visible" });
+ $('.navbar-static-side').fadeIn();
}
}
});
@@ -89,7 +89,7 @@ function syncMenuTab(dataId) {
$("#tab_" + menuId + " a").click();
}
}
- }
+ }
}
function NavToggle() {
@@ -97,12 +97,11 @@ function NavToggle() {
}
function fixedSidebar() {
- $('#side-menu').hide();
- $("nav .logo").addClass("hide");
+ $('#side-menu').hide();
+ $("nav .logo").addClass("hide");
setTimeout(function() {
$('#side-menu').fadeIn(500);
- },
- 100);
+ }, 100);
}
function SmoothlyMenu() {
@@ -263,8 +262,8 @@ $(function() {
var $dataObj = $('a[href$="' + decodeURI(dataUrl) + '"]');
if (!$dataObj.hasClass("noactive")) {
- $('.tab-pane li').removeClass("active");
- $('.nav ul').removeClass("in");
+ $('.tab-pane li').removeClass("active");
+ $('.nav ul').removeClass("in");
$dataObj.parents("ul").addClass("in")
$dataObj.parents("li").addClass("active").siblings().removeClass("active").find('li').removeClass("active");
$dataObj.parents("ul").css('height', 'auto').height();
@@ -395,7 +394,7 @@ $(function() {
$(this).show().siblings('.RuoYi_iframe').hide();
return false;
}
- });
+ });
}
}
}
@@ -450,14 +449,14 @@ $(function() {
var currentId = $('.page-tabs-content').find('.active').attr('data-id');
var target = $('.RuoYi_iframe[data-id="' + currentId + '"]');
var url = target.attr('src');
- target.attr('src', url).ready();
+ target.attr('src', url).ready();
}
// 页签全屏
function fullScreenTab() {
var currentId = $('.page-tabs-content').find('.active').attr('data-id');
var target = $('.RuoYi_iframe[data-id="' + currentId + '"]');
- target.fullScreen(true);
+ target.fullScreen(true);
}
// 关闭当前选项卡
@@ -538,11 +537,11 @@ $(function() {
// 设置锚点
function setIframeUrl(href) {
if($.common.equals("history", mode)) {
- storage.set('publicPath', href);
+ storage.set('publicPath', href);
} else {
- var nowUrl = window.location.href;
- var newUrl = nowUrl.substring(0, nowUrl.indexOf("#"));
- window.location.href = newUrl + "#" + href;
+ var nowUrl = window.location.href;
+ var newUrl = nowUrl.substring(0, nowUrl.indexOf("#"));
+ window.location.href = newUrl + "#" + href;
}
}
@@ -569,14 +568,14 @@ $(function() {
name: "关闭当前",
icon: "fa-close",
callback: function(key, opt) {
- opt.$trigger.find('i').trigger("click");
+ opt.$trigger.find('i').trigger("click");
}
},
"close_other": {
name: "关闭其他",
icon: "fa-window-close-o",
callback: function(key, opt) {
- setActiveTab(this);
+ setActiveTab(this);
tabCloseOther();
}
},
@@ -584,23 +583,23 @@ $(function() {
name: "关闭左侧",
icon: "fa-reply",
callback: function(key, opt) {
- setActiveTab(this);
- this.prevAll('.menuTab').not(":last").each(function() {
- if ($(this).hasClass('active')) {
- setActiveTab(this);
- }
- $('.RuoYi_iframe[data-id="' + $(this).data('id') + '"]').remove();
- $(this).remove();
- });
- $('.page-tabs-content').css("margin-left", "0");
+ setActiveTab(this);
+ this.prevAll('.menuTab').not(":last").each(function() {
+ if ($(this).hasClass('active')) {
+ setActiveTab(this);
+ }
+ $('.RuoYi_iframe[data-id="' + $(this).data('id') + '"]').remove();
+ $(this).remove();
+ });
+ $('.page-tabs-content').css("margin-left", "0");
}
},
"close_right": {
name: "关闭右侧",
icon: "fa-share",
callback: function(key, opt) {
- setActiveTab(this);
- this.nextAll('.menuTab').each(function() {
+ setActiveTab(this);
+ this.nextAll('.menuTab').each(function() {
$('.menuTab[data-id="' + $(this).data('id') + '"]').remove();
$(this).remove();
});
@@ -618,18 +617,18 @@ $(function() {
name: "全屏显示",
icon: "fa-arrows-alt",
callback: function(key, opt) {
- setActiveTab(this);
+ setActiveTab(this);
var target = $('.RuoYi_iframe[data-id="' + this.data('id') + '"]');
- target.fullScreen(true);
+ target.fullScreen(true);
}
},
"refresh": {
name: "刷新页面",
icon: "fa-refresh",
callback: function(key, opt) {
- setActiveTab(this);
- var target = $('.RuoYi_iframe[data-id="' + this.data('id') + '"]');
- var url = target.attr('src');
+ setActiveTab(this);
+ var target = $('.RuoYi_iframe[data-id="' + this.data('id') + '"]');
+ var url = target.attr('src');
$.modal.loading("数据加载中,请稍后...");
target.attr('src', url).load(function () {
$.modal.closeLoading();
@@ -640,7 +639,7 @@ $(function() {
name: "新窗口打开",
icon: "fa-link",
callback: function(key, opt) {
- var target = $('.RuoYi_iframe[data-id="' + this.data('id') + '"]');
+ var target = $('.RuoYi_iframe[data-id="' + this.data('id') + '"]');
window.open(target.attr('src'));
}
},
diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js
index 163d2ce6..bc810834 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js
@@ -4,187 +4,187 @@
*/
$(function() {
- // layer扩展皮肤
- if (window.layer !== undefined) {
- layer.config({
- extend: 'moon/style.css',
- skin: 'layer-ext-moon'
- });
- }
+ // layer扩展皮肤
+ if (window.layer !== undefined) {
+ layer.config({
+ extend: 'moon/style.css',
+ skin: 'layer-ext-moon'
+ });
+ }
- // 回到顶部绑定
- if ($.fn.toTop !== undefined) {
- $('#scroll-up').toTop();
- }
+ // 回到顶部绑定
+ if ($.fn.toTop !== undefined) {
+ $('#scroll-up').toTop();
+ }
- // select2复选框事件绑定
- if ($.fn.select2 !== undefined) {
+ // select2复选框事件绑定
+ if ($.fn.select2 !== undefined) {
$.fn.select2.defaults.set( "theme", "bootstrap" );
- $("select.form-control:not(.noselect2)").each(function () {
- $(this).select2().on("change", function () {
- $(this).valid();
- })
- })
- }
+ $("select.form-control:not(.noselect2)").each(function () {
+ $(this).select2().on("change", function () {
+ $(this).valid();
+ })
+ })
+ }
- // iCheck单选框及复选框事件绑定
- if ($.fn.iCheck !== undefined) {
- $(".check-box:not(.noicheck),.radio-box:not(.noicheck)").each(function() {
+ // iCheck单选框及复选框事件绑定
+ if ($.fn.iCheck !== undefined) {
+ $(".check-box:not(.noicheck),.radio-box:not(.noicheck)").each(function() {
$(this).iCheck({
checkboxClass: 'icheckbox-blue',
radioClass: 'iradio-blue',
})
})
- }
+ }
- // 气泡弹出框特效(移到元素时)
- $(document).on("mouseenter", '.table [data-toggle="popover"]', function() {
- var _this = this;
- $(this).popover("show");
- $(".popover").on("mouseleave", function() {
- $(_this).popover('hide');
- });
- })
+ // 气泡弹出框特效(移到元素时)
+ $(document).on("mouseenter", '.table [data-toggle="popover"]', function() {
+ var _this = this;
+ $(this).popover("show");
+ $(".popover").on("mouseleave", function() {
+ $(_this).popover('hide');
+ });
+ })
- // 气泡弹出框特效(离开元素时)
- $(document).on("mouseleave", '.table [data-toggle="popover"]', function() {
- var _this = this;
- setTimeout(function() {
- if (!$(".popover:hover").length) $(_this).popover("hide");
- }, 100);
- });
+ // 气泡弹出框特效(离开元素时)
+ $(document).on("mouseleave", '.table [data-toggle="popover"]', function() {
+ var _this = this;
+ setTimeout(function() {
+ if (!$(".popover:hover").length) $(_this).popover("hide");
+ }, 100);
+ });
- // 取消回车自动提交表单
- $(document).on("keypress", ":input:not(textarea):not([type=submit])", function(event) {
+ // 取消回车自动提交表单
+ $(document).on("keypress", ":input:not(textarea):not([type=submit])", function(event) {
if (event.keyCode == 13) {
event.preventDefault();
}
});
- // laydate 时间控件绑定
- if ($(".select-time").length > 0) {
- layui.use('laydate', function() {
- var laydate = layui.laydate;
- var startDate = laydate.render({
- elem: '#startTime',
- max: $('#endTime').val(),
- theme: 'molv',
- trigger: 'click',
- done: function(value, date) {
- // 结束时间大于开始时间
- if (value !== '') {
- endDate.config.min.year = date.year;
- endDate.config.min.month = date.month - 1;
- endDate.config.min.date = date.date;
- } else {
- endDate.config.min.year = '';
- endDate.config.min.month = '';
- endDate.config.min.date = '';
- }
- }
- });
- var endDate = laydate.render({
- elem: '#endTime',
- min: $('#startTime').val(),
- theme: 'molv',
- trigger: 'click',
- done: function(value, date) {
- // 开始时间小于结束时间
- if (value !== '') {
- startDate.config.max.year = date.year;
- startDate.config.max.month = date.month - 1;
- startDate.config.max.date = date.date;
- } else {
- startDate.config.max.year = '2099';
- startDate.config.max.month = '12';
- startDate.config.max.date = '31';
- }
- }
- });
- });
- }
+ // laydate 时间控件绑定
+ if ($(".select-time").length > 0) {
+ layui.use('laydate', function() {
+ var laydate = layui.laydate;
+ var startDate = laydate.render({
+ elem: '#startTime',
+ max: $('#endTime').val(),
+ theme: 'molv',
+ trigger: 'click',
+ done: function(value, date) {
+ // 结束时间大于开始时间
+ if (value !== '') {
+ endDate.config.min.year = date.year;
+ endDate.config.min.month = date.month - 1;
+ endDate.config.min.date = date.date;
+ } else {
+ endDate.config.min.year = '';
+ endDate.config.min.month = '';
+ endDate.config.min.date = '';
+ }
+ }
+ });
+ var endDate = laydate.render({
+ elem: '#endTime',
+ min: $('#startTime').val(),
+ theme: 'molv',
+ trigger: 'click',
+ done: function(value, date) {
+ // 开始时间小于结束时间
+ if (value !== '') {
+ startDate.config.max.year = date.year;
+ startDate.config.max.month = date.month - 1;
+ startDate.config.max.date = date.date;
+ } else {
+ startDate.config.max.year = '2099';
+ startDate.config.max.month = '12';
+ startDate.config.max.date = '31';
+ }
+ }
+ });
+ });
+ }
- // laydate time-input 时间控件绑定
- if ($(".time-input").length > 0) {
- layui.use('laydate', function () {
- var com = layui.laydate;
- $(".time-input").each(function (index, item) {
- var time = $(item);
- // 控制控件外观
- var type = time.attr("data-type") || 'date';
- // 控制回显格式
- var format = time.attr("data-format") || 'yyyy-MM-dd';
- // 控制日期控件按钮
- var buttons = time.attr("data-btn") || 'clear|now|confirm', newBtnArr = [];
- // 日期控件选择完成后回调处理
- var callback = time.attr("data-callback") || {};
- if (buttons) {
- if (buttons.indexOf("|") > 0) {
- var btnArr = buttons.split("|"), btnLen = btnArr.length;
- for (var j = 0; j < btnLen; j++) {
- if ("clear" === btnArr[j] || "now" === btnArr[j] || "confirm" === btnArr[j]) {
- newBtnArr.push(btnArr[j]);
- }
- }
- } else {
- if ("clear" === buttons || "now" === buttons || "confirm" === buttons) {
- newBtnArr.push(buttons);
- }
- }
- } else {
- newBtnArr = ['clear', 'now', 'confirm'];
- }
- com.render({
- elem: item,
- theme: 'molv',
- trigger: 'click',
- type: type,
- format: format,
- btns: newBtnArr,
- done: function (value, data) {
- if (typeof window[callback] != 'undefined'
- && window[callback] instanceof Function) {
- window[callback](value, data);
- }
- }
- });
- });
- });
- }
+ // laydate time-input 时间控件绑定
+ if ($(".time-input").length > 0) {
+ layui.use('laydate', function () {
+ var com = layui.laydate;
+ $(".time-input").each(function (index, item) {
+ var time = $(item);
+ // 控制控件外观
+ var type = time.attr("data-type") || 'date';
+ // 控制回显格式
+ var format = time.attr("data-format") || 'yyyy-MM-dd';
+ // 控制日期控件按钮
+ var buttons = time.attr("data-btn") || 'clear|now|confirm', newBtnArr = [];
+ // 日期控件选择完成后回调处理
+ var callback = time.attr("data-callback") || {};
+ if (buttons) {
+ if (buttons.indexOf("|") > 0) {
+ var btnArr = buttons.split("|"), btnLen = btnArr.length;
+ for (var j = 0; j < btnLen; j++) {
+ if ("clear" === btnArr[j] || "now" === btnArr[j] || "confirm" === btnArr[j]) {
+ newBtnArr.push(btnArr[j]);
+ }
+ }
+ } else {
+ if ("clear" === buttons || "now" === buttons || "confirm" === buttons) {
+ newBtnArr.push(buttons);
+ }
+ }
+ } else {
+ newBtnArr = ['clear', 'now', 'confirm'];
+ }
+ com.render({
+ elem: item,
+ theme: 'molv',
+ trigger: 'click',
+ type: type,
+ format: format,
+ btns: newBtnArr,
+ done: function (value, data) {
+ if (typeof window[callback] != 'undefined'
+ && window[callback] instanceof Function) {
+ window[callback](value, data);
+ }
+ }
+ });
+ });
+ });
+ }
- // tree 关键字搜索绑定
- if ($("#keyword").length > 0) {
- $("#keyword").bind("focus", function focusKey(e) {
- if ($("#keyword").hasClass("empty")) {
- $("#keyword").removeClass("empty");
- }
- }).bind("blur", function blurKey(e) {
- if ($("#keyword").val() === "") {
- $("#keyword").addClass("empty");
- }
- $.tree.searchNode(e);
- }).bind("input propertychange", $.tree.searchNode);
- }
+ // tree 关键字搜索绑定
+ if ($("#keyword").length > 0) {
+ $("#keyword").bind("focus", function focusKey(e) {
+ if ($("#keyword").hasClass("empty")) {
+ $("#keyword").removeClass("empty");
+ }
+ }).bind("blur", function blurKey(e) {
+ if ($("#keyword").val() === "") {
+ $("#keyword").addClass("empty");
+ }
+ $.tree.searchNode(e);
+ }).bind("input propertychange", $.tree.searchNode);
+ }
- // tree表格树 展开/折叠
- var expandFlag;
- $("#expandAllBtn").click(function() {
- var dataExpand = $.common.isEmpty(table.options.expandAll) ? true : table.options.expandAll;
- expandFlag = $.common.isEmpty(expandFlag) ? dataExpand : expandFlag;
- if (!expandFlag) {
- $.bttTable.bootstrapTreeTable('expandAll');
- } else {
- $.bttTable.bootstrapTreeTable('collapseAll');
- }
- expandFlag = expandFlag ? false: true;
- })
+ // tree表格树 展开/折叠
+ var expandFlag;
+ $("#expandAllBtn").click(function() {
+ var dataExpand = $.common.isEmpty(table.options.expandAll) ? true : table.options.expandAll;
+ expandFlag = $.common.isEmpty(expandFlag) ? dataExpand : expandFlag;
+ if (!expandFlag) {
+ $.bttTable.bootstrapTreeTable('expandAll');
+ } else {
+ $.bttTable.bootstrapTreeTable('collapseAll');
+ }
+ expandFlag = expandFlag ? false: true;
+ })
- // 按下ESC按钮关闭弹层
- $('body', document).on('keyup', function(e) {
- if (e.which === 27) {
- $.modal.closeAll();
- }
- });
+ // 按下ESC按钮关闭弹层
+ $('body', document).on('keyup', function(e) {
+ if (e.which === 27) {
+ $.modal.closeAll();
+ }
+ });
});
(function ($) {
@@ -233,8 +233,8 @@ $(function() {
/** 刷新选项卡 */
var refreshItem = function(){
var topWindow = $(window.parent.document);
- var currentId = $('.page-tabs-content', topWindow).find('.active').attr('data-id');
- var target = $('.RuoYi_iframe[data-id="' + currentId + '"]', topWindow);
+ var currentId = $('.page-tabs-content', topWindow).find('.active').attr('data-id');
+ var target = $('.RuoYi_iframe[data-id="' + currentId + '"]', topWindow);
var url = target.attr('src');
target.attr('src', url).ready();
}
@@ -243,29 +243,29 @@ var refreshItem = function(){
var closeItem = function(dataId){
var topWindow = $(window.parent.document);
if($.common.isNotEmpty(dataId)){
- window.parent.$.modal.closeLoading();
- // 根据dataId关闭指定选项卡
- $('.menuTab[data-id="' + dataId + '"]', topWindow).remove();
- // 移除相应tab对应的内容区
- $('.mainContent .RuoYi_iframe[data-id="' + dataId + '"]', topWindow).remove();
- return;
+ window.parent.$.modal.closeLoading();
+ // 根据dataId关闭指定选项卡
+ $('.menuTab[data-id="' + dataId + '"]', topWindow).remove();
+ // 移除相应tab对应的内容区
+ $('.mainContent .RuoYi_iframe[data-id="' + dataId + '"]', topWindow).remove();
+ return;
}
var panelUrl = window.frameElement.getAttribute('data-panel');
$('.page-tabs-content .active i', topWindow).click();
if($.common.isNotEmpty(panelUrl)){
- $('.menuTab[data-id="' + panelUrl + '"]', topWindow).addClass('active').siblings('.menuTab').removeClass('active');
- $('.mainContent .RuoYi_iframe', topWindow).each(function() {
- if ($(this).data('id') == panelUrl) {
- $(this).show().siblings('.RuoYi_iframe').hide();
- return false;
+ $('.menuTab[data-id="' + panelUrl + '"]', topWindow).addClass('active').siblings('.menuTab').removeClass('active');
+ $('.mainContent .RuoYi_iframe', topWindow).each(function() {
+ if ($(this).data('id') == panelUrl) {
+ $(this).show().siblings('.RuoYi_iframe').hide();
+ return false;
}
- });
- }
+ });
+ }
}
/** 创建选项卡 */
function createMenuItem(dataUrl, menuName) {
- var panelUrl = window.frameElement.getAttribute('data-id');
+ var panelUrl = window.frameElement.getAttribute('data-id');
dataIndex = $.common.random(1, 100),
flag = true;
if (dataUrl == undefined || $.trim(dataUrl).length == 0) return false;
@@ -300,7 +300,7 @@ function createMenuItem(dataUrl, menuName) {
window.parent.$.modal.loading("数据加载中,请稍后...");
$('.mainContent iframe:visible', topWindow).load(function () {
- window.parent.$.modal.closeLoading();
+ window.parent.$.modal.closeLoading();
});
// 添加选项卡
@@ -312,7 +312,7 @@ function createMenuItem(dataUrl, menuName) {
// 滚动到指定选项卡
function scrollToTab(element) {
- var topWindow = $(window.parent.document);
+ var topWindow = $(window.parent.document);
var marginLeftVal = calSumWidth($(element).prevAll()),
marginRightVal = calSumWidth($(element).nextAll());
// 可视区域非tab宽度
@@ -349,28 +349,28 @@ function calSumWidth(elements) {
/** 密码规则范围验证 */
function checkpwd(chrtype, password) {
- if (chrtype == 1) {
- if(!$.common.numValid(password)){
- $.modal.alertWarning("密码只能为0-9数字");
- return false;
- }
- } else if (chrtype == 2) {
- if(!$.common.enValid(password)){
- $.modal.alertWarning("密码只能为a-z和A-Z字母");
- return false;
- }
- } else if (chrtype == 3) {
- if(!$.common.enNumValid(password)){
- $.modal.alertWarning("密码必须包含字母以及数字");
- return false;
- }
- } else if (chrtype == 4) {
- if(!$.common.charValid(password)){
- $.modal.alertWarning("密码必须包含字母、数字、以及特殊符号~!@#$%^&*()-=_+");
- return false;
- }
- }
- return true;
+ if (chrtype == 1) {
+ if(!$.common.numValid(password)){
+ $.modal.alertWarning("密码只能为0-9数字");
+ return false;
+ }
+ } else if (chrtype == 2) {
+ if(!$.common.enValid(password)){
+ $.modal.alertWarning("密码只能为a-z和A-Z字母");
+ return false;
+ }
+ } else if (chrtype == 3) {
+ if(!$.common.enNumValid(password)){
+ $.modal.alertWarning("密码必须包含字母以及数字");
+ return false;
+ }
+ } else if (chrtype == 4) {
+ if(!$.common.charValid(password)){
+ $.modal.alertWarning("密码必须包含字母、数字、以及特殊符号~!@#$%^&*()-=_+");
+ return false;
+ }
+ }
+ return true;
}
// 日志打印封装处理
@@ -411,21 +411,21 @@ var sub = {
var count = $("#" + table.options.id).bootstrapTable('getData').length;
var params = new Array();
for (var dataIndex = 0; dataIndex <= count; dataIndex++) {
- var columns = $('#' + table.options.id + ' tr[data-index="' + dataIndex + '"] td');
- var obj = new Object();
- for (var i = 0; i < columns.length; i++) {
- var inputValue = $(columns[i]).find('input');
- var selectValue = $(columns[i]).find('select');
- var key = table.options.columns[i].field;
- if ($.common.isNotEmpty(inputValue.val())) {
- obj[key] = inputValue.val();
- } else if ($.common.isNotEmpty(selectValue.val())) {
- obj[key] = selectValue.val();
- } else {
- obj[key] = "";
- }
- }
- params.push({ index: dataIndex, row: obj });
+ var columns = $('#' + table.options.id + ' tr[data-index="' + dataIndex + '"] td');
+ var obj = new Object();
+ for (var i = 0; i < columns.length; i++) {
+ var inputValue = $(columns[i]).find('input');
+ var selectValue = $(columns[i]).find('select');
+ var key = table.options.columns[i].field;
+ if ($.common.isNotEmpty(inputValue.val())) {
+ obj[key] = inputValue.val();
+ } else if ($.common.isNotEmpty(selectValue.val())) {
+ obj[key] = selectValue.val();
+ } else {
+ obj[key] = "";
+ }
+ }
+ params.push({ index: dataIndex, row: obj });
}
$("#" + table.options.id).bootstrapTable("updateRow", params);
},
@@ -445,12 +445,12 @@ var sub = {
$.ajaxSetup({
complete: function(XMLHttpRequest, textStatus) {
if (textStatus == 'timeout') {
- $.modal.alertWarning("服务器超时,请稍后再试!");
- $.modal.enable();
+ $.modal.alertWarning("服务器超时,请稍后再试!");
+ $.modal.enable();
$.modal.closeLoading();
} else if (textStatus == "parsererror" || textStatus == "error") {
- $.modal.alertWarning("服务器错误,请联系管理员!");
- $.modal.enable();
+ $.modal.alertWarning("服务器错误,请联系管理员!");
+ $.modal.enable();
$.modal.closeLoading();
}
}
diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
index 4807f06a..d7fd933b 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
@@ -11,7 +11,7 @@ var table = {
// 设置实例配置
set: function(id) {
if($.common.getLength(table.config) > 1) {
- var tableId = $.common.isEmpty(id) ? $(event.currentTarget).parents(".bootstrap-table").find("table.table").attr("id") : id;
+ var tableId = $.common.isEmpty(id) ? $(event.currentTarget).parents(".bootstrap-table").find("table.table").attr("id") : id;
if ($.common.isNotEmpty(tableId)) {
table.options = table.get(tableId);
}
@@ -36,25 +36,25 @@ var table = {
// 初始化表格参数
init: function(options) {
var defaults = {
- id: "bootstrap-table",
- type: 0, // 0 代表bootstrapTable 1代表bootstrapTreeTable
- method: 'post',
- height: undefined,
- sidePagination: "server",
- sortName: "",
- sortOrder: "asc",
- pagination: true,
- paginationLoop: false,
- pageSize: 10,
- pageNumber: 1,
- pageList: [10, 25, 50],
- toolbar: "toolbar",
- loadingFontSize: 13,
- striped: false,
- escape: false,
- firstLoad: true,
- showFooter: false,
- search: false,
+ id: "bootstrap-table",
+ type: 0, // 0 代表bootstrapTable 1代表bootstrapTreeTable
+ method: 'post',
+ height: undefined,
+ sidePagination: "server",
+ sortName: "",
+ sortOrder: "asc",
+ pagination: true,
+ paginationLoop: false,
+ pageSize: 10,
+ pageNumber: 1,
+ pageList: [10, 25, 50],
+ toolbar: "toolbar",
+ loadingFontSize: 13,
+ striped: false,
+ escape: false,
+ firstLoad: true,
+ showFooter: false,
+ search: false,
showSearch: true,
showPageGo: false,
showRefresh: true,
@@ -66,18 +66,18 @@ var table = {
mobileResponsive: true,
maintainSelected: false,
rememberSelected: false,
- fixedColumns: false,
- fixedNumber: 0,
- fixedRightNumber: 0,
- queryParams: $.table.queryParams,
- rowStyle: {},
- };
+ fixedColumns: false,
+ fixedNumber: 0,
+ fixedRightNumber: 0,
+ queryParams: $.table.queryParams,
+ rowStyle: {},
+ };
var options = $.extend(defaults, options);
table.options = options;
table.config[options.id] = options;
$.table.initEvent();
$('#' + options.id).bootstrapTable({
- id: options.id,
+ id: options.id,
url: options.url, // 请求后台的URL(*)
contentType: "application/x-www-form-urlencoded", // 编码类型
method: options.method, // 请求方式(*)
@@ -103,7 +103,7 @@ var table = {
search: options.search, // 是否显示搜索框功能
searchText: options.searchText, // 搜索框初始显示的内容,默认为空
showSearch: options.showSearch, // 是否显示检索信息
- showPageGo: options.showPageGo, // 是否显示跳转页
+ showPageGo: options.showPageGo, // 是否显示跳转页
showRefresh: options.showRefresh, // 是否显示刷新按钮
showColumns: options.showColumns, // 是否显示隐藏某列下拉框
showToggle: options.showToggle, // 是否显示详细视图和列表视图的切换按钮
@@ -111,7 +111,7 @@ var table = {
showHeader: options.showHeader, // 是否显示表头
showFullscreen: options.showFullscreen, // 是否显示全屏按钮
uniqueId: options.uniqueId, // 唯一的标识符
- clickToSelect: options.clickToSelect, // 是否启用点击选中行
+ clickToSelect: options.clickToSelect, // 是否启用点击选中行
singleSelect: options.singleSelect, // 是否单选checkbox
mobileResponsive: options.mobileResponsive, // 是否支持移动端适配
cardView: options.cardView, // 是否启用显示卡片视图
@@ -145,36 +145,36 @@ var table = {
var _separator = $.common.isEmpty(separator) ? "," : separator;
var optionsIds = "";
$.each(table.config, function(key, value){
- optionsIds += "#" + key + _separator;
+ optionsIds += "#" + key + _separator;
});
return optionsIds.substring(0, optionsIds.length - 1);
},
// 查询条件
queryParams: function(params) {
- var curParams = {
- // 传递参数查询参数
- pageSize: params.limit,
- pageNum: params.offset / params.limit + 1,
- searchValue: params.search,
- orderByColumn: params.sort,
- isAsc: params.order
- };
+ var curParams = {
+ // 传递参数查询参数
+ pageSize: params.limit,
+ pageNum: params.offset / params.limit + 1,
+ searchValue: params.search,
+ orderByColumn: params.sort,
+ isAsc: params.order
+ };
var currentId = $.common.isEmpty(table.options.formId) ? $('form').attr('id') : table.options.formId;
return $.extend(curParams, $.common.formToJSON(currentId));
},
// 请求获取数据后处理回调函数
responseHandler: function(res) {
if (typeof table.get(this.id).responseHandler == "function") {
- table.get(this.id).responseHandler(res);
+ table.get(this.id).responseHandler(res);
}
if (res.code == 0) {
if ($.common.isNotEmpty(table.options.sidePagination) && table.options.sidePagination == 'client') {
return res.rows;
} else {
if ($.common.isNotEmpty(table.options.rememberSelected) && table.options.rememberSelected) {
- var column = $.common.isEmpty(table.options.uniqueId) ? table.options.columns[1].field : table.options.uniqueId;
- $.each(res.rows, function(i, row) {
- row.state = $.inArray(row[column], table.rememberSelectedIds[table.options.id]) !== -1;
+ var column = $.common.isEmpty(table.options.uniqueId) ? table.options.columns[1].field : table.options.uniqueId;
+ $.each(res.rows, function(i, row) {
+ row.state = $.inArray(row[column], table.rememberSelectedIds[table.options.id]) !== -1;
})
}
return { rows: res.rows, total: res.total };
@@ -190,197 +190,197 @@ var table = {
var optionsIds = $.table.getOptionsIds();
// 监听事件处理
$(optionsIds).on(TABLE_EVENTS, function () {
- table.set($(this).attr("id"));
+ table.set($(this).attr("id"));
});
// 在表格体渲染完成,并在 DOM 中可见后触发(事件)
$(optionsIds).on("post-body.bs.table", function (e, args) {
- // 浮动提示框特效
- $(".table [data-toggle='tooltip']").tooltip();
+ // 浮动提示框特效
+ $(".table [data-toggle='tooltip']").tooltip();
});
// 选中、取消、全部选中、全部取消(事件)
$(optionsIds).on("check.bs.table check-all.bs.table uncheck.bs.table uncheck-all.bs.table", function (e, rowsAfter, rowsBefore) {
- // 复选框分页保留保存选中数组
- var rows = $.common.equals("uncheck-all", e.type) ? rowsBefore : rowsAfter;
- var rowIds = $.table.affectedRowIds(rows);
- if ($.common.isNotEmpty(table.options.rememberSelected) && table.options.rememberSelected) {
- func = $.inArray(e.type, ['check', 'check-all']) > -1 ? 'union' : 'difference';
- var selectedIds = table.rememberSelectedIds[table.options.id];
- if($.common.isNotEmpty(selectedIds)) {
- table.rememberSelectedIds[table.options.id] = _[func](selectedIds, rowIds);
- } else {
- table.rememberSelectedIds[table.options.id] = _[func]([], rowIds);
- }
- var selectedRows = table.rememberSelecteds[table.options.id];
- if($.common.isNotEmpty(selectedRows)) {
- table.rememberSelecteds[table.options.id] = _[func](selectedRows, rows);
- } else {
- table.rememberSelecteds[table.options.id] = _[func]([], rows);
- }
- }
+ // 复选框分页保留保存选中数组
+ var rows = $.common.equals("uncheck-all", e.type) ? rowsBefore : rowsAfter;
+ var rowIds = $.table.affectedRowIds(rows);
+ if ($.common.isNotEmpty(table.options.rememberSelected) && table.options.rememberSelected) {
+ func = $.inArray(e.type, ['check', 'check-all']) > -1 ? 'union' : 'difference';
+ var selectedIds = table.rememberSelectedIds[table.options.id];
+ if($.common.isNotEmpty(selectedIds)) {
+ table.rememberSelectedIds[table.options.id] = _[func](selectedIds, rowIds);
+ } else {
+ table.rememberSelectedIds[table.options.id] = _[func]([], rowIds);
+ }
+ var selectedRows = table.rememberSelecteds[table.options.id];
+ if($.common.isNotEmpty(selectedRows)) {
+ table.rememberSelecteds[table.options.id] = _[func](selectedRows, rows);
+ } else {
+ table.rememberSelecteds[table.options.id] = _[func]([], rows);
+ }
+ }
});
// 加载成功、选中、取消、全部选中、全部取消(事件)
$(optionsIds).on("check.bs.table uncheck.bs.table check-all.bs.table uncheck-all.bs.table load-success.bs.table", function () {
- var toolbar = table.options.toolbar;
- var uniqueId = table.options.uniqueId;
- // 工具栏按钮控制
- var rows = $.common.isEmpty(uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(uniqueId);
- // 非多个禁用
- $('#' + toolbar + ' .multiple').toggleClass('disabled', !rows.length);
- // 非单个禁用
- $('#' + toolbar + ' .single').toggleClass('disabled', rows.length!=1);
+ var toolbar = table.options.toolbar;
+ var uniqueId = table.options.uniqueId;
+ // 工具栏按钮控制
+ var rows = $.common.isEmpty(uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(uniqueId);
+ // 非多个禁用
+ $('#' + toolbar + ' .multiple').toggleClass('disabled', !rows.length);
+ // 非单个禁用
+ $('#' + toolbar + ' .single').toggleClass('disabled', rows.length!=1);
});
// 图片预览事件
$(optionsIds).off("click").on("click", '.img-circle', function() {
- var src = $(this).attr('src');
- var target = $(this).data('target');
- if($.common.equals("self", target)) {
- var height = $(this).data('height');
- var width = $(this).data('width');
- // 如果是移动端,就使用自适应大小弹窗
- if ($.common.isMobile()) {
- width = 'auto';
- height = 'auto';
- }
- layer.open({
- title: false,
- type: 1,
- closeBtn: true,
- shadeClose: true,
- area: ['auto', 'auto'],
- content: ""
- });
- } else if ($.common.equals("blank", target)) {
- window.open(src);
- }
- });
+ var src = $(this).attr('src');
+ var target = $(this).data('target');
+ if($.common.equals("self", target)) {
+ var height = $(this).data('height');
+ var width = $(this).data('width');
+ // 如果是移动端,就使用自适应大小弹窗
+ if ($.common.isMobile()) {
+ width = 'auto';
+ height = 'auto';
+ }
+ layer.open({
+ title: false,
+ type: 1,
+ closeBtn: true,
+ shadeClose: true,
+ area: ['auto', 'auto'],
+ content: "
"
+ });
+ } else if ($.common.equals("blank", target)) {
+ window.open(src);
+ }
+ });
// 单击tooltip事件
$(optionsIds).on("click", '.tooltip-show', function() {
- var target = $(this).data('target');
- var input = $(this).prev();
- if ($.common.equals("copy", target)) {
- input.select();
- document.execCommand("copy");
- } else if ($.common.equals("open", target)) {
- parent.layer.alert(input.val(), {
- title: "信息内容",
- shadeClose: true,
- btn: ['确认'],
- btnclass: ['btn btn-primary'],
- });
- }
+ var target = $(this).data('target');
+ var input = $(this).prev();
+ if ($.common.equals("copy", target)) {
+ input.select();
+ document.execCommand("copy");
+ } else if ($.common.equals("open", target)) {
+ parent.layer.alert(input.val(), {
+ title: "信息内容",
+ shadeClose: true,
+ btn: ['确认'],
+ btnclass: ['btn btn-primary'],
+ });
+ }
});
},
// 当所有数据被加载时触发
onLoadSuccess: function(data) {
if (typeof table.options.onLoadSuccess == "function") {
- table.options.onLoadSuccess(data);
+ table.options.onLoadSuccess(data);
}
},
// 表格销毁
destroy: function (tableId) {
var currentId = $.common.isEmpty(tableId) ? table.options.id : tableId;
$("#" + currentId).bootstrapTable('destroy');
- },
+ },
// 序列号生成
serialNumber: function (index, tableId) {
- var currentId = $.common.isEmpty(tableId) ? table.options.id : tableId;
- var tableParams = $("#" + currentId).bootstrapTable('getOptions');
- var pageSize = $.common.isNotEmpty(tableParams.pageSize) ? tableParams.pageSize: table.options.pageSize;
- var pageNumber = $.common.isNotEmpty(tableParams.pageNumber) ? tableParams.pageNumber: table.options.pageNumber;
- return pageSize * (pageNumber - 1) + index + 1;
- },
- // 列超出指定长度浮动提示 target(copy单击复制文本 open弹窗打开文本)
- tooltip: function (value, length, target) {
- var _length = $.common.isEmpty(length) ? 20 : length;
- var _text = "";
- var _value = $.common.nullToStr(value);
- var _target = $.common.isEmpty(target) ? 'copy' : target;
- if (_value.length > _length) {
- _text = _value.substr(0, _length) + "...";
- _value = _value.replace(/\'/g,"'");
- _value = _value.replace(/\"/g,""");
- var actions = [];
- actions.push($.common.sprintf('', _value));
- actions.push($.common.sprintf('%s', _target, _value, _text));
- return actions.join('');
- } else {
- _text = _value;
- return _text;
- }
- },
- // 下拉按钮切换
- dropdownToggle: function (value) {
- var actions = [];
- actions.push('