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
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;
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 } : {})
};
});
}, [