动态表单组件管理修改

dsform/src/main/resources/template/js/dsformcontent/dsformcontentadd.js → dsform/src/main/resources/template/js/dsFormComponent/dsFormComponentAdd.js

@@ -154,7 +154,7 @@ layui.config({
 				if (!params["iconChooseResult"]) {
 					return false;
 				}
-				AjaxPostUtil.request({url: flowableBasePath + "writeDsFormContent", params: params, type: 'json', method: 'POST', callback: function(json) {
+				AjaxPostUtil.request({url: flowableBasePath + "writeDsFormComponent", 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 → dsform/src/main/resources/template/js/dsFormComponent/dsFormComponentEdit.js

@@ -17,11 +17,11 @@ layui.config({
 
 	showGrid({
 		id: "showForm",
-		url: flowableBasePath + "queryDsFormContentMationById",
+		url: flowableBasePath + "queryDsFormComponentMationById",
 		params: {id: parent.rowId},
 		pagination: false,
 		method: 'GET',
-		template: getFileContent('tpl/dsformcontent/dsformcontenteditTemplate.tpl'),
+		template: $("#beanTemplate").html(),
 		ajaxSendLoadBefore: function(hdb) {
 			//是否为系统菜单
 			hdb.registerHelper("compare2", function(v1, options){
@@ -198,7 +198,7 @@ layui.config({
 							return false;
 						}
 
-						AjaxPostUtil.request({url: flowableBasePath + "writeDsFormContent", params: params, type: 'json', method: 'POST', callback: function (json) {
+						AjaxPostUtil.request({url: flowableBasePath + "writeDsFormComponent", params: params, type: 'json', method: 'POST', callback: function (json) {
 							parent.layer.close(index);
 							parent.refreshCode = '0';
 						}});

dsform/src/main/resources/template/js/dsformcontent/dsformcontentlist.js → dsform/src/main/resources/template/js/dsFormComponent/dsFormComponentList.js

@@ -19,7 +19,7 @@ layui.config({
 	    id: 'messageTable',
 	    elem: '#messageTable',
 	    method: 'post',
-	    url: flowableBasePath + 'queryDsFormContentList',
+	    url: flowableBasePath + 'queryDsFormComponentList',
 	    where: getTableParams(),
 	    even: true,
 	    page: true,
@@ -113,7 +113,7 @@ layui.config({
 	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 + "deleteDsFormContentMationById", params: {id: data.id}, type: 'json', method: 'DELETE', callback: function (json) {
+            AjaxPostUtil.request({url: flowableBasePath + "deleteDsFormComponentMationById", params: {id: data.id}, type: 'json', method: 'DELETE', callback: function (json) {
 				winui.window.msg(systemLanguage["com.skyeye.deleteOperationSuccessMsg"][languageType], {icon: 1, time: 2000});
 				loadTable();
     		}});
@@ -124,9 +124,9 @@ layui.config({
 	function edit(data) {
 		rowId = data.id;
 		_openNewWindows({
-			url: "../../tpl/dsformcontent/dsformcontentedit.html", 
+			url: "../../tpl/dsFormComponent/dsFormComponentEdit.html",
 			title: systemLanguage["com.skyeye.editPageTitle"][languageType],
-			pageId: "dsformcontentedit",
+			pageId: "dsFormComponentEdit",
 			area: ['90vw', '90vh'],
 			callBack: function (refreshCode) {
 				winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
@@ -137,9 +137,9 @@ layui.config({
     // 新增
     $("body").on("click", "#addBean", function() {
     	_openNewWindows({
-			url: "../../tpl/dsformcontent/dsformcontentadd.html", 
+			url: "../../tpl/dsFormComponent/dsFormComponentAdd.html",
 			title: systemLanguage["com.skyeye.addPageTitle"][languageType],
-			pageId: "dsformcontentadd",
+			pageId: "dsFormComponentAdd",
 			area: ['90vw', '90vh'],
 			callBack: function (refreshCode) {
 				winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
@@ -160,5 +160,5 @@ layui.config({
 		return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
 	}
     
-    exports('dsformcontentlist', {});
+    exports('dsFormComponentList', {});
 });

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

@@ -87,7 +87,7 @@ layui.config({
  	function loadLeftBoxItem(){
  		showGrid({
 		 	id: "btnBox",
-		 	url: flowableBasePath + "queryDsFormContentMationToShow",
+		 	url: flowableBasePath + "queryDsFormComponentMationToShow",
 		 	params: {},
 		 	pagination: false,
 			method: 'GET',

dsform/src/main/resources/template/tpl/dsformcontent/dsformcontentadd.html → dsform/src/main/resources/template/tpl/dsFormComponent/dsFormComponentAdd.html

@@ -106,7 +106,7 @@
 	<script src="../../assets/lib/layui/layui.js"></script>
    	<script src="../../assets/lib/layui/custom.js"></script>
    	<script type="text/javascript">
-        layui.config({base: '../../js/dsformcontent/'}).use('dsformcontentadd');
+        layui.config({base: '../../js/dsFormComponent/'}).use('dsFormComponentAdd');
     </script>
 </body>
 </html>
\ No newline at end of file

dsform/src/main/resources/template/tpl/dsFormComponent/dsFormComponentEdit.html

+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title></title>
+    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
+    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
+    <link href="../../assets/lib/layui/css/codemirror.css" rel="stylesheet" />
+</head>
+<body>
+	<div style="margin:0 auto;padding:20px;">
+	    <form class="layui-form" action="" id="showForm" autocomplete="off">
+	        
+	    </form>
+	</div>
+
+	<script type="text/x-handlebars-template" id="beanTemplate">
+		{{#bean}}
+		<div class="layui-collapse">
+			<div class="layui-colla-item">
+				<h2 class="layui-colla-title"></h2>
+				<div class="layui-colla-content">
+
+				</div>
+			</div>
+		</div>
+		<div class="layui-form-item layui-col-xs12">
+			<span class="hr-title">组件信息</span><hr>
+		</div>
+		<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}}"/>
+			</div>
+		</div>
+		<div class="layui-form-item layui-col-xs6">
+			<label class="layui-form-label">分类<i class="red">*</i></label>
+			<div class="layui-input-block">
+				<select id="dsFormContentType" name="dsFormContentType" lay-filter="dsFormContentType" lay-search="" win-verify="required">
+
+				</select>
+			</div>
+		</div>
+		<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">
+					<option value="html">html</option>
+				</select>
+			</div>
+		</div>
+		<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 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">
+					<option value="javascript">javascript</option>
+				</select>
+			</div>
+		</div>
+		<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 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-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">
+
+				</select>
+			</div>
+		</div>
+		<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-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 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>
+			</div>
+		</div>
+		{{/bean}}
+	</script>
+	
+	<script src="../../assets/lib/layui/layui.js"></script>
+   	<script src="../../assets/lib/layui/custom.js"></script>
+   	<script type="text/javascript">
+        layui.config({base: '../../js/dsFormComponent/'}).use('dsFormComponentEdit');
+    </script>
+</body>
+</html>
\ No newline at end of file

dsform/src/main/resources/template/tpl/dsformcontent/dsformcontentlist.html → dsform/src/main/resources/template/tpl/dsFormComponent/dsFormComponentList.html

@@ -33,7 +33,7 @@
     <script src="../../assets/lib/layui/layui.js"></script>
     <script src="../../assets/lib/layui/custom.js"></script>
     <script type="text/javascript">
-        layui.config({base: '../../js/dsformcontent/'}).use('dsformcontentlist');
+        layui.config({base: '../../js/dsFormComponent/'}).use('dsFormComponentList');
     </script>
 </body>
 </html>
\ No newline at end of file

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

@@ -72,7 +72,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/queryDsFormContentMationToShow"/>
+					<input type="text" id="nterfac" name="nterfac" class="layui-input" placeholder="例如：http://localhost:8081/queryDsFormComponentMationToShow"/>
 				</div>
 			</div>
 		</div>

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

-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8" />
-    <title></title>
-    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
-    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
-    <link href="../../assets/lib/layui/css/codemirror.css" rel="stylesheet" />
-</head>
-<body>
-	<div style="margin:0 auto;padding:20px;">
-	    <form class="layui-form" action="" id="showForm" autocomplete="off">
-	        
-	    </form>
-	</div>
-	
-	<script src="../../assets/lib/layui/layui.js"></script>
-   	<script src="../../assets/lib/layui/custom.js"></script>
-   	<script type="text/javascript">
-        layui.config({base: '../../js/dsformcontent/'}).use('dsformcontentedit');
-    </script>
-</body>
-</html>
\ No newline at end of file

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

-{{#bean}}
-	<div class="layui-collapse">
-        <div class="layui-colla-item">
-            <h2 class="layui-colla-title"></h2>
-            <div class="layui-colla-content">
-
-            </div>
-        </div>
-    </div>
-	<div class="layui-form-item layui-col-xs12">
-		<span class="hr-title">组件信息</span><hr>
-	</div>
-    <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}}"/>
-        </div>
-    </div>
-    <div class="layui-form-item layui-col-xs6">
-        <label class="layui-form-label">分类<i class="red">*</i></label>
-        <div class="layui-input-block">
-            <select id="dsFormContentType" name="dsFormContentType" lay-filter="dsFormContentType" lay-search="" win-verify="required">
-
-            </select>
-        </div>
-    </div>
-    <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">
-                <option value="html">html</option>
-            </select>
-        </div>
-    </div>
-    <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 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">
-                <option value="javascript">javascript</option>
-            </select>
-        </div>
-    </div>
-    <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 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-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">
-            	
-            </select>
-        </div>
-    </div>
-    <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-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 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>
-        </div>
-    </div>
-{{/bean}}
\ No newline at end of file

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

@@ -89,7 +89,7 @@ layui.config({
       	//展现形式
       	showGrid({
     	 	id: "dsFormContentId",
-    	 	url: flowableBasePath + "queryDsFormContentMationToShow",
+    	 	url: flowableBasePath + "queryDsFormComponentMationToShow",
     	 	params: {},
     	 	pagination: false,
 			method: 'GET',

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

@@ -140,7 +140,7 @@ layui.config({
 		 		//展现形式
 		      	showGrid({
 		    	 	id: "dsFormContentId",
-		    	 	url: flowableBasePath + "queryDsFormContentMationToShow",
+		    	 	url: flowableBasePath + "queryDsFormComponentMationToShow",
 		    	 	params: {},
 		    	 	pagination: false,
 					method: 'GET',

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

@@ -140,7 +140,7 @@ layui.config({
 	//展现形式
   	showGrid({
 	 	id: "dsFormContentId",
-	 	url: flowableBasePath + "queryDsFormContentMationToShow",
+	 	url: flowableBasePath + "queryDsFormComponentMationToShow",
 	 	params: {},
 	 	pagination: false,
 		method: 'GET',