Browse Source

Show Drawer Setting in preview.pro.ant.design, close #2277

pull/2254/merge
afc163 8 years ago
parent
commit
f344342bfb
  1. 3
      .eslintrc.js
  2. 17
      src/layouts/BasicLayout.js
  3. 6
      src/models/setting.js

3
.eslintrc.js

@ -9,6 +9,9 @@ module.exports = {
jest: true, jest: true,
jasmine: true, jasmine: true,
}, },
globals: {
APP_TYPE: true,
},
rules: { rules: {
'react/jsx-filename-extension': [1, { extensions: ['.js'] }], 'react/jsx-filename-extension': [1, { extensions: ['.js'] }],
'react/jsx-wrap-multilines': 0, 'react/jsx-wrap-multilines': 0,

17
src/layouts/BasicLayout.js

@ -201,6 +201,16 @@ class BasicLayout extends React.PureComponent {
}); });
}; };
renderSettingDrawer() {
// Do show SettingDrawer in production
// unless deployed in preview.pro.ant.design as demo
const { rendering } = this.state;
if ((rendering || process.env.NODE_ENV === 'production') && APP_TYPE !== 'site') {
return null;
}
return <SettingDrawer />;
}
render() { render() {
const { const {
navTheme, navTheme,
@ -208,7 +218,7 @@ class BasicLayout extends React.PureComponent {
children, children,
location: { pathname }, location: { pathname },
} = this.props; } = this.props;
const { rendering, isMobile } = this.state; const { isMobile } = this.state;
const isTop = PropsLayout === 'topmenu'; const isTop = PropsLayout === 'topmenu';
const menuData = this.getMenuData(); const menuData = this.getMenuData();
const layout = ( const layout = (
@ -242,6 +252,7 @@ class BasicLayout extends React.PureComponent {
</Layout> </Layout>
</Layout> </Layout>
); );
return ( return (
<React.Fragment> <React.Fragment>
<DocumentTitle title={this.getPageTitle(pathname)}> <DocumentTitle title={this.getPageTitle(pathname)}>
@ -253,9 +264,7 @@ class BasicLayout extends React.PureComponent {
)} )}
</ContainerQuery> </ContainerQuery>
</DocumentTitle> </DocumentTitle>
{(rendering || process.env.NODE_ENV === 'production') ? null : ( // Do show SettingDrawer in production {this.renderSettingDrawer()}
<SettingDrawer />
)}
</React.Fragment> </React.Fragment>
); );
} }

6
src/models/setting.js

@ -4,11 +4,9 @@ import defaultSettings from '../defaultSettings';
let lessNodesAppended; let lessNodesAppended;
const updateTheme = primaryColor => { const updateTheme = primaryColor => {
// // Don't compile less in production! // // Don't compile less in production!
/* eslint-disable */
if (APP_TYPE !== 'site') { if (APP_TYPE !== 'site') {
return; return;
} }
/* eslint-disable */
// Determine if the component is remounted // Determine if the component is remounted
if (!primaryColor) { if (!primaryColor) {
return; return;
@ -111,8 +109,8 @@ export default {
if (state.primaryColor !== primaryColor) { if (state.primaryColor !== primaryColor) {
updateTheme(primaryColor); updateTheme(primaryColor);
} }
if (state.contentWidth !== contentWidth) { if (state.contentWidth !== contentWidth && window.dispatchEvent) {
window.dispatchEvent ? window.dispatchEvent(new Event('resize')) : null; window.dispatchEvent(new Event('resize'));
} }
updateColorWeak(colorWeak); updateColorWeak(colorWeak);
window.history.replaceState(null, 'setting', urlParams.href); window.history.replaceState(null, 'setting', urlParams.href);

Loading…
Cancel
Save