bug

admin/src/pages/course/subject/step/index.tsx

@@ -397,7 +397,7 @@ export default () => {
 
             }}*/
             onFinish={async (value: any) => {
-              console.log(subjectId, 'subjectId')
+              console.log(value, 'subjectId')
 
               const url = value?.upload[0]?.url?.replace('/dsideal_yy/html/', '') || value?.upload[0]?.response?.url;
               const info = await saveSubject({
@@ -435,7 +435,7 @@ export default () => {
                   width="xl"
                   // tooltip="最长为 6 位汉字，需要与考生身份证一致"
                   placeholder="请输入介绍"
-                  rules={[{ required: true }]}
+                // rules={[{ required: true }]}
                 // value="锦书"
                 // disabled
 

admin/src/pages/examinationrules/normal/index.tsx

@@ -2,7 +2,7 @@
 import React, { useState, useRef } from 'react';
 import { useRequest, history } from 'umi';
 import { PlusOutlined, TagsOutlined, UploadOutlined } from '@ant-design/icons';
-import { Button, message, Input, Drawer, Modal, Col, Row, Space, Upload, Typography } from 'antd';
+import { Button, message, Input, Drawer, Modal, Col, Row, Space, Upload, Typography, Popconfirm } from 'antd';
 import { PageContainer, FooterToolbar } from '@ant-design/pro-layout';
 import type { ProColumns, ActionType } from '@ant-design/pro-table';
 import ProTable from '@ant-design/pro-table';
@@ -192,18 +192,22 @@ const ExaminationRules: React.FC = () => {
           >
             编辑
           </Button>,
-          <Button type="link"
-            key="remove"
-            disabled={record.b_use ? true : false}
-            onClick={() => {
+
+
+          <Popconfirm key="popconfirm" title={`确认删除当前考试吗?`} okText="是" cancelText="否"
+            onConfirm={async () => {
               handleRemove([{ key: record?.id }], record); // 调用批量删除函数（如果接口不支持批量需要在service中处理）
               setSelectedRows([]);
               actionRef.current?.reloadAndRest?.();
             }}
-            style={{ padding: '0 2px 0 0' }}
           >
-            <Typography.Text disabled={record.b_use ? true : false} type={"danger"}>删除</Typography.Text>
-          </Button>,
+            <Button type="link" danger disabled={record.b_use ? true : false}>删除</Button>
+          </Popconfirm>
+
+
+
+
+          ,
           <a
             key="b_use"
             onClick={async () => {

admin/src/pages/questionbank/index.tsx

@@ -9,16 +9,17 @@ import styles from './style.less';
 //import SubMenu from 'antd/lib/menu/SubMenu';
 //import ProCard from '@ant-design/pro-card';
 import ProList from '@ant-design/pro-list';
-import { ReactText, useEffect, useRef, useState } from 'react';
+import type { ReactText } from 'react';
+import { useEffect, useRef, useState } from 'react';
 import { PlusOutlined, DeleteOutlined, DownloadOutlined, UploadOutlined, EditOutlined, EyeOutlined, EyeInvisibleOutlined, DownOutlined, UserOutlined } from '@ant-design/icons';
 import { exportQuestionTemplate, queryQuestionById, queryQuestionList, queryQuestionType, removeQuestion, saveQuestion } from './service';
 import { useParams, useRequest, history, useRouteMatch } from 'umi';
 import { queryCourseListByTag, queryCourseView, queryTagList } from '@/pages/course/option/service';
 import ProForm, { BetaSchemaForm, ProFormCheckbox, ProFormList, ProFormRadio, ProFormSelect, ProFormText } from '@ant-design/pro-form';
-import { DataItem } from '../dashboard/analysis/data';
-import { ActionType, ProColumns } from '@ant-design/pro-table';
+import type { DataItem } from '../dashboard/analysis/data';
+import type { ActionType, ProColumns } from '@ant-design/pro-table';
 import ProFormRichEdit from '../course/subject/components/ProFormRichEdit';
-import { TableListItem } from '../course/option/data';
+import type { TableListItem } from '../course/option/data';
 import AnswersSelector from './components/AnswersEditor';
 //const { Paragraph } = Typography;
 const { Text, Link } = Typography;
@@ -295,22 +296,31 @@ const QuestionBank = () => {
           {
             required: true,
             message: '请填写试题解析',
-          },
+          }, {
+            validator: (rule, value) => {
+              console.log("表单:", value, value.replace(/(^\s*)|(\s*$)/g, ""), "|")
+              if (value.replace(/(^\s*)|(\s*$)/g, "") === "") {
+                return Promise.reject('请填写试题解析')
+              } else {
+                return Promise.resolve()
+              }
+            }
+          }
         ]
       },
       renderText: (val: string) => (<div dangerouslySetInnerHTML={{ __html: val }} />),
-      renderFormItem: (item, { defaultRender, ...rest }, form) => (
-        <ProFormRichEdit
-          name="parsing"
-          label=""
-          width="xl"
-          // tooltip="最长为 6 位汉字，需要与考生身份证一致"
-          placeholder="请填写试题解析"
-          // rules={[{ required: true }]}
-          value=""
-          // disabled
-        />
-      ),
+      // renderFormItem: (item, { defaultRender, ...rest }, form) => (
+      //   <ProFormRichEdit
+      //     name="parsing"
+      //     label=""
+      //     width="xl"
+      //     // tooltip="最长为 6 位汉字，需要与考生身份证一致"
+      //     placeholder="请填写试题解析"
+      //     // rules={[{ required: true }]}
+      //     value=""
+      //     // disabled
+      //   />
+      // ),
     },
 
   ]
@@ -772,6 +782,8 @@ const QuestionBank = () => {
           }}
           onFinish={async (values: any) => {
             //console.log('formRef.current', formRef.current.getFieldsValue(['answertrue']))
+            console.log(values);
+            return
 
             // 表单处理
             console.log('columns:', columns);