From c369b88185c85bb7782383617fd6debf1f6c16d9 Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Thu, 16 May 2024 21:46:17 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=8D=A2=20copy=20?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/JsonPretty/index.vue                         | 2 +-
 src/styles/arco-ui/a-typography.less                        | 3 +++
 src/styles/arco-ui/index.less                               | 1 +
 .../monitor/log/operation/OperationLogDetailDrawer.vue      | 6 +++---
 src/views/system/user/UserDetailDrawer.vue                  | 6 +++---
 5 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100644 src/styles/arco-ui/a-typography.less

diff --git a/src/components/JsonPretty/index.vue b/src/components/JsonPretty/index.vue
index 9e5852e..df9d2ef 100644
--- a/src/components/JsonPretty/index.vue
+++ b/src/components/JsonPretty/index.vue
@@ -34,7 +34,7 @@ const onCopy = (data: object) => {
     position: absolute;
     right: 10px;
     top: 10px;
-    font-size: 20px;
+    font-size: 18px;
     cursor: pointer;
   }
 }
diff --git a/src/styles/arco-ui/a-typography.less b/src/styles/arco-ui/a-typography.less
new file mode 100644
index 0000000..6e47835
--- /dev/null
+++ b/src/styles/arco-ui/a-typography.less
@@ -0,0 +1,3 @@
+div.arco-typography {
+  margin-bottom: 0;
+}
\ No newline at end of file
diff --git a/src/styles/arco-ui/index.less b/src/styles/arco-ui/index.less
index b8b4856..ebbe687 100644
--- a/src/styles/arco-ui/index.less
+++ b/src/styles/arco-ui/index.less
@@ -12,6 +12,7 @@
 @import './a-picker.less';
 @import './a-message.less';
 @import './a-menu.less';
+@import './a-typography.less';
 
 @color-menu-dark-bg: var(--color-bg-1);
 @card-color-bg: var(--color-bg-1);
diff --git a/src/views/monitor/log/operation/OperationLogDetailDrawer.vue b/src/views/monitor/log/operation/OperationLogDetailDrawer.vue
index 3440aeb..2e70a4e 100644
--- a/src/views/monitor/log/operation/OperationLogDetailDrawer.vue
+++ b/src/views/monitor/log/operation/OperationLogDetailDrawer.vue
@@ -2,12 +2,12 @@
   <a-drawer v-model:visible="visible" title="日志详情" :width="720" :footer="false">
     <a-descriptions title="基本信息" :column="2" size="large" class="general-description">
       <a-descriptions-item label="日志 ID">{{ dataDetail?.id }}</a-descriptions-item>
-      <a-descriptions-item label="Trace ID">{{ dataDetail?.traceId }}<TextCopy :value="dataDetail?.traceId" /></a-descriptions-item>
+      <a-descriptions-item label="Trace ID"><a-typography-paragraph copyable>{{ dataDetail?.traceId }}</a-typography-paragraph></a-descriptions-item>
       <a-descriptions-item label="操作人">{{ dataDetail?.createUserString }}</a-descriptions-item>
       <a-descriptions-item label="操作时间">{{ dataDetail?.createTime }}</a-descriptions-item>
       <a-descriptions-item label="操作内容">{{ dataDetail?.description }}</a-descriptions-item>
       <a-descriptions-item label="所属模块">{{ dataDetail?.module }}</a-descriptions-item>
-      <a-descriptions-item label="操作 IP">{{ dataDetail?.ip }}</a-descriptions-item>
+      <a-descriptions-item label="操作 IP"><a-typography-paragraph copyable>{{ dataDetail?.ip }}</a-typography-paragraph></a-descriptions-item>
       <a-descriptions-item label="操作地点">{{ dataDetail?.address }}</a-descriptions-item>
       <a-descriptions-item label="浏览器">{{ dataDetail?.browser }}</a-descriptions-item>
       <a-descriptions-item label="终端系统">{{ dataDetail?.os }}</a-descriptions-item>
@@ -21,7 +21,7 @@
         <a-tag v-else color="green">{{ dataDetail?.timeTaken }} ms</a-tag>
       </a-descriptions-item>
       <a-descriptions-item label="请求 URI" :span="2">
-        {{ dataDetail?.requestUrl }}<TextCopy :value="dataDetail?.requestUrl" />
+        <a-typography-paragraph copyable>{{ dataDetail?.requestUrl }}</a-typography-paragraph>
       </a-descriptions-item>
     </a-descriptions>
     <a-descriptions
diff --git a/src/views/system/user/UserDetailDrawer.vue b/src/views/system/user/UserDetailDrawer.vue
index e3f36fb..b46d699 100644
--- a/src/views/system/user/UserDetailDrawer.vue
+++ b/src/views/system/user/UserDetailDrawer.vue
@@ -2,7 +2,7 @@
   <a-drawer v-model:visible="visible" title="用户详情" :width="width >= 600 ? 600 : '100%'" :footer="false">
     <a-descriptions :column="2" size="large" class="general-description">
       <a-descriptions-item label="ID" :span="2">{{ dataDetail?.id }}</a-descriptions-item>
-      <a-descriptions-item label="用户名">{{ dataDetail?.username }}</a-descriptions-item>
+      <a-descriptions-item label="用户名"><a-typography-paragraph copyable>{{ dataDetail?.username }}</a-typography-paragraph></a-descriptions-item>
       <a-descriptions-item label="昵称">{{ dataDetail?.nickname }}</a-descriptions-item>
       <a-descriptions-item label="性别">
         <span v-if="dataDetail?.gender === 1">男</span>
@@ -13,8 +13,8 @@
         <a-tag v-if="dataDetail?.status === 1" color="green">启用</a-tag>
         <a-tag v-else color="red">禁用</a-tag>
       </a-descriptions-item>
-      <a-descriptions-item label="手机号">{{ dataDetail?.phone }}</a-descriptions-item>
-      <a-descriptions-item label="邮箱">{{ dataDetail?.email }}</a-descriptions-item>
+      <a-descriptions-item label="手机号"><a-typography-paragraph copyable>{{ dataDetail?.phone }}</a-typography-paragraph></a-descriptions-item>
+      <a-descriptions-item label="邮箱"><a-typography-paragraph copyable>{{ dataDetail?.email }}</a-typography-paragraph></a-descriptions-item>
       <a-descriptions-item label="所属部门">{{ dataDetail?.deptName }}</a-descriptions-item>
       <a-descriptions-item label="角色">{{ dataDetail?.roleNames }}</a-descriptions-item>
       <a-descriptions-item label="创建人">{{ dataDetail?.createUserString }}</a-descriptions-item>