+
diff --git a/admin/src/pages/questionbank/index.tsx b/admin/src/pages/questionbank/index.tsx
index fa278f2..f2949bb 100644
--- a/admin/src/pages/questionbank/index.tsx
+++ b/admin/src/pages/questionbank/index.tsx
@@ -99,7 +99,8 @@ const QuestionBank = () => {
const type = history.location.pathname === '/questionbank/attestation' ? 1 : 0 ; // 题库类型
const actionRef = useRef
();
-
+ const formRef = useRef();
+
const [questionType, setQuestionType] = useState([]);
const [parsing, setParsing] = useState();
@@ -114,6 +115,7 @@ const QuestionBank = () => {
const [pageNumber, setPageNumber] = useState(1)
//const [answertrueValues, setAnswertrueValues] = useState(); // 编辑试题答案项值
+ //const [options, setOptions] = useState([]); // 设置当前选项, 用于删除选项时判断
/** 表单项定义 */
const columns: ProColumns[] = [
@@ -233,7 +235,7 @@ const QuestionBank = () => {
dependencies:['answers'],
renderFormItem: (item, { defaultRender, ...rest }, form) => {
console.log('正确答案...', form.getFieldValue('answers'))
- // 需要处理 关联长度变化及编辑回显
+ // 关联长度变化及编辑回显
console.log('edit answertrue11', item)
console.log('form::::::',form.getFieldValue('answertrue'))
console.log('rest', rest)
@@ -245,12 +247,13 @@ const QuestionBank = () => {
for(let i=0; i {
title: '题干',
search: false,
dataIndex: 'question_stem',
- render: (text: React.ReactNode, record: T, index: number) => (<>{record?.id} {text}),
+ render: (text: React.ReactNode, record: T, index: number) => ({record?.id} {text}),
},
avatar: {
title: '题型',
@@ -729,14 +732,41 @@ const QuestionBank = () => {
footer={null}
>
+ formRef={formRef}
layout="horizontal"
layoutType="Form"
labelCol={{ span: 8 }}
wrapperCol={{ span: 12 }}
+ onValuesChange={()=>{
+ //console.log('formRef', formRef.current.getFieldInstance('answertrue'))
+ //console.log('formRef.current', formRef.current.getFieldsValue(['answertrue']))
+ //console.log('v', value)
+ //console.log('answers', formRef?.current?.getFieldValue('answers'))
+ const answerTrue = formRef?.current?.getFieldValue('answertrue');
+ let fixed_answertrue;
+ // 如果正确答案为字符串(单选 / 判断)
+ if(typeof answerTrue === 'string'){
+ console.log('string.....')
+ fixed_answertrue = labels.indexOf(answerTrue) < (formRef?.current?.getFieldValue('answers')?.length || 0) ? answerTrue : undefined;
+ }else if(answerTrue?.length > 0){
+ fixed_answertrue = answerTrue?.filter((item, key)=>{
+ return labels.indexOf(item) < (formRef?.current?.getFieldValue('answers')?.length || 0)
+ })
+ }
+ console.log('answerTrue', answerTrue)
+ /*
+ const */
+ //console.log('fixed', fixed_answertrue)
+ formRef?.current?.setFieldsValue({answertrue: fixed_answertrue})
+ }}
onFinish={async (values: any) => {
+ //console.log('formRef.current', formRef.current.getFieldsValue(['answertrue']))
+
// 表单处理
console.log('columns:', columns);
- console.log('values:', values);
+ console.log('values:', values);
+
+ return false
const opts = [];
values?.answers?.forEach((item, key)=>{
//
diff --git a/admin/src/pages/training/option/index.tsx b/admin/src/pages/training/option/index.tsx
index 9c30a99..06a0715 100644
--- a/admin/src/pages/training/option/index.tsx
+++ b/admin/src/pages/training/option/index.tsx
@@ -40,18 +40,18 @@ const handleAdd = async (fields: TableListItem) => {
* @param fields
*/
const handleUpdate = async (fields: FormValueType, currentRow?: TableListItem) => {
- const hide = message.loading('正在配置');
+ const hide = message.loading('正在更新');
try {
await saveTrain({
...currentRow,
...fields,
});
hide();
- message.success('配置成功');
+ message.success('操作成功');
return true;
} catch (error) {
hide();
- message.error('配置失败请重试！');
+ message.error('操作失败请重试！');
return false;
}
};