From dbedad22cb3b52f7ff388d0ee96cee6916c0b3fa Mon Sep 17 00:00:00 2001
From: zhaoShijuan <18712788257@163.com>
Date: Thu, 10 Nov 2022 21:58:22 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(pagination):=20=E4=BF=AE=E5=A4=8DPagina?=
=?UTF-8?q?tion=E7=BB=84=E4=BB=B6=E5=88=87=E6=8D=A2pageSize=E6=97=B6?=
=?UTF-8?q?=E6=9C=AA=E6=8A=9B=E5=87=BA=E9=80=89=E4=B8=AD=E5=80=BC=EF=BC=8C?=
=?UTF-8?q?=E5=A2=9E=E5=8A=A0page-size=E4=B8=8B=E6=8B=89=E5=8D=95=E5=85=83?=
=?UTF-8?q?=E9=80=89=E4=B8=AD=E6=A0=B7=E5=BC=8F=EF=BC=88#1435=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../devui/pagination/src/components/page-size.tsx | 2 +-
packages/devui-vue/devui/pagination/src/pagination.scss | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/packages/devui-vue/devui/pagination/src/components/page-size.tsx b/packages/devui-vue/devui/pagination/src/components/page-size.tsx
index a3740fe225..85b65064f5 100644
--- a/packages/devui-vue/devui/pagination/src/components/page-size.tsx
+++ b/packages/devui-vue/devui/pagination/src/components/page-size.tsx
@@ -28,7 +28,7 @@ export default defineComponent({
menu: () => (
{pageSizeOptions.value.map((item, index) => (
- -
+
-
{item}
))}
diff --git a/packages/devui-vue/devui/pagination/src/pagination.scss b/packages/devui-vue/devui/pagination/src/pagination.scss
index 3e8a1c1736..6214e6eb41 100644
--- a/packages/devui-vue/devui/pagination/src/pagination.scss
+++ b/packages/devui-vue/devui/pagination/src/pagination.scss
@@ -387,9 +387,14 @@
transition: color $devui-animation-duration-fast $devui-animation-ease-in-out-smooth,
background-color $devui-animation-duration-fast $devui-animation-ease-in-out-smooth;
- &:hover {
+ &:hover:not(.active) {
color: $devui-list-item-hover-text;
background-color: $devui-list-item-hover-bg;
}
+
+ &.active {
+ color: $devui-list-item-active-text;
+ background-color: $devui-list-item-active-bg;
+ }
}
}
From 4f0ec0240beff9528d872c6fe51d5dda6cf4e46c Mon Sep 17 00:00:00 2001
From: zhaoShijuan <18712788257@163.com>
Date: Fri, 11 Nov 2022 09:41:51 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E6=A0=BC?=
=?UTF-8?q?=E5=BC=8F=E8=A6=81=E6=B1=82=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../devui-vue/devui/pagination/src/components/page-size.tsx | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/packages/devui-vue/devui/pagination/src/components/page-size.tsx b/packages/devui-vue/devui/pagination/src/components/page-size.tsx
index 85b65064f5..67d28ed41f 100644
--- a/packages/devui-vue/devui/pagination/src/components/page-size.tsx
+++ b/packages/devui-vue/devui/pagination/src/components/page-size.tsx
@@ -28,7 +28,9 @@ export default defineComponent({
menu: () => (
{pageSizeOptions.value.map((item, index) => (
- -
+
-
{item}
))}