课程、配套、课程包管理代码优化

src/models/combo/combo.js

@@ -1,3 +1,4 @@
+import { message } from 'antd';
 import { query, create, update, remove } from '../../services/product';
 import modelExtend from 'dva-model-extend';
 import queryString from 'query-string';
@@ -49,44 +50,24 @@ export default modelExtend(pageModel, {
       }
       yield put({ type: 'changeLoading', payload: { listLoading: false }});
     },
-    * create ({ payload, callback }, { call, put }) {
-      const { data, success } = yield call(create, payload);
-      if (success) {
-        if (callback) callback();
-      }
-    },
-    * update ({ payload, callback }, { call, put }) {
-      const { data, success } = yield call(update, payload);
-      if (success) {
-        yield put({ type: 'hideModal' });
-        if (callback) callback();
-      }
-    },
     * delete ({ payload, callback }, { call, put }) {
       const { data, success } = yield call(remove, payload);
       if (success) {
-        if (callback) callback();
-      }
-    },
-    * recover ({ payload, callback }, { call, put }) {
-      const { data, success } = yield call(update, payload);
-      if (success) {
+        message.success('删除成功!');
         if (callback) callback();
       }
     },
   },
 
   reducers: {
-    changeLoading(state, { payload }) {
-      return { ...state, ...payload };
+    changeLoading(state, action) {
+      return { ...state, ...action.payload };
     },
-
-    showModal(state, { payload }) {
-      return { ...state, ...payload, modalVisible: true };
+    showModal(state, action) {
+      return { ...state, ...action.payload, modalVisible: true };
     },
-
-    hideModal(state) {
-      return { ...state, modalVisible: false };
+    hideModal(state, action) {
+      return { ...state, ...action.payload, modalVisible: false };
     },
   }
 })

src/models/combo/detail.js

@@ -23,8 +23,7 @@ export default {
           dispatch({ type: 'saveFilters', payload: state });
           dispatch({ type: 'saveOperType', payload: { operType: 'update' } });
         }
-        if (pathname === '/product/package/add') {
-          dispatch({ type: 'saveFilters', payload: state });
+        if (pathname == '/product/package/add') {
           dispatch({ type: 'saveFilters', payload: state });
           dispatch({ type: 'saveOperType', payload: { operType: 'create' } });
         }

src/models/course/course.js

@@ -15,7 +15,7 @@ export default modelExtend(pageModel, {
   subscriptions: {
     setup({ dispatch, history }) {
       history.listen((location) => {
-        if (location.pathname === '/product/course') {
+        if (location.pathname == '/product/course') {
           const payload = checkSearchParams(queryString.parse(location.search));
           dispatch({ type: 'query', payload });
         }
@@ -49,13 +49,6 @@ export default modelExtend(pageModel, {
         if (callback) callback();
       }
     },
-    * recover ({ payload, callback }, { call, put }) {
-      const { data, success } = yield call(update, payload);
-      if (success) {
-        message.success('恢复成功!');
-        if (callback) callback();
-      }
-    },
   },
 
   reducers: {

src/models/course/detail.js

@@ -25,8 +25,7 @@ export default {
           dispatch({ type: 'saveFilters', payload: state });
           dispatch({ type: 'saveOperType', payload: { operType: 'update' } });
         }
-        if (pathname === '/product/course/add') {
-          dispatch({ type: 'saveFilters', payload: state });
+        if (pathname == '/product/course/add') {
           dispatch({ type: 'saveFilters', payload: state });
           dispatch({ type: 'saveOperType', payload: { operType: 'create' } });
         }

src/models/support/detail.js

@@ -24,7 +24,7 @@ export default {
           dispatch({ type: 'saveFilters', payload: state });
           dispatch({ type: 'saveOperType', payload: { operType: 'update' } });
         }
-        if (pathname === '/product/support/add') {
+        if (pathname == '/product/support/add') {
           dispatch({ type: 'saveFilters', payload: state });
           dispatch({ type: 'saveFilters', payload: state });
           dispatch({ type: 'saveOperType', payload: { operType: 'create' } });
@@ -61,41 +61,81 @@ export default {
   },
 
   reducers: {
-    changeLoading(state, { payload }) {
-      return { ...state, ...payload };
+    changeLoading(state, action) {
+      return { ...state, ...action.payload };
     },
-    querySuccess(state, { payload }) {
-      return { ...state, currentItem: payload };
+    querySuccess(state, action) {
+      return {
+        ...state,
+        currentItem: action.payload,
+      };
     },
-    saveFilters(state, { payload: filters }) {
-      return { ...state, filters };
+    saveFilters(state, action) {
+      return {
+        ...state,
+        filters: action.payload.filters,
+      };
     },
-    showSupportModal(state, { payload }) {
-      return { ...state, ...payload, supportModalVisible: true };
+    showSupportModal(state, action) {
+      return {
+        ...state,
+        ...action.payload,
+        supportModalVisible: true,
+      };
     },
-    hideSupportModal(state) {
-      return { ...state, supportModalVisible: false };
+    hideSupportModal(state, action) {
+      return {
+        ...state,
+        ...action.payload,
+        supportModalVisible: false,
+      };
     },
-    showResourceModal(state, { payload }) {
-      return { ...state, ...payload, resourceModalVisible: true };
+    showResourceModal(state, action) {
+      return {
+        ...state,
+        ...action.payload,
+        resourceModalVisible: true,
+      };
     },
-    hideResourceModal(state) {
-      return { ...state, resourceModalVisible: false };
+    hideResourceModal(state, action) {
+      return {
+        ...state,
+        ...action.payload,
+        resourceModalVisible: false,
+      };
     },
-    saveSupportList(state, { payload: { supportList } }) {
-      const currentItem = { ...state.currentItem, supportList };
-      return { ...state, supportModalVisible: false, currentItem };
+    saveSupportList(state, action) {
+      return {
+        ...state,
+        supportModalVisible: false,
+        currentItem: {
+          ...state.currentItem,
+          supportList: action.payload.supportList,
+        },
+      };
     },
-    saveCoverImg(state, { payload: { coverUrl } }) {
-      const currentItem = { ...state.currentItem, coverUrl };
-      return { ...state, resourceModalVisible: false, currentItem };
+    saveCoverImg(state, action) {
+      return {
+        ...state,
+        resourceModalVisible: false,
+        currentItem: {
+          ...state.currentItem,
+          coverUrl: action.payload.coverUrl,
+        },
+      };
     },
-    saveImgList(state, { payload: { imgList } }) {
-      const currentItem = { ...state.currentItem, imgList };
-      return { ...state, resourceModalVisible: false, currentItem };
+    saveImgList(state, action) {
+      return {
+        ...state,
+        resourceModalVisible: false,
+        currentItem: {
+          ...state.currentItem,
+          imgList: action.payload.imgList,
+        }
+      };
     },
-    saveOperType(state, { payload }) {
-      return { ...state, ...payload };
+    saveOperType(state, action) {
+      return { ...state, ...action.payload };
     },
     initState(state) {
       return { ...state, currentItem: {}, itemLoading: false };

src/models/support/support.js

@@ -1,3 +1,4 @@
+import { message } from 'antd';
 import { query, update, remove } from '../../services/product';
 import modelExtend from 'dva-model-extend';
 import queryString from 'query-string';
@@ -14,7 +15,7 @@ export default modelExtend(pageModel, {
   subscriptions: {
     setup({ dispatch, history }) {
       history.listen((location) => {
-        if (location.pathname === '/product/support') {
+        if (location.pathname == '/product/support') {
           const payload = checkSearchParams(queryString.parse(location.search));
           dispatch({ type: 'query', payload });
         }
@@ -44,20 +45,15 @@ export default modelExtend(pageModel, {
     * delete ({ payload, callback }, { call, put }) {
       const { data, success } = yield call(remove, payload);
       if (success) {
-        if (callback) callback();
-      }
-    },
-    * recover ({ payload, callback }, { call, put }) {
-      const { data, success } = yield call(update, payload);
-      if (success) {
+        message.success('删除成功!');
         if (callback) callback();
       }
     },
   },
 
   reducers: {
-    changeLoading(state, { payload }) {
-      return { ...state, ...payload };
+    changeLoading(state, action) {
+      return { ...state, ...action.payload };
     }
   }
 })

src/routes/Combo/Edit/index.js

@@ -33,9 +33,9 @@ export default class PackageProfile extends PureComponent {
     const { products } = currentItem;
     const boundPriceProducts = [...products];
     if (field == 'cp') {
-      boundPriceProducts.map(item => item.pid === record.pid ? item.cpPrice = value : null);
+      boundPriceProducts.map(item => item.pid == record.pid ? item.cpPrice = value : null);
     } else if (field == 'pj') {
-      boundPriceProducts.map(item => item.pid === record.pid ? item.merchantPrice = value : null);
+      boundPriceProducts.map(item => item.pid == record.pid ? item.merchantPrice = value : null);
     }
     this.props.dispatch({
       type: 'comboDetail/savePrice',
@@ -141,11 +141,11 @@ export default class PackageProfile extends PureComponent {
         }));
       }
       // add params `status`
-      if (operType === 'create') {
+      if (operType == 'create') {
         data.status = Codes.CODE_NORMAL;
         data.type = Codes.CODE_PACKAGE;
       }
-      else if (operType === 'update') {
+      else if (operType == 'update') {
         data.type = Codes.CODE_PACKAGE;
         data.status = status;
         data.id = id;
@@ -201,20 +201,20 @@ export default class PackageProfile extends PureComponent {
       title: '名称',
       dataIndex: 'name',
       key: 'name',
-      width: '21%',
+      width: '23%',
     },{
       title: '类型',
       dataIndex: 'type',
       key: 'type',
       render: (text, record) => productType[text],
-      width: '15%',
+      width: '13%',
     },{
     //   title: '供应商',
     //   dataIndex: 'cpName',
     //   key: 'cpName',
     //   width: '17%',
     // },{
-      title: '供应商售价',
+      title: '供应商售价(¥)',
       dataIndex: 'cpPrice',
       key: 'cpPrice',
       render: (text, record) => (
@@ -227,7 +227,7 @@ export default class PackageProfile extends PureComponent {
       ),
       width: '22%',
     },{
-      title: '渠道售价',
+      title: '渠道售价(¥)',
       dataIndex: 'merchantPrice',
       key: 'merchantPrice',
       render: (text, record) => (

src/routes/Combo/Edit/product.js

@@ -38,9 +38,7 @@ export default class ProductSelectModal extends PureComponent {
       searchSelectProps: {
         defaultValue: 'code',
       },
-      onSearch: (value) => {
-        onSearch(value);
-      },
+      onSearch: (value) => onSearch(value),
     };
 
     //已选资源列表
@@ -73,6 +71,7 @@ export default class ProductSelectModal extends PureComponent {
     };
 
     //待选资源Table属性
+    delete productType.PACKAGE;
     const fsTableProps = {
       fsTableColumns: [{
         title: '编号',

src/routes/Combo/List/index.js

@@ -1,5 +1,4 @@
 import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
 import queryString from 'query-string';
 import { connect } from 'dva';
 import { routerRedux } from 'dva/router';
@@ -9,23 +8,23 @@ import Search from './search';
 import PageHeaderLayout from '../../../layouts/PageHeaderLayout';
 import { Codes } from '../../../utils/config';
 
-@connect(state => ({
-  combo: state.combo,
-}))
+@connect(state => ({ combo: state.combo }))
 export default class Combo extends PureComponent {
-  static propTypes = {
-    combo: PropTypes.object,
-    location: PropTypes.object,
-    dispatch: PropTypes.func,
-  };
-
   render() {
     const { location, dispatch, combo } = this.props;
 
     location.query = queryString.parse(location.search);
     const { query, pathname } = location;
     const { field, keyword, ...filters } = query;
-    const { list, listLoading, pagination, currentItem, itemLoading, modalVisible, modalType } = combo;
+    const {
+      list,
+      listLoading,
+      pagination,
+      currentItem,
+      itemLoading,
+      modalVisible,
+      modalType,
+    } = combo;
 
     // 把携带的参数中空值项删除
     Object.keys(filters).map(key => { filters[key] ? null : delete filters[key] });
@@ -107,20 +106,6 @@ export default class Combo extends PureComponent {
           }
         });
       },
-      onRecoverItem: (payload) => {
-        dispatch({
-          type: 'combo/recover',
-          payload,
-          callback: () => {
-            dispatch(
-              routerRedux.push({
-                pathname,
-                search: queryString.stringify(filters),
-              })
-            );
-          }
-        });
-      }
     };
 
     return (

src/routes/Combo/List/search.js

@@ -1,18 +1,8 @@
 import react, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-import { Button, Form, Row, Col, Icon } from 'antd';
+import { Button, Row, Col, Icon } from 'antd';
 import DataSearch from '../../../components/DataSearch';
 
-@Form.create()
 export default class Search extends PureComponent {
-  static propTypes = {
-    form: PropTypes.object.isRequired,
-    onSearch: PropTypes.func,
-    onAdd: PropTypes.func,
-    field: PropTypes.string,
-    keyword: PropTypes.string,
-  };
-
   render() {
     const { field, keyword, onSearch, onAdd } = this.props;
 
@@ -29,9 +19,7 @@ export default class Search extends PureComponent {
       selectProps: {
         defaultValue: field || 'code',
       },
-      onSearch: (value) => {
-        onSearch(value);
-      },
+      onSearch: (value) => onSearch(value),
     };
 
     return (

src/routes/Combo/List/table.js

@@ -1,40 +1,34 @@
 import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
 import moment from 'moment';
-import classnames from 'classnames';
 import queryString from 'query-string';
-import { Modal, Table, Menu, Icon, Badge } from 'antd';
-import AnimTableBody from '../../../components/Animation/AnimTableBody';
-import styles from './table.less';
+import { Divider, Modal, Table, Icon, Badge } from 'antd';
 import { statuses, Codes } from '../../../utils/config';
 
 export default class TableList extends PureComponent {
 
-  handleOperateItem = (record) => {
-    const { onDeleteItem, onRecoverItem } = this.props;
+  handleDeleteItem = (record) => {
+    const { onDeleteItem } = this.props;
     Modal.confirm({
-      title: `您确定要${record.status === Codes.CODE_NORMAL ? '删除' : '恢复'}该课程包?`,
-      onOk () {
-        if (record.status === Codes.CODE_NORMAL) {
-          onDeleteItem({id: record.id});
-        } else {
-          onRecoverItem({ id: record.id, status: Codes.CODE_NORMAL });
-        }
-      },
-    })
+      title: `您确定要删除该课程包?`,
+      okText: '确定',
+      cancelText: '取消',
+      onOk: () => onDeleteItem({id: record.id}),
+    });
   }
 
   render() {
-    const { curStatus, onDeleteItem, onRecoverItem, onEditItem, location, pagination, ...tableProps } = this.props;
+    const { onDeleteItem, onEditItem, pagination, ...tableProps } = this.props;
 
     const columns = [{
       title: '课程包编号',
       dataIndex: 'code',
       key: 'code',
+      width: '28%',
     },{
       title: '课程包名称',
       dataIndex: 'name',
       key: 'name',
+      width: '28%',
     },{
       title: '状态',
       dataIndex: 'status',
@@ -43,16 +37,15 @@ export default class TableList extends PureComponent {
         const statusMap = {[Codes.CODE_NORMAL]: 'success', [Codes.CODE_DELETE]: 'error'};
         return (<Badge status={statusMap[record.status]} text={statuses[record.status]} />);
       },
-      filters: Object.keys(statuses).map(key => ({ text: statuses[key], value: key })),
-      filterMultiple: false,
-      filteredValue: [curStatus],
+      width: '12%',
     },{
       title: '修改时间',
       dataIndex: 'gmtModified',
       key: 'gmtModified',
       render: (text, record) => (
         <div>{moment(text).format('YYYY-MM-DD HH:mm:ss')}</div>
-      )
+      ),
+      width: '20%',
     },{
       title: '操作',
       dataIndex: 'operation',
@@ -60,34 +53,23 @@ export default class TableList extends PureComponent {
       render: (text, record) => (
         <div>
           <a onClick={() => onEditItem(record)}>编辑</a>
-          <span className={styles.splitLine} />
-            <a onClick={() => this.handleOperateItem(record)}>{record.status === Codes.CODE_NORMAL ? '删除' : '恢复'}</a>
+          <Divider type="vertical" />
+          <a onClick={() => this.handleDeleteItem(record)}>删除</a>
         </div>
-      )
+      ),
+      width: '12%',
     }];
 
-    // 数据table列表表头的筛选按钮点击重置后status值为空，此时删除该参数
-    columns.map(item => {
-      item.dataIndex === 'status' && !curStatus ? delete item.filteredValue : null;
-    });
-
     // 配置分页
     tableProps.pagination = !!pagination && { ...pagination, showSizeChanger: true, showQuickJumper: true, showTotal: total => `共 ${total} 条`};
 
-    // 添加动画
-    const AnimationTableBody = (props) => (<AnimTableBody {...props}/>);
-
     return (
       <Table
         simple
         bordered
         { ...tableProps }
         columns={columns}
-        className={classnames({ [styles.table]: true, [styles.motion]: true })}
         rowKey={record => record.id}
-        components={{
-          body: { wrapper: AnimationTableBody }
-        }}
       />
     );
   }

src/routes/Combo/List/table.less

@@ -1,78 +0,0 @@
-@import "~antd/lib/style/themes/default.less";
-@import "../../../utils/utils.less";
-
-.table {
-  :global {
-    .ant-table-tbody > tr > td,
-    .ant-table-thead > tr > th {
-      height: 50px;
-    }
-  }
-
-  &.motion {
-    :global {
-      .ant-table-tbody > tr > td,
-      .ant-table-thead > tr > th {
-        &:nth-child(1) {
-          width: 20%;
-        }
-
-        &:nth-child(2) {
-          width: 20%;
-        }
-
-        &:nth-child(3) {
-          width: 20%;
-        }
-
-        &:nth-child(4) {
-          width: 20%;
-        }
-
-        &:nth-child(5) {
-          width: 20%;
-        }
-      }
-
-      .ant-table-thead {
-        & > tr {
-          transition: none;
-          display: block;
-
-          & > th {
-            display: inline-flex;
-            align-items: center;
-            justify-content: center;
-          }
-        }
-      }
-
-      .ant-table-tbody {
-        & > tr {
-          transition: none;
-          display: block;
-          border-bottom: 1px solid #f5f5f5;
-
-          & > td {
-            border-bottom: none;
-            display: inline-flex;
-            align-items: center;
-            justify-content: center;
-          }
-
-          &.ant-table-expanded-row-level-1 > td {
-            height: auto;
-          }
-        }
-      }
-    }
-  }
-}
-
-.splitLine {
-  background: @border-color-split;
-  display: inline-block;
-  margin: 0 8px;
-  width: 1px;
-  height: 12px;
-}

src/routes/Course/Edit/index.js

@@ -1,19 +1,14 @@
 import React, { PureComponent } from 'react';
 import { routerRedux } from 'dva/router';
-import PropTypes from 'prop-types';
 import queryString from 'query-string';
 import { connect } from 'dva';
-import { Spin, Popover, Badge, Table, Radio, Card, Form, Input, Icon, Button, Select } from 'antd';
+import { Spin, Table, Card, Form, Input, Icon, Button, Select } from 'antd';
 import PageHeaderLayout from '../../../layouts/PageHeaderLayout';
 import LessonSelectSortModal from './lesson';
 import ResourceSelectModal from './resource';
 import SupportSelectSortModal from './support';
 import { Codes, ossHost } from '../../../utils/config';
 
-const FormItem = Form.Item;
-const Option = Select.Option;
-const { TextArea } = Input;
-
 @Form.create()
 @connect(state => ({
   courseDetail: state.courseDetail,
@@ -45,7 +40,7 @@ export default class CourseDetail extends PureComponent {
       curClickedBtn: btnName,
     }, () => {
       const { dispatch } = this.props;
-      if (btnName === 'lessonBtn') {
+      if (btnName == 'lessonBtn') {
         dispatch({ type: 'courseDetail/showLessonModal' });
         dispatch({
           type: 'lesson/query',
@@ -55,7 +50,7 @@ export default class CourseDetail extends PureComponent {
             status: Codes.CODE_NORMAL,
           }
         });
-      } else if (btnName === 'cvImgBtn' || btnName === 'bgImgBtn') {
+      } else if (btnName == 'cvImgBtn' || btnName == 'bgImgBtn') {
         dispatch({ type: 'courseDetail/showResourceModal' });
         dispatch({
           type: 'resource/query',
@@ -66,7 +61,7 @@ export default class CourseDetail extends PureComponent {
             type: Codes.CODE_IMAGE,
           }
         });
-      } else if (btnName === 'supportBtn') {
+      } else if (btnName == 'supportBtn') {
         dispatch({ type: 'courseDetail/showSupportModal' });
         dispatch({
           type: 'support/query',
@@ -84,11 +79,11 @@ export default class CourseDetail extends PureComponent {
   handleModalCancel = () => {
     const { curClickedBtn } = this.state;
     const { dispatch } = this.props;
-    if (curClickedBtn === 'lessonBtn') {
+    if (curClickedBtn == 'lessonBtn') {
       dispatch({ type: 'courseDetail/hideLessonModal' });
-    } else if (curClickedBtn === 'cvImgBtn' || curClickedBtn === 'bgImgBtn') {
+    } else if (curClickedBtn == 'cvImgBtn' || curClickedBtn == 'bgImgBtn') {
       dispatch({ type: 'courseDetail/hideResourceModal' });
-    } else if (curClickedBtn === 'supportBtn') {
+    } else if (curClickedBtn == 'supportBtn') {
       dispatch({ type: 'courseDetail/hideSupportModal' });
     }
   }
@@ -97,22 +92,22 @@ export default class CourseDetail extends PureComponent {
   handleModalOk = (data) => {
     const { curClickedBtn } = this.state;
     const { dispatch } = this.props;
-    if (curClickedBtn === 'lessonBtn') {
+    if (curClickedBtn == 'lessonBtn') {
       dispatch({
         type: 'courseDetail/saveLessonList',
         payload: { subItemList: data }
       });
-    } else if (curClickedBtn === 'cvImgBtn') {
+    } else if (curClickedBtn == 'cvImgBtn') {
       dispatch({
         type: 'courseDetail/saveCoverImg',
         payload: { coverUrl: data.path },
       });
-    } else if (curClickedBtn === 'bgImgBtn') {
+    } else if (curClickedBtn == 'bgImgBtn') {
       dispatch({
         type: 'courseDetail/saveBackgroundImg',
         payload: { bgUrl: data.path },
       });
-    } else if (curClickedBtn === 'supportBtn') {
+    } else if (curClickedBtn == 'supportBtn') {
       dispatch({
         type: 'courseDetail/saveSupportList',
         payload: { supportList: data }
@@ -127,18 +122,16 @@ export default class CourseDetail extends PureComponent {
     const newData = { ...data };
     if (newData.keyword) {
       newData[newData.field] = newData.keyword;
-      delete newData.field;
-      delete newData.keyword;
-    } else {
-      delete newData.field;
-      delete newData.keyword;
     }
-    if (curClickedBtn === 'lessonBtn') {
+    delete newData.field;
+    delete newData.keyword;
+
+    if (curClickedBtn == 'lessonBtn') {
       dispatch({
         type: `lesson/query`,
         payload: { ...newData, pageNo: 1, pageSize: 10, status: Codes.CODE_NORMAL },
       });
-    } else if (curClickedBtn === 'cvImgBtn' || curClickedBtn === 'bgImgBtn') {
+    } else if (curClickedBtn == 'cvImgBtn' || curClickedBtn == 'bgImgBtn') {
       dispatch({
         type: `resource/query`,
         payload: { ...newData, pageNo: 1, pageSize: 10, status: Codes.CODE_NORMAL, type: Codes.CODE_IMAGE },
@@ -153,12 +146,10 @@ export default class CourseDetail extends PureComponent {
     const newFilters = { ...filters };
     if (newFilters.keyword) {
       newFilters[newFilters.field] = newFilters.keyword;
-      delete newFilters.field;
-      delete newFilters.keyword;
-    } else {
-      delete newFilters.field;
-      delete newFilters.keyword;
     }
+    delete newFilters.field;
+    delete newFilters.keyword;
+
     const getValue = obj => Object.keys(obj).map(key => obj[key]).join(',');
     const tableFilters = Object.keys(filterArgs).reduce((obj, key) => {
       const newObj = { ...obj };
@@ -169,11 +160,11 @@ export default class CourseDetail extends PureComponent {
     const data = { ...newFilters, ...tableFilters, pageNo: pagination.current, pageSize: pagination.pageSize };
     Object.keys(data).map(key => data[key] ? null : delete data[key]);
 
-    if (curClickedBtn === 'lessonBtn') {
+    if (curClickedBtn == 'lessonBtn') {
       dispatch({ type: `lesson/query`, payload: data });
-    } else if (curClickedBtn === 'cvImgBtn' || curClickedBtn === 'bgImgBtn') {
+    } else if (curClickedBtn == 'cvImgBtn' || curClickedBtn == 'bgImgBtn') {
       dispatch({ type: `resource/query`, payload: { ...data, type: Codes.CODE_IMAGE } });
-    } else if (curClickedBtn === 'supportBtn') {
+    } else if (curClickedBtn == 'supportBtn') {
       dispatch({ type: `support/query`, payload: data });
     }
   }
@@ -335,46 +326,46 @@ export default class CourseDetail extends PureComponent {
         <Spin spinning={itemLoading}>
           <Card title="课程信息">
             <Form layout="horizontal" onSubmit={this.handlePageSubmit}>
-              <FormItem label="课程编号：" hasFeedback {...formItemLayout}>
+              <Form.Item label="课程编号：" hasFeedback {...formItemLayout}>
                 {getFieldDecorator('code', {
                   rules: [{ required: true, type: 'string', message: "编号为必填项!" }],
                   initialValue: code,
                 })(<Input />)}
-              </FormItem>
-              <FormItem label="课程名称：" hasFeedback {...formItemLayout}>
+              </Form.Item>
+              <Form.Item label="课程名称：" hasFeedback {...formItemLayout}>
                 {getFieldDecorator('name', {
                   rules: [{ required: true, type: 'string', message: "名称为必填项!" }],
                   initialValue: name,
                 })(<Input />)}
-              </FormItem>
-              <FormItem label="课程副标题：" hasFeedback {...formItemLayout}>
+              </Form.Item>
+              <Form.Item label="课程副标题：" hasFeedback {...formItemLayout}>
                 {getFieldDecorator('subTitle', {
                   initialValue: subTitle,
                 })(<Input />)}
-              </FormItem>
-              <FormItem label="面包屑导航：" hasFeedback {...formItemLayout}>
+              </Form.Item>
+              <Form.Item label="面包屑导航：" hasFeedback {...formItemLayout}>
                 {getFieldDecorator('breadCrumbs', {
                   initialValue: breadCrumbs,
                 })(<Input />)}
-              </FormItem>
-              <FormItem label="课程概要：" hasFeedback {...formItemLayout}>
+              </Form.Item>
+              <Form.Item label="课程概要：" hasFeedback {...formItemLayout}>
                 {getFieldDecorator('digest', {
                   initialValue: digest,
-                })(<TextArea />)}
-              </FormItem>
-              <FormItem label="课程详情：" hasFeedback {...formItemLayout}>
+                })(<Input.TextArea />)}
+              </Form.Item>
+              <Form.Item label="课程详情：" hasFeedback {...formItemLayout}>
                 {getFieldDecorator('detail', {
                   initialValue: detail,
-                })(<TextArea />)}
-              </FormItem>
-              <FormItem label="所属供应商：" {...formItemLayout}>
+                })(<Input.TextArea />)}
+              </Form.Item>
+              <Form.Item label="所属供应商：" {...formItemLayout}>
                 {getFieldDecorator('cpId', {
                   initialValue: cpId,
                 })(
-                  <Select placeholder="请选择">{merchant.list.map(item => <Option value={item.id} key={item.id}>{item.name}</Option>)}</Select>
+                  <Select placeholder="请选择">{merchant.list.map(item => <Select.Option value={item.id} key={item.id}>{item.name}</Select.Option>)}</Select>
                 )}
-              </FormItem>
-              <FormItem label="封面图片" {...formItemLayout}>
+              </Form.Item>
+              <Form.Item label="封面图片" {...formItemLayout}>
                 <Button onClick={() => this.handleModalShow('cvImgBtn')} type="primary" icon="select" size="small">选择</Button>
                 {!coverUrl ? null :
                   <Card
@@ -384,8 +375,8 @@ export default class CourseDetail extends PureComponent {
                     style={{ width: 240, marginTop: 20 }}
                   >
                   </Card>}
-              </FormItem>
-              <FormItem label="背景图片" {...formItemLayout}>
+              </Form.Item>
+              <Form.Item label="背景图片" {...formItemLayout}>
                 <Button onClick={() => this.handleModalShow('bgImgBtn')} type="primary" icon="select" size="small">选择</Button>
                 {!bgUrl ? null :
                   <Card
@@ -395,11 +386,11 @@ export default class CourseDetail extends PureComponent {
                   style={{ width: 240, marginTop: 20 }}
                 >
                 </Card>}
-              </FormItem>
-              <FormItem label="相关课" {...formItemLayout}>
+              </Form.Item>
+              <Form.Item label="相关课" {...formItemLayout}>
                 <Button onClick={() => this.handleModalShow('lessonBtn')} type="primary" size="small" icon="edit">编辑</Button>
-              </FormItem>
-              <FormItem wrapperCol={{ offset: 7, span: 12 }}>
+              </Form.Item>
+              <Form.Item wrapperCol={{ offset: 7, span: 12 }}>
                 <Table
                   locale={{
                     emptyText: <span style={{ color: "#C6D0D6" }}>&nbsp;&nbsp;<Icon type="frown-o"/>
@@ -411,11 +402,11 @@ export default class CourseDetail extends PureComponent {
                   bordered
                   pagination={false}
                 />
-              </FormItem>
-              <FormItem label="相关配套" {...formItemLayout}>
+              </Form.Item>
+              <Form.Item label="相关配套" {...formItemLayout}>
                 <Button onClick={() => this.handleModalShow('supportBtn')} type="primary" size="small" icon="edit">编辑</Button>
-              </FormItem>
-              <FormItem wrapperCol={{ offset: 7, span: 12 }}>
+              </Form.Item>
+              <Form.Item wrapperCol={{ offset: 7, span: 12 }}>
                 <Table
                   locale={{
                     emptyText: <span style={{ color: "#C6D0D6" }}>&nbsp;&nbsp;<Icon type="frown-o"/>
@@ -427,11 +418,11 @@ export default class CourseDetail extends PureComponent {
                   bordered
                   pagination={false}
                 />
-              </FormItem>
-              <FormItem {...submitFormLayout} style={{ marginTop: 32 }}>
+              </Form.Item>
+              <Form.Item {...submitFormLayout} style={{ marginTop: 32 }}>
                 <Button onClick={this.handlePageCancel}>取消</Button>
                 <Button type="primary" style={{ marginLeft: 35 }} htmlType="submit">提交</Button>
-              </FormItem>
+              </Form.Item>
             </Form>
             {/*课的模态选择框*/}
             <LessonSelectSortModal

src/routes/Course/Edit/lesson.js

@@ -1,17 +1,9 @@
 import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-import { Badge, Popover, Icon } from 'antd';
 import SelectModal from '../../../components/SelectModal';
 import styles from './lesson.less';
 import { Codes, resourceType } from '../../../utils/config';
 
 export default class LessonSelectSortModal extends PureComponent {
-  static propTypes = {
-    selTableData: PropTypes.array.isRequired,
-    modalVisible: PropTypes.bool.isRequired,
-    rowKeyName: PropTypes.string.isRequired,
-  };
-
   render() {
     const { selTableData, modalVisible, rowKeyName, onCancel, onOk, onSearch, ...fsTableOpts } = this.props;
 
@@ -34,11 +26,9 @@ export default class LessonSelectSortModal extends PureComponent {
         value: 'code', name: '课编号', mode: 'input',
       }],
       searchSelectProps: {
-        defaultValue: 'name',
-      },
-      onSearch: (value) => {
-        onSearch(value);
+        defaultValue: 'code',
       },
+      onSearch: (value) => onSearch(value),
     };
 
     const selTableProps = {

src/routes/Course/Edit/resource.js

@@ -1,16 +1,10 @@
 import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-import { Badge, Popover, Icon } from 'antd';
+import { Popover } from 'antd';
 import SelectModal from '../../../components/SelectModal';
 import styles from './resource.less';
 import { Codes, ossHost } from '../../../utils/config';
 
 export default class ResourceSelectModal extends PureComponent {
-  static propTypes = {
-    modalVisible: PropTypes.bool.isRequired,
-    rowKeyName: PropTypes.string.isRequired,
-  };
-
   render() {
     const { modalVisible, onCancel, onOk, onSearch, ...fsTableOpts } = this.props;
 
@@ -35,9 +29,7 @@ export default class ResourceSelectModal extends PureComponent {
       searchSelectProps: {
         defaultValue: 'code',
       },
-      onSearch: (value) => {
-        onSearch(value);
-      },
+      onSearch: (value) => onSearch(value),
     };
 
     //待选资源Table属性

src/routes/Course/Edit/support.js

@@ -1,17 +1,10 @@
 import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-import { Badge, Popover, Icon } from 'antd';
+import { Popover } from 'antd';
 import SelectModal from '../../../components/SelectModal';
 import styles from './support.less';
 import { Codes } from '../../../utils/config';
 
 export default class SupportSelectSortModal extends PureComponent {
-  static propTypes = {
-    selTableData: PropTypes.array.isRequired,
-    modalVisible: PropTypes.bool.isRequired,
-    rowKeyName: PropTypes.string.isRequired,
-  };
-
   render() {
     const { selTableData, modalVisible, rowKeyName, onCancel, onOk, onSearch, ...fsTableOpts } = this.props;
 
@@ -34,11 +27,9 @@ export default class SupportSelectSortModal extends PureComponent {
         value: 'code', name: '配套编号', mode: 'input',
       }],
       searchSelectProps: {
-        defaultValue: 'name',
-      },
-      onSearch: (value) => {
-        onSearch(value);
+        defaultValue: 'code',
       },
+      onSearch: (value) => onSearch(value),
     };
 
     const selTableProps = {

src/routes/Course/List/index.js

@@ -1,5 +1,4 @@
 import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
 import queryString from 'query-string';
 import { connect } from 'dva';
 import { routerRedux } from 'dva/router';
@@ -11,12 +10,6 @@ import { Codes } from '../../../utils/config';
 
 @connect(state => ({ course: state.course }))
 export default class Course extends PureComponent {
-  static propTypes = {
-    course: PropTypes.object,
-    location: PropTypes.object,
-    dispatch: PropTypes.func,
-  };
-
   render() {
     const { location, dispatch, course } = this.props;
     location.query = queryString.parse(location.search);
@@ -62,7 +55,6 @@ export default class Course extends PureComponent {
       location,
       dataSource: list,
       loading: listLoading,
-      curStatus: filters.status,
       onChange: (pagination, filterArgs) => {
         const getValue = obj => Object.keys(obj).map(key => obj[key]).join(',');
         const tableFilters = Object.keys(filterArgs).reduce((obj, key) => {
@@ -104,20 +96,6 @@ export default class Course extends PureComponent {
           }
         });
       },
-      onRecoverItem: (payload) => {
-        dispatch({
-          type: 'course/recover',
-          payload,
-          callback: () => {
-            dispatch(
-              routerRedux.push({
-                pathname,
-                search: queryString.stringify(filters),
-              })
-            );
-          }
-        });
-      }
     };
 
     return (

src/routes/Course/List/search.js

@@ -1,18 +1,8 @@
 import react, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-import { Button, Form, Row, Col, Icon } from 'antd';
+import { Button, Row, Col, Icon } from 'antd';
 import DataSearch from '../../../components/DataSearch';
 
-@Form.create()
 export default class Search extends PureComponent {
-  static propTypes = {
-    form: PropTypes.object.isRequired,
-    onSearch: PropTypes.func,
-    onAdd: PropTypes.func,
-    field: PropTypes.string,
-    keyword: PropTypes.string,
-  };
-
   render() {
     const { field, keyword, onSearch, onAdd } = this.props;
 
@@ -29,9 +19,7 @@ export default class Search extends PureComponent {
       selectProps: {
         defaultValue: field || 'code',
       },
-      onSearch: (value) => {
-        onSearch(value);
-      },
+      onSearch: (value) => onSearch(value),
     };
 
     return (

src/routes/Course/List/table.js

@@ -1,40 +1,33 @@
 import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
 import moment from 'moment';
-import classnames from 'classnames';
 import queryString from 'query-string';
-import { Modal, Table, Menu, Icon, Badge } from 'antd';
-import AnimTableBody from '../../../components/Animation/AnimTableBody';
-import styles from './table.less';
+import { Divider, Modal, Table, Icon, Badge } from 'antd';
 import { statuses, Codes } from '../../../utils/config';
 
 export default class TableList extends PureComponent {
-
-  handleOperateItem = (record) => {
-    const { onDeleteItem, onRecoverItem } = this.props;
+  handleDeleteItem = (record) => {
+    const { onDeleteItem } = this.props;
     Modal.confirm({
-      title: `您确定要${record.status === Codes.CODE_NORMAL ? '删除' : '恢复'}该课程?`,
-      onOk () {
-        if (record.status == Codes.CODE_NORMAL) {
-          onDeleteItem({ id: record.id });
-        } else {
-          onRecoverItem({ id: record.id, status: Codes.CODE_NORMAL });
-        }
-      },
-    })
+      title: `您确定要删除该课程?`,
+      okText: '确定',
+      cancelText: '取消',
+      onOk: () => onDeleteItem({ id: record.id }),
+    });
   }
 
   render() {
-    const { curStatus, onDeleteItem, onRecoverItem, onEditItem, location, pagination, ...tableProps } = this.props;
+    const { onDeleteItem, onEditItem, pagination, ...tableProps } = this.props;
 
     const columns = [{
       title: '课程编号',
       dataIndex: 'code',
       key: 'code',
+      width: '28%',
     },{
       title: '课程名称',
       dataIndex: 'name',
       key: 'name',
+      width: '28%',
     },{
       title: '状态',
       dataIndex: 'status',
@@ -43,16 +36,15 @@ export default class TableList extends PureComponent {
         const statusMap = {[Codes.CODE_NORMAL]: 'success', [Codes.CODE_DELETE]: 'error'};
         return (<Badge status={statusMap[record.status]} text={statuses[record.status]} />);
       },
-      filters: Object.keys(statuses).map(key => ({ text: statuses[key], value: key })),
-      filterMultiple: false,
-      filteredValue: [curStatus],
+      width: '12%',
     },{
       title: '修改时间',
       dataIndex: 'gmtModified',
       key: 'gmtModified',
       render: (text, record) => (
         <div>{moment(text).format('YYYY-MM-DD HH:mm:ss')}</div>
-      )
+      ),
+      width: '20%',
     },{
       title: '操作',
       dataIndex: 'operation',
@@ -60,34 +52,23 @@ export default class TableList extends PureComponent {
       render: (text, record) => (
         <div>
           <a onClick={() => onEditItem(record)}>编辑</a>
-          <span className={styles.splitLine} />
-          <a onClick={() => this.handleOperateItem(record)}>{record.status === Codes.CODE_NORMAL ? '删除' : '恢复'}</a>
+          <Divider type="vertical" />
+          <a onClick={() => this.handleDeleteItem(record)}>删除</a>
         </div>
-      )
+      ),
+      width: '12%',
     }];
 
-    // 数据table列表表头的筛选按钮点击重置后status值为空，此时删除该参数
-    columns.map(item => {
-      item.dataIndex === 'status' && !curStatus ? delete item.filteredValue : null;
-    });
-
     // 配置分页
     tableProps.pagination = !!pagination && { ...pagination, showSizeChanger: true, showQuickJumper: true, showTotal: total => `共 ${total} 条`};
 
-    // 添加动画
-    const AnimationTableBody = (props) => (<AnimTableBody {...props}/>);
-
     return (
       <Table
         simple
         bordered
         { ...tableProps }
         columns={columns}
-        className={classnames({ [styles.table]: true, [styles.motion]: true })}
         rowKey={record => record.id}
-        components={{
-          body: { wrapper: AnimationTableBody }
-        }}
       />
     );
   }

src/routes/Course/List/table.less

@@ -1,78 +0,0 @@
-@import "~antd/lib/style/themes/default.less";
-@import "../../../utils/utils.less";
-
-.table {
-  :global {
-    .ant-table-tbody > tr > td,
-    .ant-table-thead > tr > th {
-      height: 50px;
-    }
-  }
-
-  &.motion {
-    :global {
-      .ant-table-tbody > tr > td,
-      .ant-table-thead > tr > th {
-        &:nth-child(1) {
-          width: 20%;
-        }
-
-        &:nth-child(2) {
-          width: 20%;
-        }
-
-        &:nth-child(3) {
-          width: 20%;
-        }
-
-        &:nth-child(4) {
-          width: 20%;
-        }
-
-        &:nth-child(5) {
-          width: 20%;
-        }
-      }
-
-      .ant-table-thead {
-        & > tr {
-          transition: none;
-          display: block;
-
-          & > th {
-            display: inline-flex;
-            align-items: center;
-            justify-content: center;
-          }
-        }
-      }
-
-      .ant-table-tbody {
-        & > tr {
-          transition: none;
-          display: block;
-          border-bottom: 1px solid #f5f5f5;
-
-          & > td {
-            border-bottom: none;
-            display: inline-flex;
-            align-items: center;
-            justify-content: center;
-          }
-
-          &.ant-table-expanded-row-level-1 > td {
-            height: auto;
-          }
-        }
-      }
-    }
-  }
-}
-
-.splitLine {
-  background: @border-color-split;
-  display: inline-block;
-  margin: 0 8px;
-  width: 1px;
-  height: 12px;
-}

src/routes/Support/Edit/index.js

@@ -1,6 +1,5 @@
 import React, { PureComponent } from 'react';
 import { routerRedux } from 'dva/router';
-import PropTypes from 'prop-types';
 import queryString from 'query-string';
 import { connect } from 'dva';
 import { Spin, Popover, Badge, Table, Radio, Card, Form, Input, Icon, Button, Select } from 'antd';
@@ -9,10 +8,6 @@ import SupportSelectSortModal from './support';
 import ResourceSelectModal from './resource';
 import { Codes, ossHost } from '../../../utils/config';
 
-const FormItem = Form.Item;
-const Option = Select.Option;
-const { TextArea } = Input;
-
 @Form.create()
 @connect(state => ({
   merchant: state.merchant,
@@ -21,10 +16,6 @@ const { TextArea } = Input;
   supportDetail: state.supportDetail,
 }))
 export default class SupportDetail extends PureComponent {
-  static propTypes = {
-    supportDetail: PropTypes.object,
-  };
-
   state = { curClickedBtn: null };
 
   componentDidMount() {
@@ -293,14 +284,6 @@ export default class SupportDetail extends PureComponent {
             <img alt="" src={`${ossHost}/${text}`} width={70} />
           </Popover>
       ),
-    // },{
-    //   title: '图片编号',
-    //   dataIndex: 'code',
-    //   key: 'code',
-    // },{
-    //   title: '图片名称',
-    //   dataIndex: 'name',
-    //   key: 'name',
     }];
 
     const formItemLayout = {
@@ -323,36 +306,36 @@ export default class SupportDetail extends PureComponent {
         <Spin spinning={itemLoading}>
           <Card title="配套信息">
             <Form layout="horizontal" onSubmit={this.handlePageSubmit}>
-              <FormItem label="配套编号：" hasFeedback {...formItemLayout}>
+              <Form.Item label="配套编号：" hasFeedback {...formItemLayout}>
                 {getFieldDecorator('code', {
                   rules: [{ required: true, type: 'string', message: "编号为必填项!" }],
                   initialValue: code,
                 })(<Input />)}
-              </FormItem>
-              <FormItem label="配套名称：" hasFeedback {...formItemLayout}>
+              </Form.Item>
+              <Form.Item label="配套名称：" hasFeedback {...formItemLayout}>
                 {getFieldDecorator('name', {
                   rules: [{ required: true, type: 'string', message: "名称为必填项!" }],
                   initialValue: name,
                 })(<Input />)}
-              </FormItem>
-              <FormItem label="配套概要：" hasFeedback {...formItemLayout}>
+              </Form.Item>
+              <Form.Item label="配套概要：" hasFeedback {...formItemLayout}>
                 {getFieldDecorator('digest', {
                   initialValue: digest,
-                })(<TextArea />)}
-              </FormItem>
-              <FormItem label="配套详情：" hasFeedback {...formItemLayout}>
+                })(<Input.TextArea />)}
+              </Form.Item>
+              <Form.Item label="配套详情：" hasFeedback {...formItemLayout}>
                 {getFieldDecorator('detail', {
                   initialValue: detail,
-                })(<TextArea />)}
-              </FormItem>
-              <FormItem label="所属供应商：" {...formItemLayout}>
+                })(<Input.TextArea />)}
+              </Form.Item>
+              <Form.Item label="所属供应商：" {...formItemLayout}>
                 {getFieldDecorator('cpId', {
                   initialValue: cpId,
                 })(
-                  <Select placeholder="请选择">{merchant.list.map(item => <Option value={item.id} key={item.id}>{item.name}</Option>)}</Select>
+                  <Select placeholder="请选择">{merchant.list.map(item => <Select.Option value={item.id} key={item.id}>{item.name}</Select.Option>)}</Select>
                 )}
-              </FormItem>
-              <FormItem label="封面图片" {...formItemLayout}>
+              </Form.Item>
+              <Form.Item label="封面图片" {...formItemLayout}>
                 <Button onClick={() => this.handleModalShow('cvImgBtn')} type="primary" icon="select" size="small">选择</Button>
                 {!coverUrl? null :
                   <Card
@@ -362,11 +345,11 @@ export default class SupportDetail extends PureComponent {
                     style={{ width: 240, marginTop: 20 }}
                   >
                   </Card>}
-              </FormItem>
-              <FormItem label="图片列表" {...formItemLayout}>
+              </Form.Item>
+              <Form.Item label="图片列表" {...formItemLayout}>
                 <Button onClick={() => this.handleModalShow('imgBtn')} type="primary" size="small" icon="edit">编辑</Button>
-              </FormItem>
-              <FormItem wrapperCol={{ offset: 7, span: 12 }}>
+              </Form.Item>
+              <Form.Item wrapperCol={{ offset: 7, span: 12 }}>
                 <Table
                   locale={{
                     emptyText: <span style={{ color: "#C6D0D6" }}>&nbsp;&nbsp;<Icon type="frown-o"/>
@@ -378,11 +361,11 @@ export default class SupportDetail extends PureComponent {
                   bordered
                   pagination={false}
                 />
-              </FormItem>
-              <FormItem label="相关配套" {...formItemLayout}>
+              </Form.Item>
+              <Form.Item label="相关配套" {...formItemLayout}>
                 <Button onClick={() => this.handleModalShow('supportBtn')} type="primary" size="small" icon="edit">编辑</Button>
-              </FormItem>
-              <FormItem wrapperCol={{ offset: 7, span: 12 }}>
+              </Form.Item>
+              <Form.Item wrapperCol={{ offset: 7, span: 12 }}>
                 <Table
                   locale={{
                     emptyText: <span style={{ color: "#C6D0D6" }}>&nbsp;&nbsp;<Icon type="frown-o"/>
@@ -394,11 +377,11 @@ export default class SupportDetail extends PureComponent {
                   bordered
                   pagination={false}
                 />
-              </FormItem>
-              <FormItem {...submitFormLayout} style={{ marginTop: 32 }}>
+              </Form.Item>
+              <Form.Item {...submitFormLayout} style={{ marginTop: 32 }}>
                 <Button onClick={this.handlePageCancel}>取消</Button>
                 <Button type="primary" style={{ marginLeft: 35 }} htmlType="submit">提交</Button>
-              </FormItem>
+              </Form.Item>
             </Form>
             {/*周边的模态选择框*/}
             <SupportSelectSortModal

src/routes/Support/Edit/resource.js

@@ -1,16 +1,10 @@
 import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-import { Badge, Popover, Icon } from 'antd';
+import { Popover } from 'antd';
 import SelectModal from '../../../components/SelectModal';
 import styles from './resource.less';
 import { Codes, ossHost } from '../../../utils/config';
 
 export default class ResourceSelectModal extends PureComponent {
-  static propTypes = {
-    modalVisible: PropTypes.bool.isRequired,
-    rowKeyName: PropTypes.string.isRequired,
-  };
-
   render() {
     const { mode, selTableData, modalVisible, onCancel, onOk, onSearch, ...fsTableOpts } = this.props;
 

src/routes/Support/Edit/support.js

@@ -1,17 +1,10 @@
 import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-import { Badge, Popover, Icon } from 'antd';
+import { Popover } from 'antd';
 import SelectModal from '../../../components/SelectModal';
 import styles from './support.less';
 import { Codes } from '../../../utils/config';
 
 export default class SupportSelectSortModal extends PureComponent {
-  static propTypes = {
-    selTableData: PropTypes.array.isRequired,
-    modalVisible: PropTypes.bool.isRequired,
-    rowKeyName: PropTypes.string.isRequired,
-  };
-
   render() {
     const { selTableData, modalVisible, rowKeyName, onCancel, onOk, onSearch, ...fsTableOpts } = this.props;
 

src/routes/Support/List/index.js

@@ -1,5 +1,4 @@
 import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
 import queryString from 'query-string';
 import { connect } from 'dva';
 import { routerRedux } from 'dva/router';
@@ -11,18 +10,20 @@ import { Codes } from '../../../utils/config';
 
 @connect(state => ({ support: state.support }))
 export default class Support extends PureComponent {
-  static propTypes = {
-    support: PropTypes.object,
-    location: PropTypes.object,
-    dispatch: PropTypes.func,
-  };
-
   render() {
     const { location, dispatch, support } = this.props;
     location.query = queryString.parse(location.search);
     const { query, pathname } = location;
     const { field, keyword, ...filters } = query;
-    const { list, listLoading, pagination, currentItem, itemLoading, modalVisible, modalType } = support;
+    const {
+      list,
+      listLoading,
+      pagination,
+      currentItem,
+      itemLoading,
+      modalVisible,
+      modalType,
+    } = support;
 
     // 把携带的参数中空值项删除
     Object.keys(filters).map(key => { filters[key] ? null : delete filters[key] });
@@ -62,7 +63,6 @@ export default class Support extends PureComponent {
       location,
       dataSource: list,
       loading: listLoading,
-      curStatus: filters.status,
       onChange: (pagination, filterArgs) => {
         const getValue = obj => Object.keys(obj).map(key => obj[key]).join(',');
         const tableFilters = Object.keys(filterArgs).reduce((obj, key) => {
@@ -104,20 +104,6 @@ export default class Support extends PureComponent {
           }
         });
       },
-      onRecoverItem: (payload) => {
-        dispatch({
-          type: 'support/recover',
-          payload,
-          callback: () => {
-            dispatch(
-              routerRedux.push({
-                pathname,
-                search: queryString.stringify(filters),
-              })
-            );
-          }
-        });
-      }
     };
 
     return (

src/routes/Support/List/search.js

@@ -1,18 +1,8 @@
 import react, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-import { Button, Form, Row, Col, Icon } from 'antd';
+import { Button, Row, Col, Icon } from 'antd';
 import DataSearch from '../../../components/DataSearch';
 
-@Form.create()
 export default class Search extends PureComponent {
-  static propTypes = {
-    form: PropTypes.object.isRequired,
-    onSearch: PropTypes.func,
-    onAdd: PropTypes.func,
-    field: PropTypes.string,
-    keyword: PropTypes.string,
-  };
-
   render() {
     const { field, keyword, onSearch, onAdd } = this.props;
 
@@ -29,9 +19,7 @@ export default class Search extends PureComponent {
       selectProps: {
         defaultValue: field || 'code',
       },
-      onSearch: (value) => {
-        onSearch(value);
-      },
+      onSearch: (value) => onSearch(value),
     };
 
     return (

src/routes/Support/List/table.js

@@ -1,40 +1,33 @@
 import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
 import moment from 'moment';
-import classnames from 'classnames';
 import queryString from 'query-string';
-import { Modal, Table, Menu, Icon, Badge } from 'antd';
-import AnimTableBody from '../../../components/Animation/AnimTableBody';
-import styles from './table.less';
+import { Divider, Modal, Table, Badge } from 'antd';
 import { statuses, Codes } from '../../../utils/config';
 
 export default class TableList extends PureComponent {
-
-  handleOperateItem = (record) => {
-    const { onDeleteItem, onRecoverItem } = this.props;
+  handleDeleteItem = (record) => {
+    const { onDeleteItem } = this.props;
     Modal.confirm({
-      title: `您确定要${record.status === Codes.CODE_NORMAL ? '删除' : '恢复'}该周边配套?`,
-      onOk () {
-        if (record.status === Codes.CODE_NORMAL) {
-          onDeleteItem({id: record.id});
-        } else {
-          onRecoverItem({ id: record.id, status: Codes.CODE_NORMAL });
-        }
-      },
-    })
+      title: `您确定要删除该周边配套?`,
+      okText: '确定',
+      cancelText: '取消',
+      onOk: () => onDeleteItem({id: record.id}),
+    });
   }
 
   render() {
-    const { curStatus, onDeleteItem, onRecoverItem, onEditItem, location, pagination, ...tableProps } = this.props;
+    const { onDeleteItem, onEditItem, pagination, ...tableProps } = this.props;
 
     const columns = [{
       title: '配套编号',
       dataIndex: 'code',
       key: 'code',
+      width: '28%',
     },{
       title: '配套名称',
       dataIndex: 'name',
       key: 'name',
+      width: '28%',
     },{
       title: '状态',
       dataIndex: 'status',
@@ -43,16 +36,15 @@ export default class TableList extends PureComponent {
         const statusMap = {[Codes.CODE_NORMAL]: 'success', [Codes.CODE_DELETE]: 'error'};
         return (<Badge status={statusMap[record.status]} text={statuses[record.status]} />);
       },
-      filters: Object.keys(statuses).map(key => ({ text: statuses[key], value: key })),
-      filterMultiple: false,
-      filteredValue: [curStatus],
+      width: '12%',
     },{
-      title: '添加时间',
-      dataIndex: 'gmtCreated',
-      key: 'gmtCreated',
+      title: '修改时间',
+      dataIndex: 'gmtModified',
+      key: 'gmtModified',
       render: (text, record) => (
-        <div>{moment(text).format('YYYY-MM-DD')}</div>
-      )
+        <div>{moment(text).format('YYYY-MM-DD HH:mm:ss')}</div>
+      ),
+      width: '20%',
     },{
       title: '操作',
       dataIndex: 'operation',
@@ -60,34 +52,22 @@ export default class TableList extends PureComponent {
       render: (text, record) => (
         <div>
           <a onClick={() => onEditItem(record)}>编辑</a>
-          <span className={styles.splitLine} />
-            <a onClick={() => this.handleOperateItem(record)}>{record.status === Codes.CODE_NORMAL ? '删除' : '恢复'}</a>
+          <Divider type="vertical" />
+          <a onClick={() => this.handleDeleteItem(record)}>删除</a>
         </div>
-      )
+      ),
+      width: '12%',
     }];
 
-    // 数据table列表表头的筛选按钮点击重置后status值为空，此时删除该参数
-    columns.map(item => {
-      item.dataIndex === 'status' && !curStatus ? delete item.filteredValue : null;
-    });
-
     // 配置分页
     tableProps.pagination = !!pagination && { ...pagination, showSizeChanger: true, showQuickJumper: true, showTotal: total => `共 ${total} 条`};
-
-    // 添加动画
-    const AnimationTableBody = (props) => (<AnimTableBody {...props}/>);
-
     return (
       <Table
         simple
         bordered
         { ...tableProps }
         columns={columns}
-        className={classnames({ [styles.table]: true, [styles.motion]: true })}
         rowKey={record => record.id}
-        components={{
-          body: { wrapper: AnimationTableBody }
-        }}
       />
     );
   }

src/routes/Support/List/table.less

@@ -1,78 +0,0 @@
-@import "~antd/lib/style/themes/default.less";
-@import "../../../utils/utils.less";
-
-.table {
-  :global {
-    .ant-table-tbody > tr > td,
-    .ant-table-thead > tr > th {
-      height: 50px;
-    }
-  }
-
-  &.motion {
-    :global {
-      .ant-table-tbody > tr > td,
-      .ant-table-thead > tr > th {
-        &:nth-child(1) {
-          width: 20%;
-        }
-
-        &:nth-child(2) {
-          width: 20%;
-        }
-
-        &:nth-child(3) {
-          width: 20%;
-        }
-
-        &:nth-child(4) {
-          width: 20%;
-        }
-
-        &:nth-child(5) {
-          width: 20%;
-        }
-      }
-
-      .ant-table-thead {
-        & > tr {
-          transition: none;
-          display: block;
-
-          & > th {
-            display: inline-flex;
-            align-items: center;
-            justify-content: center;
-          }
-        }
-      }
-
-      .ant-table-tbody {
-        & > tr {
-          transition: none;
-          display: block;
-          border-bottom: 1px solid #f5f5f5;
-
-          & > td {
-            border-bottom: none;
-            display: inline-flex;
-            align-items: center;
-            justify-content: center;
-          }
-
-          &.ant-table-expanded-row-level-1 > td {
-            height: auto;
-          }
-        }
-      }
-    }
-  }
-}
-
-.splitLine {
-  background: @border-color-split;
-  display: inline-block;
-  margin: 0 8px;
-  width: 1px;
-  height: 12px;
-}