小程序标签属性添加子查询属性

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

@@ -15,6 +15,7 @@
 			a.property_unit propertyUnit,
 			(SELECT COUNT(*) FROM rm_property_value c WHERE c.property_id = a.id) propertyValueNum,
 			(SELECT COUNT(*) FROM rm_group_member_property d WHERE d.property_id = a.id) useNum,
+			CASE a.wether_sel_child_data WHEN '1' THEN '是' WHEN '2' THEN '否' ELSE '否' END selChildData,
 			CONVERT(a.create_time, char) createTime
 		FROM
 			rm_property a
@@ -45,9 +46,9 @@
 	
 	<insert id="insertRmPropertyMation" parameterType="java.util.Map">
 	     INSERT into rm_property
-	     (id, title, property_tag, property_out, property_unit, ds_form_content_id, html_content, js_content, js_rely_on, create_id, create_time)
+	     (id, title, property_tag, property_out, property_unit, ds_form_content_id, html_content, js_content, js_rely_on, wether_sel_child_data, create_id, create_time)
 	     VALUES
-	     (#{id}, #{title}, #{propertyTag}, #{propertyOut}, #{propertyUnit}, #{dsFormContentId}, #{htmlContent}, #{jsContent}, #{jsRelyOn}, #{createId}, #{createTime})
+	     (#{id}, #{title}, #{propertyTag}, #{propertyOut}, #{propertyUnit}, #{dsFormContentId}, #{htmlContent}, #{jsContent}, #{jsRelyOn}, #{selChildData}, #{createId}, #{createTime})
 	</insert>
 	
 	<select id="queryRmPropertyValueNumById" parameterType="java.util.Map" resultType="java.util.Map">
@@ -86,7 +87,8 @@
 			a.js_rely_on jsRelyOn,
 			a.property_unit propertyUnit,
 			b.html_content htmlModelContent,
-			b.js_content jsModelContent
+			b.js_content jsModelContent,
+			a.wether_sel_child_data selChildData
 		FROM
 			rm_property a
 			LEFT JOIN ds_form_content b ON a.ds_form_content_id = b.id
@@ -122,6 +124,9 @@
 			<if test="htmlContent != '' and htmlContent != null">
 				html_content = #{htmlContent},
 			</if>
+			<if test="selChildData != '' and selChildData != null">
+				wether_sel_child_data = #{selChildData},
+			</if>
 			js_content = #{jsContent},
 			js_rely_on = #{jsRelyOn},
 			property_unit = #{propertyUnit},

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

@@ -41,7 +41,8 @@
 			b.property_unit propertyUnit,
 			b.html_content htmlContent,
 			b.js_content jsContent,
-			b.js_rely_on jsRelyOn
+			b.js_rely_on jsRelyOn,
+			b.wether_sel_child_data selChildData
 		FROM
 			rm_group_member_property a,
 			rm_property b

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

@@ -349,6 +349,7 @@
 	    <property id="propertyTag" name="propertyTag" ref="required" var="样式属性标签"/>
 	    <property id="dsFormContentId" name="dsFormContentId" ref="required" var="样式属性展现形式"/>
 	    <property id="propertyOut" name="propertyOut" ref="required,num" var="是否为外部属性   1是 2否"/>
+	    <property id="selChildData" name="selChildData" ref="required,num" var="子查询   1是 2否"/>
 	    <property id="htmlContent" name="htmlContent" ref="required" var="html内容"/>
 	    <property id="jsContent" name="jsContent" ref="" var="js内容"/>
 	    <property id="jsRelyOn" name="jsRelyOn" ref="" var="js依赖的js包"/>
@@ -366,6 +367,7 @@
 	    <property id="propertyTag" name="propertyTag" ref="required" var="样式属性标签"/>
 	    <property id="dsFormContentId" name="dsFormContentId" ref="required" var="样式属性展现形式"/>
 	    <property id="propertyOut" name="propertyOut" ref="required,num" var="是否为外部属性   1是 2否"/>
+	    <property id="selChildData" name="selChildData" ref="required,num" var="子查询   1是 2否"/>
 	    <property id="htmlContent" name="htmlContent" ref="required" var="html内容"/>
 	    <property id="jsContent" name="jsContent" ref="" var="js内容"/>
 	    <property id="jsRelyOn" name="jsRelyOn" ref="" var="js依赖的js包"/>

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

@@ -129,6 +129,7 @@ layui.config({
         			propertyUnit:encodeURI($("#propertyUnit").val()),
         			dsFormContentId:$("#dsFormContentId").val(),
         			propertyOut:data.field.propertyOut,
+        			selChildData:data.field.selChildData,
         			htmlContent:encodeURI(htmlContent.getValue().replace(/\+/g, "%2B").replace(/\&/g, "%26")),
         			jsContent:encodeURI(jsContent.getValue().replace(/\+/g, "%2B").replace(/\&/g, "%26")),
         			jsRelyOn:encodeURI(jsRelyOnContent.getValue().replace(/\+/g, "%2B").replace(/\&/g, "%26")),

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

@@ -103,6 +103,7 @@ 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.render();
 		 		
@@ -143,6 +144,7 @@ layui.config({
 		        			propertyUnit:encodeURI($("#propertyUnit").val()),
 		        			dsFormContentId:$("#dsFormContentId").val(),
 		        			propertyOut:data.field.propertyOut,
+		        			selChildData:data.field.selChildData,
 		        			htmlContent:encodeURI(htmlContent.getValue().replace(/\+/g, "%2B").replace(/\&/g, "%26")),
 		        			jsContent:encodeURI(jsContent.getValue().replace(/\+/g, "%2B").replace(/\&/g, "%26")),
 		        			jsRelyOn:encodeURI(jsRelyOnContent.getValue().replace(/\+/g, "%2B").replace(/\&/g, "%26")),

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

@@ -28,6 +28,7 @@ layui.config({
 	        { field: 'title', title: '属性别名', width: 180 },
 	        { field: 'propertyTag', title: '属性标签', width: 100 },
 	        { field: 'propertyUnit', title: '属性单位', width: 100 },
+	        { field: 'selChildData', title: '子查询', width: 100 },
 	        { field: 'propertyOut', title: '外部属性', width: 100 },
 	        { field: 'contentName', title: '展现形式', width: 120 },
 	        { field: 'propertyValueNum', title: '属性值数量', width: 100 },

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

@@ -37,6 +37,13 @@
                     <input type="radio" name="propertyOut" value="2" title="否" checked />
                 </div>
             </div>
+            <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/>
+		        </div>
+		    </div>
           	<div class="layui-form-item">
                 <label class="layui-form-label">展现形式<i class="red">*</i></label>
                 <div class="layui-input-block">

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

@@ -24,6 +24,13 @@
             <input type="radio" name="propertyOut" value="1" title="是" />
             <input type="radio" name="propertyOut" value="2" title="否" />
         </div>
+    </div>
+    <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="否" />
+        </div>
     </div>
 	<div class="layui-form-item">
         <label class="layui-form-label">展现形式<i class="red">*</i></label>