From 6a9c45dc309197c7ba66373323e20d2ac7f5a97d Mon Sep 17 00:00:00 2001 From: actiontech-zihan Date: Thu, 17 Sep 2026 18:50:34 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat(sqlManagement):=20=E7=AE=A1=E6=8E=A7?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA=E5=B9=B6=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=90=8C=E6=BA=90=20SQL=20ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 列 dataIndex=id 默认隐藏；筛参 fuzzy_search_id；locale 文案 SQL ID。 Co-authored-by: Cursor --- .../lib/api/sqle/service/SqlManage/index.d.ts | 4 ++++ .../sqle/src/locale/en-US/sqlManagement.ts | 1 + .../sqle/src/locale/zh-CN/sqlManagement.ts | 1 + .../__snapshots__/index.test.tsx.snap | 22 ++++++++++++++++++- .../component/SQLEEIndex/column.tsx | 22 +++++++++++++++++++ .../component/SQLEEIndex/exportColumnKeys.ts | 1 + .../component/SQLEEIndex/index.tsx | 6 +++++ .../component/SQLEEIndex/sourceExtra.data.ts | 1 + 8 files changed, 57 insertions(+), 1 deletion(-) diff --git a/packages/shared/lib/api/sqle/service/SqlManage/index.d.ts b/packages/shared/lib/api/sqle/service/SqlManage/index.d.ts index 6a83d296f..a215698b4 100644 --- a/packages/shared/lib/api/sqle/service/SqlManage/index.d.ts +++ b/packages/shared/lib/api/sqle/service/SqlManage/index.d.ts @@ -195,6 +195,8 @@ export interface IGetSqlManageListV2Params { fuzzy_search_sql_fingerprint?: string; + fuzzy_search_id?: string; + filter_assignee?: string; filter_instance_id?: string; @@ -243,6 +245,8 @@ export interface IGetSqlManageStatisticsV2Params { fuzzy_search_sql_fingerprint?: string; + fuzzy_search_id?: string; + filter_assignee?: string; filter_instance_id?: string; diff --git a/packages/sqle/src/locale/en-US/sqlManagement.ts b/packages/sqle/src/locale/en-US/sqlManagement.ts index bfc583917..598000d5b 100644 --- a/packages/sqle/src/locale/en-US/sqlManagement.ts +++ b/packages/sqle/src/locale/en-US/sqlManagement.ts @@ -64,6 +64,7 @@ export default { }, column: { SQLFingerprint: 'SQL fingerprint', + sqlId: 'SQL ID', source: 'Source', instanceName: 'DB instance', priority: 'Priority', diff --git a/packages/sqle/src/locale/zh-CN/sqlManagement.ts b/packages/sqle/src/locale/zh-CN/sqlManagement.ts index 336553ec7..8883eada6 100644 --- a/packages/sqle/src/locale/zh-CN/sqlManagement.ts +++ b/packages/sqle/src/locale/zh-CN/sqlManagement.ts @@ -67,6 +67,7 @@ export default { }, column: { SQLFingerprint: 'SQL指纹', + sqlId: 'SQL ID', source: '来源', instanceName: '数据源', priority: '优先级', diff --git a/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/__snapshots__/index.test.tsx.snap b/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/__snapshots__/index.test.tsx.snap index 0889d6cc1..ad223162d 100644 --- a/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/__snapshots__/index.test.tsx.snap +++ b/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/__snapshots__/index.test.tsx.snap @@ -827,7 +827,7 @@ exports[`page/SqlManagement/SQLEEIndex filter data with rule name 1`] = `
+
+ + + SQL ID + + + +
ActiontechTableFilterMeta< filterLabel: t('sqlManagement.table.filter.rule'), checked: false } + ], + [ + 'fuzzy_search_id', + { + filterCustomType: 'input', + filterKey: 'fuzzy_search_id', + filterLabel: t('sqlManagement.table.column.sqlId'), + checked: false + } ] ]); }; @@ -231,6 +241,18 @@ const SqlManagementColumn: ( ); } }, + { + className: 'ellipsis-column-width', + dataIndex: 'id', + key: 'id', + width: 200, + title: () => t('sqlManagement.table.column.sqlId'), + show: false, + render: (id) => { + if (id === undefined || id === null) return null; + return ; + } + }, { dataIndex: 'sql', className: 'ellipsis-column-width', diff --git a/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/exportColumnKeys.ts b/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/exportColumnKeys.ts index 1b2204727..5ac95d0c4 100644 --- a/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/exportColumnKeys.ts +++ b/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/exportColumnKeys.ts @@ -13,6 +13,7 @@ const OBJECT_NAME_EXPORT_KEY = 'object_name'; const SQL_MANAGEMENT_EXPORT_COLUMN_KEYS = [ 'sql_fingerprint', + 'id', 'sql', 'source', AUDIT_LEVEL_EXPORT_KEY, diff --git a/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/index.tsx b/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/index.tsx index 4a937f0fa..6f292d482 100644 --- a/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/index.tsx +++ b/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/index.tsx @@ -400,6 +400,12 @@ const SQLEEIndex = () => { ) { delete staticFilters.filter_schema_name; } + if ( + staticFilters.fuzzy_search_id === '' || + staticFilters.fuzzy_search_id === undefined + ) { + delete staticFilters.fuzzy_search_id; + } const isParseFailedRuleSelected = filter_rule_name === PARSE_FAILED_RULE_SELECT_VALUE; diff --git a/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/sourceExtra.data.ts b/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/sourceExtra.data.ts index 2032524cc..2a333ba8e 100644 --- a/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/sourceExtra.data.ts +++ b/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/sourceExtra.data.ts @@ -37,6 +37,7 @@ export const SQL_MANAGE_STATIC_FILTER_KEYS = [ 'filter_status', 'filter_db_type', 'fuzzy_search_sql_fingerprint', + 'fuzzy_search_id', 'fuzzy_search_endpoint', 'fuzzy_search_schema_name' ] as const; From 50f63820df57a92735b23f0d6b9077447cd17045 Mon Sep 17 00:00:00 2001 From: actiontech-zihan Date: Thu, 17 Sep 2026 18:50:34 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat(SqlManagementConf):=20=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E8=AF=A6=E6=83=85=20SQL=20ID=20=E5=88=97=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 对齐管控页，fieldName=id 时 show=false。 Co-authored-by: Cursor --- .../SqlManagementConf/Detail/ScanTypeSqlCollection/index.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/sqle/src/page/SqlManagementConf/Detail/ScanTypeSqlCollection/index.tsx b/packages/sqle/src/page/SqlManagementConf/Detail/ScanTypeSqlCollection/index.tsx index 6f517b438..014a8f8c2 100644 --- a/packages/sqle/src/page/SqlManagementConf/Detail/ScanTypeSqlCollection/index.tsx +++ b/packages/sqle/src/page/SqlManagementConf/Detail/ScanTypeSqlCollection/index.tsx @@ -653,9 +653,11 @@ const ScanTypeSqlCollection: React.FC = ({ ? 320 : DEFAULT_SCAN_SQL_COLUMN_WIDTH); + // SQL ID（主键 id）：与管控页同口径，默认不勾选（清本地设置后 cur.show ?? true 不会误展示） return { ...column, - width + width, + ...(fieldName === 'id' ? { show: false as const } : {}) }; }); }, [ From 59a5ecf1d34440ccf03ebfe346f1273be5f1457f Mon Sep 17 00:00:00 2001 From: actiontech-zihan Date: Thu, 17 Sep 2026 18:50:34 +0800 Subject: [PATCH 3/3] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=20UI=5FVERSION?= =?UTF-8?q?=20=E8=87=B3=E6=9C=AC=E7=89=B9=E6=80=A7=E5=88=86=E6=94=AF=20tip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Cursor --- .../test/__snapshots__/BasicVersionModal.test.tsx.snap | 4 ++-- .../VersionModal/test/__snapshots__/index.ce.test.tsx.snap | 4 ++-- .../Modal/VersionModal/test/__snapshots__/index.test.tsx.snap | 4 ++-- packages/base/src/scripts/version.ts | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/base/src/page/Nav/SideMenu/UserMenu/Modal/VersionModal/test/__snapshots__/BasicVersionModal.test.tsx.snap b/packages/base/src/page/Nav/SideMenu/UserMenu/Modal/VersionModal/test/__snapshots__/BasicVersionModal.test.tsx.snap index 83d8bea49..fe2056f48 100644 --- a/packages/base/src/page/Nav/SideMenu/UserMenu/Modal/VersionModal/test/__snapshots__/BasicVersionModal.test.tsx.snap +++ b/packages/base/src/page/Nav/SideMenu/UserMenu/Modal/VersionModal/test/__snapshots__/BasicVersionModal.test.tsx.snap @@ -110,7 +110,7 @@ exports[`base/Nav/SideMenu/UserMenu/BasicVersionModal render snap when open is t class="ant-typography css-dev-only-do-not-override-txh9fw" > UI: - dev-zjrc-scan-collect-audit-lb-v3 0da534e4f + dev-zjrc-sql-fingerprint-id-filter 93c9fa7e2
UI: - dev-zjrc-scan-collect-audit-lb-v3 0da534e4f + dev-zjrc-sql-fingerprint-id-filter 93c9fa7e2
UI: - dev-zjrc-scan-collect-audit-lb-v3 0da534e4f + dev-zjrc-sql-fingerprint-id-filter 93c9fa7e2
UI: - dev-zjrc-scan-collect-audit-lb-v3 0da534e4f + dev-zjrc-sql-fingerprint-id-filter 93c9fa7e2
UI: - dev-zjrc-scan-collect-audit-lb-v3 0da534e4f + dev-zjrc-sql-fingerprint-id-filter 93c9fa7e2
UI: - dev-zjrc-scan-collect-audit-lb-v3 0da534e4f + dev-zjrc-sql-fingerprint-id-filter 93c9fa7e2