Merge remote-tracking branch 'origin/bww-v1' into draw-develop

src/pages/teacher/ChooseClassModal.js

 import { connect } from 'dva';
 import React from 'react';
-import { Icon, Button, Row, Col, Input, Select, Checkbox, Table, Modal, Form, Alert, message } from 'antd';
+import { Icon, Button, Row, Col, Input, Select, Checkbox, Table, Modal, Form, Empty, message } from 'antd';
 import pageStyle from './ChooseClassModal.less';
 import { pageIn } from '../../utils/index';
 const { Option } = Select;
@@ -66,7 +66,7 @@ class ChooseClassModal extends React.Component {
         onCancel={this.close}
         onOk={this.save}
         width={570}
-        heigh={432}
+        heigh={600}
         confirmLoading={submitting}
       >
         <Form labelAlign="left">
@@ -79,17 +79,11 @@ class ChooseClassModal extends React.Component {
               </Select>,
             )}
           </FormItem>
-          {courseList.length > 0 &&
-          <div className={pageStyle.checkwrap}>
-            <FormItem {...formItemModalLineLayout}>
-              {getFieldDecorator('class_ids', {
+          {classList.length > 0 ?
+            <div className={pageStyle.checkwrap}>
+              <FormItem {...formItemModalLineLayout}>
+                {getFieldDecorator('class_ids', {
                 initialValue: defaultClassValues,
-                rules: [
-                  {
-                    required: true,
-                    message: '请选择班级',
-                  },
-                ],
               })(
                 <CheckboxGroup
                   onChange={e => handleCheckClass(e)}
@@ -100,8 +94,8 @@ class ChooseClassModal extends React.Component {
 
                 </CheckboxGroup>,
               )}
-            </FormItem>
-          </div> }
+              </FormItem>
+            </div> : <div><Empty /></div> }
         </Form>
       </Modal>
     );