From 63d1983914423191b43b1f5f33dfaa5056ab5864 Mon Sep 17 00:00:00 2001 From: feng <1304903146@qq.com> Date: Thu, 16 May 2024 11:13:44 +0800 Subject: [PATCH 1/4] perf: card table css --- src/components/Table/CardTable.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Table/CardTable.vue b/src/components/Table/CardTable.vue index cf48e7812..5e753323c 100644 --- a/src/components/Table/CardTable.vue +++ b/src/components/Table/CardTable.vue @@ -286,12 +286,12 @@ export default { .comment { display: -webkit-box; - height: 75px; + height: 110px; font-size: 12px; padding: 15px 0; cursor: pointer; overflow: hidden; - -webkit-line-clamp: 2; + -webkit-line-clamp: 3; -webkit-box-flex: 1; -webkit-flex-grow: 1; flex-grow: 1; From e8f395007217a3a3598a29c5a3f8a7f59300e364 Mon Sep 17 00:00:00 2001 From: zhaojisen <1301338853@qq.com> Date: Thu, 16 May 2024 11:11:24 +0800 Subject: [PATCH 2/4] =?UTF-8?q?style=EF=BC=9A=E4=BC=98=E5=8C=96=20organiza?= =?UTF-8?q?tion=20=E7=BB=84=E4=BB=B6=E7=9A=84=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/NavHeader/Organization.vue | 6 ++++-- src/layout/components/NavHeader/index.vue | 6 +++--- src/styles/index.scss | 13 +++++++------ 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/layout/components/NavHeader/Organization.vue b/src/layout/components/NavHeader/Organization.vue index 10bb39f60..e12fab6fc 100644 --- a/src/layout/components/NavHeader/Organization.vue +++ b/src/layout/components/NavHeader/Organization.vue @@ -132,8 +132,8 @@ $height: 28px; ::v-deep .el-input { .el-input__inner { - height: 30px; - line-height: 30px; + height: 28px; + line-height: 28px; background: none; border: none; padding-left: 20px; @@ -150,6 +150,8 @@ $height: 28px; .el-select-dropdown.switch-org { border-radius: 4px; + left: 220px !important; + max-width: 400px; .option-group { padding-right: 8px; diff --git a/src/layout/components/NavHeader/index.vue b/src/layout/components/NavHeader/index.vue index 12d0b4a63..ce4011292 100644 --- a/src/layout/components/NavHeader/index.vue +++ b/src/layout/components/NavHeader/index.vue @@ -182,9 +182,9 @@ export default { .organization { display: flex; align-items: center; - line-height: 30px; - padding: 0 10px 0 15px !important; - border-radius: 5px; + line-height: 28px; + padding: 0 0 0 15px !important; + border-radius: 3px; background-color: rgba(255, 255, 255, .15); color: #fff; font-weight: 600; diff --git a/src/styles/index.scss b/src/styles/index.scss index 6f09701e5..8bd4cd0d4 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -218,15 +218,16 @@ input[type=file] { @media screen and (max-width: 992px) { .el-select-dropdown.switch-org { - left: 0!important; - width: 100vw!important; + left: 0 !important; + width: 350px; } } -.el-popper.switch-org { - border-radius: 5px; - left: 220px !important; - max-width: 400px; +@media screen and (min-width: 992px) { + .el-select-dropdown.switch-org { + left: 220px !important; + max-width: 400px; + } } // 步骤条 From 87d7a291f0db95f5e858d94be6a7bda73dcee96b Mon Sep 17 00:00:00 2001 From: zhaojisen <1301338853@qq.com> Date: Thu, 16 May 2024 11:56:37 +0800 Subject: [PATCH 3/4] =?UTF-8?q?style=EF=BC=9A=E4=BF=AE=E5=A4=8D=20organiza?= =?UTF-8?q?tion=20=E5=9C=A8=E7=A6=81=E7=94=A8=E6=97=B6=E7=9A=84=E8=83=8C?= =?UTF-8?q?=E6=99=AF=E8=A2=AB=E8=A6=86=E7=9B=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/NavHeader/index.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/layout/components/NavHeader/index.vue b/src/layout/components/NavHeader/index.vue index ce4011292..8eb9a0b94 100644 --- a/src/layout/components/NavHeader/index.vue +++ b/src/layout/components/NavHeader/index.vue @@ -190,6 +190,10 @@ export default { font-weight: 600; font-size: 15px; + ::v-deep .el-input.is-disabled > input { + background: none; + } + &:hover { background-color: rgba(0, 0, 0, .12) !important; } From ac97dbf8ba46866fd057956016a0fca9fcf740d7 Mon Sep 17 00:00:00 2001 From: zhaojisen <1301338853@qq.com> Date: Thu, 16 May 2024 11:37:14 +0800 Subject: [PATCH 4/4] =?UTF-8?q?style=EF=BC=9Aalert=20=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/styles/index.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/styles/index.scss b/src/styles/index.scss index 8bd4cd0d4..dbd7d4022 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -402,6 +402,10 @@ input[type=file] { } .el-alert { + &.el-alert--success.is-light { + color: var(--color-text-primary) + } + .el-alert__description, .el-alert__title{ color: var(--color-text-primary) !important;