安装SQL的更新

优化菜单生成
优化部分模块的JS
pull/329932/MERGE
Karson 2017-06-20 22:41:24 +08:00
parent b48a6db08c
commit 5b87ced1e3
6 changed files with 18 additions and 13 deletions

File diff suppressed because one or more lines are too long

View File

@ -262,7 +262,7 @@ class Menu extends Command
continue;
}
//过滤掉其它字符
$comment = preg_replace(array('/^\/\*\*(.*)[\n\r\t]/', '/[\s]+\*\//', '/\*\s@(.*)/', '/[\s|\*]+/'), '', $comment);
$comment = preg_replace(array('/^\/\*\*(.*)[\n\r\t]/u', '/[\s]+\*\//u', '/\*\s@(.*)/u', '/[\s|\*]+/u'), '', $comment);
$ruleArr[] = array('pid' => $pid, 'name' => $name . "/" . strtolower($n->name), 'icon' => 'fa fa-circle-o', 'title' => $comment ? $comment : $n->name, 'ismenu' => 0, 'status' => 'normal');
}

View File

@ -19,9 +19,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'jstree'], function (
index: function () {
// 初始化表格参数配置
Table.api.init({
search: false,
advancedSearch: false,
pagination: false,
extend: {
"index_url": "auth/group/index",
"add_url": "auth/group/add",
@ -45,7 +42,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'jstree'], function (
{field: 'status', title: __('Status'), formatter: Table.api.formatter.status},
{field: 'operate', title: __('Operate'), events: Table.api.events.operate, formatter: Table.api.formatter.operate}
]
]
],
pagination: false,
search: false,
commonSearch: false,
});
// 为表格绑定事件

View File

@ -4,9 +4,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template'], function
index: function () {
// 初始化表格参数配置
Table.api.init({
search: true,
advancedSearch: false,
pagination: false,
extend: {
"index_url": "auth/rule/index",
"add_url": "auth/rule/add",
@ -36,7 +33,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template'], function
{field: 'id', title: '<a href="javascript:;" class="btn btn-primary btn-xs btn-toggle"><i class="fa fa-chevron-down"></i></a>', operate: false, formatter: Controller.api.formatter.subnode},
{field: 'operate', title: __('Operate'), events: Table.api.events.operate, formatter: Table.api.formatter.operate}
]
]
],
pagination: false,
search: false,
commonSearch: false,
});
// 为表格绑定事件

View File

@ -32,7 +32,10 @@ define(['jquery', 'bootstrap', 'backend', 'form', 'table'], function ($, undefin
{field: 'status', title: __('Status'), formatter: Table.api.formatter.status},
{field: 'operate', title: __('Operate'), events: Table.api.events.operate, formatter: Table.api.formatter.operate}
]
]
],
pagination: false,
search: false,
commonSearch: false,
});
// 为表格绑定事件

View File

@ -47,7 +47,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template'], function
//启用普通表单搜索
commonSearch: false,
//可以控制是否默认显示搜索单表,false则隐藏,默认为false
searchFormVisible: false
searchFormVisible: false,
//分页大小
pageSize:12
});
// 为表格绑定事件