From 3fa7ee9e01289b413171ba799de5c769b1807724 Mon Sep 17 00:00:00 2001 From: zuiidea Date: Fri, 14 Apr 2017 19:38:28 +0800 Subject: [PATCH] update README --- README.md | 40 ++++++++++------------------------------ package.json | 7 ++----- src/mock/users.js | 9 +-------- 3 files changed, 13 insertions(+), 43 deletions(-) diff --git a/README.md b/README.md index 2f132c5..9ec5735 100644 --- a/README.md +++ b/README.md @@ -19,29 +19,17 @@ - 基于[dva](https://github.com/dvajs/dva)动态加载 Model 和路由,按需加载 - 浅度响应式设计 -## To do list +## 更新日志 -- [x] 登录页面 -- [x] dashbord页面 - - [x] 数字卡片 - - [x] 实时天气卡片 - - [x] 图表 -- [x] 用户列表页面 - - [x] 增删改查 - - [x] 交互动效 -- [x] 扩展UI组件 - - [x] IconFont - - [x] DataTable - - [x] Search - - [x] DropOption - - [x] 基于Modal封装的layer方法 -- [x] 加入dva-loading -- [x] 规范代码: EsLint; 自用[开发配置](assets/standard.md) -- [ ] 数据可视化页面 -- [ ] 模拟消息收发 -- [ ] 升级为roadhog +### 4.1 -## 开发及构建 +`2017-04-14` + +- 升级开发工具为[roadhog](https://github.com/sorrycc/roadhog) +- 使用`roadhog`的mock功能 +- 增强`utils/request.js`跨域处理能力 + +## 开发构建 ### 目录结构 @@ -84,6 +72,7 @@ 进入目录安装依赖: npm i 或者 yarn install + npm i roadhog@0.6.0-beta.3 -g 开发: @@ -107,15 +96,6 @@ npm run build npm run lint ``` -### 注意事项 - -- 生产环境中,已有数据接口,请将`src/utils/index.js`第四行 `require('./mock.js')`注释 -- 开发环境中,如再mock目录新增文件,请在`src/utils/mock.js`第二行的`mockData`数组中添加 -- 如需重写antd样式配置,请修改`src/theme.js` -- 项目配置文件在`src/utils/config.js` -- 如需重写异步请求函数,请修改`src/utils/request.js` - (关于为什么使用axios而不是fetch:在一个无服务器的环境中模拟数据请求,[Mock](https://github.com/nuysoft/Mock)不能拦截Fetch) - ## 参考 用户列表: diff --git a/package.json b/package.json index 261cc63..593d3b3 100644 --- a/package.json +++ b/package.json @@ -1,12 +1,11 @@ { "private": true, "dependencies": { - "antd": "^2.7.3", + "antd": "^2.9.1", "classnames": "^2.2.5", "draftjs-to-markdown": "^0.4.0", "dva": "^1.1.0", "dva-loading": "^0.2.0", - "js-cookie": "^2.1.3", "lodash": "^4.17.4", "qs": "^6.2.0", "react": "^15.4.1", @@ -36,9 +35,7 @@ "less-vars-to-js": "^1.1.2", "mockjs": "^1.0.1-beta3", "rc-tween-one": "^1.0.0", - "redbox-react": "^1.2.10", - "roadhog": "^0.6.0-beta.3", - "watchjs": "^0.0.0" + "redbox-react": "^1.2.10" }, "pre-commit": [ "lint" diff --git a/src/mock/users.js b/src/mock/users.js index 235aa84..a2155b9 100644 --- a/src/mock/users.js +++ b/src/mock/users.js @@ -3,7 +3,7 @@ const Mock = require('mockjs') const config = require('../utils/config') const { apiPrefix } = config -let antdAdminUsersList = Mock.mock({ +let usersListData = Mock.mock({ 'data|100': [ { 'id|+1': 1, @@ -55,8 +55,6 @@ const adminUsers = [ }, ] -let usersListData = antdAdminUsersList - module.exports = { [`POST ${apiPrefix}/user/login`] (req, res) { @@ -152,8 +150,6 @@ module.exports = { usersListData.page.total = usersListData.data.length usersListData.page.current = 1 - antdAdminUsersList = usersListData - res.json({ success: true, data: usersListData.data, page: usersListData.page }) }, @@ -169,8 +165,6 @@ module.exports = { usersListData.page.total = usersListData.data.length - antdAdminUsersList = usersListData - res.json({ success: true, data: usersListData.data, page: usersListData.page }) }, @@ -187,7 +181,6 @@ module.exports = { return item }) - antdAdminUsersList = usersListData res.json({ success: true, data: usersListData.data, page: usersListData.page }) }, }