From 6c8e8b930bb516375c95f97cd362fde43ce6b6c9 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Wed, 18 Jun 2025 11:03:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Evue=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/sys/web/ModuleController.java | 10 ++--- .../templates/modules/gen/config.xml | 8 ++++ .../modules/gen/module_vue/README.md.xml | 35 ++++++++++++++++ .../modules/gen/module_vue/api/api.xml | 12 ++++++ .../modules/gen/module_vue/index.ts.xml | 12 ++++++ .../modules/gen/module_vue/package.json.xml | 42 +++++++++++++++++++ .../modules/gen/module_vue/tsconfig.json.xml | 32 ++++++++++++++ .../modules/gen/module_vue/views/views.xml | 12 ++++++ 8 files changed, 158 insertions(+), 5 deletions(-) create mode 100644 modules/core/src/main/resources/templates/modules/gen/module_vue/README.md.xml create mode 100644 modules/core/src/main/resources/templates/modules/gen/module_vue/api/api.xml create mode 100644 modules/core/src/main/resources/templates/modules/gen/module_vue/index.ts.xml create mode 100644 modules/core/src/main/resources/templates/modules/gen/module_vue/package.json.xml create mode 100644 modules/core/src/main/resources/templates/modules/gen/module_vue/tsconfig.json.xml create mode 100644 modules/core/src/main/resources/templates/modules/gen/module_vue/views/views.xml diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/ModuleController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/ModuleController.java index e425dc60..866c4402 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/ModuleController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/ModuleController.java @@ -40,13 +40,13 @@ import java.util.stream.Collectors; */ @Controller @RequestMapping(value = "${adminPath}/sys/module") -@ConditionalOnProperty(name="web.core.enabled", havingValue="true", matchIfMissing=true) +@ConditionalOnProperty(name={"config.enabled","web.core.enabled"}, havingValue="true", matchIfMissing=true) @ApiIgnore public class ModuleController extends BaseController { @Autowired private ModuleService moduleService; - + /** * 获取数据 * @param moduleCode @@ -56,7 +56,7 @@ public class ModuleController extends BaseController { public Module get(String moduleCode, boolean isNewRecord) { return moduleService.get(moduleCode, isNewRecord); } - + /** * 查询列表 * @param module @@ -70,7 +70,7 @@ public class ModuleController extends BaseController { model.addAttribute("module", module); return "modules/sys/moduleList"; } - + /** * 查询列表 * @param module @@ -83,7 +83,7 @@ public class ModuleController extends BaseController { @ResponseBody public Page listData(Module module, HttpServletRequest request, HttpServletResponse response) { module.setPage(new Page<>(request, response)); - Page page = moduleService.findPage(module); + Page page = moduleService.findPage(module); return page; } diff --git a/modules/core/src/main/resources/templates/modules/gen/config.xml b/modules/core/src/main/resources/templates/modules/gen/config.xml index 5779b539..3f165220 100644 --- a/modules/core/src/main/resources/templates/modules/gen/config.xml +++ b/modules/core/src/main/resources/templates/modules/gen/config.xml @@ -293,5 +293,13 @@ + + + + + + + + \ No newline at end of file diff --git a/modules/core/src/main/resources/templates/modules/gen/module_vue/README.md.xml b/modules/core/src/main/resources/templates/modules/gen/module_vue/README.md.xml new file mode 100644 index 00000000..e81ff207 --- /dev/null +++ b/modules/core/src/main/resources/templates/modules/gen/module_vue/README.md.xml @@ -0,0 +1,35 @@ + + + \ No newline at end of file diff --git a/modules/core/src/main/resources/templates/modules/gen/module_vue/api/api.xml b/modules/core/src/main/resources/templates/modules/gen/module_vue/api/api.xml new file mode 100644 index 00000000..4831145d --- /dev/null +++ b/modules/core/src/main/resources/templates/modules/gen/module_vue/api/api.xml @@ -0,0 +1,12 @@ + + + \ No newline at end of file diff --git a/modules/core/src/main/resources/templates/modules/gen/module_vue/index.ts.xml b/modules/core/src/main/resources/templates/modules/gen/module_vue/index.ts.xml new file mode 100644 index 00000000..167ebd0e --- /dev/null +++ b/modules/core/src/main/resources/templates/modules/gen/module_vue/index.ts.xml @@ -0,0 +1,12 @@ + + + \ No newline at end of file diff --git a/modules/core/src/main/resources/templates/modules/gen/module_vue/package.json.xml b/modules/core/src/main/resources/templates/modules/gen/module_vue/package.json.xml new file mode 100644 index 00000000..7a020d29 --- /dev/null +++ b/modules/core/src/main/resources/templates/modules/gen/module_vue/package.json.xml @@ -0,0 +1,42 @@ + + + \ No newline at end of file diff --git a/modules/core/src/main/resources/templates/modules/gen/module_vue/tsconfig.json.xml b/modules/core/src/main/resources/templates/modules/gen/module_vue/tsconfig.json.xml new file mode 100644 index 00000000..1de6b97d --- /dev/null +++ b/modules/core/src/main/resources/templates/modules/gen/module_vue/tsconfig.json.xml @@ -0,0 +1,32 @@ + + + \ No newline at end of file diff --git a/modules/core/src/main/resources/templates/modules/gen/module_vue/views/views.xml b/modules/core/src/main/resources/templates/modules/gen/module_vue/views/views.xml new file mode 100644 index 00000000..78eb76bb --- /dev/null +++ b/modules/core/src/main/resources/templates/modules/gen/module_vue/views/views.xml @@ -0,0 +1,12 @@ + + + \ No newline at end of file