diff --git a/package.json b/package.json index 076acce4..a3ee805f 100644 --- a/package.json +++ b/package.json @@ -71,6 +71,7 @@ "typescript": "^4.1.2", "umi": "^3.3.9", "umi-request": "^1.3.5", + "vh-check": "^2.0.5", "webpack": "^5.28.0", "yorkie": "^2.0.0" } diff --git a/src/layouts/index.less b/src/layouts/index.less index 7329aca7..5e4df4c7 100644 --- a/src/layouts/index.less +++ b/src/layouts/index.less @@ -6,10 +6,13 @@ body { @import '~codemirror/lib/codemirror.css'; -.code-mirror-wrapper .CodeMirror { - position: absolute; - height: calc(100vh - 128px); - width: calc(100% - 32px); +.ql-container-wrapper { + .CodeMirror { + position: absolute; + height: calc(100vh - 128px); + height: calc(100vh - var(--vh-offset, 0px) - 128px); + width: calc(100% - 32px); + } } .ant-pro-grid-content.wide { @@ -18,6 +21,7 @@ body { .ant-pro-page-container-children-content { overflow: auto; height: calc(100vh - 96px); + height: calc(100vh - var(--vh-offset, 0px) - 96px); background-color: #fff; padding: 16px; } @@ -29,13 +33,30 @@ body { } } +.log-select { + width: 300px; +} + @media (max-width: 768px) { .ant-pro-grid-content.wide { .ant-pro-page-container-children-content { height: calc(100vh - 144px); + height: calc(100vh - var(--vh-offset, 0px) - 144px); } } - .code-mirror-wrapper .CodeMirror { - height: calc(100vh - 176px); + .ql-container-wrapper { + &.crontab-wrapper { + .ant-pro-grid-content.wide .ant-pro-page-container-children-content { + height: calc(100vh - 184px); + height: calc(100vh - var(--vh-offset, 0px) - 184px); + } + } + .CodeMirror { + height: calc(100vh - 176px); + height: calc(100vh - var(--vh-offset, 0px) - 176px); + } + } + .log-select { + width: 200px; } } diff --git a/src/layouts/index.tsx b/src/layouts/index.tsx index 8a42056a..c855ba92 100644 --- a/src/layouts/index.tsx +++ b/src/layouts/index.tsx @@ -13,6 +13,7 @@ import config from '@/utils/config'; import 'codemirror/mode/shell/shell.js'; import { request } from '@/utils/http'; import './index.less'; +import vhCheck from 'vh-check'; export default function (props: any) { const logout = () => { @@ -27,6 +28,7 @@ export default function (props: any) { if (!isAuth) { history.push('/login'); } + vhCheck(); }, []); useEffect(() => { diff --git a/src/pages/config/index.tsx b/src/pages/config/index.tsx index ba35b07e..763d59f3 100644 --- a/src/pages/config/index.tsx +++ b/src/pages/config/index.tsx @@ -49,7 +49,7 @@ const Config = () => { return ( @@ -68,9 +68,6 @@ const Config = () => { marginLeft, }, }} - style={{ - height: '100vh', - }} > { marginLeft, }, }} - style={{ - height: '100vh', - }} > { return ( { marginLeft, }, }} - style={{ - height: '100vh', - }} > {selectedRowIds.length > 0 && (
diff --git a/src/pages/diff/index.less b/src/pages/diff/index.less index a0acd042..dbea084e 100644 --- a/src/pages/diff/index.less +++ b/src/pages/diff/index.less @@ -1,12 +1,13 @@ .d2h-files-diff { - height: calc(100vh - 130px); - overflow: auto; + height: calc(100vh - 130px); + height: calc(100vh - var(--vh-offset, 0px) - 130px); + overflow: auto; } .d2h-code-side-linenumber { - position: relative; + position: relative; } .d2h-code-side-line { - padding: 0 0.5em; -} \ No newline at end of file + padding: 0 0.5em; +} diff --git a/src/pages/diff/index.tsx b/src/pages/diff/index.tsx index 6801c5f1..43ff3d28 100644 --- a/src/pages/diff/index.tsx +++ b/src/pages/diff/index.tsx @@ -46,7 +46,7 @@ const Crontab = () => { return ( { marginLeft, }, }} - style={{ - height: '100vh', - }} > { return ( @@ -68,9 +68,6 @@ const Crontab = () => { marginLeft, }, }} - style={{ - height: '100vh', - }} > { return ( { marginLeft, }, }} - style={{ - height: '100vh', - }} > { return ( { marginLeft, }, }} - style={{ - height: '100vh', - }} >