:bug: 修正资源管理中部分bug

src/components/AXItem/PictureItem.js

@@ -8,10 +8,6 @@ class PictureItem extends Component {
     const { item, onSelectChange } = this.props;
     onSelectChange(item.id, e.target.checked);
   };
-  handleItemDelete = () => {
-    const { item, onDelete } = this.props;
-    onDelete(item.id);
-  };
   handleItemEdit = () => {
     const { item, onEdit } = this.props;
     onEdit(item);
@@ -33,10 +29,10 @@ class PictureItem extends Component {
           className={styles.checkbox}
           onChange={this.handleItemChecked}
         />
+        {/* 不需删除功能 */}
         <Icon
           type="close-square-o"
           className={styles.removeIcon}
-          onClick={this.handleItemDelete}
         />
         <div className={styles.metaData}>
           {code}
@@ -50,13 +46,6 @@ class PictureItem extends Component {
             onClick={this.handleItemEdit}
           >编辑
           </Button>
-          <Button
-            size="small"
-            type="primary"
-            icon="delete"
-            onClick={this.handleItemDelete}
-          >删除
-          </Button>
         </div>
       </Card>
     );

src/components/AXUpload/index.js

@@ -182,7 +182,7 @@ class Uploader extends Component {
             <Icon type="inbox" />
           </p>
           <p className={styles.dragText}>点击或者拖拽图片到此区域进行上传</p>
-          <p className={styles.dragHint}>{`支持jpg/png图片格式,大小需小于${Hotax.FILE_MAX_SIZE}M`}</p>
+          <p className={styles.dragHint}>{`支持jpg/png/svg等图片格式,大小需小于${Hotax.FILE_MAX_SIZE}M`}</p>
         </Upload.Dragger>
         <Modal
           visible={previewVisible}

src/models/resource.js

@@ -2,7 +2,6 @@ import { routerRedux } from 'dva/router';
 import { message } from 'antd';
 import {
   createResource,
-  deleteResource,
   updateResource,
   queryImageResource,
   queryVideoResource,
@@ -89,26 +88,6 @@ export default {
         }));
       }
     },
-    *deleteImage({ payload, states }, { call, put }) {
-      const response = yield call(deleteResource, payload);
-      if (response && response.success) {
-        message.success('删除图片成功');
-        yield put({
-          type: 'fetchImageList',
-          payload: states,
-        });
-      }
-    },
-    *deleteVideo({ payload, states }, { call, put }) {
-      const response = yield call(deleteResource, payload);
-      if (response && response.success) {
-        message.success('删除视频成功');
-        yield put({
-          type: 'fetchVideoList',
-          payload: states,
-        });
-      }
-    },
   },
 
   reducers: {

src/routes/Resource/Picture/PictureCardList.js

@@ -4,7 +4,7 @@ import { StandardCardList } from '../../../components/AXList';
 
 function PictureCardList({
   UIParams, dataSource, loading, totalSize, pageSize, pageNo,
-  onFilterClick, onCreateClick, onBatchClick, onDeleteClick, onEditClick,
+  onFilterClick, onCreateClick, onBatchClick, onEditClick,
 }) {
   const batchActions = [{
     key: 'delete',
@@ -36,7 +36,6 @@ function PictureCardList({
       header={{ basicSearch, onFilterClick, onCreateClick }}
       footer={{ pagination, batchActions, onBatchClick }}
       grid={{ gutter: 16, xxl: 12, xl: 6, lg: 4, md: 3, sm: 2, xs: 1 }}
-      onDelete={onDeleteClick}
       onEdit={onEditClick}
     />
   );

src/routes/Resource/Picture/PictureEdit.js

@@ -1,10 +1,10 @@
 import React, { PureComponent } from 'react';
-import { Card, Form, Input, Button, Switch } from 'antd';
+import { Card, Form, Input, Button } from 'antd';
 import { connect } from 'dva';
 import { routerRedux } from 'dva/router';
 import Uploader from '../../../components/AXUpload';
+import { Hotax } from '../../../utils/config';
 import PageHeaderLayout from '../../../layouts/PageHeaderLayout';
-import { boolToStatus, statusToBool } from '../../../utils/utils';
 
 const formItemLayout = {
   labelCol: {
@@ -53,11 +53,11 @@ export default class PictureSingleUpload extends PureComponent {
     return fileList;
   };
   handlePageBack = () => {
-    const { UIParams, Queryers } = this.props.location.state || {};
+    const { UIParams, Queryers, isCard } = this.props.location.state || {};
     this.props.dispatch(
       routerRedux.push({
         pathname: '/resource/picture',
-        state: { UIParams, Queryers },
+        state: { UIParams, Queryers, isCard },
       })
     );
   };
@@ -66,13 +66,13 @@ export default class PictureSingleUpload extends PureComponent {
     this.props.form.validateFieldsAndScroll((err, values) => {
       if (!err) {
         const { id, type, UIParams, Queryers } = this.props.location.state || {};
-        const { fileList, status, ...params } = values;
+        const { fileList, ...params } = values;
         if (Array.isArray(fileList) && fileList.length) {
           params.url = fileList[0].url;
         }
         params.id = id;
         params.type = type;
-        params.status = boolToStatus(status);
+        params.status = Hotax.STATUS_NORMAL;
         this.props.dispatch({
           type: 'resource/updateImage',
           payload: params,
@@ -145,17 +145,6 @@ export default class PictureSingleUpload extends PureComponent {
                 <Input disabled />
               )}
             </Form.Item>
-            <Form.Item label="图片状态" {...formItemLayout}>
-              {getFieldDecorator('status', {
-                valuePropName: 'checked',
-                initialValue: statusToBool(status),
-              })(
-                <Switch
-                  checkedChildren="启用"
-                  unCheckedChildren="不启用"
-                />
-              )}
-            </Form.Item>
             <Form.Item {...submitFormLayout} style={{ marginTop: 32 }}>
               <Button onClick={this.handlePageBack}>取消</Button>
               <Button

src/routes/Resource/Picture/PictureList.js

@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import { connect } from 'dva';
 import { routerRedux } from 'dva/router';
-import { Card, Modal, Button, message } from 'antd';
+import { Card, Button, message } from 'antd';
 import PictureCardList from './PictureCardList';
 import PictureTableList from './PictureTableList';
 import PageHeaderLayout from '../../../layouts/PageHeaderLayout';
@@ -19,7 +19,7 @@ export default class PictureListPage extends Component {
     this.state = {
       UIParams: (state || {}).UIParams, // 组件的状态参数
       Queryers: (state || {}).Queryers, // 查询的条件参数
-      isCard: false,
+      isCard: (state || {}).isCard || false,
     };
   }
   componentWillMount() {
@@ -45,20 +45,6 @@ export default class PictureListPage extends Component {
       })
     );
   };
-  // 删除图片(删)
-  handleDeleteOperation = (item) => {
-    Modal.confirm({
-      okText: '确定',
-      cancelText: '取消',
-      title: '您确定要删除这张图片吗?',
-      onOk: () => {
-        this.props.dispatch({
-          type: 'resource/deleteImage',
-          payload: { id: item.id },
-        });
-      },
-    });
-  };
   // 修改图片(改)
   handleEditOperation = (data) => {
     this.props.dispatch(
@@ -99,7 +85,6 @@ export default class PictureListPage extends Component {
       UIParams,
       dataSource: list,
       onCreateClick: this.handleCreateOperation,
-      onDeleteClick: this.handleDeleteOperation,
       onEditClick: this.handleEditOperation,
       onFilterClick: this.handleFilterOperation,
       onBatchClick: this.handleBatchOperation,

src/routes/Resource/Picture/PictureSingleUpload.js

@@ -1,9 +1,8 @@
 import React, { PureComponent, Fragment } from 'react';
-import { Form, Input, Button, Switch, Alert } from 'antd';
+import { Form, Input, Button, Alert } from 'antd';
 import { connect } from 'dva';
 import { routerRedux } from 'dva/router';
 import Uploader from '../../../components/AXUpload';
-import { boolToStatus } from '../../../utils/utils';
 import { Hotax } from '../../../utils/config';
 
 const formItemLayout = {
@@ -45,11 +44,12 @@ export default class PictureSingleUpload extends PureComponent {
     return fileList;
   };
   handlePageBack = () => {
-    const { UIParams, Queryers } = this.props.location.state || {};
+    const { UIParams, Queryers, isCard } = this.props.location.state || {};
     this.props.dispatch(
       routerRedux.push({
         pathname: '/resource/picture',
         state: {
+          isCard,
           UIParams,
           Queryers,
         },
@@ -60,12 +60,12 @@ export default class PictureSingleUpload extends PureComponent {
     e.preventDefault();
     this.props.form.validateFieldsAndScroll((err, values) => {
       if (!err) {
-        const { fileList, status, ...params } = values;
+        const { fileList, ...params } = values;
         if (Array.isArray(fileList) && fileList.length) {
           params.url = fileList[0].url;
         }
-        params.status = boolToStatus(status);
         params.type = Hotax.RESOURCE_IMAGE;
+        params.status = Hotax.STATUS_NORMAL;
         this.props.dispatch({
           type: 'resource/createImage',
           payload: params,
@@ -150,17 +150,6 @@ export default class PictureSingleUpload extends PureComponent {
             <Input disabled />
           )}
         </Form.Item>
-        <Form.Item label="图片状态" {...formItemLayout}>
-          {getFieldDecorator('status', {
-            valuePropName: 'checked',
-            initialValue: true,
-          })(
-            <Switch
-              checkedChildren="启用"
-              unCheckedChildren="不启用"
-            />
-          )}
-        </Form.Item>
         <Form.Item {...submitFormLayout} style={{ marginTop: 32 }}>
           <Button onClick={this.handlePageBack}>取消</Button>
           <Button

src/routes/Resource/Picture/PictureTableList.js

@@ -1,13 +1,13 @@
 import React from 'react';
 import moment from 'moment';
 import { Button } from 'antd';
-import { renderStatus, addRowKey, genAbsolutePicUrl } from '../../../utils/utils';
+import { addRowKey, genAbsolutePicUrl } from '../../../utils/utils';
 import { StandardTableList } from '../../../components/AXList';
 import styles from './PictureTableList.less';
 
 function PictureTableList({
   UIParams, dataSource, loading, totalSize, pageSize, pageNo,
-  onFilterClick, onCreateClick, onBatchClick, onDeleteClick, onEditClick,
+  onFilterClick, onCreateClick, onBatchClick, onEditClick,
 }) {
   const batchActions = [{
     key: 'delete',
@@ -55,12 +55,6 @@ function PictureTableList({
           onClick={() => onEditClick(item)}
         >编辑
         </Button>
-        <Button
-          size="small"
-          className="delBtn"
-          onClick={() => onDeleteClick(item)}
-        >删除
-        </Button>
       </div>
     );
   };
@@ -69,41 +63,35 @@ function PictureTableList({
     key: 1,
     dataIndex: 'path',
     render: text => renderThumbPic(genAbsolutePicUrl(text)),
-    width: '15%',
+    width: '20%',
   }, {
     title: '名称/编号',
     key: 2,
     dataIndex: 'meta',
     render: (_, record) => renderMetaData(record),
-    width: '27%',
+    width: '25%',
   }, {
     title: '格式',
     key: 3,
     dataIndex: 'format',
-    width: '10%',
+    width: '13%',
   }, {
     title: '大小(Byte)',
     key: 4,
     dataIndex: 'size',
-    width: '10%',
-  }, {
-    title: '状态',
-    key: 5,
-    dataIndex: 'status',
-    render: text => renderStatus(text),
-    width: '8%',
+    width: '12%',
   }, {
     title: '更新日期',
-    key: 6,
+    key: 5,
     dataIndex: 'gmtModified',
     render: text => moment(text).format('YYYY-MM-DD HH:mm:ss'),
-    width: '17%',
+    width: '20%',
   }, {
     title: '操作',
-    key: 7,
+    key: 6,
     dataIndex: 'action',
     render: (_, record) => renderActions(record),
-    width: '13%',
+    width: '10%',
     align: 'right',
   }];
 
@@ -115,6 +103,7 @@ function PictureTableList({
       keepUIState={{ ...UIParams }}
       header={{ basicSearch, onFilterClick, onCreateClick }}
       footer={{ pagination, batchActions, onBatchClick }}
+      showStatusSelect={false}
     />
   );
 }

src/routes/Resource/Video/VideoCreate.js

@@ -1,12 +1,10 @@
 import React, { PureComponent } from 'react';
 import pathToRegexp from 'path-to-regexp';
-import { Card, Form, Radio, Input, Button, Switch } from 'antd';
+import { Card, Form, Radio, Input, Button } from 'antd';
 import { connect } from 'dva';
 import { routerRedux } from 'dva/router';
 import PageHeaderLayout from '../../../layouts/PageHeaderLayout';
-import {
-  resourceTypes, resourceQuality, boolToStatus, statusToBool,
-} from '../../../utils/utils';
+import { resourceTypes, resourceQuality } from '../../../utils/utils';
 import { Hotax } from '../../../utils/config';
 
 const formItemLayout = {
@@ -54,19 +52,18 @@ export default class VideoCreatePage extends PureComponent {
     this.props.form.validateFieldsAndScroll((err, values) => {
       if (!err) {
         const { UIParams, Queryers } = this.props.location.state || {};
-        const { status, ...params } = values;
         const matchId = this.isEdit();
         if (matchId) {
           this.props.dispatch({
             type: 'resource/updateVideo',
-            payload: { id: matchId, status: boolToStatus(status), ...params },
+            payload: { id: matchId, status: Hotax.STATUS_NORMAL, ...values },
             states: { UIParams, Queryers },
           });
           return;
         }
         this.props.dispatch({
           type: 'resource/createVideo',
-          payload: { status: boolToStatus(status), ...params },
+          payload: { status: Hotax.STATUS_NORMAL, ...values },
           states: { UIParams, Queryers },
         });
       }
@@ -76,7 +73,7 @@ export default class VideoCreatePage extends PureComponent {
     const { form, submitting, location } = this.props;
     const { getFieldDecorator } = form;
     const { state = {} } = location;
-    const { code, name, size, type, path, rate, quality, status, format } = state;
+    const { code, name, size, type, path, rate, quality, format } = state;
 
     return (
       <PageHeaderLayout>
@@ -117,7 +114,7 @@ export default class VideoCreatePage extends PureComponent {
                 rules: [{ required: true, message: '资源类型不能为空' }],
                 initialValue: type || Hotax.RESOURCE_VIDEO,
               })(
-                <Radio.Group>
+                <Radio.Group disabled>
                   {
                     Object.keys(resourceTypes).map(key =>
                       (
@@ -137,7 +134,7 @@ export default class VideoCreatePage extends PureComponent {
                 rules: [{ required: true, message: '清晰度为必选项' }],
                 initialValue: quality || Hotax.QUALITY_HIGH,
               })(
-                <Radio.Group>
+                <Radio.Group disabled>
                   {
                     Object.keys(resourceQuality).map(key =>
                       (
@@ -157,7 +154,7 @@ export default class VideoCreatePage extends PureComponent {
                 rules: [{ required: true, message: '视频格式不能为空' }],
                 initialValue: format || 'm3u8',
               })(
-                <Input placeholder="请填写" />
+                <Input disabled placeholder="请填写" />
               )}
             </Form.Item>
             <Form.Item label="视频码流" {...formItemLayout}>
@@ -174,17 +171,6 @@ export default class VideoCreatePage extends PureComponent {
                 <Input placeholder="请填写" addonAfter="字节" />
               )}
             </Form.Item>
-            <Form.Item label="视频状态" {...formItemLayout}>
-              {getFieldDecorator('status', {
-                valuePropName: 'checked',
-                initialValue: statusToBool(status),
-              })(
-                <Switch
-                  checkedChildren="正常"
-                  unCheckedChildren="删除"
-                />
-              )}
-            </Form.Item>
             <Form.Item {...submitFormLayout} style={{ marginTop: 32 }}>
               <Button onClick={this.handlePageBack}>取消</Button>
               <Button

src/routes/Resource/Video/VideoTableList.js

@@ -4,11 +4,11 @@ import { Modal, Button } from 'antd';
 import { StandardTableList } from '../../../components/AXList';
 import AXVideoPlayer from '../../../components/AXVideoPlayer';
 import Ellipsis from '../../../components/Ellipsis';
-import { renderStatus, renderVideoQuality } from '../../../utils/utils';
+import { renderVideoQuality } from '../../../utils/utils';
 
 function VideoTableList({
   UIParams, dataSource, loading, totalSize, pageSize, pageNo, modalDestroy, currentItem,
-  onCreateClick, onDeleteClick, onUpdateClick, onFilterClick, onBatchClick, onModalCreate,
+  onCreateClick, onUpdateClick, onFilterClick, onBatchClick, onModalCreate,
   onModalDestroy,
 }) {
   const pagination = {
@@ -44,7 +44,7 @@ function VideoTableList({
     title: '视频名称',
     key: 2,
     dataIndex: 'name',
-    width: '23%',
+    width: '30%',
     render: text => (
       <Ellipsis tooltip lines={1}>{text}</Ellipsis>
     ),
@@ -58,25 +58,19 @@ function VideoTableList({
     key: 4,
     dataIndex: 'quality',
     render: text => renderVideoQuality(text),
-    width: '8%',
-  }, {
-    title: '状态',
-    key: 5,
-    dataIndex: 'status',
-    render: text => renderStatus(text),
-    width: '8%',
+    width: '10%',
   }, {
     title: '修改时间',
-    key: 6,
+    key: 5,
     dataIndex: 'gmtModified',
     render: text => moment(text).format('YYYY-MM-DD HH:mm:ss'),
-    width: '17%',
+    width: '15%',
   }, {
     title: '操作',
-    key: 8,
+    key: 6,
     dataIndex: 'operation',
     render: (_, record) => renderActions(record),
-    width: '19%',
+    width: '20%',
     align: 'right',
   }];
   const renderActions = (item) => {
@@ -96,12 +90,6 @@ function VideoTableList({
           onClick={() => onUpdateClick(item)}
         >编辑
         </Button>
-        <Button
-          size="small"
-          className="delBtn"
-          onClick={() => onDeleteClick(item)}
-        >删除
-        </Button>
       </div>
     );
   };
@@ -114,6 +102,7 @@ function VideoTableList({
         keepUIState={{ ...UIParams }}
         header={{ basicSearch, onFilterClick, onCreateClick }}
         footer={{ pagination, batchActions, onBatchClick }}
+        showStatusSelect={false}
       />
       {!modalDestroy && (
         <Modal

src/services/resource.js

@@ -41,13 +41,6 @@ export async function createResource(params) {
   return request(`${api.resourceItem}`, options);
 }
 
-export async function deleteResource(params) {
-  const options = {
-    method: 'DELETE',
-  };
-  return request(`${api.resourceItem}/${params.id}`, options);
-}
-
 export async function updateResource(params) {
   const options = {
     method: 'PUT',