diff --git a/src/plugin/admin/app/controller/RuleController.php b/src/plugin/admin/app/controller/RuleController.php
index 76ac1cd4..70750875 100644
--- a/src/plugin/admin/app/controller/RuleController.php
+++ b/src/plugin/admin/app/controller/RuleController.php
@@ -78,6 +78,8 @@ function get(Request $request): Response
$item['name'] = $item['title'];
$item['value'] = $item['id'];
$item['icon'] = $item['icon'] ? "layui-icon {$item['icon']}" : '';
+ $item['openType'] = $item['open_type'] ?? '_iframe';
+ $item['isParent'] = !!$item['pid'];
$formatted_items[] = $item;
}
@@ -89,6 +91,9 @@ function get(Request $request): Response
}
$this->removeNotContain($tree_items, 'type', $types);
$menus = $this->empty_filter(Tree::arrayValues($tree_items));
+ if ($request->get('original')){
+ return json($menus);
+ }
return $this->json(0, 'ok', $menus);
}
diff --git a/src/plugin/admin/app/controller/TableController.php b/src/plugin/admin/app/controller/TableController.php
index 3c337b03..d005408e 100644
--- a/src/plugin/admin/app/controller/TableController.php
+++ b/src/plugin/admin/app/controller/TableController.php
@@ -401,7 +401,7 @@ public function crud(Request $request): Response
$table_basename = strpos($table_name, $prefix) === 0 ? substr($table_name, strlen($prefix)) : $table_name;
$inflector = InflectorFactory::create()->build();
$model_class = $inflector->classify($inflector->singularize($table_basename));
- $base_path = '/plugin/admin/app';
+ $base_path = '/app/admin';
if ($request->method() === 'GET') {
return raw_view('table/crud', [
'table' => $table_name,
@@ -419,6 +419,10 @@ public function crud(Request $request): Response
return $this->json(1, '控制器和model不能为空');
}
+ if (str_starts_with($controller_file, $base_path) && !config('middleware.admin')) {
+ return $this->json(1, "请先设置鉴权中间件：config('middleware.admin')");
+ }
+
$controller_info = pathinfo($controller_file);
$model_info = pathinfo($model_file);
$controller_path = Util::filterPath($controller_info['dirname'] ?? '');
@@ -525,6 +529,7 @@ public function crud(Request $request): Response
$menu->title = $title;
$menu->icon = $icon;
$menu->href = "$url_path_base/index";
+ $menu->open_type = '_iframe';
$menu->save();
$roles = admin('roles');
@@ -757,10 +762,10 @@ protected function createTemplate($template_file_path, $table, $url_path_base, $
$html
-
@@ -784,8 +789,7 @@ protected function createTemplate($template_file_path, $table, $url_path_base, $
浏览页面
-
-
+
@@ -801,24 +805,24 @@ protected function createTemplate($template_file_path, $table, $url_path_base, $
-
-
+
+
-
+
-
+
-
+
+
+
@@ -90,15 +89,15 @@
-
-
+
+
-
+
+
-
+
+
-
+