From 7e626ea2193d39217fa7321a865bfab014c5ea69 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期日, 22 五月 2022 13:07:36 +0800
Subject: [PATCH] update xxl-job 2.3.0 => 2.3.1
---
ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/js/user.index.1.js | 358 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 179 insertions(+), 179 deletions(-)
diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/js/user.index.1.js b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/js/user.index.1.js
index 1d83461..48d3f30 100644
--- a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/js/user.index.1.js
+++ b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/js/user.index.1.js
@@ -1,48 +1,48 @@
$(function() {
- // init date tables
- var userListTable = $("#user_list").dataTable({
- "deferRender": true,
- "processing" : true,
- "serverSide": true,
- "ajax": {
- url: base_url + "/user/pageList",
- type:"post",
- data : function ( d ) {
- var obj = {};
+ // init date tables
+ var userListTable = $("#user_list").dataTable({
+ "deferRender": true,
+ "processing" : true,
+ "serverSide": true,
+ "ajax": {
+ url: base_url + "/user/pageList",
+ type:"post",
+ data : function ( d ) {
+ var obj = {};
obj.username = $('#username').val();
obj.role = $('#role').val();
- obj.start = d.start;
- obj.length = d.length;
+ obj.start = d.start;
+ obj.length = d.length;
return obj;
}
- },
- "searching": false,
- "ordering": false,
- //"scrollX": true, // scroll x锛宑lose self-adaption
- "columns": [
- {
- "data": 'id',
- "visible" : false,
- "width":'10%'
- },
- {
- "data": 'username',
- "visible" : true,
- "width":'20%'
- },
- {
- "data": 'password',
- "visible" : false,
+ },
+ "searching": false,
+ "ordering": false,
+ //"scrollX": true, // scroll x锛宑lose self-adaption
+ "columns": [
+ {
+ "data": 'id',
+ "visible" : false,
+ "width":'10%'
+ },
+ {
+ "data": 'username',
+ "visible" : true,
+ "width":'20%'
+ },
+ {
+ "data": 'password',
+ "visible" : false,
"width":'20%',
"render": function ( data, type, row ) {
return '*********';
}
- },
- {
- "data": 'role',
- "visible" : true,
- "width":'10%',
+ },
+ {
+ "data": 'role',
+ "visible" : true,
+ "width":'10%',
"render": function ( data, type, row ) {
if (data == 1) {
return I18n.user_role_admin
@@ -50,101 +50,101 @@
return I18n.user_role_normal
}
}
- },
- {
- "data": 'permission',
- "width":'10%',
- "visible" : false
- },
- {
- "data": I18n.system_opt ,
- "width":'15%',
- "render": function ( data, type, row ) {
- return function(){
- // html
+ },
+ {
+ "data": 'permission',
+ "width":'10%',
+ "visible" : false
+ },
+ {
+ "data": I18n.system_opt ,
+ "width":'15%',
+ "render": function ( data, type, row ) {
+ return function(){
+ // html
tableData['key'+row.id] = row;
- var html = '<p id="'+ row.id +'" >'+
- '<button class="btn btn-warning btn-xs update" type="button">'+ I18n.system_opt_edit +'</button> '+
- '<button class="btn btn-danger btn-xs delete" type="button">'+ I18n.system_opt_del +'</button> '+
- '</p>';
+ var html = '<p id="'+ row.id +'" >'+
+ '<button class="btn btn-warning btn-xs update" type="button">'+ I18n.system_opt_edit +'</button> '+
+ '<button class="btn btn-danger btn-xs delete" type="button">'+ I18n.system_opt_del +'</button> '+
+ '</p>';
- return html;
- };
- }
- }
- ],
- "language" : {
- "sProcessing" : I18n.dataTable_sProcessing ,
- "sLengthMenu" : I18n.dataTable_sLengthMenu ,
- "sZeroRecords" : I18n.dataTable_sZeroRecords ,
- "sInfo" : I18n.dataTable_sInfo ,
- "sInfoEmpty" : I18n.dataTable_sInfoEmpty ,
- "sInfoFiltered" : I18n.dataTable_sInfoFiltered ,
- "sInfoPostFix" : "",
- "sSearch" : I18n.dataTable_sSearch ,
- "sUrl" : "",
- "sEmptyTable" : I18n.dataTable_sEmptyTable ,
- "sLoadingRecords" : I18n.dataTable_sLoadingRecords ,
- "sInfoThousands" : ",",
- "oPaginate" : {
- "sFirst" : I18n.dataTable_sFirst ,
- "sPrevious" : I18n.dataTable_sPrevious ,
- "sNext" : I18n.dataTable_sNext ,
- "sLast" : I18n.dataTable_sLast
- },
- "oAria" : {
- "sSortAscending" : I18n.dataTable_sSortAscending ,
- "sSortDescending" : I18n.dataTable_sSortDescending
- }
- }
- });
+ return html;
+ };
+ }
+ }
+ ],
+ "language" : {
+ "sProcessing" : I18n.dataTable_sProcessing ,
+ "sLengthMenu" : I18n.dataTable_sLengthMenu ,
+ "sZeroRecords" : I18n.dataTable_sZeroRecords ,
+ "sInfo" : I18n.dataTable_sInfo ,
+ "sInfoEmpty" : I18n.dataTable_sInfoEmpty ,
+ "sInfoFiltered" : I18n.dataTable_sInfoFiltered ,
+ "sInfoPostFix" : "",
+ "sSearch" : I18n.dataTable_sSearch ,
+ "sUrl" : "",
+ "sEmptyTable" : I18n.dataTable_sEmptyTable ,
+ "sLoadingRecords" : I18n.dataTable_sLoadingRecords ,
+ "sInfoThousands" : ",",
+ "oPaginate" : {
+ "sFirst" : I18n.dataTable_sFirst ,
+ "sPrevious" : I18n.dataTable_sPrevious ,
+ "sNext" : I18n.dataTable_sNext ,
+ "sLast" : I18n.dataTable_sLast
+ },
+ "oAria" : {
+ "sSortAscending" : I18n.dataTable_sSortAscending ,
+ "sSortDescending" : I18n.dataTable_sSortDescending
+ }
+ }
+ });
// table data
var tableData = {};
- // search btn
- $('#searchBtn').on('click', function(){
+ // search btn
+ $('#searchBtn').on('click', function(){
userListTable.fnDraw();
- });
+ });
+
+ // job operate
+ $("#user_list").on('click', '.delete',function() {
+ var id = $(this).parent('p').attr("id");
- // job operate
- $("#user_list").on('click', '.delete',function() {
- var id = $(this).parent('p').attr("id");
-
- layer.confirm( I18n.system_ok + I18n.system_opt_del + '?', {
- icon: 3,
- title: I18n.system_tips ,
+ layer.confirm( I18n.system_ok + I18n.system_opt_del + '?', {
+ icon: 3,
+ title: I18n.system_tips ,
btn: [ I18n.system_ok, I18n.system_cancel ]
- }, function(index){
- layer.close(index);
+ }, function(index){
+ layer.close(index);
- $.ajax({
- type : 'POST',
- url : base_url + "/user/remove",
- data : {
- "id" : id
- },
- dataType : "json",
- success : function(data){
- if (data.code == 200) {
+ $.ajax({
+ type : 'POST',
+ url : base_url + "/user/remove",
+ data : {
+ "id" : id
+ },
+ dataType : "json",
+ success : function(data){
+ if (data.code == 200) {
layer.msg( I18n.system_success );
- userListTable.fnDraw(false);
- } else {
+ userListTable.fnDraw(false);
+ } else {
layer.msg( data.msg || I18n.system_opt_del + I18n.system_fail );
- }
- }
- });
- });
- });
+ }
+ }
+ });
+ });
+ });
- // add role
+ // add role
$("#addModal .form input[name=role]").change(function () {
- var role = $(this).val();
- if (role == 1) {
+ var role = $(this).val();
+ if (role == 1) {
$("#addModal .form input[name=permission]").parents('.form-group').hide();
- } else {
+ } else {
$("#addModal .form input[name=permission]").parents('.form-group').show();
- }
+ }
$("#addModal .form input[name='permission']").prop("checked",false);
});
@@ -154,28 +154,28 @@
return this.optional(element) || valid.test(value);
}, I18n.user_username_valid );
- // add
- $(".add").click(function(){
- $('#addModal').modal({backdrop: false, keyboard: false}).modal('show');
- });
- var addModalValidate = $("#addModal .form").validate({
- errorElement : 'span',
+ // add
+ $(".add").click(function(){
+ $('#addModal').modal({backdrop: false, keyboard: false}).modal('show');
+ });
+ var addModalValidate = $("#addModal .form").validate({
+ errorElement : 'span',
errorClass : 'help-block',
- focusInvalid : true,
+ focusInvalid : true,
rules : {
username : {
- required : true,
+ required : true,
rangelength:[4, 20],
myValid01: true
- },
+ },
password : {
required : true,
rangelength:[4, 20]
}
- },
+ },
messages : {
username : {
- required : I18n.system_please_input + I18n.user_username,
+ required : I18n.system_please_input + I18n.user_username,
rangelength: I18n.system_lengh_limit + "[4-20]"
},
password : {
@@ -183,15 +183,15 @@
rangelength: I18n.system_lengh_limit + "[4-20]"
}
},
- highlight : function(element) {
- $(element).closest('.form-group').addClass('has-error');
+ highlight : function(element) {
+ $(element).closest('.form-group').addClass('has-error');
},
- success : function(label) {
- label.closest('.form-group').removeClass('has-error');
- label.remove();
+ success : function(label) {
+ label.closest('.form-group').removeClass('has-error');
+ label.remove();
},
- errorPlacement : function(error, element) {
- element.parent('div').append(error);
+ errorPlacement : function(error, element) {
+ element.parent('div').append(error);
},
submitHandler : function(form) {
@@ -200,38 +200,38 @@
permissionArr.push($(this).val());
});
- var paramData = {
- "username": $("#addModal .form input[name=username]").val(),
+ var paramData = {
+ "username": $("#addModal .form input[name=username]").val(),
"password": $("#addModal .form input[name=password]").val(),
"role": $("#addModal .form input[name=role]:checked").val(),
"permission": permissionArr.join(',')
- };
+ };
- $.post(base_url + "/user/add", paramData, function(data, status) {
- if (data.code == "200") {
- $('#addModal').modal('hide');
+ $.post(base_url + "/user/add", paramData, function(data, status) {
+ if (data.code == "200") {
+ $('#addModal').modal('hide');
layer.msg( I18n.system_add_suc );
userListTable.fnDraw();
- } else {
- layer.open({
- title: I18n.system_tips ,
+ } else {
+ layer.open({
+ title: I18n.system_tips ,
btn: [ I18n.system_ok ],
- content: (data.msg || I18n.system_add_fail),
- icon: '2'
- });
- }
- });
- }
- });
- $("#addModal").on('hide.bs.modal', function () {
- $("#addModal .form")[0].reset();
- addModalValidate.resetForm();
- $("#addModal .form .form-group").removeClass("has-error");
- $(".remote_panel").show(); // remote
+ content: (data.msg || I18n.system_add_fail),
+ icon: '2'
+ });
+ }
+ });
+ }
+ });
+ $("#addModal").on('hide.bs.modal', function () {
+ $("#addModal .form")[0].reset();
+ addModalValidate.resetForm();
+ $("#addModal .form .form-group").removeClass("has-error");
+ $(".remote_panel").show(); // remote
$("#addModal .form input[name=permission]").parents('.form-group').show();
- });
+ });
// update role
$("#updateModal .form input[name=role]").change(function () {
@@ -244,21 +244,21 @@
$("#updateModal .form input[name='permission']").prop("checked",false);
});
- // update
- $("#user_list").on('click', '.update',function() {
+ // update
+ $("#user_list").on('click', '.update',function() {
var id = $(this).parent('p').attr("id");
var row = tableData['key'+id];
- // base data
- $("#updateModal .form input[name='id']").val( row.id );
- $("#updateModal .form input[name='username']").val( row.username );
- $("#updateModal .form input[name='password']").val( '' );
- $("#updateModal .form input[name='role'][value='"+ row.role +"']").click();
+ // base data
+ $("#updateModal .form input[name='id']").val( row.id );
+ $("#updateModal .form input[name='username']").val( row.username );
+ $("#updateModal .form input[name='password']").val( '' );
+ $("#updateModal .form input[name='role'][value='"+ row.role +"']").click();
var permissionArr = [];
if (row.permission) {
permissionArr = row.permission.split(",");
- }
+ }
$("#updateModal .form input[name='permission']").each(function () {
if($.inArray($(this).val(), permissionArr) > -1) {
$(this).prop("checked",true);
@@ -267,22 +267,22 @@
}
});
- // show
- $('#updateModal').modal({backdrop: false, keyboard: false}).modal('show');
- });
- var updateModalValidate = $("#updateModal .form").validate({
- errorElement : 'span',
+ // show
+ $('#updateModal').modal({backdrop: false, keyboard: false}).modal('show');
+ });
+ var updateModalValidate = $("#updateModal .form").validate({
+ errorElement : 'span',
errorClass : 'help-block',
focusInvalid : true,
- highlight : function(element) {
- $(element).closest('.form-group').addClass('has-error');
+ highlight : function(element) {
+ $(element).closest('.form-group').addClass('has-error');
},
- success : function(label) {
- label.closest('.form-group').removeClass('has-error');
- label.remove();
+ success : function(label) {
+ label.closest('.form-group').removeClass('has-error');
+ label.remove();
},
- errorPlacement : function(error, element) {
- element.parent('div').append(error);
+ errorPlacement : function(error, element) {
+ element.parent('div').append(error);
},
submitHandler : function(form) {
@@ -314,15 +314,15 @@
});
}
});
- }
- });
- $("#updateModal").on('hide.bs.modal', function () {
+ }
+ });
+ $("#updateModal").on('hide.bs.modal', function () {
$("#updateModal .form")[0].reset();
updateModalValidate.resetForm();
$("#updateModal .form .form-group").removeClass("has-error");
- $(".remote_panel").show(); // remote
+ $(".remote_panel").show(); // remote
$("#updateModal .form input[name=permission]").parents('.form-group').show();
- });
+ });
});
--
Gitblit v1.9.3