Commit 31c3bfe8ddd0df2fe99e5e82e1fdabb4b3e121b7
Merge branch 'fix/edge/07-31' into 'main_dev'
perf: 优化边缘实例,新增表单,复制图标优化 See merge request yunteng/thingskit-front!1424
Showing
2 changed files
with
7 additions
and
12 deletions
@@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
2 | <Dropdown placement="bottomLeft" :overlayClassName="`${prefixCls}-dropdown-overlay`"> | 2 | <Dropdown placement="bottomLeft" :overlayClassName="`${prefixCls}-dropdown-overlay`"> |
3 | <span :class="[prefixCls, `${prefixCls}--${theme}`]" class="flex"> | 3 | <span :class="[prefixCls, `${prefixCls}--${theme}`]" class="flex"> |
4 | <img :class="`${prefixCls}__header`" :src="getUserInfo.avatar" /> | 4 | <img :class="`${prefixCls}__header`" :src="getUserInfo.avatar" /> |
5 | - <span :class="`${prefixCls}__info hidden md:block`"> | 5 | + <span :class="`${prefixCls}__info hidden md:block w-30 truncate`"> |
6 | <span :class="`${prefixCls}__name `" class="truncate"> | 6 | <span :class="`${prefixCls}__name `" class="truncate"> |
7 | {{ getUserInfo.realName }} | 7 | {{ getUserInfo.realName }} |
8 | </span> | 8 | </span> |
@@ -8,7 +8,6 @@ | @@ -8,7 +8,6 @@ | ||
8 | import { createOrEditEdgeInstance } from '/@/api/edgeManage/edgeInstance'; | 8 | import { createOrEditEdgeInstance } from '/@/api/edgeManage/edgeInstance'; |
9 | import { EdgeInstanceItemType } from '/@/api/edgeManage/model/edgeInstance'; | 9 | import { EdgeInstanceItemType } from '/@/api/edgeManage/model/edgeInstance'; |
10 | import { buildUUID, randomString } from '/@/utils/uuid'; | 10 | import { buildUUID, randomString } from '/@/utils/uuid'; |
11 | - import { CopyOutlined } from '@ant-design/icons-vue'; | ||
12 | import { handeleCopy } from '/@/views/device/profiles/step/topic'; | 11 | import { handeleCopy } from '/@/views/device/profiles/step/topic'; |
13 | 12 | ||
14 | const emits = defineEmits(['success', 'register']); | 13 | const emits = defineEmits(['success', 'register']); |
@@ -99,21 +98,17 @@ | @@ -99,21 +98,17 @@ | ||
99 | <template #routingKey="{ model, field }"> | 98 | <template #routingKey="{ model, field }"> |
100 | <div class="!flex justify-between items-center gap-5"> | 99 | <div class="!flex justify-between items-center gap-5"> |
101 | <a-input disabled v-model:value="model[field]" /> | 100 | <a-input disabled v-model:value="model[field]" /> |
102 | - <CopyOutlined | ||
103 | - @click="handleCopyRoutingKey(model[field])" | ||
104 | - class="cursor-pointer" | ||
105 | - style="font-size: 32px" | ||
106 | - /> | 101 | + <a-button type="link" @click="handleCopyRoutingKey(model[field])" class="cursor-pointer" |
102 | + >复制</a-button | ||
103 | + > | ||
107 | </div> | 104 | </div> |
108 | </template> | 105 | </template> |
109 | <template #secret="{ model, field }"> | 106 | <template #secret="{ model, field }"> |
110 | <div class="!flex justify-between items-center gap-5"> | 107 | <div class="!flex justify-between items-center gap-5"> |
111 | <a-input disabled v-model:value="model[field]" /> | 108 | <a-input disabled v-model:value="model[field]" /> |
112 | - <CopyOutlined | ||
113 | - @click="handleCopySecret(model[field])" | ||
114 | - class="cursor-pointer" | ||
115 | - style="font-size: 32px" | ||
116 | - /> | 109 | + <a-button type="link" @click="handleCopySecret(model[field])" class="cursor-pointer" |
110 | + >复制</a-button | ||
111 | + > | ||
117 | </div> | 112 | </div> |
118 | </template> | 113 | </template> |
119 | </BasicForm> | 114 | </BasicForm> |