From 44ce2b42103fad5bd80b0720745d46de2b549b67 Mon Sep 17 00:00:00 2001 From: ulleo Date: Wed, 30 Oct 2024 15:22:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/locales/en.ts | 8 +++++++- core/core-frontend/src/locales/tw.ts | 7 ++++++- core/core-frontend/src/locales/zh-CN.ts | 7 ++++++- de-xpack | 2 +- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts index bec78bad14..c4de4bd427 100644 --- a/core/core-frontend/src/locales/en.ts +++ b/core/core-frontend/src/locales/en.ts @@ -52,7 +52,13 @@ export default { user: 'Operating User', time: 'Operation Time', ip: 'IP Address', - error_msg: 'Error Message' + error_msg: 'Error Message', + organization: 'Organization', + error_msg: 'Error Message', + confirm_export: 'Are You Sure You Want to Export the Log?', + export_success: 'Export Succeeded', + excel_file_name: 'DataEase Operation Log', + relevant_content_found: 'No Relevant Content Found' }, template_manage: { name_already_exists_type: 'Classification name already exists', diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts index 56b8f978c9..ca42ed742a 100644 --- a/core/core-frontend/src/locales/tw.ts +++ b/core/core-frontend/src/locales/tw.ts @@ -77,7 +77,12 @@ export default { user: '操作用戶', time: '操作時間', ip: 'IP地址', - error_msg: '錯誤信息' + organization: '所屬組織', + error_msg: '錯誤信息', + confirm_export: '確定導出日志嗎', + export_success: '導出成功', + excel_file_name: 'DataEase操作日志', + relevant_content_found: '沒有找到相關內容' }, template_manage: { name_already_exists_type: '分類名稱已存在', diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index f9fb6fb54e..0b03f29494 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -77,7 +77,12 @@ export default { user: '操作用户', time: '操作时间', ip: 'IP地址', - error_msg: '错误信息' + organization: '所属组织', + error_msg: '错误信息', + confirm_export: '确定导出日志吗', + export_success: '导出成功', + excel_file_name: 'DataEase操作日志', + relevant_content_found: '没有找到相关内容' }, template_manage: { name_already_exists_type: '分类名称已存在', diff --git a/de-xpack b/de-xpack index 0c3c81beed..bd9158c471 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 0c3c81beed9e0229d3989615f8b2886cd1c09493 +Subproject commit bd9158c471ab1da8c1b0ee21404200152368d56c From 2adece80e363009c13753e9edad4cff50f582ed2 Mon Sep 17 00:00:00 2001 From: ulleo Date: Wed, 30 Oct 2024 16:36:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/layout/components/HeaderSystem.vue | 23 +++++++++++-------- core/core-frontend/src/locales/en.ts | 2 +- core/core-frontend/src/locales/tw.ts | 2 +- core/core-frontend/src/locales/zh-CN.ts | 2 +- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/core/core-frontend/src/layout/components/HeaderSystem.vue b/core/core-frontend/src/layout/components/HeaderSystem.vue index 9d06d47c8d..ccbf8394e1 100644 --- a/core/core-frontend/src/layout/components/HeaderSystem.vue +++ b/core/core-frontend/src/layout/components/HeaderSystem.vue @@ -5,13 +5,18 @@ import { computed } from 'vue' import { ElHeader } from 'element-plus-secondary' import { useRouter } from 'vue-router' import AccountOperator from '@/layout/components/AccountOperator.vue' -import { propTypes } from '@/utils/propTypes' import { useAppearanceStoreWithOut } from '@/store/modules/appearance' +import { useI18n } from '@/hooks/web/useI18n' const appearanceStore = useAppearanceStoreWithOut() const { push } = useRouter() -const props = defineProps({ - title: propTypes.string.def('系统设置') -}) +const { t } = useI18n() + +const props = withDefaults( + defineProps<{ + title: string + }>(), + {} +) const backToMain = () => { push('/workbranch/index') } @@ -25,17 +30,17 @@ const navigate = computed(() => appearanceStore.getNavigate) :class="{ 'header-light': navigateBg && navigateBg === 'light' }" > - + - {{ props.title || '系统设置' }} + {{ title || t('commons.system_setting') }}
- 返回工作台 + {{ t('work_branch.back_to_work_branch') }} diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts index c4de4bd427..6792a8bd6f 100644 --- a/core/core-frontend/src/locales/en.ts +++ b/core/core-frontend/src/locales/en.ts @@ -359,6 +359,7 @@ export default { to_delete_: 'Are you sure to delete [100]?' }, work_branch: { + back_to_work_branch: 'Back to work branch', recommended_dashboard: 'Recommended dashboard', template_market_official: 'If you have not obtained the template download link, please contact the template market official', @@ -1001,7 +1002,6 @@ export default { task_finish_in_suffix: '', open_sub_task: 'Open Assigned Tasks' }, - on_the_left: 'Please select a form on the left', search_by_commit_name: 'Search by operator name' } } diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts index ca42ed742a..3e38a8c2de 100644 --- a/core/core-frontend/src/locales/tw.ts +++ b/core/core-frontend/src/locales/tw.ts @@ -125,6 +125,7 @@ export default { exists_name_hint: '當前名稱已在模版管理中存在，請修改' }, work_branch: { + back_to_work_branch: '返回工作台', recommended_dashboard: '推薦儀表板', template_market_official: '未獲取模板下載鏈接請聯系模板市場官方', create_quickly: '快速創建', @@ -3262,7 +3263,6 @@ export default { task_finish_in_suffix: '內完成填報', open_sub_task: '查看已下發任務' }, - on_the_left: '請在左側選擇表單', search_by_commit_name: '根據操作人名稱搜索' }, threshold: { diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index 0b03f29494..00da1efd53 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -125,6 +125,7 @@ export default { exists_name_hint: '当前名称已在模版管理中存在，请修改' }, work_branch: { + back_to_work_branch: '返回工作台', recommended_dashboard: '推荐仪表板', template_market_official: '未获取模板下载链接请联系模板市场官方', create_quickly: '快速创建', @@ -3320,7 +3321,6 @@ export default { task_finish_in_suffix: '内完成填报', open_sub_task: '查看已下发任务' }, - on_the_left: '请在左侧选择表单', search_by_commit_name: '根据操作人名称搜索' }, threshold: {