表单组件新增图标属性，支持图片，系统ICON以及颜色配置等

activiti/src/main/resources/template/js/activitimodel/activitimodellist.js

@@ -81,7 +81,7 @@ layui.config({
 	});
 	
 	//删除
-	function del(data, obj){
+	function del(data, obj) {
 		var msg = obj ? '确认删除模型【' + obj.data.name + '】吗？' : '确认删除选中数据吗？';
 		layer.confirm(msg, { icon: 3, title: '删除模型' }, function (index) {
 			layer.close(index);

code-doc/src/main/resources/template/js/codemodel/codemodellist.js

@@ -90,7 +90,7 @@ layui.config({
 	});
 	
 	//删除
-	function del(data, obj){
+	function del(data, obj) {
 		var msg = obj ? '确认删除模板【' + obj.data.modelName + '】吗？' : '确认删除选中数据吗？';
 		layer.confirm(msg, { icon: 3, title: '删除模板' }, function (index) {
 			layer.close(index);

code-doc/src/main/resources/template/js/codemodelgroup/codemodelgrouplist.js

@@ -77,7 +77,7 @@ layui.config({
 	});
 	
 	//删除
-	function del(data, obj){
+	function del(data, obj) {
 		layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function(index){
 			layer.close(index);
             AjaxPostUtil.request({url: reqBasePath + "codemodel003", params: {rowId: data.id}, type: 'json', callback: function (json) {

code-doc/src/main/resources/template/js/sysdevelopdoc/sysdevelopdocconsolelist.js

@@ -66,7 +66,7 @@ layui.config({
 	});
 	
 	//删除
-	function del(data, obj){
+	function del(data, obj) {
 		layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function(index){
 			layer.close(index);
             AjaxPostUtil.request({url: reqBasePath + "sysdevelopdoc015", params: {rowId: data.id}, type: 'json', callback: function (json) {

code-doc/src/main/resources/template/js/sysdevelopdoc/sysdevelopdoclist.js

@@ -65,7 +65,7 @@ layui.config({
 	});
 	
 	//删除
-	function del(data, obj){
+	function del(data, obj) {
 		layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function(index){
 			layer.close(index);
             AjaxPostUtil.request({url: reqBasePath + "sysdevelopdoc005", params: {rowId: data.id}, type: 'json', callback: function (json) {

common/src/main/resources/template/js/sysEveModel/sysEveModelList.js

@@ -68,7 +68,7 @@ layui.config({
     });
 	
 	// 删除
-	function del(data, obj){
+	function del(data, obj) {
 		layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function(index){
 			layer.close(index);
             AjaxPostUtil.request({url: reqBasePath + "sysevemodel003", params: {id: data.id}, type: 'json', method: "DELETE", callback: function (json) {

crm/src/main/resources/template/js/crmCustomerContact/crmCustomerContactList.js

@@ -83,7 +83,7 @@ layui.config({
 	}
 	
 	// 删除
-	function del(data, obj){
+	function del(data, obj) {
 		layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function(index){
 			layer.close(index);
             AjaxPostUtil.request({url: flowableBasePath + "customercontact005", params: {contactId: data.id}, type: 'json', callback: function (json) {

crm/src/main/resources/template/js/crmOpportunity/crmOpportunityList.js

@@ -193,7 +193,7 @@ layui.config({
 	}
 	
 	// 删除
-	function del(data, obj){
+	function del(data, obj) {
 		layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function(index){
 			layer.close(index);
             AjaxPostUtil.request({url: flowableBasePath + "opportunity013", params: {rowId: data.id}, type: 'json', callback: function (json) {

crm/src/main/resources/template/js/crmOpportunity/myCrmOpportunityList.js

@@ -191,7 +191,7 @@ layui.config({
 	}
 	
 	// 删除
-	function del(data, obj){
+	function del(data, obj) {
 		layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function(index){
 			layer.close(index);
             AjaxPostUtil.request({url: flowableBasePath + "opportunity013", params: {rowId: data.id}, type: 'json', callback: function (json) {

crm/src/main/resources/template/js/crmcontractmanage/mycrmcontractlist.js

@@ -162,7 +162,7 @@ layui.config({
 	}
 	
 	// 删除
-	function del(data, obj){
+	function del(data, obj) {
 		layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function(index){
 			layer.close(index);
             AjaxPostUtil.request({url: flowableBasePath + "mycrmcontract015", params: {rowId: data.id}, type: 'json', callback: function (json) {

crm/src/main/resources/template/js/customermanage/customerlist.js

@@ -107,7 +107,7 @@ layui.config({
 	}
 	
 	// 删除
-	function del(data, obj){
+	function del(data, obj) {
 		layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function(index){
 			layer.close(index);
             AjaxPostUtil.request({url: flowableBasePath + "customer006", params: {rowId: data.id}, type: 'json', callback: function (json) {

crm/src/main/resources/template/js/documentarymanage/mydocumentarylist.js

@@ -98,7 +98,7 @@ layui.config({
 	}
 	
 	// 删除
-	function del(data, obj){
+	function del(data, obj) {
 		layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function(index){
 			layer.close(index);
             AjaxPostUtil.request({url: flowableBasePath + "documentary006", params: {rowId: data.id}, type: 'json', callback: function (json) {

dsform/src/main/resources/template/js/dsFormPage/dsFormPageDesign.js

@@ -90,9 +90,10 @@ layui.config({
  	function loadLeftBoxItem(){
  		showGrid({
 		 	id: "btnBox",
-		 	url: flowableBasePath + "dsform006",
-		 	params: {rowId: parent.rowId},
+		 	url: flowableBasePath + "queryDsFormContentMationToShow",
+		 	params: {},
 		 	pagination: false,
+			method: 'GET',
 		 	template: $("#leftBoxItem").html(),
 		 	ajaxSendAfter:function (json) {
 		 		formPageControl = [].concat(json.rows);
@@ -186,7 +187,7 @@ layui.config({
 	
 	// 获取该控件的脚本信息
 	function getDataScript(params){
-		AjaxPostUtil.request({url: flowableBasePath + "dsform007", params: {rowId: params.formContentId}, type: 'json', callback: function (json) {
+		AjaxPostUtil.request({url: flowableBasePath + "queryDsFormContentMationById", params: {id: params.formContentId}, type: 'json', method: 'GET', callback: function (json) {
 			params.htmlContent = encodeURIComponent(json.bean.htmlContent);
 			params.jsContent = encodeURIComponent(json.bean.jsContent);
     	}, async: false});

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

@@ -6,15 +6,19 @@ layui.config({
 	version: skyeyeVersion
 }).extend({
     window: 'js/winui.window'
-}).define(['window', 'table', 'jquery', 'winui', 'element'], function (exports) {
+}).define(['window', 'table', 'jquery', 'winui', 'element', 'colorpicker', 'fileUpload'], function (exports) {
 	winui.renderColor();
 	layui.use(['form', 'codemirror', 'xml', 'clike', 'css', 'htmlmixed', 'javascript', 'nginx',
 	           'solr', 'sql', 'vue'], function (form) {
 		var index = parent.layer.getFrameIndex(window.name);
 	    var $ = layui.$,
 			element = layui.element,
+			colorpicker = layui.colorpicker,
 	    	form = layui.form;
 
+		// 加载图标信息
+		systemCommonUtil.initIconChooseHtml('iconMation', form, colorpicker, 12);
+
 	    // 根据类型获取部分功能的使用说明
 		systemCommonUtil.queryExplainMationByType(2, function(json) {
 			$(".layui-colla-title").html(json.bean.title);
@@ -71,53 +75,7 @@ layui.config({
 		 		});
 			}
 		});
-		function removeByValue(arr, val){
-			for(var i = 0; i < arr.length; i++){
-				if(arr[i] == val) {
-					arr.splice(i, 1);
-					break;
-				}
-			}
-		}
-		
-		//取出json串的键
-		function getOutKey(arr){
-			var jsonObj = $.parseJSON(arr);
-			var a = [];
-			var b = [];
-			for(var i = 0; i < jsonObj.length; i++){
-				for (var key in jsonObj[i])
-					a.push(key); 
-				b.push(a);
-				a = [];
-			}
-			return b;
-		}
-		
-		//B的子集是否是A的子集
-		function subset(A,B){
-			for(var i = 0; i < B.length; i++){
-				if(!isContained(B[i], A)){
-					return false;
-				}
-			}
-			return true;
-		}
-		
-		//b是否被a包含,是返回true,不是返回false
-		isContained =(a, b)=>{
-			if(!(a instanceof Array) || !(b instanceof Array)) 
-		    	return false;
-		    if(a.length < b.length) 
-		    	return false;
-		    var aStr = a.toString();
-		    for(var i = 0, len = b.length; i < len; i++){
-		    	if(aStr.indexOf(b[i]) == -1) 
-		    		return false;
-		    }
-		    return true;
-		}
-		
+
 	    var htmlEditor = CodeMirror.fromTextArea(document.getElementById("htmlContent"), {
             mode : "xml",  // 模式
             theme : "eclipse",  // CSS样式选择
@@ -188,7 +146,12 @@ layui.config({
 						params.dataShowTpl = "";
 						params.defaultData = "";
 					}
-	        		AjaxPostUtil.request({url: flowableBasePath + "dsform002", params: params, type: 'json', callback: function(json) {
+					// 获取图标信息
+					params = systemCommonUtil.getIconChoose(params);
+					if (!params["iconChooseResult"]) {
+						return false;
+					}
+	        		AjaxPostUtil.request({url: flowableBasePath + "writeDsFormContent", params: params, type: 'json', method: 'POST', callback: function(json) {
 						parent.layer.close(index);
 						parent.refreshCode = '0';
 	        		}});

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

@@ -6,21 +6,23 @@ layui.config({
 	version: skyeyeVersion
 }).extend({
     window: 'js/winui.window'
-}).define(['window', 'table', 'jquery', 'winui', 'element'], function (exports) {
+}).define(['window', 'table', 'jquery', 'winui', 'element', 'colorpicker', 'fileUpload'], function (exports) {
 	winui.renderColor();
 	layui.use(['form', 'codemirror', 'xml', 'clike', 'css', 'htmlmixed', 'javascript', 'nginx',
 	           'solr', 'sql', 'vue'], function (form) {
 		var index = parent.layer.getFrameIndex(window.name);
 	    var $ = layui.$,
 			element = layui.element,
+			colorpicker = layui.colorpicker,
 	    	form = layui.form;
 	    var htmlEditor, jsEditor;
 	    
 	    showGrid({
 		 	id: "showForm",
-		 	url: flowableBasePath + "dsform004",
-		 	params: {rowId: parent.rowId},
+		 	url: flowableBasePath + "queryDsFormContentMationById",
+		 	params: {id: parent.rowId},
 		 	pagination: false,
+			method: 'GET',
 		 	template: getFileContent('tpl/dsformcontent/dsformcontenteditTemplate.tpl'),
 		 	ajaxSendLoadBefore: function(hdb){
 		 		//是否为系统菜单
@@ -44,6 +46,9 @@ layui.config({
 				});
 		 	},
 		 	ajaxSendAfter: function(json) {
+				// 加载图标信息
+				systemCommonUtil.initEditIconChooseHtml('iconMation', form, colorpicker, 12, json.bean);
+
 				// 根据类型获取部分功能的使用说明
 				systemCommonUtil.queryExplainMationByType(2, function (json) {
 					$(".layui-colla-title").html(json.bean.title);
@@ -137,53 +142,7 @@ layui.config({
 				 		});
 					}
 				});
-				function removeByValue(arr, val){
-					for(var i = 0; i < arr.length; i++){
-						if(arr[i] == val) {
-							arr.splice(i, 1);
-							break;
-						}
-					}
-				}
-				
-				//取出json串的键
-				function getOutKey(arr){
-					var jsonObj = $.parseJSON(arr);
-					var a = [];
-					var b = [];
-					for(var i = 0; i < jsonObj.length; i++){
-						for (var key in jsonObj[i])
-							a.push(key); 
-						b.push(a);
-						a = [];
-					}
-					return b;
-				}
-				
-				//B的子集是否是A的子集
-				function subset(A,B){
-					for(var i = 0; i < B.length; i++){
-						if(!isContained(B[i], A)){
-							return false;
-						}
-					}
-					return true;
-				}
-				
-				//b是否被a包含,是返回true,不是返回false
-				isContained =(a, b)=>{
-					if(!(a instanceof Array) || !(b instanceof Array)) 
-				    	return false;
-				    if(a.length < b.length) 
-				    	return false;
-				    var aStr = a.toString();
-				    for(var i = 0, len = b.length; i < len; i++){
-				    	if(aStr.indexOf(b[i]) == -1) 
-				    		return false;
-				    }
-				    return true;
-				}
-				
+
 				matchingLanguage();
 		 		form.render();
 		 		form.on('submit(formEditBean)', function (data) {
@@ -197,7 +156,7 @@ layui.config({
 		        				htmlType: $("#htmlType").val(),
 		        				jsContent: encodeURIComponent(jsEditor.getValue()),
 		        				jsType: $("#jsType").val(),
-		        				rowId: parent.rowId
+		        				id: parent.rowId
 			        		};
 			        		if($("#linkedData").val() == 'true'){
 			 	        		params.linkedData = '1';
@@ -229,7 +188,14 @@ layui.config({
 			 	        		params.dataShowTpl = '';
 			 	        		params.defaultData = "";
 			 	        	}
-				        	AjaxPostUtil.request({url: flowableBasePath + "dsform005", params: params, type: 'json', callback: function (json) {
+
+							// 获取图标信息
+							params = systemCommonUtil.getIconChoose(params);
+							if (!params["iconChooseResult"]) {
+								return false;
+							}
+
+				        	AjaxPostUtil.request({url: flowableBasePath + "writeDsFormContent", params: params, type: 'json', method: 'POST', callback: function (json) {
 								parent.layer.close(index);
 								parent.refreshCode = '0';
 				 	   		}});
@@ -241,11 +207,10 @@ layui.config({
 		 	}
 	    });
 	    
-	    //取消
+	    // 取消
 	    $("body").on("click", "#cancle", function() {
 	    	parent.layer.close(index);
 	    });
 	    
 	});
-	    
 });
\ No newline at end of file

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

@@ -19,15 +19,15 @@ layui.config({
 	    id: 'messageTable',
 	    elem: '#messageTable',
 	    method: 'post',
-	    url: flowableBasePath + 'dsform001',
-	    where:{contentName:$("#contentName").val()},
-	    even:true,
+	    url: flowableBasePath + 'queryDsFormContentList',
+	    where: getTableParams(),
+	    even: true,
 	    page: true,
 		limits: getLimits(),
 		limit: getLimit(),
 	    cols: [[
 	        { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
-	        { field: 'contentName', title: '模板标题', width: 120 },
+	        { field: 'contentName', title: '组件名称', width: 120 },
 	        { title: 'HTML内容', align: 'center', width: 90, templet: function (d) {
 	        	return '<i class="fa fa-fw fa-html5 cursor" lay-event="htmlContent"></i>';
 	        }},
@@ -42,10 +42,13 @@ layui.config({
 			{ 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'}
+	        { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', width: 140, toolbar: '#tableBar'}
 	    ]],
 	    done: function(json) {
 	    	matchingLanguage();
+			initTableSearchUtil.initAdvancedSearch(this, json.searchFilter, form, "请输入组件名称", function () {
+				table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
+			});
 	    }
 	});
 	
@@ -100,19 +103,11 @@ layui.config({
         }
     });
 	
-	form.render();
-	form.on('submit(formSearch)', function (data) {
-        if (winui.verifyForm(data.elem)) {
-        	refreshTable();
-        }
-        return false;
-	});
-	
 	//删除
-	function del(data, obj){
+	function del(data, obj) {
 		layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function(index){
 			layer.close(index);
-            AjaxPostUtil.request({url: flowableBasePath + "dsform003", params: {rowId: data.id}, type: 'json', callback: function (json) {
+            AjaxPostUtil.request({url: flowableBasePath + "deleteDsFormContentMationById", params: {id: data.id}, type: 'json', method: 'DELETE', callback: function (json) {
 				winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
 				loadTable();
     		}});
@@ -132,12 +127,7 @@ layui.config({
 				loadTable();
 			}});
 	}
-	
-	//刷新数据
-    $("body").on("click", "#reloadTable", function() {
-    	loadTable();
-    });
-    
+
     //新增
     $("body").on("click", "#addBean", function() {
     	_openNewWindows({
@@ -150,14 +140,20 @@ layui.config({
 				loadTable();
 			}});
     });
-    
+
+	form.render();
+	//刷新数据
+	$("body").on("click", "#reloadTable", function() {
+		loadTable();
+	});
+	
     function loadTable() {
-    	table.reloadData("messageTable", {where:{contentName:$("#contentName").val()}});
+    	table.reloadData("messageTable", {where: getTableParams()});
     }
     
-    function refreshTable(){
-    	table.reloadData("messageTable", {page: {curr: 1}, where:{contentName:$("#contentName").val()}});
-    }
+	function getTableParams() {
+		return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
+	}
     
     exports('dsformcontentlist', {});
 });

dsform/src/main/resources/template/js/dsformdisplaytemplate/dsformdisplaytemplatelist.js

@@ -85,7 +85,7 @@ layui.config({
 	});
 	
 	//删除
-	function del(data, obj){
+	function del(data, obj) {
 		layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function(index){
 			layer.close(index);
             AjaxPostUtil.request({url: flowableBasePath + "dsformdisplaytemplate003", params: {rowId: data.id}, type: 'json', callback: function (json) {

dsform/src/main/resources/template/js/dsformlimitrequirement/dsformlimitrequirementlist.js

@@ -57,7 +57,7 @@ layui.config({
 	});
 	
 	//删除
-	function del(data, obj){
+	function del(data, obj) {
 		layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function(index){
 			layer.close(index);
             AjaxPostUtil.request({url: flowableBasePath + "dsformlimitrequirement003", params: {rowId: data.id}, type: 'json', callback: function (json) {

dsform/src/main/resources/template/tpl/dsFormPage/dsFormPageDesign.html

@@ -156,7 +156,7 @@
 			        <div class="layui-form-item layui-col-xs12 TypeIsTwo layui-hide">
 			            <label class="layui-form-label">接口<i class="red">*</i></label>
 			            <div class="layui-input-block">
-			                <input type="text" id="nterfac" name="nterfac" class="layui-input" placeholder="例如：http://localhost:8081/dsform006"/>
+			                <input type="text" id="nterfac" name="nterfac" class="layui-input" placeholder="例如：http://localhost:8081/queryDsFormContentMationToShow"/>
 			            </div>
 			        </div>
 			    </div>   

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

@@ -19,15 +19,15 @@
 				</div>
 			</div>
 			<div class="layui-form-item layui-col-xs12">
-				<span class="hr-title">模板内容</span><hr>
+				<span class="hr-title">组件信息</span><hr>
 			</div>
-	        <div class="layui-form-item">
-	            <label class="layui-form-label">模板标题<i class="red">*</i></label>
+	        <div class="layui-form-item layui-col-xs12">
+	            <label class="layui-form-label">组件标题<i class="red">*</i></label>
 	            <div class="layui-input-block">
-                	<input type="text" id="contentName" name="contentName" win-verify="required" placeholder="请输入模板标题" class="layui-input" maxlength="20"/>
+                	<input type="text" id="contentName" name="contentName" win-verify="required" placeholder="请输入组件标题" class="layui-input" maxlength="20"/>
                 </div>
 	        </div>
-	        <div class="layui-form-item">
+	        <div class="layui-form-item layui-col-xs12">
 	            <label class="layui-form-label">HTML内容类型<i class="red">*</i></label>
 	            <div class="layui-input-block">
                 	<select id="htmlType" name="htmlType" class="layui-input" win-verify="required" lay-filter="selectParent">
@@ -35,13 +35,13 @@
                     </select>
                 </div>
 	        </div>
-	        <div class="layui-form-item">
+	        <div class="layui-form-item layui-col-xs12">
 	            <label class="layui-form-label">HTML模板内容<i class="red">*</i></label>
 	            <div class="layui-input-block">
                 	<textarea id="htmlContent"></textarea>
                 </div>
 	        </div>
-	        <div class="layui-form-item">
+	        <div class="layui-form-item layui-col-xs12">
 	            <label class="layui-form-label">JS内容类型<i class="red">*</i></label>
 	            <div class="layui-input-block">
                 	<select id="jsType" name="jsType" class="layui-input" win-verify="required" lay-filter="selectParent">
@@ -49,19 +49,19 @@
                     </select>
                 </div>
 	        </div>
-	        <div class="layui-form-item">
+	        <div class="layui-form-item layui-col-xs12">
 	            <label class="layui-form-label">JS模板内容</label>
 	            <div class="layui-input-block">
                 	<textarea id="jsContent"></textarea>
                 </div>
 	        </div>
-	        <div class="layui-form-item">
+	        <div class="layui-form-item layui-col-xs12">
 	            <label class="layui-form-label">关联数据<i class="red">*</i></label>
 	            <div class="layui-input-block winui-switch">
 	                <input id="linkedData" name="linkedData" lay-filter="linkedData" type="checkbox" lay-skin="switch" lay-text="是|否" value="false" />
 	            </div>
 	        </div>
-	        <div class="layui-form-item layui-hide dataTpl">
+	        <div class="layui-form-item layui-col-xs12 layui-hide dataTpl">
 	            <label class="layui-form-label">数据展示模板<i class="red">*</i></label>
 	            <div class="layui-input-block">
 	                <select id="dataShowTpl" name="dataShowTpl" lay-filter="dataShowTpl">
@@ -69,19 +69,24 @@
 	                </select>
 	            </div>
 	        </div>
-		    <div class="layui-form-item layui-hide dataTpl">
+		    <div class="layui-form-item layui-col-xs12 layui-hide dataTpl">
 		        <div class="layui-input-block" id="templateContent">
 		        	
 		        </div>
 		    </div>
-		    <div class="layui-form-item layui-hide dataTpl">
+		    <div class="layui-form-item layui-col-xs12 layui-hide dataTpl">
 		        <label class="layui-form-label">默认数据<i class="red">*</i></label>
 		        <div class="layui-input-block">
 		        	<textarea id="defaultData" name="defaultData" class="layui-textarea"></textarea>
 		        	<div class="layui-form-mid layui-word-aux">数据样式为：[{"id":"1","name":"男",...},{"id":"2","name":"女",...}]</div>
 		        </div>
 		    </div>
-	        <div class="layui-form-item">
+
+			<div class="layui-form-item layui-col-xs12" id="iconMation">
+
+			</div>
+
+	        <div class="layui-form-item layui-col-xs12">
 	            <div class="layui-input-block">
 	                <button class="winui-btn" id="cancle"><language showName="com.skyeye.cancel"></language></button>
 	                <button class="winui-btn" lay-submit lay-filter="formAddBean"><language showName="com.skyeye.save"></language></button>

dsform/src/main/resources/template/tpl/dsformcontent/dsformcontenteditTemplate.tpl

@@ -8,15 +8,15 @@
         </div>
     </div>
 	<div class="layui-form-item layui-col-xs12">
-		<span class="hr-title">模板内容</span><hr>
+		<span class="hr-title">组件信息</span><hr>
 	</div>
-    <div class="layui-form-item">
-        <label class="layui-form-label">模板标题<i class="red">*</i></label>
+    <div class="layui-form-item layui-col-xs12">
+        <label class="layui-form-label">组件标题<i class="red">*</i></label>
         <div class="layui-input-block">
-        	<input type="text" id="contentName" name="contentName" win-verify="required" placeholder="请输入模板标题" class="layui-input" maxlength="20" value="{{contentName}}"/>
+        	<input type="text" id="contentName" name="contentName" win-verify="required" placeholder="请输入组件标题" class="layui-input" maxlength="20" value="{{contentName}}"/>
         </div>
     </div>
-    <div class="layui-form-item">
+    <div class="layui-form-item layui-col-xs12">
         <label class="layui-form-label">HTML内容类型<i class="red">*</i></label>
         <div class="layui-input-block">
         	<select id="htmlType" name="htmlType" class="layui-input" win-verify="required" lay-filter="selectParent">
@@ -24,13 +24,13 @@
             </select>
         </div>
     </div>
-    <div class="layui-form-item">
+    <div class="layui-form-item layui-col-xs12">
         <label class="layui-form-label">HTML模板内容<i class="red">*</i></label>
         <div class="layui-input-block">
         	<textarea id="htmlContent">{{htmlContent}}</textarea>
         </div>
     </div>
-    <div class="layui-form-item">
+    <div class="layui-form-item layui-col-xs12">
         <label class="layui-form-label">JS内容类型<i class="red">*</i></label>
         <div class="layui-input-block">
         	<select id="jsType" name="jsType" class="layui-input" win-verify="required" lay-filter="selectParent">
@@ -38,19 +38,19 @@
             </select>
         </div>
     </div>
-    <div class="layui-form-item">
+    <div class="layui-form-item layui-col-xs12">
         <label class="layui-form-label">JS模板内容</label>
         <div class="layui-input-block">
         	<textarea id="jsContent">{{jsContent}}</textarea>
         </div>
     </div>
-    <div class="layui-form-item">
+    <div class="layui-form-item layui-col-xs12">
         <label class="layui-form-label">关联数据<i class="red">*</i></label>
         <div class="layui-input-block winui-switch">
             <input id="linkedData" name="linkedData" lay-filter="linkedData" type="checkbox" lay-skin="switch" lay-text="是|否" {{#compare2 linkedData}}{{/compare2}} value="{{#compare3 linkedData}}{{/compare3}}"/>
         </div>
     </div>
-    <div class="layui-form-item layui-hide dataTpl">
+    <div class="layui-form-item layui-col-xs12 layui-hide dataTpl">
         <label class="layui-form-label">数据展示模板<i class="red">*</i></label>
         <div class="layui-input-block">
             <select id="dataShowTpl" name="dataShowTpl" lay-filter="dataShowTpl">
@@ -58,19 +58,24 @@
             </select>
         </div>
     </div>
-    <div class="layui-form-item layui-hide dataTpl">
+    <div class="layui-form-item layui-col-xs12 layui-hide dataTpl">
         <div class="layui-input-block" id="templateContent">
         	
         </div>
     </div>
-    <div class="layui-form-item layui-hide dataTpl">
+    <div class="layui-form-item layui-col-xs12 layui-hide dataTpl">
         <label class="layui-form-label">默认数据<i class="red">*</i></label>
         <div class="layui-input-block">
         	<textarea id="defaultData" name="defaultData" class="layui-textarea">{{defaultData}}</textarea>
         	<div class="layui-form-mid layui-word-aux">数据样式为：[{"id":"1","name":"男",...},{"id":"2","name":"女",...}]</div>
         </div>
     </div>
-    <div class="layui-form-item">
+
+    <div class="layui-form-item layui-col-xs12" id="iconMation">
+
+    </div>
+
+    <div class="layui-form-item layui-col-xs12">
         <div class="layui-input-block">
             <button class="winui-btn" id="cancle"><language showName="com.skyeye.cancel"></language></button>
             <button class="winui-btn" lay-submit lay-filter="formEditBean"><language showName="com.skyeye.save"></language></button>

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

@@ -8,24 +8,10 @@
     <link href="../../assets/lib/layui/css/codemirror.css" rel="stylesheet" />
 </head>
 <body>
-	<div class="txtcenter" style="margin:0 auto;padding-top:10px;">
-	    <form class="layui-form layui-form-pane" action="" autocomplete="off">
-	        <div class="layui-form-item">
-	            <div class="layui-inline">
-	                <label class="layui-form-label">模板标题</label>
-	                <div class="layui-input-inline">
-	                    <input type="text" id="contentName" name="contentName" placeholder="请输入模板标题" class="layui-input" />
-	                </div>
-	                <button type="reset" class="layui-btn layui-btn-primary list-form-search"><language showName="com.skyeye.reset"></language></button>
-	                <button class="layui-btn list-form-search" lay-submit lay-filter="formSearch"><language showName="com.skyeye.search2"></language></button>
-	            </div>
-	        </div>
-	    </form>
-	</div>
     <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><language showName="com.skyeye.addBtn"></language></button>
+            <button id="reloadTable" class="winui-toolbtn search-table-btn-right"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
+            <button id="addBean" class="winui-toolbtn search-table-btn-right" auth="1555857604181"><i class="fa fa-plus" aria-hidden="true"></i><language showName="com.skyeye.addBtn"></language></button>
         </div>
     </div>
     
@@ -36,7 +22,7 @@
     <div style="margin:auto 10px;">
         <table id="messageTable" lay-filter="messageTable"></table>
         <script type="text/html" id="tableBar">
-			{{# if(auth('1555857631041')){ }}
+			{{# if(auth('1555857604181')){ }}
             	<a class="layui-btn layui-btn-xs" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
 			{{# } }}
 			{{# if(auth('1555857618854')){ }}

erp-produce/src/main/resources/template/js/erpProduction/erpProductionList.js

@@ -84,7 +84,7 @@ layui.config({
 	});
 	
 	//删除
-	function del(data, obj){
+	function del(data, obj) {
 		layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function(index){
 			layer.close(index);
             AjaxPostUtil.request({url: flowableBasePath + "erpproduction005", params: {orderId: data.id}, type: 'json', callback: function (json) {

exam/src/main/resources/template/js/examdesign/examDesignList.js

@@ -142,7 +142,7 @@ layui.config({
     }
 	
 	//删除
-	function del(data, obj){
+	function del(data, obj) {
 		var msg = obj ? '确认删除试卷【' + obj.data.surveyName + '】吗？' : '确认删除选中数据吗？';
 		layer.confirm(msg, { icon: 3, title: '删除试卷' }, function (index) {
 			layer.close(index);

exam/src/main/resources/template/js/examdesign/examDesignMyList.js

@@ -143,7 +143,7 @@ layui.config({
     }
 	
 	//删除
-	function del(data, obj){
+	function del(data, obj) {
 		var msg = obj ? '确认删除试卷【' + obj.data.surveyName + '】吗？' : '确认删除选中数据吗？';
 		layer.confirm(msg, { icon: 3, title: '删除试卷' }, function (index) {
 			layer.close(index);

exam/src/main/resources/template/js/schoolQuestionBank/schoolQuestionBankList.js

@@ -132,7 +132,7 @@ layui.config({
     }
 	
 	// 删除
-	function del(data, obj){
+	function del(data, obj) {
 		layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function(index){
 			layer.close(index);
             AjaxPostUtil.request({url:schoolBasePath + "schoolquestionbank003", params: {rowId: data.id}, type: 'json', callback: function (json) {

light-app/src/main/resources/template/js/lightapp/lightapplist.js

@@ -116,7 +116,7 @@ layui.config({
 	}
 	
 	//删除
-	function del(data, obj){
+	function del(data, obj) {
 		var msg = obj ? '确认删除【' + obj.data.appName + '】吗？' : '确认删除选中数据吗？';
 		layer.confirm(msg, { icon: 3, title: '删除轻应用' }, function (index) {
 			layer.close(index);

light-app/src/main/resources/template/js/lightapptype/lightapptypelist.js

@@ -126,7 +126,7 @@ layui.config({
 	}
 	
 	//删除
-	function del(data, obj){
+	function del(data, obj) {
 		var msg = obj ? '确认删除【' + obj.data.typeName + '】吗？' : '确认删除选中数据吗？';
 		layer.confirm(msg, { icon: 3, title: '删除轻应用类型' }, function (index) {
 			layer.close(index);

mail/src/main/resources/template/js/mailGroup/mailGroupList.js

@@ -73,7 +73,7 @@ layui.config({
 	}
 	
 	// 删除
-	function del(data, obj){
+	function del(data, obj) {
 		layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function(index){
 			layer.close(index);
             AjaxPostUtil.request({url: sysMainMation.mailBasePath + "mailGroup003", params: {rowId: data.id}, type: 'json', method: "DELETE", callback: function (json) {

message/src/main/resources/template/js/mymessage/myNoticeList.js

@@ -73,7 +73,7 @@ layui.config({
 	}
 	
 	//删除
-	function del(data, obj){
+	function del(data, obj) {
 		layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {id: "delNoticeList", icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType], skin: 'msg-skin-message', success: function(layero, index){
 			var times = $("#delNoticeList").parent().attr("times");
 			var zIndex = $("#delNoticeList").parent().css("z-index");

organization/src/main/resources/template/js/companyjob/companyjoblist.js

@@ -104,7 +104,7 @@ layui.config({
 	});
 	
 	//删除
-	function del(data, obj){
+	function del(data, obj) {
 		layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function(index){
 			layer.close(index);
             AjaxPostUtil.request({url: reqBasePath + "companyjob003", params: {rowId: data.id}, type: 'json', callback: function (json) {

organization/src/main/resources/template/js/companymation/companymationlist.js

@@ -84,7 +84,7 @@ layui.config({
 	});
 	
 	//删除
-	function del(data, obj){
+	function del(data, obj) {
 		layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function(index){
 			layer.close(index);
             AjaxPostUtil.request({url: reqBasePath + "companymation003", params: {rowId: data.id}, type: 'json', callback: function (json) {

pro/src/main/resources/template/js/procostexpense/procostexpensealllist.js

@@ -163,7 +163,7 @@ layui.config({
 	}
 	
 	// 删除
-	function del(data, obj){
+	function del(data, obj) {
 		layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function(index){
 			layer.close(index);
             AjaxPostUtil.request({url: flowableBasePath + "procostexpense009", params: {rowId: data.id}, type: 'json', callback: function (json) {

pro/src/main/resources/template/js/profile/profilelist.js

@@ -161,7 +161,7 @@ layui.config({
 	}
 
 	// 删除
-	function del(data, obj){
+	function del(data, obj) {
 		layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function(index){
 			layer.close(index);
             AjaxPostUtil.request({url: flowableBasePath + "profile009", params: {rowId: data.id}, type: 'json', callback: function (json) {

pro/src/main/resources/template/js/protask/protasklist.js

@@ -242,7 +242,7 @@ layui.config({
 	}
 	
 	// 删除
-	function del(data, obj){
+	function del(data, obj) {
 		var msg = obj ? '确认删除【' + obj.data.taskName + '】吗？' : '确认删除选中数据吗？';
 		layer.confirm(msg, {icon: 3, title: '删除任务'}, function (index) {
 			layer.close(index);

pro/src/main/resources/template/js/proworkload/proworkloadlist.js

@@ -164,7 +164,7 @@ layui.config({
 	}
 	
 	// 删除
-	function del(data, obj){
+	function del(data, obj) {
 		layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function(index){
 			layer.close(index);
             AjaxPostUtil.request({url: flowableBasePath + "proworkload010", params: {rowId: data.id}, type: 'json', callback: function (json) {

rmprogram/src/main/resources/template/js/rmgroup/rmgrouplist.js

@@ -77,7 +77,7 @@ layui.config({
     });
 	
 	//删除
-	function del(data, obj){
+	function del(data, obj) {
 		var msg = obj ? '确认删除分组【' + obj.data.rmGroupName + '】吗？' : '确认删除选中数据吗？';
 		layer.confirm(msg, { icon: 3, title: '删除分组' }, function (index) {
 			layer.close(index);

rmprogram/src/main/resources/template/js/rmgroupmember/rmgroupmemberlist.js

@@ -225,7 +225,7 @@ layui.config({
     });
 	
 	// 删除
-	function del(data, obj){
+	function del(data, obj) {
 		layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function(index){
 			layer.close(index);
             AjaxPostUtil.request({url: sysMainMation.rmprogramBasePath + "rmxcx019", params: {rowId: data.id}, type: 'json', callback: function (json) {

rmprogram/src/main/resources/template/js/rmmysmpro/mysmprolist.js

@@ -59,7 +59,7 @@ layui.config({
 	});
 	
 	//删除
-	function del(data, obj){
+	function del(data, obj) {
 		var msg = obj ? '确认删除项目【' + obj.data.proName + '】吗？' : '确认删除选中数据吗？';
 		layer.confirm(msg, { icon: 3, title: '删除项目' }, function (index) {
 			layer.close(index);

rmprogram/src/main/resources/template/js/rmproperty/rmpropertyadd.js

@@ -89,9 +89,10 @@ layui.config({
       	//展现形式
       	showGrid({
     	 	id: "dsFormContentId",
-    	 	url: flowableBasePath + "dsform006",
+    	 	url: flowableBasePath + "queryDsFormContentMationToShow",
     	 	params: {},
     	 	pagination: false,
+			method: 'GET',
     	 	template: getFileContent('tpl/template/select-option.tpl'),
     	 	ajaxSendLoadBefore: function(hdb){
     	 	},
@@ -127,7 +128,7 @@ layui.config({
         });
       	
       	form.on('select(selectParent)', function(data) {
-      		AjaxPostUtil.request({url: flowableBasePath + "dsform007", params: {rowId: data.value}, type: 'json', callback: function (json) {
+      		AjaxPostUtil.request({url: flowableBasePath + "queryDsFormContentMationById", params: {id: data.value}, type: 'json', method: 'GET', callback: function (json) {
 				htmlModelContent.setValue(json.bean.htmlContent);
 				jsModelContent.setValue(json.bean.jsContent);
 				htmlContent.setValue(json.bean.htmlContent);

rmprogram/src/main/resources/template/js/rmproperty/rmpropertyedit.js

@@ -138,9 +138,10 @@ layui.config({
 		 		//展现形式
 		      	showGrid({
 		    	 	id: "dsFormContentId",
-		    	 	url: flowableBasePath + "dsform006",
+		    	 	url: flowableBasePath + "queryDsFormContentMationToShow",
 		    	 	params: {},
 		    	 	pagination: false,
+					method: 'GET',
 		    	 	template: getFileContent('tpl/template/select-option.tpl'),
 		    	 	ajaxSendLoadBefore: function(hdb){
 		    	 	},
@@ -157,7 +158,7 @@ layui.config({
 				});
 
               	form.on('select(selectParent)', function(data) {
-              		AjaxPostUtil.request({url: flowableBasePath + "dsform007", params: {rowId: data.value}, type: 'json', callback: function (json) {
+              		AjaxPostUtil.request({url: flowableBasePath + "queryDsFormContentMationById", params: {id: data.value}, type: 'json', method: 'GET', callback: function (json) {
 						htmlModelContent.setValue(json.bean.htmlContent);
 						jsModelContent.setValue(json.bean.jsContent);
 						htmlContent.setValue(json.bean.htmlContent);

rmprogram/src/main/resources/template/js/rmproperty/rmpropertylist.js

@@ -8,14 +8,12 @@ layui.config({
     window: 'js/winui.window'
 }).define(['window', 'table', 'jquery', 'winui', 'form', 'codemirror', 'xml', 'clike', 'css', 'htmlmixed', 'javascript', 'nginx', 'solr', 'sql', 'vue'], function (exports) {
 	winui.renderColor();
-	
 	var $ = layui.$,
 		form = layui.form,
 		table = layui.table;
 	
 	authBtn('1560828282644');
-	
-	
+
 	table.render({
 	    id: 'messageTable',
 	    elem: '#messageTable',
@@ -131,10 +129,8 @@ layui.config({
         }
     });
 	
-	
 	form.render();
 	form.on('submit(formSearch)', function (data) {
-    	
         if (winui.verifyForm(data.elem)) {
         	refreshTable();
         }
@@ -144,9 +140,10 @@ layui.config({
 	//展现形式
   	showGrid({
 	 	id: "dsFormContentId",
-	 	url: flowableBasePath + "dsform006",
+	 	url: flowableBasePath + "queryDsFormContentMationToShow",
 	 	params: {},
 	 	pagination: false,
+		method: 'GET',
 	 	template: getFileContent('tpl/template/select-option.tpl'),
 	 	ajaxSendLoadBefore: function(hdb){
 	 	},
@@ -156,11 +153,10 @@ layui.config({
     });
 	
 	//删除
-	function del(data, obj){
+	function del(data, obj) {
 		var msg = obj ? '确认删除样式属性【' + obj.data.title + '】吗？' : '确认删除选中数据吗？';
 		layer.confirm(msg, { icon: 3, title: '删除样式属性' }, function (index) {
 			layer.close(index);
-            
             AjaxPostUtil.request({url: sysMainMation.rmprogramBasePath + "rmproperty003", params: {rowId: data.id}, type: 'json', callback: function (json) {
 				winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
 				loadTable();

rmprogram/src/main/resources/template/js/rmpropertyvalue/rmpropertyvaluelist.js

@@ -71,7 +71,7 @@ layui.config({
 	});
 	
 	//删除
-	function del(data, obj){
+	function del(data, obj) {
 		var msg = obj ? '确认删除标签属性值【' + obj.data.title + '】吗？' : '确认删除选中数据吗？';
 		layer.confirm(msg, { icon: 3, title: '删除标签属性值' }, function (index) {
 			layer.close(index);

rmprogram/src/main/resources/template/js/rmtype/rmtypelist.js

@@ -58,7 +58,7 @@ layui.config({
 	});
 	
 	//删除
-	function del(data, obj){
+	function del(data, obj) {
 		var msg = obj ? '确认删除分类【' + obj.data.rmTypeName + '】吗？' : '确认删除选中数据吗？';
 		layer.confirm(msg, { icon: 3, title: '删除分类' }, function (index) {
 			layer.close(index);

schedule/src/main/resources/template/js/schedule/holidayschedule.js

@@ -56,7 +56,7 @@ layui.config({
     });
 	
 	// 删除
-	function del(data, obj){
+	function del(data, obj) {
 		layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function(index){
 			layer.close(index);
             AjaxPostUtil.request({url: sysMainMation.scheduleBasePath + "syseveschedule011", params: {rowId: data.id}, type: 'json', callback: function (json) {

school/src/main/resources/template/js/schoolKnowledgePoints/schoolKnowledgePointsList.js

@@ -124,7 +124,7 @@ layui.config({
     }
 	
 	//删除
-	function del(data, obj){
+	function del(data, obj) {
 		layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function(index){
 			layer.close(index);
             AjaxPostUtil.request({url:schoolBasePath + "knowledgepoints003", params: {rowId: data.id}, type: 'json', callback: function (json) {

school/src/main/resources/template/js/schoolclassmation/schoolclassmationlist.js

@@ -98,7 +98,7 @@ layui.config({
 	}
 	
 	// 删除
-	function del(data, obj){
+	function del(data, obj) {
 		layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function(index){
 			layer.close(index);
             AjaxPostUtil.request({url:schoolBasePath + "classmation003", params: {rowId: data.id}, type: 'json', callback: function (json) {

school/src/main/resources/template/js/schoolgrademation/schoolgrademationlist.js

@@ -69,7 +69,7 @@ layui.config({
 	});
 	
 	//删除
-	function del(data, obj){
+	function del(data, obj) {
 		layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function(index){
 			layer.close(index);
             AjaxPostUtil.request({url:schoolBasePath + "grademation003", params: {rowId: data.id}, type: 'json', callback: function (json) {

school/src/main/resources/template/js/schoolmation/schoolmationlist.js

@@ -67,7 +67,7 @@ layui.config({
 	});
 	
 	//删除
-	function del(data, obj){
+	function del(data, obj) {
 		layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function(index){
 			layer.close(index);
             AjaxPostUtil.request({url:schoolBasePath + "schoolmation003", params: {rowId: data.id}, type: 'json', callback: function (json) {

seal-service/src/main/resources/template/js/serviceworker/serviceworkerlist.js

@@ -102,7 +102,7 @@ layui.config({
 	}
 	
 	//删除
-	function del(data, obj){
+	function del(data, obj) {
 		layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function(index){
 			layer.close(index);
             AjaxPostUtil.request({url: flowableBasePath + "sealseserviceworker003", params: {rowId: data.id}, type: 'json', callback: function (json) {

survey/src/main/resources/template/js/dwsurveydesign/dwsurveydesignlist.js

@@ -68,7 +68,7 @@ layui.config({
 	});
 	
 	//删除
-	function del(data, obj){
+	function del(data, obj) {
 		var msg = obj ? '确认删除问卷【' + obj.data.surveyName + '】吗？' : '确认删除选中数据吗？';
 		layer.confirm(msg, { icon: 3, title: '删除问卷' }, function (index) {
 			layer.close(index);

userauth/src/main/resources/template/js/appWorkPage/appWorkPageList.js

@@ -106,7 +106,7 @@ layui.config({
 	}
 	
 	// 删除菜单
-	function del(data, obj){
+	function del(data, obj) {
 		layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function(index){
 			layer.close(index);
             AjaxPostUtil.request({url: reqBasePath + "appworkpage007", params: {rowId: data.id}, type: 'json', callback: function (json) {

userauth/src/main/resources/template/js/appWorkPageAuthPoint/appWorkPageAuthPointList.js

@@ -62,7 +62,7 @@ layui.config({
     });
 
 	// 删除
-	function del(data, obj){
+	function del(data, obj) {
 		layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function(index){
 			layer.close(index);
             AjaxPostUtil.request({url: reqBasePath + "appworkpageauthpoint005", params: {rowId: data.id}, type: 'json', callback: function (json) {

userauth/src/main/resources/template/js/sysEveMenuAuthPoint/sysEveMenuAuthPointList.js

@@ -62,7 +62,7 @@ layui.config({
     });
 	
 	// 删除
-	function del(data, obj){
+	function del(data, obj) {
 		layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function(index){
 			layer.close(index);
             AjaxPostUtil.request({url: reqBasePath + "sysevemenuauthpoint005", params: {rowId: data.id}, type: 'json', callback: function (json) {

userauth/src/main/resources/template/js/sysEveRole/sysEveRoleList.js

@@ -55,7 +55,7 @@ layui.config({
     });
 	
 	// 删除
-	function del(data, obj){
+	function del(data, obj) {
 		layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], { icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType] }, function (index) {
 			layer.close(index);
             AjaxPostUtil.request({url: reqBasePath + "sys018", params: {rowId: data.id}, type: 'json', method: "DELETE", callback: function (json) {

userauth/src/main/resources/template/js/sysEveWin/sysEveWinList.js

@@ -55,7 +55,7 @@ layui.config({
     });
 	
 	// 删除
-	function del(data, obj){
+	function del(data, obj) {
 		layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], { icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType] }, function (index) {
 			layer.close(index);
             AjaxPostUtil.request({url: reqBasePath + "sysevewin005", params: {id: data.id}, type: 'json', method: "DELETE", callback: function (json) {

userauth/src/main/resources/template/js/sysevemenu/sysevemenulist.js

@@ -152,7 +152,7 @@ layui.config({
     });
     
     // 删除
-	function del(data, obj){
+	function del(data, obj) {
 		layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function(index){
 			layer.close(index);
             AjaxPostUtil.request({url: reqBasePath + "sys011", params: {rowId: data.id}, type: 'json', callback: function (json) {

userauth/src/main/resources/template/js/sysevewinthemecolor/sysevewinthemecolorlist.js

@@ -58,7 +58,7 @@ layui.config({
 	});
 	
 	//删除
-	function del(data, obj){
+	function del(data, obj) {
 		layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function(index){
 			layer.close(index);
             AjaxPostUtil.request({url: reqBasePath + "sysevewinthemecolor003", params: {rowId: data.id}, type: 'json', callback: function (json) {

web/src/main/resources/static/公共请求

-//下拉框模板 展现形式   例如：输入框，选择框
-showGrid({
- 	id: "showModel",
- 	url: flowableBasePath + "dsform006",
- 	params: {},
- 	pagination: false,
- 	template: getFileContent('tpl/template/select-option.tpl'),
- 	ajaxSendLoadBefore: function(hdb){
- 	},
- 	ajaxSendAfter:function (json) {
- 		form.render('select');
- 	}
-});
-
-//下拉框模板 属性标签
-showGrid({
- 	id: "propertyId",
- 	url: sysMainMation.rmprogramBasePath + "rmproperty006",
- 	params: {},
- 	pagination: false,
- 	template: getFileContent('tpl/template/select-option.tpl'),
- 	ajaxSendLoadBefore: function(hdb){
- 	},
- 	ajaxSendAfter:function (json) {
- 		form.render('select');
- 	}
-});
-
-//多选框模板 属性标签
-showGrid({
- 	id: "limitRequire",
- 	url: sysMainMation.rmprogramBasePath + "rmproperty006",
- 	params: {},
- 	pagination: false,
- 	template: getFileContent('tpl/template/checkbox-property.tpl'),
- 	ajaxSendLoadBefore: function(hdb){
- 	},
- 	ajaxSendAfter:function (json) {
- 		form.render('checkbox');
- 	}
-});
-

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

@@ -441,6 +441,7 @@ var systemCommonUtil = {
             $(".iconTypeIsTwo").removeClass("layui-hide");
             $(".iconTypeIsOne").addClass("layui-hide");
         }
+        // 设置图标颜色
         if (isNull(params.iconColor)) {
             $("#iconShow").css({'color': 'white'});
         } else {
@@ -448,8 +449,9 @@ var systemCommonUtil = {
             $("#iconShow").css({'color': params.iconColor});
         }
 
+        // 设置图标背景颜色
         if (isNull(params.iconBg)) {
-            $("#iconShow").css({'color': 'white'});
+            $("#iconShow").css({'background-color': 'white'});
         } else {
             $('#iconBginput').val(params.iconBg);
             $("#iconShow").parent().css({'background-color': params.iconBg});

workplan/src/main/resources/template/js/mySysWorkPlan/myCreateSysWorkPlanList.js

@@ -151,7 +151,7 @@ layui.config({
 	}
 
 	// 删除
-	function del(data, obj){
+	function del(data, obj) {
 		layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function(index){
 			layer.close(index);
 			AjaxPostUtil.request({url: sysMainMation.workplanBasePath + "sysworkplan006", params: {planId: data.id}, type: 'json', callback: function (json) {

workplan/src/main/resources/template/js/sysworkplan/sysworkplanlist.js

@@ -234,7 +234,7 @@ layui.config({
 	}
 	
 	//删除
-	function del(data, obj){
+	function del(data, obj) {
 		layer.confirm(systemLanguage["com.skyeye.deleteOperationMsg"][languageType], {icon: 3, title: systemLanguage["com.skyeye.deleteOperation"][languageType]}, function(index){
 			layer.close(index);
             AjaxPostUtil.request({url: sysMainMation.workplanBasePath + "sysworkplan006", params: {planId: data.id}, type: 'json', callback: function (json) {