diff --git a/extend/base/admin/controller/debug/LogBase.php b/extend/base/admin/controller/debug/LogBase.php index 96bb7ee..d23f677 100644 --- a/extend/base/admin/controller/debug/LogBase.php +++ b/extend/base/admin/controller/debug/LogBase.php @@ -55,11 +55,12 @@ class LogBase extends AdminController return json($data); } - $distinctData = $this->model->field('app_name, controller_name, action_name')->distinct(true)->select(); + $distinctData = $this->model->field('app_name, controller_name, action_name, level')->distinct(true)->select(); $this->assign([ 'apps' => array_unique($distinctData->column('app_name')), 'controllers' => array_unique($distinctData->column('controller_name')), 'actions' => array_unique($distinctData->column('action_name')), + 'levels' => array_unique($distinctData->column('level')), ]); return $this->fetch(); diff --git a/extend/base/admin/view/debug/log/index.html b/extend/base/admin/view/debug/log/index.html index 6ddf56a..b894263 100644 --- a/extend/base/admin/view/debug/log/index.html +++ b/extend/base/admin/view/debug/log/index.html @@ -20,6 +20,17 @@ +
+ +
+ +
+
@@ -53,6 +64,7 @@
+
diff --git a/extend/base/admin/view/debug/log/index.js b/extend/base/admin/view/debug/log/index.js index ba006cb..258f725 100644 --- a/extend/base/admin/view/debug/log/index.js +++ b/extend/base/admin/view/debug/log/index.js @@ -52,6 +52,12 @@ $(function () { op.action_name = '='; } + var level = $('#level-select').val(); + if (level) { + filter.level = level; + op.level = '='; + } + if (Object.keys(filter).length > 0) { requestData.filter = JSON.stringify(filter); requestData.op = JSON.stringify(op);