diff --git a/src/locales/en-US.json b/src/locales/en-US.json index e63116466..4aef94ec3 100644 --- a/src/locales/en-US.json +++ b/src/locales/en-US.json @@ -388,5 +388,6 @@ "SHENYU.DISCOVERY.SELECTOR.UPSTREAM.DateUpdated": "DateUpdated", "SHENYU.DISCOVERY.SELECTOR.CONFIG.BASIC": "Basic Config", "SHENYU.DISCOVERY.SELECTOR.CONFIG.DISCOVERY": "Discovery Config", + "SHENYU.DISCOVERY.SELECTOR.DELETE.CONFIRM": "Are you sure to delete this selector?", "SHENYU.COMMON.REFRESH": "Refresh" } diff --git a/src/locales/zh-CN.json b/src/locales/zh-CN.json index e8bd8240c..34d926f38 100644 --- a/src/locales/zh-CN.json +++ b/src/locales/zh-CN.json @@ -375,5 +375,6 @@ "SHENYU.DISCOVERY.SELECTOR.UPSTREAM.DateUpdated": "更新时间", "SHENYU.DISCOVERY.SELECTOR.CONFIG.BASIC": "基本配置", "SHENYU.DISCOVERY.SELECTOR.CONFIG.DISCOVERY": "服务发现", + "SHENYU.DISCOVERY.SELECTOR.DELETE.CONFIRM": "确定删除该选择器吗?", "SHENYU.COMMON.REFRESH": "刷新" } diff --git a/src/models/plugin.js b/src/models/plugin.js index 4841c4a76..08b9eb2ae 100644 --- a/src/models/plugin.js +++ b/src/models/plugin.js @@ -152,7 +152,7 @@ export default { message.success(getIntlContent("SHENYU.COMMON.RESPONSE.ADD.SUCCESS")); callback(json) } else { - message.warn(json.message.split(":")[1]); + message.warn(json.message); } } diff --git a/src/routes/Plugin/Discovery/TcpCard.js b/src/routes/Plugin/Discovery/TcpCard.js index 15cc0b2ae..55d79b128 100644 --- a/src/routes/Plugin/Discovery/TcpCard.js +++ b/src/routes/Plugin/Discovery/TcpCard.js @@ -16,7 +16,7 @@ */ import React, {Component} from "react"; -import {Card, Popover, Typography, Skeleton, Icon} from "antd"; +import {Card, Popover, Typography, Skeleton, Icon, Popconfirm} from "antd"; import {getIntlContent} from "../../../utils/IntlUtils"; import tcpStyles from "./tcp.less"; @@ -75,9 +75,18 @@ export class TcpCard extends Component { updateSelector(data.id)} /> , - - handleDelete(data.id)} /> - + } + onConfirm={() => handleDelete(data.id)} + okText={getIntlContent("SHENYU.COMMON.YES")} + cancelText={getIntlContent("SHENYU.COMMON.NO")} + key="popconfirm" + > + + + , + ]} extra={
{formatTimestamp(createTime)}
} >