Skip to content

Commit 39d512a

Browse files
authored
Merge pull request #775 from actiontech/fix/sql-workflow-tips
[feature](SqlExecworkflow):Revise the prompt text for asynchronous tasks
2 parents c9f15bd + 9bd8d69 commit 39d512a

File tree

6 files changed

+10
-9
lines changed

6 files changed

+10
-9
lines changed

packages/base/src/locale/zh-CN/dmsDataExport.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ export default {
163163
},
164164
execute: {
165165
text: '执行导出',
166-
successTips: '工单执行导出成功!',
166+
successTips: '执行导出操作已提交',
167167
confirmTips:
168168
'当前操作将立即执行导出工单下的所有任务,是否确认立即执行导出?'
169169
}

packages/base/src/page/DataExportManagement/Detail/hooks/__tests__/useExportDetailAction.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ describe('test base/DataExport/Detail/hooks/useExportDetailAction', () => {
114114
await act(async () => jest.advanceTimersByTime(3000));
115115
expect(result.current.executeExportLoading).toBeFalsy();
116116
expect(messageApiSpy.success).toHaveBeenCalledTimes(1);
117-
expect(messageApiSpy.success).toHaveBeenCalledWith('工单执行导出成功!');
117+
expect(messageApiSpy.success).toHaveBeenCalledWith('执行导出操作已提交');
118118
expect(emitSpy).toHaveBeenCalledTimes(1);
119119
expect(emitSpy).toHaveBeenCalledWith(
120120
EmitterKey.DMS_Refresh_Export_Data_Workflow

packages/sqle/src/locale/zh-CN/execWorkflow.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,8 @@ export default {
226226
execScheduledBeforeNow: '定时上线时间必须在当前时间之后',
227227
execScheduleTips: '定时上线设置成功',
228228
status: '上线状态',
229-
executingTips: '立即上线设置成功',
229+
batchExecutingTips: '批量立即上线操作已提交',
230+
executingTips: '立即上线操作已提交',
230231
createWorkflowStep: '创建工单',
231232
updateWorkflowStep: '更新工单',
232233
reviewWorkflowStep: '审核工单',
@@ -263,7 +264,7 @@ export default {
263264
sqlExecuteConfirmTips:
264265
'当前操作将立即执行该数据源上的SQL语句, 是否确认立即上线',
265266
retryExecute: '再次执行',
266-
retryExecuteSuccess: '再次执行成功',
267+
retryExecuteSuccess: '再次执行操作已提交',
267268
pleaseSelectSql: '请选择需要再次执行的SQL',
268269
selectRetryExecuteSqlDesc: '已执行成功的SQL无法再次执行',
269270
selectRetryExecuteSql: '选择再次执行的SQL'

packages/sqle/src/page/SqlExecWorkflow/Detail/components/AuditExecResultPanel/hooks/__tests__/useOverviewActions.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ describe('test useOverviewActions', () => {
6060
await act(async () => jest.advanceTimersByTime(3000));
6161

6262
expect(mockMessageSuccess).toHaveBeenCalledTimes(1);
63-
expect(mockMessageSuccess).toHaveBeenCalledWith('上线成功');
63+
expect(mockMessageSuccess).toHaveBeenCalledWith('立即上线操作已提交');
6464
expect(mockRefreshOverview).toHaveBeenCalledTimes(1);
6565
expect(mockRefreshWorkflow).toHaveBeenCalledTimes(1);
6666
});

packages/sqle/src/page/SqlExecWorkflow/Detail/components/AuditExecResultPanel/hooks/useOverviewActions.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,7 @@ const useOverviewActions = ({
3838
};
3939
workflow.executeOneTaskOnWorkflowV2(param).then((res) => {
4040
if (res.data.code === ResponseCode.SUCCESS) {
41-
messageApi.success(
42-
t('execWorkflow.common.workflowStatus.execSucceeded')
43-
);
41+
messageApi.success(t('execWorkflow.detail.operator.executingTips'));
4442
refreshOverview();
4543
refreshWorkflow?.();
4644
}

packages/sqle/src/page/SqlExecWorkflow/Detail/hooks/useGenerateWorkflowStepsProps.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,9 @@ const useGenerateWorkflowStepsProps = ({
7070
})
7171
.then((res) => {
7272
if (res.data.code === ResponseCode.SUCCESS) {
73-
messageApi.success(t('execWorkflow.detail.operator.executingTips'));
73+
messageApi.success(
74+
t('execWorkflow.detail.operator.batchExecutingTips')
75+
);
7476
refreshWorkflowInfo();
7577
refreshOverviewAction();
7678
}

0 commit comments

Comments
 (0)