[Fix-10002] Fix some bugs in datasource list (apache#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
vagetablechicken · May 12, 2022 · 53cd700 · 53cd700
1 parent 8d17fd2
commit 53cd700
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git 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
@@ -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'),