diff --git a/functions/package.json b/functions/package.json
index 6bf16a42e0e6e1f4409f1e196f24c493aa91f267..5e142869dda3b8973da4ddb8b03c9d3d3e2f160e 100644
--- a/functions/package.json
+++ b/functions/package.json
@@ -7,7 +7,7 @@
"start": "npm run shell",
"deploy": "firebase deploy --only functions",
"logs": "firebase functions:log",
- "mock":"cd .. && rollup -c"
+ "mock": "cd .. && rollup -c"
},
"dependencies": {
"express": "^4.16.3",
diff --git a/package.json b/package.json
index 5bd0a6c6c3a12509517cdfb149976c5f344502cb..8750db9d404ffca0622462ea86db9d16fe8ec926 100755
--- a/package.json
+++ b/package.json
@@ -5,11 +5,11 @@
"private": true,
"scripts": {
"precommit": "npm run lint-staged",
- "preinstall": "cd functions && npm install",
+ "presite": "cd functions && npm install",
"start": "cross-env ESLINT=none roadhog dev",
"start:no-proxy": "cross-env NO_PROXY=true ESLINT=none roadhog dev",
"build": "cross-env ESLINT=none roadhog build",
- "site": "rollup -c && npm run build && firebase deploy",
+ "site": "npm run presite && rollup -c && npm run build && firebase deploy",
"analyze": "cross-env ANALYZE=1 roadhog build",
"lint:style": "stylelint \"src/**/*.less\" --syntax less",
"lint": "eslint --ext .js src mock tests && npm run lint:style",
@@ -38,7 +38,7 @@
"path-to-regexp": "^2.1.0",
"prop-types": "^15.5.10",
"qs": "^6.5.0",
- "rc-drawer": "^1.4.4",
+ "rc-drawer": "^1.5.1",
"react": "^16.4.0",
"react-container-query": "^0.11.0",
"react-document-title": "^2.0.3",
diff --git a/src/components/SettingDarwer/index.js b/src/components/SettingDarwer/index.js
index 79aa11b2617f292e8194828054558f7125ffed54..e11595edba8bbf2833d71d36c557a8cbf04b9024 100644
--- a/src/components/SettingDarwer/index.js
+++ b/src/components/SettingDarwer/index.js
@@ -106,7 +106,7 @@ class SettingDarwer extends PureComponent {
}
}
if (key === 'colorWeak') {
- if (value === 'open') {
+ if (value) {
document.body.className = 'colorWeak';
} else {
document.body.className = '';
@@ -155,24 +155,26 @@ class SettingDarwer extends PureComponent {
open={collapse}
mask={false}
onHandleClick={this.togglerContent}
- handleChild={
- !collapse ? (
-
- ) : (
-
- )
+ handler={
+
+ {!collapse ? (
+
+ ) : (
+
+ )}
+
}
placement="right"
width="336px"
@@ -231,15 +233,11 @@ class SettingDarwer extends PureComponent {
this.changeSetting('colorWeak', value)}
- style={{ width: 80 }}
- >
- close
- open
- ,
+ checked={!!colorWeak}
+ onChange={checked => this.changeSetting('colorWeak', checked)}
+ />,
]}
>
色弱模式
diff --git a/src/models/setting.js b/src/models/setting.js
index 72b7caca9e4d1807b4fc2d08cbc63418b96f2c58..77b21a0c33ac8259ec50ce90258379456ed62cbd 100644
--- a/src/models/setting.js
+++ b/src/models/setting.js
@@ -7,7 +7,7 @@ const defaultSetting = {
fixedHeader: false,
autoHideHeader: false,
fixSiderbar: false,
- colorWeak: 'close',
+ colorWeak: false,
};
export default {