Commit 977ba6d8db483a4673825e46cdaf98474a0cd1ef
Merge branch 'perf/configuration-center' into 'main_dev'
perf: 优化组态分页展示,增加icon区分phone和pc端 See merge request yunteng/thingskit-front!885
Showing
1 changed file
with
13 additions
and
3 deletions
@@ -11,7 +11,7 @@ | @@ -11,7 +11,7 @@ | ||
11 | import { ConfigurationCenterItemsModal } from '/@/api/configuration/center/model/configurationCenterModal'; | 11 | import { ConfigurationCenterItemsModal } from '/@/api/configuration/center/model/configurationCenterModal'; |
12 | import { PageWrapper } from '/@/components/Page'; | 12 | import { PageWrapper } from '/@/components/Page'; |
13 | import { BasicForm, useForm } from '/@/components/Form'; | 13 | import { BasicForm, useForm } from '/@/components/Form'; |
14 | - import { ConfigurationPermission, searchFormSchema } from './center.data'; | 14 | + import { ConfigurationPermission, Platform, searchFormSchema } from './center.data'; |
15 | import { useMessage } from '/@/hooks/web/useMessage'; | 15 | import { useMessage } from '/@/hooks/web/useMessage'; |
16 | import { Authority } from '/@/components/Authority'; | 16 | import { Authority } from '/@/components/Authority'; |
17 | import { isDevMode } from '/@/utils/env'; | 17 | import { isDevMode } from '/@/utils/env'; |
@@ -30,6 +30,7 @@ | @@ -30,6 +30,7 @@ | ||
30 | import { ViewType } from '../../visual/board/config/panelDetail'; | 30 | import { ViewType } from '../../visual/board/config/panelDetail'; |
31 | import { useRole } from '/@/hooks/business/useRole'; | 31 | import { useRole } from '/@/hooks/business/useRole'; |
32 | import { useClipboard } from '@vueuse/core'; | 32 | import { useClipboard } from '@vueuse/core'; |
33 | + import { Icon } from '/@/components/Icon'; | ||
33 | 34 | ||
34 | const listColumn = ref(5); | 35 | const listColumn = ref(5); |
35 | 36 | ||
@@ -187,7 +188,7 @@ | @@ -187,7 +188,7 @@ | ||
187 | 188 | ||
188 | onMounted(() => { | 189 | onMounted(() => { |
189 | const clientHeight = document.documentElement.clientHeight; | 190 | const clientHeight = document.documentElement.clientHeight; |
190 | - const rect = getBoundingClientRect(unref(listEl)!.$el!) as DOMRect; | 191 | + const rect = getBoundingClientRect(unref(listEl)!.$el! as HTMLElement) as DOMRect; |
191 | // margin-top 24 height 24 | 192 | // margin-top 24 height 24 |
192 | const paginationHeight = 24 + 24 + 8; | 193 | const paginationHeight = 24 + 24 + 8; |
193 | // list pading top 8 maring-top 8 extra slot 56 | 194 | // list pading top 8 maring-top 8 extra slot 56 |
@@ -322,7 +323,16 @@ | @@ -322,7 +323,16 @@ | ||
322 | </template> | 323 | </template> |
323 | <template #description> | 324 | <template #description> |
324 | <div class="truncate h-11"> | 325 | <div class="truncate h-11"> |
325 | - <div class="truncate">{{ item.organizationDTO.name }}</div> | 326 | + <div class="truncate flex justify-between items-center"> |
327 | + <div>{{ item.organizationDTO.name }}</div> | ||
328 | + <Icon | ||
329 | + :icon=" | ||
330 | + item.platform === Platform.PC | ||
331 | + ? 'ri:computer-line' | ||
332 | + : 'clarity:mobile-phone-solid' | ||
333 | + " | ||
334 | + /> | ||
335 | + </div> | ||
326 | <div class="truncate">{{ item.remark || '' }} </div> | 336 | <div class="truncate">{{ item.remark || '' }} </div> |
327 | </div> | 337 | </div> |
328 | </template> | 338 | </template> |