样式标签逻辑修改

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

@@ -12,6 +12,7 @@
 			a.html_content htmlContent,
 			a.js_content jsContent,
 			a.js_rely_on jsRelyOn,
+			a.property_unit propertyUnit,
 			CONVERT(a.create_time, char) createTime
 		FROM
 			rm_property a
@@ -38,14 +39,13 @@
 			rm_property a
 		WHERE 
 			a.title = #{title}
-			OR a.property_tag = #{propertyTag}
 	</select>
 	
 	<insert id="insertRmPropertyMation" parameterType="java.util.Map">
 	     INSERT into rm_property
-	     (id, title, property_tag, property_out, 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, create_id, create_time)
 	     VALUES
-	     (#{id}, #{title}, #{propertyTag}, #{propertyOut}, #{dsFormContentId}, #{htmlContent}, #{jsContent}, #{jsRelyOn}, #{createId}, #{createTime})
+	     (#{id}, #{title}, #{propertyTag}, #{propertyOut}, #{propertyUnit}, #{dsFormContentId}, #{htmlContent}, #{jsContent}, #{jsRelyOn}, #{createId}, #{createTime})
 	</insert>
 	
 	<delete id="deleteRmPropertyMationById" parameterType="java.util.Map">
@@ -66,6 +66,7 @@
 			a.html_content htmlContent,
 			a.js_content jsContent,
 			a.js_rely_on jsRelyOn,
+			a.property_unit propertyUnit,
 			b.html_content htmlModelContent,
 			b.js_content jsModelContent
 		FROM
@@ -82,7 +83,7 @@
 		FROM
 			rm_property a
 		WHERE a.id != #{id}
-			AND (a.title = #{title} OR a.property_tag = #{propertyTag})
+			AND a.title = #{title}
 	</select>
 	
 	<update id="editRmPropertyMationById" parameterType="java.util.Map">
@@ -105,6 +106,7 @@
 			</if>
 			js_content = #{jsContent},
 			js_rely_on = #{jsRelyOn},
+			property_unit = #{propertyUnit},
 		</set>
 		WHERE id = #{id}
 	</update>

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

@@ -341,6 +341,7 @@
 	    <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包"/>
+	    <property id="propertyUnit" name="propertyUnit" ref="" var="样式属性单位"/>
 	</url>
 	<url id="rmproperty003" path="/post/RmPropertyController/deleteRmPropertyMationById" val="删除小程序样式属性信息" allUse="1">
 	    <property id="rowId" name="id" ref="required" var="小程序样式属性id"/>
@@ -357,6 +358,7 @@
 	    <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包"/>
+	    <property id="propertyUnit" name="propertyUnit" ref="" var="样式属性单位"/>
 	</url>
 	
 	<!-- 小程序系列结束 -->

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

@@ -109,6 +109,7 @@ layui.config({
 	        	var params = {
         			title:$("#title").val(),
         			propertyTag:$("#propertyTag").val(),
+        			propertyUnit:encodeURI($("#propertyUnit").val()),
         			dsFormContentId:$("#dsFormContentId").val(),
         			propertyOut:data.field.propertyOut,
         			htmlContent:encodeURI(htmlContent.getValue().replace(/\+/g, "%2B").replace(/\&/g, "%26")),

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

@@ -123,6 +123,7 @@ layui.config({
 			        	var params = {
 		        			title:$("#title").val(),
 		        			propertyTag:$("#propertyTag").val(),
+		        			propertyUnit:encodeURI($("#propertyUnit").val()),
 		        			dsFormContentId:$("#dsFormContentId").val(),
 		        			propertyOut:data.field.propertyOut,
 		        			htmlContent:encodeURI(htmlContent.getValue().replace(/\+/g, "%2B").replace(/\&/g, "%26")),

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

@@ -27,6 +27,7 @@ layui.config({
 	        { title: '序号', type: 'numbers'},
 	        { field: 'title', title: '属性别名', width: 180 },
 	        { field: 'propertyTag', title: '属性标签', width: 180 },
+	        { field: 'propertyUnit', title: '属性单位', width: 180 },
 	        { field: 'propertyOut', title: '外部属性', width: 150 },
 	        { field: 'contentName', title: '展现形式', width: 180 },
 	        { field: 'id', title: 'HTML内容', width: 180, templet: function(d){

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

@@ -22,6 +22,13 @@
                 <div class="layui-input-block">
                     <input type="text" id="propertyTag" name="propertyTag" win-verify="required" placeholder="请输入属性标签" class="layui-input"/>
                 </div>
+            </div>
+            <div class="layui-form-item">
+                <label class="layui-form-label">属性单位</label>
+                <div class="layui-input-block">
+                    <input type="text" id="propertyUnit" name="propertyUnit" placeholder="请输入属性单位" class="layui-input"/>
+                    <div class="layui-form-mid layui-word-aux">例如：width:100%;单位为：%</div>
+                </div>
             </div>
           	<div class="layui-form-item">
                 <label class="layui-form-label">外部属性<i class="red">*</i></label>

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

@@ -10,6 +10,13 @@
         <div class="layui-input-block">
             <input type="text" id="propertyTag" name="propertyTag" win-verify="required" placeholder="请输入属性标签" class="layui-input" value="{{propertyTag}}"/>
         </div>
+    </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">属性单位</label>
+        <div class="layui-input-block">
+            <input type="text" id="propertyUnit" name="propertyUnit" placeholder="请输入属性单位" class="layui-input" value="{{propertyUnit}}"/>
+            <div class="layui-form-mid layui-word-aux">例如：width:100%;单位为：%</div>
+        </div>
     </div>
 	<div class="layui-form-item">
         <label class="layui-form-label">外部属性<i class="red">*</i></label>