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('新增')}
<% } %>
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 befda086..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 @@
@@ -61,7 +61,7 @@