From 9115f93439cab6a2cb7f2f8c75a7b9f31050a456 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=93=88=E5=A3=AB=E5=A5=87-=E9=BB=84?= <473795376@qq.com>
Date: Wed, 29 Jun 2022 15:30:42 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix(Modal):=20=E4=BF=AE=E5=A4=8D=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E5=85=B3=E9=97=AD=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=20(#918)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/devui-vue/devui/modal/src/modal.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/devui-vue/devui/modal/src/modal.scss b/packages/devui-vue/devui/modal/src/modal.scss
index 93f5336cda..15b67cdf15 100644
--- a/packages/devui-vue/devui/modal/src/modal.scss
+++ b/packages/devui-vue/devui/modal/src/modal.scss
@@ -44,6 +44,11 @@
       color: $devui-icon-fill-active-hover;
       background-color: $devui-list-item-hover-bg;
     }
+    & i {
+      position: absolute;
+      right: 0;
+      top: 0;
+    }
   }
 }
 

From df5c992d870518fbb05f72fba80159a23f1ca67c Mon Sep 17 00:00:00 2001
From: zhaokun <zhaokun_zhang@icloud.com>
Date: Fri, 12 Sep 2025 18:04:37 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix(pagination):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E7=BB=84=E4=BB=B6perPage=E8=8B=B1=E6=96=87?=
 =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E6=96=87=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在en-us.ts中添加perPage: 'per page'配置
- 修复分页组件'条/页'文本在英文环境下无法正确显示的问题
- 解决issue #1949中提到的国际化缺失问题
---
 packages/devui-vue/devui/locale/lang/en-us.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/devui-vue/devui/locale/lang/en-us.ts b/packages/devui-vue/devui/locale/lang/en-us.ts
index f099c90a59..4ad06f52f3 100644
--- a/packages/devui-vue/devui/locale/lang/en-us.ts
+++ b/packages/devui-vue/devui/locale/lang/en-us.ts
@@ -2,6 +2,7 @@ export default {
   pagination: {
     totalItemText: 'Total',
     goToText: 'Go to',
+    perPage: 'per page',
   },
   accordion: {
     loading: 'loading',

From b79a4806745011e87345d843b5eab88ed1850b29 Mon Sep 17 00:00:00 2001
From: Zhaokun <zhaokun_zhang@icloud.com>
Date: Fri, 12 Sep 2025 18:07:35 +0800
Subject: [PATCH 3/4] Update modal.scss

---
 packages/devui-vue/devui/modal/src/modal.scss | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/devui-vue/devui/modal/src/modal.scss b/packages/devui-vue/devui/modal/src/modal.scss
index e829af398a..a32be4b4eb 100644
--- a/packages/devui-vue/devui/modal/src/modal.scss
+++ b/packages/devui-vue/devui/modal/src/modal.scss
@@ -48,11 +48,6 @@
       vertical-align: middle;
       font-size: 18px;
     }
-    & i {
-      position: absolute;
-      right: 0;
-      top: 0;
-    }
   }
 }
 
@@ -117,4 +112,4 @@
     opacity: 0.2;
     top: calc(50% - 24px);
   }
-}
\ No newline at end of file
+}

From 938a951014eee1506849903ffd6a3cc1ffd57b13 Mon Sep 17 00:00:00 2001
From: Zhaokun Zhang <zhaokunzhang@Zhaokuns-Air.lan>
Date: Mon, 15 Sep 2025 23:15:06 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix(pagination):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E7=BB=84=E4=BB=B6perPage=E8=8B=B1=E6=96=87?=
 =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E6=96=87=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 - 在en-us.ts中添加perPage: 'per page'配置
- 修复分页组件'条/页'文本在英文环境下无法正确显示的问题
 - 解决issue #1949中提到的国际化缺失问题
---
 packages/devui-vue/devui/locale/lang/en-us.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/devui-vue/devui/locale/lang/en-us.ts b/packages/devui-vue/devui/locale/lang/en-us.ts
index 4ad06f52f3..b22c6895ea 100644
--- a/packages/devui-vue/devui/locale/lang/en-us.ts
+++ b/packages/devui-vue/devui/locale/lang/en-us.ts
@@ -2,7 +2,7 @@ export default {
   pagination: {
     totalItemText: 'Total',
     goToText: 'Go to',
-    perPage: 'per page',
+    perPage: 'Per page',
   },
   accordion: {
     loading: 'loading',