diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue index 824c30150..f922d2ad7 100644 --- a/resources/assets/js/pages/manage.vue +++ b/resources/assets/js/pages/manage.vue @@ -352,12 +352,12 @@ - + - + diff --git a/resources/assets/js/pages/manage/application.vue b/resources/assets/js/pages/manage/application.vue index 24e4c2a74..9231458ee 100644 --- a/resources/assets/js/pages/manage/application.vue +++ b/resources/assets/js/pages/manage/application.vue @@ -127,11 +127,13 @@ + +
-
- {{ $L('AI 列表') }} -

{{ $L('机器人设置') }}

-
  • diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue index c658f9c04..b3d8d0f85 100644 --- a/resources/assets/js/pages/manage/components/DialogWrapper.vue +++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue @@ -575,7 +575,7 @@ @@ -599,6 +600,7 @@
    diff --git a/resources/assets/js/pages/manage/file.vue b/resources/assets/js/pages/manage/file.vue index dade1cc65..39dd5ff13 100644 --- a/resources/assets/js/pages/manage/file.vue +++ b/resources/assets/js/pages/manage/file.vue @@ -415,8 +415,9 @@ diff --git a/resources/assets/sass/components/drawer-overlay.scss b/resources/assets/sass/components/drawer-overlay.scss index c5b978e46..6aaa253ff 100644 --- a/resources/assets/sass/components/drawer-overlay.scss +++ b/resources/assets/sass/components/drawer-overlay.scss @@ -1,3 +1,33 @@ +// 去除 modal 默认样式 +body { + .ivu-modal-wrap { + &.common-drawer { + overflow: hidden; + + .ivu-modal { + .ivu-modal-content { + margin-top: 0; + margin-bottom: 0; + background-color: transparent; + } + + .ivu-modal-close { + display: none; + } + + .ivu-modal-body { + padding: 0; + display: flex; + flex-direction: column; + justify-content: flex-end; + align-items: flex-end; + } + } + } + } +} + +// 通用抽屉样式 .common-drawer { --margin-top: 8px; --margin-left: 8px; @@ -142,6 +172,7 @@ } } +// 全屏抽屉样式 .drawer-fullscreen { --margin-top: 0px; --margin-left: 0px; @@ -155,44 +186,26 @@ --close-top: 20px; --close-right: 12px; } -} -body { - .ivu-modal-wrap { - &.common-drawer { - overflow: hidden; - - .ivu-modal { - .ivu-modal-content { - margin-top: 0; - margin-bottom: 0; - background-color: transparent; - } - - .ivu-modal-close { - display: none; - } - - .ivu-modal-body { - padding: 0; - display: flex; - flex-direction: column; - justify-content: flex-end; - align-items: flex-end; - } - } - } + &.dialog-wrapper-list { + --content-bg-color: #f8f8f8; } } body.dark-mode-reverse { + // 暗黑模式下的抽屉样式 .common-drawer { &.file-drawer { --close-color: #000000; } } + // 暗黑模式下的全屏抽屉样式 + .drawer-fullscreen { + + } } +// 抽屉动画样式 .drawer-animation { &-fade { &-enter-active, diff --git a/resources/assets/sass/components/report.scss b/resources/assets/sass/components/report.scss index eac7f53ae..4f8819770 100644 --- a/resources/assets/sass/components/report.scss +++ b/resources/assets/sass/components/report.scss @@ -66,7 +66,7 @@ flex-shrink: 0; font-size: 16px; font-weight: bold; - padding: 20px 24px; + padding: 16px 24px; border-bottom: 1px solid #eeeeee; @media (max-width: 500px) { padding-right: 50px; diff --git a/resources/assets/sass/dark.scss b/resources/assets/sass/dark.scss index 2f521da9f..1154a32b9 100644 --- a/resources/assets/sass/dark.scss +++ b/resources/assets/sass/dark.scss @@ -80,20 +80,6 @@ body.dark-mode-reverse { } } - .common-drawer-overlay { - .overlay-body { - .overlay-close { - > a { - color: #323232; - - &:hover { - color: #000; - } - } - } - } - } - .file-content, .file-preview { .content-body { diff --git a/resources/assets/sass/pages/components/dialog-wrapper.scss b/resources/assets/sass/pages/components/dialog-wrapper.scss index 76d2208a3..001dba024 100644 --- a/resources/assets/sass/pages/components/dialog-wrapper.scss +++ b/resources/assets/sass/pages/components/dialog-wrapper.scss @@ -2492,12 +2492,6 @@ body:not(.window-touch) { } } -.dialog-wrapper-modal-list { - .ivu-modal-fullscreen { - background-color: #f8f8f8; - } -} - @keyframes head-box-loading-animation { 0% { box-shadow: 0 0, 0 0; @@ -2547,8 +2541,8 @@ body.window-portrait { &.inde-list { .dialog-nav { .drawer-title { - height: 52px; - line-height: 52px; + height: 56px; + line-height: 56px; border-bottom: 0; } } diff --git a/resources/assets/sass/pages/page-approve.scss b/resources/assets/sass/pages/page-approve.scss index ac2e983b4..f21fbc489 100644 --- a/resources/assets/sass/pages/page-approve.scss +++ b/resources/assets/sass/pages/page-approve.scss @@ -15,7 +15,7 @@ display: flex; align-items: center; padding-bottom: 16px; - margin: 20px 20px 5px; + margin: 20px 60px 5px 20px; border-bottom: 1px solid #F4F4F5; gap: 16px; @@ -523,11 +523,3 @@ border-width: 0; } } - -body.window-portrait { - .page-approve{ - .approve-head { - margin: 24px 16px 6px 16px; - } - } -} diff --git a/resources/assets/sass/pages/page-file.scss b/resources/assets/sass/pages/page-file.scss index 76f466acc..36ee315cc 100644 --- a/resources/assets/sass/pages/page-file.scss +++ b/resources/assets/sass/pages/page-file.scss @@ -714,12 +714,6 @@ } } -.page-file-drawer { - .overlay-content { - border-radius: 20px 20px 0 0 !important; - } -} - body.window-portrait { .page-file { .file-wrapper {