diff --git a/application/admin/command/Install/fastadmin.sql b/application/admin/command/Install/fastadmin.sql index 6c2fa9bb..1b816535 100755 --- a/application/admin/command/Install/fastadmin.sql +++ b/application/admin/command/Install/fastadmin.sql @@ -187,7 +187,7 @@ CREATE TABLE `fa_auth_rule` ( BEGIN; INSERT INTO `fa_auth_rule` VALUES (1, 'file', 0, 'dashboard', 'Dashboard', 'fa fa-dashboard', '', '', 'Dashboard tips', 1, NULL, '', 'kzt', 'kongzhitai', 1491635035, 1491635035, 143, 'normal'); INSERT INTO `fa_auth_rule` VALUES (2, 'file', 0, 'general', 'General', 'fa fa-cogs', '', '', '', 1, NULL, '', 'cggl', 'changguiguanli', 1491635035, 1491635035, 137, 'normal'); -INSERT INTO `fa_auth_rule` VALUES (3, 'file', 0, 'category', 'Category', 'fa fa-leaf', '', '', 'Category tips', 1, NULL, '', 'flgl', 'fenleiguanli', 1491635035, 1491635035, 119, 'normal'); +INSERT INTO `fa_auth_rule` VALUES (3, 'file', 0, 'category', 'Category', 'fa fa-leaf', '', '', 'Category tips', 0, NULL, '', 'flgl', 'fenleiguanli', 1491635035, 1491635035, 119, 'normal'); INSERT INTO `fa_auth_rule` VALUES (4, 'file', 0, 'addon', 'Addon', 'fa fa-rocket', '', '', 'Addon tips', 1, NULL, '', 'cjgl', 'chajianguanli', 1491635035, 1491635035, 0, 'normal'); INSERT INTO `fa_auth_rule` VALUES (5, 'file', 0, 'auth', 'Auth', 'fa fa-group', '', '', '', 1, NULL, '', 'qxgl', 'quanxianguanli', 1491635035, 1491635035, 99, 'normal'); INSERT INTO `fa_auth_rule` VALUES (6, 'file', 2, 'general/config', 'Config', 'fa fa-cog', '', '', 'Config tips', 1, NULL, '', 'xtpz', 'xitongpeizhi', 1491635035, 1491635035, 60, 'normal'); diff --git a/application/admin/view/addon/config.html b/application/admin/view/addon/config.html index 3abf772b..8b96f6f2 100644 --- a/application/admin/view/addon/config.html +++ b/application/admin/view/addon/config.html @@ -29,7 +29,7 @@ {foreach name="$addon.config" id="item"} {if ((!isset($item['group']) || $item['group']=='') && $groupName=='other') || (isset($item['group']) && $item['group']==$groupName)} - + {$item.title}
diff --git a/application/admin/view/addon/index.html b/application/admin/view/addon/index.html index f220cd83..19ecc105 100644 --- a/application/admin/view/addon/index.html +++ b/application/admin/view/addon/index.html @@ -93,7 +93,7 @@ {:__('Userinfo')} {/if}
- +
diff --git a/application/admin/view/auth/admin/index.html b/application/admin/view/auth/admin/index.html index b4ed2565..17d74666 100644 --- a/application/admin/view/auth/admin/index.html +++ b/application/admin/view/auth/admin/index.html @@ -8,9 +8,9 @@
{:build_toolbar('refresh,add,delete')}
-
@@ -18,4 +18,4 @@ - \ No newline at end of file + diff --git a/application/admin/view/auth/adminlog/index.html b/application/admin/view/auth/adminlog/index.html index e0a711f6..d5deee7a 100644 --- a/application/admin/view/auth/adminlog/index.html +++ b/application/admin/view/auth/adminlog/index.html @@ -8,9 +8,9 @@
{:build_toolbar('refresh,delete')}
-
@@ -18,4 +18,4 @@ - \ No newline at end of file + diff --git a/application/admin/view/auth/group/index.html b/application/admin/view/auth/group/index.html index 9ad38482..15f8c362 100644 --- a/application/admin/view/auth/group/index.html +++ b/application/admin/view/auth/group/index.html @@ -8,9 +8,9 @@
{:build_toolbar('refresh,add,delete')}
-
diff --git a/application/admin/view/category/index.html b/application/admin/view/category/index.html index d69a291b..c257520b 100644 --- a/application/admin/view/category/index.html +++ b/application/admin/view/category/index.html @@ -23,9 +23,9 @@ -
diff --git a/application/admin/view/general/attachment/select.html b/application/admin/view/general/attachment/select.html index 0548effb..fdc14f22 100644 --- a/application/admin/view/general/attachment/select.html +++ b/application/admin/view/general/attachment/select.html @@ -36,7 +36,7 @@ {:__('Choose')} {/if} - +
diff --git a/application/admin/view/general/config/index.html b/application/admin/view/general/config/index.html index 24f4ac65..c8a39abb 100644 --- a/application/admin/view/general/config/index.html +++ b/application/admin/view/general/config/index.html @@ -67,7 +67,7 @@ {foreach $vo.list as $item} - + {$item.title}
diff --git a/application/admin/view/general/profile/index.html b/application/admin/view/general/profile/index.html index ce4262e5..bc5ff5cb 100644 --- a/application/admin/view/general/profile/index.html +++ b/application/admin/view/general/profile/index.html @@ -100,7 +100,7 @@
{:build_toolbar('refresh')}
- +
diff --git a/application/admin/view/user/group/index.html b/application/admin/view/user/group/index.html index 53d01bf0..57191efc 100644 --- a/application/admin/view/user/group/index.html +++ b/application/admin/view/user/group/index.html @@ -15,9 +15,9 @@
-
diff --git a/application/admin/view/user/rule/index.html b/application/admin/view/user/rule/index.html index b796d3b1..1ecb4ed7 100644 --- a/application/admin/view/user/rule/index.html +++ b/application/admin/view/user/rule/index.html @@ -15,9 +15,9 @@ -
diff --git a/public/assets/js/backend/auth/adminlog.js b/public/assets/js/backend/auth/adminlog.js index 6f01f955..08765e3c 100644 --- a/public/assets/js/backend/auth/adminlog.js +++ b/public/assets/js/backend/auth/adminlog.js @@ -18,9 +18,11 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin // 初始化表格 table.bootstrapTable({ url: $.fn.bootstrapTable.defaults.extend.index_url, + fixedColumns: true, + fixedRightNumber: 1, columns: [ [ - {field: 'state', checkbox: true, }, + {field: 'state', checkbox: true,}, {field: 'id', title: 'ID', operate: false}, {field: 'username', title: __('Username'), formatter: Table.api.formatter.search}, {field: 'title', title: __('Title'), operate: 'LIKE %...%', placeholder: '模糊搜索'}, @@ -28,15 +30,16 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin {field: 'ip', title: __('IP'), events: Table.api.events.ip, formatter: Table.api.formatter.search}, {field: 'browser', title: __('Browser'), operate: false, formatter: Controller.api.formatter.browser}, {field: 'createtime', title: __('Create time'), formatter: Table.api.formatter.datetime, operate: 'RANGE', addclass: 'datetimerange', sortable: true}, - {field: 'operate', title: __('Operate'), table: table, + { + field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, buttons: [{ - name: 'detail', - text: __('Detail'), - icon: 'fa fa-list', - classname: 'btn btn-info btn-xs btn-detail btn-dialog', - url: 'auth/adminlog/detail' - }], + name: 'detail', + text: __('Detail'), + icon: 'fa fa-list', + classname: 'btn btn-info btn-xs btn-detail btn-dialog', + url: 'auth/adminlog/detail' + }], formatter: Table.api.formatter.operate } ] diff --git a/public/assets/js/require-table.js b/public/assets/js/require-table.js index 42dfe75a..61359431 100644 --- a/public/assets/js/require-table.js +++ b/public/assets/js/require-table.js @@ -509,16 +509,13 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table var btnGroup = $(this); var isPullRight = dropdownMenu.hasClass("pull-right") || dropdownMenu.hasClass("dropdown-menu-right"); var left, top, position; - if (dropdownMenu.outerHeight() + btnGroup.outerHeight() > tableBody.outerHeight() - 41) { + if (true || dropdownMenu.outerHeight() + btnGroup.outerHeight() > tableBody.outerHeight() - 41) { position = 'fixed'; top = btnGroup.offset().top - $(window).scrollTop() + btnGroup.outerHeight(); - left = isPullRight ? btnGroup.offset().left + btnGroup.outerWidth() - dropdownMenu.outerWidth() : btnGroup.offset().left; - } else { - if (btnGroup.offset().top + btnGroup.outerHeight() + dropdownMenu.outerHeight() > tableBody.offset().top + tableBody.outerHeight() - 30) { - position = 'absolute'; - left = isPullRight ? -(dropdownMenu.outerWidth() - btnGroup.outerWidth()) : 0; - top = -(dropdownMenu.outerHeight() + 3); + if ((top + dropdownMenu.outerHeight()) > $(window).height()) { + top = btnGroup.offset().top - dropdownMenu.outerHeight() - 5; } + left = isPullRight ? btnGroup.offset().left + btnGroup.outerWidth() - dropdownMenu.outerWidth() : btnGroup.offset().left; } if (left || top) { dropdownMenu.css({ @@ -878,7 +875,7 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table dropdown = j.dropdown ? j.dropdown : ''; url = j.url ? j.url : ''; url = typeof url === 'function' ? url.call(table, row, j) : (url ? Fast.api.fixurl(Table.api.replaceurl(url, row, table)) : 'javascript:;'); - classname = j.classname ? j.classname : 'btn-primary btn-' + name + 'one'; + classname = j.classname ? j.classname : (dropdown ? 'btn-' + name + 'one' : 'btn-primary btn-' + name + 'one'); icon = j.icon ? j.icon : ''; text = typeof j.text === 'function' ? j.text.call(table, row, j) : j.text ? j.text : ''; title = typeof j.title === 'function' ? j.title.call(table, row, j) : j.title ? j.title : text;