feats

src/components/SearchSelect/index.jsx

@@ -11,7 +11,7 @@ export function transformQuery(fn, { searchKey = 'name', labelKey = 'name', valu
   return s => {
     const pageSize = !s ? 10 : 100;
     return fn({ pageSize, [searchKey]: s }).then(res => {
-      return (res.records || []).map(x => ({label: x[labelKey], value: x[valueKey]}));
+      return (res.records || []).map(x => ({...x, label: x[labelKey], value: x[valueKey]}));
     })
   }
 }
@@ -41,6 +41,7 @@ export default (props) => {
   return (
     <Select
       showSearch
+      allowClear
       defaultActiveFirstOption={false}
       showArrow={false}
       filterOption={false}

src/pages/check/components/QuForm.jsx

@@ -9,13 +9,15 @@ import {
 import { Form, Row, Col } from 'antd';
 import WangEditor from '@/components/Wangeditor';
 import SearchSelect, { transformQuery } from '@/components/SearchSelect';
-import { postTaCheckItemQu } from '@/service/tdlocquestion';
+import { postTaCheckItemQu } from '@/service/tacheckitemqu';
+import { getTdQuestion } from '@/service/tdquestion';
 
+const queryQu = transformQuery(getTdQuestion, { searchKey: 'title', labelKey: 'title', valueKey: 'quId' });
 
 export default (props) => {
   const {open, onOpenChange, quInfo, itemId, itemType, onChange} = props;
   const [form] = Form.useForm();
-  
+
   const onFinish = async (values) => {
     const data = {
       ...(quInfo || {}),
@@ -29,6 +31,20 @@ export default (props) => {
     return true;
   }
 
+  const onTplChange = (_, tpl) => {
+    if (tpl) {
+      form.resetFields();
+      form.setFieldsValue({
+        quType: tpl.quType,
+        title: tpl.title,
+        answerList: (tpl.quAnswerList || []).map(x => ({
+          answerCode: x.answerCode,
+          answer: x.answer,
+        })),
+      });
+    }
+  }
+
   React.useEffect(() => {
     if (quInfo) {
       form.setFieldsValue(quInfo);
@@ -43,15 +59,20 @@ export default (props) => {
       open={open}
       width={800}
       form={form}
-      destroyOnClose
       onFinish={onFinish}
       onOpenChange={onOpenChange}
       drawerProps={{
+        destroyOnClose: true,
         extra: (
           <>
           {
             itemType == 'survey' && (
-              <div></div>
+              <SearchSelect
+                placeholder="请输入题干搜索题库"
+                style={{width: '300px'}}
+                request={queryQu}
+                onChange={onTplChange}
+              />
             )
           }
           </>
@@ -156,32 +177,36 @@ export default (props) => {
           />
         </Col>
       </Row>
-      <Form.Item name="stand" label="评分标准">
-        <WangEditor
-          height="200px"
-          toolbarConfig={{
-            toolbarKeys: [
-              'headerSelect',
-              'blockquote',
-              '|',
-              'bold',
-              'underline',
-              'italic',
-              'color',
-              'fontSize',
-              '|',
-              'bulletedList',
-              'numberedList',
-            ]
-          }}
-        />
-      </Form.Item>
+      {
+        itemType == 'loc' && (
+          <Form.Item name="stand" label="评分标准">
+            <WangEditor
+              height="200px"
+              toolbarConfig={{
+                toolbarKeys: [
+                  'headerSelect',
+                  'blockquote',
+                  '|',
+                  'bold',
+                  'underline',
+                  'italic',
+                  'color',
+                  'fontSize',
+                  '|',
+                  'bulletedList',
+                  'numberedList',
+                ]
+              }}
+            />
+          </Form.Item>
+        )
+      }
       <ProFormList
         name="answerList"
         label="选项列表"
         copyIconProps={false}
       >
-        <Row gutter={24} style={{width: '730px'}}>
+        <Row gutter={24} style={{ width: '730px' }}>
           <Col span={6}>
             <ProFormText
               name="answerCode"

src/pages/check/components/QuList.jsx

@@ -1,8 +1,7 @@
 import React from 'react';
 import { Button, Card, Table, Space, Popconfirm } from 'antd';
 import useBool from '@/utils/hooks/useBool';
-import { getTaCheckItemQu } from '@/service/tdlocquestion';
-import { deleteTaCheckItemQu } from '@/service/tacheckitemqu';
+import { getTaCheckItemQu, deleteTaCheckItemQu } from '@/service/tacheckitemqu';
 import QuForm from './QuForm';
 
 export default (props) => {
@@ -62,7 +61,7 @@ export default (props) => {
     setCurItem();
     setOpen(true);
   }
-  
+
   const onEdit = (qu) => {
     setCurItem(qu);
     setOpen(true);
@@ -77,7 +76,7 @@ export default (props) => {
       setList(list.filter(x => x.quId !== qu.quId));
     }
   }
-  
+
   const onFinish = (res) => {
     let found = false;
     const newList = list.map(item => {
@@ -99,7 +98,7 @@ export default (props) => {
   React.useEffect(() => {
     if (itemId) {
       startLoading();
-      getTaCheckItemQu({pageSize: 500, itemId}).then((res) => {
+      getTaCheckItemQu({ pageSize: 500, itemId }).then((res) => {
         stopLoading();
         setList(res.records);
       }).catch(() => {

src/pages/question/list/index.jsx

@@ -7,7 +7,7 @@ import {
   ProFormList,
   PageContainer
 } from '@ant-design/pro-components';
-import { postTdLocQuestion, getTdLocQuestion, deleteTdLocQuestion, getTdLocQuestionById } from '@/service/tdlocquestion';
+import { postTdQuestion, getTdQuestion, deleteTdQuestion, getTdQuestionById } from '@/service/tdquestion';
 
 const QuItem = (props) => {
   const { qu, onEdit, onDelete } = props;
@@ -70,7 +70,7 @@ export default React.forwardRef((props, ref) => {
 
   const onFinish = async (values) => {
     const data = { ...(quInfo || {}), ...values, itemId };
-    const res = await postTdLocQuestion(data).then(x => x);
+    const res = await postTdQuestion(data).then(x => x);
     let found = false;
     const newList = list.map(item => {
       if (item.quId === res.quId) {
@@ -98,7 +98,7 @@ export default React.forwardRef((props, ref) => {
 
   const onDeleteQu = (qu) => {
     if (qu?.quId) {
-      deleteTdLocQuestion(qu.quId).then(() => {
+      deleteTdQuestion(qu.quId).then(() => {
         setList(list.filter(x => x.quId !== qu.quId));
       })
     } else {
@@ -114,7 +114,7 @@ export default React.forwardRef((props, ref) => {
 
   // React.useEffect(() => {
   //   if (itemId) {
-  //     getTdLocQuestion({ pageSize: 500, itemId }).then((res) => {
+  //     getTdQuestion({ pageSize: 500, itemId }).then((res) => {
   //       setList(res.records);
   //     });
   //   }
@@ -122,7 +122,7 @@ export default React.forwardRef((props, ref) => {
 
   React.useEffect(() => {
     if (itemId) {
-      getTdLocQuestionById({ pageSize: 500, itemId }).then((res) => {
+      getTdQuestionById({ pageSize: 500, itemId }).then((res) => {
         setList(res.records);
       });
     }

src/service/tdlocquanswer.js

@@ -1,26 +0,0 @@
-import request from '@/utils/request';
-
-/*
- * 分页查询
- */
-export const getTdLocQuAnswer = (params) => request('/api/tdLocQuAnswer', { params });
-
-/*
- * 新增数据
- */
-export const postTdLocQuAnswer = (data) => request('/api/tdLocQuAnswer', { data, method: 'post' });
-
-/*
- * 通过ID查询单条数据
- */
-export const getTdLocQuAnswerById = (id) => request(`/api/tdLocQuAnswer/${id}`);
-
-/*
- * 更新数据
- */
-export const putTdLocQuAnswer = (id, data) => request(`/api/tdLocQuAnswer/${id}`, { data, method: 'put' });
-
-/*
- * 通过主键删除数据
- */
-export const deleteTdLocQuAnswer = (id) => request(`/api/tdLocQuAnswer/${id}`, { method: 'delete' });

src/service/tdlocquestion.js

@@ -1,51 +0,0 @@
-import request from '@/utils/request';
-
-/*
- * 分页查询
- */
-export const getTaCheckItemQu = (params) => request('/api/taCheckItemQu', { params });
-
-/*
- * 新增数据
- */
-export const postTaCheckItemQu = (data) => request('/api/taCheckItemQu', { data, method: 'post' });
-
-/*
- * 通过ID查询单条数据
- */
-export const getTaCheckItemQuById = (id) => request(`/api/taCheckItemQu/${id}`);
-
-/*
- * 更新数据
- */
-export const putTaCheckItemQu = (id, data) => request(`/api/taCheckItemQu/${id}`, { data, method: 'put' });
-
-/*
- * 通过主键删除数据
- */
-export const deleteTaCheckItemQu = (id) => request(`/api/taCheckItemQu/${id}`, { method: 'delete' });
-
-/*
- * 分页查询
- */
-export const getTdLocQuestion = (params) => request('/api/tdLocQuestion', { params });
-
-/*
- * 新增数据
- */
-export const postTdLocQuestion = (data) => request('/api/tdLocQuestion', { data, method: 'post' });
-
-/*
- * 通过ID查询单条数据
- */
-export const getTdLocQuestionById = (id) => request(`/api/tdLocQuestion/${id}`);
-
-/*
- * 更新数据
- */
-export const putTdLocQuestion = (id, data) => request(`/api/tdLocQuestion/${id}`, { data, method: 'put' });
-
-/*
- * 通过主键删除数据
- */
-export const deleteTdLocQuestion = (id) => request(`/api/tdLocQuestion/${id}`, { method: 'delete' });

src/service/tdquanswer.js

@@ -0,0 +1,26 @@
+import request from '@/utils/request';
+
+/*
+ * 分页查询
+ */
+export const getTdQuAnswer = (params) => request('/api/tdQuAnswer', { params });
+
+/*
+ * 新增数据
+ */
+export const postTdQuAnswer = (data) => request('/api/tdQuAnswer', { data, method: 'post' });
+
+/*
+ * 通过ID查询单条数据
+ */
+export const getTdQuAnswerById = (id) => request(`/api/tdQuAnswer/${id}`);
+
+/*
+ * 更新数据
+ */
+export const putTdQuAnswer = (id, data) => request(`/api/tdQuAnswer/${id}`, { data, method: 'put' });
+
+/*
+ * 通过主键删除数据
+ */
+export const deleteTdQuAnswer = (id) => request(`/api/tdQuAnswer/${id}`, { method: 'delete' });

src/service/tdquestion.js

@@ -0,0 +1,26 @@
+import request from '@/utils/request';
+
+/*
+ * 分页查询
+ */
+export const getTdQuestion = (params) => request('/api/tdQuestion', { params });
+
+/*
+ * 新增数据
+ */
+export const postTdQuestion = (data) => request('/api/tdQuestion', { data, method: 'post' });
+
+/*
+ * 通过ID查询单条数据
+ */
+export const getTdQuestionById = (id) => request(`/api/tdQuestion/${id}`);
+
+/*
+ * 更新数据
+ */
+export const putTdQuestion = (id, data) => request(`/api/tdQuestion/${id}`, { data, method: 'put' });
+
+/*
+ * 通过主键删除数据
+ */
+export const deleteTdQuestion = (id) => request(`/api/tdQuestion/${id}`, { method: 'delete' });