diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/JavaFxApplication.java b/src/main/java/xyz/wbsite/dbtool/javafx/JavaFxApplication.java index 8d90af7e..56e9c5e2 100644 --- a/src/main/java/xyz/wbsite/dbtool/javafx/JavaFxApplication.java +++ b/src/main/java/xyz/wbsite/dbtool/javafx/JavaFxApplication.java @@ -440,6 +440,12 @@ public class JavaFxApplication extends Application { currentTable.setPageAdd(newValue); } }); + detailTableController.getPageDel().selectedProperty().addListener(new ChangeListener() { + @Override + public void changed(ObservableValue observable, Boolean oldValue, Boolean newValue) { + currentTable.setPageDel(newValue); + } + }); detailTableController.getPageExp().selectedProperty().addListener(new ChangeListener() { @Override public void changed(ObservableValue observable, Boolean oldValue, Boolean newValue) { @@ -976,6 +982,7 @@ public class JavaFxApplication extends Application { detailTableController.getAjax().setSelected(currentTable.isAjax()); detailTableController.getPage().setSelected(currentTable.isPage()); detailTableController.getPageAdd().setSelected(currentTable.isPageAdd()); + detailTableController.getPageDel().setSelected(currentTable.isPageDel()); detailTableController.getPageImp().setSelected(currentTable.isPageImp()); detailTableController.getPageExp().setSelected(currentTable.isPageExp()); detailTableController.getApi().setSelected(currentTable.getApi()); diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/ctrl/DetailTableController.java b/src/main/java/xyz/wbsite/dbtool/javafx/ctrl/DetailTableController.java index cae55f83..c48290fc 100644 --- a/src/main/java/xyz/wbsite/dbtool/javafx/ctrl/DetailTableController.java +++ b/src/main/java/xyz/wbsite/dbtool/javafx/ctrl/DetailTableController.java @@ -38,6 +38,8 @@ public class DetailTableController { @FXML private CheckBox pageAdd; @FXML + private CheckBox pageDel; + @FXML private CheckBox pageImp; @FXML private CheckBox pageExp; @@ -189,4 +191,12 @@ public class DetailTableController { public void setMsvr(CheckBox msvr) { this.msvr = msvr; } + + public CheckBox getPageDel() { + return pageDel; + } + + public void setPageDel(CheckBox pageDel) { + this.pageDel = pageDel; + } } diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/manger/ProjectManager.java b/src/main/java/xyz/wbsite/dbtool/javafx/manger/ProjectManager.java index b9d33c34..ad9f1da5 100644 --- a/src/main/java/xyz/wbsite/dbtool/javafx/manger/ProjectManager.java +++ b/src/main/java/xyz/wbsite/dbtool/javafx/manger/ProjectManager.java @@ -229,6 +229,7 @@ public class ProjectManager { table.setPage(true); table.setAjax(true); table.setPageAdd(true); + table.setPageDel(true); table.setPageImp(true); table.setPageExp(true); checkSysFields(table);// 检查或移除系统字段 diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/po/Table.java b/src/main/java/xyz/wbsite/dbtool/javafx/po/Table.java index adf5dc77..3512ac64 100644 --- a/src/main/java/xyz/wbsite/dbtool/javafx/po/Table.java +++ b/src/main/java/xyz/wbsite/dbtool/javafx/po/Table.java @@ -57,6 +57,8 @@ public class Table { private boolean page = true; @Property("pageAdd") private boolean pageAdd = true; + @Property("pageDel") + private boolean pageDel = true; @Property("pageImp") private boolean pageImp = true; @Property("pageExp") @@ -230,6 +232,14 @@ public class Table { this.pageAdd = pageAdd; } + public boolean isPageDel() { + return pageDel; + } + + public void setPageDel(boolean pageDel) { + this.pageDel = pageDel; + } + public boolean isPageImp() { return pageImp; } diff --git a/src/main/resources/fxml/DetailTable.fxml b/src/main/resources/fxml/DetailTable.fxml index b105b7c7..6b1ccc39 100644 --- a/src/main/resources/fxml/DetailTable.fxml +++ b/src/main/resources/fxml/DetailTable.fxml @@ -62,6 +62,7 @@ + diff --git a/src/main/resources/modules/SpringBoot/java/action/GlobalController.java b/src/main/resources/modules/SpringBoot/java/action/GlobalController.java index 7e7d99a2..77d6c55f 100644 --- a/src/main/resources/modules/SpringBoot/java/action/GlobalController.java +++ b/src/main/resources/modules/SpringBoot/java/action/GlobalController.java @@ -164,6 +164,7 @@ public class GlobalController { // todo 可在此获取共性数据(也可以在全局拦截器GlobalHandlerInterceptor、拦截器作用域比此更高), // todo 例如用户信息等。其他业务数据在页面渲染后通过Ajax请求 + model.addAttribute("token",LocalData.getToken()); return layout; } diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/mgr.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/mgr.ftl index f63a2fee..21b0ffb2 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/mgr.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/mgr.ftl @@ -94,25 +94,37 @@ <#if table.isPageAdd()> + ${print('<#if token.hasRes("/ajax/${module.name}/${table.getFName()}/create")>')} 新增 + ${print('')} + <#if table.isPageDel()> + ${print('<#if token.hasRes("/ajax/${module.name}/${table.getFName()}/delete")>')} 删除 + ${print('')} + <#if table.isPageImp()> + ${print('<#if token.hasRes("/ajax/${module.name}/${table.getFName()}/template")>')} + ${print('')} + ${print('<#if token.hasRes("/ajax/${module.name}/${table.getFName()}/imports")>')} + ${print('')} <#if table.isPageExp()> + ${print('<#if token.hasRes("/ajax/${module.name}/${table.getFName()}/exports")>')} + ${print('')} @@ -309,8 +321,12 @@ label="操作"> diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dept.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dept.ftl index 68325d9e..03c6370b 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dept.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dept.ftl @@ -40,26 +40,36 @@ + <#if token.hasRes("/ajax/wsys/dept/create")> 新增 + - 导出 + <#if token.hasRes("/ajax/wsys/dept/delete")> + 删除 + 树状 + <#if token.hasRes("/ajax/wsys/dept/template")> + + <#if token.hasRes("/ajax/wsys/dept/imports")> + - - + <#if token.hasRes("/ajax/wsys/dept/exports")> + + + @@ -139,8 +149,12 @@ label="操作"> diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dict.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dict.ftl index 0b7059fb..9550e30f 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dict.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dict.ftl @@ -30,24 +30,34 @@ + <#if token.hasRes("/ajax/wsys/dict/create")> 新增 + - 导出 + <#if token.hasRes("/ajax/wsys/dict/delete")> + 删除 + + <#if token.hasRes("/ajax/wsys/dict/template")> + + <#if token.hasRes("/ajax/wsys/dict/imports")> + - - + <#if token.hasRes("/ajax/wsys/dict/exports")> + + + @@ -116,8 +126,12 @@ diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dictItem.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dictItem.ftl index f629cb3c..c061bd97 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dictItem.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dictItem.ftl @@ -33,24 +33,34 @@ + <#if token.hasRes("/ajax/wsys/dictItem/create")> 新增 + - 导出 + <#if token.hasRes("/ajax/wsys/dictItem/delete")> + 删除 + + <#if token.hasRes("/ajax/wsys/dictItem/template")> + + <#if token.hasRes("/ajax/wsys/dictItem/imports")> + - - + <#if token.hasRes("/ajax/wsys/dictItem/exports")> + + + @@ -118,8 +128,12 @@ label="操作"> diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/file.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/file.ftl index 0729c3f2..4b125d5c 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/file.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/file.ftl @@ -33,24 +33,34 @@ + <#if token.hasRes("/ajax/wsys/file/create")> 新增 + - 导出 + <#if token.hasRes("/ajax/wsys/file/delete")> + 删除 + + <#if token.hasRes("/ajax/wsys/file/template")> + + <#if token.hasRes("/ajax/wsys/file/imports")> + - - + <#if token.hasRes("/ajax/wsys/file/exports")> + + + @@ -108,8 +118,12 @@ label="操作"> diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/logtask.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/logtask.ftl index 4d188d14..7595ea5e 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/logtask.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/logtask.ftl @@ -50,22 +50,30 @@ - 导出 + <#if token.hasRes("/ajax/wsys/logtask/delete")> + 删除 + + <#if token.hasRes("/ajax/wsys/logtask/template")> + + <#if token.hasRes("/ajax/wsys/logtask/imports")> + - - + <#if token.hasRes("/ajax/wsys/logtask/exports")> + + + @@ -148,8 +156,12 @@ label="操作"> diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/profiles.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/profiles.ftl index 6d4a7e9c..f7f85951 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/profiles.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/profiles.ftl @@ -26,24 +26,34 @@ + <#if token.hasRes("/ajax/wsys/profiles/create")> 新增 + - 导出 + <#if token.hasRes("/ajax/wsys/profiles/delete")> + 删除 + + <#if token.hasRes("/ajax/wsys/profiles/template")> + + <#if token.hasRes("/ajax/wsys/profiles/imports")> + - - + <#if token.hasRes("/ajax/wsys/profiles/exports")> + + + @@ -101,8 +111,12 @@ label="操作"> diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/res.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/res.ftl index c032a7fd..cd2b8ff1 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/res.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/res.ftl @@ -46,26 +46,36 @@ + <#if token.hasRes("/ajax/wsys/res/create")> 新增 + - 导出 + <#if token.hasRes("/ajax/wsys/res/delete")> + 删除 + 树状 + <#if token.hasRes("/ajax/wsys/res/template")> + + <#if token.hasRes("/ajax/wsys/res/imports")> + - - + <#if token.hasRes("/ajax/wsys/res/exports")> + + + diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/role.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/role.ftl index 7dbc5b6f..ac4fe3c5 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/role.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/role.ftl @@ -26,24 +26,34 @@ + <#if token.hasRes("/ajax/wsys/role/create")> 新增 + - 导出 + <#if token.hasRes("/ajax/wsys/role/delete")> + 删除 + + <#if token.hasRes("/ajax/wsys/role/template")> + + <#if token.hasRes("/ajax/wsys/role/imports")> + - - + <#if token.hasRes("/ajax/wsys/role/exports")> + + + @@ -102,8 +112,12 @@ diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/taskSql.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/taskSql.ftl index 5a339eb1..abcaa000 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/taskSql.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/taskSql.ftl @@ -36,24 +36,34 @@ + <#if token.hasRes("/ajax/wsys/taskSql/create")> 新增 + - 导出 + <#if token.hasRes("/ajax/wsys/taskSql/delete")> + 删除 + + <#if token.hasRes("/ajax/wsys/taskSql/template")> + + <#if token.hasRes("/ajax/wsys/taskSql/imports")> + - - + <#if token.hasRes("/ajax/wsys/taskSql/exports")> + + + @@ -138,8 +148,12 @@ label="操作"> diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/tokens.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/tokens.ftl index 86e3d1aa..203b9424 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/tokens.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/tokens.ftl @@ -52,23 +52,13 @@ + <#if token.hasRes("/ajax/wsys/dept/exports")> 导出 + - - - - - - - - - - - - diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/user.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/user.ftl index 5cd561b3..ea1ba29c 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/user.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/user.ftl @@ -37,24 +37,34 @@ + <#if token.hasRes("/ajax/wsys/user/create")> 新增 + - 导出 + <#if token.hasRes("/ajax/wsys/user/delete")> + 删除 + + <#if token.hasRes("/ajax/wsys/user/template")> + + <#if token.hasRes("/ajax/wsys/user/imports")> + - - + <#if token.hasRes("/ajax/wsys/user/exports")> + + + @@ -135,8 +145,12 @@ label="操作"> diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/visitor.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/visitor.ftl index 28719765..f77cc961 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/visitor.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/visitor.ftl @@ -34,24 +34,34 @@ + <#if token.hasRes("/ajax/wsys/visitor/create")> 新增 + - 导出 + <#if token.hasRes("/ajax/wsys/visitor/delete")> + 删除 + + <#if token.hasRes("/ajax/wsys/visitor/template")> + + <#if token.hasRes("/ajax/wsys/visitor/imports")> + - - + <#if token.hasRes("/ajax/wsys/visitor/exports")> + + + @@ -125,8 +135,12 @@ label="操作"> diff --git a/src/main/resources/modules/SpringBoot/test/DataInit.java b/src/main/resources/modules/SpringBoot/test/DataInit.java index 74cd0fea..e40f34fb 100644 --- a/src/main/resources/modules/SpringBoot/test/DataInit.java +++ b/src/main/resources/modules/SpringBoot/test/DataInit.java @@ -91,7 +91,8 @@ public class DataInit { List forBase = new ArrayList<>(); {// 公共资源 forBase.add(createRes("00", "管理系统", "WEB", "/index.htm", true)); - forBase.add(createRes("0000", "首页", "WEB", "/home.htm", true)); + forBase.add(createRes("0000", "根页", "WEB", "/", true)); + forBase.add(createRes("0001", "首页", "WEB", "/home.htm", true)); } List forDev = new ArrayList<>();