From 1c8ad3656e001d9bc24cbe0dad8ddbea6fb8ad2f Mon Sep 17 00:00:00 2001
From: zhengpengju <zpj0219@126.com>
Date: Sun, 20 Mar 2022 22:02:33 +0800
Subject: [PATCH] fix

---
 .../components/QuestionSelector.tsx           | 22 ++++++++++++-------
 .../examinationrules/normal/step/index.tsx    |  5 +++--
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/admin/src/pages/examinationrules/components/QuestionSelector.tsx b/admin/src/pages/examinationrules/components/QuestionSelector.tsx
index dfa97ad..10ad749 100644
--- a/admin/src/pages/examinationrules/components/QuestionSelector.tsx
+++ b/admin/src/pages/examinationrules/components/QuestionSelector.tsx
@@ -5,7 +5,7 @@ import { Button, message } from 'antd';
 //import { useRequest } from 'umi';
 //import { queryFakeList } from './service';
 //import type { CardListItemDataType } from './data';
-import styles from '../style.less';
+//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';
@@ -112,7 +112,7 @@ const QuestionSelector = (props: any, ref: any) => {
   const [selectedRowsState, setSelectedRows] = useState<API.RuleListItem[]>([]);
   const [addType, setAddType] = useState({name: '', value: 0});
 
-  const labels = ['A','B','C','D','E']
+  const labels = ['A','B','C','D','E','F','G','H','I']
 
   /** 获取题型 */
   const { data } = useRequest(() => {
@@ -137,18 +137,24 @@ const QuestionSelector = (props: any, ref: any) => {
     },
   }));
   
+  
   return (
     <>
-    <ProTable
+    <ProTable      
       pagination={{
         defaultPageSize: 10,
         showSizeChanger: false,
       }}
-      search={{
-        optionRender: false,
-        collapsed: false,
-        labelWidth: 40,
-      }}
+      search={
+        {
+          className:'questionSeatch',
+          //optionRender: false,
+          defaultCollapsed: false,
+          collapsed: false,
+          labelWidth: 'auto',
+          span:6
+        }
+      }
       actionRef={actionRef}
       toolBarRender={false}
       rowKey="id"
diff --git a/admin/src/pages/examinationrules/normal/step/index.tsx b/admin/src/pages/examinationrules/normal/step/index.tsx
index d4ce38e..557cc41 100644
--- a/admin/src/pages/examinationrules/normal/step/index.tsx
+++ b/admin/src/pages/examinationrules/normal/step/index.tsx
@@ -633,7 +633,8 @@ export default () => {
 
             <ModalForm
                 title={`手动组卷`}
-                width="60%"
+                width="80%"
+                layout='horizontal'
                 visible={selectorModalVisible}
                 onVisibleChange={handleSelectorModalVisible}
                 onFinish={async (values) => {
@@ -658,7 +659,7 @@ export default () => {
             </ModalForm>
             <ModalForm
                 title={`系统组卷`}
-                width="60%"
+                width="80%"
                 visible={autoModalVisible}
                 onVisibleChange={handleAutoModalVisible}
                 onFinish={async () => {