From bd68f8c631a118bcc6873666152d4f86211a1b8c Mon Sep 17 00:00:00 2001 From: nazarlitvin Date: Mon, 19 Feb 2018 22:16:33 +0200 Subject: [PATCH 1/4] remove unnecessary async functions --- src/services/app.js | 6 +++--- src/services/dashboard.js | 2 +- src/services/login.js | 2 +- src/services/menus.js | 2 +- src/services/posts.js | 2 +- src/services/user.js | 8 ++++---- src/services/users.js | 4 ++-- src/services/weather.js | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/services/app.js b/src/services/app.js index e3c9aef..62c4d73 100644 --- a/src/services/app.js +++ b/src/services/app.js @@ -3,7 +3,7 @@ import { request, config } from 'utils' const { api } = config const { user, userLogout, userLogin } = api -export async function login (params) { +export function login (params) { return request({ url: userLogin, method: 'post', @@ -11,7 +11,7 @@ export async function login (params) { }) } -export async function logout (params) { +export function logout (params) { return request({ url: userLogout, method: 'get', @@ -19,7 +19,7 @@ export async function logout (params) { }) } -export async function query (params) { +export function query (params) { return request({ url: user.replace('/:id', ''), method: 'get', diff --git a/src/services/dashboard.js b/src/services/dashboard.js index 5ffabfd..2f07631 100644 --- a/src/services/dashboard.js +++ b/src/services/dashboard.js @@ -3,7 +3,7 @@ import { request, config } from 'utils' const { api } = config const { dashboard } = api -export async function query (params) { +export function query (params) { return request({ url: dashboard, method: 'get', diff --git a/src/services/login.js b/src/services/login.js index c3f4fbe..0bda106 100644 --- a/src/services/login.js +++ b/src/services/login.js @@ -3,7 +3,7 @@ import { request, config } from 'utils' const { api } = config const { userLogin } = api -export async function login (data) { +export function login (data) { return request({ url: userLogin, method: 'post', diff --git a/src/services/menus.js b/src/services/menus.js index 5c00290..803323f 100644 --- a/src/services/menus.js +++ b/src/services/menus.js @@ -3,7 +3,7 @@ import { request, config } from 'utils' const { api } = config const { menus } = api -export async function query (params) { +export function query (params) { return request({ url: menus, method: 'get', diff --git a/src/services/posts.js b/src/services/posts.js index ccd588e..0983eac 100644 --- a/src/services/posts.js +++ b/src/services/posts.js @@ -3,7 +3,7 @@ import { request, config } from 'utils' const { api } = config const { posts } = api -export async function query (params) { +export function query (params) { return request({ url: posts, method: 'get', diff --git a/src/services/user.js b/src/services/user.js index fa29e5c..233f393 100644 --- a/src/services/user.js +++ b/src/services/user.js @@ -3,7 +3,7 @@ import { request, config } from 'utils' const { api } = config const { user } = api -export async function query (params) { +export function query (params) { return request({ url: user, method: 'get', @@ -11,7 +11,7 @@ export async function query (params) { }) } -export async function create (params) { +export function create (params) { return request({ url: user.replace('/:id', ''), method: 'post', @@ -19,7 +19,7 @@ export async function create (params) { }) } -export async function remove (params) { +export function remove (params) { return request({ url: user, method: 'delete', @@ -27,7 +27,7 @@ export async function remove (params) { }) } -export async function update (params) { +export function update (params) { return request({ url: user, method: 'patch', diff --git a/src/services/users.js b/src/services/users.js index 4d1c113..b782cfb 100644 --- a/src/services/users.js +++ b/src/services/users.js @@ -3,7 +3,7 @@ import { request, config } from 'utils' const { api } = config const { users } = api -export async function query (params) { +export function query (params) { return request({ url: users, method: 'get', @@ -11,7 +11,7 @@ export async function query (params) { }) } -export async function remove (params) { +export function remove (params) { return request({ url: users, method: 'delete', diff --git a/src/services/weather.js b/src/services/weather.js index 2c90060..4a07b5f 100644 --- a/src/services/weather.js +++ b/src/services/weather.js @@ -2,7 +2,7 @@ import { request, config } from 'utils' const { APIV1 } = config -export async function query (params) { +export function query (params) { params.key = 'i7sau1babuzwhycn' return request({ url: `${APIV1}/weather/now.json`, From bc3d7fb39a59cb7d5a4d5150a6387599f7cae9b6 Mon Sep 17 00:00:00 2001 From: Dustin Date: Tue, 27 Feb 2018 19:02:53 +0800 Subject: [PATCH 2/4] Update Echarts version require Echarts ^4.0.0 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 6f56ac2..2c46903 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "draftjs-to-markdown": "^0.5.0", "dva": "2.1.0", "dva-loading": "^1.0.4", - "echarts": "^3.7.2", + "echarts": "^4.0.0", "echarts-for-react": "^2.0.0", "echarts-gl": "^1.0.0-beta.5", "echarts-liquidfill": "^1.1.0", @@ -69,4 +69,4 @@ "build:dll": "roadhog buildDll", "build:new": "node version && roadhog build" } -} \ No newline at end of file +} From 580ff59b3d3db52bccc89e3ca12656462a9d4bf8 Mon Sep 17 00:00:00 2001 From: Baorong Li Date: Fri, 9 Mar 2018 11:18:39 +0800 Subject: [PATCH 3/4] Create issue_template.md --- .github/issue_template.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .github/issue_template.md diff --git a/.github/issue_template.md b/.github/issue_template.md new file mode 100644 index 0000000..1f0ad65 --- /dev/null +++ b/.github/issue_template.md @@ -0,0 +1,8 @@ +> 请酌情提供细节，并保持issue精简便于查阅 +> 1. 功能需求 => 详细说明 +> 2. Bug反馈 +> 2.1 简单描述下报错 +> 2.2 你期望什么结果 +> 2.3 如何操作导致的 +> 2.4 可提供运行环境信息 +> 3. 代码求助 => 可以提，未必及时答复 From 99ec9facd397de2064e8933a4d40ec864a59bd25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B5=A9?= Date: Fri, 16 Mar 2018 10:29:32 +0800 Subject: [PATCH 4/4] refresh bug --- src/routes/user/index.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/routes/user/index.js b/src/routes/user/index.js index 0eb62ba..088c29d 100644 --- a/src/routes/user/index.js +++ b/src/routes/user/index.js @@ -41,6 +41,9 @@ const User = ({ type: `user/${modalType}`, payload: data, }) + .then(() => { + handleRefresh() + }) }, onCancel () { dispatch({ @@ -80,7 +83,6 @@ const User = ({ currentItem: item, }, }) - .then(() => handleRefresh) }, rowSelection: { selectedRowKeys, @@ -113,7 +115,6 @@ const User = ({ modalType: 'create', }, }) - .then(() => handleRefresh) }, switchIsMotion () { dispatch({ type: 'user/switchIsMotion' })