From 45adbc611687bcc70b967aa8731319053a250b12 Mon Sep 17 00:00:00 2001
From: weizhiqiang <598748873@qq.com>
Date: Tue, 18 Oct 2022 23:29:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E6=95=B0=E6=8D=AE=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9A=E5=8A=A8=E6=80=81=E8=A1=A8=E5=8D=95=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dsFormObjectRelationEdit.js                    | 14 +++++++++-----
 .../dsFormObjectRelationList.js                    |  7 +++----
 .../dsFormObjectRelationList.html                  |  2 +-
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/dsform/src/main/resources/template/js/dsFormObjectRelation/dsFormObjectRelationEdit.js b/dsform/src/main/resources/template/js/dsFormObjectRelation/dsFormObjectRelationEdit.js
index 6b5b15409..660977b09 100644
--- a/dsform/src/main/resources/template/js/dsFormObjectRelation/dsFormObjectRelationEdit.js
+++ b/dsform/src/main/resources/template/js/dsFormObjectRelation/dsFormObjectRelationEdit.js
@@ -22,12 +22,16 @@ layui.config({
         ajaxSendLoadBefore: function (hdb) {
         },
         ajaxSendAfter: function (json) {
-            $.each(json.bean.dsFormPageMations, function (i, item) {
+            if (!isNull(json.bean.dsFormPageMations)) {
+                $.each(json.bean.dsFormPageMations, function (i, item) {
+                    addRow();
+                    $("#dsFormChooseList" + (rowNum - 1)).val(item.pageNum);
+                    $("#dsFormChooseList" + (rowNum - 1)).attr("dataId", item.id);
+                    $("#pageName" + (rowNum - 1)).html(item.pageName);
+                })
+            } else {
                 addRow();
-                $("#dsFormChooseList" + (rowNum - 1)).val(item.pageNum);
-                $("#dsFormChooseList" + (rowNum - 1)).attr("dataId", item.id);
-                $("#pageName" + (rowNum - 1)).html(item.pageName);
-            })
+            }
 
             matchingLanguage();
             form.render();
diff --git a/dsform/src/main/resources/template/js/dsFormObjectRelation/dsFormObjectRelationList.js b/dsform/src/main/resources/template/js/dsFormObjectRelation/dsFormObjectRelationList.js
index 39f7928da..fa55eba78 100644
--- a/dsform/src/main/resources/template/js/dsFormObjectRelation/dsFormObjectRelationList.js
+++ b/dsform/src/main/resources/template/js/dsFormObjectRelation/dsFormObjectRelationList.js
@@ -27,8 +27,8 @@ layui.config({
             { field: 'serviceName', title: '服务名称', align: 'left', width: 120, templet: function (d) {
                 return '<a lay-event="details" class="notice-title-click">' + d.serviceName + '</a>';
             }},
-            { field: 'className', title: '服务编码', align: 'left', width: 120 },
-            { field: 'appId', title: '应用ID', align: 'left', width: 120 },
+            { field: 'className', title: '服务编码', align: 'left', width: 400 },
+            { field: 'appId', title: '应用ID', align: 'left', width: 240 },
             { field: 'appName', title: '应用名称', align: 'left', width: 120 },
             { field: 'createName', title: systemLanguage["com.skyeye.createName"][languageType], width: 120 },
             { field: 'createTime', title: systemLanguage["com.skyeye.createTime"][languageType], align: 'center', width: 150 },
@@ -59,7 +59,7 @@ layui.config({
         rowId = data.id;
         _openNewWindows({
             url: "../../tpl/dsFormObjectRelation/dsFormObjectRelationEdit.html",
-            title: systemLanguage["com.skyeye.editPageTitle"][languageType],
+            title: '绑定表单',
             pageId: "dsFormObjectRelationEdit",
             area: ['90vw', '90vh'],
             callBack: function (refreshCode) {
@@ -71,7 +71,6 @@ layui.config({
     // 详情
     function details(data) {
         rowId = data.id;
-        var url = erpOrderUtil.getErpDetailUrl(data);
         _openNewWindows({
             url: "../../tpl/dsFormObjectRelation/dsFormObjectRelationDetails.html",
             title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
diff --git a/dsform/src/main/resources/template/tpl/dsFormObjectRelation/dsFormObjectRelationList.html b/dsform/src/main/resources/template/tpl/dsFormObjectRelation/dsFormObjectRelationList.html
index 002718016..762468aff 100644
--- a/dsform/src/main/resources/template/tpl/dsFormObjectRelation/dsFormObjectRelationList.html
+++ b/dsform/src/main/resources/template/tpl/dsFormObjectRelation/dsFormObjectRelationList.html
@@ -16,7 +16,7 @@
         <table id="messageTable" lay-filter="messageTable"></table>
         <script type="text/html" id="tableBar">
             {{# if(auth('1641693544770')){ }}
-                <a class="layui-btn layui-btn-xs" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
+                <a class="layui-btn layui-btn-xs" lay-event="bindDsFormPage">绑定表单</a>
             {{# } }}
         </script>
     </div>
-- 
GitLab