小程序数据展示模板展示完成

skyeye-dao/src/main/java/com/skyeye/dsform/dao/DsFormDisplayTemplateDao.java

@@ -20,4 +20,6 @@ public interface DsFormDisplayTemplateDao {
 
 	public int editDsFormDisplayTemplateMationById(Map<String, Object> map) throws Exception;
 
+	public List<Map<String, Object>> queryDisplayTemplateListToShow(Map<String, Object> map) throws Exception;
+
 }

skyeye-service/src/main/java/com/skyeye/dsform/service/DsFormDisplayTemplateService.java

@@ -15,4 +15,6 @@ public interface DsFormDisplayTemplateService {
 
 	public void editDsFormDisplayTemplateMationById(InputObject inputObject, OutputObject outputObject) throws Exception;
 
+	public void queryDisplayTemplateListToShow(InputObject inputObject, OutputObject outputObject) throws Exception;
+
 }

skyeye-service/src/main/java/com/skyeye/dsform/service/impl/DsFormDisplayTemplateServiceImpl.java

@@ -118,5 +118,25 @@ public class DsFormDisplayTemplateServiceImpl implements DsFormDisplayTemplateSe
 			outputObject.setreturnMessage("该动态表单数据展示模板名称已存在，不可进行二次保存");
 		}
 	}
+
+	/**
+	 * 
+	     * @Title: queryDisplayTemplateListToShow
+	     * @Description: 获取动态表单数据展示模板
+	     * @param @param inputObject
+	     * @param @param outputObject
+	     * @param @throws Exception    参数
+	     * @return void    返回类型
+	     * @throws
+	 */
+	@Override
+	public void queryDisplayTemplateListToShow(InputObject inputObject, OutputObject outputObject) throws Exception {
+		Map<String, Object> map = inputObject.getParams();
+		List<Map<String, Object>> beans = dsFormDisplayTemplateDao.queryDisplayTemplateListToShow(map);
+		if(beans != null){
+			outputObject.setBeans(beans);
+			outputObject.settotal(beans.size());
+		}
+	}
 	
 }

skyeye-web/src/main/java/com/skyeye/dsform/controller/DsFormDisplayTemplateController.java

@@ -94,4 +94,20 @@ public class DsFormDisplayTemplateController {
 		dsFormDisplayTemplateService.editDsFormDisplayTemplateMationById(inputObject, outputObject);
 	}
 	
+	/**
+	 * 
+	     * @Title: queryDisplayTemplateListToShow
+	     * @Description: 获取动态表单数据展示模板
+	     * @param @param inputObject
+	     * @param @param outputObject
+	     * @param @throws Exception    参数
+	     * @return void    返回类型
+	     * @throws
+	 */
+	@RequestMapping("/post/DsFormDisplayTemplateController/queryDisplayTemplateListToShow")
+	@ResponseBody
+	public void queryDisplayTemplateListToShow(InputObject inputObject, OutputObject outputObject) throws Exception{
+		dsFormDisplayTemplateService.queryDisplayTemplateListToShow(inputObject, outputObject);
+	}
+	
 }

skyeye-web/src/main/resources/dbmapper/DsFormDisplayTemplateMapper.xml

@@ -75,4 +75,12 @@
 		WHERE id = #{id}
 	</update>
 	
+	<select id="queryDisplayTemplateListToShow" parameterType="java.util.Map" resultType="java.util.Map">
+		SELECT
+			a.id,
+			a.template_name name
+		FROM
+			ds_form_display_template a
+	</select>
+	
 </mapper>
\ No newline at end of file

skyeye-web/src/main/resources/mapping/reqmapping.xml

@@ -375,6 +375,7 @@
 	</url>
 	<url id="rmproperty006" path="/post/RmPropertyController/queryRmPropertyListToShow" val="获取小程序样式属性供展示" allUse="1">
 	</url>
+	
 	<url id="rmpropertyvalue001" path="/post/RmPropertyValueController/queryRmPropertyValueList" val="获取小程序样式属性值列表" allUse="1">
 		<property id="limit" name="limit" ref="required,num" var="分页参数,每页多少条数据" />
 	    <property id="page" name="page" ref="required,num" var="分页参数,第几页"/>
@@ -551,6 +552,8 @@
 	    <property id="templateName" name="templateName" ref="required" var="模板名称"/>
 	    <property id="templateContent" name="templateContent" ref="required" var="模板内容"/>
 	</url>
+	<url id="dsformdisplaytemplate006" path="/post/DsFormDisplayTemplateController/queryDisplayTemplateListToShow" val="获取动态表单数据展示模板" allUse="1">
+	</url>
 	<!-- 动态表单系列结束 -->
 	
 	<!-- 系统各部分说明开始 -->

skyeye-web/src/main/webapp/js/rmproperty/rmpropertyadd.js

@@ -11,6 +11,8 @@ layui.config({
 	    
 		form.render();
 		
+		$("#dataShowModel").hide();
+		
 		AjaxPostUtil.request({url:reqBasePath + "exexplaintormproperty004", params:{}, type:'json', callback:function(json){
    			if(json.returnCode == 0){
    				layer.open({
@@ -107,6 +109,30 @@ layui.config({
     	 	}
         });
       	
+      	//子查询变化
+ 		form.on('radio(selChildData)', function (data) {
+ 			var val = data.value;
+	    	if(val == '1'){//是
+	    		$("#dataShowModel").show();
+	    		showGrid({
+	    		 	id: "displayTemplateId",
+	    		 	url: reqBasePath + "dsformdisplaytemplate006",
+	    		 	params: {},
+	    		 	pagination: false,
+	    		 	template: getFileContent('tpl/template/select-option.tpl'),
+	    		 	ajaxSendLoadBefore: function(hdb){
+	    		 	},
+	    		 	ajaxSendAfter:function(json){
+	    		 		form.render('select');
+	    		 	}
+	    		});
+	    	}else if(val == '2'){//否
+	    		$("#dataShowModel").hide();
+	    	}else{
+	    		top.winui.window.msg('状态值错误', {icon: 2,time: 2000});
+	    	}
+        });
+      	
       	form.on('select(selectParent)', function(data){
       		AjaxPostUtil.request({url:reqBasePath + "dsform007", params:{rowId: data.value}, type:'json', callback:function(json){
     			if(json.returnCode == 0){

skyeye-web/src/main/webapp/js/rmproperty/rmpropertyedit.js

@@ -37,6 +37,8 @@ layui.config({
 		 	},
 		 	ajaxSendAfter:function(json){
 		 		
+		 		$("#dataShowModel").hide();
+		 		
 		 		htmlModelContent = CodeMirror.fromTextArea(document.getElementById("htmlModelContent"), {
 		            mode : "xml",  // 模式
 		            theme : "eclipse",  // CSS样式选择
@@ -105,6 +107,30 @@ layui.config({
 		      	$("input:radio[name=propertyOut][value=" + json.bean.propertyOut + "]").prop("checked", true);
 		      	$("input:radio[name=selChildData][value=" + json.bean.selChildData + "]").prop("checked", true);
 		 		
+		 		//子查询变化
+		 		form.on('radio(selChildData)', function (data) {
+		 			var val = data.value;
+			    	if(val == '1'){//是
+			    		$("#dataShowModel").show();
+			    		showGrid({
+			    		 	id: "displayTemplateId",
+			    		 	url: reqBasePath + "dsformdisplaytemplate006",
+			    		 	params: {},
+			    		 	pagination: false,
+			    		 	template: getFileContent('tpl/template/select-option.tpl'),
+			    		 	ajaxSendLoadBefore: function(hdb){
+			    		 	},
+			    		 	ajaxSendAfter:function(json){
+			    		 		form.render('select');
+			    		 	}
+			    		});
+			    	}else if(val == '2'){//否
+			    		$("#dataShowModel").hide();
+			    	}else{
+			    		top.winui.window.msg('状态值错误', {icon: 2,time: 2000});
+			    	}
+		        });
+		 		
 		 		form.render();
 		 		
 		 		//展现形式

skyeye-web/src/main/webapp/tpl/rmproperty/rmpropertyadd.html

@@ -40,8 +40,16 @@
             <div class="layui-form-item">
 		        <label class="layui-form-label">子查询<i class="red">*</i></label>
 		        <div class="layui-input-block winui-radio">
-		            <input type="radio" name="selChildData" value="1" title="是" />
-		            <input type="radio" name="selChildData" value="2" title="否" checked/>
+		            <input type="radio" name="selChildData" value="1" title="是" lay-filter="selChildData" />
+		            <input type="radio" name="selChildData" value="2" title="否" lay-filter="selChildData" checked/>
+		        </div>
+		    </div>
+		    <div class="layui-form-item" id="dataShowModel">
+		        <label class="layui-form-label">数据展示模板<i class="red">*</i></label>
+		        <div class="layui-input-block winui-radio">
+		            <select id="displayTemplateId" name="displayTemplateId" class="layui-input" win-verify="required" lay-search>
+		                <option value="">全部</option>
+		            </select>
 		        </div>
 		    </div>
           	<div class="layui-form-item">

skyeye-web/src/main/webapp/tpl/rmproperty/rmpropertyeditTemplate.tpl

@@ -28,8 +28,16 @@
     <div class="layui-form-item">
         <label class="layui-form-label">子查询<i class="red">*</i></label>
         <div class="layui-input-block winui-radio">
-            <input type="radio" name="selChildData" value="1" title="是" />
-            <input type="radio" name="selChildData" value="2" title="否" />
+            <input type="radio" name="selChildData" value="1" title="是" lay-filter="selChildData"/>
+            <input type="radio" name="selChildData" value="2" title="否" lay-filter="selChildData"/>
+        </div>
+    </div>
+    <div class="layui-form-item" id="dataShowModel">
+        <label class="layui-form-label">数据展示模板<i class="red">*</i></label>
+        <div class="layui-input-block winui-radio">
+            <select id="displayTemplateId" name="displayTemplateId" class="layui-input" win-verify="required" lay-search>
+                <option value="">全部</option>
+            </select>
         </div>
     </div>
 	<div class="layui-form-item">