From 010d59f1d658e385cdf7538c28d9b8bdff9125ec Mon Sep 17 00:00:00 2001
From: rockfang <657297417@qq.com>
Date: Thu, 12 May 2022 14:11:52 +0800
Subject: [PATCH] [Fix-10002] Fix some bugs in datasource list (#10005)

* fix: fix ellipsis bug in table column

* fix ellipsis bug in table column

* fix: json-highlight component support nested jsonstring

* fix: make datasource description show

(cherry picked from commit 53cd7009deae072c5284ea881204ed2e8845b572)
---
 .../src/views/datasource/list/json-highlight.tsx       | 10 +++++++---
 .../src/views/datasource/list/use-columns.ts           |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/dolphinscheduler-ui/src/views/datasource/list/json-highlight.tsx b/dolphinscheduler-ui/src/views/datasource/list/json-highlight.tsx
index 017702217c..26a3b67aa8 100644
--- a/dolphinscheduler-ui/src/views/datasource/list/json-highlight.tsx
+++ b/dolphinscheduler-ui/src/views/datasource/list/json-highlight.tsx
@@ -56,9 +56,13 @@ const syntaxHighlight = (json: string) => {
     lines.push(
       <NText tag='div' class={styles['line']}>
         <NText type='error'>"{key}": </NText>
-        <NText type={type}>
-          "{value}"{i !== len - 1 ? ',' : ''}
-        </NText>
+        {isPlainObject(value) ? (
+          syntaxHighlight(JSON.stringify(value))
+        ) : (
+          <NText type={type}>
+            "{value}"{i !== len - 1 ? ',' : ''}
+          </NText>
+        )}
       </NText>
     )
   }
diff --git a/dolphinscheduler-ui/src/views/datasource/list/use-columns.ts b/dolphinscheduler-ui/src/views/datasource/list/use-columns.ts
index 604e2fd720..c43d71fa23 100644
--- a/dolphinscheduler-ui/src/views/datasource/list/use-columns.ts
+++ b/dolphinscheduler-ui/src/views/datasource/list/use-columns.ts
@@ -83,7 +83,7 @@ export function useColumns(onCallback: Function) {
         title: t('datasource.description'),
         key: 'note',
         ...COLUMN_WIDTH_CONFIG['note'],
-        render: (rowData) => rowData.description || '-'
+        render: (rowData) => rowData.note || '-'
       },
       {
         title: t('datasource.create_time'),