diff --git a/common/src/main/resources/static/adminlte/css/skins/skin-blue2.css b/common/src/main/resources/static/adminlte/css/skins/skin-blue2.css
index 83e63484..4ca3d2fe 100644
--- a/common/src/main/resources/static/adminlte/css/skins/skin-blue2.css
+++ b/common/src/main/resources/static/adminlte/css/skins/skin-blue2.css
@@ -199,7 +199,7 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor
.form-control:focus,.select2-container--default.select2-container--focus .select2-selection--multiple,
.select2-container--default .select2-search--dropdown .select2-search__field,
.select2-container--default.select2-container--focus .select2-selection--single,
-.select2-container--default.select2-container--focus .select2-selection--multiple {border-color:#557bfa!important;box-shadow:0 0 0 2px rgba(24,80,236,.2);}
+.select2-container--default.select2-container--focus .select2-selection--multiple {border-color:#557bfa!important;box-shadow:0 0 0 2px rgba(5, 88, 255, 0.06);}
.table thead tr, .ui-jqgrid-htable thead tr, .ui-jqgrid-hdiv, .ui-jqgrid-hbox {background-color:#f6f6f6;}
.ui-jqgrid .ui-jqgrid-labels th, .ui-jqgrid tr.ui-row-ltr td, .ui-jqgrid tr.ui-row-rtl td, .ui-jqgrid tr.ui-row-ltr td:last-child,
.ui-jqgrid .ui-jqgrid-htable th.ui-th-column-header, .ui-jqgrid .ui-jqgrid-htable th.ui-th-column,
diff --git a/common/src/main/resources/static/adminlte/css/skins/skin-blue3.css b/common/src/main/resources/static/adminlte/css/skins/skin-blue3.css
index 6c87b757..d8c699e1 100644
--- a/common/src/main/resources/static/adminlte/css/skins/skin-blue3.css
+++ b/common/src/main/resources/static/adminlte/css/skins/skin-blue3.css
@@ -221,7 +221,7 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor
.form-control:focus,.select2-container--default.select2-container--focus .select2-selection--multiple,
.select2-container--default .select2-search--dropdown .select2-search__field,
.select2-container--default.select2-container--focus .select2-selection--single,
-.select2-container--default.select2-container--focus .select2-selection--multiple {border-color:#557bfa!important;box-shadow:0 0 0 2px rgba(24,80,236,.2);}
+.select2-container--default.select2-container--focus .select2-selection--multiple {border-color:#557bfa!important;box-shadow:0 0 0 2px rgba(5, 88, 255, 0.06);}
.table thead tr, .ui-jqgrid-htable thead tr, .ui-jqgrid-hdiv, .ui-jqgrid-hbox {background-color:#fafafa;}
.ui-jqgrid .ui-jqgrid-labels th, .ui-jqgrid tr.ui-row-ltr td, .ui-jqgrid tr.ui-row-rtl td, .ui-jqgrid tr.ui-row-ltr td:last-child,
.ui-jqgrid .ui-jqgrid-htable th.ui-th-column-header, .ui-jqgrid .ui-jqgrid-htable th.ui-th-column,
diff --git a/common/src/main/resources/static/adminlte/css/skins/skin-dark.css b/common/src/main/resources/static/adminlte/css/skins/skin-dark.css
index 5cff4256..b04d8f4c 100644
--- a/common/src/main/resources/static/adminlte/css/skins/skin-dark.css
+++ b/common/src/main/resources/static/adminlte/css/skins/skin-dark.css
@@ -203,7 +203,7 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor
::-webkit-scrollbar {background:#2a2a2a;}
::-webkit-scrollbar-thumb {background:#6a6a6a;}
-.btn-default {background-color:#323232;border-color:#323232;color:#b5b5b5;}
+.btn-default {background-color:#323232;border-color:#323232;color:#b5b5b5;} .btn-default i {color:#dfdfdf;}
.btn-default.active, .btn-default:active {background-color:#3e3e3e;border-color:#3e3e3e;color:#dfdfdf;}
.btn-default:hover, .btn-default:active, .btn-default.hover, .btn-default:focus,
.btn-default.active.focus, .btn-default.active:focus, .btn-default.active:hover, .btn-default:active.focus,
diff --git a/modules/app/src/main/resources/views/modules/app/appCommentList.html b/modules/app/src/main/resources/views/modules/app/appCommentList.html
index 9567a02c..36c0a929 100644
--- a/modules/app/src/main/resources/views/modules/app/appCommentList.html
+++ b/modules/app/src/main/resources/views/modules/app/appCommentList.html
@@ -8,9 +8,9 @@
@@ -82,11 +82,11 @@ $('#dataGrid').dataGrid({
{header:'${text("操作")}', name:'actions', width:120, formatter: function(val, obj, row, act){
var actions = [];
//# if(hasPermi('app:appComment:edit')){
- actions.push('
');
+ actions.push('
');
if (row.status == Global.STATUS_NORMAL){
- actions.push('
');
+ actions.push('
');
} else if (row.status == Global.STATUS_DISABLE){
- actions.push('
');
+ actions.push('
');
}
actions.push('
');
//# }
diff --git a/modules/app/src/main/resources/views/modules/app/appUpgradeList.html b/modules/app/src/main/resources/views/modules/app/appUpgradeList.html
index 556fa643..103ff26d 100644
--- a/modules/app/src/main/resources/views/modules/app/appUpgradeList.html
+++ b/modules/app/src/main/resources/views/modules/app/appUpgradeList.html
@@ -8,9 +8,9 @@
@@ -82,11 +82,11 @@ $('#dataGrid').dataGrid({
{header:'${text("操作")}', name:'actions', width:120, formatter: function(val, obj, row, act){
var actions = [];
//# if(hasPermi('app:appUpgrade:edit')){
- actions.push('
');
+ actions.push('
');
if (row.status == Global.STATUS_NORMAL){
- actions.push('
');
+ actions.push('
');
} else if (row.status == Global.STATUS_DISABLE){
- actions.push('
');
+ actions.push('
');
}
actions.push('
');
//# }
diff --git a/modules/cms/src/main/resources/views/modules/cms/articleList.html b/modules/cms/src/main/resources/views/modules/cms/articleList.html
index d7e4d529..e11913a4 100644
--- a/modules/cms/src/main/resources/views/modules/cms/articleList.html
+++ b/modules/cms/src/main/resources/views/modules/cms/articleList.html
@@ -9,7 +9,7 @@
${text('访问网站')}
${text('查询')}
<% if(hasPermi('cms:article:edit')){ %>
-
${text('新增')}
+
${text('新增')}
<% } %>
@@ -71,12 +71,12 @@ $('#dataGrid').dataGrid({
{header:'${text("操作")}', name:'actions', width:150, formatter: function(val, obj, row, act){
var actions = [];
//# if(hasPermi('cms:article:edit')){
- actions.push(' ');
+ actions.push(' ');
if (row.status == Global.STATUS_NORMAL){
- actions.push(' ');
+ actions.push(' ');
}
if (row.status == Global.STATUS_DISABLE){
- actions.push(' ');
+ actions.push(' ');
}
actions.push(' ');
if (row.status == Global.STATUS_NORMAL){
diff --git a/modules/cms/src/main/resources/views/modules/cms/categoryList.html b/modules/cms/src/main/resources/views/modules/cms/categoryList.html
index 38b096e7..a613da7c 100644
--- a/modules/cms/src/main/resources/views/modules/cms/categoryList.html
+++ b/modules/cms/src/main/resources/views/modules/cms/categoryList.html
@@ -98,18 +98,18 @@ $('#dataGrid').dataGrid({
return js.getDictLabel("#{@DictUtils.getDictListJson('sys_status')}", val, '未知', true);
}},
{header:'${text("备注")}', name:'remarks', index:'a.remarks', width:100, align:"left"},
- {header:'${text("操作")}', name:'actions', width:180, formatter: function(val, obj, row, act){
+ {header:'${text("操作")}', name:'actions', width:210, formatter: function(val, obj, row, act){
var actions = [];
//# if(hasPermi('cms:category:edit')){
- actions.push(' ');
+ actions.push(' ');
if (row.status == Global.STATUS_NORMAL){
- actions.push(' ');
+ actions.push(' ');
}
if (row.status == Global.STATUS_DISABLE){
- actions.push(' ');
+ actions.push(' ');
}
actions.push(' ');
- actions.push(' ');
+ actions.push(' ');
//# if(hasPermi('cms:category:rebuildIndex')){
actions.push(' ');
//# }
diff --git a/modules/cms/src/main/resources/views/modules/cms/commentList.html b/modules/cms/src/main/resources/views/modules/cms/commentList.html
index 3aa68deb..da872680 100644
--- a/modules/cms/src/main/resources/views/modules/cms/commentList.html
+++ b/modules/cms/src/main/resources/views/modules/cms/commentList.html
@@ -8,7 +8,7 @@
@@ -130,12 +130,12 @@ $('#dataGrid').dataGrid({
{header:'${text('操作')}', name:'actions', width:120, formatter: function(val, obj, row, act){
var actions = [];
//# if(hasPermi('cms:comment:edit')){
- actions.push(' ');
+ actions.push(' ');
if (row.status == Global.STATUS_NORMAL){
- actions.push(' ');
+ actions.push(' ');
}
if (row.status == Global.STATUS_DISABLE){
- actions.push(' ');
+ actions.push(' ');
}
actions.push(' ');
//# }
diff --git a/modules/cms/src/main/resources/views/modules/cms/reportList.html b/modules/cms/src/main/resources/views/modules/cms/reportList.html
index 7f098f33..58e93860 100644
--- a/modules/cms/src/main/resources/views/modules/cms/reportList.html
+++ b/modules/cms/src/main/resources/views/modules/cms/reportList.html
@@ -8,7 +8,7 @@
@@ -71,12 +71,12 @@ $('#dataGrid').dataGrid({
{header:'${text('操作')}', name:'actions', width:120, formatter: function(val, obj, row, act){
var actions = [];
//# if(hasPermi('cms:report:edit')){
- actions.push(' ');
+ actions.push(' ');
if (row.status == Global.STATUS_NORMAL){
- actions.push(' ');
+ actions.push(' ');
}
if (row.status == Global.STATUS_DISABLE){
- actions.push(' ');
+ actions.push(' ');
}
actions.push(' ');
//# }
diff --git a/modules/cms/src/main/resources/views/modules/cms/siteList.html b/modules/cms/src/main/resources/views/modules/cms/siteList.html
index 83e0f4d3..59174414 100644
--- a/modules/cms/src/main/resources/views/modules/cms/siteList.html
+++ b/modules/cms/src/main/resources/views/modules/cms/siteList.html
@@ -8,7 +8,7 @@
@@ -67,15 +67,15 @@ $('#dataGrid').dataGrid({
return js.getDictLabel("#{@DictUtils.getDictListJson('sys_search_status')}", val, '${text("未知")}', true);
}},
{header:'${text("创建时间")}', name:'createDate', index:'a.create_date', width:150, align:"center"},
- {header:'${text("操作")}', name:'actions', width:160, formatter: function(val, obj, row, act){
+ {header:'${text("操作")}', name:'actions', width:183, formatter: function(val, obj, row, act){
var actions = [];
//# if(hasPermi('cms:site:edit')){
- actions.push(' ');
+ actions.push(' ');
if (row.status == Global.STATUS_NORMAL){
- actions.push(' ');
+ actions.push(' ');
}
if (row.status == Global.STATUS_DISABLE){
- actions.push(' ');
+ actions.push(' ');
}
actions.push(' ');
//# if(hasPermi('cms:site:rebuildIndex')){
diff --git a/modules/cms/src/main/resources/views/modules/cms/visitLogList.html b/modules/cms/src/main/resources/views/modules/cms/visitLogList.html
index 920c8e42..b730a590 100644
--- a/modules/cms/src/main/resources/views/modules/cms/visitLogList.html
+++ b/modules/cms/src/main/resources/views/modules/cms/visitLogList.html
@@ -8,7 +8,7 @@
@@ -92,12 +92,12 @@ $('#dataGrid').dataGrid({
{header:'${text('操作')}', name:'actions', width:120, formatter: function(val, obj, row, act){
var actions = [];
//# if(hasPermi('cms:visitLog:edit')){
- actions.push(' ');
+ actions.push(' ');
if (row.status == Global.STATUS_NORMAL){
- actions.push(' ');
+ actions.push(' ');
}
if (row.status == Global.STATUS_DISABLE){
- actions.push(' ');
+ actions.push(' ');
}
actions.push(' ');
//# }
diff --git a/modules/core/src/main/resources/templates/modules/gen/view/dataGridScript.html b/modules/core/src/main/resources/templates/modules/gen/view/dataGridScript.html
index 56e6f347..3fb0a8ed 100644
--- a/modules/core/src/main/resources/templates/modules/gen/view/dataGridScript.html
+++ b/modules/core/src/main/resources/templates/modules/gen/view/dataGridScript.html
@@ -76,19 +76,19 @@ $('#dataGrid').dataGrid({
actions.push(' ');
<% }else{ %>
\//# if(hasPermi('${permissionPrefix}:edit')){
- actions.push(' ');
+ actions.push(' ');
<% if(toBoolean(table.optionMap['isHaveDisableEnable'])){ %>
if (row.status == Global.STATUS_NORMAL){
- actions.push(' ');
+ actions.push(' ');
} else if (row.status == Global.STATUS_DISABLE){
- actions.push(' ');
+ actions.push(' ');
}
<% } %>
<% if(toBoolean(table.optionMap['isHaveDelete'])){ %>
actions.push('及所有子${functionNameSimple}<% } %>吗?")}"<% if(table.isTreeEntity){ %> data-deltreenode="'+row.id+'"<% } %>> ');
<% } %>
<% if(table.isTreeEntity){ %>
- actions.push(' ');
+ actions.push(' ');
<% } %>
\//# }
<% if(toBoolean(table.optionMap['isBpmForm'])){ %>
diff --git a/modules/core/src/main/resources/templates/modules/gen/view/viewList.html b/modules/core/src/main/resources/templates/modules/gen/view/viewList.html
index 6d75caa8..27c99c18 100644
--- a/modules/core/src/main/resources/templates/modules/gen/view/viewList.html
+++ b/modules/core/src/main/resources/templates/modules/gen/view/viewList.html
@@ -23,7 +23,7 @@
<% } %>
\${text('新增')}
\<% } %>
-
+
diff --git a/modules/core/src/main/resources/views/modules/biz/bizCategoryList.html b/modules/core/src/main/resources/views/modules/biz/bizCategoryList.html
index 9cc246e8..ecab280e 100644
--- a/modules/core/src/main/resources/views/modules/biz/bizCategoryList.html
+++ b/modules/core/src/main/resources/views/modules/biz/bizCategoryList.html
@@ -11,9 +11,9 @@
${text('展开')}
${text('折叠')}
<% if(hasPermi('biz:bizCategory:edit')){ %>
-
${text('新增')}
+
${text('新增')}
<% } %>
-
+
@@ -68,17 +68,17 @@ $('#dataGrid').dataGrid({
{header:'${text("状态")}', name:'status', index:'a.status', width:80, align:"center", formatter: function(val, obj, row, act){
return js.getDictLabel("#{@DictUtils.getDictListJson('sys_search_status')}", val, '${text("未知")}', true);
}},
- {header:'${text("操作")}', name:'actions', width:120, formatter: function(val, obj, row, act){
+ {header:'${text("操作")}', name:'actions', width:140, formatter: function(val, obj, row, act){
var actions = [];
//# if(hasPermi('biz:bizCategory:edit')){
- actions.push('
');
+ actions.push('
');
if (row.status == Global.STATUS_NORMAL){
- actions.push('
');
+ actions.push('
');
} else if (row.status == Global.STATUS_DISABLE){
- actions.push('
');
+ actions.push('
');
}
actions.push('
');
- actions.push('
');
+ actions.push('
');
//# }
return actions.join('');
}}
diff --git a/modules/core/src/main/resources/views/modules/msg/msgInnerList.html b/modules/core/src/main/resources/views/modules/msg/msgInnerList.html
index 465c468e..ee7f6a37 100644
--- a/modules/core/src/main/resources/views/modules/msg/msgInnerList.html
+++ b/modules/core/src/main/resources/views/modules/msg/msgInnerList.html
@@ -8,9 +8,9 @@
@@ -91,7 +91,7 @@ $('#dataGrid').dataGrid({
var actions = [];
if(row.status == Global.STATUS_DRAFT){
//# if(hasPermi('msg:msgInner:edit')){
- actions.push('
');
+ actions.push('
');
actions.push('
');
//# }
}else{
diff --git a/modules/core/src/main/resources/views/modules/sys/areaList.html b/modules/core/src/main/resources/views/modules/sys/areaList.html
index dfe5f782..4eaf4317 100644
--- a/modules/core/src/main/resources/views/modules/sys/areaList.html
+++ b/modules/core/src/main/resources/views/modules/sys/areaList.html
@@ -11,9 +11,9 @@
${text('展开')}
${text('折叠')}
<% if(hasPermi('sys:area:edit')){ %>
-
${text('新增')}
+
${text('新增')}
<% } %>
-
+
@@ -69,14 +69,14 @@ $('#dataGrid').dataGrid({
{header:'${text("操作")}', name:'actions', width:130, formatter: function(val, obj, row, act){
var actions = [];
//# if(hasPermi('sys:area:edit')){
- actions.push('
');
+ actions.push('
');
if (row.status == Global.STATUS_NORMAL){
- actions.push('
');
+ actions.push('
');
} else if (row.status == Global.STATUS_DISABLE){
- actions.push('
');
+ actions.push('
');
}
actions.push('
');
- actions.push('
');
+ actions.push('
');
//# }
return actions.join('');
}}
diff --git a/modules/core/src/main/resources/views/modules/sys/companyList.html b/modules/core/src/main/resources/views/modules/sys/companyList.html
index f1e5250d..0f8638ac 100644
--- a/modules/core/src/main/resources/views/modules/sys/companyList.html
+++ b/modules/core/src/main/resources/views/modules/sys/companyList.html
@@ -11,9 +11,9 @@
${text('展开')}
${text('折叠')}
<% if(hasPermi('sys:company:edit')){ %>
-
${text('新增')}
+
${text('新增')}
<% } %>
-
+
@@ -71,17 +71,17 @@ $('#dataGrid').dataGrid({
{header:'${text("状态")}', name:'status', index:'a.status', width:80, align:"center", formatter: function(val, obj, row, act){
return js.getDictLabel("#{@DictUtils.getDictListJson('sys_status')}", val, '未知', true);
}},
- {header:'${text("操作")}', name:'actions', width:150, formatter: function(val, obj, row, act){
+ {header:'${text("操作")}', name:'actions', width:140, formatter: function(val, obj, row, act){
var actions = [];
//# if(hasPermi('sys:company:edit')){
- actions.push('
');
+ actions.push('
');
if (row.status == Global.STATUS_NORMAL){
- actions.push('
');
+ actions.push('
');
} else if (row.status == Global.STATUS_DISABLE){
- actions.push('
');
+ actions.push('
');
}
actions.push('
');
- actions.push('
');
+ actions.push('
');
//# }
return actions.join('');
}}
diff --git a/modules/core/src/main/resources/views/modules/sys/configList.html b/modules/core/src/main/resources/views/modules/sys/configList.html
index 0f6c05ad..4ab4aff1 100644
--- a/modules/core/src/main/resources/views/modules/sys/configList.html
+++ b/modules/core/src/main/resources/views/modules/sys/configList.html
@@ -10,7 +10,7 @@
@@ -74,13 +74,13 @@ $('#dataGrid').dataGrid({
{header:'${text("操作")}', name:'actions', width:120, formatter: function(val, obj, row, act){
var actions = [];
//# if(hasPermi('sys:config:edit')){
- actions.push('
');
+ actions.push('
');
actions.push('
');
-// actions.push('
');
+// actions.push('
');
// actions.push('
');
-// actions.push('
编辑参数 ');
-// actions.push('
编辑参数 ');
-// actions.push('
编辑参数 ');
+// actions.push('
编辑参数 ');
+// actions.push('
编辑参数 ');
+// actions.push('
编辑参数 ');
// actions.push('
');
//# }
return actions.join('');
diff --git a/modules/core/src/main/resources/views/modules/sys/dictDataList.html b/modules/core/src/main/resources/views/modules/sys/dictDataList.html
index a96d25ba..4ad380be 100644
--- a/modules/core/src/main/resources/views/modules/sys/dictDataList.html
+++ b/modules/core/src/main/resources/views/modules/sys/dictDataList.html
@@ -11,9 +11,9 @@
${text('展开')}
${text('折叠')}
<% if(hasPermi('sys:dictData:edit')){ %>
-
${text('新增')}
+
${text('新增')}
<% } %>
-
+
@@ -93,14 +93,14 @@ $('#dataGrid').dataGrid({
{header:'${text("操作")}', name:'actions', width:150, formatter: function(val, obj, row, act){
var actions = [];
//# if(hasPermi('sys:dictData:edit')){
- actions.push('
');
+ actions.push('
');
if (row.status == Global.STATUS_NORMAL){
- actions.push('
');
+ actions.push('
');
} else if (row.status == Global.STATUS_DISABLE){
- actions.push('
');
+ actions.push('
');
}
actions.push('
');
- actions.push('
');
+ actions.push('
');
//# }
return actions.join('');
}}
diff --git a/modules/core/src/main/resources/views/modules/sys/dictTypeList.html b/modules/core/src/main/resources/views/modules/sys/dictTypeList.html
index 4d4279e8..0dfdc5f4 100644
--- a/modules/core/src/main/resources/views/modules/sys/dictTypeList.html
+++ b/modules/core/src/main/resources/views/modules/sys/dictTypeList.html
@@ -8,9 +8,9 @@
@@ -73,17 +73,17 @@ $('#dataGrid').dataGrid({
{header:'${text("操作")}', name:'actions', width:130, formatter: function(val, obj, row, act){
var actions = [];
//# if(hasPermi('sys:dictType:edit')){
- actions.push('
');
+ actions.push('
');
//# }
- actions.push('
');
//# if(hasPermi('sys:dictType:edit')){
- if (row.status == Global.STATUS_NORMAL){
- actions.push('
');
+ /*if (row.status == Global.STATUS_NORMAL){
+ actions.push('
');
} else if (row.status == Global.STATUS_DISABLE){
- actions.push('
');
- }
+ actions.push('
');
+ }*/
actions.push('
');
//# }
+ actions.push('
');
return actions.join('');
}}
],
diff --git a/modules/core/src/main/resources/views/modules/sys/langList.html b/modules/core/src/main/resources/views/modules/sys/langList.html
index a8a268db..bf6b422f 100644
--- a/modules/core/src/main/resources/views/modules/sys/langList.html
+++ b/modules/core/src/main/resources/views/modules/sys/langList.html
@@ -10,10 +10,10 @@
@@ -73,7 +73,7 @@ $('#dataGrid').dataGrid({
{header:'${text("操作")}', name:'actions', width:130, formatter: function(val, obj, row, act){
var actions = [];
//# if(hasPermi('sys:lang:edit')){
- actions.push('
');
+ actions.push('
');
actions.push('
');
//# }
return actions.join('');
diff --git a/modules/core/src/main/resources/views/modules/sys/logList.html b/modules/core/src/main/resources/views/modules/sys/logList.html
index 5fdb3de1..18c4eebc 100644
--- a/modules/core/src/main/resources/views/modules/sys/logList.html
+++ b/modules/core/src/main/resources/views/modules/sys/logList.html
@@ -4,7 +4,7 @@
@@ -134,7 +134,7 @@ $('#dataGrid').dataGrid({
{header:'${text("浏览器名")}', name:'browserName', index:'a.browser_name', width:100, align:"center"},
{header:'${text("响应时间")}', name:'executeTimeFormat', index:'a.execute_time', width:100, align:"center"}/* ,
{header:'${text("操作")}', name:'actions', width:130, formatter: function(val, obj, row, act){
- return ' ';
+ return ' ';
}} */
],
//# // 加载成功后执行事件
diff --git a/modules/core/src/main/resources/views/modules/sys/menuList.html b/modules/core/src/main/resources/views/modules/sys/menuList.html
index aebc3a21..25fc6eda 100644
--- a/modules/core/src/main/resources/views/modules/sys/menuList.html
+++ b/modules/core/src/main/resources/views/modules/sys/menuList.html
@@ -28,10 +28,10 @@
${text('折叠')}
<% if(hasPermi('sys:menu:edit')){ %>
${text('保存排序')}
- ${text('新增')}
+ ${text('新增')}
${text('数据修复')}
<% } %>
-
+
@@ -124,17 +124,17 @@ $('#dataGrid').dataGrid({
{header:'${text("菜单权重")}', name:'weight', width:100, fixed:true, align:"center", formatter: function(val, obj, row, act){
return js.getDictLabel("#{@DictUtils.getDictListJson('sys_menu_weight')}", val, '未知', true);
}},
- {header:'${text("操作")}', name:'actions', width:120, sortable:false, formatter: function(val, obj, row, act){
+ {header:'${text("操作")}', name:'actions', width:130, sortable:false, formatter: function(val, obj, row, act){
var actions = [];
//# if(hasPermi('sys:menu:edit')){
- actions.push('
');
+ actions.push('
');
if (row.status == Global.STATUS_NORMAL){
- actions.push('
');
+ actions.push('
');
} else if (row.status == Global.STATUS_DISABLE){
- actions.push('
');
+ actions.push('
');
}
actions.push('
');
- actions.push('
');
+ actions.push('
');
//actions.push('
');
//# }
return actions.join('');
diff --git a/modules/core/src/main/resources/views/modules/sys/moduleList.html b/modules/core/src/main/resources/views/modules/sys/moduleList.html
index 7beb5565..dba8ffa7 100644
--- a/modules/core/src/main/resources/views/modules/sys/moduleList.html
+++ b/modules/core/src/main/resources/views/modules/sys/moduleList.html
@@ -10,9 +10,9 @@
@@ -64,11 +64,11 @@ $('#dataGrid').dataGrid({
{header:'${text("操作")}', name:'actions', width:120, formatter: function(val, obj, row, act){
var actions = [];
//# if(hasPermi('sys:module:edit')){
- actions.push('
');
+ actions.push('
');
if (row.status == Global.STATUS_NORMAL){
- actions.push('
');
+ actions.push('
');
}else if (row.status == Global.STATUS_DISABLE){
- actions.push('
');
+ actions.push('
');
}
actions.push('
');
//# }
diff --git a/modules/core/src/main/resources/views/modules/sys/officeList.html b/modules/core/src/main/resources/views/modules/sys/officeList.html
index 44bb4ff7..4e0fce94 100644
--- a/modules/core/src/main/resources/views/modules/sys/officeList.html
+++ b/modules/core/src/main/resources/views/modules/sys/officeList.html
@@ -13,9 +13,9 @@
${text('导出')}
<% if(hasPermi('sys:office:edit')){ %>
${text('导入')}
-
${text('新增')}
+
${text('新增')}
<% } %>
-
+
@@ -81,17 +81,17 @@ $('#dataGrid').dataGrid({
{header:'${text("状态")}', name:'status', index:'a.status', width:80, align:"center", formatter: function(val, obj, row, act){
return js.getDictLabel("#{@DictUtils.getDictListJson('sys_status')}", val, '${text("未知")}', true);
}},
- {header:'${text("操作")}', name:'actions', width:150, formatter: function(val, obj, row, act){
+ {header:'${text("操作")}', name:'actions', width:140, formatter: function(val, obj, row, act){
var actions = [];
//# if(hasPermi('sys:office:edit')){
- actions.push('
');
+ actions.push('
');
if (row.status == Global.STATUS_NORMAL){
- actions.push('
');
+ actions.push('
');
} else if (row.status == Global.STATUS_DISABLE){
- actions.push('
');
+ actions.push('
');
}
actions.push('
');
- actions.push('
');
+ actions.push('
');
//# }
return actions.join('');
}}
diff --git a/modules/core/src/main/resources/views/modules/sys/onlineList.html b/modules/core/src/main/resources/views/modules/sys/onlineList.html
index 70f76803..4cee278b 100644
--- a/modules/core/src/main/resources/views/modules/sys/onlineList.html
+++ b/modules/core/src/main/resources/views/modules/sys/onlineList.html
@@ -7,7 +7,7 @@
diff --git a/modules/core/src/main/resources/views/modules/sys/postList.html b/modules/core/src/main/resources/views/modules/sys/postList.html
index 560d5fc1..f1aa9949 100644
--- a/modules/core/src/main/resources/views/modules/sys/postList.html
+++ b/modules/core/src/main/resources/views/modules/sys/postList.html
@@ -8,9 +8,9 @@
@@ -72,11 +72,11 @@ $('#dataGrid').dataGrid({
{header:'${text("操作")}', name:'actions', width:130, formatter: function(val, obj, row, act){
var actions = [];
//# if(hasPermi('sys:post:edit')){
- actions.push('
');
+ actions.push('
');
if (row.status == Global.STATUS_NORMAL){
- actions.push('
');
+ actions.push('
');
} else if (row.status == Global.STATUS_DISABLE){
- actions.push('
');
+ actions.push('
');
}
actions.push('
');
//# }
diff --git a/modules/core/src/main/resources/views/modules/sys/roleList.html b/modules/core/src/main/resources/views/modules/sys/roleList.html
index a769a815..459cf275 100644
--- a/modules/core/src/main/resources/views/modules/sys/roleList.html
+++ b/modules/core/src/main/resources/views/modules/sys/roleList.html
@@ -10,9 +10,9 @@
@@ -96,17 +96,17 @@ $('#dataGrid').dataGrid({
{header:'${text("状态")}', name:'status', index:'a.status', width:80, align:"center", formatter: function(val, obj, row, act){
return js.getDictLabel("#{@DictUtils.getDictListJson('sys_status')}", val, '未知', true);
}},
- {header:'${text("操作")}', name:'actions', width:110, formatter: function(val, obj, row, act){
+ {header:'${text("操作")}', name:'actions', width:140, formatter: function(val, obj, row, act){
var actions = [];
//# if(hasPermi('sys:role:edit')){
- actions.push('
');
+ actions.push('
');
if (row.status == Global.STATUS_NORMAL){
- actions.push('
');
+ actions.push('
');
}else if (row.status == Global.STATUS_DISABLE){
- actions.push('
');
+ actions.push('
');
}
actions.push('
');
- actions.push('
');
+ actions.push('
');
actions.push('
');
actions.push('
${text("授权菜单")} ');
actions.push('
${text("数据权限")} ');
diff --git a/modules/core/src/main/resources/views/modules/sys/user/corpAdminList.html b/modules/core/src/main/resources/views/modules/sys/user/corpAdminList.html
index 39c970cc..07739397 100644
--- a/modules/core/src/main/resources/views/modules/sys/user/corpAdminList.html
+++ b/modules/core/src/main/resources/views/modules/sys/user/corpAdminList.html
@@ -9,12 +9,12 @@
${text('查询')}
<% if(hasPermi('sys:corpAdmin:edit')){ %>
<% if(useCorpModel){ %>
-
${text('新增')}
+
${text('新增')}
<% }else{ %>
-
${text('新增')}
+
${text('新增')}
<% } %>
<% } %>
-
+
@@ -83,20 +83,20 @@ $('#dataGrid').dataGrid({
{header:'${text("状态")}', name:'status', index:'a.status', width:100, align:"center", formatter: function(val, obj, row, act){
return js.getDictLabel("#{@DictUtils.getDictListJson('sys_status')}", val, '未知', true);
}},
- {header:'${text("操作")}', name:'actions', width:150, formatter: function(val, obj, row, act){
+ {header:'${text("操作")}', name:'actions', width:160, formatter: function(val, obj, row, act){
var actions = [];
//# if(hasPermi('sys:corpAdmin:edit')){
- actions.push('
');
+ actions.push('
');
if (row.status == Global.STATUS_NORMAL){
- actions.push('
');
+ actions.push('
');
} else if (row.status == Global.STATUS_DISABLE){
- actions.push('
');
+ actions.push('
');
}
actions.push('
');
//# if(useCorpModel){
- actions.push('
');
+ actions.push('
');
//# }
- actions.push('
');
+ actions.push('
');
actions.push('
');
diff --git a/modules/core/src/main/resources/views/modules/sys/user/empUserIndex.html b/modules/core/src/main/resources/views/modules/sys/user/empUserIndex.html
index 3c698fda..f1ac5d7b 100644
--- a/modules/core/src/main/resources/views/modules/sys/user/empUserIndex.html
+++ b/modules/core/src/main/resources/views/modules/sys/user/empUserIndex.html
@@ -3,9 +3,6 @@
diff --git a/modules/core/src/main/resources/views/modules/sys/user/empUserList.html b/modules/core/src/main/resources/views/modules/sys/user/empUserList.html
index 5dea1549..3885914c 100644
--- a/modules/core/src/main/resources/views/modules/sys/user/empUserList.html
+++ b/modules/core/src/main/resources/views/modules/sys/user/empUserList.html
@@ -10,9 +10,9 @@
${text('导出')}
<% if(hasPermi('sys:empUser:edit')){ %>
${text('导入')}
-
${text('新增')}
+
${text('新增')}
<% } %>
-
+