1.4.1

dist/antd-lib.js

-webpackJsonp([35],[function(e,n,t){"use strict";function u(e){return e&&e.__esModule?e:{"default":e}}var c=t(12),o=(u(c),t(6)),r=(u(o),t(47)),s=(u(r),t(36)),a=(u(s),t(50)),f=(u(a),t(128)),i=(u(f),t(95)),d=(u(i),t(171)),l=(u(d),t(53)),p=(u(l),t(88)),_=(u(p),t(147)),b=(u(_),t(107)),k=(u(b),t(109)),v=(u(k),t(129)),w=(u(v),t(119));u(w)}]);
\ No newline at end of file
+webpackJsonp([34],[function(e,n,t){"use strict";function u(e){return e&&e.__esModule?e:{"default":e}}var c=t(11),o=(u(c),t(6)),r=(u(o),t(47)),s=(u(r),t(46)),a=(u(s),t(50)),f=(u(a),t(121)),i=(u(f),t(100)),d=(u(i),t(189)),l=(u(d),t(61)),p=(u(l),t(85)),_=(u(p),t(162)),b=(u(_),t(109)),k=(u(b),t(124)),v=(u(k),t(133)),w=(u(v),t(120));u(w)}]);
\ No newline at end of file

src/components/HeaderOperation/HeaderOperation.jsx

@@ -160,14 +160,14 @@ export function DetailOperations(command, id, isEdit, dispatch) {
             key: 'edit',
             onClick: (e)=> {
                 e.preventDefault();
-                dispatch({type: 'UPDATE_' + command});
+                dispatch({type: 'EDIT_' + command + '_START'});
             }
         });
         isEdit && buttons.push({
             key: 'cancel',
             onClick: (e)=> {
                 e.preventDefault();
-                dispatch({type: 'CANCEL_UPDATE_' + command});
+                dispatch({type: 'EDIT_' + command + '_CANCEL'});
             }
         });
     }

src/components/ProductForm/BaseInfoForm.jsx

@@ -40,7 +40,8 @@ export default class BaseInfoForm extends Component {
         cates: PropTypes.array,
         product: PropTypes.object,
         user: PropTypes.object,
-        dispatch: PropTypes.func
+        dispatch: PropTypes.func,
+        isCreate: PropTypes.bool,
     };
 
     constructor(props, context) {
@@ -76,7 +77,8 @@ export default class BaseInfoForm extends Component {
 
     handleSubmit(e) {
         e.preventDefault();
-        const data = this.props.form.getFieldsValue();
+        const {isCreate, form, product, dispatch} = this.props;
+        const data = form.getFieldsValue();
 
         if (Array.isArray(data.categoryId) && data.categoryId.length === 2) {
             data.categoryParentId = data.categoryId[0];
@@ -89,13 +91,13 @@ export default class BaseInfoForm extends Component {
             data['itemPic'] = this.state.fileList[0].url;
         }
 
-        data.id = this.props.product.id;
+        data.id = product.id;
 
         console.log('收到表单值：', data);
 
-        this.props.dispatch({
-            type: 'UPDATE_PRODUCT_ITEM',
-            item: data
+        dispatch({
+            type: isCreate ? 'UPDATE_PRODUCT' : 'EDIT_PRODUCT_SUBMIT',
+            data
         });
 
     };

src/components/ProductForm/HuikuanInfoForm.jsx

@@ -19,6 +19,7 @@ import {
     Table,
     Spin
 } from 'antd';
+import FooterOperation from '../FooterOperation/FooterOperation';
 
 
 import {arrayRemoveIndex, NULL, UUID, formItemLayout, smallFormItemLayout, footerFormSubmitLayout} from '../../utils';
@@ -42,8 +43,8 @@ export default class HuikuanInfoForm extends Component {
         console.log('收到表单值：', data);
 
         this.props.dispatch({
-            type: 'UPDATE_PRODUCT_ITEM',
-            item: data
+            type: this.props.isCreate ? 'UPDATE_PRODUCT' : 'EDIT_PRODUCT_SUBMIT',
+            data
         });
     }
 
@@ -107,7 +108,17 @@ export default class HuikuanInfoForm extends Component {
                         }
 
                     </Form.Item>
-                    <Form.Item {...footerFormSubmitLayout} style={{marginTop:30}}>
+                    <FooterOperation {...this.props} layout={{wrapperCol:{span: 16, offset: 6}}} command="PRODUCT" hasCancel={!isCreate} />
+
+                </Form>
+            </Spin>
+        );
+    }
+}
+
+
+/*
+<Form.Item {...footerFormSubmitLayout} style={{marginTop:30}}>
     {
         isEdit ?
             <Button type="primary" htmlType="submit" loading={loading}>
@@ -138,9 +149,5 @@ export default class HuikuanInfoForm extends Component {
             {isEdit ? '取消' : '返回'}
         </Button>
     }
-                    </Form.Item>
-                </Form>
-            </Spin>
-        );
-    }
-}
+</Form.Item>
+    */

src/components/ProductForm/index.js

@@ -5,3 +5,4 @@ export ElementForm from './ElementForm';
 export DateTimeStatusForm from './DateTimeStatusForm';
 export DocumentsForm from './DocumentsForm';
 export ContactForm from './ContactForm';
+export PublishForm from './PublishForm';

src/containers/AuthInfo/List.jsx

@@ -54,7 +54,7 @@ const columns = [
 ];
 
 @connect(state=>({
-    items: state.authInfo.audits,
+    items: state.authInfo.items,
     loading: state.authInfo.loading,
     total: state.authInfo.total,
 }))
@@ -71,10 +71,10 @@ export default class List extends Component {
         this.fetchList(this.props.location.query);
     };
 
-    fetchList(query) {
+    fetchList(data) {
         this.props.dispatch({
             type: 'FETCH_AUTHINFO_LIST',
-            query
+            data
         });
     }
 

src/containers/Authority/List.jsx

@@ -42,10 +42,10 @@ export default class List extends Component {
         this.fetchList(this.props.location.query);
     };
 
-    fetchList(query) {
+    fetchList(data) {
         this.props.dispatch({
             type: 'FETCH_AUTHORITY_LIST',
-            query
+            data
         });
     };
 
@@ -95,8 +95,8 @@ export default class List extends Component {
 
         const handleRemove = (id)=> {
             dispatch({
-                type: 'DELETE_AUTHORITY_ITEM',
-                id
+                type: 'DELETE_AUTHORITY',
+                data:{id}
             });
         };
 

src/containers/CustomMessage/AddItem.jsx

@@ -72,14 +72,16 @@ export default class AddItem extends Component {
 
         console.log(data);
         this.props.dispatch({
-            type: 'CREATE_MESSAGE_ITEM',
-            item: data
+            type: 'CREATE_MESSAGE',
+            data
         });
     }
 
     render = ()=> {
         const {loading, form:{getFieldProps}, location:{query}, dispatch} = this.props;
 
+
+
         const operation = (
             <HeaderOperation history={this.props.history} buttons={[{key: 'rollback'}]}/>
         );

src/containers/Product/List.jsx

@@ -114,10 +114,10 @@ export default class List extends Component {
         }
     };
 
-    fetchList(query) {
+    fetchList(data) {
         this.props.dispatch({
             type: 'FETCH_PRODUCT_LIST',
-            query
+            data
         });
     };
 

src/containers/Resource/List.jsx

@@ -44,10 +44,10 @@ export default class List extends Component {
         this.fetchList(this.props.location.query);
     };
 
-    fetchList(query) {
+    fetchList(data) {
         this.props.dispatch({
             type: 'FETCH_RESOURCE_LIST',
-            query
+            data
         });
     };
 

src/containers/Trade/AddItem.jsx

@@ -108,9 +108,8 @@ export default class AddItem extends Component {
         console.log(data);
 
         this.props.dispatch({
-            type: 'CREATE_TRADE_ITEM',
-            item: data,
-            push: this.props.history.push,
+            type: 'CREATE_TRADE',
+            data,
         });
     }
 

src/containers/Trade/Commission.jsx

@@ -46,16 +46,16 @@ export default class Commission extends Component {
     componentDidMount() {
         const {dispatch, params:{id}} = this.props;
         dispatch({
-            type: 'FETCH_TRADE_ITEM',
-            id
+            type: 'FETCH_TRADE',
+            data:{id}
         });
     };
 
 
     handleSubmit() {
         this.props.dispatch({
-            type: 'SETTLEMENT_TRADE_ITEM',
-            id: this.props.item.id
+            type: 'SETTLEMENT_TRADE',
+            data:{id: this.props.item.id}
         })
     }
 

src/containers/Trade/Contract.jsx

@@ -42,8 +42,8 @@ export default class Contract extends Component {
     componentDidMount() {
         const {dispatch, params:{id}} = this.props;
         dispatch({
-            type: 'FETCH_CONTRACT_ITEM',
-            id
+            type: 'FETCH_CONTRACT',
+            data:{id}
         });
     };
 
@@ -54,8 +54,8 @@ export default class Contract extends Component {
         data.id = this.props.params.id;
         console.log(data);
         this.props.dispatch({
-            type: 'UPDATE_CONTRACT_ITEM',
-            item: data
+            type: 'UPDATE_CONTRACT',
+            data
         });
     }
 

src/containers/Trade/List.jsx

@@ -96,10 +96,10 @@ export default class List extends Component {
         this.fetchList(this.props.location.query);
     };
 
-    fetchList(query) {
+    fetchList(data) {
         this.props.dispatch({
             type: 'FETCH_TRADE_LIST',
-            query
+            data
         });
     }
 

src/containers/Users/List.jsx

@@ -79,10 +79,10 @@ export default class List extends Component {
         this.fetchList(this.props.location.query);
     };
 
-    fetchList(query) {
+    fetchList(data) {
         this.props.dispatch({
             type: 'FETCH_USER_LIST',
-            query
+            data
         });
     }
 

src/reducers/index.js

 // Use require.context to require reducers automatically
 // Ref: https://webpack.github.io/docs/context.html
 const context = require.context('./', false, /\.js$/);
-const keys = context.keys().filter(item => item !== './index.js');
+const keys = context.keys().filter(item => item !== './index.js' && item !== './base.js');
 
 const reducers = keys.reduce((memo, key) => {
   memo[key.match(/([^\/]+)\.js$/)[1]] = context(key);