Skip to content

Commit add9d1b

Browse files
committed
fix: In the permission settings, the knowledge base list does not distinguish between knowledge base types, and all are marked with the icon of the general knowledge base.
--bug=1054142 --user=王孝刚 【团队成员】权限设置中,知识库列表没有区分知识库类型,都用通用知识库的图标标识 https://www.tapd.cn/57709429/s/1681104
1 parent 9c36d8f commit add9d1b

File tree

2 files changed

+36
-6
lines changed

2 files changed

+36
-6
lines changed

apps/setting/sql/get_member_permission.sql

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ FROM
88
"id",
99
"name",
1010
'DATASET' AS "type",
11-
user_id
11+
user_id,
12+
"type" AS "icon"
1213
FROM
1314
dataset
1415
WHERE
@@ -17,7 +18,8 @@ FROM
1718
"id",
1819
"name",
1920
'APPLICATION' AS "type",
20-
user_id
21+
user_id,
22+
"icon" AS "icon"
2123
FROM
2224
application
2325
WHERE

ui/src/views/team/component/PermissionSetting.vue

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,41 @@
1919
<template #default="{ row }">
2020
<div class="flex align-center">
2121
<AppAvatar
22-
v-if="isApplication"
23-
:name="row.name"
24-
pinyinColor
22+
v-if="isApplication && isAppIcon(row?.icon)"
23+
style="background: none"
2524
class="mr-12"
2625
shape="square"
2726
:size="24"
27+
>
28+
<img :src="row?.icon" alt="" />
29+
</AppAvatar>
30+
31+
<AppAvatar
32+
v-else-if="row?.name && isApplication"
33+
:name="row?.name"
34+
pinyinColor
35+
shape="square"
36+
:size="24"
37+
class="mr-12"
2838
/>
29-
<AppAvatar v-else-if="isDataset" class="mr-12 avatar-blue" shape="square" :size="24">
39+
<AppAvatar
40+
v-if="row.icon === '1' && isDataset"
41+
class="mr-8 avatar-purple"
42+
shape="square"
43+
:size="24"
44+
>
45+
<img src="@/assets/icon_web.svg" style="width: 58%" alt="" />
46+
</AppAvatar>
47+
<AppAvatar
48+
v-else-if="row.icon === '2' && isDataset"
49+
class="mr-8 avatar-purple"
50+
shape="square"
51+
:size="24"
52+
style="background: none"
53+
>
54+
<img src="@/assets/logo_lark.svg" style="width: 100%" alt="" />
55+
</AppAvatar>
56+
<AppAvatar v-else-if="isDataset" class="mr-8 avatar-blue" shape="square" :size="24">
3057
<img src="@/assets/icon_document.svg" style="width: 58%" alt="" />
3158
</AppAvatar>
3259
<auto-tooltip :content="row?.name">
@@ -85,6 +112,7 @@
85112
<script setup lang="ts">
86113
import { ref, onMounted, watch, computed } from 'vue'
87114
import { TeamEnum } from '@/enums/team'
115+
import { isAppIcon } from '@/utils/application'
88116
89117
const props = defineProps({
90118
data: {

0 commit comments

Comments
 (0)