Skip to content

💥 feat(account-center): Add country information to the Account Center page #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 17, 2025
Merged

💥 feat(account-center): Add country information to the Account Center page #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7522779
💥 feat(account-center): 添加国家信息到账户中心页面
lwnmengjing Mar 17, 2025
ee331db
💥 refactor(menu): 更新菜单项，调整超级权限相关的翻译键
lwnmengjing Mar 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions src/locales/en-US/menu.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,10 @@ export default {
'menu.system.option.edit': 'Edit Option',
'menu.system.option.delete': 'Delete Option',
'menu.system.tenant': 'Tenant List',
'menu.tenant': 'Super Permission',
'menu.tenant.tenant': 'Tenant List',
'menu.tenant.system-config': 'System Configuration',
'menu.tenant.system-config.control': 'Manage Configuration',
'menu.super-permission': 'Super Permission',
'menu.super-permission.tenant': 'Tenant List',
'menu.super-permission.system-config': 'System Configuration',
'menu.super-permission.system-config.control': 'Manage Configuration',
'menu.develop': 'Development Tools',
'menu.develop.model': 'Model List',
'menu.develop.model.control': 'Manage Model',
Expand Down Expand Up @@ -122,12 +122,12 @@ export default {
'menu.center': 'Personal Center',
'menu.develop.model.field': 'Field List',
'menu.develop.model.generate-data': 'Generate Data',
'menu.tenant.tenant.control': 'Manage Tenant',
'menu.tenant.tenant.edit': 'Edit Tenant',
'menu.tenant.tenant.delete': 'Delete Tenant',
'menu.tenant.tenant.create': 'Create Tenant',
'menu.tenant.system-config.delete': 'Delete Configuration',
'menu.tenant.system-config.edit': 'Edit Configuration',
'menu.tenant.system-config.create': 'Create Configuration',
'menu.super-permission.tenant.control': 'Manage Tenant',
'menu.super-permission.tenant.edit': 'Edit Tenant',
'menu.super-permission.tenant.delete': 'Delete Tenant',
'menu.super-permission.tenant.create': 'Create Tenant',
'menu.super-permission.system-config.delete': 'Delete Configuration',
'menu.super-permission.system-config.edit': 'Edit Configuration',
'menu.super-permission.system-config.create': 'Create Configuration',
'menu.system.notice.read': 'Read Notice',
};
8 changes: 8 additions & 0 deletions src/locales/en-US/pages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,4 +373,12 @@ export default {
'pages.account.center.signature': 'Signature',
'pages.account.center.tags': 'Tags',
'pages.account.center.fetchDataError': 'Failed to fetch data',

/****************** account center ******************/
'pages.account.center.country.China': 'China',
'pages.account.center.country.United States': 'United States',
'pages.account.center.country.Japan': 'Japan',
'pages.account.center.country.Korea': 'Korea',
'pages.account.center.country.Russia': 'Russia',
'pages.account.center.country.Germany': 'Germany',
};
22 changes: 11 additions & 11 deletions src/locales/zh-CN/menu.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,10 @@ export default {
'menu.system.option.create': '创建选项',
'menu.system.option.edit': '编辑选项',
'menu.system.option.delete': '删除选项',
'menu.tenant': '超级权限',
'menu.tenant.tenant': '租户管理',
'menu.tenant.system-config': '系统配置',
'menu.tenant.system-config.control': '管理配置',
'menu.super-permission': '超级权限',
'menu.super-permission.tenant': '租户管理',
'menu.super-permission.system-config': '系统配置',
'menu.super-permission.system-config.control': '管理配置',
'menu.develop': '开发工具',
'menu.develop.model': '模型列表',
'menu.develop.model.control': '管理模型',
Expand Down Expand Up @@ -121,12 +121,12 @@ export default {
'menu.center': '个人中心',
'menu.develop.model.field': '字段列表',
'menu.develop.model.generate-data': '生成数据',
'menu.tenant.tenant.control': '管理租户',
'menu.tenant.tenant.edit': '编辑租户',
'menu.tenant.tenant.delete': '删除租户',
'menu.tenant.tenant.create': '创建租户',
'menu.tenant.system-config.delete': '删除配置',
'menu.tenant.system-config.edit': '编辑配置',
'menu.tenant.system-config.create': '创建配置',
'menu.super-permission.tenant.control': '管理租户',
'menu.super-permission.tenant.edit': '编辑租户',
'menu.super-permission.tenant.delete': '删除租户',
'menu.super-permission.tenant.create': '创建租户',
'menu.super-permission.system-config.delete': '删除配置',
'menu.super-permission.system-config.edit': '编辑配置',
'menu.super-permission.system-config.create': '创建配置',
'menu.system.notice.read': '阅读通知',
};
8 changes: 8 additions & 0 deletions src/locales/zh-CN/pages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,4 +357,12 @@ export default {
'pages.account.center.signature': '个性签名',
'pages.account.center.tags': '标签',
'pages.account.center.fetchDataError': '获取数据失败',

/****************** account center ******************/
'pages.account.center.country.China': '中国',
'pages.account.center.country.United States': '美国',
'pages.account.center.country.Japan': '日本',
'pages.account.center.country.Korea': '韩国',
'pages.account.center.country.Russia': '俄罗斯',
'pages.account.center.country.Germany': '德国',
};
25 changes: 22 additions & 3 deletions src/pages/Account/Center/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import { getDepartmentsId } from '@/services/admin/department';
import { getPostsId } from '@/services/admin/post';
import { useIntl } from '@umijs/max';
import { PageContainer, ProCard, ProDescriptions } from '@ant-design/pro-components';
import { province } from '../Settings/geographic/province';
import { city } from '../Settings/geographic/city';

const { Title, Paragraph } = Typography;

Expand Down Expand Up @@ -114,10 +116,27 @@ const Center: React.FC = () => {
title: intl.formatMessage({ id: 'pages.account.center.address' }),
dataIndex: 'address',
span: 2,
render: () =>
[userInfo?.country, userInfo?.province, userInfo?.city, userInfo?.address]
render: () => {
const country = userInfo?.country
? intl.formatMessage({
id: `pages.account.center.country.${userInfo?.country}`,
})
: '';
const provinceName = province.find((item: { id: string; name: string }) => {
return item.id === userInfo?.province;
})?.name;
const cityName =
userInfo?.province && userInfo?.city
? city[userInfo.province as keyof typeof city].find(
(item: { id: string; name: string }) => {
return item.id === userInfo.city;
},
)?.name
: undefined;
return [country, provinceName, cityName, userInfo?.address]
.filter(Boolean)
.join(' '),
.join(' ');
},
},
{
title: intl.formatMessage({ id: 'pages.account.center.profile' }),
Expand Down