+
+ |
+
+
+
+ |
+
+
+
+
+ |
+
+
+
+
+ |
+
@@ -784,50 +852,9 @@ exports[`base/Member should update content when change segmented value 1`] = `
colspan="3"
>
+ class="ant-table-expanded-row-fixed"
+ style="width: 0px; position: sticky; left: 0px; overflow: hidden;"
+ />
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 eb95d52539..83d8bea499 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:
- dms-ui/feat-3127 9e4430d27
+ dev-zjrc-scan-collect-audit-lb-v3 0da534e4f
UI:
- dms-ui/feat-3127 9e4430d27
+ dev-zjrc-scan-collect-audit-lb-v3 0da534e4f
UI:
- dms-ui/feat-3127 9e4430d27
+ dev-zjrc-scan-collect-audit-lb-v3 0da534e4f
社区版
@@ -499,7 +499,7 @@ exports[`base/Nav/SideMenu/UserMenu/VersionModal-ce render snap when open is tru
class="ant-space-item"
>
专业版
@@ -789,7 +789,7 @@ exports[`base/Nav/SideMenu/UserMenu/VersionModal-ce render snap when open is tru
class="ant-space-item"
>
企业版
@@ -1312,7 +1312,7 @@ exports[`base/Nav/SideMenu/UserMenu/VersionModal-ce render snap when open is tru
class="ant-typography css-dev-only-do-not-override-txh9fw"
>
UI:
- dms-ui/feat-3127 9e4430d27
+ dev-zjrc-scan-collect-audit-lb-v3 0da534e4f
社区版
@@ -1701,7 +1701,7 @@ exports[`base/Nav/SideMenu/UserMenu/VersionModal-ce render snap when open is tru
class="ant-space-item"
>
专业版
@@ -1991,7 +1991,7 @@ exports[`base/Nav/SideMenu/UserMenu/VersionModal-ce render snap when open is tru
class="ant-space-item"
>
企业版
diff --git a/packages/base/src/page/Nav/SideMenu/UserMenu/Modal/VersionModal/test/__snapshots__/index.test.tsx.snap b/packages/base/src/page/Nav/SideMenu/UserMenu/Modal/VersionModal/test/__snapshots__/index.test.tsx.snap
index 9451297cd7..4314530446 100644
--- a/packages/base/src/page/Nav/SideMenu/UserMenu/Modal/VersionModal/test/__snapshots__/index.test.tsx.snap
+++ b/packages/base/src/page/Nav/SideMenu/UserMenu/Modal/VersionModal/test/__snapshots__/index.test.tsx.snap
@@ -110,7 +110,7 @@ exports[`base/Nav/SideMenu/UserMenu/VersionModal-ee render snap when open is tru
class="ant-typography css-dev-only-do-not-override-txh9fw"
>
UI:
- dms-ui/feat-3127 9e4430d27
+ dev-zjrc-scan-collect-audit-lb-v3 0da534e4f
UI:
- dms-ui/feat-3127 9e4430d27
+ dev-zjrc-scan-collect-audit-lb-v3 0da534e4f
business1
@@ -847,7 +847,7 @@ exports[`base/Project/Import render upload file 1`] = `
style="margin-right: 8px; padding-bottom: 8px;"
>
business2
@@ -857,7 +857,7 @@ exports[`base/Project/Import render upload file 1`] = `
style="padding-bottom: 8px;"
>
business3
@@ -891,7 +891,7 @@ exports[`base/Project/Import render upload file 1`] = `
style="padding-bottom: 8px;"
>
business1
diff --git a/packages/base/src/page/Project/List/__snapshots__/index.test.tsx.snap b/packages/base/src/page/Project/List/__snapshots__/index.test.tsx.snap
index 3e97f4b956..e767ac84b1 100644
--- a/packages/base/src/page/Project/List/__snapshots__/index.test.tsx.snap
+++ b/packages/base/src/page/Project/List/__snapshots__/index.test.tsx.snap
@@ -578,7 +578,7 @@ exports[`test base/project/list should be get data from the request to render th
class="ant-space-item"
>
business1
@@ -786,7 +786,7 @@ exports[`test base/project/list should be get data from the request to render th
style="margin-right: 8px;"
>
business1
diff --git a/packages/base/src/page/Project/__snapshots__/index.test.tsx.snap b/packages/base/src/page/Project/__snapshots__/index.test.tsx.snap
index 428d225cf0..7214141c1e 100644
--- a/packages/base/src/page/Project/__snapshots__/index.test.tsx.snap
+++ b/packages/base/src/page/Project/__snapshots__/index.test.tsx.snap
@@ -810,7 +810,7 @@ exports[`test base/page/project should match snapshot 2`] = `
class="ant-space-item"
>
business1
@@ -1018,7 +1018,7 @@ exports[`test base/page/project should match snapshot 2`] = `
style="margin-right: 8px;"
>
business1
diff --git a/packages/base/src/page/SyncDataSource/List/__snapshots__/index.test.tsx.snap b/packages/base/src/page/SyncDataSource/List/__snapshots__/index.test.tsx.snap
index d0d73908c1..48a4d86fcc 100644
--- a/packages/base/src/page/SyncDataSource/List/__snapshots__/index.test.tsx.snap
+++ b/packages/base/src/page/SyncDataSource/List/__snapshots__/index.test.tsx.snap
@@ -203,7 +203,7 @@ exports[`page/SyncDataSource/SyncTaskList render list action when no permission
class="ant-space-item"
>
成功
@@ -286,7 +286,7 @@ exports[`page/SyncDataSource/SyncTaskList render list action when no permission
class="ant-space-item"
>
成功
@@ -744,7 +744,7 @@ exports[`page/SyncDataSource/SyncTaskList render list snap 2`] = `
class="ant-space-item"
>
成功
@@ -854,7 +854,7 @@ exports[`page/SyncDataSource/SyncTaskList render list snap 2`] = `
class="ant-space-item"
>
成功
diff --git a/packages/base/src/page/SyncDataSource/__snapshots__/index.ce.test.tsx.snap b/packages/base/src/page/SyncDataSource/__snapshots__/index.ce.test.tsx.snap
index 74c3be7539..62371a78d9 100644
--- a/packages/base/src/page/SyncDataSource/__snapshots__/index.ce.test.tsx.snap
+++ b/packages/base/src/page/SyncDataSource/__snapshots__/index.ce.test.tsx.snap
@@ -51,7 +51,7 @@ exports[`base/page/SyncDataSource-ce render index page 1`] = `
class="ant-space-item"
>
社区版
@@ -341,7 +341,7 @@ exports[`base/page/SyncDataSource-ce render index page 1`] = `
class="ant-space-item"
>
专业版
@@ -631,7 +631,7 @@ exports[`base/page/SyncDataSource-ce render index page 1`] = `
class="ant-space-item"
>
企业版
diff --git a/packages/base/src/page/System/LoginConnection/Oauth/__snapshots__/index.ce.test.tsx.snap b/packages/base/src/page/System/LoginConnection/Oauth/__snapshots__/index.ce.test.tsx.snap
index 3d5bc67de5..9ee94f6d27 100644
--- a/packages/base/src/page/System/LoginConnection/Oauth/__snapshots__/index.ce.test.tsx.snap
+++ b/packages/base/src/page/System/LoginConnection/Oauth/__snapshots__/index.ce.test.tsx.snap
@@ -56,7 +56,7 @@ exports[`base/System/LoginConnection/Oauth-ce render snap 1`] = `
class="ant-space-item"
>
社区版
@@ -346,7 +346,7 @@ exports[`base/System/LoginConnection/Oauth-ce render snap 1`] = `
class="ant-space-item"
>
专业版
@@ -636,7 +636,7 @@ exports[`base/System/LoginConnection/Oauth-ce render snap 1`] = `
class="ant-space-item"
>
企业版
diff --git a/packages/base/src/page/System/LoginConnection/__snapshots__/index.ce.test.tsx.snap b/packages/base/src/page/System/LoginConnection/__snapshots__/index.ce.test.tsx.snap
index fa39af5cb8..78e6ba16c8 100644
--- a/packages/base/src/page/System/LoginConnection/__snapshots__/index.ce.test.tsx.snap
+++ b/packages/base/src/page/System/LoginConnection/__snapshots__/index.ce.test.tsx.snap
@@ -695,7 +695,7 @@ exports[`base/System/LoginConnection-ce render snap 1`] = `
class="ant-space-item"
>
社区版
@@ -985,7 +985,7 @@ exports[`base/System/LoginConnection-ce render snap 1`] = `
class="ant-space-item"
>
专业版
@@ -1275,7 +1275,7 @@ exports[`base/System/LoginConnection-ce render snap 1`] = `
class="ant-space-item"
>
企业版
@@ -2500,7 +2500,7 @@ exports[`base/System/LoginConnection-ce render snap 2`] = `
class="ant-space-item"
>
社区版
@@ -2790,7 +2790,7 @@ exports[`base/System/LoginConnection-ce render snap 2`] = `
class="ant-space-item"
>
专业版
@@ -3080,7 +3080,7 @@ exports[`base/System/LoginConnection-ce render snap 2`] = `
class="ant-space-item"
>
企业版
diff --git a/packages/base/src/page/System/ProcessConnection/__snapshots__/index.ce.test.tsx.snap b/packages/base/src/page/System/ProcessConnection/__snapshots__/index.ce.test.tsx.snap
index 0853f6ae9a..294a51aa7c 100644
--- a/packages/base/src/page/System/ProcessConnection/__snapshots__/index.ce.test.tsx.snap
+++ b/packages/base/src/page/System/ProcessConnection/__snapshots__/index.ce.test.tsx.snap
@@ -63,7 +63,7 @@ exports[`base/System/ProcessConnection ce should match snap shots 1`] = `
class="ant-space-item"
>
社区版
@@ -353,7 +353,7 @@ exports[`base/System/ProcessConnection ce should match snap shots 1`] = `
class="ant-space-item"
>
专业版
@@ -643,7 +643,7 @@ exports[`base/System/ProcessConnection ce should match snap shots 1`] = `
class="ant-space-item"
>
企业版
diff --git a/packages/base/src/page/System/__snapshots__/index.ce.test.tsx.snap b/packages/base/src/page/System/__snapshots__/index.ce.test.tsx.snap
index 7194aba216..229b8e6bf2 100644
--- a/packages/base/src/page/System/__snapshots__/index.ce.test.tsx.snap
+++ b/packages/base/src/page/System/__snapshots__/index.ce.test.tsx.snap
@@ -4500,7 +4500,7 @@ exports[`base/System-ee render snap 3`] = `
class="ant-space-item"
>
社区版
@@ -4790,7 +4790,7 @@ exports[`base/System-ee render snap 3`] = `
class="ant-space-item"
>
专业版
@@ -5080,7 +5080,7 @@ exports[`base/System-ee render snap 3`] = `
class="ant-space-item"
>
企业版
diff --git a/packages/base/src/page/UserCenter/__tests__/__snapshots__/index.test.tsx.snap b/packages/base/src/page/UserCenter/__tests__/__snapshots__/index.test.tsx.snap
index 3df4ca310d..05c7174356 100644
--- a/packages/base/src/page/UserCenter/__tests__/__snapshots__/index.test.tsx.snap
+++ b/packages/base/src/page/UserCenter/__tests__/__snapshots__/index.test.tsx.snap
@@ -3048,7 +3048,7 @@ exports[`base/UserCenter switch to role list 1`] = `
style="padding-bottom: 8px;"
>
test1
diff --git a/packages/base/src/page/UserCenter/components/RoleList/__tests__/__snapshots__/RoleList.test.tsx.snap b/packages/base/src/page/UserCenter/components/RoleList/__tests__/__snapshots__/RoleList.test.tsx.snap
index 2978194c4d..6bdbef94ce 100644
--- a/packages/base/src/page/UserCenter/components/RoleList/__tests__/__snapshots__/RoleList.test.tsx.snap
+++ b/packages/base/src/page/UserCenter/components/RoleList/__tests__/__snapshots__/RoleList.test.tsx.snap
@@ -258,7 +258,7 @@ exports[`base/UserCenter/RoleList render role table 1`] = `
style="padding-bottom: 8px;"
>
test1
diff --git a/packages/base/src/scripts/version.ts b/packages/base/src/scripts/version.ts
index fa34b11d71..1aa2fcbb51 100644
--- a/packages/base/src/scripts/version.ts
+++ b/packages/base/src/scripts/version.ts
@@ -1 +1 @@
-export const UI_VERSION = 'dms-ui/feat-3127 9e4430d27';
+export const UI_VERSION = 'dev-zjrc-scan-collect-audit-lb-v3 0da534e4f';
diff --git a/packages/shared/lib/api/sqle/service/common.d.ts b/packages/shared/lib/api/sqle/service/common.d.ts
index 8b03d1d1f3..d15057cd21 100644
--- a/packages/shared/lib/api/sqle/service/common.d.ts
+++ b/packages/shared/lib/api/sqle/service/common.d.ts
@@ -24,9 +24,11 @@ import {
HighPriorityConditionTypeEnum,
HighPriorityConditionReqOperatorEnum,
InstanceAuditPlanInfoActiveStatusEnum,
+ InstanceAuditPlanInfoAuditStatusEnum,
+ InstanceAuditPlanInfoCollectionStatusEnum,
InstanceAuditPlanInfoLastCollectStatusEnum,
+ InstanceAuditPlanInfoLastAuditStatusEnum,
InstanceAuditPlanInfoNextCollectionModeEnum,
- InstanceAuditPlanInfoPipelineStatusEnum,
InstanceAuditPlanResV1ActiveStatusEnum,
MatchConditionReqV1TypeEnum,
OperationRecordListStatusEnum,
@@ -895,8 +897,12 @@ export interface IGetAuditPlanSQLDataResV1 {
data?: IAuditPlanSQLDataResV1;
+ has_pending_audit?: boolean;
+
message?: string;
+ pending_audit_count?: number;
+
total_nums?: number;
}
@@ -1443,8 +1449,12 @@ export interface IGetSqlManageListResp {
data?: ISqlManage[];
+ has_pending_audit?: boolean;
+
message?: string;
+ pending_audit_count?: number;
+
source_extra?: ISourceExtra;
sql_manage_bad_num?: number;
@@ -1737,10 +1747,24 @@ export interface IInstanceAuditPlanInfo {
audit_plan_type?: IAuditPlanTypeResBase;
+ audit_status?: InstanceAuditPlanInfoAuditStatusEnum | string;
+
+ can_trigger_collect?: boolean;
+
+ collection_status?: InstanceAuditPlanInfoCollectionStatusEnum | string;
+
exec_cmd?: string;
+ execution_node_address?: string | null;
+
id?: number;
+ last_audit_finished_at?: string | null;
+
+ last_audit_status?: InstanceAuditPlanInfoLastAuditStatusEnum | string | null;
+
+ last_audit_failure_msg?: string | null;
+
last_collection_time?: string;
last_collect_failure_msg?: string | null;
@@ -1760,7 +1784,11 @@ export interface IInstanceAuditPlanInfo {
next_collection_time?: string;
- pipeline_status?: InstanceAuditPlanInfoPipelineStatusEnum | string;
+ last_task_updated_at?: string | null;
+
+ pending_audit_count?: number;
+
+ task_running?: boolean;
total_sql_nums?: number;
diff --git a/packages/shared/lib/api/sqle/service/common.enum.ts b/packages/shared/lib/api/sqle/service/common.enum.ts
index 34bd405baa..c86fd54c0f 100644
--- a/packages/shared/lib/api/sqle/service/common.enum.ts
+++ b/packages/shared/lib/api/sqle/service/common.enum.ts
@@ -240,10 +240,14 @@ export enum InstanceAuditPlanInfoActiveStatusEnum {
disabled = 'disabled'
}
-export enum InstanceAuditPlanInfoPipelineStatusEnum {
+export enum InstanceAuditPlanInfoCollectionStatusEnum {
idle = 'idle',
- collecting = 'collecting',
+ collecting = 'collecting'
+}
+
+export enum InstanceAuditPlanInfoAuditStatusEnum {
+ idle = 'idle',
pending_audit = 'pending_audit',
@@ -266,6 +270,14 @@ export enum InstanceAuditPlanInfoLastCollectStatusEnum {
failed = 'failed'
}
+export enum InstanceAuditPlanInfoLastAuditStatusEnum {
+ success = 'success',
+
+ partial_failed = 'partial_failed',
+
+ failed = 'failed'
+}
+
export enum InstanceAuditPlanResV1ActiveStatusEnum {
normal = 'normal',
@@ -345,7 +357,9 @@ export enum ScheduleTaskDefaultOptionDefaultSelectorEnum {
}
export enum SqlManageAuditStatusEnum {
- being_audited = 'being_audited'
+ pending = 'pending',
+
+ audited = 'audited'
}
export enum SqlManageStatusEnum {
diff --git a/packages/shared/lib/api/sqle/service/instance_audit_plan/index.d.ts b/packages/shared/lib/api/sqle/service/instance_audit_plan/index.d.ts
index 3447bd25dd..933153173f 100644
--- a/packages/shared/lib/api/sqle/service/instance_audit_plan/index.d.ts
+++ b/packages/shared/lib/api/sqle/service/instance_audit_plan/index.d.ts
@@ -134,7 +134,7 @@ export interface ITriggerAuditPlanCollectV1Params {
export interface ITriggerAuditPlanCollectResData {
audit_plan_id?: number;
- pipeline_status?: string;
+ collection_status?: string;
}
export interface ITriggerAuditPlanCollectV1Return extends IBaseRes {
diff --git a/packages/shared/lib/components/ActiontechTable/Table.tsx b/packages/shared/lib/components/ActiontechTable/Table.tsx
index 94efc0d770..6194da016b 100644
--- a/packages/shared/lib/components/ActiontechTable/Table.tsx
+++ b/packages/shared/lib/components/ActiontechTable/Table.tsx
@@ -8,7 +8,14 @@ import useTableAction, {
ACTIONTECH_TABLE_OPERATOR_COLUMN_DATA_INDEX
} from './hooks/useTableAction';
import classnames from 'classnames';
-import { useEffect, useMemo } from 'react';
+import {
+ useCallback,
+ useEffect,
+ useLayoutEffect,
+ useMemo,
+ useRef,
+ useState
+} from 'react';
import useTableSettings from './hooks/useTableSettings';
const ActiontechTable = <
@@ -23,9 +30,14 @@ const ActiontechTable = <
columns = [],
isPaginationFixed = true,
disableRowHover = false,
+ enableBodyScrollY = false,
+ scroll,
...props
}: ActiontechTableProps) => {
const { t } = useTranslation();
+ const tableContainerRef = useRef(null);
+ const [bodyScrollY, setBodyScrollY] = useState();
+ const hasPagination = !!props.pagination;
const setting = props.setting ?? (toolbar && toolbar.setting);
const { tableName = '', username = '' } = setting || {};
@@ -65,6 +77,103 @@ const ActiontechTable = <
catchDefaultColumnsInfo(mergerColumns);
}
}, [catchDefaultColumnsInfo, mergerColumns, tableName, username]);
+
+ const measureBodyScrollY = useCallback(() => {
+ if (!enableBodyScrollY || !tableContainerRef.current) {
+ setBodyScrollY(undefined);
+ return;
+ }
+ const container = tableContainerRef.current;
+ const tableHeader = container.querySelector('.ant-table-thead');
+ const pagination = container.querySelector('.ant-table-pagination');
+ const containerTop = container.getBoundingClientRect().top;
+ const headerHeight = tableHeader?.getBoundingClientRect().height ?? 40;
+ const paginationHeight =
+ hasPagination && isPaginationFixed
+ ? pagination?.getBoundingClientRect().height ?? 60
+ : 0;
+ const nextBodyScrollY = Math.max(
+ 120,
+ Math.floor(
+ window.innerHeight - containerTop - headerHeight - paginationHeight
+ )
+ );
+ setBodyScrollY((previous) =>
+ previous === nextBodyScrollY ? previous : nextBodyScrollY
+ );
+ }, [enableBodyScrollY, hasPagination, isPaginationFixed]);
+
+ useLayoutEffect(() => {
+ measureBodyScrollY();
+ });
+
+ useEffect(() => {
+ if (!enableBodyScrollY || !tableContainerRef.current) {
+ return;
+ }
+ const observedElements: Element[] = [];
+ let element: Element | null = tableContainerRef.current;
+ while (element && observedElements.length < 4) {
+ observedElements.push(element);
+ element = element.parentElement;
+ }
+ window.addEventListener('resize', measureBodyScrollY);
+ const resizeObserver =
+ typeof ResizeObserver !== 'undefined'
+ ? new ResizeObserver(measureBodyScrollY)
+ : null;
+ if (resizeObserver) {
+ observedElements.forEach((item) => resizeObserver.observe(item));
+ }
+ return () => {
+ resizeObserver?.disconnect();
+ window.removeEventListener('resize', measureBodyScrollY);
+ };
+ }, [enableBodyScrollY, measureBodyScrollY]);
+
+ const tableNode = (
+
+ ) : undefined
+ }}
+ {...props}
+ scroll={{
+ x: 'max-content',
+ ...scroll,
+ ...(enableBodyScrollY && bodyScrollY ? { y: bodyScrollY } : {})
+ }}
+ columns={innerColumns}
+ pagination={
+ !props.pagination
+ ? false
+ : {
+ defaultPageSize: 20,
+ showSizeChanger: true,
+ showTotal: (total) => (
+
+ {t('common.actiontechTable.pagination.total', {
+ total
+ })}
+
+ ),
+ className: classnames('actiontech-table-pagination', {
+ 'actiontech-table-pagination-fixed': isPaginationFixed
+ }),
+ ...props.pagination
+ }
+ }
+ />
+ );
+
return (
<>
{toolbar && (
@@ -76,44 +185,11 @@ const ActiontechTable = <
{!!filterContainerProps && }
-
- ) : undefined
- }}
- scroll={{
- x: 'max-content'
- }}
- {...props}
- columns={innerColumns}
- pagination={
- !props.pagination
- ? false
- : {
- defaultPageSize: 20,
- showSizeChanger: true,
- showTotal: (total) => (
-
- {t('common.actiontechTable.pagination.total', {
- total
- })}
-
- ),
- className: classnames('actiontech-table-pagination', {
- 'actiontech-table-pagination-fixed': isPaginationFixed
- }),
- ...props.pagination
- }
- }
- />
+ {enableBodyScrollY ? (
+ {tableNode}
+ ) : (
+ tableNode
+ )}
);
diff --git a/packages/shared/lib/components/ActiontechTable/index.type.ts b/packages/shared/lib/components/ActiontechTable/index.type.ts
index ad533bcdd6..1156b141a1 100644
--- a/packages/shared/lib/components/ActiontechTable/index.type.ts
+++ b/packages/shared/lib/components/ActiontechTable/index.type.ts
@@ -421,4 +421,10 @@ export interface ActiontechTableProps<
* 禁用表格行 hover 时的背景色变化（sticky 操作列场景下避免左侧内容透出）
*/
disableRowHover?: boolean;
+
+ /**
+ * 将表体限制在当前视口内，使原生横向滚动条保持在固定分页器上方。
+ * 默认关闭，仅供需要固定横向滚动条的页面选择开启。
+ */
+ enableBodyScrollY?: boolean;
}
diff --git a/packages/shared/lib/components/BasicTag/__snapshots__/index.test.tsx.snap b/packages/shared/lib/components/BasicTag/__snapshots__/index.test.tsx.snap
index c63c0d5cc4..9aec5bd199 100644
--- a/packages/shared/lib/components/BasicTag/__snapshots__/index.test.tsx.snap
+++ b/packages/shared/lib/components/BasicTag/__snapshots__/index.test.tsx.snap
@@ -4,7 +4,7 @@ exports[`lib/BasicTag render diff color tag 1`] = `
@@ -14,12 +14,12 @@ exports[`lib/BasicTag render diff color tag 2`] = `
@@ -29,17 +29,17 @@ exports[`lib/BasicTag render diff color tag 3`] = `
@@ -49,22 +49,22 @@ exports[`lib/BasicTag render diff color tag 4`] = `
@@ -74,27 +74,27 @@ exports[`lib/BasicTag render diff color tag 5`] = `
@@ -104,32 +104,32 @@ exports[`lib/BasicTag render diff color tag 6`] = `
@@ -139,37 +139,37 @@ exports[`lib/BasicTag render diff color tag 7`] = `
@@ -179,42 +179,42 @@ exports[`lib/BasicTag render diff color tag 8`] = `
@@ -224,47 +224,47 @@ exports[`lib/BasicTag render diff color tag 9`] = `
@@ -274,52 +274,52 @@ exports[`lib/BasicTag render diff color tag 10`] = `
@@ -329,57 +329,57 @@ exports[`lib/BasicTag render diff color tag 11`] = `
@@ -389,62 +389,62 @@ exports[`lib/BasicTag render diff color tag 12`] = `
@@ -455,7 +455,7 @@ exports[`lib/BasicTag render diff size tag 1`] = `
@@ -465,12 +465,12 @@ exports[`lib/BasicTag render diff size tag 2`] = `
@@ -480,17 +480,17 @@ exports[`lib/BasicTag render diff size tag 3`] = `
diff --git a/packages/shared/lib/components/BasicTag/style.ts b/packages/shared/lib/components/BasicTag/style.ts
index 4e535eaeed..7336b68df9 100644
--- a/packages/shared/lib/components/BasicTag/style.ts
+++ b/packages/shared/lib/components/BasicTag/style.ts
@@ -10,6 +10,7 @@ export const BasicTagStyleWrapper = styled(Tag)<{ color: BasicTagColor }>`
padding: 0 8px 0 6px;
align-items: center;
border-radius: 4px;
+ width: max-content;
svg:first-of-type {
margin-right: 6px;
diff --git a/packages/shared/lib/components/EnterpriseFeatureDisplay/__snapshots__/ce.test.tsx.snap b/packages/shared/lib/components/EnterpriseFeatureDisplay/__snapshots__/ce.test.tsx.snap
index f7382d3a9a..e7f3ea374e 100644
--- a/packages/shared/lib/components/EnterpriseFeatureDisplay/__snapshots__/ce.test.tsx.snap
+++ b/packages/shared/lib/components/EnterpriseFeatureDisplay/__snapshots__/ce.test.tsx.snap
@@ -44,7 +44,7 @@ exports[`test ce EnterpriseFeatureDisplay should match snapshot 1`] = `
class="ant-space-item"
>
社区版
@@ -334,7 +334,7 @@ exports[`test ce EnterpriseFeatureDisplay should match snapshot 1`] = `
class="ant-space-item"
>
专业版
@@ -624,7 +624,7 @@ exports[`test ce EnterpriseFeatureDisplay should match snapshot 1`] = `
class="ant-space-item"
>
企业版
@@ -1224,7 +1224,7 @@ exports[`test ce EnterpriseFeatureDisplay should match snapshot when isConfigPag
class="ant-space-item"
>
社区版
@@ -1514,7 +1514,7 @@ exports[`test ce EnterpriseFeatureDisplay should match snapshot when isConfigPag
class="ant-space-item"
>
专业版
@@ -1804,7 +1804,7 @@ exports[`test ce EnterpriseFeatureDisplay should match snapshot when isConfigPag
class="ant-space-item"
>
企业版
diff --git a/packages/shared/lib/components/EnterpriseFeatureDisplay/components/test/__snapshots__/VersionComparison.test.tsx.snap b/packages/shared/lib/components/EnterpriseFeatureDisplay/components/test/__snapshots__/VersionComparison.test.tsx.snap
index c6344529fd..64e591064d 100644
--- a/packages/shared/lib/components/EnterpriseFeatureDisplay/components/test/__snapshots__/VersionComparison.test.tsx.snap
+++ b/packages/shared/lib/components/EnterpriseFeatureDisplay/components/test/__snapshots__/VersionComparison.test.tsx.snap
@@ -26,7 +26,7 @@ exports[`shared/EnterpriseFeatureDisplay/VersionComparison should match snapshot
class="ant-space-item"
>
社区版
@@ -316,7 +316,7 @@ exports[`shared/EnterpriseFeatureDisplay/VersionComparison should match snapshot
class="ant-space-item"
>
专业版
@@ -606,7 +606,7 @@ exports[`shared/EnterpriseFeatureDisplay/VersionComparison should match snapshot
class="ant-space-item"
>
企业版
diff --git a/packages/sqle/src/components/AuditResultMessage/AuditLevelIcon.tsx b/packages/sqle/src/components/AuditResultMessage/AuditLevelIcon.tsx
index f199c5ca18..08133b73bc 100644
--- a/packages/sqle/src/components/AuditResultMessage/AuditLevelIcon.tsx
+++ b/packages/sqle/src/components/AuditResultMessage/AuditLevelIcon.tsx
@@ -3,17 +3,19 @@ import { Space } from 'antd';
import {
WarningFilled,
InfoHexagonFilled,
- CloseCircleFilled
+ CloseCircleFilled,
+ ProfileSquareFilled
} from '@actiontech/icons';
-/** 与 AuditLevelSummary / 列表「当前审核结果」列同源 */
+/** 与 AuditLevelSummary / 列表「当前审核结果」列 / 规则列表 level-icon 同源 */
export const AUDIT_LEVEL_ICON_MAP: Record<
string,
FC<{ width?: number; height?: number }>
> = {
error: CloseCircleFilled,
warn: WarningFilled,
- notice: InfoHexagonFilled
+ notice: InfoHexagonFilled,
+ normal: ProfileSquareFilled
};
export type AuditLevelIconProps = {
diff --git a/packages/sqle/src/components/ReportDrawer/__tests__/__snapshots__/index.test.tsx.snap b/packages/sqle/src/components/ReportDrawer/__tests__/__snapshots__/index.test.tsx.snap
index b02a5fa3ed..cf92a6e455 100644
--- a/packages/sqle/src/components/ReportDrawer/__tests__/__snapshots__/index.test.tsx.snap
+++ b/packages/sqle/src/components/ReportDrawer/__tests__/__snapshots__/index.test.tsx.snap
@@ -600,7 +600,7 @@ exports[`sqle/components/ReportDrawer render snap when has delete rule 1`] = `
style="margin-right: 8px;"
>