From fcd28837b2ef7115c86eab9a6551fd0d6ca14c64 Mon Sep 17 00:00:00 2001 From: xiaoming <1923740402@qq.com> Date: Thu, 8 Jan 2026 11:23:51 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20`RePureTableBar`=E4=B8=8E`ReVxeTableBar?= =?UTF-8?q?`=E7=BB=84=E4=BB=B6=E5=AE=9E=E7=8E=B0=E5=85=A8=E9=87=8F?= =?UTF-8?q?=E6=96=87=E6=9C=AC=E5=9B=BD=E9=99=85=E5=8C=96=20(#1251)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locales/en.yaml | 16 +++++++++- locales/zh-CN.yaml | 16 +++++++++- src/components/RePureTableBar/src/bar.tsx | 38 +++++++++++++++-------- src/components/ReVxeTableBar/src/bar.tsx | 38 +++++++++++++++-------- 4 files changed, 80 insertions(+), 28 deletions(-) diff --git a/locales/en.yaml b/locales/en.yaml index 1b38890a1..89008e379 100644 --- a/locales/en.yaml +++ b/locales/en.yaml @@ -238,4 +238,18 @@ login: purePassWordRuleReg: The password format should be any combination of 8-18 digits purePassWordSureReg: Please enter confirm password purePassWordDifferentReg: The two passwords do not match! - purePassWordUpdateReg: Password has been updated \ No newline at end of file + purePassWordUpdateReg: Password has been updated +tableBar: + pureList: List + pureLarge: Large + pureDefault: Default + pureSmall: Small + pureColumnSettings: ColumnSettings + pureCollapse: Collapse + pureExpand: Expand + pureRefresh: Refresh + pureDensity: Density + pureColumnDisplay: ColumnDisplay + pureReset: Reset + pureExitFullScreen: ExitFullScreen + pureFullScreen: FullScreen \ No newline at end of file diff --git a/locales/zh-CN.yaml b/locales/zh-CN.yaml index 48fb0ec6c..bcf1eea74 100644 --- a/locales/zh-CN.yaml +++ b/locales/zh-CN.yaml @@ -238,4 +238,18 @@ login: purePassWordRuleReg: 密码格式应为8-18位数字、字母、符号的任意两种组合 purePassWordSureReg: 请输入确认密码 purePassWordDifferentReg: 两次密码不一致! - purePassWordUpdateReg: 修改密码成功 \ No newline at end of file + purePassWordUpdateReg: 修改密码成功 +tableBar: + pureList: 列表 + pureLarge: 宽松 + pureDefault: 默认 + pureSmall: 紧凑 + pureColumnSettings: 列设置 + pureCollapse: 折叠 + pureExpand: 展开 + pureRefresh: 刷新 + pureDensity: 密度 + pureColumnDisplay: 列展示 + pureReset: 重置 + pureExitFullScreen: 退出全屏 + pureFullScreen: 全屏 \ No newline at end of file diff --git a/src/components/RePureTableBar/src/bar.tsx b/src/components/RePureTableBar/src/bar.tsx index b00486e7f..924e47bde 100644 --- a/src/components/RePureTableBar/src/bar.tsx +++ b/src/components/RePureTableBar/src/bar.tsx @@ -1,5 +1,5 @@ import Sortable from "sortablejs"; -import { transformI18n } from "@/plugins/i18n"; +import { $t, transformI18n } from "@/plugins/i18n"; import { useEpThemeStoreHook } from "@/store/modules/epTheme"; import { type PropType, @@ -30,7 +30,7 @@ const props = { /** 头部最左边的标题 */ title: { type: String, - default: "列表" + default: $t("tableBar.pureList") }, /** 对于树形表格，如果想启用展开和折叠功能，传入当前表格的ref即可 */ tableRef: { @@ -169,19 +169,19 @@ export default defineComponent({ style={getDropdownItemStyle.value("large")} onClick={() => (size.value = "large")} > - 宽松 + {transformI18n($t("tableBar.pureLarge"))} (size.value = "default")} > - 默认 + {transformI18n($t("tableBar.pureDefault"))} (size.value = "small")} > - 紧凑 + {transformI18n($t("tableBar.pureSmall"))} ) @@ -245,7 +245,9 @@ export default defineComponent({ reference: () => ( ) }; @@ -268,7 +270,7 @@ export default defineComponent({ {slots?.title ? ( slots.title() ) : ( -

{props.title}

+

{transformI18n(props.title)}

)}
{slots?.buttons ? ( @@ -282,7 +284,9 @@ export default defineComponent({ transform: isExpandAll.value ? "none" : "rotate(-90deg)" }} v-tippy={rendTippyProps( - isExpandAll.value ? "折叠" : "展开" + isExpandAll.value + ? transformI18n($t("tableBar.pureCollapse")) + : transformI18n($t("tableBar.pureExpand")) )} onClick={() => onExpand()} /> @@ -295,14 +299,18 @@ export default defineComponent({ iconClass.value, loading.value ? "animate-spin" : "" ]} - v-tippy={rendTippyProps("刷新")} + v-tippy={rendTippyProps( + transformI18n($t("tableBar.pureRefresh")) + )} onClick={() => onReFresh()} /> @@ -318,13 +326,13 @@ export default defineComponent({
handleCheckAllChange(value)} /> onReset()}> - 重置 + {transformI18n($t("tableBar.pureReset"))}
@@ -382,7 +390,11 @@ export default defineComponent({ onFullscreen()} />
diff --git a/src/components/ReVxeTableBar/src/bar.tsx b/src/components/ReVxeTableBar/src/bar.tsx index aaca2c894..1aa345106 100644 --- a/src/components/ReVxeTableBar/src/bar.tsx +++ b/src/components/ReVxeTableBar/src/bar.tsx @@ -1,5 +1,5 @@ import Sortable from "sortablejs"; -import { transformI18n } from "@/plugins/i18n"; +import { $t, transformI18n } from "@/plugins/i18n"; import { useEpThemeStoreHook } from "@/store/modules/epTheme"; import { delay, cloneDeep, getKeyList } from "@pureadmin/utils"; import { @@ -24,7 +24,7 @@ const props = { /** 头部最左边的标题 */ title: { type: String, - default: "列表" + default: $t("tableBar.pureList") }, vxeTableRef: { type: Object as PropType @@ -161,19 +161,19 @@ export default defineComponent({ style={getDropdownItemStyle.value("medium")} onClick={() => changeSize("medium")} > - 宽松 + {transformI18n($t("tableBar.pureLarge"))} changeSize("small")} > - 默认 + {transformI18n($t("tableBar.pureDefault"))} changeSize("mini")} > - 紧凑 + {transformI18n($t("tableBar.pureSmall"))} ) @@ -238,7 +238,9 @@ export default defineComponent({ reference: () => ( ) }; @@ -261,7 +263,7 @@ export default defineComponent({ {slots?.title ? ( slots.title() ) : ( -

{props.title}

+

{transformI18n(props.title)}

)}
{slots?.buttons ? ( @@ -275,7 +277,9 @@ export default defineComponent({ transform: isExpandAll.value ? "none" : "rotate(-90deg)" }} v-tippy={rendTippyProps( - isExpandAll.value ? "折叠" : "展开" + isExpandAll.value + ? transformI18n($t("tableBar.pureCollapse")) + : transformI18n($t("tableBar.pureExpand")) )} onClick={() => onExpand()} /> @@ -288,14 +292,18 @@ export default defineComponent({ iconClass.value, loading.value ? "animate-spin" : "" ]} - v-tippy={rendTippyProps("刷新")} + v-tippy={rendTippyProps( + transformI18n($t("tableBar.pureRefresh")) + )} onClick={() => onReFresh()} /> @@ -311,13 +319,13 @@ export default defineComponent({
handleCheckAllChange(value)} /> onReset()}> - 重置 + {transformI18n($t("tableBar.pureReset"))}
@@ -373,7 +381,11 @@ export default defineComponent({ onFullscreen()} />