From 2e0de6e0d07a814f69591d60f0036cf861f7fe31 Mon Sep 17 00:00:00 2001
From: wangxd-yu <657716219@qq.com>
Date: Wed, 8 Dec 2021 23:27:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20confirm=E7=A1=AE=E8=AE=A4=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yu-react/src/pages/log/EndpointLog/index.tsx | 18 ++++++-------
 yu-react/src/pages/system/Dept/index.tsx     |  2 +-
 yu-react/src/pages/system/Dict/index.tsx     | 28 ++++++++++++--------
 yu-react/src/pages/system/Role/index.tsx     | 15 ++++++-----
 4 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/yu-react/src/pages/log/EndpointLog/index.tsx b/yu-react/src/pages/log/EndpointLog/index.tsx
index 44b5fb5..5d5f7a8 100644
--- a/yu-react/src/pages/log/EndpointLog/index.tsx
+++ b/yu-react/src/pages/log/EndpointLog/index.tsx
@@ -100,16 +100,16 @@ const LogEndpointTable: React.FC<LogEndpointData> = () => {
         closable={false}
       >
         <ProDescriptions column={1} bordered>
-          <ProDescriptions.Item label="url">
+          <ProDescriptions.Item label="请求地址">
             {logEndpointCurrentRow?.url}
           </ProDescriptions.Item>
-          <ProDescriptions.Item label="httpStatus">
+          <ProDescriptions.Item label="响应状态">
             {logEndpointCurrentRow?.httpStatus}
           </ProDescriptions.Item>
-          <ProDescriptions.Item label="createTime">
+          <ProDescriptions.Item label="请求时间">
             {logEndpointCurrentRow?.createTime}
           </ProDescriptions.Item>
-          <ProDescriptions.Item label="time">
+          <ProDescriptions.Item label="请求耗时(ms)">
             {logEndpointCurrentRow?.time}
           </ProDescriptions.Item>
           <ProDescriptions.Item label="用户名">
@@ -118,19 +118,19 @@ const LogEndpointTable: React.FC<LogEndpointData> = () => {
           <ProDescriptions.Item label="IP">
             {logEndpointCurrentRow?.ip}
           </ProDescriptions.Item>
-          <ProDescriptions.Item label="method">
+          <ProDescriptions.Item label="请求方法">
             {logEndpointCurrentRow?.method}
           </ProDescriptions.Item>
-          <ProDescriptions.Item label="pattern">
+          <ProDescriptions.Item label="端点路径">
             {logEndpointCurrentRow?.pattern}
           </ProDescriptions.Item>
-          <ProDescriptions.Item label="handler">
+          <ProDescriptions.Item label="处理器">
             {logEndpointCurrentRow?.handler}
           </ProDescriptions.Item>
-          <ProDescriptions.Item label="JSON 代码块" valueType="jsonCode">
+          <ProDescriptions.Item label="请求体" valueType="jsonCode">
             {logEndpointCurrentRow?.request}
           </ProDescriptions.Item>
-          <ProDescriptions.Item label="JSON 代码块" valueType="jsonCode">
+          <ProDescriptions.Item label="响应体" valueType="jsonCode">
             {logEndpointCurrentRow?.response}
           </ProDescriptions.Item>
         </ProDescriptions>
diff --git a/yu-react/src/pages/system/Dept/index.tsx b/yu-react/src/pages/system/Dept/index.tsx
index 34e2cea..1a9b43c 100644
--- a/yu-react/src/pages/system/Dept/index.tsx
+++ b/yu-react/src/pages/system/Dept/index.tsx
@@ -82,7 +82,7 @@ const DeptPage: React.FC = () => {
         >
           添加下级
         </a>,
-        <Popconfirm key="popconfirm" title={`确认删除该记录吗?`} okText="是" cancelText="否"
+        <Popconfirm key="deleteConfirm" title={`确认删除该记录吗?`} okText="是" cancelText="否"
           onConfirm={async () => {
             await YuCrud.handleDelete(deleteDept, record.id);
             if (deptActionRef.current) {
diff --git a/yu-react/src/pages/system/Dict/index.tsx b/yu-react/src/pages/system/Dict/index.tsx
index 435eb2a..e741997 100644
--- a/yu-react/src/pages/system/Dict/index.tsx
+++ b/yu-react/src/pages/system/Dict/index.tsx
@@ -1,5 +1,5 @@
 import { PlusOutlined } from '@ant-design/icons';
-import { Button, Drawer } from 'antd';
+import { Button, Drawer, Popconfirm } from 'antd';
 import type { FormInstance } from 'antd';
 import React, { useState, useRef } from 'react';
 import { PageContainer } from '@ant-design/pro-layout';
@@ -79,15 +79,18 @@ const TableList: React.FC = () => {
         >
           字典配置
         </a>,
-        <a key="subscribeAlert"
-          onClick={async () => {
+        <Popconfirm key="popconfirm" title={`确认删除该记录吗?`} okText="是" cancelText="否"
+          onConfirm={async () => {
             await YuCrud.handleDelete(deleteDict, record.id)
             if (actionRef.current) {
               actionRef.current.reload();
             }
-          }}>
-          删除
-        </a>,
+          }}
+        >
+          <a key="delete" href="#">
+            删除
+          </a>
+        </Popconfirm>
       ],
     },
   ];
@@ -121,15 +124,18 @@ const TableList: React.FC = () => {
         >
           编辑
         </a>,
-        <a key="deleteDictItem"
-          onClick={async () => {
+        <Popconfirm key="popconfirm" title={`确认删除该记录吗?`} okText="是" cancelText="否"
+          onConfirm={async () => {
             await YuCrud.handleDelete(deleteDictItem, record.id);
             if (itemActionRef.current) {
               itemActionRef.current.reload();
             }
-          }}>
-          删除
-        </a>,
+          }}
+        >
+          <a key="delete" href="#">
+            删除
+          </a>
+        </Popconfirm>
       ],
     },
   ]
diff --git a/yu-react/src/pages/system/Role/index.tsx b/yu-react/src/pages/system/Role/index.tsx
index 3a21e60..42dae6d 100644
--- a/yu-react/src/pages/system/Role/index.tsx
+++ b/yu-react/src/pages/system/Role/index.tsx
@@ -1,5 +1,5 @@
 import { FolderOutlined, PlusOutlined, ProfileOutlined, SecurityScanOutlined } from '@ant-design/icons';
-import { Button, Tree } from 'antd';
+import { Button, Popconfirm, Tree } from 'antd';
 import type { FormInstance } from 'antd';
 import React, { useState, useRef, useEffect } from 'react';
 import { PageContainer } from '@ant-design/pro-layout';
@@ -116,15 +116,18 @@ const RoleTable: React.FC = () => {
         >
           权限分配
         </a>,
-        <a key="subscribeAlert"
-          onClick={async () => {
+        <Popconfirm key="deleteConfirm" title={`确认删除该记录吗?`} okText="是" cancelText="否"
+          onConfirm={async () => {
             await YuCrud.handleDelete(deleteRole, record.id)
             if (actionRef.current) {
               actionRef.current.reload();
             }
-          }}>
-          删除
-        </a>,
+          }}
+        >
+          <a key="delete" href="#">
+            删除
+          </a>
+        </Popconfirm>
       ],
     },
   ];