From 605616b1169ecabb08c0c62f234e26c5f2444dbc Mon Sep 17 00:00:00 2001
From: lanyuanxiaoyao <lanyuanxiaoyao@gmail.com>
Date: Fri, 9 Jun 2023 20:24:19 +0800
Subject: [PATCH] =?UTF-8?q?fix(web):=20=E4=BF=AE=E5=A4=8D=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=20mapping=20=E6=97=A0=E6=B3=95=E6=AD=A3=E5=B8=B8?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/components/common.js    | 14 +++++++-------
 web/components/table-tab.js | 18 +++++-------------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/web/components/common.js b/web/components/common.js
index 6ac025d..0e79459 100644
--- a/web/components/common.js
+++ b/web/components/common.js
@@ -751,14 +751,15 @@ function tableMetaDialog() {
                                                 direction: '${orderDir|default:undefined}',
                                                 flink_job_id: '${flinkJobId|default:undefined}',
                                                 alias: '${tableMeta.alias|default:undefined}',
-                                                filter_type: '${filter_type|default:undefined}',
-                                                filter_action: '${filter_action|default:undefined}',
-                                                filter_state: '${filter_state|default:undefined}',
+                                                filter_type: '${type|default:undefined}',
+                                                filter_action: '${action|default:undefined}',
+                                                filter_state: '${state|default:undefined}',
                                             },
                                             defaultParams: {
                                                 filter_type: 'active',
                                             },
                                         },
+                                        affixHeader: true,
                                         syncLocation: false,
                                         silentPolling: true,
                                         stopAutoRefreshWhenModalIsOpen: true,
@@ -789,14 +790,14 @@ function tableMetaDialog() {
                                                 sortable: true,
                                             },
                                             {
-                                                name: 'filter_action',
+                                                name: 'action',
                                                 label: '类型',
                                                 width: 100,
                                                 ...mappingField('action', hudiTimelineActionMapping),
                                                 filterable: filterableField(hudiTimelineActionMapping, false),
                                             },
                                             {
-                                                name: 'filter_state',
+                                                name: 'state',
                                                 label: ' 状态',
                                                 width: 80,
                                                 align: 'center',
@@ -808,7 +809,7 @@ function tableMetaDialog() {
                                                 label: '文件名',
                                             },
                                             {
-                                                name: 'filter_type',
+                                                name: 'type',
                                                 label: '来源',
                                                 width: 60,
                                                 align: 'center',
@@ -1417,7 +1418,6 @@ function mappingField(field, mapping) {
     })
     return {
         type: 'mapping',
-        value: `\${${field}}`,
         map: mapData,
     }
 }
diff --git a/web/components/table-tab.js b/web/components/table-tab.js
index 407cf62..317d2ad 100644
--- a/web/components/table-tab.js
+++ b/web/components/table-tab.js
@@ -19,8 +19,8 @@ function tableTab() {
                                 direction: '${orderDir|default:undefined}',
                                 search_flink_job_id: '${flinkJobId|default:undefined}',
                                 search_alias: '${alias|default:undefined}',
-                                filter_run_mode: '${run_mode|default:undefined}',
-                                filter_compaction_status: '${compaction_status|default:undefined}'
+                                filter_run_mode: '${flinkJob\\.runMode|default:undefined}',
+                                filter_compaction_status: '${syncState\\.compactionStatus|default:undefined}'
                             }
                         },
                         syncLocation: false,
@@ -145,7 +145,7 @@ function tableTab() {
                                 ],
                             },
                             {
-                                name: 'run_mode',
+                                name: 'flinkJob.runMode',
                                 label: '表类型',
                                 width: 60,
                                 align: 'center',
@@ -197,21 +197,13 @@ function tableTab() {
                                 width: 75,
                             },
                             {
-                                name: 'compaction_status',
+                                name: 'syncState.compactionStatus',
                                 label: '压缩状态',
                                 width: 60,
                                 align: 'center',
                                 ...mappingField('syncState.compactionStatus', compactionStatusMapping),
+                                filterable: filterableField(compactionStatusMapping, true),
                                 className: 'bg-cyan-50',
-                                /*filterable: {
-                                    multiple: true,
-                                    options: [
-                                        {label: '调度', value: 'SCHEDULE'},
-                                        {label: '开始', value: 'START'},
-                                        {label: '完成', value: 'FINISH'},
-                                        {label: '失败', value: 'FAIL'},
-                                    ]
-                                }*/
                             },
                             {
                                 name: 'compaction_start_time',