:bug: 修复模态选择框单选不能选中bug

:zap: 调整有声读物、课件创建页面部分样式

src/components/AXTableSelector/Selector.js

@@ -17,7 +17,7 @@ export default class Selector extends PureComponent {
     const rowKeys = getRowKeys(rows || []);
     this.state = {
       searchKey: 'code',
-      searchValue: '',
+      searchValue: undefined,
       selectedRows: rows,
       selectedRowKeys: rowKeys,
     };
@@ -237,6 +237,10 @@ export default class Selector extends PureComponent {
             onClick={this.handleFinishOperation}
           >完成
           </Button>
+          <Button
+            style={{ marginLeft: 20, background: '#5cdbd3' }}
+          >{`已选择【${(selectedRows || []).length}】项`}
+          </Button>
         </div>
       </div>
     );

src/components/AXTableSelector/SingleSelectTable.js

@@ -23,17 +23,12 @@ export default class SingleSelectTable extends Component {
     selectedRowKeys: null,
   };
 
-  handleRowClick = (record) => {
+  handleRowSelectChange = (record) => {
     this.setState({
       selectedRowKeys: record.key,
     });
     this.props.onSingleTransfer(record);
   };
-  handleRowSelectChange = (key) => {
-    this.setState({
-      selectedRowKeys: key,
-    });
-  };
   handleTableChange = (page, pageSize) => {
     this.props.onChange(page, pageSize);
   };
@@ -49,7 +44,7 @@ export default class SingleSelectTable extends Component {
     };
     const onRowClick = (record) => {
       return {
-        onClick: () => this.handleRowSelectChange(record.key),
+        onClick: () => this.handleRowSelectChange(record),
       };
     };
     const renderTableFooter = (paginationProps) => {

src/components/AXTableSelector/columnsMap.js

@@ -1,10 +1,14 @@
 import React from 'react';
+import { Icon } from 'antd';
 import {
   genAbsolutePicUrl,
   renderProductType,
   renderVideoQuality,
-  renderCategory, renderStatus,
+  renderCategory,
+  renderStatus,
+  getResourceTypeName,
 } from '../../utils/utils';
+import { Hotax } from '../../utils/config';
 import styles from './columnsMap.less';
 
 function renderPicture(path) {
@@ -25,6 +29,47 @@ function renderPictureData(record) {
 }
 
 const clMap = {
+  Resource: {
+    columns: [{
+      title: '缩略图',
+      key: 1,
+      render: (_, record) => {
+        const { type } = record;
+        if (type === Hotax.RESOURCE_IMAGE) {
+          const { path } = record;
+          return (
+            <div className={styles.thumb}>
+              <img src={genAbsolutePicUrl(path)} alt="" />
+            </div>
+          );
+        } else if (type === Hotax.RESOURCE_AUDIOBOOK) {
+          const { img } = record;
+          const { path } = img || {};
+          return (
+            <div className={styles.thumb}>
+              <img src={genAbsolutePicUrl(path)} alt="" />
+            </div>
+          );
+        } else {
+          return (
+            <Icon style={{ fontSize: 50 }} type="video-camera" />
+          );
+        }
+      },
+      width: '25%',
+    }, {
+      title: '编号/名称',
+      key: 2,
+      render: (_, record) => renderPictureData(record),
+      width: '40%',
+    }, {
+      title: '资源类型',
+      key: 3,
+      dataIndex: 'type',
+      render: text => getResourceTypeName(text),
+      align: 'center',
+    }],
+  },
   Picture: {
     columns: [{
       title: '图片',

src/routes/Product/Courseware/CoursewareCreate.js

@@ -2,14 +2,12 @@ import React, { Component } from 'react';
 import pathToRegexp from 'path-to-regexp';
 import { connect } from 'dva';
 import { routerRedux } from 'dva/router';
-import { Form, Modal, Card, Button, Input, Radio, Switch } from 'antd';
+import { Form, Modal, Card, Icon, Button, Input, Radio, Switch } from 'antd';
 import AXDragSortTable from '../../../components/AXDragSortTable';
 import Selector from '../../../components/AXTableSelector/Selector';
-import AXVideoPlayer from '../../../components/AXVideoPlayer';
 import FooterToolbar from '../../../components/FooterToolbar';
 import {
   genAbsolutePicUrl,
-  renderStatus,
   statusToBool,
   boolToStatus,
   getResourceTypeName,
@@ -196,7 +194,7 @@ export default class CoursewareCreatePage extends Component {
       dataIndex: 'path',
       key: 1,
       render: (text, record) => {
-        const { type, url, format } = record;
+        const { type } = record;
         if (type === Hotax.RESOURCE_IMAGE) {
           return (
             <div className={styles.picture}>
@@ -214,12 +212,7 @@ export default class CoursewareCreatePage extends Component {
         } else {
           return (
             <div className={styles.video}>
-              <AXVideoPlayer
-                width="100%"
-                height="100%"
-                url={url}
-                isM3U8={format === 'm3u8'}
-              />
+              <Icon style={{ fontSize: 50 }} type="video-camera" />
             </div>
           );
         }
@@ -227,33 +220,22 @@ export default class CoursewareCreatePage extends Component {
       width: '10%',
       align: 'center',
     }, {
-      title: '编号',
+      title: '资源编号',
       dataIndex: 'code',
       key: 2,
-      width: '20%',
+      width: '25%',
     }, {
-      title: '名称',
+      title: '资源名称',
       dataIndex: 'name',
       key: 3,
-      width: '20%',
+      width: '25%',
     }, {
-      title: '类型',
+      title: '资源类型',
       dataIndex: 'type',
       key: 4,
       width: '10%',
       render: text => getResourceTypeName(text),
       align: 'center',
-    }, {
-      title: '格式',
-      dataIndex: 'format',
-      key: 5,
-      align: 'center',
-    }, {
-      title: '状态',
-      dataIndex: 'status',
-      key: 6,
-      render: text => renderStatus(text),
-      align: 'center',
     }];
 
     const renderCardName = () => {
@@ -277,21 +259,14 @@ export default class CoursewareCreatePage extends Component {
         </Radio.Group>
       );
     };
-    // 根据选定的资源列表类型决定渲染样式
     const renderResourceList = () => {
-      if (!resourceList.length) {
-        return (
-          <h3 style={{ color: 'red' }}>你还未选择任何资源,请点击上方资源列表进行选择</h3>
-        );
-      } else {
-        return (
-          <AXDragSortTable
-            columns={imageColumns}
-            data={resourceList}
-            onChange={this.handleDragSortTableChange}
-          />
-        );
-      }
+      return (
+        <AXDragSortTable
+          columns={imageColumns}
+          data={resourceList}
+          onChange={this.handleDragSortTableChange}
+        />
+      );
     };
     return (
       <div>
@@ -363,6 +338,7 @@ export default class CoursewareCreatePage extends Component {
                 multiple={resourceType === 'Picture' || resourceType === 'AudioBook'}
                 loading={loading}
                 selectorName={resourceType}
+                fixedName="Resource"
                 list={resource.list}
                 pageNo={resource.pageNo}
                 pageSize={resource.pageSize}

src/routes/Product/Courseware/CoursewareCreate.less

@@ -17,6 +17,5 @@
 
 .video {
   width: 100px;
-  height: 80px;
   text-align: center;
 }

src/routes/Product/Courseware/CoursewareList.js

@@ -101,11 +101,11 @@ export default class CoursewareListPage extends Component {
     }];
     const basicSearch = {
       keys: [{
-        name: '课件名称',
-        field: 'name',
-      }, {
         name: '课件编号',
         field: 'code',
+      }, {
+        name: '课件名称',
+        field: 'name',
       }],
     };
     const pagination = {

src/routes/Product/Lesson/LessonList.js

@@ -101,11 +101,11 @@ export default class LessonListPage extends Component {
     }];
     const basicSearch = {
       keys: [{
-        name: '课名称',
-        field: 'name',
-      }, {
         name: '课编号',
         field: 'code',
+      }, {
+        name: '课名称',
+        field: 'name',
       }],
     };
     const pagination = {

src/routes/Product/Training/TrainingCreate.js

@@ -343,52 +343,31 @@ export default class TrainingCreatePage extends Component {
           </Form>
         </Card>
         {/* 封面及走马灯选择Card */}
-        <Card title="封面 | 图册" style={{ marginBottom: 70 }}>
-          <Row gutter={16}>
-            <Col
-              md={{ span: 12, offset: 1 }}
-              lg={{ span: 8, offset: 2 }}
-              xl={{ span: 8, offset: 2 }}
-              xxl={{ span: 6, offset: 5 }}
+        <Row gutter={16} style={{ marginBottom: 70 }}>
+          <Col span={12}>
+            <Card
+              title="师训封面"
+              cover={<img style={{ height: 300 }} src={genAbsolutePicUrl(coverUrl)} alt="" />}
+              className={styles.trainingCover}
             >
-              <Card
-                hoverable
-                title={renderCoverCardName()}
-              >
-                <div className={styles.cover}>
-                  {coverUrl && (
-                    <img src={genAbsolutePicUrl(coverUrl)} alt="" />
-                  )}
-                </div>
-                {!coverSelectorDestroy && getResourceModal(true)}
-              </Card>
-            </Col>
-            <Col
-              md={{ span: 10, offset: 2 }}
-              lg={{ span: 8, offset: 4 }}
-              xl={{ span: 6, offset: 4 }}
-              xxl={{ span: 4, offset: 5 }}
-            >
-              <Card
-                hoverable
-                title={renderCarouselCardName()}
-              >
-                <div className={styles.carousel}>
-                  <Carousel autoplay>
-                    {
-                      imgList.map(
-                        path => (
-                          <img key={path} src={genAbsolutePicUrl(path)} alt="" />
-                        )
-                      )
-                    }
-                  </Carousel>
-                </div>
-                {!carouselSelectorDestroy && getResourceModal(false)}
-              </Card>
-            </Col>
-          </Row>
-        </Card>
+              {!coverSelectorDestroy && getResourceModal(true)}
+            </Card>
+          </Col>
+          <Col span={12}>
+            <Card title="详情图册">
+              <Carousel autoplay>
+                {
+                  imgList.map(
+                    path => (
+                      <img style={{ height: 300 }} key={path} src={genAbsolutePicUrl(path)} alt="" />
+                    )
+                  )
+                }
+              </Carousel>
+              {!carouselSelectorDestroy && getResourceModal(false)}
+            </Card>
+          </Col>
+        </Row>
         <FooterToolbar style={{ width: '100%' }}>
           <Button
             onClick={this.handlePageBack}

src/routes/Product/Training/TrainingCreate.less

@@ -23,11 +23,13 @@
   }
 }
 
-.carousel {
-  width: 100%;
-  height: 200px;
-  img {
-    width: 100%;
-    height: 100%;
+.trainingCover {
+  :global {
+    .ant-card-cover {
+      padding: 16px;
+    }
+    .ant-card-body {
+      padding: 0 !important;
+    }
   }
 }

src/routes/Resource/AudioBook/AudioBookList.js

@@ -141,7 +141,7 @@ export default class AudioBookListPage extends Component {
       title: '有声读物配图',
       key: 3,
       dataIndex: 'img',
-      width: '20%',
+      width: '18%',
       render: (text) => {
         const { path } = text || {};
         return (
@@ -158,9 +158,7 @@ export default class AudioBookListPage extends Component {
       render: (text) => {
         const { url } = text || {};
         return (
-          <div className={styles.audioWrapper}>
-            <audio controls src={url}>浏览器暂不支持播放</audio>
-          </div>
+          <audio controls src={url}>浏览器暂不支持播放</audio>
         );
       },
     }, {
@@ -168,7 +166,7 @@ export default class AudioBookListPage extends Component {
       key: 5,
       dataIndex: 'gmtModified',
       render: text => moment(text).format('YYYY-MM-DD HH:mm:ss'),
-      width: '17%',
+      width: '19%',
     }, {
       title: '操作',
       key: 6,

src/routes/Resource/AudioBook/AudioBookList.less

@@ -15,11 +15,3 @@
   }
 }
 
-.audioWrapper {
-  width: 180px;
-  height: 35px;
-  audio {
-    width: 100%;
-    height: 100%;
-  }
-}

src/routes/Shelves/ShelvesList.js

@@ -179,11 +179,11 @@ export default class ShelvesListPage extends Component {
     }];
     const basicSearch = {
       keys: [{
-        name: `${productNameMap[scene]}名称`,
-        field: 'name',
-      }, {
         name: `${productNameMap[scene]}编号`,
         field: 'code',
+      }, {
+        name: `${productNameMap[scene]}名称`,
+        field: 'name',
       }],
     };
     const pagination = {