hitsword
/
fastadmin
mirror of https://gitee.com/karson/fastadmin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

新增自适应后台状态显示 

修复iOS下iframe不滚动的BUG
新增后台基本配置不允许编辑状态为locked的条目
pull/269678/MERGE
Karson 2017-04-24 11:32:25 +08:00
parent cdc72a61d3
commit 75981bdb74
6 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
application/admin/controller/general/Configvalue.php
View File

@ -93,6 +93,9 @@ class Configvalue extends Backend
$row = $this->model->get(['id' => $ids]);
if (!$row)
$this->error(__('No Results were found'));
// 状态为locked时不允许编辑
if ($row['status'] == 'locked')
$this->error(__('The current item can not be edited'));
if ($this->request->isPost())
{
$this->code = -1;

2
public/assets/css/backend-func.css
View File

@ -33,6 +33,8 @@ body {
.tab-addtabs .tab-pane {
height: 100%;
width: 100%;
-webkit-overflow-scrolling: touch;
overflow: auto;
}
/*
* RIBBON

2
public/assets/css/backend.min.css vendored
View File

File diff suppressed because one or more lines are too long

22
public/assets/js/require-backend.min.js vendored
View File

@ -7221,7 +7221,7 @@ define('table',['jquery', 'bootstrap', 'backend', 'config', 'toastr', 'moment',
valign: 'middle',
},
config: {
firsttd: 'tbody tr td:first-child',
firsttd: 'tbody tr td:first-child:not(:has(div.card-views))',
toolbar: '.toolbar',
refreshbtn: '.btn-refresh',
addbtn: '.btn-add',
@ -7424,20 +7424,24 @@ define('table',['jquery', 'bootstrap', 'backend', 'config', 'toastr', 'moment',
// 单元格数据格式化
formatter: {
icon: function (value, row, index) {
value = value.indexOf(" ") > -1 ? value : "fa fa-" + value;
//渲染fontawesome图标
return '<i class="fa fa-' + value + '"></i> ' + value;
return '<i class="' + value + '"></i> ' + value;
},
image: function (value, row, index) {
return '<img class="img-rounded img-sm" src="' + (value.indexOf("http") === 0 ? '' : Config.upload.cdnurl) + value + '" />';
},
status: function (value, row, index) {
//渲染状态
var html = '';
if (value == 'normal') {
html = '<span class="text-success"><i class="fa fa-circle"></i> ' + __('Normal') + '</span>';
} else {
html = '<span class="text-default"><i class="fa fa-circle"></i> ' + __('Hidden') + '</span>';
status: function (value, row, index, custom) {
//颜色状态数组,可使用red/yellow/aqua/blue/navy/teal/olive/lime/fuchsia/purple/maroon
var colorArr = {normal: 'success', hidden: 'grey', deleted: 'danger', locked: 'info'};
//如果有自定义状态,可以按需传入
if (typeof custom !== 'undefined') {
colorArr = $.extend(colorArr, custom);
}
var color = value && typeof colorArr[value] !== 'undefined' ? colorArr[value] : 'primary';
value = value[0].toUpperCase() + value.substr(1);
//渲染状态
var html = '<span class="text-' + color + '"><i class="fa fa-circle"></i> ' + __(value) + '</span>';
return html;
},
url: function (value, row, index) {

20
public/assets/js/require-table.js
View File

@ -244,20 +244,24 @@ define(['jquery', 'bootstrap', 'backend', 'config', 'toastr', 'moment', 'bootstr
// 单元格数据格式化
formatter: {
icon: function (value, row, index) {
value = value.indexOf(" ") > -1 ? value : "fa fa-" + value;
//渲染fontawesome图标
return '<i class="fa fa-' + value + '"></i> ' + value;
return '<i class="' + value + '"></i> ' + value;
},
image: function (value, row, index) {
return '<img class="img-rounded img-sm" src="' + (value.indexOf("http") === 0 ? '' : Config.upload.cdnurl) + value + '" />';
},
status: function (value, row, index) {
//渲染状态
var html = '';
if (value == 'normal') {
html = '<span class="text-success"><i class="fa fa-circle"></i> ' + __('Normal') + '</span>';
} else {
html = '<span class="text-default"><i class="fa fa-circle"></i> ' + __('Hidden') + '</span>';
status: function (value, row, index, custom) {
//颜色状态数组,可使用red/yellow/aqua/blue/navy/teal/olive/lime/fuchsia/purple/maroon
var colorArr = {normal: 'success', hidden: 'grey', deleted: 'danger', locked: 'info'};
//如果有自定义状态,可以按需传入
if (typeof custom !== 'undefined') {
colorArr = $.extend(colorArr, custom);
}
var color = value && typeof colorArr[value] !== 'undefined' ? colorArr[value] : 'primary';
value = value[0].toUpperCase() + value.substr(1);
//渲染状态
var html = '<span class="text-' + color + '"><i class="fa fa-circle"></i> ' + __(value) + '</span>';
return html;
},
url: function (value, row, index) {

2
public/assets/less/backend-func.less
View File

@ -51,6 +51,8 @@ body {
.tab-pane {
height: 100%;
width: 100%;
-webkit-overflow-scrolling:touch;
overflow:auto;
}
}