diff --git a/modules/core/src/main/java/com/jeesite/modules/state/web/ServerStateController.java b/modules/core/src/main/java/com/jeesite/modules/state/web/ServerStateController.java index 7a531efe..86af7cb7 100644 --- a/modules/core/src/main/java/com/jeesite/modules/state/web/ServerStateController.java +++ b/modules/core/src/main/java/com/jeesite/modules/state/web/ServerStateController.java @@ -5,6 +5,7 @@ package com.jeesite.modules.state.web; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; import org.springframework.web.bind.annotation.RequestMapping; /** @@ -18,7 +19,8 @@ public class ServerStateController { @RequiresPermissions("sys:state:server") @RequestMapping(value="") - public String index(){ + public String index(Model model){ + model.addAttribute("message", "正在研发中，敬请期待！"); return "modules/state/serverIndex"; } diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx index 70b1a9db..52f72269 100644 Binary files a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx and b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx differ diff --git a/web/src/main/java/com/jeesite/modules/test/web/DemoController.java b/web/src/main/java/com/jeesite/modules/test/web/DemoController.java new file mode 100644 index 00000000..2abd2360 --- /dev/null +++ b/web/src/main/java/com/jeesite/modules/test/web/DemoController.java @@ -0,0 +1,57 @@ +/** + * Copyright (c) 2013-Now http://jeesite.com All rights reserved. + */ +package com.jeesite.modules.test.web; + +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; + +import com.jeesite.common.lang.StringUtils; +import com.jeesite.common.web.BaseController; +import com.jeesite.modules.test.entity.TestData; +import com.jeesite.modules.test.service.TestDataService; + +/** + * 演示实例Controller + * @author ThinkGem + * @version 2018-03-24 + */ +@Controller +@RequestMapping(value = "${adminPath}/demo") +public class DemoController extends BaseController { + + @Autowired + private TestDataService testDataService; + + /** + * 获取数据 + */ + @ModelAttribute + public TestData get(String id, boolean isNewRecord) { + return testDataService.get(id, isNewRecord); + } + + /** + * DataGrid + */ + @RequiresPermissions("test:testData:view") + @RequestMapping(value = "dataGrid/{viewName}") + public String dataGrid(@PathVariable String viewName, TestData testData, Model model) { + return "modules/demo/dataGrid" + StringUtils.cap(viewName); + } + + /** + * Form + */ + @RequiresPermissions("test:testData:view") + @RequestMapping(value = "form/{viewName}") + public String form(@PathVariable String viewName, TestData testData, Model model) { + return "modules/demo/form" + StringUtils.cap(viewName); + } + +} \ No newline at end of file diff --git a/web/src/main/resources/views/modules/demo/dataGridEditGrid.html b/web/src/main/resources/views/modules/demo/dataGridEditGrid.html new file mode 100644 index 00000000..3ead6f3e --- /dev/null +++ b/web/src/main/resources/views/modules/demo/dataGridEditGrid.html @@ -0,0 +1,238 @@ +<% layout('/layouts/default.html', {title: '数据管理', libs: ['dataGrid','validate']}){ %> +
+
+
+
+ 数据管理 +
+
+ 查询 + <% if(hasPermi('test:testData:edit')){ %> + 增行 + <% } %> +
+
+
+ <#form:form id="searchForm" model="${testData}" action="${ctx}/test/testData/listData" method="post" class="form-inline hide" + data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}"> +
+ +
+ <#form:input path="testInput" maxlength="200" class="form-control width-120"/> +
+
+
+ +
+ <#form:input path="testTextarea" maxlength="200" class="form-control width-120"/> +
+
+
+ +
+ <#form:select path="testSelect" dictType="sys_menu_type" blankOption="true" class="form-control"/> +
+
+
+ +
+ <#form:select path="testSelectMultiple" dictType="sys_menu_type" multiple="true" blankOption="true" class="form-control"/> +
+
+
+ +
+ <#form:radio path="testRadio" dictType="sys_menu_type" blankOption="true" class="form-control"/> +
+
+
+ +
+ <#form:checkbox path="testCheckbox" dictType="sys_menu_type" blankOption="true" class="form-control"/> +
+
+
+ +
+ <#form:input path="testDate_gte" readonly="true" maxlength="20" class="form-control Wdate-date" + dataFormat="date" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false,onpicked:function(){testDate_lte.click()}});"/> +  --  + <#form:input path="testDate_lte" readonly="true" maxlength="20" class="form-control Wdate-date" + dataFormat="date" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/> +
+
+
+ +
+ <#form:input path="testDatetime_gte" readonly="true" maxlength="20" class="form-control Wdate-datetime" + dataFormat="datetime" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm',isShowClear:false,onpicked:function(){testDatetime_lte.click()}});"/> +  --  + <#form:input path="testDatetime_lte" readonly="true" maxlength="20" class="form-control Wdate-datetime" + dataFormat="datetime" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm',isShowClear:false});"/> +
+
+
+ +
+ <#form:treeselect id="testUser" title="用户" + path="testUser.userCode" labelPath="testUser.userName" + url="${ctx}/sys/office/treeData?isLoadUser=true" allowClear="true"/> +
+
+
+ +
+ <#form:treeselect id="testOffice" title="部门" + path="testOffice.officeCode" labelPath="testOffice.officeName" + url="${ctx}/sys/office/treeData" allowClear="true"/> +
+
+
+ +
+ <#form:treeselect id="testAreaCode" title="区域" + path="testAreaCode" labelPath="testAreaName" + url="${ctx}/sys/area/treeData" allowClear="true"/> +
+
+
+ +
+ <#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control"/> +
+
+
+ +
+ <#form:input path="remarks" maxlength="500" class="form-control width-120"/> +
+
+
+ + +
+ + <#form:form id="inputForm" model="${testData}" action="${ctx}/test/testData/save" method="post" class="form-horizontal"> +
+
+ +
+
+
+<% } %> + + \ No newline at end of file diff --git a/web/src/main/resources/views/modules/demo/dataGridGroupGrid.html b/web/src/main/resources/views/modules/demo/dataGridGroupGrid.html new file mode 100644 index 00000000..2dadf4a5 --- /dev/null +++ b/web/src/main/resources/views/modules/demo/dataGridGroupGrid.html @@ -0,0 +1,230 @@ +<% layout('/layouts/default.html', {title: '数据管理', libs: ['dataGrid']}){ %> +
+
+
+
+ 数据管理 +
+
+ 查询 + <% if(hasPermi('test:testData:edit')){ %> + 新增 + <% } %> +
+
+
+ <#form:form id="searchForm" model="${testData}" action="${ctx}/test/testData/listData" method="post" class="form-inline hide" + data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}"> +
+ +
+ <#form:input path="testInput" maxlength="200" class="form-control width-120"/> +
+
+
+ +
+ <#form:input path="testTextarea" maxlength="200" class="form-control width-120"/> +
+
+
+ +
+ <#form:select path="testSelect" dictType="sys_menu_type" blankOption="true" class="form-control"/> +
+
+
+ +
+ <#form:select path="testSelectMultiple" dictType="sys_menu_type" multiple="true" blankOption="true" class="form-control"/> +
+
+
+ +
+ <#form:radio path="testRadio" dictType="sys_menu_type" blankOption="true" class="form-control"/> +
+
+
+ +
+ <#form:checkbox path="testCheckbox" dictType="sys_menu_type" blankOption="true" class="form-control"/> +
+
+
+ +
+ <#form:input path="testDate_gte" readonly="true" maxlength="20" class="form-control Wdate-date" + dataFormat="date" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false,onpicked:function(){testDate_lte.click()}});"/> +  --  + <#form:input path="testDate_lte" readonly="true" maxlength="20" class="form-control Wdate-date" + dataFormat="date" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/> +
+
+
+ +
+ <#form:input path="testDatetime_gte" readonly="true" maxlength="20" class="form-control Wdate-datetime" + dataFormat="datetime" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm',isShowClear:false,onpicked:function(){testDatetime_lte.click()}});"/> +  --  + <#form:input path="testDatetime_lte" readonly="true" maxlength="20" class="form-control Wdate-datetime" + dataFormat="datetime" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm',isShowClear:false});"/> +
+
+
+ +
+ <#form:treeselect id="testUser" title="用户" + path="testUser.userCode" labelPath="testUser.userName" + url="${ctx}/sys/office/treeData?isLoadUser=true" allowClear="true"/> +
+
+
+ +
+ <#form:treeselect id="testOffice" title="部门" + path="testOffice.officeCode" labelPath="testOffice.officeName" + url="${ctx}/sys/office/treeData" allowClear="true"/> +
+
+
+ +
+ <#form:treeselect id="testAreaCode" title="区域" + path="testAreaCode" labelPath="testAreaName" + url="${ctx}/sys/area/treeData" allowClear="true"/> +
+
+
+ +
+ <#form:select path="status" dictType="sys_search_status" blankOption="true" class="form-control"/> +
+
+
+ +
+ <#form:input path="remarks" maxlength="500" class="form-control width-120"/> +
+
+
+ + +
+ +
+
+
+
+
+<% } %> + \ No newline at end of file