You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ki...@apache.org on 2022/03/18 07:50:41 UTC
[dolphinscheduler] branch dev updated: [Fix][UI Next][V1.0.0-Alpha] Fix the new button in the English state of the alarm instance page lacks a space. (#8984)
This is an automated email from the ASF dual-hosted git repository.
kirs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 9fbc62f [Fix][UI Next][V1.0.0-Alpha] Fix the new button in the English state of the alarm instance page lacks a space. (#8984)
9fbc62f is described below
commit 9fbc62f7849836edb408c95cd409cad0df2f7225
Author: songjianet <17...@qq.com>
AuthorDate: Fri Mar 18 15:50:34 2022 +0800
[Fix][UI Next][V1.0.0-Alpha] Fix the new button in the English state of the alarm instance page lacks a space. (#8984)
---
dolphinscheduler-ui-next/src/locales/modules/en_US.ts | 5 ++---
dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts | 5 ++---
.../views/security/alarm-instance-manage/detail.tsx | 19 +++++++++----------
.../views/security/alarm-instance-manage/index.tsx | 3 +--
4 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/dolphinscheduler-ui-next/src/locales/modules/en_US.ts b/dolphinscheduler-ui-next/src/locales/modules/en_US.ts
index 3f5f1d6..ecad72d 100644
--- a/dolphinscheduler-ui-next/src/locales/modules/en_US.ts
+++ b/dolphinscheduler-ui-next/src/locales/modules/en_US.ts
@@ -1061,20 +1061,19 @@ const security = {
alarm_instance: {
search_input_tips: 'Please input the keywords',
alarm_instance_manage: 'Alarm instance manage',
- alarm_instance: 'Alarm Instance',
alarm_instance_name: 'Alarm instance name',
alarm_instance_name_tips: 'Please enter alarm plugin instance name',
alarm_plugin_name: 'Alarm plugin name',
create_time: 'Create Time',
update_time: 'Update Time',
operation: 'Operation',
- edit: 'Edit',
+ edit_alarm_instance: 'Edit Alarm Instance',
delete: 'Delete',
delete_confirm: 'Delete?',
confirm: 'Confirm',
cancel: 'Cancel',
submit: 'Submit',
- create: 'Create',
+ create_alarm_instance: 'Create Alarm Instance',
select_plugin: 'Select plugin',
select_plugin_tips: 'Select Alarm plugin',
instance_parameter_exception: 'Instance parameter exception',
diff --git a/dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts b/dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts
index 09d166a..b56870f 100644
--- a/dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts
+++ b/dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts
@@ -1048,20 +1048,19 @@ const security = {
alarm_instance: {
search_input_tips: '请输入关键字',
alarm_instance_manage: '告警实例管理',
- alarm_instance: '告警实例',
alarm_instance_name: '告警实例名称',
alarm_instance_name_tips: '请输入告警实例名称',
alarm_plugin_name: '告警插件名称',
create_time: '创建时间',
update_time: '更新时间',
operation: '操作',
- edit: '编辑',
+ edit_alarm_instance: '编辑告警实例',
delete: '删除',
delete_confirm: '删除?',
confirm: '确定',
cancel: '取消',
submit: '提交',
- create: '创建',
+ create_alarm_instance: '创建告警实例',
select_plugin: '选择插件',
select_plugin_tips: '请选择告警插件',
instance_parameter_exception: '实例参数异常',
diff --git a/dolphinscheduler-ui-next/src/views/security/alarm-instance-manage/detail.tsx b/dolphinscheduler-ui-next/src/views/security/alarm-instance-manage/detail.tsx
index 64ecafd..5766f9d 100644
--- a/dolphinscheduler-ui-next/src/views/security/alarm-instance-manage/detail.tsx
+++ b/dolphinscheduler-ui-next/src/views/security/alarm-instance-manage/detail.tsx
@@ -17,22 +17,21 @@
import {
defineComponent,
- PropType,
toRefs,
watch,
onMounted,
- ref,
- Ref
+ ref
} from 'vue'
import { NSelect, NInput } from 'naive-ui'
import { isFunction } from 'lodash'
-import Modal from '@/components/modal'
-import Form from '@/components/form'
import { useI18n } from 'vue-i18n'
import { useForm } from './use-form'
import { useDetail } from './use-detail'
+import Modal from '@/components/modal'
+import Form from '@/components/form'
import getElementByJson from '@/components/form/get-elements-by-json'
import type { IRecord, FormRules, IFormItem } from './types'
+import type { PropType, Ref } from 'vue'
interface IElements extends Omit<Ref, 'value'> {
value: IFormItem[]
@@ -146,14 +145,14 @@ const DetailModal = defineComponent({
return (
<Modal
show={show}
- title={`${t(
+ title={t(
currentRecord?.id
- ? 'security.alarm_instance.edit'
- : 'security.alarm_instance.create'
- )} ${t('security.alarm_instance.alarm_instance')}`}
+ ? 'security.alarm_instance.edit_alarm_instance'
+ : 'security.alarm_instance.create_alarm_instance'
+ )}
onConfirm={onSubmit}
confirmLoading={saving || loading}
- onCancel={() => void onCancel()}
+ onCancel={onCancel}
>
{{
default: () => (
diff --git a/dolphinscheduler-ui-next/src/views/security/alarm-instance-manage/index.tsx b/dolphinscheduler-ui-next/src/views/security/alarm-instance-manage/index.tsx
index b3df1b0..6fdc8dd 100644
--- a/dolphinscheduler-ui-next/src/views/security/alarm-instance-manage/index.tsx
+++ b/dolphinscheduler-ui-next/src/views/security/alarm-instance-manage/index.tsx
@@ -116,8 +116,7 @@ const AlarmInstanceManage = defineComponent({
<div class={styles['conditions']}>
{IS_ADMIN && (
<NButton onClick={onCreate} type='primary'>
- {t('security.alarm_instance.create') +
- t('security.alarm_instance.alarm_instance')}
+ {t('security.alarm_instance.create_alarm_instance')}
</NButton>
)}
<NSpace