From ff7c26ced6c6aa0a55428eb5adea2d54ef523707 Mon Sep 17 00:00:00 2001 From: zuiidea Date: Sat, 3 Dec 2016 23:10:47 +0800 Subject: [PATCH] update --- .gitignore | 2 +- package.json | 6 +++--- src/models/app.js | 12 ++++++++---- yarn.lock | 40 +++++++++++++++++++++++++++++++--------- 4 files changed, 43 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index b186605..88b3bfc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ dist node_modules -.DS_Store +yarn.lock diff --git a/package.json b/package.json index d2a0a3d..3db72f7 100644 --- a/package.json +++ b/package.json @@ -6,11 +6,11 @@ "dependencies": { "antd": "^2.5.0", "classnames": "^2.2.5", - "dva": "1.0.0", + "dva": "^1.1.0", "js-cookie": "^2.1.3", "qs": "^6.2.0", - "react": "^15.1.0", - "react-dom": "^15.1.0", + "react": "^15.4.1", + "react-dom": "^15.4.1", "recharts": "^0.19.0" }, "devDependencies": { diff --git a/src/models/app.js b/src/models/app.js index 1630242..8df1650 100644 --- a/src/models/app.js +++ b/src/models/app.js @@ -66,15 +66,17 @@ export default { *switchSider({ payload }, {put}) { + console.log("switchSider"); yield put({ - type: 'switchSider' + type: 'handleSwitchSider' }) }, *changeTheme({ payload }, {put}) { + console.log("changeTheme"); yield put({ - type: 'changeTheme' + type: 'handleChangeTheme' }) }, }, @@ -118,13 +120,15 @@ export default { loading: false } }, - switchSider(state) { + handleSwitchSider(state) { + console.log(state); return { ...state, siderFold: !state.siderFold } }, - changeTheme(state) { + handleChangeTheme(state) { + console.log(state); return { ...state, darkTheme: !state.darkTheme diff --git a/yarn.lock b/yarn.lock index 3de47d4..d1fc937 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1653,6 +1653,10 @@ dom-scroll-into-view@^1.2.0, dom-scroll-into-view@1.x: version "1.2.1" resolved "http://registry.npm.taobao.org/dom-scroll-into-view/download/dom-scroll-into-view-1.2.1.tgz#e8f36732dd089b0201a88d7815dc3f88e6d66c7e" +dom-walk@^0.1.0: + version "0.1.1" + resolved "http://registry.npm.taobao.org/dom-walk/download/dom-walk-0.1.1.tgz#672226dc74c8f799ad35307df936aba11acd6018" + domain-browser@^1.1.1: version "1.1.7" resolved "http://registry.npm.taobao.org/domain-browser/download/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc" @@ -1727,12 +1731,13 @@ draft-js@^0.9.1, draft-js@~0.9.1: immutable "~3.7.4" object-assign "^4.1.0" -dva@1.0.0: - version "1.0.0" - resolved "http://registry.npm.taobao.org/dva/download/dva-1.0.0.tgz#3665d2b5f062f14a33f2370d74db7022c0af2dca" +dva@^1.1.0: + version "1.1.0" + resolved "http://registry.npm.taobao.org/dva/download/dva-1.1.0.tgz#18756b3689c038ea81b15ab70e23cf97866de555" dependencies: babel-runtime "^6.11.6" flatten "^1.0.2" + global "^4.3.1" invariant "^2.2.1" is-plain-object "^2.0.1" react-redux "4.4.x" @@ -1740,7 +1745,7 @@ dva@1.0.0: react-router-redux "^4.0.5" redux "^3.6.0" redux-actions "^0.12.0" - redux-saga "^0.11.1" + redux-saga "^0.12.0" warning "^3.0.0" whatwg-fetch "^1.0.0" @@ -2251,6 +2256,13 @@ glob@^7.0.3, glob@^7.0.5: once "^1.3.0" path-is-absolute "^1.0.0" +global@^4.3.1: + version "4.3.1" + resolved "http://registry.npm.taobao.org/global/download/global-4.3.1.tgz#5f757908c7cbabce54f386ae440e11e26b7916df" + dependencies: + min-document "^2.19.0" + process "~0.5.1" + globals@^9.0.0, globals@^9.2.0: version "9.14.0" resolved "http://registry.npm.taobao.org/globals/download/globals-9.14.0.tgz#8859936af0038741263053b39d0e76ca241e4034" @@ -3132,6 +3144,12 @@ mime@1.2.x: version "1.2.11" resolved "http://registry.npm.taobao.org/mime/download/mime-1.2.11.tgz#58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10" +min-document@^2.19.0: + version "2.19.0" + resolved "http://registry.npm.taobao.org/min-document/download/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685" + dependencies: + dom-walk "^0.1.0" + minimatch@^2.0.8: version "2.0.10" resolved "http://registry.npm.taobao.org/minimatch/download/minimatch-2.0.10.tgz#8d087c39c6b38c001b97fca7ce6d0e1e80afbac7" @@ -3872,6 +3890,10 @@ process@^0.11.0, process@~0.11.0: version "0.11.9" resolved "http://registry.npm.taobao.org/process/download/process-0.11.9.tgz#7bd5ad21aa6253e7da8682264f1e11d11c0318c1" +process@~0.5.1: + version "0.5.2" + resolved "http://registry.npm.taobao.org/process/download/process-0.5.2.tgz#1638d8a8e34c2f440a91db95ab9aeb677fc185cf" + progress@^1.1.8: version "1.1.8" resolved "http://registry.npm.taobao.org/progress/download/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be" @@ -4233,7 +4255,7 @@ rc@~1.1.6: version "15.4.1" resolved "http://registry.npm.taobao.org/react-addons-transition-group/download/react-addons-transition-group-15.4.1.tgz#27d92717089c5e2db202e654a85b76a41b703acc" -react-dom@^15.1.0: +react-dom@^15.4.1: version "15.4.1" resolved "http://registry.npm.taobao.org/react-dom/download/react-dom-15.4.1.tgz#d54c913261aaedb17adc20410d029dcc18a1344a" dependencies: @@ -4320,7 +4342,7 @@ react-smooth@^0.1.15: raf "^3.2.0" react-addons-transition-group "^0.14.0 || ^15.0.0" -react@^15.1.0: +react@^15.4.1: version "15.4.1" resolved "http://registry.npm.taobao.org/react/download/react-15.4.1.tgz#498e918602677a3983cd0fd206dfe700389a0dd6" dependencies: @@ -4445,9 +4467,9 @@ redux-actions@^0.12.0: lodash "^4.13.1" reduce-reducers "^0.1.0" -redux-saga@^0.11.1: - version "0.11.1" - resolved "http://registry.npm.taobao.org/redux-saga/download/redux-saga-0.11.1.tgz#dc2023d059af0b91c0b1b4febce21194b67d5a58" +redux-saga@^0.12.0: + version "0.12.1" + resolved "http://registry.npm.taobao.org/redux-saga/download/redux-saga-0.12.1.tgz#79c9263d67486fd26a7a3d3b9df8ed65057a9fc6" redux@^3.6.0: version "3.6.0"