From 614b0106f079e67bb674a37ede2bd0fe3df2a430 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 27 七月 2023 17:45:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/webapp/static/modular/system/role/role.js | 68 ++++++++++------------------------
1 files changed, 20 insertions(+), 48 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/role/role.js b/cloud-server-management/src/main/webapp/static/modular/system/role/role.js
index 1676d4c..d269433 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/role/role.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/role/role.js
@@ -7,27 +7,19 @@
table: null,
layerIndex: -1
};
-var language =$("#language").val()
+
/**
* 初始化表格的列
*/
Role.initColumn = function () {
var columns = [
- {field: 'selectItem', radio: true,
- /*formatter: function (value, row) {
- if (row.id == 1)
- return {
- disabled : true,//设置是否可用
- };
- return "";
- }*/
- },
+ {field: 'selectItem', radio: true},
{title: 'id', field: 'id', visible: false, align: 'center', valign: 'middle'},
- {title: language==1?'名称':(language==2?'Name':'Nama'), field: 'name', align: 'center', valign: 'middle', sortable: true},
- {title: language==1?'上级角色':(language==2?'Superior role':'Peran orang tua'), field: 'pName', align: 'center', valign: 'middle', sortable: true},
- {title: language==1?'所在部门':(language==2?'Department':'Departemen'), field: 'deptName', align: 'center', valign: 'middle', sortable: true},
- {title: language==1?'包含账户数':(language==2?'Number of included accounts':'Jumlah rekening termasuk'), field: 'userCount', align: 'center', valign: 'middle', sortable: true},
- {title: language==1?'别名':(language==2?'alias':'alias'), field: 'tips', align: 'center', valign: 'middle', sortable: true}]
+ {title: '添加时间', field: 'createTime', align: 'center', valign: 'middle'},
+ {title: '角色名称', field: 'name', align: 'center', valign: 'middle', sortable: true},
+ {title: '上级角色', field: 'pName', align: 'center', valign: 'middle', sortable: true},
+ {title: '所在部门', field: 'deptName', align: 'center', valign: 'middle', sortable: true},
+ {title: '别名', field: 'tips', align: 'center', valign: 'middle', sortable: true}]
return columns;
};
@@ -38,14 +30,7 @@
Role.check = function () {
var selected = $('#' + this.id).bootstrapTable('getSelections');
if (selected.length == 0) {
- if(language==1){
- Feng.info("请先选中表格中的某一记录！");
- }else if(language==2){
- Feng.info("Please select a record in the table first！");
- }else {
- Feng.info("Pilih catatan di tabel terlebih dahulu！");
- }
-
+ Feng.info("请先选中表格中的某一记录！");
return false;
} else {
Role.seItem = selected[0];
@@ -59,7 +44,7 @@
Role.openAddRole = function () {
var index = layer.open({
type: 2,
- title: language==1?'添加':(language==2?'Add':'Tambahkan'),
+ title: '添加角色',
area: ['800px', '450px'], //宽高
fix: false, //不固定
maxmin: true,
@@ -75,7 +60,7 @@
if (this.check()) {
var index = layer.open({
type: 2,
- title: language==1?'修改角色':(language==2?'modify role':'mengubah peran'),
+ title: '修改角色',
area: ['800px', '450px'], //宽高
fix: false, //不固定
maxmin: true,
@@ -93,34 +78,16 @@
var operation = function(){
var ajax = new $ax(Feng.ctxPath + "/role/remove", function () {
- if(language==1){
- Feng.success("删除成功!");
- }else if(language==2){
- Feng.success("Delete succeeded!");
- }else {
- Feng.success("Hapus berhasil!");
- }
+ Feng.success("删除成功!");
Role.table.refresh();
}, function (data) {
- if(language==1){
- Feng.error("删除失败!" + data.responseJSON.message + "!");
- }else if(language==2){
- Feng.error("Delete failed!" + data.responseJSON.message + "!");
- }else {
- Feng.error("Hapus gagal!" + data.responseJSON.message + "!");
- }
+ Feng.error("删除失败!" + data.responseJSON.message + "!");
});
ajax.set("roleId", Role.seItem.id);
ajax.start();
};
- if(language==1){
- Feng.confirm("是否删除角色 " + Role.seItem.name + "?",operation);
- }else if(language==2){
- Feng.confirm("Whether to delete a Role " + Role.seItem.name + "?",operation);
- }else {
- Feng.confirm("Apakah menghapus peran " + Role.seItem.name + "?",operation);
- }
+ Feng.confirm("是否删除角色 " + Role.seItem.name + "?",operation);
}
};
@@ -131,8 +98,8 @@
if (this.check()) {
var index = layer.open({
type: 2,
- title: language==1?'权限配置':(language==2?'Permission Configuration':'Konfigurasi Keizinan'),
- area: ['30%', '80%'], //宽高
+ title: '权限配置',
+ area: ['300px', '450px'], //宽高
fix: false, //不固定
maxmin: true,
content: Feng.ctxPath + '/role/role_assign/' + this.seItem.id
@@ -150,6 +117,11 @@
Role.table.refresh({query: queryData});
}
+Role.resetSearch = function(){
+ $("#roleName").val('');
+ Role.search();
+}
+
$(function () {
var defaultColunms = Role.initColumn();
var table = new BSTable(Role.id, "/role/list", defaultColunms);
--
Gitblit v1.7.1