diff --git a/app/Controller/Admin/Tools.php b/app/Controller/Admin/Tools.php index c2bf99d..16d5c2c 100644 --- a/app/Controller/Admin/Tools.php +++ b/app/Controller/Admin/Tools.php @@ -164,8 +164,12 @@ class Tools extends Base preg_match_all('/([a-zA-Z])[a-zA-Z]*/', $table_name, $m); $name1 = implode('', $m[1]); $name2 = lcfirst(str_replace(' ', '', ucwords(str_replace('_', ' ', $table_name)))); + $parts = explode('_', $table_name); + $name3 = end($parts); $module_name = $table['module_name']; $controller_name = $table['controller_name']; + + // 搜搜字段 $query_fields = []; $insert_fields = []; @@ -191,12 +195,12 @@ class Tools extends Base } } $data = [ - 'model.php' => $this->render->getContents('templates/model.php.twig', compact("table_name", "fields", "controller_name", "query_fields", "list_fields")), + 'model.php' => $this->render->getContents('templates/model.php.twig', compact("table_name", "fields", "controller_name", "query_fields", "list_fields", "name3")), 'request.php' => $this->render->getContents('templates/request.php.twig', compact("controller_name", "insert_fields", "fields", "required_fields", "edit_fields")), 'controller.php' => $this->render->getContents('templates/controller.php.twig', compact("controller_name", "module_name", "query_fields", "insert_fields", "edit_fields", "table_name", "name1", "name2")), 'api.ts' => $this->render->getContents('templates/api.ts.twig', compact('table_name')), - 'index.vue' => $this->render->getContents('templates/index.vue.twig', compact('table_name', 'list_fields', 'query_fields', 'name2')), - 'save.vue' => $this->render->getContents('templates/save.vue.twig', compact('table_name', 'insert_fields', 'required_fields', 'edit_fields')) + 'index.vue' => $this->render->getContents('templates/index.vue.twig', compact('table_name', 'list_fields', 'query_fields', 'name2', 'name3')), + 'save.vue' => $this->render->getContents('templates/save.vue.twig', compact('table_name', 'insert_fields', 'required_fields', 'edit_fields', 'name3')) ]; return $this->success("模板信息", $data); } diff --git a/static/view/templates/api.ts.twig b/static/view/templates/api.ts.twig index 6f4dd12..27746f2 100644 --- a/static/view/templates/api.ts.twig +++ b/static/view/templates/api.ts.twig @@ -6,7 +6,7 @@ export default { return await http.get("{{ table_name }}/list", data); }, info: async function (data = {}) { - return await http.get("{{ table_name }}/list", data); + return await http.get("{{ table_name }}/info", data); }, add: async function (data = {}) { return await http.post("{{ table_name }}/add", data); diff --git a/static/view/templates/index.vue.twig b/static/view/templates/index.vue.twig index ea3de9f..cb10acc 100644 --- a/static/view/templates/index.vue.twig +++ b/static/view/templates/index.vue.twig @@ -1,5 +1,5 @@