表单控件整改

dsform/src/main/resources/template/js/dsformcontent/dsformcontentadd.js

@@ -166,35 +166,35 @@ layui.config({
 	 	 	        		return false;
 	 	 	        	}
 	 	        		var defaultDataStr = $("#defaultData").val();//默认数据值
-		        		if(defaultDataStr.length != 0){
-		        			if(isJSON(defaultDataStr)){
-		        				var defaultKey = getOutKey(defaultDataStr);//从默认数据中取出json串的键
-		        				if(subset(tplContentVal,defaultKey)){
-		        					params.defaultData = defaultDataStr;
-		        				}else{
-		        					winui.window.msg('默认数据内容有误，请重新填写!', {icon: 2,time: 2000});
-			 	 	        		return false;
-		        				}
-		        			}else{
-		        				winui.window.msg('默认数据格式不正确，请重新填写!', {icon: 2,time: 2000});
-		 	 	        		return false;
-		        			}
-		        		}else{
-		        			winui.window.msg('请填写默认数据', {icon: 2,time: 2000});
-	 	 	        		return false;
-		        		}
-	 	        	}else{
-	 	        		params.linkedData = '2';
-	 	        		params.dataShowTpl = "";
-	 	        		params.defaultData = "";
-	 	        	}
-	        		AjaxPostUtil.request({url: flowableBasePath + "dsform002", params:params, type: 'json', callback: function(json){
-	        			if(json.returnCode == 0){
-	        				parent.layer.close(index);
-	        				parent.refreshCode = '0';
-	        			}else{
-	        				winui.window.msg(json.returnMessage, {icon: 2,time: 2000});
-	        			}
+						if (defaultDataStr.length != 0) {
+							if (isJSON(defaultDataStr)) {
+								var defaultKey = getOutKey(defaultDataStr);//从默认数据中取出json串的键
+								if (subset(tplContentVal, defaultKey)) {
+									params.defaultData = defaultDataStr;
+								} else {
+									winui.window.msg('默认数据内容有误，请重新填写!', {icon: 2, time: 2000});
+									return false;
+								}
+							} else {
+								winui.window.msg('默认数据格式不正确，请重新填写!', {icon: 2, time: 2000});
+								return false;
+							}
+						} else {
+							winui.window.msg('请填写默认数据', {icon: 2, time: 2000});
+							return false;
+						}
+					} else {
+						params.linkedData = '2';
+						params.dataShowTpl = "";
+						params.defaultData = "";
+					}
+	        		AjaxPostUtil.request({url: flowableBasePath + "dsform002", params: params, type: 'json', callback: function(json) {
+						if (json.returnCode == 0) {
+							parent.layer.close(index);
+							parent.refreshCode = '0';
+						} else {
+							winui.window.msg(json.returnMessage, {icon: 2, time: 2000});
+						}
 	        		}});
 	        	}
 	        }

dsform/src/main/resources/template/js/dsformcontent/dsformcontentlist.js

@@ -32,13 +32,16 @@ layui.config({
 	        	return '<i class="fa fa-fw fa-html5 cursor" lay-event="htmlContent"></i>';
 	        }},
 	        { title: 'JS内容', align: 'center', width: 80, templet: function(d){
-	        	if(!isNull(d.jsContent)){
-	        		return '<i class="fa fa-fw fa-html5 cursor" lay-event="jsContent"></i>';
-	        	}else{
-	        		return '-';
-	        	}
+				if (!isNull(d.jsContent)) {
+					return '<i class="fa fa-fw fa-html5 cursor" lay-event="jsContent"></i>';
+				} else {
+					return '-';
+				}
 	        }},
-	        { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 },
+			{ field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], width: 120 },
+			{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 },
+			{ field: 'lastUpdateName', title: systemLanguage["com.skyeye.lastUpdateName"][languageType], align: 'left', width: 120 },
+			{ field: 'lastUpdateTime', title: systemLanguage["com.skyeye.lastUpdateTime"][languageType], align: 'center', width: 150},
 	        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 240, toolbar: '#tableBar'}
 	    ]],
 	    done: function(){

dsform/src/main/resources/template/tpl/dsformcontent/dsformcontentlist.html

@@ -25,7 +25,7 @@
     <div class="winui-toolbar">
         <div class="winui-tool">
             <button id="reloadTable" class="winui-toolbtn"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
-            <button id="addBean" class="winui-toolbtn" auth="1555857604181"><i class="fa fa-plus" aria-hidden="true"></i>新增模板</button>
+            <button id="addBean" class="winui-toolbtn" auth="1555857604181"><i class="fa fa-plus" aria-hidden="true"></i><language showName="com.skyeye.addBtn"></language></button>
         </div>
     </div>
     

web/src/main/resources/template/assets/lib/layui/customer/systemCommonUtil.js

@@ -522,6 +522,6 @@ var systemCommonUtil = {
             params["iconColor"] = '';
         }
         return params;
-    }
+    },
 
 };
\ No newline at end of file