提交 2955dcc10580467ebbfc5796c65f976552806e0f

作者 JIACHENG9
提交者 Yu
1 个父辈 63b92648

fix: BasicProfile (#11)

1 1 export default {
2 2 plugins: [
3   - ['umi-plugin-block-dev', {}],
  3 + ['umi-plugin-block-dev', {
  4 + layout: 'ant-design-pro',
  5 + }],
4 6 ['umi-plugin-react', {
5 7 dva: true,
6 8 locale: true,
... ...
1   -import React, { PureComponent } from 'react';
2   -import { connect } from 'dva';
3   -import styles from './GridContent.less';
4   -
5   -class GridContent extends PureComponent {
6   - render() {
7   - const { contentWidth, children } = this.props;
8   - let className = `${styles.main}`;
9   - if (contentWidth === 'Fixed') {
10   - className = `${styles.main} ${styles.wide}`;
11   - }
12   - return <div className={className}>{children}</div>;
13   - }
14   -}
15   -
16   -export default connect(({ setting }) => ({
17   - contentWidth: setting.contentWidth,
18   -}))(GridContent);
1   -.main {
2   - width: 100%;
3   - height: 100%;
4   - min-height: 100%;
5   - transition: 0.3s;
6   - &.wide {
7   - max-width: 1200px;
8   - margin: 0 auto;
9   - }
10   -}
... ... @@ -11,14 +11,15 @@
11 11 "url": "https://github.com/umijs/umi-blocks/basicprofile"
12 12 },
13 13 "dependencies": {
14   - "react": "^16.6.3",
15   - "dva": "^2.4.0",
16   - "antd": "^3.10.9",
17 14 "ant-design-pro": "^2.1.1",
18   - "qs": "^6.6.0",
  15 + "antd": "^3.10.9",
  16 + "dva": "^2.4.0",
19 17 "hash.js": "^1.1.5",
20 18 "moment": "^2.22.2",
21   - "nzh": "^1.0.3"
  19 + "nzh": "^1.0.3",
  20 + "qs": "^6.6.0",
  21 + "react": "^16.6.3",
  22 + "umi-request": "^1.0.0"
22 23 },
23 24 "devDependencies": {
24 25 "umi": "^2.3.0-beta.1",
... ...
1 1 import React from 'react';
2 2 import { FormattedMessage } from 'umi/locale';
3 3 import Link from 'umi/link';
4   -import PageHeader from 'ant-design-pro/lib/PageHeader';
5   -import { connect } from 'dva';
6   -import GridContent from './GridContent';
  4 +import { PageHeader } from 'ant-design-pro';
7 5 import styles from './index.less';
8   -import MenuContext from '@/layouts/MenuContext';
  6 +import MenuContext from '../../layouts/MenuContext';
9 7
10 8 const PageHeaderWrapper = ({ children, contentWidth, wrapperClassName, top, ...restProps }) => (
11 9 <div style={{ margin: '-24px -24px 0' }} className={wrapperClassName}>
... ... @@ -30,12 +28,10 @@ const PageHeaderWrapper = ({ children, contentWidth, wrapperClassName, top, ...r
30 28 </MenuContext.Consumer>
31 29 {children ? (
32 30 <div className={styles.content}>
33   - <GridContent>{children}</GridContent>
  31 + {children}
34 32 </div>
35 33 ) : null}
36 34 </div>
37 35 );
38 36
39   -export default connect(({ setting }) => ({
40   - contentWidth: setting.contentWidth,
41   -}))(PageHeaderWrapper);
  37 +export default PageHeaderWrapper;
... ...
1   -module.exports = {
2   - navTheme: 'dark', // theme for nav menu
3   - primaryColor: '#1890FF', // primary color of ant design
4   - layout: 'sidemenu', // nav menu position: sidemenu or topmenu
5   - contentWidth: 'Fluid', // layout of content: Fluid or Fixed, only works when layout is topmenu
6   - fixedHeader: false, // sticky header
7   - autoHideHeader: false, // auto hide header
8   - fixSiderbar: false, // sticky siderbar
9   -};
1 1 import React, { Component } from 'react';
2 2 import { connect } from 'dva';
3 3 import { Card, Badge, Table, Divider } from 'antd';
4   -import DescriptionList from 'ant-design-pro/lib/DescriptionList';
5   -import PageHeaderWrapper from '@/components/PageHeaderWrapper';
6   -import styles from './BasicProfile.less';
  4 +import { DescriptionList } from 'ant-design-pro';
  5 +import PageHeaderWrapper from './components/PageHeaderWrapper';
  6 +import styles from './style.less';
7 7
8 8 const { Description } = DescriptionList;
9 9
... ...
1   -import { queryBasicProfile, queryAdvancedProfile } from '@/services/api';
  1 +import { queryBasicProfile, queryAdvancedProfile } from '../services/api';
2 2
3 3 export default {
4 4 namespace: 'profile',
... ...
1   -import { message } from 'antd';
2   -import defaultSettings from '../defaultSettings';
3   -
4   -let lessNodesAppended;
5   -const updateTheme = primaryColor => {
6   - // Don't compile less in production!
7   - if (APP_TYPE !== 'site') {
8   - return;
9   - }
10   - // Determine if the component is remounted
11   - if (!primaryColor) {
12   - return;
13   - }
14   - const hideMessage = message.loading('正在编译主题!', 0);
15   - function buildIt() {
16   - if (!window.less) {
17   - return;
18   - }
19   - setTimeout(() => {
20   - window.less
21   - .modifyVars({
22   - '@primary-color': primaryColor,
23   - })
24   - .then(() => {
25   - hideMessage();
26   - })
27   - .catch(() => {
28   - message.error('Failed to update theme');
29   - hideMessage();
30   - });
31   - }, 200);
32   - }
33   - if (!lessNodesAppended) {
34   - // insert less.js and color.less
35   - const lessStyleNode = document.createElement('link');
36   - const lessConfigNode = document.createElement('script');
37   - const lessScriptNode = document.createElement('script');
38   - lessStyleNode.setAttribute('rel', 'stylesheet/less');
39   - lessStyleNode.setAttribute('href', '/color.less');
40   - lessConfigNode.innerHTML = `
41   - window.less = {
42   - async: true,
43   - env: 'production',
44   - javascriptEnabled: true
45   - };
46   - `;
47   - lessScriptNode.src = 'https://gw.alipayobjects.com/os/lib/less.js/3.8.1/less.min.js';
48   - lessScriptNode.async = true;
49   - lessScriptNode.onload = () => {
50   - buildIt();
51   - lessScriptNode.onload = null;
52   - };
53   - document.body.appendChild(lessStyleNode);
54   - document.body.appendChild(lessConfigNode);
55   - document.body.appendChild(lessScriptNode);
56   - lessNodesAppended = true;
57   - } else {
58   - buildIt();
59   - }
60   -};
61   -
62   -const updateColorWeak = colorWeak => {
63   - document.body.className = colorWeak ? 'colorWeak' : '';
64   -};
65   -
66   -export default {
67   - namespace: 'setting',
68   - state: defaultSettings,
69   - reducers: {
70   - getSetting(state) {
71   - const setting = {};
72   - const urlParams = new URL(window.location.href);
73   - Object.keys(state).forEach(key => {
74   - if (urlParams.searchParams.has(key)) {
75   - const value = urlParams.searchParams.get(key);
76   - setting[key] = value === '1' ? true : value;
77   - }
78   - });
79   - const { primaryColor, colorWeak } = setting;
80   - if (state.primaryColor !== primaryColor) {
81   - updateTheme(primaryColor);
82   - }
83   - updateColorWeak(colorWeak);
84   - return {
85   - ...state,
86   - ...setting,
87   - };
88   - },
89   - changeSetting(state, { payload }) {
90   - const urlParams = new URL(window.location.href);
91   - Object.keys(defaultSettings).forEach(key => {
92   - if (urlParams.searchParams.has(key)) {
93   - urlParams.searchParams.delete(key);
94   - }
95   - });
96   - Object.keys(payload).forEach(key => {
97   - if (key === 'collapse') {
98   - return;
99   - }
100   - let value = payload[key];
101   - if (value === true) {
102   - value = 1;
103   - }
104   - if (defaultSettings[key] !== value) {
105   - urlParams.searchParams.set(key, value);
106   - }
107   - });
108   - const { primaryColor, colorWeak, contentWidth } = payload;
109   - if (state.primaryColor !== primaryColor) {
110   - updateTheme(primaryColor);
111   - }
112   - if (state.contentWidth !== contentWidth && window.dispatchEvent) {
113   - window.dispatchEvent(new Event('resize'));
114   - }
115   - updateColorWeak(colorWeak);
116   - window.history.replaceState(null, 'setting', urlParams.href);
117   - return {
118   - ...state,
119   - ...payload,
120   - };
121   - },
122   - },
123   -};
1 1 import { stringify } from 'qs';
2   -import request from '@/utils/request';
  2 +import request from '../utils/request';
3 3
4 4 export async function queryProjectNotice() {
5 5 return request('/api/project/notice');
... ...
1   -import fetch from 'dva/fetch';
  1 +import request from 'umi-request';
2 2 import { notification } from 'antd';
3 3 import router from 'umi/router';
4 4 import hash from 'hash.js';
... ... @@ -63,7 +63,7 @@ const cachedSave = (response, hashcode) => {
63 63 * @param {object} [option] The options we want to pass to "fetch"
64 64 * @return {object} An object containing either "data" or "err"
65 65 */
66   -export default function request(url, option) {
  66 +export default function (url, option) {
67 67 const options = {
68 68 expirys: isAntdPro(),
69 69 ...option,
... ...
注册登录 后发表评论