新增自适应后台状态显示

修复iOS下iframe不滚动的BUG
新增后台基本配置不允许编辑状态为locked的条目

application/admin/controller/general/Configvalue.php

@@ -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;

public/assets/css/backend-func.css

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

public/assets/js/require-backend.min.js

@@ -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) {
+                status: function (value, row, index, custom) {
-                    //渲染状态
+                    //颜色状态数组,可使用red/yellow/aqua/blue/navy/teal/olive/lime/fuchsia/purple/maroon
-                    var html = '';
+                    var colorArr = {normal: 'success', hidden: 'grey', deleted: 'danger', locked: 'info'};
-                    if (value == 'normal') {
+                    //如果有自定义状态,可以按需传入
-                        html = '<span class="text-success"><i class="fa fa-circle"></i> ' + __('Normal') + '</span>';
+                    if (typeof custom !== 'undefined') {
-                    } else {
+                        colorArr = $.extend(colorArr, custom);
-                        html = '<span class="text-default"><i class="fa fa-circle"></i> ' + __('Hidden') + '</span>';
                     }
+                    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) {

public/assets/js/require-table.js

@@ -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) {
+                status: function (value, row, index, custom) {
-                    //渲染状态
+                    //颜色状态数组,可使用red/yellow/aqua/blue/navy/teal/olive/lime/fuchsia/purple/maroon
-                    var html = '';
+                    var colorArr = {normal: 'success', hidden: 'grey', deleted: 'danger', locked: 'info'};
-                    if (value == 'normal') {
+                    //如果有自定义状态,可以按需传入
-                        html = '<span class="text-success"><i class="fa fa-circle"></i> ' + __('Normal') + '</span>';
+                    if (typeof custom !== 'undefined') {
-                    } else {
+                        colorArr = $.extend(colorArr, custom);
-                        html = '<span class="text-default"><i class="fa fa-circle"></i> ' + __('Hidden') + '</span>';
                     }
+                    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) {

public/assets/less/backend-func.less

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