Home Explore Help
Sign In
githab
/
fastadmin
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

修复特殊字段导致生成Model的错误
修复Toastr在首页弹出位置的错误
移除Category的diyname字段
移动统计代码到index.js文件中,去除视图中的统计代码

Karson 8 years ago
parent
cbfc382d8c
commit
3a29ac2e4a
12 changed files with 51 additions and 28 deletions
Unified View Show Diff Stats
  1. 12 0
      application/admin/command/Crud.php
  2. 0 4
      application/admin/view/category/add.html
  3. 0 4
      application/admin/view/category/edit.html
  4. 0 11
      application/admin/view/index/index.html
  5. 4 0
      public/assets/css/backend.css
  6. 1 1
      public/assets/css/backend.min.css
  7. 3 0
      public/assets/js/backend.js
  8. 1 0
      public/assets/js/backend/category.js
  9. 11 3
      public/assets/js/backend/example/bootstraptable.js
  10. 6 0
      public/assets/js/backend/index.js
  11. 8 5
      public/assets/js/require-backend.min.js
  12. 5 0
      public/assets/less/backend.less

+ 12 - 0
application/admin/command/Crud.php
View File 

@@ -548,6 +548,10 @@ class Crud extends Command
 
 
 
     protected function getAttr(&$getAttr, $field, $itemArr = '', $inputType = '')
 
     protected function getAttr(&$getAttr, $field, $itemArr = '', $inputType = '')
 
     {
 
     {
 
+        if (preg_match("/[_\-]+/", $field))
 
+        {
 
+            return;
 
+        }
 
         if (!in_array($inputType, ['datetime', 'select', 'multiple', 'checkbox', 'radio']))
 
         if (!in_array($inputType, ['datetime', 'select', 'multiple', 'checkbox', 'radio']))
 
             return;
 
             return;
 
         $attrField = ucfirst($field);
 
         $attrField = ucfirst($field);
 
@@ -595,6 +599,10 @@ EOD;
 
 
 
     protected function setAttr(&$setAttr, $field, $itemArr = '', $inputType = '')
 
     protected function setAttr(&$setAttr, $field, $itemArr = '', $inputType = '')
 
     {
 
     {
 
+        if (preg_match("/[_\-]+/", $field))
 
+        {
 
+            return;
 
+        }
 
         if ($inputType != 'datetime')
 
         if ($inputType != 'datetime')
 
             return;
 
             return;
 
         $field = ucfirst($field);
 
         $field = ucfirst($field);
 
@@ -614,6 +622,10 @@ EOD;
 
 
 
     protected function appendAttr(&$appendAttrList, $field)
 
     protected function appendAttr(&$appendAttrList, $field)
 
     {
 
     {
 
+        if (preg_match("/[_\-]+/", $field))
 
+        {
 
+            return;
 
+        }
 
         $appendAttrList[] = <<<EOD
 
         $appendAttrList[] = <<<EOD
 
         '{$field}_text'
 
         '{$field}_text'
 
 EOD;
 
 EOD;

+ 0 - 4
application/admin/view/category/add.html
View File 

@@ -14,10 +14,6 @@
 
                 <input type="text" class="form-control" id="nickname" name="row[nickname]" value="" required="required" />
 
                 <input type="text" class="form-control" id="nickname" name="row[nickname]" value="" required="required" />
 
             </div>
 
             </div>
 
             <div class="form-group">
 
             <div class="form-group">
 
-                <label for="diyname" class="control-label">{:__('Diyname')}:</label>
 
-                <input type="text" class="form-control" id="diyname" name="row[diyname]" value="" required="required" />
 
-            </div>
 
-            <div class="form-group">
 
                 <label for="keywords" class="control-label">{:__('Keywords')}:</label>
 
                 <label for="keywords" class="control-label">{:__('Keywords')}:</label>
 
                 <input type="text" class="form-control" id="keywords" name="row[keywords]" value="" />
 
                 <input type="text" class="form-control" id="keywords" name="row[keywords]" value="" />
 
             </div>
 
             </div>

+ 0 - 4
application/admin/view/category/edit.html
View File 

@@ -14,10 +14,6 @@
 
                 <input type="text" class="form-control" id="nickname" name="row[nickname]" value="{$row.nickname}" required="required" />
 
                 <input type="text" class="form-control" id="nickname" name="row[nickname]" value="{$row.nickname}" required="required" />
 
             </div>
 
             </div>
 
             <div class="form-group">
 
             <div class="form-group">
 
-                <label for="diyname" class="control-label">{:__('Diyname')}:</label>
 
-                <input type="text" class="form-control" id="diyname" name="row[diyname]" value="{$row.diyname}" required="required" />
 
-            </div>
 
-            <div class="form-group">
 
                 <label for="keywords" class="control-label">{:__('Keywords')}:</label>
 
                 <label for="keywords" class="control-label">{:__('Keywords')}:</label>
 
                 <input type="text" class="form-control" id="keywords" name="row[keywords]" value="{$row.keywords}" />
 
                 <input type="text" class="form-control" id="keywords" name="row[keywords]" value="{$row.keywords}" />
 
             </div>
 
             </div>

+ 0 - 11
application/admin/view/index/index.html
View File 

@@ -2,17 +2,6 @@
 
 <html lang="{$config.language}">
 
 <html lang="{$config.language}">
 
     <head>
 
     <head>
 
         {include file="common/meta" /}
 
         {include file="common/meta" /}
 
-
 
-        <script>
 
-            //此处为FastAdmin的统计代码,正式使用请移除
 
-            var _hmt = _hmt || [];
 
-            (function () {
 
-                var hm = document.createElement("script");
 
-                hm.src = "https://hm.baidu.com/hm.js?58347d769d009bcf6074e9a0ab7ba05e";
 
-                var s = document.getElementsByTagName("script")[0];
 
-                s.parentNode.insertBefore(hm, s);
 
-            })();
 
-        </script>
 
     </head>
 
     </head>
 
     <body class="hold-transition skin-green sidebar-mini fixed" id="tabs">
 
     <body class="hold-transition skin-green sidebar-mini fixed" id="tabs">
 
         <div class="wrapper">
 
         <div class="wrapper">

+ 4 - 0
public/assets/css/backend.css
View File 

@@ -73,6 +73,10 @@ body {
 
 .searchit {
 
 .searchit {
 
   border-bottom: 1px dashed #3c8dbc;
 
   border-bottom: 1px dashed #3c8dbc;
 
 }
 
 }
 
+.toast-top-right-index {
 
+  top: 62px;
 
+  right: 12px;
 
+}
 
 /*
 
 /*
 
  * RIBBON
 
  * RIBBON
 
  */
 
  */

File diff suppressed because it is too large
+ 1 - 1
public/assets/css/backend.min.css


+ 3 - 0
public/assets/js/backend.js
View File 

@@ -347,6 +347,9 @@ define(['jquery', 'bootstrap', 'toastr', 'layer', 'lang', 'moment'], function ($
 
         init: function () {
 
         init: function () {
 
             //公共代码
 
             //公共代码
 
             //配置Toastr的参数
 
             //配置Toastr的参数
 
+            if (Config.controllername == 'index') {
 
+                Backend.config.toastr.positionClass = "toast-top-right-index";
 
+            }
 
             Toastr.options = Backend.config.toastr;
 
             Toastr.options = Backend.config.toastr;
 
             //点击包含.btn-dialog的元素时弹出dialog
 
             //点击包含.btn-dialog的元素时弹出dialog
 
             $(document).on('click', '.btn-dialog,.dialogit', function (e) {
 
             $(document).on('click', '.btn-dialog,.dialogit', function (e) {

+ 1 - 0
public/assets/js/backend/category.js
View File 

@@ -26,6 +26,7 @@ define(['jquery', 'bootstrap', 'backend', 'form', 'table'], function ($, undefin
 
                         {field: 'id', title: 'ID'},
 
                         {field: 'id', title: 'ID'},
 
                         {field: 'name', title: __('Name'), align: 'left'},
 
                         {field: 'name', title: __('Name'), align: 'left'},
 
                         {field: 'nickname', title: __('Nickname')},
 
                         {field: 'nickname', title: __('Nickname')},
 
+                        {field: 'type', title: __('Type')},
 
                         {field: 'flag', title: __('Flag'), formatter: Table.api.formatter.flag},
 
                         {field: 'flag', title: __('Flag'), formatter: Table.api.formatter.flag},
 
                         {field: 'weigh', title: __('Weigh')},
 
                         {field: 'weigh', title: __('Weigh')},
 
                         {field: 'status', title: __('Status'), formatter: Table.api.formatter.status},
 
                         {field: 'status', title: __('Status'), formatter: Table.api.formatter.status},

+ 11 - 3
public/assets/js/backend/example/bootstraptable.js
View File 

@@ -24,13 +24,21 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 
                         {field: 'id', title: 'ID', operate: false},
 
                         {field: 'id', title: 'ID', operate: false},
 
                         //使用Table.api.formatter.search可直接响应搜索
 
                         //使用Table.api.formatter.search可直接响应搜索
 
                         {field: 'username', title: __('Username'), formatter: Table.api.formatter.search},
 
                         {field: 'username', title: __('Username'), formatter: Table.api.formatter.search},
 
-                        {field: 'title', title: __('Title')},
 
+                        {field: 'title', title: __('Title'),
 
+                            operate: 'LIKE %...%',
 
+                            placeholder: '模糊搜索，*表示任意字符',
 
+                            style: 'width:200px',
 
+                            process: function (value, arg) {
 
+                                return value.replace(/\*/g, '%');
 
+                            }
 
+                        },
 
                         {field: 'url', title: __('Url'), align: 'left', formatter: Controller.api.formatter.url},
 
                         {field: 'url', title: __('Url'), align: 'left', formatter: Controller.api.formatter.url},
 
-                        //点击IP时同时执行搜索此IP
 
-                        {field: 'ip', title: __('IP'), events: Controller.api.events.ip, formatter: Controller.api.formatter.ip},
 
+                        //点击IP时同时执行搜索此IP,同时普通搜索使用下拉列表的形式
 
+                        {field: 'ip', title: __('IP'), searchList: ['127.0.0.1', '127.0.0.2'], events: Controller.api.events.ip, formatter: Controller.api.formatter.ip},
 
                         //browser是一个不存在的字段
 
                         //browser是一个不存在的字段
 
                         //通过formatter来渲染数据,同时为它添加上事件
 
                         //通过formatter来渲染数据,同时为它添加上事件
 
                         {field: 'browser', title: __('Browser'), operate: false, events: Controller.api.events.browser, formatter: Controller.api.formatter.browser},
 
                         {field: 'browser', title: __('Browser'), operate: false, events: Controller.api.events.browser, formatter: Controller.api.formatter.browser},
 
+                        //启用时间段搜索
 
                         {field: 'createtime', title: __('Create time'), formatter: Table.api.formatter.datetime, operate: 'BETWEEN', type: 'datetime', addclass: 'datetimepicker', data: 'data-date-format="YYYY-MM-DD HH:mm:ss"'},
 
                         {field: 'createtime', title: __('Create time'), formatter: Table.api.formatter.datetime, operate: 'BETWEEN', type: 'datetime', addclass: 'datetimepicker', data: 'data-date-format="YYYY-MM-DD HH:mm:ss"'},
 
                         //我们向操作栏额外添加上一个详情按钮,并保留已有的编辑和删除控制,同时为这个按钮添加上点击事件
 
                         //我们向操作栏额外添加上一个详情按钮,并保留已有的编辑和删除控制,同时为这个按钮添加上点击事件
 
                         {field: 'operate', title: __('Operate'), events: Controller.api.events.operate, formatter: Controller.api.formatter.operate}
 
                         {field: 'operate', title: __('Operate'), events: Controller.api.events.operate, formatter: Controller.api.formatter.operate}

+ 6 - 0
public/assets/js/backend/index.js
View File 

@@ -14,6 +14,12 @@ define(['jquery', 'bootstrap', 'backend', 'addtabs', 'adminlte', 'form'], functi
 
                 e.stopPropagation();
 
                 e.stopPropagation();
 
             });
 
             });
 
 
 
+            //此处为FastAdmin的统计代码,正式使用请移除
 
+            var s = document.createElement("script");
 
+            s.type = "text/javascript";
 
+            s.src = "https://hm.baidu.com/hm.js?58347d769d009bcf6074e9a0ab7ba05e";
 
+            $("head").append(s);
 
+
 
             //读取FastAdmin的更新信息
 
             //读取FastAdmin的更新信息
 
             $.ajax({
 
             $.ajax({
 
                 url: 'http://demo.fastadmin.net/index/index/news',
 
                 url: 'http://demo.fastadmin.net/index/index/news',

+ 8 - 5
public/assets/js/require-backend.min.js
View File 

@@ -6663,7 +6663,7 @@ define('backend',['jquery', 'bootstrap', 'toastr', 'layer', 'lang', 'moment'], f
 
                 });
 
                 });
 
             },
 
             },
 
             addtabs: function (url, title, icon) {
 
             addtabs: function (url, title, icon) {
 
-                var dom = ".sidebar-menu li a[url='{url}']"
 
+                var dom = "a[url='{url}']"
 
                 var leftlink = top.window.$(dom.replace(/\{url\}/, url));
 
                 var leftlink = top.window.$(dom.replace(/\{url\}/, url));
 
                 if (leftlink.size() > 0) {
 
                 if (leftlink.size() > 0) {
 
                     leftlink.trigger("click");
 
                     leftlink.trigger("click");
 
@@ -6690,7 +6690,7 @@ define('backend',['jquery', 'bootstrap', 'toastr', 'layer', 'lang', 'moment'], f
 
                             var id = Math.floor(new Date().valueOf() * Math.random());
 
                             var id = Math.floor(new Date().valueOf() * Math.random());
 
                             icon = typeof icon != 'undefined' ? icon : 'fa fa-circle-o';
 
                             icon = typeof icon != 'undefined' ? icon : 'fa fa-circle-o';
 
                             title = typeof title != 'undefined' ? title : '';
 
                             title = typeof title != 'undefined' ? title : '';
 
-                            top.window.$("<a />").append('<i class="' + icon + '"></i> <span>' + title + '</span>').prop("href", url).attr({url: url, addtabs: id}).appendTo(top.window.document.body).trigger("click");
 
+                            top.window.$("<a />").append('<i class="' + icon + '"></i> <span>' + title + '</span>').prop("href", url).attr({url: url, addtabs: id}).addClass("hide").appendTo(top.window.document.body).trigger("click");
 
                         }
 
                         }
 
                     }
 
                     }
 
                 }
 
                 }
 
@@ -6764,6 +6764,9 @@ define('backend',['jquery', 'bootstrap', 'toastr', 'layer', 'lang', 'moment'], f
 
         init: function () {
 
         init: function () {
 
             //公共代码
 
             //公共代码
 
             //配置Toastr的参数
 
             //配置Toastr的参数
 
+            if (Config.controllername == 'index') {
 
+                Backend.config.toastr.positionClass = "toast-top-right-index";
 
+            }
 
             Toastr.options = Backend.config.toastr;
 
             Toastr.options = Backend.config.toastr;
 
             //点击包含.btn-dialog的元素时弹出dialog
 
             //点击包含.btn-dialog的元素时弹出dialog
 
             $(document).on('click', '.btn-dialog,.dialogit', function (e) {
 
             $(document).on('click', '.btn-dialog,.dialogit', function (e) {
 
@@ -10939,9 +10942,9 @@ define('form',['jquery', 'bootstrap', 'backend', 'toastr', 'upload', 'validator'
 
                     stopOnError: true,
 
                     stopOnError: true,
 
                     valid: function (ret) {
 
                     valid: function (ret) {
 
                         //验证通过提交表单
 
                         //验证通过提交表单
 
-                        Form.api.submit(form, onBeforeSubmit, function (data) {
 
+                        Form.api.submit($(ret), onBeforeSubmit, function (data) {
 
                             if (typeof onAfterSubmit == 'function') {
 
                             if (typeof onAfterSubmit == 'function') {
 
-                                if (!onAfterSubmit.call(form, data)) {
 
+                                if (!onAfterSubmit.call($(ret), data)) {
 
                                     return false;
 
                                     return false;
 
                                 }
 
                                 }
 
                             }
 
                             }
 
@@ -11102,7 +11105,7 @@ define('form',['jquery', 'bootstrap', 'backend', 'toastr', 'upload', 'validator'
 
                     $(document).on('click', ".fachoose", function () {
 
                     $(document).on('click', ".fachoose", function () {
 
                         var multiple = $(this).data("multiple") ? $(this).data("multiple") : false;
 
                         var multiple = $(this).data("multiple") ? $(this).data("multiple") : false;
 
                         var mimetype = $(this).data("mimetype") ? $(this).data("mimetype") : '';
 
                         var mimetype = $(this).data("mimetype") ? $(this).data("mimetype") : '';
 
-                        Backend.api.open("general/attachment/select?callback=refreshchoose&element_id=" + $(this).attr("id") + "&multiple=" + multiple + "&mimetype="+mimetype, __('Choose'));
 
+                        Backend.api.open("general/attachment/select?callback=refreshchoose&element_id=" + $(this).attr("id") + "&multiple=" + multiple + "&mimetype=" + mimetype, __('Choose'));
 
                         return false;
 
                         return false;
 
                     });
 
                     });

+ 5 - 0
public/assets/less/backend.less
View File 

@@ -97,6 +97,11 @@ body {
 
     border-bottom:1px dashed @link-color;

     border-bottom:1px dashed @link-color;

 }

 }

 

 

+.toast-top-right-index{

+    top:62px;

+    right:12px;

+}

+

 /*

 /*

  * RIBBON

  * RIBBON

  */

  */