diff --git a/dsform/src/main/resources/template/js/dsformcontent/dsformcontentadd.js b/dsform/src/main/resources/template/js/dsFormComponent/dsFormComponentAdd.js similarity index 98% rename from dsform/src/main/resources/template/js/dsformcontent/dsformcontentadd.js rename to dsform/src/main/resources/template/js/dsFormComponent/dsFormComponentAdd.js index 542a2ea47244ef4793e65e892d1651ba86cdc249..91b0a72ce297961eb1493713bcef5d673ac70df8 100644 --- a/dsform/src/main/resources/template/js/dsformcontent/dsformcontentadd.js +++ b/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'; }}); diff --git a/dsform/src/main/resources/template/js/dsformcontent/dsformcontentedit.js b/dsform/src/main/resources/template/js/dsFormComponent/dsFormComponentEdit.js similarity index 96% rename from dsform/src/main/resources/template/js/dsformcontent/dsformcontentedit.js rename to dsform/src/main/resources/template/js/dsFormComponent/dsFormComponentEdit.js index bf727ef068fa514bf02e951609ea9d9ee9415d0f..9ba619f263607b5eb4c08fcce2b3571a951b30bd 100644 --- a/dsform/src/main/resources/template/js/dsformcontent/dsformcontentedit.js +++ b/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'; }}); diff --git a/dsform/src/main/resources/template/js/dsformcontent/dsformcontentlist.js b/dsform/src/main/resources/template/js/dsFormComponent/dsFormComponentList.js similarity index 93% rename from dsform/src/main/resources/template/js/dsformcontent/dsformcontentlist.js rename to dsform/src/main/resources/template/js/dsFormComponent/dsFormComponentList.js index ae1dc3e48422e3468fa4e6d2e54f308420d58a78..cb8d4e753ea238ac49ba9b35bbbf9607810ee1de 100644 --- a/dsform/src/main/resources/template/js/dsformcontent/dsformcontentlist.js +++ b/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', {}); }); diff --git a/dsform/src/main/resources/template/js/dsFormPage/dsFormPageDesign.js b/dsform/src/main/resources/template/js/dsFormPage/dsFormPageDesign.js index a42c04b3f420a166647bb5c1682c1bb5d41d9597..51c2e966317bd7e7b711172afa78ef289c11ac9d 100644 --- a/dsform/src/main/resources/template/js/dsFormPage/dsFormPageDesign.js +++ b/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', diff --git a/dsform/src/main/resources/template/tpl/dsformcontent/dsformcontentadd.html b/dsform/src/main/resources/template/tpl/dsFormComponent/dsFormComponentAdd.html similarity index 98% rename from dsform/src/main/resources/template/tpl/dsformcontent/dsformcontentadd.html rename to dsform/src/main/resources/template/tpl/dsFormComponent/dsFormComponentAdd.html index 4c65bd527f860873ae943b1e20d29c7db4c5519b..212dd616fe012de39de0dc334bcb7c653284aaf4 100644 --- a/dsform/src/main/resources/template/tpl/dsformcontent/dsformcontentadd.html +++ b/dsform/src/main/resources/template/tpl/dsFormComponent/dsFormComponentAdd.html @@ -106,7 +106,7 @@ \ No newline at end of file diff --git a/dsform/src/main/resources/template/tpl/dsFormComponent/dsFormComponentEdit.html b/dsform/src/main/resources/template/tpl/dsFormComponent/dsFormComponentEdit.html new file mode 100644 index 0000000000000000000000000000000000000000..115196e67c80221b4c4edeb3d248bf3a33a73a53 --- /dev/null +++ b/dsform/src/main/resources/template/tpl/dsFormComponent/dsFormComponentEdit.html @@ -0,0 +1,118 @@ + + + + + + + + + + +
+
+ +
+
+ + + + + + + + \ No newline at end of file diff --git a/dsform/src/main/resources/template/tpl/dsformcontent/dsformcontentlist.html b/dsform/src/main/resources/template/tpl/dsFormComponent/dsFormComponentList.html similarity index 94% rename from dsform/src/main/resources/template/tpl/dsformcontent/dsformcontentlist.html rename to dsform/src/main/resources/template/tpl/dsFormComponent/dsFormComponentList.html index a67bb99d072085fc732c67640fe98419668302ba..a066ad8bf283911af6f0f3dc7929c02895f0875f 100644 --- a/dsform/src/main/resources/template/tpl/dsformcontent/dsformcontentlist.html +++ b/dsform/src/main/resources/template/tpl/dsFormComponent/dsFormComponentList.html @@ -33,7 +33,7 @@ \ No newline at end of file diff --git a/dsform/src/main/resources/template/tpl/dsFormPage/dsFormPageDesign.html b/dsform/src/main/resources/template/tpl/dsFormPage/dsFormPageDesign.html index d3d5244afa18a1377d5fa0fe8247295457bb7920..36bd1fe6603ea7947b22ccba17f67c225524e4d6 100644 --- a/dsform/src/main/resources/template/tpl/dsFormPage/dsFormPageDesign.html +++ b/dsform/src/main/resources/template/tpl/dsFormPage/dsFormPageDesign.html @@ -72,7 +72,7 @@
- +
diff --git a/dsform/src/main/resources/template/tpl/dsformcontent/dsformcontentedit.html b/dsform/src/main/resources/template/tpl/dsformcontent/dsformcontentedit.html deleted file mode 100644 index 219339b8398008768fea946af27495abc9756705..0000000000000000000000000000000000000000 --- a/dsform/src/main/resources/template/tpl/dsformcontent/dsformcontentedit.html +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - -
-
- -
-
- - - - - - \ No newline at end of file diff --git a/dsform/src/main/resources/template/tpl/dsformcontent/dsformcontenteditTemplate.tpl b/dsform/src/main/resources/template/tpl/dsformcontent/dsformcontenteditTemplate.tpl deleted file mode 100644 index 2c5a636b8d47fb489759891b41bca6ba49d99728..0000000000000000000000000000000000000000 --- a/dsform/src/main/resources/template/tpl/dsformcontent/dsformcontenteditTemplate.tpl +++ /dev/null @@ -1,92 +0,0 @@ -{{#bean}} -
-
-

-
- -
-
-
-
- 组件信息
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- -
-
-
- -
- -
数据样式为：[{"id":"1","name":"男",...},{"id":"2","name":"女",...}]
-
-
- -
- -
- -
-
- - -
-
-{{/bean}} \ No newline at end of file diff --git a/rmprogram/src/main/resources/template/js/rmproperty/rmpropertyadd.js b/rmprogram/src/main/resources/template/js/rmproperty/rmpropertyadd.js index 43f14c6e19c14fb15c1041826cc0f04c2510097d..2e498b81fb7b51d01563a6d3a6c04191e09cbe35 100644 --- a/rmprogram/src/main/resources/template/js/rmproperty/rmpropertyadd.js +++ b/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', diff --git a/rmprogram/src/main/resources/template/js/rmproperty/rmpropertyedit.js b/rmprogram/src/main/resources/template/js/rmproperty/rmpropertyedit.js index 16c37bbc78dada2411376e2668176b462f3d6065..787730b818969065397e7f9ebf23f19d0ffb793e 100644 --- a/rmprogram/src/main/resources/template/js/rmproperty/rmpropertyedit.js +++ b/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', diff --git a/rmprogram/src/main/resources/template/js/rmproperty/rmpropertylist.js b/rmprogram/src/main/resources/template/js/rmproperty/rmpropertylist.js index 0db5e8145bddc03eb9295411aa92af6934aa74c4..0ff9404f5cc73d9e7bd8cdd8b781595c5925e11c 100644 --- a/rmprogram/src/main/resources/template/js/rmproperty/rmpropertylist.js +++ b/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',