From be73f4da3e4bbbacf3f748f7ebfd70f825e0d15e Mon Sep 17 00:00:00 2001 From: kailong321200875 <321200875@qq.com> Date: Sat, 14 Oct 2023 09:11:14 +0800 Subject: [PATCH] =?UTF-8?q?style:=20Descriptions=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Descriptions/src/Descriptions.vue | 11 ++++++----- src/components/Dialog/src/Dialog.vue | 8 ++++++-- .../InputPassword/src/InputPassword.vue | 2 +- src/components/Menu/src/Menu.vue | 5 +++-- src/components/Qrcode/src/Qrcode.vue | 2 +- .../Setting/src/components/LayoutRadioPicker.vue | 16 ++++++++-------- .../UserInfo/src/components/LockDialog.vue | 2 +- .../UserInfo/src/components/LockPage.vue | 2 ++ stylelint.config.js | 2 ++ 9 files changed, 30 insertions(+), 20 deletions(-) diff --git a/src/components/Descriptions/src/Descriptions.vue b/src/components/Descriptions/src/Descriptions.vue index 66dad8b24..f031e5cbb 100644 --- a/src/components/Descriptions/src/Descriptions.vue +++ b/src/components/Descriptions/src/Descriptions.vue @@ -61,7 +61,10 @@ export default defineComponent({ delete obj[key] } } - return obj + return { + labelClassName: `${prefixCls}-label`, + ...obj + } } // 折叠 @@ -155,9 +158,7 @@ export default defineComponent({ } } -.@{prefix-cls}-content { - :deep(.@{elNamespace}-descriptions__cell) { - width: 0; - } +:deep(.@{prefix-cls}-label) { + width: 150px; } diff --git a/src/components/Dialog/src/Dialog.vue b/src/components/Dialog/src/Dialog.vue index dafad22e9..7bba97147 100644 --- a/src/components/Dialog/src/Dialog.vue +++ b/src/components/Dialog/src/Dialog.vue @@ -113,18 +113,22 @@ const dialogStyle = computed(() => { .@{elNamespace}-dialog { margin: 0 !important; + &__header { + height: 54px; + padding: 0; margin-right: 0 !important; border-bottom: 1px solid var(--el-border-color); - padding: 0; - height: 54px; } + &__body { padding: 15px !important; } + &__footer { border-top: 1px solid var(--el-border-color); } + &__headerbtn { top: 0; } diff --git a/src/components/InputPassword/src/InputPassword.vue b/src/components/InputPassword/src/InputPassword.vue index 87c994451..1f04dbbb9 100644 --- a/src/components/InputPassword/src/InputPassword.vue +++ b/src/components/InputPassword/src/InputPassword.vue @@ -86,7 +86,7 @@ const getPasswordStrength = computed(() => { background-color: transparent; border-color: var(--el-color-white); border-style: solid; - border-width: 0 5px 0 5px; + border-width: 0 5px; content: ''; } diff --git a/src/components/Menu/src/Menu.vue b/src/components/Menu/src/Menu.vue index 74e2d7dc9..e3448d609 100644 --- a/src/components/Menu/src/Menu.vue +++ b/src/components/Menu/src/Menu.vue @@ -155,6 +155,7 @@ export default defineComponent({ .is-active { & > .@{elNamespace}-sub-menu__title { color: var(--left-menu-text-active-color) !important; + // background-color: var(--left-menu-bg-color) !important; } } @@ -168,7 +169,6 @@ export default defineComponent({ } // 设置选中时的高亮背景和高亮颜色 - .@{elNamespace}-sub-menu.is-active, .@{elNamespace}-menu-item.is-active { color: var(--left-menu-text-active-color) !important; background-color: var(--left-menu-bg-active-color) !important; @@ -235,7 +235,7 @@ export default defineComponent({ .@{elNamespace}-menu-item.is-active { position: relative; - &:after { + &::after { display: none !important; } } @@ -270,6 +270,7 @@ export default defineComponent({ .is-active { & > .el-sub-menu__title { color: var(--left-menu-text-active-color) !important; + // background-color: var(--left-menu-bg-color) !important; } } diff --git a/src/components/Qrcode/src/Qrcode.vue b/src/components/Qrcode/src/Qrcode.vue index c2436321c..ac216dd7d 100644 --- a/src/components/Qrcode/src/Qrcode.vue +++ b/src/components/Qrcode/src/Qrcode.vue @@ -242,7 +242,7 @@ const disabledClick = () => { .@{prefix-cls} { &--disabled { - background: rgba(255, 255, 255, 0.95); + background: rgb(255 255 255 / 95%); & > div { transform: translate(-50%, -50%); diff --git a/src/components/Setting/src/components/LayoutRadioPicker.vue b/src/components/Setting/src/components/LayoutRadioPicker.vue index 96b1dbeb9..de6e80f69 100644 --- a/src/components/Setting/src/components/LayoutRadioPicker.vue +++ b/src/components/Setting/src/components/LayoutRadioPicker.vue @@ -67,7 +67,7 @@ const layout = computed(() => appStore.getLayout) border: 2px solid #e5e7eb; border-radius: 4px; - &:before { + &::before { position: absolute; top: 0; left: 0; @@ -79,14 +79,14 @@ const layout = computed(() => appStore.getLayout) content: ''; } - &:after { + &::after { position: absolute; top: 0; left: 0; width: 100%; height: 25%; background-color: #fff; - border-radius: 4px 4px 0 4px; + border-radius: 4px 4px 0; content: ''; } } @@ -95,7 +95,7 @@ const layout = computed(() => appStore.getLayout) border: 2px solid #e5e7eb; border-radius: 4px; - &:before { + &::before { position: absolute; top: 0; left: 0; @@ -107,7 +107,7 @@ const layout = computed(() => appStore.getLayout) content: ''; } - &:after { + &::after { position: absolute; top: 0; left: 0; @@ -123,7 +123,7 @@ const layout = computed(() => appStore.getLayout) border: 2px solid #e5e7eb; border-radius: 4px; - &:before { + &::before { position: absolute; top: 0; left: 0; @@ -140,7 +140,7 @@ const layout = computed(() => appStore.getLayout) border: 2px solid #e5e7eb; border-radius: 4px; - &:before { + &::before { position: absolute; top: 0; left: 0; @@ -152,7 +152,7 @@ const layout = computed(() => appStore.getLayout) content: ''; } - &:after { + &::after { position: absolute; top: 0; left: 0; diff --git a/src/components/UserInfo/src/components/LockDialog.vue b/src/components/UserInfo/src/components/LockDialog.vue index f8bc0b453..a5f01647f 100644 --- a/src/components/UserInfo/src/components/LockDialog.vue +++ b/src/components/UserInfo/src/components/LockDialog.vue @@ -94,7 +94,7 @@ const handleLock = async () => {