From b40673e9ac79ab340c1cde4f6e1948b56921b326 Mon Sep 17 00:00:00 2001 From: whyour Date: Wed, 16 Aug 2023 22:14:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97=E5=BC=B9?= =?UTF-8?q?=E6=A1=86=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layouts/index.less | 13 ++++++++++--- src/pages/crontab/index.less | 12 ------------ src/pages/crontab/index.tsx | 2 +- src/pages/crontab/logModal.tsx | 3 --- src/pages/dependence/logModal.tsx | 5 ----- src/pages/subscription/logModal.tsx | 3 --- 6 files changed, 11 insertions(+), 27 deletions(-) diff --git a/src/layouts/index.less b/src/layouts/index.less index 50c0ff44..9c1cced4 100644 --- a/src/layouts/index.less +++ b/src/layouts/index.less @@ -32,9 +32,16 @@ body { } .log-modal { - .ant-modal { - padding-bottom: 0 !important; - width: 580px !important; + &.ant-modal { + max-width: 1000px !important; + width: 80vw !important; + } + + .ant-modal-body { + overflow-y: auto; + min-height: 300px; + max-height: 80vh; + max-height: calc(80vh - var(--vh-offset, 0px)); } pre { diff --git a/src/pages/crontab/index.less b/src/pages/crontab/index.less index 658e7525..6602b37f 100644 --- a/src/pages/crontab/index.less +++ b/src/pages/crontab/index.less @@ -186,18 +186,6 @@ tr.drop-over-upward td { } } -.log-modal { - .log-container { - overflow-y: auto; - min-height: 300px; - max-height: calc(80vh - 110px); - max-height: calc(80vh - var(--vh-offset, 110px)); - - padding: 24px; - margin: -24px; - } -} - body[data-mode='desktop'] { .crontab-wrapper { tbody .ant-table-cell { diff --git a/src/pages/crontab/index.tsx b/src/pages/crontab/index.tsx index 93b24bb4..5f617bd6 100644 --- a/src/pages/crontab/index.tsx +++ b/src/pages/crontab/index.tsx @@ -68,7 +68,7 @@ const Crontab = () => { title: intl.get('名称'), dataIndex: 'name', key: 'name', - fixed: isPhone ? undefined : 'left', + fixed: 'left', width: 120, render: (text: string, record: any) => ( <> diff --git a/src/pages/crontab/logModal.tsx b/src/pages/crontab/logModal.tsx index 5c3d95c3..ea559ee8 100644 --- a/src/pages/crontab/logModal.tsx +++ b/src/pages/crontab/logModal.tsx @@ -124,9 +124,6 @@ const CronLogModal = ({ open={visible} centered className="log-modal" - bodyStyle={{ - minHeight: '300px', - }} forceRender onOk={() => cancel()} onCancel={() => cancel()} diff --git a/src/pages/dependence/logModal.tsx b/src/pages/dependence/logModal.tsx index 6713c836..836621bf 100644 --- a/src/pages/dependence/logModal.tsx +++ b/src/pages/dependence/logModal.tsx @@ -121,11 +121,6 @@ const DependenceLogModal = ({ open={visible} centered className="log-modal" - bodyStyle={{ - overflowY: 'auto', - maxHeight: 'calc(70vh - var(--vh-offset, 0px))', - minHeight: '300px', - }} forceRender onOk={() => cancel()} onCancel={() => cancel()} diff --git a/src/pages/subscription/logModal.tsx b/src/pages/subscription/logModal.tsx index 09df132b..484afe5a 100644 --- a/src/pages/subscription/logModal.tsx +++ b/src/pages/subscription/logModal.tsx @@ -99,9 +99,6 @@ const SubscriptionLogModal = ({ open={visible} centered className="log-modal" - bodyStyle={{ - minHeight: '300px', - }} forceRender onOk={() => cancel()} onCancel={() => cancel()}