Skip to content

C
console
Commit 3d31834a authored by nano's avatar nano
Browse files
Options

update

parent 15c4b1c3
Show whitespace changes
Inline Side-by-side
Showing with 162 additions and 91 deletions
src/index.js
View file @ 3d31834a
......@@ -16,6 +16,8 @@ app.model(require("./models/Apps"));
app.model(require("./models/user"));
// app.model(require("./models/packages"));
app.model(require("./models/Common"));
app.model(require("./models/App"));
......
src/models/Apps.js
View file @ 3d31834a
......@@ -37,6 +37,9 @@ export default {
} else {
yield put({ type: 'faile' })
}
},
*success({ payload }, { call, put}) {
yield put({ type: 'fetch' })
}
},
subscriptions: {
......
src/router.js
View file @ 3d31834a
......@@ -14,7 +14,6 @@ function RouterConfig({ history }) {
<Route path="apps" component={Apps} />
<Route path="apps/:id" component={AppDetail} />
</Route>
<Route path="/loginCallback" component={LoginCallback} />
<Route path="*" component={() => <div>404</div>}/>
</Router>
......
src/routes/AppDetail.js
View file @ 3d31834a
......@@ -2,6 +2,7 @@ import React from 'react';
import { connect } from 'dva';
import styles from './AppDetail.less';
import config from '../config'
import uuid from 'uuid'
import { Form, Input, Icon, Radio, Tag, Tooltip, Button, Select, Tabs, Upload, Modal, Table, Popconfirm, Row, Col, Card } from 'antd'
const FormItem = Form.Item;
const RadioButton = Radio.Button;
......@@ -27,18 +28,20 @@ defLocales.forEach(locale => {
defNews[locale] = []
})
const defPackage = {
id: '',
const defPackage = () => {
return {
id: uuid.v1(),
name: '',
version: '',
platforms: [],
locales: []
locales: [],
isNew: true
}
}
const defPackages = {
main: []
}
const formItemLayout = {
labelCol: { span: 5 },
wrapperCol: { span: 24 },
......@@ -48,7 +51,6 @@ const uploadProps = {
name: 'file',
multiple: false,
showUploadList: false,
action: '//jsonplaceholder.typicode.com/posts/',
onChange(info) {
const status = info.file.status;
if (status !== 'uploading') {
......@@ -75,16 +77,16 @@ class AppDetail extends React.Component {
developers: {},
publishers: {},
news: {},
packages: {},
packages: [],
isDanger: false
};
componentWillReceiveProps(nextProps){
const { App:{ developers, publishers, news, packages = {} } } = nextProps
const { App:{ developers, publishers, news, packages = [] } } = nextProps
this.setState({
developers: {...defDevelopers, ...developers},
publishers: {...defPublishers, ...publishers},
packages: {...defPackages, ...packages},
packages: [...defPackages, ...packages],
news: {...defNews, ...news},
})
}
......@@ -124,7 +126,7 @@ class AppDetail extends React.Component {
onSubmitBase = (e) => {
const { form, dispatch, params: { id }} = this.props
e.preventDefault();
e && e.preventDefault();
form.validateFieldsAndScroll((err, values) => {
if (!err) {
console.log('Received values of form: ', values);
......@@ -139,7 +141,7 @@ class AppDetail extends React.Component {
onSubmitIntro = (e) => {
const { form, dispatch, params: { id }} = this.props
e.preventDefault();
e && e.preventDefault();
form.validateFieldsAndScroll((err, values) => {
if (!err) {
console.log('Received values of form: ', values);
......@@ -154,7 +156,7 @@ class AppDetail extends React.Component {
onSubmitManage = (e) => {
const { form, dispatch, params: { id }} = this.props
e.preventDefault();
e && e.preventDefault();
form.validateFieldsAndScroll((err, values) => {
if (!err) {
console.log('Received values of form: ', values);
......@@ -173,45 +175,62 @@ class AppDetail extends React.Component {
onSubmitUpload = (e) => {
const { form, dispatch, params: { id }} = this.props
e.preventDefault();
e && e.preventDefault();
form.validateFieldsAndScroll((err, values) => {
if (!err) {
console.log('Received values of form: ', values);
let {packages} = values
let {upload: { packages }} = values
dispatch({type: "Apps/update", payload: {id, packages}})
}
});
}
onDeletePackage = (_id) => {
const { form, dispatch, params: { id }} = this.props
form.validateFieldsAndScroll((err, values) => {
if (!err) {
let {upload: { packages }} = values
packages.splice(_id, 1)
// dispatch({type: "Apps/update", payload: {id, packages}})
dispatch({type: "Apps/update", payload: {id, packages}})
}
});
}
onEdit = (targetKey, action) => {
console.log(targetKey, action)
this[action](targetKey);
}
add = (targetKey) => {
add = async (targetKey) => {
let packages = this.state.packages
packages["main"].push(defPackage)
packages.push(defPackage())
this.setState({
await this.setState({
packages
})
this.onSubmitUpload()
}
remove = (targetKey) => {
remove = async (targetKey) => {
if(!this.props.isDanger) {
let {packages} = this.state
packages["main"].splice(targetKey,1)
packages.splice(targetKey,1)
this.setState({
await this.setState({
packages
})
this.onDeletePackage(targetKey)
}
}
......@@ -591,21 +610,30 @@ class AppDetail extends React.Component {
<div className={styles.form}>
<Tabs type="editable-card" className="app-detail-nav" onEdit={this.onEdit}>
{packages["main"] && packages["main"].map((pack,i) => {
{packages && packages.map((pack,i) => {
if(pack) {
return (
<TabPane tab={pack.id || "New"} key={i} closable={true}>
<TabPane tab={pack.name || "New"} key={i} closable={false}>
<Form onSubmit={this.onSubmitUpload}>
<FormItem {...formItemLayout} help="id">
{getFieldDecorator(`packages["main"][${i}]["id"]`, {
{getFieldDecorator(`upload["packages"][${i}]["id"]`, {
initialValue: pack["id"]
})(
<Input addonBefore={<Icon type="info-circle-o" />} placeholder="id" />
<Input addonBefore={<Icon type="info-circle-o" />} placeholder="id" disabled />
)}
</FormItem>
<FormItem {...formItemLayout} help="name">
{getFieldDecorator(`upload["packages"][${i}]["name"]`, {
initialValue: pack["name"]
})(
<Input addonBefore={<Icon type="info-circle-o" />} placeholder="name" />
)}
</FormItem>
<FormItem {...formItemLayout} help="version">
{getFieldDecorator(`packages["main"][${i}]["version"]`, {
{getFieldDecorator(`upload["packages"][${i}]["version"]`, {
initialValue: pack["version"]
})(
<Input addonBefore={<Icon type="info-circle-o" />} placeholder="版本号" />
......@@ -613,7 +641,7 @@ class AppDetail extends React.Component {
</FormItem>
<FormItem {...formItemLayout} help="platforms">
{getFieldDecorator(`packages["main"][${i}]["platforms"]`, {
{getFieldDecorator(`upload["packages"][${i}]["platforms"]`, {
initialValue: pack["platforms"]
})(
<Select multiple style={{ width: '100%' }} placeholder="platforms">
......@@ -625,7 +653,7 @@ class AppDetail extends React.Component {
</FormItem>
<FormItem {...formItemLayout} help="locales">
{getFieldDecorator(`packages["main"][${i}]["locales"]`, {
{getFieldDecorator(`upload["packages"][${i}]["locales"]`, {
initialValue: pack["locales"]
})(
<Select multiple style={{ width: '100%' }} placeholder="locales">
......@@ -637,9 +665,12 @@ class AppDetail extends React.Component {
</FormItem>
<FormItem {...formItemLayout}>
{getFieldDecorator(`packages["main"][${i}]["upload"]`, {
{getFieldDecorator(`upload["packages"][${i}]["upload"]`, {
})(
<Dragger {...uploadProps}>
<Dragger
{...uploadProps}
action={`${config.apiRoot}/upload/packages/${pack["id"]}`}
disabled={pack.isNew}>
<p className="ant-upload-drag-icon">
<Icon type="inbox" />
</p>
......@@ -657,6 +688,13 @@ class AppDetail extends React.Component {
</Form>
</TabPane>
)
} else {
return (
<TabPane tab={"!"} key={i} closable={true}>
<div>好像出了什么问题， 请联系xxxxxx</div>
</TabPane>
)
}
})}
</Tabs>
</div>
......
src/routes/Login.js 0 → 100644
View file @ 3d31834a
import React from 'react';
import { connect } from 'dva';
import styles from './Login.css';
function Login() {
return (
<div className={styles.normal}>
Route Component: Login
</div>
);
}
function mapStateToProps() {
return {};
}
export default connect(mapStateToProps)(Login);
src/services/Packages.js 0 → 100644
View file @ 3d31834a
import request from '../utils/request'
export async function create(params) {
return request(`/packages/${params.id}`, {
method: 'POST',
body: JSON.stringify(params)
})
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment