(inlong) branch master updated: [INLONG-10045][Dashboard] Supports one approval order containing multiple inlongGroups (#10046)

[dockerzhang]

This is an automated email from the ASF dual-hosted git repository.

dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git


The following commit(s) were added to refs/heads/master by this push:
     new 255be6052e [INLONG-10045][Dashboard] Supports one approval order 
containing multiple inlongGroups (#10046)
255be6052e is described below

commit 255be6052efa21ce250c9661e4861645286d9046
Author: haifxu <xhf1208357...@gmail.com>
AuthorDate: Tue Apr 23 15:18:33 2024 +0800

    [INLONG-10045][Dashboard] Supports one approval order containing multiple 
inlongGroups (#10046)
---
 inlong-dashboard/src/ui/pages/Process/Approvals/config.tsx | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/inlong-dashboard/src/ui/pages/Process/Approvals/config.tsx 
b/inlong-dashboard/src/ui/pages/Process/Approvals/config.tsx
index 99a235179f..0956f5dba7 100644
--- a/inlong-dashboard/src/ui/pages/Process/Approvals/config.tsx
+++ b/inlong-dashboard/src/ui/pages/Process/Approvals/config.tsx
@@ -76,13 +76,21 @@ export const getColumns = activedName => [
   {
     title: i18n.t('pages.Approvals.GroupId'),
     dataIndex: 'inlongGroupId',
-    render: (text, record) => record.showInList?.inlongGroupId,
+    render: (text, record) =>
+      record.showInList
+        ?.filter(item => item.inlongGroupId)
+        ?.map(item => item.inlongGroupId)
+        .join(';'),
   },
   {
     title: i18n.t('pages.Approvals.ConsumeName'),
     dataIndex: 'consumerGroup',
     width: 200,
-    render: (text, record) => record.showInList?.consumerGroup,
+    render: (text, record) =>
+      record.showInList
+        ?.filter(item => item.consumerGroup)
+        ?.map(item => item.consumerGroup)
+        .join(';'),
   },
   {
     title: i18n.t('pages.Approvals.GroupMode'),