二次弹窗提示修改

packages/examination/src/views/exam-online/compoents/ExamEditPage.tsx

@@ -1,6 +1,6 @@
 import React, { useRef, useEffect, useState } from 'react';
 // @ts-ignore
-import { Form, Input, Select, DatePicker, Space, ColProps, Button, Cascader, DefaultOptionType, Rule } from 'antd';
+import {Form, Input, Select, DatePicker, Space, ColProps, Button, Cascader, DefaultOptionType, Rule, Modal} from 'antd';
 import type { FormProps, FormInstance } from 'antd';
 import ESBreadcrumbComponent from './ESBreadcrumbComponent'; // 引入面包屑组件
 import { withRouter, RouteComponentProps } from 'react-router-dom'; // 引入 withRouter 和 RouteComponentProps
@@ -136,7 +136,16 @@ const ExamBasicInfoForm: React.FC<PropsWithRouter> = (props) => {
     const handleSubmit = () => {
         if (formRef.current) {
             formRef.current.validateFields().then((values) => {
+                const text = isEdit ? '修改' : '新增';
+                Modal.confirm({
+                    title: `确认${text}`,
+                    content: `是否${text}考试？`,
+                    onOk: () => {
                         onFinish(values);
+                        },
+                    onCancel: () => {
+                    },
+                });
             }).catch((errorInfo) => {
                 console.log('表单验证失败:', errorInfo);
             });

packages/examination/src/views/exam-online/compoents/ExamListPage.tsx

@@ -241,18 +241,10 @@ const ExamListPage = ({ history }: { history: any }) => {
 
     // 编辑
     const handleEdit = (examId: number) => {
-        Modal.confirm({
-            title: `确认修改`,
-            content: `是否修改试卷？`,
-            onOk: () => {
         history.push({
             pathname: '/exam-edit',
             state: { examId },
         });
-            },
-            onCancel: () => {
-            },
-        });
     };
 
     const handleDetail = (examId: number) => {

packages/examination/src/views/examPaper/examPaperAdd.tsx

@@ -332,6 +332,10 @@ class ExamPaperAdd extends Component<any, States> {
                 questionIds
             };
             if (isEdit === 'true') {
+                Modal.confirm({
+                    title: `确认修改`,
+                    content: `是否修改试卷？`,
+                    onOk: async () => {
                         const res = await editExamPaper(data);
                         const success = res["success"];
                         if (success) {
@@ -340,7 +344,15 @@ class ExamPaperAdd extends Component<any, States> {
                         } else {
                             message.error('试卷更新失败');
                         }
+                    },
+                    onCancel: () => {
+                    },
+                });
             } else {
+                Modal.confirm({
+                    title: `确认保存`,
+                    content: `是否保存试卷？`,
+                    onOk: async () => {
                         const res = await addExamPaper(data);
                         const success = res["success"];
                         if (success) {
@@ -349,6 +361,10 @@ class ExamPaperAdd extends Component<any, States> {
                         } else {
                             message.error('试卷保存失败');
                         }
+                    },
+                    onCancel: () => {
+                    },
+                });
             }
         } catch (error) {
         }

packages/examination/src/views/examPaper/examPaperList.tsx

@@ -323,10 +323,6 @@ class ExamPaperList extends Component<any, States> {
                 width: 200,
                 render: (record: any) => [
                     <span className='mr10 link' onClick={() => {
-                        Modal.confirm({
-                            title: `确认修改`,
-                            content: `是否修改试卷？`,
-                            onOk: () => {
                         this.props.history.push({
                             pathname: '/examPaperAdd',
                             state: {
@@ -334,10 +330,6 @@ class ExamPaperList extends Component<any, States> {
                                 isEdit: "true"
                             }
                         });
-                            },
-                            onCancel: () => {
-                            },
-                        });
                     }}>编辑</span>,
                     <span className='mr10 link' onClick={() => {
                         this.props.history.push({

packages/examination/src/views/question/questionAdd.tsx

@@ -1,9 +1,10 @@
 import React, { Component } from "react";
-import { Form, Input, Button, Radio, Checkbox, Select, message } from "antd";
+import {Form, Input, Button, Radio, Checkbox, Select, message, Modal} from "antd";
 import { dictionary } from "api/dict/index";
 import { addQuestion, findIndustry } from "api/question";
 import { CloseCircleOutlined } from '@ant-design/icons';
 import * as XLSX from "xlsx";
+import {addExamPaper} from "../../api/examPaper";
 
 const { Option } = Select;
 
@@ -136,7 +137,10 @@ class QuestionAdd extends Component<any, States> {
         this.formRef.current.validateFields().then((values: any) => {
             const questions: any = [];
             const { formIds } = this.state;
-
+            Modal.confirm({
+                title: `确认保存`,
+                content: `是否保存试题？`,
+                onOk: async () => {
                     formIds.forEach((formId) => {
                         let answer = values[`answer_${formId}`];
                         if (Array.isArray(answer)) {
@@ -168,6 +172,10 @@ class QuestionAdd extends Component<any, States> {
                     }).catch(() => {
                         message.error("新增试题时发生错误，请检查");
                     });
+                },
+                onCancel: () => {
+                },
+            });
         });
     };
 

packages/examination/src/views/question/questionEdit.tsx

@@ -1,5 +1,5 @@
 import React, { Component } from'react';
-import { Form, Input, Button, Radio, Checkbox, Select, message } from 'antd';
+import { Form, Input, Button, Radio, Checkbox, Select, message, Modal } from 'antd';
 import { dictionary } from "api/dict/index";
 import { findIndustry, getQuestionDetail, editQuestion } from 'api/question';
 import TextArea from "antd/es/input/TextArea";
@@ -91,6 +91,10 @@ class QuestionEdit extends Component<any, States> {
                 values.answer.sort();
                 values.answer = values.answer.join('，');
             }
+            Modal.confirm({
+                title: `确认修改`,
+                content: `是否修改试题？`,
+                onOk: () => {
                     editQuestion(values).then((res) => {
                         const success = res['success'];
                         if (success) {
@@ -102,6 +106,9 @@ class QuestionEdit extends Component<any, States> {
                     }).catch(() => {
                         message.error('修改时发生错误，请检查');
                     });
+                },
+                onCancel: () => {},
+            });
         });
     };
 

packages/examination/src/views/question/questionList.tsx

@@ -266,18 +266,10 @@ class QuestionList extends Component<any, States> {
                         this.handleDeleteQuestion(record.id);
                     }}>删除</span>,
                     <span className="mr10 link" onClick={() => {
-                        Modal.confirm({
-                            title: `确认修改`,
-                            content: `是否修改试题？`,
-                            onOk: () => {
                         this.props.history.push({
                             pathname: '/questionEdit',
                             state: { id: record.id }
                         });
-                            },
-                            onCancel: () => {
-                            },
-                        });
                     }}>修正</span>
                 ]
             },