onOpenDrawer(record)}
diff --git a/packages/sqle/src/page/RuleTemplate/RuleTemplateList/columns.tsx b/packages/sqle/src/page/RuleTemplate/RuleTemplateList/columns.tsx
index a99c1e2fe..08f59878f 100644
--- a/packages/sqle/src/page/RuleTemplate/RuleTemplateList/columns.tsx
+++ b/packages/sqle/src/page/RuleTemplate/RuleTemplateList/columns.tsx
@@ -118,7 +118,7 @@ export const RuleTemplateTableColumn: (
{
dataIndex: 'rule_template_name',
title: () => t('ruleTemplate.ruleTemplateList.table.templateName'),
- render(name: string, record) {
+ render(name, record) {
if (!name) {
return '';
}
@@ -141,7 +141,7 @@ export const RuleTemplateTableColumn: (
dataIndex: 'desc',
title: () => t('ruleTemplate.ruleTemplateList.table.desc'),
className: 'ellipsis-column-width',
- render: (desc: string) => {
+ render: (desc) => {
if (!desc) return '-';
return
;
}
@@ -149,7 +149,7 @@ export const RuleTemplateTableColumn: (
{
dataIndex: 'db_type',
title: () => t('ruleTemplate.ruleTemplateList.table.dbType'),
- render(type: string) {
+ render(type) {
if (!type) {
return '-';
}
diff --git a/packages/sqle/src/page/SqlExecWorkflow/Common/AuditResultList/Table/column.tsx b/packages/sqle/src/page/SqlExecWorkflow/Common/AuditResultList/Table/column.tsx
index 35c99a118..13cd83f0a 100644
--- a/packages/sqle/src/page/SqlExecWorkflow/Common/AuditResultList/Table/column.tsx
+++ b/packages/sqle/src/page/SqlExecWorkflow/Common/AuditResultList/Table/column.tsx
@@ -1,7 +1,4 @@
-import {
- IAuditResult,
- IAuditTaskSQLResV2
-} from '@actiontech/shared/lib/api/sqle/service/common';
+import { IAuditTaskSQLResV2 } from '@actiontech/shared/lib/api/sqle/service/common';
import {
ActiontechTableActionMeta,
ActiontechTableColumn
@@ -42,7 +39,7 @@ export const AuditResultForCreateWorkflowColumn = (
dataIndex: 'audit_result',
title: () => t('execWorkflow.audit.table.auditResult'),
className: 'audit-result-column',
- render: (result: IAuditResult[], record) => {
+ render: (result = [], record) => {
return (
onClickAuditResult(record)}>
{result?.length > 1 ? (
@@ -66,7 +63,7 @@ export const AuditResultForCreateWorkflowColumn = (
dataIndex: 'description',
title: () => t('execWorkflow.audit.table.describe'),
className: 'audit-result-describe-column',
- render: (description: string, record) => {
+ render: (description, record) => {
return (
);
}
diff --git a/packages/sqle/src/page/SqlExecWorkflow/Detail/components/AuditExecResultPanel/OverviewList/column.tsx b/packages/sqle/src/page/SqlExecWorkflow/Detail/components/AuditExecResultPanel/OverviewList/column.tsx
index de326b351..674ef03d8 100644
--- a/packages/sqle/src/page/SqlExecWorkflow/Detail/components/AuditExecResultPanel/OverviewList/column.tsx
+++ b/packages/sqle/src/page/SqlExecWorkflow/Detail/components/AuditExecResultPanel/OverviewList/column.tsx
@@ -224,9 +224,7 @@ export const auditResultOverviewColumn: () => ActiontechTableColumn
t('execWorkflow.detail.overview.table.status'),
- render: (status: GetWorkflowTasksItemV2StatusEnum) => (
-
- )
+ render: (status) =>
},
{
dataIndex: 'task_pass_rate',
@@ -242,7 +240,7 @@ export const auditResultOverviewColumn: () => ActiontechTableColumn t('execWorkflow.detail.overview.table.assigneeUserName'),
- render: (list: string[]) => {
+ render: (list) => {
return list?.map((v) => {
return ;
});
diff --git a/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/column.tsx b/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/column.tsx
index ceb098321..4c600ee4d 100644
--- a/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/column.tsx
+++ b/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/column.tsx
@@ -8,14 +8,9 @@ import {
} from '@actiontech/shared/lib/components/ActiontechTable';
import { ModalName } from '../../../../data/ModalName';
import { IGetSqlManageListV2Params } from '@actiontech/shared/lib/api/sqle/service/SqlManage/index.d';
-import {
- IAuditResult,
- ISource,
- ISqlManage
-} from '@actiontech/shared/lib/api/sqle/service/common';
+import { ISqlManage } from '@actiontech/shared/lib/api/sqle/service/common';
import ResultIconRender from '../../../../components/AuditResultMessage/ResultIconRender';
import AuditResultMessage from '../../../../components/AuditResultMessage';
-import { SqlManageStatusEnum } from '@actiontech/shared/lib/api/sqle/service/common.enum';
import { Link } from 'react-router-dom';
import { AvatarCom, EditText, SQLRenderer } from '@actiontech/shared';
import { tooltipsCommonProps } from '@actiontech/shared/lib/components/BasicToolTips';
@@ -208,7 +203,7 @@ const SqlManagementColumn: (
{
dataIndex: 'source',
title: () => t('sqlManagement.table.column.source'),
- render: (source: ISource) => {
+ render: (source) => {
//todo 本期只支持跳转至 sql管控配置,后续调整
if (source && source.sql_source_id && source.sql_source_type) {
return (
@@ -226,7 +221,7 @@ const SqlManagementColumn: (
dataIndex: 'audit_result',
width: 200,
title: () => t('sqlManagement.table.column.auditResult'),
- render: (result: IAuditResult[], record) => {
+ render: (result = [], record) => {
return (
@@ -268,7 +263,7 @@ const SqlManagementColumn: (
{
dataIndex: 'priority',
title: () => t('sqlManagement.table.column.priority'),
- render: (priority: ISqlManage['priority']) => {
+ render: (priority) => {
if (priority === 'high') {
return t('sqlManagement.table.column.highPriority');
}
@@ -308,7 +303,7 @@ const SqlManagementColumn: (
dataIndex: 'assignees',
title: () => t('sqlManagement.table.column.personInCharge'),
width: 200,
- render: (assignees: string[]) => {
+ render: (assignees) => {
if (!Array.isArray(assignees)) {
return '-';
}
@@ -327,7 +322,7 @@ const SqlManagementColumn: (
{
dataIndex: 'endpoints',
title: () => t('sqlManagement.table.column.endpoints'),
- render: (endpoints: ISqlManage['endpoints']) => {
+ render: (endpoints) => {
if (!endpoints) {
return '-';
}
@@ -338,7 +333,7 @@ const SqlManagementColumn: (
{
dataIndex: 'status',
title: () => t('sqlManagement.table.column.status'),
- render: (status: SqlManageStatusEnum) => {
+ render: (status) => {
if (!status) return '-';
return
;
}
@@ -347,12 +342,12 @@ const SqlManagementColumn: (
dataIndex: 'remark',
title: () => t('sqlManagement.table.column.comment'),
className: 'ellipsis-column-width',
- render: (remark: string, record) => {
+ render: (remark, record) => {
if (!hasPermissionAndNotArchive)
return remark ?
: '-';
return (
{
diff --git a/packages/sqle/src/page/SqlManagementConf/Detail/Overview/column.tsx b/packages/sqle/src/page/SqlManagementConf/Detail/Overview/column.tsx
index 0e3495894..557c59d96 100644
--- a/packages/sqle/src/page/SqlManagementConf/Detail/Overview/column.tsx
+++ b/packages/sqle/src/page/SqlManagementConf/Detail/Overview/column.tsx
@@ -4,11 +4,7 @@ import {
} from '@actiontech/shared/lib/components/ActiontechTable';
import { t } from '../../../../locale';
import { formatTime } from '@actiontech/shared/lib/utils/Common';
-import {
- IAuditPlanRuleTemplate,
- IAuditPlanTypeResBase,
- IInstanceAuditPlanInfo
-} from '@actiontech/shared/lib/api/sqle/service/common';
+import { IInstanceAuditPlanInfo } from '@actiontech/shared/lib/api/sqle/service/common';
import { TokenCom } from '@actiontech/shared';
import { InstanceAuditPlanInfoActiveStatusEnum } from '@actiontech/shared/lib/api/sqle/service/common.enum';
import { Link } from 'react-router-dom';
@@ -29,15 +25,22 @@ export const ConfDetailOverviewColumns: (
title: () => t('managementConf.detail.overview.column.auditPlanType'),
filterCustomType: 'select',
filterKey: 'filter_audit_plan_type',
- render: (data: IAuditPlanTypeResBase) => {
- return data.desc ? {data.desc} : '-';
+ render: (data) => {
+ return data?.desc ? (
+ {data.desc}
+ ) : (
+ '-'
+ );
}
},
{
dataIndex: 'audit_plan_rule_template',
title: () => t('managementConf.detail.overview.column.auditRuleTemplate'),
- render: (ruleTemplate: IAuditPlanRuleTemplate, record) => {
- const path = ruleTemplate.is_global_rule_template
+ render: (ruleTemplate, record) => {
+ if (!ruleTemplate?.name) {
+ return '-';
+ }
+ const path = ruleTemplate?.is_global_rule_template
? `/sqle/rule-manager/global-detail/${ruleTemplate.name}/${record.audit_plan_db_type}`
: `/sqle/project/${projectID}/rule/template/detail/${ruleTemplate.name}/${record.audit_plan_db_type}`;
@@ -57,7 +60,7 @@ export const ConfDetailOverviewColumns: (
{
dataIndex: 'active_status',
title: () => t('managementConf.detail.overview.column.status'),
- render: (status: InstanceAuditPlanInfoActiveStatusEnum) => {
+ render: (status) => {
if (status === InstanceAuditPlanInfoActiveStatusEnum.disabled) {
return (
@@ -109,7 +112,7 @@ export const ConfDetailOverviewColumns: (
dataIndex: 'last_collection_time',
title: () =>
t('managementConf.detail.overview.column.lastCollectionTime'),
- render: (time: string) => formatTime(time, '-')
+ render: (time) => formatTime(time, '-')
}
];
};
diff --git a/packages/sqle/src/page/SqlManagementConf/List/column.tsx b/packages/sqle/src/page/SqlManagementConf/List/column.tsx
index 145deb36f..7846ae157 100644
--- a/packages/sqle/src/page/SqlManagementConf/List/column.tsx
+++ b/packages/sqle/src/page/SqlManagementConf/List/column.tsx
@@ -8,10 +8,7 @@ import { t } from '../../../locale';
import { DatabaseTypeLogo } from '@actiontech/shared';
import { Typography } from 'antd';
import { Link } from 'react-router-dom';
-import {
- IAuditPlanTypeResBase,
- IInstanceAuditPlanResV1
-} from '@actiontech/shared/lib/api/sqle/service/common';
+import { IInstanceAuditPlanResV1 } from '@actiontech/shared/lib/api/sqle/service/common';
import { InstanceAuditPlanTableFilterParamType } from './index.type';
import { formatTime } from '@actiontech/shared/lib/utils/Common';
import {
@@ -52,7 +49,7 @@ export const SqlManagementConfColumns: (
{
dataIndex: 'instance_name',
title: () => t('managementConf.list.table.column.dbName'),
- render: (instanceName: string, record) => {
+ render: (instanceName, record) => {
return (
{instanceName ||
@@ -66,7 +63,7 @@ export const SqlManagementConfColumns: (
{
dataIndex: 'instance_type',
title: () => t('managementConf.list.table.column.dbType'),
- render(type: string) {
+ render(type) {
if (!type) {
return '-';
}
@@ -83,13 +80,13 @@ export const SqlManagementConfColumns: (
{
dataIndex: 'audit_plan_types',
title: () => t('managementConf.list.table.column.enabledScanTypes'),
- render: (scanTypes: IAuditPlanTypeResBase[], record) => {
+ render: (scanTypes, record) => {
return (
);
}
@@ -97,7 +94,7 @@ export const SqlManagementConfColumns: (
{
dataIndex: 'active_status',
title: () => t('managementConf.list.table.column.dbTaskStatus'),
- render: (status: InstanceAuditPlanResV1ActiveStatusEnum) => {
+ render: (status) => {
if (status === InstanceAuditPlanResV1ActiveStatusEnum.disabled) {
return (
@@ -129,7 +126,7 @@ export const SqlManagementConfColumns: (
{
dataIndex: 'create_time',
title: () => t('managementConf.list.table.column.createdAt'),
- render: (time: string) => {
+ render: (time) => {
return formatTime(time, '-');
}
},
diff --git a/packages/sqle/src/page/SqlOptimization/List/columns.tsx b/packages/sqle/src/page/SqlOptimization/List/columns.tsx
index 5c97063a1..447c39b40 100644
--- a/packages/sqle/src/page/SqlOptimization/List/columns.tsx
+++ b/packages/sqle/src/page/SqlOptimization/List/columns.tsx
@@ -41,7 +41,7 @@ export const SqlOptimizationListColumns: (
{
dataIndex: 'db_type',
title: () => t('sqlOptimization.table.dbType'),
- render: (dbType: string) => {
+ render: (dbType) => {
if (!dbType) return '-';
return (
@@ -56,6 +56,9 @@ export const SqlOptimizationListColumns: (
dataIndex: 'performance_gain',
title: () => t('sqlOptimization.table.performanceGain'),
render: (performance) => {
+ if (!performance) {
+ return '-';
+ }
return isNaN(performance) ? '-' : `${floatToPercent(performance)}%`;
}
},
@@ -69,8 +72,13 @@ export const SqlOptimizationListColumns: (
{
dataIndex: 'status',
title: () => t('sqlOptimization.table.status'),
- render: (status: SqlOptimizationStatusEnum) => {
- return ;
+ render: (status) => {
+ if (!status) {
+ return '-';
+ }
+ return (
+
+ );
}
},
{
diff --git a/packages/sqle/src/page/SqlOptimization/Overview/OptimizationSqlList/columns.tsx b/packages/sqle/src/page/SqlOptimization/Overview/OptimizationSqlList/columns.tsx
index 4428ec339..a52bb0e15 100644
--- a/packages/sqle/src/page/SqlOptimization/Overview/OptimizationSqlList/columns.tsx
+++ b/packages/sqle/src/page/SqlOptimization/Overview/OptimizationSqlList/columns.tsx
@@ -60,6 +60,9 @@ export const SqlOptimizationListColumns: () => ActiontechTableColumn
t('sqlOptimization.overview.sqlTable.performanceImprovement'),
render: (performance) => {
+ if (!performance) {
+ return '-';
+ }
return isNaN(performance) ? '-' : `${floatToPercent(performance)}%`;
}
},
diff --git a/packages/sqle/src/page/Whitelist/List/columns.tsx b/packages/sqle/src/page/Whitelist/List/columns.tsx
index cb11692f5..5f7ac5988 100644
--- a/packages/sqle/src/page/Whitelist/List/columns.tsx
+++ b/packages/sqle/src/page/Whitelist/List/columns.tsx
@@ -12,7 +12,7 @@ export const WhitelistColumn =
dataIndex: 'value',
title: () => t('whitelist.table.sql'),
className: 'ellipsis-column-width',
- render: (sql?: string) => {
+ render: (sql) => {
if (!!sql) {
return ;
}
@@ -23,7 +23,7 @@ export const WhitelistColumn =
dataIndex: 'desc',
title: () => t('whitelist.table.desc'),
className: 'ellipsis-column-width',
- render: (desc?: string) => {
+ render: (desc) => {
if (!desc) return '-';
return ;
}
@@ -31,8 +31,14 @@ export const WhitelistColumn =
{
dataIndex: 'match_type',
title: () => t('whitelist.table.matchType'),
- render: (matchType?: CreateAuditWhitelistReqV1MatchTypeEnum) => {
- return matchType ? t(WhitelistMatchTypeLabel[matchType]) : null;
+ render: (matchType) => {
+ return matchType
+ ? t(
+ WhitelistMatchTypeLabel[
+ matchType as CreateAuditWhitelistReqV1MatchTypeEnum
+ ]
+ )
+ : null;
}
}
];