Skip to content

Commit e0b967d

Browse files
wangdan-fit2cloudwangdan-fit2cloud
committed
fix: trigger execution detail
1 parent 3579902 commit e0b967d

File tree

8 files changed

+47
-31
lines changed

8 files changed

+47
-31
lines changed

‎ui/src/locales/lang/en-US/views/trigger.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,6 @@ export default {
4545
},
4646
},
4747
requestParameter: 'Request Parameters',
48+
triggerParam: 'Trigger Input Parameters',
49+
errorMsg: 'Error Message',
4850
}

‎ui/src/locales/lang/zh-CN/views/trigger.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,6 @@ export default {
4545
},
4646
},
4747
requestParameter: '请求参数',
48+
triggerParam: '触发器入参',
49+
errorMsg: '错误信息',
4850
}

‎ui/src/locales/lang/zh-Hant/views/trigger.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,6 @@ export default {
4545
},
4646
},
4747
requestParameter: '請求參數',
48+
triggerParam: '觸發器入參',
49+
errorMsg: '錯誤信息',
4850
}

‎ui/src/views/tool/execution-record/TriggerRecordDrawer.vue‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -81,20 +81,23 @@
8181
show-overflow-tooltip
8282
>
8383
<template #default="{ row }">
84-
<div class="flex align-center">
84+
<el-space :size="8">
8585
<KnowledgeIcon :size="22" v-if="row.source_type === 'KNOWLEDGE'" :type="4" />
86-
<TriggerIcon v-else-if="row.source_type === 'TRIGGER'" :type="row.trigger_type" :size="22" />
86+
<TriggerIcon
87+
v-else-if="row.source_type === 'TRIGGER'"
88+
:type="row.trigger_type"
89+
:size="22"
90+
/>
8791
<el-avatar shape="square" :size="22" style="background: none" v-else>
8892
<img :src="resetUrl(row?.source_icon, resetUrl('./favicon.ico'))" alt="" />
8993
</el-avatar>
90-
91-
<span class="ml-8">{{ row.source_name }}</span>
92-
</div>
94+
<span class="ellipsis">{{ row.source_name }}</span>
95+
</el-space>
9396
</template>
9497
</el-table-column>
9598
<el-table-column
9699
prop="source_type"
97-
min-width="120"
100+
width="100"
98101
show-overflow-tooltip
99102
:label="$t('common.type')"
100103
>
@@ -104,16 +107,7 @@
104107
<span v-else>{{ $t('views.trigger.title') }}</span>
105108
</template>
106109
</el-table-column>
107-
<el-table-column
108-
v-if="apiType === 'systemShare'"
109-
prop="workspace_name"
110-
:label="$t('views.workspace.title')"
111-
>
112-
<template #default="{ row }">
113-
{{ row.workspace_name }}
114-
</template>
115-
</el-table-column>
116-
<el-table-column prop="state" :label="$t('common.status.label')" width="180">
110+
<el-table-column prop="state" :label="$t('common.status.label')" width="100">
117111
<template #default="{ row }">
118112
<el-text class="color-text-primary" v-if="row.state === 'SUCCESS'">
119113
<el-icon class="color-success"><SuccessFilled /></el-icon>
@@ -142,6 +136,15 @@
142136
{{ row.run_time != undefined ? row.run_time?.toFixed(2) + 's' : '-' }}
143137
</template>
144138
</el-table-column>
139+
<el-table-column
140+
v-if="apiType === 'systemShare'"
141+
prop="workspace_name"
142+
:label="$t('views.workspace.title')"
143+
>
144+
<template #default="{ row }">
145+
{{ row.workspace_name }}
146+
</template>
147+
</el-table-column>
145148
<el-table-column
146149
sortable
147150
prop="create_time"

‎ui/src/views/trigger/ResourceTriggerDrawer.vue‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,17 @@
2121
<div v-if="triggerList.length > 0" class="w-full" v-loading="loading">
2222
<template v-for="(item, index) in triggerList" :key="index">
2323
<div class="flex-between border border-r-6 white-bg mb-8" style="padding: 2px 8px">
24-
<div class="flex align-center w-180">
24+
<div class="flex align-center" style="width: 60%">
2525
<TriggerIcon :type="item.trigger_type" class="mr-8" :size="20" />
26-
<span class="ellipsis-1" :title="item.name"> {{ item.name }}</span>
26+
<auto-tooltip :content="item.name">
27+
{{ item.name + '111' }}
28+
</auto-tooltip>
2729
</div>
28-
<div class="w-180">
29-
<span v-if="item.trigger_type === 'SCHEDULED'">
30+
31+
<div>
32+
<span v-if="item.trigger_type === 'SCHEDULED'" class="mr-8 color-secondary lighter">
3033
{{ getTriggerCycleLabel(item.trigger_setting) }}</span
3134
>
32-
</div>
33-
<div>
3435
<span class="mr-4">
3536
<el-button text @click="openEditTriggerDrawer(item)">
3637
<AppIcon iconName="app-edit" class="color-secondary"></AppIcon>

‎ui/src/views/trigger/execution-record/ExecutionDetailDrawer.vue‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,18 +105,23 @@
105105
</h4>
106106
<template v-if="taskRecordDetails && taskRecordDetails.state === 'TRIGGER_ERROR'">
107107
<div class="card-never border-r-6 mb-12">
108-
<h5 class="p-8-12">触发器入参</h5>
108+
<h5 class="p-8-12">{{ $t('views.trigger.triggerParam') }}</h5>
109109
<div class="p-8-12 border-t-dashed lighter">
110110
{{ taskRecordDetails.meta.input }}
111111
</div>
112112
</div>
113113
<div class="card-never border-r-6 mb-12">
114-
<h5 class="p-8-12">错误信息</h5>
114+
<h5 class="p-8-12">{{ $t('views.trigger.errorMsg') }}</h5>
115115
<div class="p-8-12 border-t-dashed lighter">
116116
{{ taskRecordDetails.meta.err_message }}
117117
</div>
118118
</div>
119119
</template>
120+
<ExecutionDetailContent
121+
v-else-if="props.currentContent?.source_type === 'APPLICATION'"
122+
:detail="detail"
123+
:appType="props.currentContent.type"
124+
></ExecutionDetailContent>
120125
<template v-else v-for="(item, index) in arraySort(detail ?? [], 'index')" :key="index">
121126
<ExecutionDetailCard :data="item"> </ExecutionDetailCard>
122127
</template>
@@ -141,6 +146,7 @@ import { useRoute } from 'vue-router'
141146
import { arraySort } from '@/utils/array'
142147
import { isAppIcon, resetUrl } from '@/utils/common'
143148
import ExecutionDetailCard from '@/components/execution-detail-card/index.vue'
149+
import ExecutionDetailContent from '@/components/ai-chat/component/knowledge-source-component/ExecutionDetailContent.vue'
144150
import { datetimeFormat } from '@/utils/time'
145151
import triggerAPI from '@/api/trigger/trigger'
146152
const props = withDefaults(

‎ui/src/views/trigger/execution-record/TriggerTaskRecordDrawer.vue‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,19 +80,19 @@
8080
show-overflow-tooltip
8181
>
8282
<template #default="{ row }">
83-
<div class="flex align-center">
83+
<el-space :size="8">
8484
<ToolIcon v-if="row.source_type === 'TOOL' && !row.source_icon" :size="22" />
8585
<el-avatar v-else shape="square" :size="22" style="background: none">
8686
<img :src="resetUrl(row?.source_icon, resetUrl('./favicon.ico'))" alt="" />
8787
</el-avatar>
88-
<span class="ml-8">{{ row.source_name }}</span>
89-
</div>
88+
<span class="ellipsis">{{ row.source_name }}</span>
89+
</el-space>
9090
</template>
9191
</el-table-column>
9292

9393
<el-table-column
9494
prop="source_type"
95-
min-width="120"
95+
width="100"
9696
show-overflow-tooltip
9797
:label="$t('common.type')"
9898
>
@@ -105,7 +105,7 @@
105105
</template>
106106
</el-table-column>
107107

108-
<el-table-column prop="state" :label="$t('common.status.label')" width="180">
108+
<el-table-column prop="state" :label="$t('common.status.label')" width="100">
109109
<template #default="{ row }">
110110
<el-text class="color-text-primary" v-if="row.state === 'SUCCESS'">
111111
<el-icon class="color-success"><SuccessFilled /></el-icon>

‎ui/src/views/trigger/index.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@
7171
clearable
7272
style="width: 220px"
7373
>
74-
<el-option :label="$t('common.status.enable')" value="true" />
75-
<el-option :label="$t('common.status.disable')" value="false" />
74+
<el-option :label="$t('common.status.enabled')" value="true" />
75+
<el-option :label="$t('common.status.disabled')" value="false" />
7676
</el-select>
7777
<el-select
7878
v-else-if="search_type === 'create_user'"

0 commit comments

Comments
 (0)