diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/viewForm.xml b/modules/core/src/main/resources/templates/modules/gen/crud/viewForm.xml index cc91d32c..e6d59afd 100644 --- a/modules/core/src/main/resources/templates/modules/gen/crud/viewForm.xml +++ b/modules/core/src/main/resources/templates/modules/gen/crud/viewForm.xml @@ -19,7 +19,7 @@
- \${text(${className}.isNewRecord ? '新增${functionNameSimple}' : '编辑${functionNameSimple}')} + \${text(${className}.isNewRecord ? '新增${functionNameSimple}' : '编辑${functionNameSimple}')}
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/viewList.xml b/modules/core/src/main/resources/templates/modules/gen/crud/viewList.xml index 8eff60ab..f3d969ee 100644 --- a/modules/core/src/main/resources/templates/modules/gen/crud/viewList.xml +++ b/modules/core/src/main/resources/templates/modules/gen/crud/viewList.xml @@ -10,7 +10,7 @@
- \${text('${functionNameSimple}管理')} + \${text('${functionNameSimple}管理')}
\${text('查询')} diff --git a/modules/core/src/main/resources/templates/modules/gen/query/viewForm.xml b/modules/core/src/main/resources/templates/modules/gen/query/viewForm.xml index 1837fb07..f986a9a9 100644 --- a/modules/core/src/main/resources/templates/modules/gen/query/viewForm.xml +++ b/modules/core/src/main/resources/templates/modules/gen/query/viewForm.xml @@ -19,7 +19,7 @@
- \${text(${className}.isNewRecord ? '新增${functionNameSimple}' : '详情${functionNameSimple}')} + \${text(${className}.isNewRecord ? '新增${functionNameSimple}' : '详情${functionNameSimple}')}
diff --git a/modules/core/src/main/resources/templates/modules/gen/query/viewList.xml b/modules/core/src/main/resources/templates/modules/gen/query/viewList.xml index 6a59092e..0bee5603 100644 --- a/modules/core/src/main/resources/templates/modules/gen/query/viewList.xml +++ b/modules/core/src/main/resources/templates/modules/gen/query/viewList.xml @@ -10,7 +10,7 @@
- \${text('${functionNameSimple}查询')} + \${text('${functionNameSimple}查询')}
\${text('查询')} diff --git a/modules/core/src/main/resources/views/modules/sys/sysDesktop.html b/modules/core/src/main/resources/views/modules/sys/sysDesktop.html index 8f64fd27..0170cf90 100644 --- a/modules/core/src/main/resources/views/modules/sys/sysDesktop.html +++ b/modules/core/src/main/resources/views/modules/sys/sysDesktop.html @@ -254,9 +254,7 @@ 2:15 ThinkGem - I would like to meet you to discuss the latest news about - the arrival of the new theme. They say it is going to be one the - best themes on the market + JeeSite 自发布以来被用到了企业、政府、医疗、金融、互联网等各个领域中， JeeSite 的设计思想和开发模式已深入开发者的内心， 当前版本 JeeSite 团队结合了以往的经验和总结各方面的应用案例， 对架构做一次全部重构，也纳入非常多的新思想。

@@ -269,9 +267,7 @@ 5:15 ThinkGem - I would like to meet you to discuss the latest news about - the arrival of the new theme. They say it is going to be one the - best themes on the market + JeeSite 基于最主流的 Spring Boot 2 + MyBatis + Shiro + J2Cache/Redis + Beetl 的稳定架构。 前端采用了目前极为流行的扁平化响应式的设计风格，可以完美兼容电脑，平板，手机等多个平台。 基于 jQuery + Bootstrap + AdminLTE 实现。

@@ -283,9 +279,7 @@ 5:30 ThinkGem - I would like to meet you to discuss the latest news about - the arrival of the new theme. They say it is going to be one the - best themes on the market + JeeSite 严格遵循了 Web 安全的规范，前后台双重验证，参数编码传输，密码安全策略，密码散列加密存储， 精细的权限验证，数据验证，SQL 编码过滤，从根本上避免了SQL注入，防止 XSS 攻击， CSRF 攻击等常见的 Web 攻击手段。

@@ -297,23 +291,7 @@ 5:30 ThinkGem - I would like to meet you to discuss the latest news about - the arrival of the new theme. They say it is going to be one the - best themes on the market -

-
- - -
- user image -

- - 5:30 - ThinkGem - - I would like to meet you to discuss the latest news about - the arrival of the new theme. They say it is going to be one the - best themes on the market + 经典架构会的人多，提供一个强大的 在线代码生成 工具，此工具提供常用的单表、一对多、树结构及列表查询等功能的生成， 如果对外观要求不是很高，生成的功能就可以用了。如果你使用了本平台，就可以很简单很高效的快速开发出优秀的产品。

@@ -321,9 +299,9 @@
- +
- +
@@ -358,9 +336,9 @@ - Design a nice theme + 模块及插件分项目，尽量松耦合，方便模块升级、增减模块 - 2 mins + 2 分钟
@@ -373,8 +351,8 @@ - Make the theme responsive - 4 hours + 模块化数据库自动升级程序，自动对应版本执行 SQL 更新 + 4 小时
@@ -386,8 +364,8 @@ - Let theme shine like a star - 1 day + 持久层 @Table 注解配置，节省 85% 的重复 SQL 编写 + 1 天
@@ -399,8 +377,8 @@ - Let theme shine like a star - 3 days + 完善的安全体系，身份认证、密码策略、安全审计、日志收集 + 2 天
@@ -412,8 +390,8 @@ - Check your messages and notifications - 1 week + 平面化界面设计，更加美观、高端、大气、上档次 + 3 天
@@ -425,8 +403,8 @@ - Let theme shine like a star - 1 month + 基于 Spring Cloud 安全稳定、支持分布式、支持微服务 + 1 周
@@ -459,7 +437,7 @@

访问

-
+
−
+
+
−
@@ -563,8 +541,8 @@
- -
«July 2019»
SuMoTuWeThFrSa
30123456
78910111213
14151617181920
21222324252627
28293031123
45678910
+ +
«2019 年 7 月»
日一二三四五六
30123456
78910111213
14151617181920
21222324252627
28293031123
45678910
diff --git a/modules/core/src/main/resources/views/modules/sys/user/corpAdminForm.html b/modules/core/src/main/resources/views/modules/sys/user/corpAdminForm.html index bb7364f0..0d21bf62 100644 --- a/modules/core/src/main/resources/views/modules/sys/user/corpAdminForm.html +++ b/modules/core/src/main/resources/views/modules/sys/user/corpAdminForm.html @@ -3,7 +3,7 @@
- ${user.isNewRecord ? op == 'addCorp' ? '新增租户' : '新增' : '编辑'}管理员 + ${user.isNewRecord ? op == 'addCorp' ? '新增租户' : '新增' : '编辑'}管理员
diff --git a/modules/core/src/main/resources/views/modules/sys/user/corpAdminList.html b/modules/core/src/main/resources/views/modules/sys/user/corpAdminList.html index 035dab30..11e73d8a 100644 --- a/modules/core/src/main/resources/views/modules/sys/user/corpAdminList.html +++ b/modules/core/src/main/resources/views/modules/sys/user/corpAdminList.html @@ -3,7 +3,7 @@
- ${@Global.getConfigToBoolean('user.useCorpModel', 'false') ? '租户' : '系统'}管理员 + ${@Global.getConfigToBoolean('user.useCorpModel', 'false') ? '租户' : '系统'}管理员
查询 diff --git a/modules/core/src/main/resources/views/modules/sys/user/secAdminForm.html b/modules/core/src/main/resources/views/modules/sys/user/secAdminForm.html index c51fb437..58a31646 100644 --- a/modules/core/src/main/resources/views/modules/sys/user/secAdminForm.html +++ b/modules/core/src/main/resources/views/modules/sys/user/secAdminForm.html @@ -3,7 +3,7 @@
- 二级管理员管理数据权限 + 二级管理员管理数据权限
diff --git a/modules/core/src/main/resources/views/modules/sys/user/secAdminList.html b/modules/core/src/main/resources/views/modules/sys/user/secAdminList.html index e9dfa98c..354640d5 100644 --- a/modules/core/src/main/resources/views/modules/sys/user/secAdminList.html +++ b/modules/core/src/main/resources/views/modules/sys/user/secAdminList.html @@ -3,7 +3,7 @@
- 二级管理员 + 二级管理员
查询 diff --git a/web/src/main/java/com/jeesite/modules/test/service/TestDataService.java b/web/src/main/java/com/jeesite/modules/test/service/TestDataService.java index c995d686..24da30a8 100644 --- a/web/src/main/java/com/jeesite/modules/test/service/TestDataService.java +++ b/web/src/main/java/com/jeesite/modules/test/service/TestDataService.java @@ -3,6 +3,8 @@ */ package com.jeesite.modules.test.service; +import java.util.List; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -67,6 +69,16 @@ public class TestDataService extends CrudService { return super.findPage(testData); } + /** + * 查询子表分页数据 + * @param page 分页对象 + * @param testData + * @return + */ + public List findSubList(TestDataChild testData) { + return testDataChildDao.findList(testData); + } + /** * 保存数据（插入或更新） * @param testData diff --git a/web/src/main/java/com/jeesite/modules/test/web/TestDataController.java b/web/src/main/java/com/jeesite/modules/test/web/TestDataController.java index f8724fd1..b56368eb 100644 --- a/web/src/main/java/com/jeesite/modules/test/web/TestDataController.java +++ b/web/src/main/java/com/jeesite/modules/test/web/TestDataController.java @@ -3,6 +3,8 @@ */ package com.jeesite.modules.test.web; +import java.util.List; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -20,6 +22,7 @@ import com.jeesite.common.config.Global; import com.jeesite.common.entity.Page; import com.jeesite.common.web.BaseController; import com.jeesite.modules.test.entity.TestData; +import com.jeesite.modules.test.entity.TestDataChild; import com.jeesite.modules.test.service.TestDataService; /** @@ -63,6 +66,16 @@ public class TestDataController extends BaseController { Page page = testDataService.findPage(testData); return page; } + + /** + * 查询子表列表数据 + */ + @RequiresPermissions("test:testData:view") + @RequestMapping(value = "subListData") + @ResponseBody + public List subListData(TestDataChild testDataChild) { + return testDataService.findSubList(testDataChild); + } /** * 查看编辑表单 diff --git a/web/src/main/resources/views/modules/demo/demoDataGridEditGrid.html b/web/src/main/resources/views/modules/demo/demoDataGridEditGrid.html index 28ebc0ab..4a01c2c3 100644 --- a/web/src/main/resources/views/modules/demo/demoDataGridEditGrid.html +++ b/web/src/main/resources/views/modules/demo/demoDataGridEditGrid.html @@ -3,7 +3,7 @@
- 数据管理 + 数据管理
查询 diff --git a/web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html b/web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html index c842e14d..be95fcd7 100644 --- a/web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html +++ b/web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html @@ -3,7 +3,7 @@
- 数据管理 + 数据管理
查询 diff --git a/web/src/main/resources/views/modules/demo/demoFormEditForm.html b/web/src/main/resources/views/modules/demo/demoFormEditForm.html index 5cadccb0..cdefd69e 100644 --- a/web/src/main/resources/views/modules/demo/demoFormEditForm.html +++ b/web/src/main/resources/views/modules/demo/demoFormEditForm.html @@ -3,7 +3,7 @@
- ${testData.isNewRecord ? '新增数据' : '编辑数据'} + ${testData.isNewRecord ? '新增数据' : '编辑数据'}
diff --git a/web/src/main/resources/views/modules/demo/demoFormLayoutForm.html b/web/src/main/resources/views/modules/demo/demoFormLayoutForm.html index f51b411f..2e78edb6 100644 --- a/web/src/main/resources/views/modules/demo/demoFormLayoutForm.html +++ b/web/src/main/resources/views/modules/demo/demoFormLayoutForm.html @@ -3,7 +3,7 @@
- ${testData.isNewRecord ? '新增数据' : '编辑数据'} + ${testData.isNewRecord ? '新增数据' : '编辑数据'}
diff --git a/web/src/main/resources/views/modules/demo/demoFormTableForm.html b/web/src/main/resources/views/modules/demo/demoFormTableForm.html index 49640d71..41e65b72 100644 --- a/web/src/main/resources/views/modules/demo/demoFormTableForm.html +++ b/web/src/main/resources/views/modules/demo/demoFormTableForm.html @@ -3,7 +3,7 @@
- ${testData.isNewRecord ? '新增数据' : '编辑数据'} + ${testData.isNewRecord ? '新增数据' : '编辑数据'}
diff --git a/web/src/main/resources/views/modules/test/testDataForm.html b/web/src/main/resources/views/modules/test/testDataForm.html index 7af173cc..30331671 100644 --- a/web/src/main/resources/views/modules/test/testDataForm.html +++ b/web/src/main/resources/views/modules/test/testDataForm.html @@ -3,7 +3,7 @@
- ${text(testData.isNewRecord ? '新增数据' : '编辑数据')} + ${text(testData.isNewRecord ? '新增数据' : '编辑数据')}
@@ -170,7 +170,7 @@
-

${text('测试数据子表')}

+

${text('子表数据')}

<% if (hasPermi('test:testData:edit')){ %> diff --git a/web/src/main/resources/views/modules/test/testDataList.html b/web/src/main/resources/views/modules/test/testDataList.html index af639a2c..b23a77ed 100644 --- a/web/src/main/resources/views/modules/test/testDataList.html +++ b/web/src/main/resources/views/modules/test/testDataList.html @@ -3,7 +3,7 @@
- ${text('数据管理')} + ${text('数据管理')}
${text('查询')} @@ -169,7 +169,46 @@ $('#dataGrid').dataGrid({ // 双击表格行时调用 ondblClickRow: function(id, rownum, colnum, event){ js.addTabPage(null, '编辑数据', '${ctx}/test/testData/form?id='+id); - }, + }, + + // 子表格支持演示 + subGrid: true, + subGridRowExpanded: function (subgridId, rowId) { + $('#'+subgridId).html('
子表数据
' + +'
'); + $('#'+subgridId+'_subgrid').dataGrid({ + url: '${ctx}/test/testData/subListData', + postData: {'testData.id': rowId}, + autoGridHeight: function(){return 'auto'}, // 设置自动高度 + autoGridWidth: function(){return $("#"+subgridId).width();}, // 设置自动高度 + // 设置数据表格列 + columnModel: [ + {header:'${text("单行文本")}', name:'testInput', width:150}, + {header:'${text("多行文本")}', name:'testTextarea', width:150}, + {header:'${text("下拉框")}', name:'testSelect', width:150, align:"center", formatter: function(val, obj, row, act){ + return js.getDictLabel(${@DictUtils.getDictListJson('sys_menu_type')}, val, '${text("未知")}', true); + }}, + {header:'${text("下拉多选")}', name:'testSelectMultiple', width:150, align:"center", formatter: function(val, obj, row, act){ + return js.getDictLabel(${@DictUtils.getDictListJson('sys_menu_type')}, val, '${text("未知")}', true); + }}, + {header:'${text("单选框")}', name:'testRadio', width:150, align:"center", formatter: function(val, obj, row, act){ + return js.getDictLabel(${@DictUtils.getDictListJson('sys_menu_type')}, val, '${text("未知")}', true); + }}, + {header:'${text("复选框")}', name:'testCheckbox', width:150, align:"center", formatter: function(val, obj, row, act){ + return js.getDictLabel(${@DictUtils.getDictListJson('sys_menu_type')}, val, '${text("未知")}', true); + }}, + {header:'${text("日期时间")}', name:'testDatetime', width:150, align:"center"}, + {header:'${text("用户名称")}', name:'testUser.userName', width:150, align:"center"}, + {header:'${text("机构名称")}', name:'testOffice.officeName', width:150, align:"center"}, + {header:'${text("区域名称")}', name:'testAreaName', width:150, align:"center"} + ], + // 加载成功后执行事件 + ajaxSuccess: function(data){ + + } + }); + }, + // 加载成功后执行事件 ajaxSuccess: function(data){ // if (data.count == 0){ diff --git a/web/src/main/resources/views/modules/test/testTreeForm.html b/web/src/main/resources/views/modules/test/testTreeForm.html index f2c822e2..be858f50 100644 --- a/web/src/main/resources/views/modules/test/testTreeForm.html +++ b/web/src/main/resources/views/modules/test/testTreeForm.html @@ -3,7 +3,7 @@
- ${text(testTree.isNewRecord ? '新增数据' : '编辑数据')} + ${text(testTree.isNewRecord ? '新增数据' : '编辑数据')}
diff --git a/web/src/main/resources/views/modules/test/testTreeList.html b/web/src/main/resources/views/modules/test/testTreeList.html index d13e0a69..c9ff684e 100644 --- a/web/src/main/resources/views/modules/test/testTreeList.html +++ b/web/src/main/resources/views/modules/test/testTreeList.html @@ -3,7 +3,7 @@
- ${text('数据管理')} + ${text('数据管理')}
${text('查询')}