课件、课管理代码完善

src/models/ware/detail.js

@@ -1,5 +1,6 @@
-import { queryOne, create, update } from '../../services/ware';
+import { message } from 'antd';
 import pathToRegexp from 'path-to-regexp';
+import { queryOne, create, update } from '../../services/ware';
 import { Codes } from '../../utils/config';
 
 export default {
@@ -22,8 +23,7 @@ export default {
           dispatch({ type: 'saveFilters', payload: state });
           dispatch({ type: 'saveOperType', payload: { operType: 'update' } });
         }
-        if (pathname === '/basic-product/ware/add') {
-          dispatch({ type: 'saveFilters', payload: state });
+        if (pathname == '/basic-product/ware/add') {
           dispatch({ type: 'saveFilters', payload: state });
           dispatch({ type: 'saveOperType', payload: { operType: 'create' } });
         }
@@ -41,52 +41,64 @@ export default {
       yield put({ type: 'changeLoading', payload: { itemLoading: false } });
     },
     * create ({ payload, callback }, { call, put }) {
-      const { data, success } = yield call(create, { ...payload, status: Codes.CODE_NORMAL });
+      const { data, success } = yield call(create, payload);
       if (success) {
-        yield put({ type: 'clearPage' });
+        message.success('创建成功!');
+        yield put({ type: 'initState' });
         if (callback) callback();
       }
     },
     * update ({ payload, callback }, { call, put }) {
       const { data, success } = yield call(update, payload);
       if (success) {
-        yield put({ type: 'clearPage' });
+        message.success('修改成功!');
+        yield put({ type: 'initState' });
         if (callback) callback();
       }
     }
   },
 
   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,
+      };
     },
-
-    showModal(state) {
-      return { ...state, 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,
+      };
     },
-
-    saveOperType(state, { payload }) {
-      return { ...state, ...payload };
+    saveOperType(state, action) {
+      return { ...state, ...action.payload };
     },
-
-    saveSortResult(state, { payload: { resourceList } }) {
-      const currentItem = { ...state.currentItem, resourceList };
-      return { ...state, modalVisible: false, currentItem };
+    saveSortResult(state, action) {
+      return {
+        ...state,
+        currentItem: { ...state.currentItem, resourceList },
+        modalVisible: false,
+      };
     },
-
-    clearPage(state) {
+    initState(state) {
       return { ...state, currentItem: {}, itemLoading: false };
     }
   }

src/models/ware/ware.js

@@ -1,6 +1,7 @@
 import { query, create, update, remove } from '../../services/ware';
 import modelExtend from 'dva-model-extend';
 import queryString from 'query-string';
+import { message } from 'antd';
 import { pageModel } from '../common';
 import { pageSize } from '../../utils/config';
 import { checkSearchParams } from '../../utils/utils';
@@ -8,18 +9,12 @@ import { checkSearchParams } from '../../utils/utils';
 export default modelExtend(pageModel, {
   namespace: 'ware',
 
-  state: {
-    currentItem: {},
-    itemLoading: false,
-    listLoading: false,
-    modalVisible: false,
-    modalType: 'create',
-  },
+  state: { listLoading: false },
 
   subscriptions: {
     setup({ dispatch, history }) {
       history.listen((location) => {
-        if (location.pathname === '/basic-product/ware') {
+        if (location.pathname == '/basic-product/ware') {
           const payload = checkSearchParams(queryString.parse(location.search));
           dispatch({
             type: 'query',
@@ -49,28 +44,10 @@ 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();
       }
     },
@@ -80,13 +57,5 @@ export default modelExtend(pageModel, {
     changeLoading(state, { payload }) {
       return { ...state, ...payload };
     },
-
-    showModal(state, { payload }) {
-      return { ...state, ...payload, modalVisible: true };
-    },
-
-    hideModal(state) {
-      return { ...state, modalVisible: false };
-    },
   }
 })

src/routes/Lesson/Edit/index.js

@@ -1,27 +1,18 @@
 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, Badge, Table, Card, Form, Input, Icon, Button } from 'antd';
 import PageHeaderLayout from '../../../layouts/PageHeaderLayout';
 import WareSelectSortModal from './modal';
 import { Codes } from '../../../utils/config';
 
-const FormItem = Form.Item;
-const Option = Select.Option;
-const { TextArea } = Input;
-
 @Form.create()
 @connect(state => ({
   lessonDetail: state.lessonDetail,
   ware: state.ware,
 }))
 export default class LessonDetail extends PureComponent {
-  static propTypes = {
-    lessonDetail: PropTypes.object,
-  };
-
   // 展示模态框 - 加载第一页数据
   handleModalShow = () => {
     const { dispatch } = this.props;
@@ -158,10 +149,12 @@ export default class LessonDetail extends PureComponent {
       title: '课件编号',
       dataIndex: 'code',
       key: 'code',
+      width: '50%',
     },{
       title: '课件名称',
       dataIndex: 'name',
       key: 'name',
+      width: '50%',
     }];
 
     const formItemLayout = {
@@ -184,27 +177,27 @@ export default class LessonDetail extends PureComponent {
         <Spin spinning={itemLoading}>
           <Card>
             <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="选择课件" {...formItemLayout}>
+                })(<Input.TextArea />)}
+              </Form.Item>
+              <Form.Item label="选择课件" {...formItemLayout}>
                 <Button onClick={this.handleModalShow} 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"/>
@@ -216,11 +209,11 @@ export default class LessonDetail 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>
             <WareSelectSortModal
               rowKeyName="id"

src/routes/Lesson/Edit/modal.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 './modal.less';
 import { Codes, resourceType } from '../../../utils/config';
 
 export default class WareSelectSortModal 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 WareSelectSortModal extends PureComponent {
         value: 'code', name: '课件编号', mode: 'input',
       }],
       searchSelectProps: {
-        defaultValue: 'name',
-      },
-      onSearch: (value) => {
-        onSearch(value);
+        defaultValue: 'code',
       },
+      onSearch: (value) => onSearch(value),
     };
 
     const selTableProps = {

src/routes/Lesson/Edit/modal.less

@@ -2,7 +2,7 @@
   :global {
     .ant-table-tbody > tr > td,
     .ant-table-thead > tr > th {
-      height: 50px;
+      height: 62px;
     }
   }
 
@@ -61,7 +61,7 @@
   :global {
     .ant-table-tbody > tr > td,
     .ant-table-thead > tr > th {
-      height: 50px;
+      height: 62px;
     }
   }
 

src/routes/Lesson/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 => ({
-  lesson: state.lesson,
-}))
+@connect(state => ({lesson: state.lesson}))
 export default class Lesson extends PureComponent {
-  static propTypes = {
-    lesson: PropTypes.object,
-    location: PropTypes.object,
-    dispatch: PropTypes.func,
-  };
-
   render() {
     const { location, dispatch, lesson } = 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 } = lesson;
+    const {
+      list,
+      listLoading,
+      pagination,
+      currentItem,
+      itemLoading,
+      modalVisible,
+      modalType
+    } = lesson;
 
     // 把携带的参数中空值项删除
     Object.keys(filters).map(key => { filters[key] ? null : delete filters[key] });
@@ -107,20 +106,6 @@ export default class Lesson extends PureComponent {
           }
         });
       },
-      onRecoverItem: (payload) => {
-        dispatch({
-          type: 'lesson/recover',
-          payload,
-          callback: () => {
-            dispatch(
-              routerRedux.push({
-                pathname,
-                search: queryString.stringify(filters),
-              })
-            );
-          }
-        });
-      }
     };
 
     return (

src/routes/Lesson/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 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;
 

src/routes/Lesson/List/table.js

@@ -1,40 +1,32 @@
 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 { curStatus, onDeleteItem, onEditItem, location, pagination, ...tableProps } = this.props;
 
     const columns = [{
       title: '课编号',
       dataIndex: 'code',
       key: 'code',
+      width: '28%',
     },{
       title: '课名称',
       dataIndex: 'name',
       key: 'name',
+      width: '28%',
     },{
       title: '状态',
       dataIndex: 'status',
@@ -46,6 +38,7 @@ export default class TableList extends PureComponent {
       filters: Object.keys(statuses).map(key => ({ text: statuses[key], value: key })),
       filterMultiple: false,
       filteredValue: [curStatus],
+      width: '12%',
     },{
       title: '修改时间',
       dataIndex: 'gmtModified',
@@ -53,6 +46,7 @@ export default class TableList extends PureComponent {
       render: (text, record) => (
         <div>{moment(text).format('YYYY-MM-DD HH:mm:ss')}</div>
       ),
+      width: '20%',
     },{
       title: '操作',
       dataIndex: 'operation',
@@ -60,10 +54,11 @@ 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值为空，此时删除该参数
@@ -74,20 +69,13 @@ export default class TableList extends PureComponent {
     // 配置分页
     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/Lesson/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/Ware/Edit/index.js

@@ -1,17 +1,12 @@
 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, Popover, Table, Card, Form, Input, Icon, Button } from 'antd';
 import PageHeaderLayout from '../../../layouts/PageHeaderLayout';
 import ResourceSelectSortModal from './modal';
 import { Codes, ossHost, resourceType, pageSize } from '../../../utils/config';
 
-const FormItem = Form.Item;
-const Option = Select.Option;
-const { TextArea } = Input;
-
 @Form.create()
 @connect(state => ({
   wareDetail: state.wareDetail,
@@ -134,7 +129,7 @@ export default class WareDetail extends PureComponent {
       data.resourceList = (resourceList || []).map(item => item.id);
 
       // 创建课件状态为normal
-      if (operType === 'create') {
+      if (operType == 'create') {
         data.status = Codes.CODE_NORMAL;
       }
 
@@ -227,50 +222,32 @@ export default class WareDetail extends PureComponent {
         <Spin spinning={itemLoading}>
           <Card>
             <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('category', {
                   initialValue: category,
                 })(<Input />)}
-              </FormItem>
-              <FormItem label="课件简述：" hasFeedback {...formItemLayout}>
+              </Form.Item>
+              <Form.Item label="课件简述：" hasFeedback {...formItemLayout}>
                 {getFieldDecorator('digest', {
                   initialValue: digest,
-                })(<TextArea />)}
-              </FormItem>
-              {/*内容提供商暂不用选择
-              <FormItem label="提供商" hasFeedback {...formItemLayout}>
-                {getFieldDecorator('groupId', {
-                  rules: [{ required: true, type: 'string', message: "标签组为必选项!" }],
-                  initialValue: groupId,
-                })(
-                  <Select
-                    showSearch
-                    allowClear
-                    placeholder="请输入标签组编号或者名称进行筛选"
-                    optionFilterProp="children"
-                    filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
-                  >
-                    {list.map(item => <Option value={item.id} key={item.id}>{`${item.code}/${item.name}`}</Option>)}
-                  </Select>
-                )}
-              </FormItem>
-              */}
-              <FormItem label="选择资源" {...formItemLayout}>
+                })(<Input.TextArea />)}
+              </Form.Item>
+              <Form.Item label="选择资源" {...formItemLayout}>
                 <Button onClick={this.handleModalShow} 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"/>
@@ -282,11 +259,11 @@ export default class WareDetail 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>
             <ResourceSelectSortModal
               rowKeyName="id"

src/routes/Ware/Edit/modal.js

@@ -1,17 +1,10 @@
 import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-import { Badge, Popover, Icon } from 'antd';
+import { Popover, Icon } from 'antd';
 import SelectModal from '../../../components/SelectModal';
 import styles from './modal.less';
 import { Codes, resourceType, ossHost } from '../../../utils/config';
 
 export default class ResourceSelectSortModal extends PureComponent {
-  static propTypes = {
-    selTableData: PropTypes.array.isRequired,
-    modalVisible: PropTypes.bool.isRequired,
-    rowKeyName: PropTypes.string.isRequired,
-  };
-
   render() {
     const {
       selTableData,
@@ -46,9 +39,7 @@ export default class ResourceSelectSortModal extends PureComponent {
       searchSelectProps: {
         defaultValue: 'code',
       },
-      onSearch: (value) => {
-        onSearch(value);
-      },
+      onSearch: (value) => onSearch(value),
     };
 
     const selTableProps = {

src/routes/Ware/Edit/modal.less

@@ -2,7 +2,7 @@
   :global {
     .ant-table-tbody > tr > td,
     .ant-table-thead > tr > th {
-      height: 50px;
+      height: 62px;
     }
   }
 
@@ -69,7 +69,7 @@
   :global {
     .ant-table-tbody > tr > td,
     .ant-table-thead > tr > th {
-      height: 50px;
+      height: 62px;
     }
   }
 

src/routes/Ware/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';
@@ -13,12 +12,6 @@ import { Codes } from '../../../utils/config';
   ware: state.ware,
 }))
 export default class Ware extends PureComponent {
-  static propTypes = {
-    ware: PropTypes.object,
-    location: PropTypes.object,
-    dispatch: PropTypes.func,
-  };
-
   render() {
     const { location, dispatch, ware } = this.props;
 

src/routes/Ware/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/Ware/List/table.js

@@ -1,44 +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 { curStatus, onDeleteItem, onEditItem, location, pagination, ...tableProps } = this.props;
 
     const columns = [{
       title: '课件编号',
       dataIndex: 'code',
       key: 'code',
+      width: '28%',
     },{
       title: '课件名称',
       dataIndex: 'name',
       key: 'name',
-    // },{
-    //   title: '供应商',
-    //   dataIndex: 'cpId',
-    //   key: 'cpId',
+      width: '28%',
     },{
       title: '状态',
       dataIndex: 'status',
@@ -50,13 +39,15 @@ export default class TableList extends PureComponent {
       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',
@@ -64,32 +55,26 @@ 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%',
     }];
 
     columns.map(item => {
-      item.dataIndex === 'status' && !curStatus ? delete item.filteredValue : null;
+      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/Ware/List/table.less

@@ -1,82 +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: 25%;
-        }
-
-        &:nth-child(2) {
-          width: 25%;
-        }
-
-        // &:nth-child(3) {
-        //   width: 17%;
-        // }
-        //
-        &:nth-child(3) {
-          width: 15%;
-        }
-
-        &:nth-child(4) {
-          width: 20%;
-        }
-
-        &:nth-child(5) {
-          width: 15%;
-        }
-      }
-
-      .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;
-}