表单布局关联业务对象属性完成

common/src/main/resources/template/js/dsFormPage/pageAdd.js

@@ -10,13 +10,17 @@ layui.config({
 	var $ = layui.$,
 		form = layui.form;
 
+	skyeyeClassEnumUtil.showEnumDataListByClassName("dsFormPageType", 'select', "type", '', form);
+
 	matchingLanguage();
 	form.render();
 	form.on('submit(formAddBean)', function (data) {
 		if (winui.verifyForm(data.elem)) {
 			var params = {
 				name: $("#name").val(),
-				remark: $("#remark").val()
+				remark: $("#remark").val(),
+				type: $("#type").val(),
+				className: parent.objectId
 			};
 			AjaxPostUtil.request({url: reqBasePath + "writeDsFormPage", params: params, type: 'json', method: "POST", callback: function (json) {
 				parent.layer.close(index);

common/src/main/resources/template/js/dsFormPage/pageEdit.js

@@ -19,6 +19,7 @@ layui.config({
 		template: $("#showTemplate").html(),
 		ajaxSendAfter:function (json) {
 
+			skyeyeClassEnumUtil.showEnumDataListByClassName("dsFormPageType", 'select', "type", json.bean.type, form);
 			matchingLanguage();
 			form.render();
 			form.on('submit(formEditBean)', function (data) {
@@ -26,7 +27,9 @@ layui.config({
 					var params = {
 						id: parent.rowId,
 						name: $("#name").val(),
-						remark: $("#remark").val()
+						remark: $("#remark").val(),
+						type: $("#type").val(),
+						className: parent.objectId
 					};
 					AjaxPostUtil.request({url: reqBasePath + "writeDsFormPage", params: params, type: 'json', method: "POST", callback: function (json) {
 						parent.layer.close(index);

common/src/main/resources/template/js/dsFormPage/pageList.js

@@ -38,10 +38,10 @@ layui.config({
 	    cols: [[
 	        { title: systemLanguage["com.skyeye.serialNumber"][languageType], type: 'numbers' },
 	        { field: 'name', title: '名称', align: 'left', width: 120 },
-	        { field: 'remark', title: '简介', align: 'left', width: 350 },
+	        { field: 'remark', title: '简介', align: 'left', width: 200 },
 	        { field: 'numCode', title: '编号', width: 150 },
-			{ field: 'typeName', title: '类型', align: 'left', width: 120, templet: function (d) {
-				return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("dsFormPageType", 'id', d.typeName, 'name');
+			{ field: 'type', title: '类型', align: 'left', width: 120, templet: function (d) {
+				return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("dsFormPageType", 'id', d.type, 'name');
 			}},
 			{ field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], width: 120 },
 			{ field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 },
@@ -83,7 +83,7 @@ layui.config({
 	// 表单设计
 	function control(data) {
 		rowId = data.id;
-		_openNewWindows({
+		parent.parent._openNewWindows({
 			url: "../../tpl/dsFormPage/dsFormPageDesign.html",
 			title: "表单设计",
 			pageId: "dsFormPageDesign",

common/src/main/resources/template/tpl/dsFormPage/pageAdd.html

@@ -12,12 +12,19 @@
 			<div class="layui-form-item layui-col-xs12">
 				<span class="hr-title">基本信息</span><hr>
 			</div>
-	        <div class="layui-form-item layui-col-xs12">
+	        <div class="layui-form-item layui-col-xs6">
 		        <label class="layui-form-label">名称<i class="red">*</i></label>
 		        <div class="layui-input-block">
 		        	<input type="text" id="name" name="name" win-verify="required" placeholder="请输入名称" class="layui-input"/>
 		        </div>
 		    </div>
+			<div class="layui-form-item layui-col-xs6">
+				<label class="layui-form-label">布局类型</label>
+				<div class="layui-input-block">
+					<select lay-filter="type" lay-search="" win-verify="required" id="type" name="type">
+					</select>
+				</div>
+			</div>
 		    <div class="layui-form-item layui-col-xs12">
 		    	<label class="layui-form-label">简介</label>
 		        <div class="layui-input-block">

common/src/main/resources/template/tpl/dsFormPage/pageEdit.html

@@ -18,12 +18,19 @@
 		<div class="layui-form-item layui-col-xs12">
 			<span class="hr-title">基本信息</span><hr>
 		</div>
-		<div class="layui-form-item layui-col-xs12">
+		<div class="layui-form-item layui-col-xs6">
 			<label class="layui-form-label">名称<i class="red">*</i></label>
 			<div class="layui-input-block">
 				<input type="text" id="name" name="name" win-verify="required" placeholder="请输入名称" class="layui-input"  value="{{name}}"/>
 			</div>
 		</div>
+		<div class="layui-form-item layui-col-xs6">
+			<label class="layui-form-label">布局类型</label>
+			<div class="layui-input-block">
+				<select lay-filter="type" lay-search="" win-verify="required" id="type" name="type">
+				</select>
+			</div>
+		</div>
 		<div class="layui-form-item layui-col-xs12">
 			<label class="layui-form-label">页面简介</label>
 			<div class="layui-input-block">