0b2/catchAdmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增layout

Browse Source
This commit is contained in:
wuyanwen 2019-12-17 09:03:04 +08:00
parent 2c349e0832
commit 46a41c86ea
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
extend/catcher/base/CatchController.php
View File

@ -8,6 +8,10 @@ abstract class CatchController
{
protected $data = [];
public function __construct()
{
$this->loadConfig();
}
/**
*
* @time 2019年11月28日
@ -21,15 +25,16 @@ abstract class CatchController
$stack = \debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT, 2);
$end = end($stack);
View::config([
'view_path' => CatchAdmin::getViews()[$this->getModule($end['class'])]
'view_path' => CatchAdmin::getViews()[$this->getModule($end['class'])],
]);
if (!empty($this->data)) {
$data = array_merge($this->data, $data);
}
$data['layout'] = root_path('view') . 'layout.html';
return View::fetch($template ? : $this->getTemp($end['class'], $end['function']), $data);
}
@ -67,6 +72,23 @@ abstract class CatchController
return explode('\\', $class)[1];
}
/**
*
*
* @time 2019年12月15日
* @return void
*/
protected function loadConfig()
{
$module = explode('\\', get_class($this))[1];
$moduleConfig = CatchAdmin::moduleDirectory($module) . 'config.php';
if (file_exists(CatchAdmin::moduleDirectory($module) . 'config.php')) {
app()->config->load($moduleConfig);
}
}
/**
*
* @time 2019年12月13日