:zap: fix audiobook create logic

src/routes/Resource/AudioBook/AudioBookCreate.js

@@ -26,14 +26,9 @@ const submitFormLayout = {
 
 function getFileObject(params) {
   if (!params) { return; }
-  const { imgFormat, imgPath, imgUrl } = params;
-  return {
-    url: imgUrl,
-    path: imgPath,
-    name: '',
-    size: 0,
-    type: `image/${imgFormat}`,
-  };
+  const { img } = params;
+  const { format, ...rest } = img || {};
+  return { ...rest, type: `image/${format}` };
 }
 
 @Form.create()
@@ -70,27 +65,35 @@ export default class AudioBookCreatePage extends PureComponent {
     e.preventDefault();
     this.props.form.validateFieldsAndScroll((err, values) => {
       if (!err) {
-        const { fileList } = this.state;
-        const { ...params } = values;
+        const { id, img, audio, fileList } = this.state;
+        const { audioPath, audioFormat, ...params } = values;
+        // 1.提取图片信息
+        let newImg = {};
         if (Array.isArray(fileList) && fileList.length) {
-          const { path, type } = fileList[0];
-          params.imgPath = path;
-          params.imgFormat = type ? type.split('/')[1] : '';
+          const { path, type, size, url } = fileList[0];
+          newImg = { ...img, url, path, size, format: type ? type.split('/')[1] : '' };
         }
-        params.type = Hotax.RESOURCE_AUDIOBOOK;
-        params.status = Hotax.STATUS_NORMAL;
-        const { id } = this.state;
+        // 2.提取音频信息
+        const newAudio = { ...audio, path: audioPath, format: audioFormat };
+        // 3.需提交的数据
+        const newParams = {
+          ...params,
+          img: newImg,
+          audio: newAudio,
+          type: Hotax.RESOURCE_AUDIOBOOK,
+          status: Hotax.STATUS_NORMAL,
+        };
         const { UIParams, Queryers } = this.props.location.state || {};
         if (id) {
           this.props.dispatch({
             type: 'resource/updateAudioBook',
-            payload: { id, ...params },
+            payload: { id, ...newParams },
             states: { UIParams, Queryers },
           });
         } else {
           this.props.dispatch({
             type: 'resource/createAudioBook',
-            payload: params,
+            payload: newParams,
             states: { UIParams, Queryers },
           });
         }
@@ -100,7 +103,7 @@ export default class AudioBookCreatePage extends PureComponent {
   render() {
     const { form, submitting } = this.props;
     const { getFieldDecorator } = form;
-    const { fileList, code, name, audioPath, audioFormat } = this.state;
+    const { fileList, code, name, audio } = this.state;
 
     return (
       <PageHeaderLayout>
@@ -141,7 +144,7 @@ export default class AudioBookCreatePage extends PureComponent {
             <Form.Item label="音频路径" {...formItemLayout}>
               {getFieldDecorator('audioPath', {
                 rules: [{ required: true, message: '音频路径不能为空!' }],
-                initialValue: audioPath,
+                initialValue: (audio || {}).path,
               })(
                 <Input />
               )}
@@ -149,7 +152,7 @@ export default class AudioBookCreatePage extends PureComponent {
             <Form.Item label="音频格式" {...formItemLayout}>
               {getFieldDecorator('audioFormat', {
                 rules: [{ required: true, message: '音频格式不能为空!' }],
-                initialValue: audioFormat || 'mp4',
+                initialValue: (audio || {}).format || 'mp4',
               })(
                 <Input disabled />
               )}

src/routes/Resource/AudioBook/AudioBookList.js

@@ -25,23 +25,14 @@ function deleteBlankKey(obj) {
   return newObj;
 }
 function genAudioBook(obj = {}) {
-  const { id, code, name, status } = obj;
-  let { img, audio } = obj;
-  img = img || {};
-  audio = audio || {};
+  const { id, code, name, img, audio, status } = obj;
   return {
     id,
     code,
     name,
     status,
-    imgUrl: img.url,
-    imgPath: img.path,
-    imgFormat: img.format,
-    imgQuality: img.quality,
-    audioUrl: audio.url,
-    audioPath: audio.path,
-    audioFormat: audio.format,
-    audioQuality: audio.quality,
+    img: img || {},
+    audio: audio || {},
   };
 }
 

src/routes/Shelves/ShelvesEdit.js

@@ -23,18 +23,22 @@ export default class ShelvesEdit extends Component {
     super(props);
     const { location } = props;
     const { state } = location;
-    const { merchantId, pid, productType } = state;
+    const { merchantId, pid } = state;
     const match = pathToRegexp('/shelves/:type/edit').exec(location.pathname);
     const type = match[1];
     this.state = {
       pid,
       merchantId,
-      productType,
       scene: type,
       tagSelectorDestroy: true,
       resourceSelectorDestroy: true,
     };
   }
+  componentWillMount() {
+    this.props.dispatch({
+      type: 'shelves/cleanItemState',
+    });
+  }
   componentDidMount() {
     const { merchantId, pid } = this.state;
     this.props.dispatch({