From 42fae06d641a5fd535213ecd10c37d4ffd8b57be Mon Sep 17 00:00:00 2001 From: weizhiqiang <598748873@qq.com> Date: Sat, 5 Nov 2022 00:03:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E8=A1=A8=E5=8D=95=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E7=AE=A1=E7=90=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dsFormComponentAdd.js} | 2 +- .../dsFormComponentEdit.js} | 6 +- .../dsFormComponentList.js} | 14 +-- .../js/dsFormPage/dsFormPageDesign.js | 2 +- .../dsFormComponentAdd.html} | 2 +- .../dsFormComponent/dsFormComponentEdit.html | 118 ++++++++++++++++++ .../dsFormComponentList.html} | 2 +- .../tpl/dsFormPage/dsFormPageDesign.html | 2 +- .../tpl/dsformcontent/dsformcontentedit.html | 23 ---- .../dsformcontenteditTemplate.tpl | 92 -------------- .../template/js/rmproperty/rmpropertyadd.js | 2 +- .../template/js/rmproperty/rmpropertyedit.js | 2 +- .../template/js/rmproperty/rmpropertylist.js | 2 +- 13 files changed, 136 insertions(+), 133 deletions(-) rename dsform/src/main/resources/template/js/{dsformcontent/dsformcontentadd.js => dsFormComponent/dsFormComponentAdd.js} (98%) rename dsform/src/main/resources/template/js/{dsformcontent/dsformcontentedit.js => dsFormComponent/dsFormComponentEdit.js} (96%) rename dsform/src/main/resources/template/js/{dsformcontent/dsformcontentlist.js => dsFormComponent/dsFormComponentList.js} (93%) rename dsform/src/main/resources/template/tpl/{dsformcontent/dsformcontentadd.html => dsFormComponent/dsFormComponentAdd.html} (98%) create mode 100644 dsform/src/main/resources/template/tpl/dsFormComponent/dsFormComponentEdit.html rename dsform/src/main/resources/template/tpl/{dsformcontent/dsformcontentlist.html => dsFormComponent/dsFormComponentList.html} (94%) delete mode 100644 dsform/src/main/resources/template/tpl/dsformcontent/dsformcontentedit.html delete mode 100644 dsform/src/main/resources/template/tpl/dsformcontent/dsformcontenteditTemplate.tpl 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 542a2ea47..91b0a72ce 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 bf727ef06..9ba619f26 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 ae1dc3e48..cb8d4e753 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 a42c04b3f..51c2e9663 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 4c65bd527..212dd616f 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 000000000..115196e67 --- /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 a67bb99d0..a066ad8bf 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 d3d5244af..36bd1fe66 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 219339b83..000000000 --- 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 2c5a636b8..000000000 --- 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 43f14c6e1..2e498b81f 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 16c37bbc7..787730b81 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 0db5e8145..0ff9404f5 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', -- GitLab