diff --git a/packages/base/src/locale/en-US/dmsHome.ts b/packages/base/src/locale/en-US/dmsHome.ts index eef157ef1..8c1bfa326 100644 --- a/packages/base/src/locale/en-US/dmsHome.ts +++ b/packages/base/src/locale/en-US/dmsHome.ts @@ -44,7 +44,8 @@ export default { action_1_1: '授权清单', title_2: '审批流程', content_2: '根据实际业务流转变更流程模板', - action_2_0: '配置审批流程模板' + action_2_0: '配置审批流程模板', + action_2_1: '查看审批流程模板' } }, queryAndModify: { diff --git a/packages/base/src/locale/en-US/dmsSystem.ts b/packages/base/src/locale/en-US/dmsSystem.ts index b09d3915b..b66bd64c1 100644 --- a/packages/base/src/locale/en-US/dmsSystem.ts +++ b/packages/base/src/locale/en-US/dmsSystem.ts @@ -6,7 +6,8 @@ export default { confirmCloseConfigTips: '是否确认关闭当前配置？', confirmResetConfigTips: '关闭配置后当前的编辑信息将不会被保留，是否确认关闭配置？', - + processConnectionCETips: + '如果您使用钉钉、飞书作为协作平台，并且希望在这些外部平台上进行工单审批，您可以启用流程对接功能。通过将工单审批集成到团队的协作平台中，审批过程将变得更加便捷、高效和可追溯，同时提升数据安全和团队协作的效率。', tabPaneTitle: { pushNotification: '消息推送', processConnection: '流程对接', diff --git a/packages/base/src/locale/zh-CN/dmsHome.ts b/packages/base/src/locale/zh-CN/dmsHome.ts index ee70c4912..b05e50afc 100644 --- a/packages/base/src/locale/zh-CN/dmsHome.ts +++ b/packages/base/src/locale/zh-CN/dmsHome.ts @@ -44,7 +44,8 @@ export default { action_1_1: '授权清单', title_2: '审批流程', content_2: '根据实际业务流转变更流程模板', - action_2_0: '配置审批流程模板' + action_2_0: '配置审批流程模板', + action_2_1: '查看审批流程模板' } }, queryAndModify: { diff --git a/packages/base/src/locale/zh-CN/dmsSystem.ts b/packages/base/src/locale/zh-CN/dmsSystem.ts index dd06db8b7..17810d9a7 100644 --- a/packages/base/src/locale/zh-CN/dmsSystem.ts +++ b/packages/base/src/locale/zh-CN/dmsSystem.ts @@ -6,7 +6,8 @@ export default { confirmCloseConfigTips: '是否确认关闭当前配置？', confirmResetConfigTips: '关闭配置后当前的编辑信息将不会被保留，是否确认关闭配置？', - + processConnectionCETips: + '如果您使用钉钉、飞书作为协作平台，并且希望在这些外部平台上进行工单审批，您可以启用流程对接功能。通过将工单审批集成到团队的协作平台中，审批过程将变得更加便捷、高效和可追溯，同时提升数据安全和团队协作的效率。', tabPaneTitle: { pushNotification: '消息推送', processConnection: '流程对接', diff --git a/packages/base/src/page/DataExportManagement/__tests__/__snapshots__/index.ce.test.tsx.snap b/packages/base/src/page/DataExportManagement/__tests__/__snapshots__/index.ce.test.tsx.snap index 5c96ef7f5..8a61cab49 100644 --- a/packages/base/src/page/DataExportManagement/__tests__/__snapshots__/index.ce.test.tsx.snap +++ b/packages/base/src/page/DataExportManagement/__tests__/__snapshots__/index.ce.test.tsx.snap @@ -16,7 +16,7 @@ exports[`test base/DataExport ce should match snapshot 1`] = ` />
- 配置审批流程模板 + 查看审批流程模板
diff --git a/packages/base/src/page/Home/DefaultScene/components/StepItems/sqle.tsx b/packages/base/src/page/Home/DefaultScene/components/StepItems/sqle.tsx index d04a78c84..d255336bd 100644 --- a/packages/base/src/page/Home/DefaultScene/components/StepItems/sqle.tsx +++ b/packages/base/src/page/Home/DefaultScene/components/StepItems/sqle.tsx @@ -64,13 +64,23 @@ export const getAuditProgressStep: ( title: t('dmsHome.defaultScene.steps.safetyRule.innerContents.title_2'), content: t('dmsHome.defaultScene.steps.safetyRule.innerContents.content_2'), buttons: [ + // #if [ee] { key: 'progress-list', label: t( 'dmsHome.defaultScene.steps.safetyRule.innerContents.action_2_0' ), action: () => navigate(`/sqle/project/${projectID}/progress`) + }, + // #else + { + key: 'progress-list', + label: t( + 'dmsHome.defaultScene.steps.safetyRule.innerContents.action_2_1' + ), + action: () => navigate(`/sqle/project/${projectID}/progress`) } + // #endif ] }; }; diff --git a/packages/base/src/page/Home/__tests__/__snapshots__/index.ce.test.tsx.snap b/packages/base/src/page/Home/__tests__/__snapshots__/index.ce.test.tsx.snap index 867c19cf1..4f789acf1 100644 --- a/packages/base/src/page/Home/__tests__/__snapshots__/index.ce.test.tsx.snap +++ b/packages/base/src/page/Home/__tests__/__snapshots__/index.ce.test.tsx.snap @@ -463,7 +463,7 @@ exports[`test base/page/Home should match snapshot 1`] = `
- 配置审批流程模板 + 查看审批流程模板
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 1ee9e284b..d221b6d48 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 @@ -13,7 +13,7 @@ exports[`base/System/LoginConnection/Oauth-ce render snap 1`] = ` class="ant-spin-container" >
{ - const { t } = useTranslation(); - return (
- - {t('dmsSystem.larkAudit.ceTips')} - - } - isConfigPage={true} - > - - +
); }; diff --git a/packages/base/src/page/System/ProcessConnection/LarkAuditSetting/__snapshots__/index.ce.test.tsx.snap b/packages/base/src/page/System/ProcessConnection/__snapshots__/index.ce.test.tsx.snap similarity index 98% rename from packages/base/src/page/System/ProcessConnection/LarkAuditSetting/__snapshots__/index.ce.test.tsx.snap rename to packages/base/src/page/System/ProcessConnection/__snapshots__/index.ce.test.tsx.snap index ec7210c91..65e8a363b 100644 --- a/packages/base/src/page/System/ProcessConnection/LarkAuditSetting/__snapshots__/index.ce.test.tsx.snap +++ b/packages/base/src/page/System/ProcessConnection/__snapshots__/index.ce.test.tsx.snap @@ -1,21 +1,35 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`base/System/ProcessConnection/LarkAuditSetting-ce render snap 1`] = ` +exports[`base/System/ProcessConnection ce should match snap shots 1`] = `
-
+
+
+
+ 流程对接 +
+
+
- 如果您使用飞书作为协作平台，并且希望在飞书上进行工单审批，您可以启用飞书审批功能。通过将工单审批集成到团队的协作平台中，审批过程将变得更加便捷、高效和可追溯，同时提升数据安全和团队协作的效率。 + 如果您使用钉钉、飞书作为协作平台，并且希望在这些外部平台上进行工单审批，您可以启用流程对接功能。通过将工单审批集成到团队的协作平台中，审批过程将变得更加便捷、高效和可追溯，同时提升数据安全和团队协作的效率。
- 飞书审批为企业版功能。如您想使用该功能，可以通过以下链接联系我们。 + 流程对接为企业版功能。如您想使用该功能，可以通过以下链接联系我们。

-
+
`; diff --git a/packages/base/src/page/System/ProcessConnection/LarkAuditSetting/index.ce.test.tsx b/packages/base/src/page/System/ProcessConnection/index.ce.test.tsx similarity index 57% rename from packages/base/src/page/System/ProcessConnection/LarkAuditSetting/index.ce.test.tsx rename to packages/base/src/page/System/ProcessConnection/index.ce.test.tsx index bd1381bce..3787cb068 100644 --- a/packages/base/src/page/System/ProcessConnection/LarkAuditSetting/index.ce.test.tsx +++ b/packages/base/src/page/System/ProcessConnection/index.ce.test.tsx @@ -3,14 +3,14 @@ */ import { superRender } from '@actiontech/shared/lib/testUtil/customRender'; -import LarkAuditSetting from '.'; +import ProcessConnection from '.'; -describe('base/System/ProcessConnection/LarkAuditSetting-ce', () => { +describe('base/System/ProcessConnection ce', () => { const customRender = () => { - return superRender(); + return superRender(); }; - it('render snap', () => { + it('should match snap shots', () => { const { baseElement } = customRender(); expect(baseElement).toMatchSnapshot(); diff --git a/packages/base/src/page/System/ProcessConnection/index.tsx b/packages/base/src/page/System/ProcessConnection/index.tsx index 2b3522ab2..c464b17be 100644 --- a/packages/base/src/page/System/ProcessConnection/index.tsx +++ b/packages/base/src/page/System/ProcessConnection/index.tsx @@ -2,16 +2,27 @@ import { useTranslation } from 'react-i18next'; import DingTalkSetting from './DingTalkSetting'; import LarkAuditSetting from './LarkAuditSetting'; import SystemBasicTitle from '../components/BasicTitle'; +import { EnterpriseFeatureDisplay } from '@actiontech/shared'; +import { Typography } from 'antd'; const ProcessConnection = () => { const { t } = useTranslation(); return ( - <> + + {t('dmsSystem.processConnectionCETips')} + + } + isConfigPage={true} + showTitle={false} + > - + ); }; 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 7f346405e..18ae1c405 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 @@ -4552,757 +4552,360 @@ exports[`base/System-ee render snap 3`] = ` -
-
-
-
- - - - - - -
+
-
+ 如果您使用钉钉、飞书作为协作平台，并且希望在这些外部平台上进行工单审批，您可以启用流程对接功能。通过将工单审批集成到团队的协作平台中，审批过程将变得更加便捷、高效和可追溯，同时提升数据安全和团队协作的效率。 +
+
- -
-
-
-
- -
-
-
-
-
-
-
- -
-
-
-
-
-
-
+ 社区版 +
-
-
-
-
- - -
-
-
-
-
-
-
-
- 飞书审批 -
-
-
- 如果您使用飞书作为协作平台，并且希望在飞书上进行工单审批，您可以启用飞书审批功能。通过将工单审批集成到团队的协作平台中，审批过程将变得更加便捷、高效和可追溯，同时提升数据安全和团队协作的效率。 -
-
-
-
-
-
-
- - 社区版 - -
+ 适用于MySQL基础审核场景 +
-

- Free -

-
-
- - 永久 - -
-
- - - 快速部署 - - -
-
- - 适用于MySQL基础审核场景 - -
-
- + class="ant-divider css-dev-only-do-not-override-txh9fw ant-divider-horizontal" + role="separator" + /> +
+
- -
+ + +
+
+ - - 支持纳管MySQL数据源 - -
+ 支持纳管MySQL数据源 +
+
+
- -
+ + +
+
+ - - 支持资源权限隔离 - -
+ 支持资源权限隔离 +
+
+
- -
+ + +
+
+ - - 集成CloudBeaver在线查询 - -
+ 集成CloudBeaver在线查询 +
+
+
- -
+ + +
+
+ - - 提供专业SQL审核能力 - -
+ 提供专业SQL审核能力 +
+
+
- -
+ + +
+
+ - - 支持多方式采集MySQL数据 - -
+ 支持多方式采集MySQL数据 +
+
+
- -
+ + +
+
+ - - 无实例限制 - -
+ 无实例限制 +
@@ -5310,331 +4913,331 @@ exports[`base/System-ee render snap 3`] = `
+
+
-
- - 专业版 - -
+ 专业版 +
+
+
-
-

- Free -

-
-
- - 永久 - -
-
+
+
+ - - - 立即申请 - - -
-
+
+
+ - - 适用于多种数据源类型体验场景 + + 立即申请 -
-
+
+
+ - + 适用于多种数据源类型体验场景 + +
+
+ +
- -
+ + +
+
+ - - 支持纳管10多种主流数据源 - -
+ 支持纳管10多种主流数据源 +
+
+
- -
+ + +
+
+ - - 支持资源权限隔离 - -
+ 支持资源权限隔离 +
+
+
- -
+ + +
+
+ - - 集成CloudBeaver在线查询 - -
+ 集成CloudBeaver在线查询 +
+
+
- -
+ + +
+
+ - - 提供专业SQL审核能力 - -
+ 提供专业SQL审核能力 +
+
+
- -
+ + +
+
+ - - 支持多方式采集各数据源数据 - -
+ 支持多方式采集各数据源数据 +
+
+
- -
+ + +
+
+ - - 最大实例个数20 - -
+ 最大实例个数20 +
@@ -5642,411 +5245,411 @@ exports[`base/System-ee render snap 3`] = `
+
+
-
- - 企业版 - -
+ 企业版 +
+
+
-
-

- Custom -

-
-
- -
-
- - - 联系我们 - - -
-
+
+
+ +
+
+ - - 适用于私有云用户定制场景 + + 联系我们 -
-
+
+
+ - + 适用于私有云用户定制场景 + +
+
+ +
- -
+ + +
+
+ - - 支持纳管10多种主流数据源 - -
+ 支持纳管10多种主流数据源 +
+
+
- -
+ + +
+
+ - - 支持资源权限隔离 - -
+ 支持资源权限隔离 +
+
+
- -
+ + +
+
+ - - 集成CloudBeaver在线查询 - -
+ 集成CloudBeaver在线查询 +
+
+
- -
+ + +
+
+ - - 提供专业SQL审核能力 - -
+ 提供专业SQL审核能力 +
+
+
- -
+ + +
+
+ - - 支持多方式采集各数据源数据 - -
+ 支持多方式采集各数据源数据 +
+
+
- -
+ + +
+
+ - - 无实例限制 - -
+ 无实例限制 +
+
+
- -
+ + +
+
+ - - 多维度智能统计 - -
+ 多维度智能统计 +
+
+
- -
+ + +
+
+ - - 个性化定制 - -
+ 个性化定制 +
@@ -6056,199 +5659,118 @@ exports[`base/System-ee render snap 3`] = `
-
- -
-
-
-
+
- - - - - - - - - - - + 各版本完整功能对比请参考： -
-
- Action - SQLE -
-

- 飞书审批为企业版功能。如您想使用该功能，可以通过以下链接联系我们。 -

-
-
- - - -
-
- - - -
-
-
+ 功能对比 +
+
+
+
+
-
+
+
+ + + + + + + + + + + + + +
+
+ Action + SQLE +
+

+ 如您想了解更多关于企业版及社区版功能的差异，可参考用户手册 +

+
+ + + +
+
+
+
+
- +
diff --git a/packages/base/src/router/test/__snapshots__/router.ce.sqle.test.tsx.snap b/packages/base/src/router/test/__snapshots__/router.ce.sqle.test.tsx.snap index 073867500..ef424d50d 100644 --- a/packages/base/src/router/test/__snapshots__/router.ce.sqle.test.tsx.snap +++ b/packages/base/src/router/test/__snapshots__/router.ce.sqle.test.tsx.snap @@ -100,6 +100,34 @@ exports[`base/router-sqle-ce render sqle global router render sqle router when v `; +exports[`base/router-sqle-ce render sqle project detail router render route analyze render route auditPlanDetail 1`] = ` + +
+
+
+ auditPlanDetailAnalyze +
+
+
+ +`; + +exports[`base/router-sqle-ce render sqle project detail router render route analyze render route orderAnalyze 1`] = ` + +
+
+
+ orderAnalyze +
+
+
+ +`; + exports[`base/router-sqle-ce render sqle project detail router render sqle project detail router when version is ce render operationRecord 1`] = `
@@ -246,20 +274,6 @@ exports[`base/router-sqle-ce render sqle project detail router render sqle proje `; -exports[`base/router-sqle-ce render sqle project detail router render sqle project detail router when version is ce render route progress render progressUpdate 1`] = ` - -
-
-
- progressUpdate -
-
-
- -`; - exports[`base/router-sqle-ce render sqle project detail router render sqle project detail router when version is ce render route projectOverview 1`] = `
@@ -621,6 +635,13 @@ Array [ "key": "orderDetail", "path": ":orderId", }, + Object { + "element":
+ orderAnalyze +
, + "key": "orderAnalyze", + "path": ":taskId/:sqlNum/analyze", + }, ], "element":
+ auditPlanDetailAnalyze +
, + "key": "auditPlanDetailAnalyze", + "path": ":reportId/:sqlNum/:auditPlanName/analyze", + }, ], "element":
- progressUpdate -
, - "key": "progressUpdate", - "path": "update/:workflowName", - }, ], "element":
{ await act(async () => jest.advanceTimersByTime(300)); expect(baseElement).toMatchSnapshot(); }); - - it('render progressUpdate', async () => { - const { baseElement } = customRender([ - `/sqle/project/${projectID}/progress/update/workflowName` - ]); - - await act(async () => jest.advanceTimersByTime(300)); - expect(baseElement).toMatchSnapshot(); - expect(screen.getByText('progressUpdate')).toBeInTheDocument(); - }); }); it('render whitelist', () => { @@ -365,5 +355,25 @@ describe('base/router-sqle-ce', () => { }); }); }); + + describe('render route analyze', () => { + it('render route orderAnalyze', () => { + const { baseElement } = customRender([ + `/sqle/project/${projectID}/order/taskId/sqlNum/analyze` + ]); + + expect(baseElement).toMatchSnapshot(); + expect(screen.getByText('orderAnalyze')).toBeInTheDocument(); + }); + + it('render route auditPlanDetail', () => { + const { baseElement } = customRender([ + `/sqle/project/${projectID}/auditPlan/reportId/sqlNum/:auditPlanName/analyze` + ]); + + expect(baseElement).toMatchSnapshot(); + expect(screen.getByText('auditPlanDetailAnalyze')).toBeInTheDocument(); + }); + }); }); }); diff --git a/packages/shared/lib/components/EnterpriseFeatureDisplay/EnterpriseFeatureDisplay.tsx b/packages/shared/lib/components/EnterpriseFeatureDisplay/EnterpriseFeatureDisplay.tsx index aad6d3c05..b37968ec3 100644 --- a/packages/shared/lib/components/EnterpriseFeatureDisplay/EnterpriseFeatureDisplay.tsx +++ b/packages/shared/lib/components/EnterpriseFeatureDisplay/EnterpriseFeatureDisplay.tsx @@ -8,12 +8,14 @@ import { IconBookMark, IconCustomService } from '../../Icon/common'; import { DMS_DEFAULT_WEB_TITLE } from '../../data/common'; import EmptyBox from '../EmptyBox'; import VersionComparison from './components/VersionComparison'; +import classNames from 'classnames'; const EnterpriseFeatureDisplay: React.FC = ({ children, eeFeatureDescription, featureName, - isConfigPage = false + isConfigPage = false, + showTitle = true }) => { const { t } = useTranslation(); @@ -100,8 +102,14 @@ const EnterpriseFeatureDisplay: React.FC = ({ {/* #if [ce] */} {isConfigPage ? ( -
-
{featureName}
+
+ {renderFeatureDescNode()} {renderAdditionalAttentionNode()}
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 3fda057b0..3f273c193 100644 --- a/packages/shared/lib/components/EnterpriseFeatureDisplay/__snapshots__/ce.test.tsx.snap +++ b/packages/shared/lib/components/EnterpriseFeatureDisplay/__snapshots__/ce.test.tsx.snap @@ -3,7 +3,7 @@ exports[`test ce EnterpriseFeatureDisplay should match snapshot 1`] = `
{ + it('should match snapshot', () => { + const { container } = renderWithTheme(); + expect(container).toMatchSnapshot(); + }); +}); 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 new file mode 100644 index 000000000..9c5632185 --- /dev/null +++ b/packages/shared/lib/components/EnterpriseFeatureDisplay/components/test/__snapshots__/VersionComparison.test.tsx.snap @@ -0,0 +1,1114 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`shared/EnterpriseFeatureDisplay/VersionComparison should match snapshot 1`] = ` +
+
+
+
+
+
+
+
+ + 社区版 + +
+
+
+
+

+ Free +

+
+
+ + 永久 + +
+
+ + + 快速部署 + + +
+
+ + 适用于MySQL基础审核场景 + +
+
+ +
+
+
+
+
+ + + + + +
+
+ + 支持纳管MySQL数据源 + +
+
+
+
+
+
+ + + + + +
+
+ + 支持资源权限隔离 + +
+
+
+
+
+
+ + + + + +
+
+ + 集成CloudBeaver在线查询 + +
+
+
+
+
+
+ + + + + +
+
+ + 提供专业SQL审核能力 + +
+
+
+
+
+
+ + + + + +
+
+ + 支持多方式采集MySQL数据 + +
+
+
+
+
+
+ + + + + +
+
+ + 无实例限制 + +
+
+
+
+
+
+
+
+
+
+
+
+ + 专业版 + +
+
+
+
+

+ Free +

+
+
+ + 永久 + +
+
+ + + 立即申请 + + +
+
+ + 适用于多种数据源类型体验场景 + +
+
+ +
+
+
+
+
+ + + + + +
+
+ + 支持纳管10多种主流数据源 + +
+
+
+
+
+
+ + + + + +
+
+ + 支持资源权限隔离 + +
+
+
+
+
+
+ + + + + +
+
+ + 集成CloudBeaver在线查询 + +
+
+
+
+
+
+ + + + + +
+
+ + 提供专业SQL审核能力 + +
+
+
+
+
+
+ + + + + +
+
+ + 支持多方式采集各数据源数据 + +
+
+
+
+
+
+ + + + + +
+
+ + 最大实例个数20 + +
+
+
+
+
+
+
+
+
+
+
+
+ + 企业版 + +
+
+
+
+

+ Custom +

+
+
+ +
+
+ + + 联系我们 + + +
+
+ + 适用于私有云用户定制场景 + +
+
+ +
+
+
+
+
+ + + + + +
+
+ + 支持纳管10多种主流数据源 + +
+
+
+
+
+
+ + + + + +
+
+ + 支持资源权限隔离 + +
+
+
+
+
+
+ + + + + +
+
+ + 集成CloudBeaver在线查询 + +
+
+
+
+
+
+ + + + + +
+
+ + 提供专业SQL审核能力 + +
+
+
+
+
+
+ + + + + +
+
+ + 支持多方式采集各数据源数据 + +
+
+
+
+
+
+ + + + + +
+
+ + 无实例限制 + +
+
+
+
+
+
+ + + + + +
+
+ + 多维度智能统计 + +
+
+
+
+
+
+ + + + + +
+
+ + 个性化定制 + +
+
+
+
+
+
+
+
+
+
+
+
+ + 各版本完整功能对比请参考： + + + 功能对比 + +
+
+
+
+`; diff --git a/packages/shared/lib/components/EnterpriseFeatureDisplay/index.type.ts b/packages/shared/lib/components/EnterpriseFeatureDisplay/index.type.ts index dfb4a009f..43d678bae 100644 --- a/packages/shared/lib/components/EnterpriseFeatureDisplay/index.type.ts +++ b/packages/shared/lib/components/EnterpriseFeatureDisplay/index.type.ts @@ -6,6 +6,7 @@ export type EnterpriseFeatureDisplayProps = { eeFeatureDescription: React.ReactNode; featureName: string; isConfigPage?: boolean; + showTitle?: boolean; }; export type VersionComparisonItem = { diff --git a/packages/shared/lib/components/EnterpriseFeatureDisplay/style.ts b/packages/shared/lib/components/EnterpriseFeatureDisplay/style.ts index 1503f9596..562f8bef7 100644 --- a/packages/shared/lib/components/EnterpriseFeatureDisplay/style.ts +++ b/packages/shared/lib/components/EnterpriseFeatureDisplay/style.ts @@ -75,6 +75,10 @@ export const CEIndexStyleWrapper = styled('section')` } } + .config-mode-wrapper.none-padding-top { + padding-top: 0; + } + .config-mode-wrapper { padding: 32px 0; diff --git a/packages/sqle/src/locale/zh-CN/workflowTemplate.ts b/packages/sqle/src/locale/zh-CN/workflowTemplate.ts index 27016b1fe..29dc51d64 100644 --- a/packages/sqle/src/locale/zh-CN/workflowTemplate.ts +++ b/packages/sqle/src/locale/zh-CN/workflowTemplate.ts @@ -2,6 +2,7 @@ export default { pageTitle: '审批流程模版', pageDesc: '你可以在这里管理默认审批流程模版。', + list: { title: { listTable: '审批流程模版列表' diff --git a/packages/sqle/src/page/OperationRecord/__snapshots__/index.ce.test.tsx.snap b/packages/sqle/src/page/OperationRecord/__snapshots__/index.ce.test.tsx.snap index 594711a33..af28326c7 100644 --- a/packages/sqle/src/page/OperationRecord/__snapshots__/index.ce.test.tsx.snap +++ b/packages/sqle/src/page/OperationRecord/__snapshots__/index.ce.test.tsx.snap @@ -16,7 +16,7 @@ exports[`slqe/OperationRecord CE should match snap shot 1`] = ` />
= ({ {t('audit.copyExecSql')} - {/* #if [ee] */} {t('audit.table.analyze')} - {/* #endif */}
diff --git a/packages/sqle/src/page/Order/AuditDetail/DataSourceResultList/components/test/__snapshots__/ResultCard.ce.test.tsx.snap b/packages/sqle/src/page/Order/AuditDetail/DataSourceResultList/components/test/__snapshots__/ResultCard.ce.test.tsx.snap index 0e2e3ddcf..230188a6e 100644 --- a/packages/sqle/src/page/Order/AuditDetail/DataSourceResultList/components/test/__snapshots__/ResultCard.ce.test.tsx.snap +++ b/packages/sqle/src/page/Order/AuditDetail/DataSourceResultList/components/test/__snapshots__/ResultCard.ce.test.tsx.snap @@ -72,6 +72,7 @@ exports[`sqle/Order/AuditDetail/ResultCard render change exec_sql & rollback_sql >
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+ + + + 说明 + + 操作 + + +
+   +
+
+ +
+
+
+ +
+
+
+ @@ -420,7 +467,7 @@ exports[`sqle/Order/Common/AuditResultList render snap when add note 2`] = ` class="ant-spin-container" >
+ + + + 说明 + + 操作 + + +
+   +
+
+ +
+
+
+ +
+
+
+ @@ -827,7 +921,7 @@ exports[`sqle/Order/Common/AuditResultList render snap when data is empty 1`] = class="ant-spin-container" >
+ + + + 说明 + + 操作 + + +
+   +
+
+ + + + 说明 + + 操作 + + +
+   +
+
= ({ pagination={{ total: data?.total ?? 0 }} - // #if [ee] actions={AuditResultForCreateOrderActions(handleClickAnalyze)} - // #endif />
+
+
+
+
+ 审批流程模版 +
+
+
+
+
+
+
+
+
+
+ + + + + + + +
+
+
+
+
+ + 工单发起/工单更新SQL语句 + +
+ 工单被创建，或者工单被驳回后等待修改SQL语句 +
+
+
+
+
+
+
+ + + + + + +
+
+
+ + + + + + + + + + +
+
+
+
+
+ + 审核节点 + + #1 + + +
+ - +
+
+
+ 审核人 +
+
+ + + + + + + 匹配拥有数据源审核权限的成员 + +
+
+
+
+
+
+
+
+ + + +
+
+
+ + + + + + + + + + +
+
+
+
+
+ + 审核节点 + + #2 + + +
+ step desc +
+
+
+ 审核人 +
+
+
+
+ + + T + + +
+
+
+
+
+
+
+
+
+
+ + + + + + +
+
+
+ + + + + + + +
+
+
+
+
+ + 执行上线 + +
+ - +
+
+
+ 执行人 +
+
+ + + + + + + 匹配拥有数据源上线权限的成员 + +
+
+
+
+
+
+
+
+
+
+
+
+ + 允许创建工单的最高审核等级 + + + 告警(Warning) + +
+
+
+
+
+
+
+
+
+
+ + 注意事项 + +
+
    +
  • + 若项目管理员对审批流程模板进行了修改，不会对已经在审批流程的工单造成影响； +
    • +
  • + 被驳回的工单，需要创建人更新SQL语句后重新发起，驳回记录可在 “工单进度-工单历史操作” 中查看； +
    • +
  • + 处于 “审核节点” 中的工单，创建人可在工单详情页随时关闭； +
    • +
  • + 审核工单：审核人在该步骤可以执行「审核通过」或「驳回」操作； +
    • +
  • + 上线工单：执行人在该步骤可以执行「执行上线」或「驳回」操作。 +
    • +
+
+
+
+ + 审批流程模板更新时间 + +
+ + + + + + + 2023-12-26 14:19:12 + +
+
+
+
+
+
+
+
+
+ +`; diff --git a/packages/sqle/src/page/WorkflowTemplate/WorkflowTemplateDetail/index.ce.test.tsx b/packages/sqle/src/page/WorkflowTemplate/WorkflowTemplateDetail/index.ce.test.tsx new file mode 100644 index 000000000..531b886e1 --- /dev/null +++ b/packages/sqle/src/page/WorkflowTemplate/WorkflowTemplateDetail/index.ce.test.tsx @@ -0,0 +1,41 @@ +/** + * @test_version ce + */ + +import { superRender } from '../../../testUtils/customRender'; +import WorkflowTemplateDetail from '.'; +import { act, cleanup, screen } from '@testing-library/react'; +import workflowTemplate from '../../../testUtils/mockApi/workflowTemplate'; +import { mockUseCurrentProject } from '@actiontech/shared/lib/testUtil/mockHook/mockUseCurrentProject'; +import { mockUseCurrentUser } from '@actiontech/shared/lib/testUtil/mockHook/mockUseCurrentUser'; +import user from '../../../testUtils/mockApi/user'; + +describe('page/WorkflowTemplate CE', () => { + beforeEach(() => { + workflowTemplate.mockAllApi(); + user.mockAllApi(); + mockUseCurrentProject(); + mockUseCurrentUser(); + jest.useFakeTimers(); + }); + + afterEach(() => { + jest.useRealTimers(); + cleanup(); + }); + + const customRender = () => { + return superRender(); + }; + + it('render workflow template detail', async () => { + const getInfoRequest = workflowTemplate.getWorkflowTemplate(); + const userInfoRequest = user.getUserTipList(); + const { baseElement } = customRender(); + await act(async () => jest.advanceTimersByTime(3000)); + expect(getInfoRequest).toBeCalled(); + expect(userInfoRequest).toBeCalled(); + expect(baseElement).toMatchSnapshot(); + expect(screen.queryByText('修改当前审批流程模版')).not.toBeInTheDocument(); + }); +}); diff --git a/packages/sqle/src/page/WorkflowTemplate/WorkflowTemplateDetail/index.tsx b/packages/sqle/src/page/WorkflowTemplate/WorkflowTemplateDetail/index.tsx index f81ab558f..d8dcd50f6 100644 --- a/packages/sqle/src/page/WorkflowTemplate/WorkflowTemplateDetail/index.tsx +++ b/packages/sqle/src/page/WorkflowTemplate/WorkflowTemplateDetail/index.tsx @@ -73,6 +73,7 @@ const WorkflowTemplateDetail: React.FC = () => { { ]} + // #endif /> diff --git a/packages/sqle/src/router/config.tsx b/packages/sqle/src/router/config.tsx index b65eb2a7d..fa73f0028 100644 --- a/packages/sqle/src/router/config.tsx +++ b/packages/sqle/src/router/config.tsx @@ -111,13 +111,6 @@ const UpdateRuleTemplate = React.lazy( ) ); -const UpdateWorkflowTemplate = React.lazy( - () => - import( - /* webpackChunkName: "UpdateWorkflowTemplate" */ '../page/WorkflowTemplate/UpdateWorkflowTemplate' - ) -); - const WorkflowTemplateDetail = React.lazy( () => import( @@ -134,15 +127,25 @@ const SqlAuditCreate = React.lazy(() => import('../page/SqlAudit/Create')); const SqlAuditDetail = React.lazy(() => import('../page/SqlAudit/Detail')); -// #if [ee] -const RuleKnowledge = React.lazy(() => import('../page/RuleKnowledge')); const OrderSqlAnalyze = React.lazy(() => import('../page/SqlAnalyze/Order')); + const AuditPlanSqlAnalyze = React.lazy( () => import('../page/SqlAnalyze/AuditPlan') ); + +// #if [ee] +const RuleKnowledge = React.lazy(() => import('../page/RuleKnowledge')); + const SQLManagementAnalyze = React.lazy( () => import('../page/SqlAnalyze/SqlManage') ); + +const UpdateWorkflowTemplate = React.lazy( + () => + import( + /* webpackChunkName: "UpdateWorkflowTemplate" */ '../page/WorkflowTemplate/UpdateWorkflowTemplate' + ) +); // #endif //sqle global page @@ -197,13 +200,11 @@ export const projectDetailRouterConfig: RouterConfigItem[] = [ element: , key: 'orderDetail' }, - // #if [ee] { path: ':taskId/:sqlNum/analyze', element: , key: 'orderAnalyze' } - // #endif ] }, { @@ -265,13 +266,11 @@ export const projectDetailRouterConfig: RouterConfigItem[] = [ key: 'auditPlanDetailReport', element: }, - // #if [ee] { path: ':reportId/:sqlNum/:auditPlanName/analyze', key: 'auditPlanDetailAnalyze', element: } - // #endif ] }, { @@ -322,11 +321,13 @@ export const projectDetailRouterConfig: RouterConfigItem[] = [ element: , key: 'progressDetail' }, + // #if [ee] { path: 'update/:workflowName', element: , key: 'progressUpdate' } + // #endif ] }, {