Skip to content

Commit a244361

Browse files
wangdan-fit2cloudwangdan-fit2cloud
committed
fix: icon issue
1 parent 545693f commit a244361

File tree

7 files changed

+61
-31
lines changed

7 files changed

+61
-31
lines changed

‎ui/src/components/folder-tree/index.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
style="font-size: 18px"
2020
class="color-primary"
2121
></AppIcon>
22-
<span class="ml-8 lighter">{{ shareTitle }}</span>
22+
<span class="ml-8">{{ shareTitle }}</span>
2323
</div>
2424
</div>
2525

‎ui/src/views/application/component/McpServersDialog.vue‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@
2929
:rules="[
3030
{
3131
required: true,
32-
message:
33-
$t('common.selectPlaceholder') +
34-
` MCP ${$t('views.tool.title')}`,
32+
message: $t('common.selectPlaceholder') + ` MCP ${$t('views.tool.title')}`,
3533
},
3634
]"
3735
prop="mcp_tool_id"
@@ -48,8 +46,17 @@
4846
:value="mcpTool.id"
4947
>
5048
<div class="flex align-center">
51-
<el-avatar shape="square" :size="20" class="mr-8">
52-
<img src="@/assets/workflow/icon_mcp.svg" style="width: 75%" alt=""/>
49+
<el-avatar
50+
v-if="mcpTool?.icon"
51+
shape="square"
52+
:size="20"
53+
style="background: none"
54+
class="mr-8"
55+
>
56+
<img :src="resetUrl(mcpTool?.icon)" alt="" />
57+
</el-avatar>
58+
<el-avatar v-else shape="square" :size="20" class="mr-8">
59+
<img src="@/assets/workflow/icon_mcp.svg" style="width: 75%" alt="" />
5360
</el-avatar>
5461
<span>{{ mcpTool.name }}</span>
5562
<el-tag v-if="mcpTool.scope === 'SHARED'" type="info" class="info-tag ml-8 mt-4">
@@ -96,9 +103,10 @@
96103
</el-dialog>
97104
</template>
98105
<script setup lang="ts">
99-
import {ref, watch} from 'vue'
100-
import {MsgError} from "@/utils/message.ts";
101-
import {t} from "@/locales";
106+
import { ref, watch } from 'vue'
107+
import { MsgError } from '@/utils/message.ts'
108+
import { t } from '@/locales'
109+
import { resetUrl } from '@/utils/common'
102110
103111
const emit = defineEmits(['refresh'])
104112
@@ -142,9 +150,8 @@ function mcpSourceChange() {
142150
}
143151
}
144152
145-
146153
const open = (data: any, selectOptions: any) => {
147-
form.value = {...form.value, ...data}
154+
form.value = { ...form.value, ...data }
148155
if (data.mcp_servers) {
149156
form.value.mcp_source = 'custom'
150157
} else if (data.mcp_tool_id) {
@@ -173,6 +180,6 @@ const submit = () => {
173180
})
174181
}
175182
176-
defineExpose({open})
183+
defineExpose({ open })
177184
</script>
178185
<style lang="scss" scoped></style>

‎ui/src/views/model/component/Provider.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
style="font-size: 18px"
1414
class="color-primary"
1515
></AppIcon>
16-
<span class="ml-8 lighter">{{ $t('views.shared.shared_model') }}</span>
16+
<span class="ml-8">{{ $t('views.shared.shared_model') }}</span>
1717
</div>
1818
</div>
1919
<div

‎ui/src/views/tool/McpToolFormDrawer.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
</el-button>
110110
</div>
111111
</template>
112-
<EditAvatarDialog ref="EditAvatarDialogRef" @refresh="refreshTool" />
112+
<EditAvatarDialog ref="EditAvatarDialogRef" @refresh="refreshTool" iconType="MCP" />
113113
</el-drawer>
114114
</template>
115115

‎ui/src/views/tool/component/EditAvatarDialog.vue‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
<el-radio-group v-model="radioType" class="radio-block mb-16">
1010
<el-radio value="default">
1111
<p>{{ $t('common.EditAvatarDialog.default') }}</p>
12-
<el-avatar class="avatar-green" shape="square" :size="32">
13-
<img src="@/assets/workflow/icon_tool.svg" style="width: 58%" alt="" />
14-
</el-avatar>
12+
<ToolIcon :size="32" :type="iconType" />
1513
</el-radio>
1614

1715
<el-radio value="custom">
@@ -55,15 +53,17 @@
5553
</el-dialog>
5654
</template>
5755
<script setup lang="ts">
58-
import {computed, ref, watch} from 'vue'
59-
import ToolApi from '@/api/tool/tool'
56+
import { computed, ref, watch } from 'vue'
6057
import { cloneDeep } from 'lodash'
6158
import { MsgError, MsgSuccess } from '@/utils/message'
62-
import { defaultIcon, isAppIcon } from '@/utils/common'
59+
import { isAppIcon } from '@/utils/common'
6360
import { t } from '@/locales'
64-
import {loadSharedApi} from "@/utils/dynamics-api/shared-api.ts";
65-
import {useRoute} from "vue-router";
61+
import { loadSharedApi } from '@/utils/dynamics-api/shared-api.ts'
62+
import { useRoute } from 'vue-router'
6663
64+
const props = defineProps<{
65+
iconType?: string
66+
}>()
6767
const emit = defineEmits(['refresh'])
6868
const route = useRoute()
6969
@@ -122,7 +122,8 @@ function submit() {
122122
const fd = new FormData()
123123
fd.append('file', iconFile.value.raw)
124124
loadSharedApi({ type: 'tool', systemType: apiType.value })
125-
.putToolIcon(detail.value.id, fd, loading).then((res: any) => {
125+
.putToolIcon(detail.value.id, fd, loading)
126+
.then((res: any) => {
126127
emit('refresh', res.data)
127128
dialogVisible.value = false
128129
})

‎ui/src/workflow/nodes/ai-chat-node/index.vue‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,16 @@
177177
<template v-for="(item, index) in chat_data.tool_ids" :key="index">
178178
<div class="flex-between border border-r-6 white-bg mb-4" style="padding: 5px 8px">
179179
<div class="flex align-center" style="line-height: 20px">
180-
<ToolIcon type="CUSTOM" class="mr-8" :size="20" />
180+
<el-avatar
181+
v-if="relatedObject(toolSelectOptions, item, 'id')?.icon"
182+
shape="square"
183+
:size="20"
184+
style="background: none"
185+
class="mr-8"
186+
>
187+
<img :src="resetUrl(relatedObject(toolSelectOptions, item, 'id')?.icon)" alt="" />
188+
</el-avatar>
189+
<ToolIcon v-else class="mr-8" :size="20" />
181190

182191
<div class="ellipsis" :title="relatedObject(toolSelectOptions, item, 'id')?.name">
183192
{{ relatedObject(toolSelectOptions, item, 'id')?.name }}
@@ -254,10 +263,12 @@ import { isLastNode } from '@/workflow/common/data'
254263
import AIModeParamSettingDialog from '@/views/application/component/AIModeParamSettingDialog.vue'
255264
import { t } from '@/locales'
256265
import ReasoningParamSettingDialog from '@/views/application/component/ReasoningParamSettingDialog.vue'
266+
import ToolDialog from '@/views/application/component/ToolDialog.vue'
257267
import McpServersDialog from '@/views/application/component/McpServersDialog.vue'
258268
import { loadSharedApi } from '@/utils/dynamics-api/shared-api'
259269
import { useRoute } from 'vue-router'
260-
import ToolDialog from '@/views/application/component/ToolDialog.vue'
270+
271+
import { resetUrl } from '@/utils/common'
261272
import { relatedObject } from '@/utils/array.ts'
262273
const getApplicationDetail = inject('getApplicationDetail') as any
263274
const route = useRoute()

‎ui/src/workflow/nodes/mcp-node/index.vue‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,22 @@
5353
:label="mcpTool.name"
5454
:value="mcpTool.id"
5555
>
56-
<span>{{ mcpTool.name }}</span>
57-
<el-tag v-if="mcpTool.scope === 'SHARED'" type="info" class="info-tag ml-8 mt-4">
58-
{{ t('views.shared.title') }}
59-
</el-tag>
56+
<div class="flex align-center">
57+
<el-avatar
58+
v-if="mcpTool?.icon"
59+
shape="square"
60+
:size="20"
61+
style="background: none"
62+
class="mr-8"
63+
>
64+
<img :src="resetUrl(mcpTool?.icon)" alt="" />
65+
</el-avatar>
66+
<ToolIcon v-else :size="20" :type="mcpTool?.tool_type" class="mr-8" />
67+
<span>{{ mcpTool.name }}</span>
68+
<el-tag v-if="mcpTool.scope === 'SHARED'" type="info" class="info-tag ml-8">
69+
{{ t('views.shared.title') }}
70+
</el-tag>
71+
</div>
6072
</el-option>
6173
</el-select>
6274
</el-form-item>
@@ -246,10 +258,9 @@ import TooltipLabel from '@/components/dynamics-form/items/label/TooltipLabel.vu
246258
import NodeCascader from '@/workflow/common/NodeCascader.vue'
247259
import { useRoute } from 'vue-router'
248260
import { loadSharedApi } from '@/utils/dynamics-api/shared-api'
249-
import useStore from '@/stores'
261+
import { resetUrl } from '@/utils/common'
250262
251263
const props = defineProps<{ nodeModel: any }>()
252-
const { user } = useStore()
253264
254265
const route = useRoute()
255266
const {

0 commit comments

Comments
 (0)