diff --git a/README.md b/README.md index f33583de..4376bfcf 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,7 @@ FastAdmin是一款基于ThinkPHP5+Bootstrap的极速后台管理系统。 * 基于`Less`进行样式开发 * 基于`Bower`进行前端组件包管理 * 数据库表一键生成`CRUD`,包括控制器、模型、视图、JS、语言包 +* 一键压缩打包JS和CSS文件 * 多语言支持，服务端及客户端支持 * 无缝整合又拍云上传功能 * 第三方登录(QQ、微信、微博)整合 diff --git a/application/admin/command/Crud/stubs/index.stub b/application/admin/command/Crud/stubs/index.stub index f9ca18d2..d3eefa4f 100644 --- a/application/admin/command/Crud/stubs/index.stub +++ b/application/admin/command/Crud/stubs/index.stub @@ -10,8 +10,8 @@
{:__('More')}
diff --git a/application/admin/controller/Ajax.php b/application/admin/controller/Ajax.php index 92f52791..29335409 100644 --- a/application/admin/controller/Ajax.php +++ b/application/admin/controller/Ajax.php @@ -71,8 +71,8 @@ class Ajax extends Backend $controllername = input("controllername"); Lang::load(APP_PATH . $modulename . '/lang/' . Lang::detect() . '/' . str_replace('.', '/', $controllername) . '.php'); //强制输出JSON Object -// $result = 'define(' . json_encode(Lang::get(), JSON_FORCE_OBJECT | JSON_UNESCAPED_UNICODE) . ');'; - return jsonp(Lang::get()); + $result = 'define(' . json_encode(Lang::get(), JSON_FORCE_OBJECT | JSON_UNESCAPED_UNICODE) . ');'; + return $result; } /** diff --git a/application/admin/controller/Category.php b/application/admin/controller/Category.php new file mode 100644 index 00000000..c0a5e81a --- /dev/null +++ b/application/admin/controller/Category.php @@ -0,0 +1,56 @@ +model = model('Category'); + + $tree = Tree::instance(); + $tree->init(CategoryModel::getCategoryArray(), 'pid'); + $this->categorylist = $tree->getTreeList($tree->getTreeArray(0), 'name'); + $categorydata = [0 => __('None')]; + foreach ($this->categorylist as $k => $v) + { + $categorydata[$v['id']] = $v['name']; + } + $this->view->assign("typelist", CategoryModel::getTypeList()); + $this->view->assign("parentlist", $categorydata); + } + + /** + * 查看 + */ + public function index() + { + if ($this->request->isAjax()) + { + + //构造父类select列表选项数据 + $list = $this->categorylist; + $total = count($list); + $result = array("total" => $total, "rows" => $list); + + return json($result); + } + return $this->view->fetch(); + } + +} diff --git a/application/admin/lang/zh-cn.php b/application/admin/lang/zh-cn.php index 24db85d2..af8992e7 100644 --- a/application/admin/lang/zh-cn.php +++ b/application/admin/lang/zh-cn.php @@ -90,6 +90,8 @@ return [ '%d month%s ago' => '%d月前', '%d year%s ago' => '%d年前', // + 'Set to normal' => '设为正常', + 'Set to hidden' => '设为隐藏', 'Invalid parameters' => '未知参数', 'No results were found' => '记录未找到', 'Parameter %s can not be empty' => '参数%s不能为空', diff --git a/application/admin/model/Page.php b/application/admin/model/Page.php deleted file mode 100644 index fe5b6821..00000000 --- a/application/admin/model/Page.php +++ /dev/null @@ -1,16 +0,0 @@ - +
+
+
+ + {:build_select('row[type]', $typelist, [], ['id'=>'c-type','class'=>'form-control selectpicker','required'=>''])} +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ + +
+
+
+
+
+ +
+ + {:build_select('row[pid]', $parentlist, null, ['id'=>'c-pid','class'=>'form-control selectpicker','required'=>''])} +
+
+ + {:build_select('row[flag]', 'h,i,s', null, ['id'=>'c-flag','class'=>'form-control selectpicker','required'=>''])} +
+
+ +
+ {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')])} +
+
+
+
+ + + diff --git a/application/admin/view/category/edit.html b/application/admin/view/category/edit.html new file mode 100644 index 00000000..3adec277 --- /dev/null +++ b/application/admin/view/category/edit.html @@ -0,0 +1,63 @@ +
+
+
+
+ + {:build_select('row[type]', $typelist, $row['type'], ['id'=>'c-type','class'=>'form-control selectpicker','required'=>''])} +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ + +
+
+
+
+
+ +
+ + {:build_select('row[pid]', $parentlist, $row['pid'], ['id'=>'c-pid','class'=>'form-control selectpicker','required'=>''])} +
+
+ + {:build_select('row[flag]', 'h,i,s', $row['flag'], ['id'=>'c-flag','class'=>'form-control selectpicker','required'=>''])} +
+
+ +
+ {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')], $row['status'])} +
+
+
+
+ + +
diff --git a/application/admin/view/category/index.html b/application/admin/view/category/index.html new file mode 100644 index 00000000..d3eefa4f --- /dev/null +++ b/application/admin/view/category/index.html @@ -0,0 +1,25 @@ +
+ {:build_heading()} + +
+
+
+
+ + +
+
+
+ +
+
+
diff --git a/application/admin/view/common/header.html b/application/admin/view/common/header.html index ce5efc7b..c0ed16be 100644 --- a/application/admin/view/common/header.html +++ b/application/admin/view/common/header.html @@ -25,31 +25,32 @@ -
  • - 2 + +
    • + +
  • + +
    • diff --git a/application/admin/view/general/attachment/index.html b/application/admin/view/general/attachment/index.html index f9ca18d2..d3eefa4f 100644 --- a/application/admin/view/general/attachment/index.html +++ b/application/admin/view/general/attachment/index.html @@ -10,8 +10,8 @@
    {:__('More')}
    diff --git a/application/admin/view/general/configvalue/index.html b/application/admin/view/general/configvalue/index.html index f9ca18d2..d3eefa4f 100644 --- a/application/admin/view/general/configvalue/index.html +++ b/application/admin/view/general/configvalue/index.html @@ -10,8 +10,8 @@
    {:__('More')}
    diff --git a/application/admin/view/general/crontab/index.html b/application/admin/view/general/crontab/index.html index f9ca18d2..d3eefa4f 100644 --- a/application/admin/view/general/crontab/index.html +++ b/application/admin/view/general/crontab/index.html @@ -10,8 +10,8 @@
    {:__('More')}
    diff --git a/application/admin/view/page/index.html b/application/admin/view/page/index.html index f9ca18d2..d3eefa4f 100644 --- a/application/admin/view/page/index.html +++ b/application/admin/view/page/index.html @@ -10,8 +10,8 @@
    {:__('More')}
    diff --git a/application/admin/view/user/third/index.phtml b/application/admin/view/user/third/index.phtml index f9ca18d2..d3eefa4f 100644 --- a/application/admin/view/user/third/index.phtml +++ b/application/admin/view/user/third/index.phtml @@ -10,8 +10,8 @@
    {:__('More')}
    diff --git a/application/admin/view/user/user/index.phtml b/application/admin/view/user/user/index.phtml index 7a571c66..43c6636e 100644 --- a/application/admin/view/user/user/index.phtml +++ b/application/admin/view/user/user/index.phtml @@ -10,8 +10,8 @@
    {:__('More')}
    diff --git a/application/admin/view/wechat/autoreply/index.html b/application/admin/view/wechat/autoreply/index.html index 5993ae2f..f1bdef1f 100644 --- a/application/admin/view/wechat/autoreply/index.html +++ b/application/admin/view/wechat/autoreply/index.html @@ -10,8 +10,8 @@
    diff --git a/application/common/controller/Backend.php b/application/common/controller/Backend.php index 57a3a8e0..92dd6c2e 100644 --- a/application/common/controller/Backend.php +++ b/application/common/controller/Backend.php @@ -84,7 +84,7 @@ class Backend extends Controller // 非选项卡时重定向 if (!IS_AJAX && !IS_ADDTABS && $controllername != 'index' && $actionname == 'index') { - header("location:" . url('index/index#!' . urlencode($this->request->url()), '', false)); + header("location:" . url('index/index#!' . urlencode($this->request->baseUrl()), '', false)); exit; } diff --git a/application/common/model/Category.php b/application/common/model/Category.php index 30e949c2..ef80cbda 100644 --- a/application/common/model/Category.php +++ b/application/common/model/Category.php @@ -34,4 +34,26 @@ class Category Extends Model return $typelist; } + /** + * 读取分类列表 + * @param string $type 指定类型 + * @param string $status 指定状态 + * @return array + */ + public static function getCategoryArray($type = NULL, $status = NULL) + { + $list = collection(self::where(function($query) use($type, $status) + { + if (!is_null($type)) + { + $query->where('type', '=', $type); + } + if (!is_null($status)) + { + $query->where('status', '=', $status); + } + })->order('weigh', 'desc')->select())->toArray(); + return $list; + } + } diff --git a/application/common/model/Page.php b/application/common/model/Page.php index 4f29b3e0..7bba9fa7 100644 --- a/application/common/model/Page.php +++ b/application/common/model/Page.php @@ -8,9 +8,9 @@ class Page extends Model { // 自动写入时间戳字段 - protected $autoWriteTimestamp = false; - + protected $autoWriteTimestamp = 'int'; // 定义时间戳字段名 - protected $createTime = false; - protected $updateTime = false; + protected $createTime = 'createtime'; + protected $updateTime = 'updatetime'; + } diff --git a/application/config.php b/application/config.php index 27526c77..df78ed8c 100755 --- a/application/config.php +++ b/application/config.php @@ -41,7 +41,7 @@ return [ // 默认时区 'default_timezone' => 'PRC', // 是否开启多语言 - 'lang_switch_on' => false, + 'lang_switch_on' => true, // 默认全局过滤方法 用逗号分隔多个 'default_filter' => '', // 默认语言 diff --git a/public/assets/js/backend/category.js b/public/assets/js/backend/category.js index bf07eaea..99fa8514 100644 --- a/public/assets/js/backend/category.js +++ b/public/assets/js/backend/category.js @@ -24,12 +24,12 @@ define(['jquery', 'bootstrap', 'backend', 'form', 'table'], function ($, undefin [ {field: 'state', checkbox: true, }, {field: 'id', title: 'ID'}, - {field: 'name', title: '名称', align: 'left'}, - {field: 'nickname', title: '昵称'}, - {field: 'flag', title: '标志', formatter: Table.api.formatter.flag}, - {field: 'weigh', title: '权重'}, - {field: 'status', title: '状态', formatter: Table.api.formatter.status}, - {field: 'operate', title: '操作', events: Table.api.events.operate, formatter: Table.api.formatter.operate} + {field: 'name', title: __('Name'), align: 'left'}, + {field: 'nickname', title: __('Nickname')}, + {field: 'flag', title: __('Flag'), formatter: Table.api.formatter.flag}, + {field: 'weigh', title: __('Weigh')}, + {field: 'status', title: __('Status'), formatter: Table.api.formatter.status}, + {field: 'operate', title: __('Operate'), events: Table.api.events.operate, formatter: Table.api.formatter.operate} ] ] }); @@ -39,10 +39,15 @@ define(['jquery', 'bootstrap', 'backend', 'form', 'table'], function ($, undefin }, add: function () { - Form.api.bindevent($("form[role=form]")); + Controller.api.bindevent(); }, edit: function () { - Form.api.bindevent($("form[role=form]")); + Controller.api.bindevent(); + }, + api: { + bindevent: function () { + Form.api.bindevent($("form[role=form]")); + } } }; diff --git a/public/assets/js/backend/index.js b/public/assets/js/backend/index.js index 1b77de0a..082236d8 100755 --- a/public/assets/js/backend/index.js +++ b/public/assets/js/backend/index.js @@ -15,6 +15,20 @@ define(['jquery', 'bootstrap', 'backend', 'addtabs', 'adminlte', 'validator'], f e.stopPropagation(); }); + //读取FastAdmin的更新信息 + $.ajax({ + url: 'http://www.fa.com/index/index/news', + type: 'post', + dataType: 'jsonp', + success: function (ret) { + $(".notifications-menu > a span").text(ret.new > 0 ? ret.new : ''); + $(".notifications-menu .footer a").attr("href", ret.url); + $.each(ret.newslist, function (i, j) { + var item = '
  • ' + j.title + '
    • '; + $(item).appendTo($(".notifications-menu ul.menu")); + }); + } + }); //切换左侧sidebar显示隐藏 $(document).on("click", ".sidebar-menu li > a", function (e) { diff --git a/public/assets/js/require-table.js b/public/assets/js/require-table.js index ad46192d..c8aec94d 100644 --- a/public/assets/js/require-table.js +++ b/public/assets/js/require-table.js @@ -41,7 +41,7 @@ define(['jquery', 'bootstrap', 'backend', 'config', 'toastr', 'moment', 'bootstr 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',