Skip to content

Commit 8c09351

Browse files
scottsutscottsut
authored
Merge pull request #1235 from xieliuduo/dev34-warpper
style: rename Wrapper
2 parents a2d731f + cbc87c4 commit 8c09351

File tree

24 files changed

+107
-145
lines changed

24 files changed

+107
-145
lines changed

‎frontend/src/app/migration/BoardConfig/migrateBoardConfig.ts‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import {
2121
DashboardConfig,
2222
} from 'app/pages/DashBoardPage/pages/Board/slice/types';
2323
import { getInitBoardConfig } from 'app/pages/DashBoardPage/utils/board';
24-
import { versionCanDo } from '../utils';
24+
import { setLatestVersion, versionCanDo } from '../utils';
2525
import {
2626
APP_VERSION_BETA_0,
2727
APP_VERSION_BETA_1,
@@ -66,11 +66,6 @@ export const beta0 = (config: DashboardConfig) => {
6666
return config;
6767
};
6868

69-
export const beta1 = (config: DashboardConfig) => {
70-
if (!versionCanDo(APP_VERSION_BETA_1, config.version)) return config;
71-
config.version = APP_VERSION_BETA_1;
72-
return config;
73-
};
7469
export const beta2 = (config: DashboardConfig) => {
7570
if (!versionCanDo(APP_VERSION_BETA_1, config.version)) return config;
7671
// allowOverlap in autoBoard
@@ -80,10 +75,12 @@ export const beta2 = (config: DashboardConfig) => {
8075
config.version = APP_VERSION_BETA_2;
8176
return config;
8277
};
78+
8379
export const migrateBoardConfig = (boardConfig: string) => {
8480
let config = parseBoardConfig(boardConfig);
8581
config = beta0(config);
86-
config = beta1(config);
82+
8783
config = beta2(config);
84+
config = setLatestVersion(config);
8885
return config;
8986
};

‎frontend/src/app/migration/BoardConfig/migrateWidgets.ts‎

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,8 @@ import {
2626
fontDefault,
2727
VALUE_SPLITTER,
2828
} from 'app/pages/DashBoardPage/utils/widget';
29-
import { versionCanDo } from '../utils';
30-
import {
31-
APP_VERSION_BETA_0,
32-
APP_VERSION_BETA_1,
33-
APP_VERSION_BETA_2,
34-
} from './../constants';
29+
import { setLatestVersion, versionCanDo } from '../utils';
30+
import { APP_VERSION_BETA_0, APP_VERSION_BETA_2 } from './../constants';
3531

3632
/**
3733
*
@@ -89,12 +85,6 @@ export const beta0 = (widget?: Widget) => {
8985
return widget;
9086
};
9187

92-
export const beta1 = (widget?: Widget) => {
93-
if (!widget) return undefined;
94-
if (!versionCanDo(APP_VERSION_BETA_1, widget?.config.version)) return widget;
95-
widget.config.version = APP_VERSION_BETA_1;
96-
return widget;
97-
};
9888
export const beta2 = (widget?: Widget) => {
9989
if (!widget) return undefined;
10090
if (!versionCanDo(APP_VERSION_BETA_2, widget?.config.version)) return widget;
@@ -105,12 +95,12 @@ export const beta2 = (widget?: Widget) => {
10595
widget.config.version = APP_VERSION_BETA_2;
10696
return widget;
10797
};
108-
/**
109-
*
110-
* parseServerWidget JSON.parse(widget.config)
111-
* @param {ServerWidget} sWidget
112-
* @return {*}
113-
*/
98+
99+
const finaleWidget = (widget?: Widget) => {
100+
if (!widget) return undefined;
101+
widget.config = setLatestVersion(widget.config);
102+
return widget;
103+
};
114104
export const parseServerWidget = (sWidget: ServerWidget) => {
115105
try {
116106
sWidget.config = JSON.parse(sWidget.config);
@@ -140,8 +130,9 @@ export const migrateWidgets = (widgets: ServerWidget[]) => {
140130
.filter(widget => !!widget)
141131
.map(widget => {
142132
let resWidget = beta0(widget);
143-
resWidget = beta1(resWidget);
133+
144134
resWidget = beta2(resWidget);
135+
resWidget = finaleWidget(resWidget);
145136
return resWidget;
146137
})
147138
.filter(widget => !!widget);

‎frontend/src/app/migration/StoryConfig/migrateStoryConfig.ts‎

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,8 @@
1717
*/
1818
import { StoryConfig } from 'app/pages/StoryBoardPage/slice/types';
1919
import { getInitStoryConfig } from 'app/pages/StoryBoardPage/utils';
20-
import { versionCanDo } from '../utils';
21-
import {
22-
APP_VERSION_BETA_0,
23-
APP_VERSION_BETA_1,
24-
APP_VERSION_BETA_2,
25-
} from './../constants';
20+
import { setLatestVersion, versionCanDo } from '../utils';
21+
import { APP_VERSION_BETA_2 } from './../constants';
2622

2723
export const parseStoryConfig = (storyConfig: string) => {
2824
if (!storyConfig) {
@@ -37,25 +33,15 @@ export const parseStoryConfig = (storyConfig: string) => {
3733
}
3834
};
3935

40-
export const beta0 = (config: StoryConfig) => {
41-
if (!versionCanDo(APP_VERSION_BETA_0, config.version)) return config;
42-
config.version = APP_VERSION_BETA_0;
43-
return config;
44-
};
45-
export const beta1 = (config: StoryConfig) => {
46-
if (!versionCanDo(APP_VERSION_BETA_1, config.version)) return config;
47-
config.version = APP_VERSION_BETA_1;
48-
return config;
49-
};
5036
export const beta2 = (config: StoryConfig) => {
5137
if (!versionCanDo(APP_VERSION_BETA_2, config.version)) return config;
5238
config.version = APP_VERSION_BETA_2;
5339
return config;
5440
};
5541
export const migrateStoryConfig = (boardConfig: string) => {
5642
let config = parseStoryConfig(boardConfig);
57-
config = beta0(config);
58-
config = beta1(config);
43+
5944
config = beta2(config);
45+
config = setLatestVersion(config);
6046
return config;
6147
};

‎frontend/src/app/migration/StoryConfig/migrateStoryPageConfig.ts‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,8 @@
1717
*/
1818
import { StoryPageConfig } from 'app/pages/StoryBoardPage/slice/types';
1919
import { getInitStoryPageConfig } from 'app/pages/StoryBoardPage/utils';
20-
import { versionCanDo } from '../utils';
21-
import {
22-
APP_VERSION_BETA_0,
23-
APP_VERSION_BETA_1,
24-
APP_VERSION_BETA_2,
25-
} from './../constants';
20+
import { setLatestVersion, versionCanDo } from '../utils';
21+
import { APP_VERSION_BETA_2 } from './../constants';
2622

2723
export const parseStoryPageConfig = (storyConfig: string) => {
2824
try {
@@ -34,18 +30,6 @@ export const parseStoryPageConfig = (storyConfig: string) => {
3430
}
3531
};
3632

37-
export const beta0 = (config: StoryPageConfig) => {
38-
const curVersion = APP_VERSION_BETA_0;
39-
if (!versionCanDo(curVersion, config.version)) return config;
40-
config.version = curVersion;
41-
return config;
42-
};
43-
export const beta1 = (config: StoryPageConfig) => {
44-
const curVersion = APP_VERSION_BETA_1;
45-
if (!versionCanDo(curVersion, config.version)) return config;
46-
config.version = curVersion;
47-
return config;
48-
};
4933
export const beta2 = (config: StoryPageConfig) => {
5034
const curVersion = APP_VERSION_BETA_2;
5135
if (!versionCanDo(curVersion, config.version)) return config;
@@ -54,8 +38,8 @@ export const beta2 = (config: StoryPageConfig) => {
5438
};
5539
export const migrateStoryPageConfig = (configStr: string) => {
5640
let config = parseStoryPageConfig(configStr);
57-
config = beta0(config);
58-
config = beta1(config);
41+
5942
config = beta2(config);
43+
config = setLatestVersion(config);
6044
return config;
6145
};

‎frontend/src/app/migration/constants.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,13 @@ export const APP_VERSION_INIT = '0.0.0';
2020
export const APP_VERSION_BETA_0 = '1.0.0-beta.0';
2121
export const APP_VERSION_BETA_1 = '1.0.0-beta.1';
2222
export const APP_VERSION_BETA_2 = '1.0.0-beta.2';
23+
export const APP_VERSION_BETA_3 = '1.0.0-beta.3';
2324
export const APP_SEMANTIC_VERSIONS = [
2425
APP_VERSION_INIT,
2526
APP_VERSION_BETA_0,
2627
APP_VERSION_BETA_1,
2728
APP_VERSION_BETA_2,
29+
APP_VERSION_BETA_3,
2830
];
2931
export const APP_CURRENT_VERSION =
3032
APP_SEMANTIC_VERSIONS[APP_SEMANTIC_VERSIONS.length - 1];

‎frontend/src/app/migration/utils.ts‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,20 @@
1616
* limitations under the License.
1717
*/
1818

19-
import { APP_SEMANTIC_VERSIONS } from './constants';
19+
import { APP_CURRENT_VERSION, APP_SEMANTIC_VERSIONS } from './constants';
2020

2121
export const versionCanDo = (curVersion: string, testVersion?: string) => {
2222
let testVersionIndex = APP_SEMANTIC_VERSIONS.indexOf(testVersion || '');
2323
if (testVersionIndex === -1) return true;
2424
let curVersionIndex = APP_SEMANTIC_VERSIONS.indexOf(curVersion);
2525
return curVersionIndex >= testVersionIndex;
2626
};
27+
28+
export const setLatestVersion = <T extends { version?: string }>(
29+
config: T,
30+
): T => {
31+
if (!versionCanDo(APP_CURRENT_VERSION, config.version)) return config;
32+
if (config.version === APP_CURRENT_VERSION) return config;
33+
config.version = APP_CURRENT_VERSION;
34+
return config;
35+
};

‎frontend/src/app/pages/DashBoardPage/components/FullScreenPanel/FullScreenPanel.tsx‎

Lines changed: 19 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,23 @@
1616
* limitations under the License.
1717
*/
1818
import { MenuFoldOutlined, MenuUnfoldOutlined } from '@ant-design/icons';
19-
import { Button, Layout, Menu } from 'antd';
19+
import { Button, Menu } from 'antd';
2020
import { WidgetWrapProvider } from 'app/pages/DashBoardPage/components/WidgetProvider/WidgetWrapProvider';
2121
import { boardActions } from 'app/pages/DashBoardPage/pages/Board/slice';
2222
import {
2323
makeSelectBoardFullScreenPanelById,
2424
selectBoardWidgetMapById,
2525
} from 'app/pages/DashBoardPage/pages/Board/slice/selector';
2626
import { BoardState } from 'app/pages/DashBoardPage/pages/Board/slice/types';
27-
import React, { useCallback, useContext, useMemo, useState } from 'react';
27+
import { memo, useCallback, useContext, useMemo, useState } from 'react';
2828
import { useDispatch, useSelector } from 'react-redux';
2929
import styled from 'styled-components/macro';
30-
import { G90, LEVEL_10, WHITE } from 'styles/StyleConstants';
30+
import { LEVEL_10, LEVEL_100, SPACE_LG, SPACE_SM } from 'styles/StyleConstants';
3131
import { CanFullScreenWidgetTypes } from '../../constants';
3232
import { BoardContext } from '../BoardProvider/BoardProvider';
3333
import { FullScreenWidgetMapper } from './FullScreenWidgetMapper';
3434

35-
const { Header } = Layout;
36-
37-
export const FullScreenPanel: React.FC<{}> = () => {
35+
export const FullScreenPanel: React.FC<{}> = memo(() => {
3836
const { boardId, boardType } = useContext(BoardContext);
3937
const dispatch = useDispatch();
4038

@@ -93,21 +91,20 @@ export const FullScreenPanel: React.FC<{}> = () => {
9391
<>
9492
{itemId && (
9593
<FullScreenWrap show={collapsed}>
96-
<Header className="full-header">
94+
<FullHeader>
9795
<div onClick={toggle}>
9896
{collapsed ? <MenuFoldOutlined /> : <MenuUnfoldOutlined />}
9997
<span>{widgetMap[itemId].config.name}</span>
10098
</div>
10199
<Button className="close-fullscreen" onClick={closeFullScreen}>
102100
取消全屏
103101
</Button>
104-
</Header>
102+
</FullHeader>
105103
<div className="full-container">
106104
{chart}
107105
{itemId && (
108106
<div className="full-menu">
109107
<Menu
110-
theme="light"
111108
mode="inline"
112109
onClick={changeItem}
113110
defaultSelectedKeys={[itemId]}
@@ -123,32 +120,22 @@ export const FullScreenPanel: React.FC<{}> = () => {
123120
)}
124121
</>
125122
);
126-
};
123+
});
127124

128125
const FullScreenWrap = styled.div<{ show: boolean }>`
129126
position: fixed;
130127
top: 0;
131128
right: 0;
132129
bottom: 0;
133130
left: 0;
134-
z-index: ${LEVEL_10 * 10};
131+
z-index: ${LEVEL_100};
135132
display: flex;
136133
flex-direction: column;
137134
width: 100%;
138135
height: 100%;
139-
140-
background-color: ${WHITE};
136+
background-color: ${p => p.theme.componentBackground};
141137
transition: all 3s ease-out;
142138
143-
.full-header {
144-
display: flex;
145-
justify-content: space-between;
146-
background-color: transparent;
147-
}
148-
.close-fullscreen {
149-
margin-top: 20px;
150-
color: ${G90};
151-
}
152139
.full-container {
153140
display: flex;
154141
flex: 1;
@@ -161,13 +148,16 @@ const FullScreenWrap = styled.div<{ show: boolean }>`
161148
z-index: ${LEVEL_10};
162149
width: 300px;
163150
height: 100%;
164-
165-
background-color: rgba(250, 250, 250, 0.859);
166-
151+
background-color: ${p => p.theme.bodyBackground};
167152
transition: all 0.3s;
168-
169-
.ant-menu {
170-
background-color: transparent;
171-
}
172153
}
173154
`;
155+
const FullHeader = styled.div`
156+
display: flex;
157+
flex-shrink: 0;
158+
align-items: center;
159+
justify-content: space-between;
160+
padding: ${SPACE_SM} ${SPACE_LG};
161+
background-color: ${p => p.theme.componentBackground};
162+
box-shadow: ${p => p.theme.shadowSider};
163+
`;

‎frontend/src/app/pages/DashBoardPage/components/Widgets/IframeWidget/IframeWidgetCore.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ export const IframeWidgetCore: React.FC<{}> = memo(() => {
7171
);
7272

7373
return (
74-
<Wrap>
74+
<Wrapper>
7575
{editing && setter}
7676
<iframe
7777
title=" "
@@ -80,10 +80,10 @@ export const IframeWidgetCore: React.FC<{}> = memo(() => {
8080
allow="autoplay"
8181
style={{ width: '100%', height: '100%' }}
8282
></iframe>
83-
</Wrap>
83+
</Wrapper>
8484
);
8585
});
86-
const Wrap = styled.div`
86+
const Wrapper = styled.div`
8787
display: flex;
8888
flex-direction: column;
8989
width: 100%;

‎frontend/src/app/pages/DashBoardPage/components/Widgets/ImageWidget/ImageWidgetCore.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ export const ImageWidgetCore: React.FC<{}> = () => {
5555
<Empty description="" />
5656
);
5757
}, [editing, onChange, t, widgetBgImage]);
58-
return <Wrap>{renderImage}</Wrap>;
58+
return <Wrapper>{renderImage}</Wrapper>;
5959
};
6060

61-
const Wrap = styled.div`
61+
const Wrapper = styled.div`
6262
display: flex;
6363
align-items: center;
6464
justify-content: center;

‎frontend/src/app/pages/DashBoardPage/components/Widgets/QueryBtnWidget/QueryBtnWidgetCore.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ export const QueryBtnWidgetCore: React.FC<{}> = memo(() => {
3636
const { name, nameConfig, background } = widget.config;
3737

3838
return (
39-
<Wrap {...nameConfig} background={background.color} onClick={onQuery}>
39+
<Wrapper {...nameConfig} background={background.color} onClick={onQuery}>
4040
<span>{name}</span>
41-
</Wrap>
41+
</Wrapper>
4242
);
4343
});
4444

45-
const Wrap = styled.div<FontConfig & { background: string }>`
45+
const Wrapper = styled.div<FontConfig & { background: string }>`
4646
display: flex;
4747
flex: 1;
4848
align-items: center;

0 commit comments

Comments
 (0)