Test/dms 829

jest.config.js

@@ -38,6 +38,7 @@ module.exports = {
     'packages/**/src/App.tsx',
     'packages/shared/api/common/**',
     '!packages/**/index.type.ts',
+    '!packages/**/index.enum.ts',
     '!packages/sqle/src/page/AuditPlan/**'
   ],
   setupFilesAfterEnv: ['<rootDir>/jest-setup.ts'],

packages/base/src/hooks/useDbService/index.test.tsx

@@ -38,13 +38,13 @@ describe('useDbService', () => {
       result.current.updateDbServiceList({
         project_uid: projectID,
         functional_module:
-          ListDBServiceTipsFunctionalModuleEnum.create_audit_plan
+          ListDBServiceTipsFunctionalModuleEnum.create_export_task
       })
     );
     expect(listDbServicesSpy).toBeCalled();
     expect(listDbServicesSpy).toBeCalledWith({
       functional_module:
-        ListDBServiceTipsFunctionalModuleEnum.create_audit_plan,
+        ListDBServiceTipsFunctionalModuleEnum.create_export_task,
       project_uid: projectID
     });
     expect(result.current.loading).toBeTruthy();

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

@@ -11,7 +11,8 @@ export default {
     export_failed: '导出失败',
     expired: '已过期',
     rejected: '已驳回',
-    canceled: '已关闭'
+    canceled: '已关闭',
+    file_deleted: '已移除'
   },
   batchCancel: {
     messageWarn:
@@ -49,7 +50,8 @@ export default {
       sourceTitle: '工单导出对象',
       methodTitle: '导出方式',
       updateInfoAction: '编辑工单信息',
-      submitAction: '提交工单'
+      submitAction: '提交工单',
+      submitTips: '仅支持对DQL语句创建导出工单'
     },
     result: {
       success: '工单创建成功',
@@ -162,6 +164,7 @@ export default {
       column: {
         number: '序号',
         execSql: '执行语句',
+        sqlType: '语句类型',
         auditResult: '审核结果'
       }
     }

packages/base/src/page/DataExportManagement/Common/AuditResultList/Table/column.tsx

@@ -32,6 +32,11 @@ export const AuditResultForCreateOrderColumn = (
         );
       }
     },
+    {
+      dataIndex: 'export_sql_type',
+      title: () => t('dmsDataExport.common.auditResult.column.sqlType'),
+      render: (type: string) => type || '-'
+    },
     {
       dataIndex: 'audit_sql_result',
       title: () => t('dmsDataExport.common.auditResult.column.auditResult'),

packages/base/src/page/DataExportManagement/Common/AuditResultList/Table/index.tsx

@@ -13,7 +13,8 @@ import { IListDataExportTaskSQL } from '@actiontech/shared/lib/api/base/service/
 
 const AuditResultTable: React.FC<AuditResultTableProps> = ({
   taskID,
-  projectID
+  projectID,
+  updateExecuteSQLsTypeIsDQL
 }) => {
   const [currentAuditResultRecord, setCurrentAuditResultRecord] =
     useState<IListDataExportTaskSQL>();
@@ -44,10 +45,12 @@ const AuditResultTable: React.FC<AuditResultTableProps> = ({
       ready: typeof taskID === 'string',
       refreshDeps: [pagination, taskID],
       onSuccess(res) {
-        // updateTaskRecordTotalNum?.(taskID ?? '', res.total ?? 0);
+        updateExecuteSQLsTypeIsDQL?.(
+          !!res.list?.every((item) => item.export_sql_type === 'dql')
+        );
       },
       onError() {
-        // updateTaskRecordTotalNum?.(taskID ?? '', 0);
+        updateExecuteSQLsTypeIsDQL?.(true);
       }
     }
   );
@@ -56,7 +59,7 @@ const AuditResultTable: React.FC<AuditResultTableProps> = ({
     <>
       <ActiontechTable
         errorMessage={requestErrorMessage}
-        rowKey="number"
+        rowKey="uid"
         columns={AuditResultForCreateOrderColumn(onClickAuditResult)}
         loading={loading}
         dataSource={data?.list}

packages/base/src/page/DataExportManagement/Common/AuditResultList/Table/index.type.ts

@@ -3,6 +3,7 @@ import { IListDataExportTaskSQL } from '@actiontech/shared/lib/api/base/service/
 export type AuditResultTableProps = {
   taskID?: string;
   projectID: string;
+  updateExecuteSQLsTypeIsDQL?: (val: boolean) => void;
 };
 
 export type AuditResultDrawerProps = {

packages/base/src/page/DataExportManagement/Common/AuditResultList/index.tsx

@@ -11,7 +11,8 @@ import { ResponseCode } from '@actiontech/shared/lib/enum';
 
 const AuditResultList: React.FC<AuditResultListProps> = ({
   taskIDs,
-  projectID
+  projectID,
+  updateExecuteSQLsTypeIsDQL
 }) => {
   const [tasks, setTasks] = useState<IGetDataExportTask[]>([]);
 
@@ -56,7 +57,11 @@ const AuditResultList: React.FC<AuditResultListProps> = ({
         />
       </SegmentedRowStyleWrapper>
 
-      <AuditResultTable taskID={currentTaskID} projectID={projectID} />
+      <AuditResultTable
+        taskID={currentTaskID}
+        projectID={projectID}
+        updateExecuteSQLsTypeIsDQL={updateExecuteSQLsTypeIsDQL}
+      />
     </AuditResultStyleWrapper>
   );
 };

packages/base/src/page/DataExportManagement/Common/AuditResultList/index.type.ts

@@ -1,4 +1,5 @@
 export type AuditResultListProps = {
   taskIDs: string[];
   projectID: string;
+  updateExecuteSQLsTypeIsDQL?: (val: boolean) => void;
 };

packages/base/src/page/DataExportManagement/Common/TaskStatus/index.tsx

@@ -6,6 +6,7 @@ import {
 } from 'sqle/src/icon/Order';
 import { t } from '../../../../locale';
 import { StatusStyleWrapper } from '../style';
+import { IconDelete } from '@actiontech/shared/lib/Icon/common';
 
 const taskStatusMap = () => {
   return new Map<GetDataExportTaskStatusEnum, React.ReactNode>([
@@ -36,6 +37,13 @@ const taskStatusMap = () => {
         <IconOrderStatusIsExecuting />
         <span>{t('dmsDataExport.status.wait_for_export')}</span>
       </>
+    ],
+    [
+      GetDataExportTaskStatusEnum.file_deleted,
+      <>
+        <IconDelete />
+        <span>{t('dmsDataExport.status.file_deleted')}</span>
+      </>
     ]
   ]);
 };