From 9bf6a752bb9cd4d1bab1ccaca514239538869768 Mon Sep 17 00:00:00 2001 From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com> Date: Fri, 26 Aug 2022 13:00:23 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A8=A1=E7=89=88=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E7=AE=A1=E7=90=86=20=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=20bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/icons/svg/icon-maybe.svg | 3 ++ .../src/icons/svg/icon_calendar_outlined.svg | 4 ++ frontend/src/lang/en.js | 46 +++++++++++++++++- frontend/src/lang/tw.js | 46 +++++++++++++++++- frontend/src/lang/zh.js | 47 ++++++++++++++++++- frontend/src/styles/index.scss | 16 +++++++ frontend/src/views/msg/all.vue | 10 ++-- .../panel/template/component/TemplateItem.vue | 4 +- .../panel/template/component/TemplateList.vue | 8 +++- frontend/src/views/panel/template/index.vue | 4 +- .../views/system/SysParam/BasicSetting.vue | 2 +- .../views/system/SysParam/KettleSetting.vue | 15 +++--- frontend/src/views/system/plugin/index.vue | 16 +++---- .../src/views/system/task/DatasetTaskList.vue | 12 ++--- frontend/src/views/system/task/TaskRecord.vue | 8 +--- frontend/src/views/system/task/form.vue | 25 +++++++--- 16 files changed, 216 insertions(+), 50 deletions(-) create mode 100644 frontend/src/icons/svg/icon-maybe.svg create mode 100644 frontend/src/icons/svg/icon_calendar_outlined.svg diff --git a/frontend/src/icons/svg/icon-maybe.svg b/frontend/src/icons/svg/icon-maybe.svg new file mode 100644 index 0000000000..c2c801bdd4 --- /dev/null +++ b/frontend/src/icons/svg/icon-maybe.svg @@ -0,0 +1,3 @@ + + + diff --git a/frontend/src/icons/svg/icon_calendar_outlined.svg b/frontend/src/icons/svg/icon_calendar_outlined.svg new file mode 100644 index 0000000000..c9ed63f2de --- /dev/null +++ b/frontend/src/icons/svg/icon_calendar_outlined.svg @@ -0,0 +1,4 @@ + + + + diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 75837c0d44..8cb3c759f4 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -395,7 +395,51 @@ export default { stickyTips: 'when the page is scrolled to the preset position will be sticky on the top.', backToTopTips1: 'When the page is scrolled to the specified position, the Back to Top button appears in the lower right corner', backToTopTips2: 'You can customize the style of the button, show / hide, height of appearance, height of the return. If you need a text prompt, you can use element-ui el-tooltip elements externally', - imageUploadTips: 'Since I was using only the vue@1 version, and it is not compatible with mockjs at the moment, I modified it myself, and if you are going to use it, it is better to use official version.' + imageUploadTips: 'Since I was using only the vue@1 version, and it is not compatible with mockjs at the moment, I modified it myself, and if you are going to use it, it is better to use official version.', + run_once: 'Run once', + continue: 'continue', + hour: 'hour', + minute: 'minute', + by_task_name: 'Search by task name', + delete_this_task: 'Are you sure to delete this task?', + message_receiving_management: 'Message receiving management', + upload_failed: 'Upload failed', + is_not_supported: 'The file format is not supported', + is_too_large: 'The file is too large', + enter_kettle_address: 'Please enter kettle address', + enter_the_port: 'Please enter the port', + one_user_name: 'enter one user name', + input_a_password: 'Please input a password', + address_is_required: 'Kettle address is required', + port_is_required: 'Port is required', + name_is_required: 'User name is required', + password_is_required: 'Password is required', + help_document_link: 'Invalid help document link', + such_as_dataeasedataease: 'Please enter the login page title, such as: dataeasedataease', + for_example_dataease: 'Please enter the system name, for example: dataease', + time_is_required: 'Start time is required', + delete_this_task: 'Are you sure to delete this task?', + it_takes_effect: 'Uninstall and restart the server before it takes effect', + uninstall_the_plugin: 'Are you sure to uninstall the plug-in?', + uninstall: 'uninstall', + relevant_content_found: 'No relevant content found', + view_tasks: 'View tasks', + day: 'day', + no_classification: 'No classification', + no_template: 'No template', + data_set_required: 'Data set (required)', + unread_message: 'Unread message', + read_message: 'Read message', + all_messages: 'All messages', + message_list: 'Message list', + all_read_successfully: 'All read successfully', + by_plugin_name: 'Search by plug-in name', + unable_to_uninstall: 'Built in plug-in, unable to uninstall', + free: 'free', + cost: 'cost', + developer: 'developer', + edition: 'edition', + installation_time: 'Installation time:' }, table: { dynamicTips1: 'Fixed header, sorted by header order', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 329b01b3e3..21cd6f619e 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -395,7 +395,51 @@ export default { stickyTips: '當頁面滾動到預設的位置會吸附在頂部', backToTopTips1: '頁面滾動到指定位置會在右下角出現返回頂部按鈕', backToTopTips2: '可自定義按鈕的樣式、show/hide、出現的高度、返回的位置 如需文字提示，可在外部使用Element的el-tooltip元素', - imageUploadTips: '由於我在使用時它只有vue@1版本，而且和mockjs不兼容，所以自己改造了一下，如果大家要使用的話，優先還是使用官方版本。' + imageUploadTips: '由於我在使用時它只有vue@1版本，而且和mockjs不兼容，所以自己改造了一下，如果大家要使用的話，優先還是使用官方版本。', + run_once: '運行一次', + continue: '繼續', + hour: '小時', + minute: '分鐘', + by_task_name: '通過任務名稱蒐索', + delete_this_task: '確定删除該任務嗎？', + message_receiving_management: '消息接收管理', + upload_failed: '上傳失敗', + is_not_supported: '檔案格式不支持', + is_too_large: '檔案過大', + enter_kettle_address: '請輸入Kettle地址', + enter_the_port: '請輸入埠', + one_user_name: '請輸入用戶名', + input_a_password: '請輸入密碼', + address_is_required: 'Kettle地址為必填', + port_is_required: '埠為必填', + name_is_required: '用戶名為必填', + password_is_required: '密碼為必填', + help_document_link: '幫助文檔連結無效', + such_as_dataeasedataease: '請輸入登入頁面標題，比如：DataEaseDataEase', + for_example_dataease: '請輸入系統名稱，比如：DataEase', + time_is_required: '開始時間為必填', + delete_this_task: '確定删除該任務嗎？', + it_takes_effect: '卸載並重啓服務器之後才能生效', + uninstall_the_plugin: '確定卸載該挿件？', + uninstall: '卸載', + relevant_content_found: '沒有找到相關內容', + view_tasks: '查看任務', + day: '天', + no_classification: '暫無分類', + no_template: '暫無模版', + data_set_required: '數据集必填', + unread_message: '未讀消息', + read_message: '已讀消息', + all_messages: '全部消息', + message_list: '消息清單', + all_read_successfully: '全部已讀成功', + by_plugin_name: '通過挿件名稱蒐索', + unable_to_uninstall: '內寘挿件，無法卸載', + free: '免費', + cost: '費用', + developer: '開發者', + edition: '版本', + installation_time: '安裝時間' }, table: { dynamicTips1: '固定錶頭, 按照錶頭順序排序', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 55c32a421d..e4d45710ad 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -396,7 +396,52 @@ export default { stickyTips: '当页面滚动到预设的位置会吸附在顶部', backToTopTips1: '页面滚动到指定位置会在右下角出现返回顶部按钮', backToTopTips2: '可自定义按钮的样式、show/hide、出现的高度、返回的位置 如需文字提示，可在外部使用Element的el-tooltip元素', - imageUploadTips: '由于我在使用时它只有vue@1版本，而且和mockjs不兼容，所以自己改造了一下，如果大家要使用的话，优先还是使用官方版本。' + imageUploadTips: '由于我在使用时它只有vue@1版本，而且和mockjs不兼容，所以自己改造了一下，如果大家要使用的话，优先还是使用官方版本。', + run_once: '运行一次', + continue: '继续', + hour: '小时', + minute: '分钟', + day: '天', + by_task_name: '通过任务名称搜索', + delete_this_task: '确定删除该任务吗？', + all_read_successfully: '全部已读成功', + message_receiving_management: '消息接收管理', + upload_failed: '上传失败', + is_not_supported: '文件格式不支持', + is_too_large: '文件过大', + enter_kettle_address: '请输入 Kettle 地址', + enter_the_port: '请输入端口', + one_user_name: '请输入用户名', + input_a_password: '请输入密码', + address_is_required: 'Kettle 地址为必填', + port_is_required: '端口为必填', + name_is_required: '用户名为必填', + password_is_required: '密码为必填', + help_document_link: '帮助文档链接无效', + such_as_dataeasedataease: '请输入登录页面标题，比如：DataEaseDataEase', + for_example_dataease: '请输入系统名称，比如：DataEase', + time_is_required: '开始时间为必填', + delete_this_task: '确定删除该任务吗？', + message_receiving_management: '消息接收管理', + it_takes_effect: '卸载并重启服务器之后才能生效', + uninstall_the_plugin: '确定卸载该插件？', + uninstall: '卸载', + relevant_content_found: '没有找到相关内容', + view_tasks: '查看任务', + no_classification: '暂无分类', + no_template: '暂无模版', + data_set_required: '数据集必填', + unread_message: '未读消息', + read_message: '已读消息', + all_messages: '全部消息', + message_list: '消息列表', + by_plugin_name: '通过插件名称搜索', + unable_to_uninstall: '内置插件，无法卸载', + free: '免费', + cost: '费用', + developer: '开发者', + edition: '版本', + installation_time: '安装时间' }, table: { dynamicTips1: '固定表头, 按照表头顺序排序', diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss index f03191475f..8702b16346 100644 --- a/frontend/src/styles/index.scss +++ b/frontend/src/styles/index.scss @@ -1181,3 +1181,19 @@ div:focus { .tox { border-radius: 4px !important; } + +.de-date-picker { + .el-input__inner { + padding: 12px; + } + + .el-input__prefix { + display: none; + } +} + +.icon-calendar-outlined { + position: absolute; + right: 12px; + bottom: 12px; +} \ No newline at end of file diff --git a/frontend/src/views/msg/all.vue b/frontend/src/views/msg/all.vue index be9c82e13d..bebc405139 100644 --- a/frontend/src/views/msg/all.vue +++ b/frontend/src/views/msg/all.vue @@ -1,13 +1,13 @@ diff --git a/frontend/src/views/system/SysParam/KettleSetting.vue b/frontend/src/views/system/SysParam/KettleSetting.vue index 2dad820057..0787e3aca4 100644 --- a/frontend/src/views/system/SysParam/KettleSetting.vue +++ b/frontend/src/views/system/SysParam/KettleSetting.vue @@ -77,22 +77,23 @@ :rules="rule" > - + - + - + @@ -149,28 +150,28 @@ export default { "configuration.carte": [ { required: true, - message: this.$t("commons.required"), + message: this.$t("components.address_is_required"), trigger: "blur", }, ], "configuration.port": [ { required: true, - message: this.$t("commons.required"), + message: this.$t("components.port_is_required"), trigger: "blur", }, ], "configuration.user": [ { required: true, - message: this.$t("commons.required"), + message: this.$t("components.name_is_required"), trigger: "blur", }, ], "configuration.passwd": [ { required: true, - message: this.$t("commons.required"), + message: this.$t("components.password_is_required"), trigger: "blur", }, ], diff --git a/frontend/src/views/system/plugin/index.vue b/frontend/src/views/system/plugin/index.vue index c033ddd8a3..e83333b811 100644 --- a/frontend/src/views/system/plugin/index.vue +++ b/frontend/src/views/system/plugin/index.vue @@ -4,7 +4,7 @@ >

- {{ item }} + {{ $t(`components.${item}`) }}

@@ -240,13 +236,13 @@ :disabled="disableExec(scope.row)" command="exec" > - {{ $t("运行一次") }} + {{ $t("components.run_once") }} - {{ $t("继续") }} + {{ $t("components.continue") }} {{ $t(`dataset.${scope.row.status.toLocaleLowerCase()}`) }} - + - diff --git a/frontend/src/views/system/task/form.vue b/frontend/src/views/system/task/form.vue index b71bdda796..3041dcfacd 100644 --- a/frontend/src/views/system/task/form.vue +++ b/frontend/src/views/system/task/form.vue @@ -42,7 +42,7 @@

- - - + + + {{ $t("cron.every_exec") }}
@@ -155,10 +155,13 @@ > + > + + +
@@ -278,7 +283,7 @@ export default { startTime: [ { required: true, - message: this.$t("dataset.required"), + message: this.$t("components.time_is_required"), trigger: "change", }, ], @@ -306,7 +311,13 @@ export default { datasetName: [ { required: true, - message: this.$t("数据集必填"), + message: this.$t("components.data_set_required"), + trigger: "change", + }, + ], + incrementalUpdateType: [ + { + required: true, trigger: "change", }, ],