Browse Source

[Fix][UI Next][V1.0.0-Alpha] Fix the new button in the English state of the alarm instance page lacks a space. (#8984)

3.0.0/version-upgrade
songjianet 3 years ago committed by GitHub
parent
commit
9fbc62f784
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      dolphinscheduler-ui-next/src/locales/modules/en_US.ts
  2. 5
      dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts
  3. 19
      dolphinscheduler-ui-next/src/views/security/alarm-instance-manage/detail.tsx
  4. 3
      dolphinscheduler-ui-next/src/views/security/alarm-instance-manage/index.tsx

5
dolphinscheduler-ui-next/src/locales/modules/en_US.ts

@ -1061,20 +1061,19 @@ const security = {
alarm_instance: { alarm_instance: {
search_input_tips: 'Please input the keywords', search_input_tips: 'Please input the keywords',
alarm_instance_manage: 'Alarm instance manage', alarm_instance_manage: 'Alarm instance manage',
alarm_instance: 'Alarm Instance',
alarm_instance_name: 'Alarm instance name', alarm_instance_name: 'Alarm instance name',
alarm_instance_name_tips: 'Please enter alarm plugin instance name', alarm_instance_name_tips: 'Please enter alarm plugin instance name',
alarm_plugin_name: 'Alarm plugin name', alarm_plugin_name: 'Alarm plugin name',
create_time: 'Create Time', create_time: 'Create Time',
update_time: 'Update Time', update_time: 'Update Time',
operation: 'Operation', operation: 'Operation',
edit: 'Edit', edit_alarm_instance: 'Edit Alarm Instance',
delete: 'Delete', delete: 'Delete',
delete_confirm: 'Delete?', delete_confirm: 'Delete?',
confirm: 'Confirm', confirm: 'Confirm',
cancel: 'Cancel', cancel: 'Cancel',
submit: 'Submit', submit: 'Submit',
create: 'Create', create_alarm_instance: 'Create Alarm Instance',
select_plugin: 'Select plugin', select_plugin: 'Select plugin',
select_plugin_tips: 'Select Alarm plugin', select_plugin_tips: 'Select Alarm plugin',
instance_parameter_exception: 'Instance parameter exception', instance_parameter_exception: 'Instance parameter exception',

5
dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts

@ -1048,20 +1048,19 @@ const security = {
alarm_instance: { alarm_instance: {
search_input_tips: '请输入关键字', search_input_tips: '请输入关键字',
alarm_instance_manage: '告警实例管理', alarm_instance_manage: '告警实例管理',
alarm_instance: '告警实例',
alarm_instance_name: '告警实例名称', alarm_instance_name: '告警实例名称',
alarm_instance_name_tips: '请输入告警实例名称', alarm_instance_name_tips: '请输入告警实例名称',
alarm_plugin_name: '告警插件名称', alarm_plugin_name: '告警插件名称',
create_time: '创建时间', create_time: '创建时间',
update_time: '更新时间', update_time: '更新时间',
operation: '操作', operation: '操作',
edit: '编辑', edit_alarm_instance: '编辑告警实例',
delete: '删除', delete: '删除',
delete_confirm: '删除?', delete_confirm: '删除?',
confirm: '确定', confirm: '确定',
cancel: '取消', cancel: '取消',
submit: '提交', submit: '提交',
create: '创建', create_alarm_instance: '创建告警实例',
select_plugin: '选择插件', select_plugin: '选择插件',
select_plugin_tips: '请选择告警插件', select_plugin_tips: '请选择告警插件',
instance_parameter_exception: '实例参数异常', instance_parameter_exception: '实例参数异常',

19
dolphinscheduler-ui-next/src/views/security/alarm-instance-manage/detail.tsx

@ -17,22 +17,21 @@
import { import {
defineComponent, defineComponent,
PropType,
toRefs, toRefs,
watch, watch,
onMounted, onMounted,
ref, ref
Ref
} from 'vue' } from 'vue'
import { NSelect, NInput } from 'naive-ui' import { NSelect, NInput } from 'naive-ui'
import { isFunction } from 'lodash' import { isFunction } from 'lodash'
import Modal from '@/components/modal'
import Form from '@/components/form'
import { useI18n } from 'vue-i18n' import { useI18n } from 'vue-i18n'
import { useForm } from './use-form' import { useForm } from './use-form'
import { useDetail } from './use-detail' 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 getElementByJson from '@/components/form/get-elements-by-json'
import type { IRecord, FormRules, IFormItem } from './types' import type { IRecord, FormRules, IFormItem } from './types'
import type { PropType, Ref } from 'vue'
interface IElements extends Omit<Ref, 'value'> { interface IElements extends Omit<Ref, 'value'> {
value: IFormItem[] value: IFormItem[]
@ -146,14 +145,14 @@ const DetailModal = defineComponent({
return ( return (
<Modal <Modal
show={show} show={show}
title={`${t( title={t(
currentRecord?.id currentRecord?.id
? 'security.alarm_instance.edit' ? 'security.alarm_instance.edit_alarm_instance'
: 'security.alarm_instance.create' : 'security.alarm_instance.create_alarm_instance'
)} ${t('security.alarm_instance.alarm_instance')}`} )}
onConfirm={onSubmit} onConfirm={onSubmit}
confirmLoading={saving || loading} confirmLoading={saving || loading}
onCancel={() => void onCancel()} onCancel={onCancel}
> >
{{ {{
default: () => ( default: () => (

3
dolphinscheduler-ui-next/src/views/security/alarm-instance-manage/index.tsx

@ -116,8 +116,7 @@ const AlarmInstanceManage = defineComponent({
<div class={styles['conditions']}> <div class={styles['conditions']}>
{IS_ADMIN && ( {IS_ADMIN && (
<NButton onClick={onCreate} type='primary'> <NButton onClick={onCreate} type='primary'>
{t('security.alarm_instance.create') + {t('security.alarm_instance.create_alarm_instance')}
t('security.alarm_instance.alarm_instance')}
</NButton> </NButton>
)} )}
<NSpace <NSpace

Loading…
Cancel
Save