Skip to content

Commit 892791a

Browse files
committed
form
1 parent f7246be commit 892791a

File tree

3 files changed

+505
-452
lines changed

3 files changed

+505
-452
lines changed

src/addons/Route.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ public static function execute($addon = null, $controller = null, $action = null
5151
}
5252
// 监听addon_module_init
5353
Event::trigger('addon_module_init', $request);
54-
$class = get_addons_class($addon, 'controller', $controller,$module);
54+
$class = get_addons_class($addon, 'controller', $controller);
5555
if (!$class) {
56-
throw new HttpException(404, lang('addon controller %s not found', [Str::studly($module.DS.$controller)]));
56+
throw new HttpException(404, lang('addon controller %s not found', [Str::studly($addon.DS.$controller)]));
5757
}
5858
//加载app配置
5959
// 重写视图基础路径

src/helper.php

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ function get_addons_instance($name)
218218
* @param string $class 当前类名
219219
* @return string
220220
*/
221-
function get_addons_class($name, $type = 'hook', $class = null, $module = 'backend')
221+
function get_addons_class($name, $type = 'hook', $class = null)
222222
{
223223
$name = trim($name);
224224
// 处理多级控制器情况
@@ -232,14 +232,11 @@ function get_addons_class($name, $type = 'hook', $class = null, $module = 'backe
232232
}
233233
switch ($type) {
234234
case 'controller':
235-
if($module){
236-
$namespace = '\\addons\\' . $name . '\\' . $module . '\\controller\\' . $class;
237-
}else{
238-
$namespace = '\\addons\\' . $name . '\\controller\\' . $class;
239-
}
235+
$namespace = '\\addons\\' . $name . '\\controller\\' . $class;
240236
break;
241237
default:
242238
$namespace = '\\addons\\' . $name . '\\Plugin';
239+
break;
243240
}
244241

245242
return class_exists($namespace) ? $namespace : '';
@@ -1108,6 +1105,6 @@ function form_selectpage($name = 'selectpage', $list = [], $options = [], $value
11081105
*/
11091106
function form_autocomplete($name = 'autocomplete', $list = [], $options = [], $value=null)
11101107
{
1111-
return Form::autocomplete( $name, $list , $options ,$attr ,$value) ;
1108+
return Form::autocomplete( $name, $list , $options ,$value) ;
11121109
}
11131110
}

0 commit comments

Comments
 (0)