From df605ddc2c2ca91664e1a2250cc15213a3df7790 Mon Sep 17 00:00:00 2001 From: ulleo Date: Tue, 9 Apr 2024 15:18:10 +0800 Subject: [PATCH] =?UTF-8?q?feat(X-Pack):=20=E6=95=B0=E6=8D=AE=E5=A1=AB?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/datafill/DataFillDataService.java | 3 +- .../service/datafill/DataFillService.java | 6 +- .../resources/i18n/messages_en_US.properties | 8 + .../resources/i18n/messages_zh_CN.properties | 8 + .../resources/i18n/messages_zh_TW.properties | 9 +- core/frontend/src/lang/en.js | 109 +++++++++++- core/frontend/src/lang/tw.js | 157 +++++++++++++++--- core/frontend/src/lang/zh.js | 108 +++++++++++- .../src/views/dataFilling/form/CreateTask.vue | 10 +- .../views/dataFilling/form/EditFormData.vue | 22 +-- .../src/views/dataFilling/form/ViewTable.vue | 44 ++--- .../src/views/dataFilling/form/create.vue | 104 +++++++----- .../src/views/dataFilling/form/index.vue | 30 ++-- .../src/views/dataFilling/form/save.vue | 88 +++++----- .../src/views/dataFilling/myTask/index.vue | 68 ++++---- 15 files changed, 560 insertions(+), 214 deletions(-) diff --git a/core/backend/src/main/java/io/dataease/service/datafill/DataFillDataService.java b/core/backend/src/main/java/io/dataease/service/datafill/DataFillDataService.java index 35106b0140..25635ea3ed 100644 --- a/core/backend/src/main/java/io/dataease/service/datafill/DataFillDataService.java +++ b/core/backend/src/main/java/io/dataease/service/datafill/DataFillDataService.java @@ -8,6 +8,7 @@ import io.dataease.controller.request.datafill.DataFillFormTableDataRequest; import io.dataease.controller.response.datafill.DataFillFormTableDataResponse; import io.dataease.dto.datafill.DataFillCommitLogDTO; import io.dataease.ext.ExtDataFillFormMapper; +import io.dataease.i18n.Translator; import io.dataease.plugins.common.base.domain.DataFillFormWithBLOBs; import io.dataease.plugins.common.base.domain.Datasource; import io.dataease.plugins.common.base.mapper.DataFillFormMapper; @@ -257,7 +258,7 @@ public class DataFillDataService { List tableFields = datasourceProvider.getTableFields(datasourceRequest).stream().filter(TableField::isPrimaryKey).collect(Collectors.toList()); if (CollectionUtils.isEmpty(tableFields)) { - throw new RuntimeException("没有主键"); + throw new RuntimeException(Translator.get("I18N_DATA_FILL_NO_PRIMARY_KEY")); } TableField key = tableFields.get(0); diff --git a/core/backend/src/main/java/io/dataease/service/datafill/DataFillService.java b/core/backend/src/main/java/io/dataease/service/datafill/DataFillService.java index 125f4ed6b5..fb36f57f00 100644 --- a/core/backend/src/main/java/io/dataease/service/datafill/DataFillService.java +++ b/core/backend/src/main/java/io/dataease/service/datafill/DataFillService.java @@ -296,16 +296,16 @@ public class DataFillService { DataFillUserTask task = dataFillUserTaskMapper.selectByPrimaryKey(userTaskId); if (task == null) { - DataEaseException.throwException("任务不存在"); + DataEaseException.throwException(Translator.get("I18N_DATA_FILL_TASK_NOT_EXIST")); } if (!AuthUtils.getUser().getUserId().equals(task.getUser())) { - DataEaseException.throwException("当前用户非任务用户"); + DataEaseException.throwException(Translator.get("I18N_DATA_FILL_USER_NOT_TASK_USER")); } if (task.getEndTime() != null) { if (task.getEndTime().getTime() < System.currentTimeMillis()) { - DataEaseException.throwException("已经超过了任务截止时间"); + DataEaseException.throwException(Translator.get("I18N_DATA_FILL_TASK_EXPIRED")); } } diff --git a/core/backend/src/main/resources/i18n/messages_en_US.properties b/core/backend/src/main/resources/i18n/messages_en_US.properties index 7aa3c971a5..466514f092 100644 --- a/core/backend/src/main/resources/i18n/messages_en_US.properties +++ b/core/backend/src/main/resources/i18n/messages_en_US.properties @@ -240,6 +240,10 @@ I18N_ACCOUNT_LOCKED=Account\u3010%s\u3011is locked(Please contact the administra I18N_PANEL_EXIST=The current panel name already exists under this directory I18N_DATA_FILL_FORM_EXIST=The current data filling form name already exists under this directory I18N_DATA_FILL_TASK_EXIST=The current data filling task name already exists under this form +I18N_DATA_FILL_TASK_NOT_EXIST=Task not exists +I18N_DATA_FILL_USER_NOT_TASK_USER=Current user is not task user +I18N_DATA_FILL_TASK_EXPIRED=Task expired +I18N_DATA_FILL_NO_PRIMARY_KEY=PRIMARY KEY not exists I18N_FOlDER_EXIST=The name already exists under this directory I18N_DATASET_GROUP_EXIST=The current dataset grouping name already exists under this directory I18N_NOT_JAR=File is not jar! @@ -284,3 +288,7 @@ I18n_del_admin_tips=Forbidden to delete the admin account I18N_NO_DRIVER_PERMISSION=Do not have permissions! i18n_field_circular_error=Field error i18n_field_circular_ref=Field has Circular Reference +\u6570\u636E\u586B\u62A5=Data Filling +\u8868\u5355\u7BA1\u7406=From Manage +\u6211\u7684\u586B\u62A5=My Job +\u8868\u5355\u521B\u5EFA=Form Create diff --git a/core/backend/src/main/resources/i18n/messages_zh_CN.properties b/core/backend/src/main/resources/i18n/messages_zh_CN.properties index fed19d8ec1..2111f2f73e 100644 --- a/core/backend/src/main/resources/i18n/messages_zh_CN.properties +++ b/core/backend/src/main/resources/i18n/messages_zh_CN.properties @@ -240,6 +240,10 @@ I18N_ACCOUNT_LOCKED=\u8D26\u53F7\u3010%s\u3011\u5DF2\u9501\u5B9A(\u8BF7\u8054\u7 I18N_PANEL_EXIST=\u5F53\u524D\u4EEA\u8868\u677F\u540D\u79F0\u5728\u8BE5\u76EE\u5F55\u4E0B\u9762\u5DF2\u7ECF\u5B58\u5728 I18N_DATA_FILL_FORM_EXIST=\u5F53\u524D\u6570\u636E\u586B\u62A5\u8868\u5355\u540D\u79F0\u5728\u8BE5\u76EE\u5F55\u4E0B\u9762\u5DF2\u7ECF\u5B58\u5728 I18N_DATA_FILL_TASK_EXIST=\u5F53\u524D\u6570\u636E\u586B\u62A5\u4EFB\u52A1\u540D\u79F0\u5728\u8BE5\u8868\u5355\u4E0B\u9762\u5DF2\u7ECF\u5B58\u5728 +I18N_DATA_FILL_TASK_NOT_EXIST=\u4EFB\u52A1\u4E0D\u5B58\u5728 +I18N_DATA_FILL_USER_NOT_TASK_USER=\u5F53\u524D\u7528\u6237\u975E\u4EFB\u52A1\u7528\u6237 +I18N_DATA_FILL_TASK_EXPIRED=\u5DF2\u7ECF\u8D85\u8FC7\u4E86\u4EFB\u52A1\u622A\u6B62\u65F6\u95F4 +I18N_DATA_FILL_NO_PRIMARY_KEY=\u6CA1\u6709\u4E3B\u952E I18N_FOlDER_EXIST=\u5F53\u524D\u540D\u79F0\u5728\u8BE5\u76EE\u5F55\u4E0B\u9762\u5DF2\u7ECF\u5B58\u5728 I18N_DATASET_GROUP_EXIST=\u5F53\u524D\u6570\u636E\u96C6\u5206\u7EC4\u540D\u79F0\u5728\u8BE5\u76EE\u5F55\u4E0B\u9762\u5DF2\u7ECF\u5B58\u5728 I18N_NOT_JAR=\u6587\u4EF6\u4E0D\u662F jar \u5305! @@ -274,3 +278,7 @@ I18n_del_admin_tips=\u7981\u6B62\u5220\u9664admin\u8D26\u53F7 I18N_NO_DRIVER_PERMISSION=\u6CA1\u6709\u6743\u9650\uFF01 i18n_field_circular_error=\u5B57\u6BB5\u89E3\u6790\u9519\u8BEF\uFF0C\u53EF\u80FD\u539F\u56E0\uFF1A\u5B57\u6BB5\u5DF2\u5220\u9664\u3001\u8BA1\u7B97\u5B57\u6BB5\u5F15\u7528\u5C42\u7EA7\u8FC7\u6DF1\u3001\u5B58\u5728\u5FAA\u73AF\u5F15\u7528\u7B49\uFF0C\u8BF7\u68C0\u67E5\u8868\u8282\u70B9\u548C\u5B57\u6BB5\u5E76\u91CD\u65B0\u7F16\u8F91\u3002 i18n_field_circular_ref=\u5B57\u6BB5\u5B58\u5728\u5FAA\u73AF\u5F15\u7528 +\u6570\u636E\u586B\u62A5=\u6570\u636E\u586B\u62A5 +\u8868\u5355\u7BA1\u7406=\u8868\u5355\u7BA1\u7406 +\u6211\u7684\u586B\u62A5=\u6211\u7684\u586B\u62A5 +\u8868\u5355\u521B\u5EFA=\u8868\u5355\u521B\u5EFA diff --git a/core/backend/src/main/resources/i18n/messages_zh_TW.properties b/core/backend/src/main/resources/i18n/messages_zh_TW.properties index d11f6cd192..9c7aebdfa4 100644 --- a/core/backend/src/main/resources/i18n/messages_zh_TW.properties +++ b/core/backend/src/main/resources/i18n/messages_zh_TW.properties @@ -36,7 +36,6 @@ \u7F16\u8F91\u89D2\u8272=\u7DE8\u8F2F\u89D2\u8272 \u7F16\u8F91\u8FDE\u63A5=\u7DE8\u8F2F\u93C8\u63A5 \u83DC\u5355\u7BA1\u7406=\u83DC\u55AE\u7BA1\u7406 -\u8868\u5355\u7BA1\u7406=\u8868\u55AE\u7BA1\u7406 \u89C6\u56FE=\u8996\u5716 \u89D2\u8272\u7BA1\u7406=\u89D2\u8272\u7BA1\u7406 \u89D2\u8272\u8868\u5355=\u89D2\u8272\u8868\u55AE @@ -236,6 +235,10 @@ I18N_ACCOUNT_LOCKED=\u8CEC\u865F\u3010%s\u3011\u5DF2\u9396\u5B9A(\u8ACB\u806F\u7 I18N_PANEL_EXIST=\u7576\u524D\u5100\u9336\u95C6\u540D\u7A31\u5728\u8A72\u76EE\u9304\u4E0B\u9762\u5DF2\u7D93\u5B58\u5728 I18N_DATA_FILL_FORM_EXIST=\u7576\u524D\u6578\u64DA\u586B\u5831\u8868\u55AE\u540D\u7A31\u5728\u8A72\u76EE\u9304\u4E0B\u9762\u5DF2\u7D93\u5B58\u5728 I18N_DATA_FILL_TASK_EXIST=\u7576\u524D\u6578\u64DA\u586B\u5831\u4EFB\u52D9\u540D\u7A31\u5728\u8A72\u8868\u55AE\u4E0B\u9762\u5DF2\u7D93\u5B58\u5728 +I18N_DATA_FILL_TASK_NOT_EXIST=\u4EFB\u52D9\u4E0D\u5B58\u5728 +I18N_DATA_FILL_USER_NOT_TASK_USER=\u7576\u524D\u7528\u6236\u975E\u4EFB\u52D9\u7528\u6236 +I18N_DATA_FILL_TASK_EXPIRED=\u5DF2\u7D93\u8D85\u904E\u4E86\u4EFB\u52D9\u622A\u6B62\u6642\u9593 +I18N_DATA_FILL_NO_PRIMARY_KEY=\u6C92\u6709\u4E3B\u9375 I18N_FOlDER_EXIST=\u540D\u7A31\u5728\u8A72\u76EE\u9304\u4E0B\u9762\u5DF2\u7D93\u5B58\u5728 I18N_DATASET_GROUP_EXIST=\u7576\u524D\u6578\u64DA\u96C6\u5206\u7D44\u540D\u7A31\u5728\u8A72\u76EE\u9304\u4E0B\u9762\u5DF2\u7D93\u5B58\u5728 I18N_NOT_JAR=\u6587\u4EF6\u4E0D\u662F jar \u5305! @@ -280,3 +283,7 @@ I18n_del_admin_tips=\u7981\u6B62\u522A\u9664admin\u8CEC\u865F I18N_NO_DRIVER_PERMISSION=\u6C92\u6709\u8A31\u53EF\u6B0A\uFF01 i18n_field_circular_error=\u5B57\u6BB5\u89E3\u6790\u932F\u8AA4\uFF0C\u53EF\u80FD\u539F\u56E0\uFF1A\u5B57\u6BB5\u5DF2\u522A\u9664\u3001\u8A08\u7B97\u5B57\u6BB5\u5F15\u7528\u5C64\u7D1A\u904E\u6DF1\u3001\u5B58\u5728\u5FAA\u74B0\u5F15\u7528\u7B49\uFF0C\u8ACB\u6AA2\u67E5\u8868\u7BC0\u9EDE\u548C\u5B57\u6BB5\u4E26\u91CD\u65B0\u7DE8\u8F2F\u3002 i18n_field_circular_ref=\u5B57\u6BB5\u5B58\u5728\u5FAA\u74B0\u5F15\u7528 +\u6570\u636E\u586B\u62A5=\u6578\u64DA\u586B\u5831 +\u8868\u5355\u7BA1\u7406=\u8868\u55AE\u7BA1\u7406 +\u6211\u7684\u586B\u62A5=\u6211\u7684\u586B\u5831 +\u8868\u5355\u521B\u5EFA=\u8868\u55AE\u5275\u5EFA diff --git a/core/frontend/src/lang/en.js b/core/frontend/src/lang/en.js index 616a3e68f2..a7a416dc1b 100644 --- a/core/frontend/src/lang/en.js +++ b/core/frontend/src/lang/en.js @@ -593,12 +593,32 @@ export default { enum_filter: 'Enum Filter' }, data_fill: { + data_fill: 'Data Filling', + new_folder: 'New Folder', + form_manage: 'Form Manage', + my_job: 'My Job', form: { + name: 'Name', + rename: 'Rename', + untitled: 'Untitled', + create_new_form: 'Create New Form', + title: 'Title', + no_form: 'Click to Create New', + form_list_name: 'Form List', + create_form: 'Create Form', + please_select: 'Please Select', + component: 'Component', + component_setting: 'Component Setting', + hint: 'Hint', + option: 'Option', + form_setting: 'Form Setting', + input_limit_50: 'No more than 50 characters', confirm_delete: 'Confirm delete? (The tables created in database will not be deleted)', list: 'Form List', record: 'Fill Record', task_manage: 'Task Manage', form_name: 'Form Name', + folder: 'Folder', datasource: 'Datasource', table: 'Table', creator: 'Creator', @@ -609,14 +629,97 @@ export default { modify: 'Modify', show: 'Show', delete: 'Delete', - show_data: 'Show Data' + show_data: 'Show Data', + text: 'Text', + number: 'Number', + tel: 'Tel', + email: 'Email', + duplicate_error: 'Duplicate', + value_not_exists: 'Value Not Exists', + range_separator: 'Range Separator', + start_hint_word: 'Start Hint Word', + end_hint_word: 'End Hint Word', + input_type: 'Input Type', + check: 'Check', + set_required: 'Set Required', + set_unique: 'Set Unique', + set_multiple: 'Set Multiple', + use_datetime: 'Use Datetime', + custom: 'Custom', + option_value: 'Options', + add_option: 'Add Option', + form_name_cannot_none: 'Form name cannot be null', + form_components_cannot_null: 'Form components cannot be null', + option_list_cannot_empty: 'Option list cannot be empty', + component_setting_error: 'Component setting error', + table_name: 'Table', + form_column: 'Form Column', + column_name: 'Table Column', + column_type: 'Table Column Type', + create_index: 'Create Index', + add_index: 'Add Index', + index_name: 'Index Name', + index_column: 'Index Column', + order_asc: 'Asc', + order_desc: 'Desc', + order_none: 'Default Order', + add_column: 'Add Column', + please_insert_start: 'Start Time Column Name', + please_insert_end: 'End Time Column Name', + save_form: 'Save Form' + }, + database: { + nvarchar: 'Nvarchar', + text: 'Text', + number: 'Number', + decimal: 'Decimal', + datetime: 'Datetime' }, data: { - confirm_delete: 'Confirm delete?' + confirm_delete: 'Confirm delete?', + add_data: 'Add Data', + insert_data: 'Insert Data', + update_data: 'Update Data', + delete_data: 'Delete Data', + recent_committer: 'Recent Committer', + recent_commit_time: 'Recent Commit Time', + start: 'Start', + end: 'End', + id_is: 'ID [', + data_not_found: '] Not Found' }, task: { + name: 'Name', + creator: 'Creator', + create_time: 'Create Time', + rate_type: 'Rate Type', + task_status: 'Status', + add_task: 'Add Task', + task_name: 'Task Name', + task_remain_time: 'Remaining Validity', + task_sender: 'Task Sender', + start_filling: 'Start Filling', + task_distribute_time: 'Distribution Time', + task_expiration_time: 'Expiration Time', + task_finished_time: 'Finished Time', + task_end_time: 'End Time', + edit_data: 'Edit Data', + show_data: 'Show Data', confirm_enable: 'Confirm enable task?', - confirm_disable: 'Confirm disable task?' + confirm_disable: 'Confirm disable task?', + edit_task: 'Edit Task', + create_task: 'Create Task', + edit: 'Edit', + stop: 'Stop', + start: 'Start', + delete: 'Delete', + no_time_limit: 'No Time Limit', + todo: 'Todo', + finished: 'Finished', + expired: 'Expired', + + task_finish_in: 'Task Finished in ', + task_finish_in_suffix: '' }, on_the_left: 'Please select a form on the left', search_by_commit_name: 'Search by operator name' diff --git a/core/frontend/src/lang/tw.js b/core/frontend/src/lang/tw.js index 2d9b9baafe..0110983078 100644 --- a/core/frontend/src/lang/tw.js +++ b/core/frontend/src/lang/tw.js @@ -189,7 +189,7 @@ export default { unbind: '解綁', unlock: '解鎖', unlock_success: '解鎖成功', - parameter_effect: '參數值僅在數据集編輯時生效', + parameter_effect: '參數值僅在數據集編輯時生效', uninstall: '卸載', no_result: '沒有找到相關內容', @@ -428,9 +428,9 @@ export default { ukey_title: 'API Keys', thumbnail: '縮略圖', confirm_delete: '確認刪除', - delete_this_dashboard: '確認删除該儀錶板嗎?', - cancel_this_dashboard: '確認取消該默认儀錶板嗎?', - delete_this_folder: '確認删除該目錄嗎?', + delete_this_dashboard: '確認刪除該儀錶板嗎?', + cancel_this_dashboard: '確認取消該默認儀錶板嗎?', + delete_this_folder: '確認刪除該目錄嗎?', confirm_stop: '確認停止', stop_success: '停止成功', treeselect: { @@ -593,12 +593,32 @@ export default { enum_filter: '枚舉篩選' }, data_fill: { + data_fill: '數據填報', + new_folder: '新建文件夾', + form_manage: '表單管理', + my_job: '我的填報', form: { + name: '名稱', + rename: '重命名', + untitled: '未命名表單', + create_new_form: '新建表單', + title: '標題', + no_form: '暫無表單，點擊', + form_list_name: '填報表單', + create_form: '新建表單', + please_select: '請選擇', + component: '組件', + component_setting: '組件設置', + hint: '提示詞', + input_limit_50: '不超過50個字符', + option: '選項', + form_setting: '表單設置', confirm_delete: '確認刪除？(不會刪除已創建的數據庫表)', list: '表單數據', record: '提交記錄', task_manage: '任務管理', form_name: '表單名稱', + folder: '所屬文件夾', datasource: '數據源', table: '數據庫表', creator: '創建人', @@ -609,14 +629,97 @@ export default { modify: '修改', show: '查看', delete: '刪除', - show_data: '查看數據' + show_data: '查看數據', + text: '普通文本', + number: '數字', + tel: '手機號', + email: '郵箱', + duplicate_error: '重復', + value_not_exists: '值不存在', + range_separator: '分割字符', + start_hint_word: '開始提示詞', + end_hint_word: '結束提示詞', + input_type: '格式類型', + check: '校驗', + set_required: '設置為必填項', + set_unique: '不允許重復值', + set_multiple: '允許多選', + use_datetime: '使用日期時間', + custom: '自定義', + option_value: '選項值', + add_option: '添加選項值', + form_name_cannot_none: '表單名稱不能為空', + form_components_cannot_null: '請添加表單組件', + option_list_cannot_empty: '選項值不能為空', + component_setting_error: '組件設置錯誤', + table_name: '數據庫表名', + form_column: '表單字段', + column_name: '數據庫表字段名稱', + column_type: '數據庫字段類型', + create_index: '創建索引', + add_index: '新增索引', + index_name: '索引名稱', + index_column: '索引字段', + order_asc: '順序', + order_desc: '倒序', + order_none: '默認排序', + add_column: '新增字段', + please_insert_start: '請輸入開始時間', + please_insert_end: '請輸入結束時間', + save_form: '保存表單' + }, + database: { + nvarchar: '字符串', + text: '長文本', + number: '整型數字', + decimal: '小數數字', + datetime: '日期' }, data: { - confirm_delete: '確認刪除?' + confirm_delete: '確認刪除?', + add_data: '添加數據', + insert_data: '插入數據', + update_data: '更新數據', + delete_data: '刪除數據', + recent_committer: '最近提交人', + recent_commit_time: '最近提交時間', + start: '開始', + end: '結束', + id_is: 'ID為[', + data_not_found: ']的數據不存在' }, task: { + name: '名稱', + creator: '創建人', + create_time: '創建時間', + rate_type: '任務下發模式', + task_status: '任務狀態', + add_task: '添加任務', + task_name: '任務名稱', + task_remain_time: '任務有效期', + task_sender: '任務下發人', + start_filling: '立即填報', + task_distribute_time: '任務下發時間', + task_expiration_time: '任務過期時間', + task_finished_time: '任務完成時間', + task_end_time: '任務截止時間', + edit_data: '編輯數據', + show_data: '查看數據', confirm_enable: '確認啟動任務？（單次任務會新建下發任務）', - confirm_disable: '確認停止任務？' + confirm_disable: '確認停止任務？', + edit_task: '編輯任務', + create_task: '新建任務', + edit: '編輯', + stop: '停止', + start: '啟動', + delete: '刪除', + no_time_limit: '不限時', + todo: '待辦項', + finished: '已完成', + expired: '已過期', + + task_finish_in: '在任務下發', + task_finish_in_suffix: '內完成填報' }, on_the_left: '請在左側選擇表單', search_by_commit_name: '根據操作人名稱搜索' @@ -908,7 +1011,7 @@ export default { proxy_account: '代理賬號', proxy_pwd: '代理密碼', proxy_host: '代理服務地址', - proxy_port: '服务端口', + proxy_port: '服務端口', email_server_config: '郵箱服務器配置', edit_success: '編輯成功', mailbox_service_settings: '郵件設置', @@ -973,7 +1076,7 @@ export default { request_timeout: '請求超時時間', message_retention_time: '消息保留時間', log_retention_time: '日誌保留時間', - ds_sync_log_retention_time: '数据同步日誌保留時間', + ds_sync_log_retention_time: '數據同步日誌保留時間', ds_check_time: '數據源檢測時間間隔', test_mail_recipient: '僅用來作為測試郵件收件人', to_enable_tsl: '如果SMTP埠是587，通常需要啟用TSL', @@ -1221,8 +1324,8 @@ export default { filter_not_empty: '非空字符串', filter_include: '包含', filter_not_include: '不包含', - filter_end_with: '结尾是', - filter_begin_with: '开头是', + filter_end_with: '結尾是', + filter_begin_with: '開頭是', rose_type: '玫瑰圖模式', radius_mode: '半徑', area_mode: '面積', @@ -1703,13 +1806,13 @@ export default { }, dataset: { scope_edit: '僅編輯時生效', - scope_all: '數据集預覽時全域生效', + scope_all: '數據集預覽時全域生效', spend_time: '耗時', sql: 'SQL 語句', sql_result: '運行結果', parse_filed: '解析字段', field_rename: '字段重命名', - params_work: '僅編輯時生效：參數值僅在數据集編輯時生效； 全域生效：在數据集查看、預覽、以及用到數据集的視圖中均生效。', + params_work: '僅編輯時生效：參數值僅在數據集編輯時生效； 全域生效：在數據集查看、預覽、以及用到數據集的視圖中均生效。', sql_variable_limit_1: '1、SQL變數只能在WHERE條件中使用', sql_variable_limit_2: '2、示例：select * from table_name where column_name1=\'${param_name1}\' and column_name2 in ${param_name2}', selesql_variable_limit_2ct_year: '選擇年', @@ -1932,7 +2035,7 @@ export default { disable: '禁用', prohibit: '禁用', desensitization: '脫敏', - desensitization_rule: '脱敏規則', + desensitization_rule: '脫敏規則', m: 'M等於', n: 'N等於', mgtn: 'M 不能大於 N' @@ -2073,7 +2176,7 @@ export default { all_compute_mode: '直連、抽取模式', extra_params: '額外的JDBC連接字符串', please_input_dataPath: '請輸入 JsonPath 數據路徑', - show_api_data: '查看API数据結構', + show_api_data: '查看API數據結構', warning: '包含無效數據表', data_table: '數據表', data_table_name: '數據表名稱', @@ -2136,9 +2239,9 @@ export default { all: '所有', other: '其他', this_data_source: '確定刪除該數據源嗎？', - delete_this_dataset: '確定删除該數据集嗎？', - cannot_be_deleted_dataset: '該數据集存在如下血緣關係，删除會造成相關儀錶板的視圖失效，確定删除？', - cannot_be_deleted_datasource: '該數據源存在如下血緣關係，删除會造成相關儀錶板的視圖失效，確定删除？', + delete_this_dataset: '確定刪除該數據集嗎？', + cannot_be_deleted_dataset: '該數據集存在如下血緣關係，刪除會造成相關儀錶板的視圖失效，確定刪除？', + cannot_be_deleted_datasource: '該數據源存在如下血緣關係，刪除會造成相關儀錶板的視圖失效，確定刪除？', edit_folder: '編輯資料夾', click_to_check: '點擊去查看血緣關係', delete_this_item: '是否要刪除此項？', @@ -2168,7 +2271,7 @@ export default { border_color_setting: '邊框配色', unpublished_tips: '取消發布後，該儀表板不能被查看。確定要取消發布？', position_adjust_component: '位置調整', - active_font_size: '选中字體大小', + active_font_size: '選中字體大小', carousel: '輪播', enable_carousel: '啟用輪播', switch_time: '切換時間', @@ -2191,7 +2294,7 @@ export default { component_color: '組件配色', chart_title: '圖表標題', filter_component: '過濾組件', - enable_refresh_view: '数据刷新', + enable_refresh_view: '數據刷新', enable_view_loading: '視圖加載提示', image_size_tips: '圖片請不要大於15M', image_add_tips: '只能插入圖片', @@ -2201,7 +2304,7 @@ export default { panel_cache_use_tips: '檢查到上次有儀表板未能正常保存，是否使用上次未保存的儀表板？', template_name_tips: '儀表板名稱必填', panel_background_item: '自定義儀表板背景', - panel_background_image_tips: '當前支持jpeg,jpg,png,gif,svg文件,大小15M内', + panel_background_image_tips: '當前支持jpeg,jpg,png,gif,svg文件,大小15M內', reUpload: '重新上傳', create_by: '創建人', create_time: '創建時間', @@ -2238,8 +2341,8 @@ export default { theme_color_dark: '深色', theme_color_light: '淺色', refresh_frequency: '刷新頻率', - refresh_browser_frequency: '浏览器刷新', - refresh_browser_tips: '仅公共链接生效', + refresh_browser_frequency: '瀏覽器刷新', + refresh_browser_tips: '僅公共鏈接生效', card_color_matching: '卡片配色', table_color_matching: '表格配色', background_color: '背景顏色', @@ -2481,9 +2584,9 @@ export default { link_panel: '儀表闆', select_jump_panel: '選擇關聯的儀表闆', link_view: '聯動視圖', - link_component: '聯動组件', + link_component: '聯動組件', link_view_field: '聯動視圖字段', - link_component_field: '聯動组件字段', + link_component_field: '聯動組件字段', add_jump_field: '追加跳轉聯動依賴字段', input_jump_link: '請輸入跳轉連接', select_dimension: '請選擇維度...', @@ -2991,7 +3094,7 @@ export default { user: '操作用戶', time: '操作時間', export: '導出', - export_as: '導出为', + export_as: '導出為', confirm: '確定導出嗎？', search_by_key: '搜索詳情', ip: 'IP地址' @@ -3031,7 +3134,7 @@ export default { datasource_history: '復用', datasource_from: '數據來源', apply_template: '應用模版', - execution_time: '执行时间', + execution_time: '執行時間', app_manager: '應用管理', app_upload: '上傳應用', no_apps: '暫無應用', diff --git a/core/frontend/src/lang/zh.js b/core/frontend/src/lang/zh.js index 8618970c08..d7602b12f6 100644 --- a/core/frontend/src/lang/zh.js +++ b/core/frontend/src/lang/zh.js @@ -592,12 +592,32 @@ export default { enum_filter: '枚举筛选' }, data_fill: { + data_fill: '数据填报', + new_folder: '新建文件夹', + form_manage: '表单管理', + my_job: '我的填报', form: { + name: '名称', + rename: '重命名', + untitled: '未命名表单', + create_new_form: '新建表单', + title: '标题', + no_form: '暂无表单，点击', + form_list_name: '填报表单', + create_form: '新建表单', + please_select: '请选择', + component: '组件', + component_setting: '组件设置', + hint: '提示词', + input_limit_50: '不超过50个字符', + option: '选项', + form_setting: '表单设置', confirm_delete: '确认删除？(不会删除已创建的数据库表)', list: '表单数据', record: '提交记录', task_manage: '任务管理', form_name: '表单名称', + folder: '所属文件夹', datasource: '数据源', table: '数据库表', creator: '创建人', @@ -608,14 +628,96 @@ export default { modify: '修改', show: '查看', delete: '删除', - show_data: '查看数据' + show_data: '查看数据', + text: '普通文本', + number: '数字', + tel: '手机号', + email: '邮箱', + duplicate_error: '重复', + value_not_exists: '值不存在', + range_separator: '分割字符', + start_hint_word: '开始提示词', + end_hint_word: '结束提示词', + input_type: '格式类型', + check: '校验', + set_required: '设置为必填项', + set_unique: '不允许重复值', + set_multiple: '允许多选', + use_datetime: '使用日期时间', + custom: '自定义', + option_value: '选项值', + add_option: '添加选项值', + form_name_cannot_none: '表单名称不能为空', + form_components_cannot_null: '请添加表单组件', + option_list_cannot_empty: '选项值不能为空', + component_setting_error: '组件设置错误', + table_name: '数据库表名', + form_column: '表单字段', + column_name: '数据库表字段名称', + column_type: '数据库字段类型', + create_index: '创建索引', + add_index: '新增索引', + index_name: '索引名称', + index_column: '索引字段', + order_asc: '顺序', + order_desc: '倒序', + order_none: '默认排序', + add_column: '新增字段', + please_insert_start: '请输入开始时间', + please_insert_end: '请输入结束时间', + save_form: '保存表单' + }, + database: { + nvarchar: '字符串', + text: '长文本', + number: '整型数字', + decimal: '小数数字', + datetime: '日期' }, data: { - confirm_delete: '确认删除?' + confirm_delete: '确认删除?', + add_data: '添加数据', + insert_data: '插入数据', + update_data: '更新数据', + delete_data: '删除数据', + recent_committer: '最近提交人', + recent_commit_time: '最近提交时间', + start: '开始', + end: '结束', + id_is: 'ID为[', + data_not_found: ']的数据不存在' }, task: { + name: '名称', + creator: '创建人', + create_time: '创建时间', + rate_type: '任务下发模式', + task_status: '任务状态', + task_name: '任务名称', + add_task: '添加任务', + task_remain_time: '任务有效期', + task_sender: '任务下发人', + start_filling: '立即填报', + task_distribute_time: '任务下发时间', + task_expiration_time: '任务过期时间', + task_finished_time: '任务完成时间', + task_end_time: '任务截止时间', + edit_data: '编辑数据', + show_data: '查看数据', confirm_enable: '确认启动任务？（单次任务会新建下发任务）', - confirm_disable: '确认停止任务？' + confirm_disable: '确认停止任务？', + edit_task: '编辑任务', + create_task: '新建任务', + edit: '编辑', + stop: '停止', + start: '启动', + delete: '删除', + no_time_limit: '不限时', + todo: '待办项', + finished: '已完成', + expired: '已过期', + task_finish_in: '在任务下发', + task_finish_in_suffix: '内完成填报' }, on_the_left: '请在左侧选择表单', search_by_commit_name: '根据操作人名称搜索' diff --git a/core/frontend/src/views/dataFilling/form/CreateTask.vue b/core/frontend/src/views/dataFilling/form/CreateTask.vue index 7008298cf7..9a4c04a72c 100644 --- a/core/frontend/src/views/dataFilling/form/CreateTask.vue +++ b/core/frontend/src/views/dataFilling/form/CreateTask.vue @@ -6,7 +6,7 @@
- {{ id? '编辑任务': '新建任务' }} + {{ id? $t('data_fill.task.edit_task'): $t('data_fill.task.create_task') }}
@@ -131,7 +131,7 @@ 任务下发时间 + >{{ $t('data_fill.task.task_distribute_time') }} 填报截止时间 + >{{ $t('data_fill.task.task_end_time') }} {{ $t('cron.every_exec') }}
- 在任务下发 + {{ $t('data_fill.task.task_finish_in') }} - 内完成填报 + {{ $t('data_fill.task.task_finish_in_suffix') }}
diff --git a/core/frontend/src/views/dataFilling/form/EditFormData.vue b/core/frontend/src/views/dataFilling/form/EditFormData.vue index ba76fcdd5d..85f5f9bc46 100644 --- a/core/frontend/src/views/dataFilling/form/EditFormData.vue +++ b/core/frontend/src/views/dataFilling/form/EditFormData.vue @@ -46,16 +46,16 @@ export default { data() { const checkDateRangeRequireValidator = (rule, value, callback) => { if (!value) { - return callback(new Error('必填')) + return callback(new Error(this.$t('commons.required'))) } if (value.length < 2) { - return callback(new Error('必填')) + return callback(new Error(this.$t('commons.required'))) } if (!value[0]) { - return callback(new Error('必填')) + return callback(new Error(this.$t('commons.required'))) } if (!value[1]) { - return callback(new Error('必填')) + return callback(new Error(this.$t('commons.required'))) } callback() } @@ -65,16 +65,16 @@ export default { requiredRule: { required: true, message: this.$t('commons.required'), trigger: ['blur', 'change'] }, dateRangeRequiredRule: { validator: checkDateRangeRequireValidator, message: this.$t('commons.required'), trigger: ['blur', 'change'] }, inputTypes: [ - { type: 'text', name: '普通文本', rules: [] }, - { type: 'number', name: '数字', rules: [] }, + { type: 'text', name: this.$t('data_fill.form.text'), rules: [] }, + { type: 'number', name: this.$t('data_fill.form.number'), rules: [] }, { type: 'tel', - name: '手机号', + name: this.$t('data_fill.form.tel'), rules: [{ pattern: PHONE_REGEX, message: this.$t('user.mobile_number_format_is_incorrect'), trigger: ['blur', 'change'] }] }, { type: 'email', - name: '邮箱', + name: this.$t('data_fill.form.email'), rules: [{ pattern: EMAIL_REGEX, message: this.$t('user.email_format_is_incorrect'), trigger: ['blur', 'change'] }] } ] @@ -207,7 +207,7 @@ export default {
- {{ title? title: (readonly? '查看数据': '编辑数据') }} + {{ title? title: (readonly? $t('data_fill.task.show_data'): $t('data_fill.task.edit_data')) }}
@@ -386,12 +386,12 @@ export default { - 取消 + {{ $t("commons.cancel") }} 保存 + >{{ $t("commons.confirm") }} diff --git a/core/frontend/src/views/dataFilling/form/ViewTable.vue b/core/frontend/src/views/dataFilling/form/ViewTable.vue index 9580c8f0b8..094a36e493 100644 --- a/core/frontend/src/views/dataFilling/form/ViewTable.vue +++ b/core/frontend/src/views/dataFilling/form/ViewTable.vue @@ -106,7 +106,7 @@ icon="el-icon-plus" size="small" @click="addData" - >添加数据 + >{{ $t('data_fill.data.add_data') }}
{{ c.label }} - (开始) - (结束) + ({{ $t('data_fill.data.start') }}) + ({{ $t('data_fill.data.end') }}) @@ -225,7 +225,7 @@