Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
CivWeb
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ReactWeb5
CivWeb
Commits
698856ee
Commit
698856ee
authored
3 years ago
by
邓晓峰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修复容器布局高度
parent
92b2bfff
Pipeline
#34681
passed with stages
in 23 minutes 8 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
reducer.js
src/containers/App/store/reducer.js
+2
-2
BasicLayout1.js
src/layouts/BasicLayout1.js
+2
-2
No files found.
src/containers/App/store/reducer.js
View file @
698856ee
...
@@ -87,8 +87,8 @@ const appReducer = (state = initialState, action) => {
...
@@ -87,8 +87,8 @@ const appReducer = (state = initialState, action) => {
},
},
);
);
// eslint-disable-next-line global-require,no-underscore-dangle
// eslint-disable-next-line global-require,no-underscore-dangle
//
window.__INITIAL_STATE__.mdi = 'SDI';
window
.
__INITIAL_STATE__
.
mdi
=
'SDI'
;
//
window.__INITIAL_STATE__.menu = 'banner-left';
window
.
__INITIAL_STATE__
.
menu
=
'banner-left'
;
window
.
globalConfig
=
AppConfig
(
window
.
__INITIAL_STATE__
);
window
.
globalConfig
=
AppConfig
(
window
.
__INITIAL_STATE__
);
// eslint-disable-next-line no-undef
// eslint-disable-next-line no-undef
...
...
This diff is collapsed.
Click to expand it.
src/layouts/BasicLayout1.js
View file @
698856ee
...
@@ -573,10 +573,10 @@ const BasicLayout = props => {
...
@@ -573,10 +573,10 @@ const BasicLayout = props => {
<
/Tabs
>
<
/Tabs
>
<
/div
>
<
/div
>
<
div
className
=
{
layoutStyles
[
'ant-pro-grid-content'
]}
>
<
div
className
=
'ant-pro-grid-content'
>
<
div
className
=
"ant-pro-grid-content-children"
>
<
div
className
=
"ant-pro-grid-content-children"
>
<
div
className
=
{
layoutStyles
[
'ant-pro-page-container-children-content'
]}
>
<
div
className
=
{
layoutStyles
[
'ant-pro-page-container-children-content'
]}
>
<
div
id
=
"micro-container"
className
=
"subapp-container"
style
=
{{
height
:
'
100%
'
}}
/
>
<
div
id
=
"micro-container"
className
=
"subapp-container"
style
=
{{
height
:
'
89.8vh'
,
position
:
'relative'
,
top
:
'64px
'
}}
/
>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment