Skip to content

Commit 02424a4

Browse files
zhanweizhang7zhanweizhang7
committed
pref: Remove return content button
1 parent b1db3a6 commit 02424a4

File tree

11 files changed

+80
-120
lines changed

11 files changed

+80
-120
lines changed

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -287,13 +287,14 @@
287287
</div>
288288
</template>
289289
</el-form-item>
290-
<el-form-item @click.prevent>
290+
<el-form-item
291+
@click.prevent
292+
v-if="[WorkflowMode.Application, WorkflowMode.ApplicationLoop].includes(workflowMode)"
293+
>
291294
<template #label>
292295
<div class="flex align-center">
293296
<div class="mr-4">
294-
<span>{{
295-
$t('views.workflow.nodes.aiChatNode.returnContent.label')
296-
}}</span>
297+
<span>{{ $t('views.workflow.nodes.aiChatNode.returnContent.label') }}</span>
297298
</div>
298299
<el-tooltip effect="dark" placement="right" popper-class="max-w-200">
299300
<template #content>
@@ -335,6 +336,8 @@ import { useRoute } from 'vue-router'
335336
336337
import { resetUrl } from '@/utils/common'
337338
import { relatedObject } from '@/utils/array.ts'
339+
import { WorkflowMode } from '@/enums/application'
340+
const workflowMode = (inject('workflowMode') as WorkflowMode) || WorkflowMode.Application
338341
const getResourceDetail = inject('getResourceDetail') as any
339342
const route = useRoute()
340343

‎ui/src/workflow/nodes/image-generate/index.vue‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,7 @@
4545
@wheel="wheel"
4646
:teleported="false"
4747
v-model="form_data.model_id"
48-
:placeholder="
49-
$t('views.workflow.nodes.imageGenerateNode.model.requiredMessage')
50-
"
48+
:placeholder="$t('views.workflow.nodes.imageGenerateNode.model.requiredMessage')"
5149
:options="modelOptions"
5250
showFooter
5351
@focus="getSelectModel"
@@ -106,9 +104,7 @@
106104
</div>
107105
<el-tooltip effect="dark" placement="right" popper-class="max-w-200">
108106
<template #content
109-
>{{
110-
$t('views.workflow.nodes.imageGenerateNode.negative_prompt.tooltip')
111-
}}
107+
>{{ $t('views.workflow.nodes.imageGenerateNode.negative_prompt.tooltip') }}
112108
</template>
113109
<AppIcon iconName="app-warning" class="app-warning-icon"></AppIcon>
114110
</el-tooltip>
@@ -118,23 +114,20 @@
118114
@wheel="wheel"
119115
:title="$t('views.workflow.nodes.imageGenerateNode.negative_prompt.label')"
120116
v-model="form_data.negative_prompt"
121-
:placeholder="
122-
$t('views.workflow.nodes.imageGenerateNode.negative_prompt.placeholder')
123-
"
117+
:placeholder="$t('views.workflow.nodes.imageGenerateNode.negative_prompt.placeholder')"
124118
style="height: 150px"
125119
@submitDialog="submitNegativeDialog"
126120
/>
127121
</el-form-item>
128122
<el-form-item
129123
:label="$t('views.workflow.nodes.aiChatNode.returnContent.label')"
130124
@click.prevent
125+
v-if="[WorkflowMode.Application, WorkflowMode.ApplicationLoop].includes(workflowMode)"
131126
>
132127
<template #label>
133128
<div class="flex align-center">
134129
<div class="mr-4">
135-
<span>{{
136-
$t('views.workflow.nodes.aiChatNode.returnContent.label')
137-
}}</span>
130+
<span>{{ $t('views.workflow.nodes.aiChatNode.returnContent.label') }}</span>
138131
</div>
139132
<el-tooltip effect="dark" placement="right" popper-class="max-w-200">
140133
<template #content>
@@ -161,6 +154,8 @@ import AIModeParamSettingDialog from '@/views/application/component/AIModeParamS
161154
import { t } from '@/locales'
162155
import { useRoute } from 'vue-router'
163156
import { loadSharedApi } from '@/utils/dynamics-api/shared-api'
157+
import { WorkflowMode } from '@/enums/application'
158+
const workflowMode = (inject('workflowMode') as WorkflowMode) || WorkflowMode.Application
164159
const getResourceDetail = inject('getResourceDetail') as any
165160
const route = useRoute()
166161

‎ui/src/workflow/nodes/image-to-video/index.vue‎

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@
1616
prop="model_id"
1717
:rules="{
1818
required: true,
19-
message: $t(
20-
'views.workflow.nodes.imageToVideoGenerate.model.requiredMessage',
21-
),
19+
message: $t('views.workflow.nodes.imageToVideoGenerate.model.requiredMessage'),
2220
trigger: 'change',
2321
}"
2422
>
@@ -48,9 +46,7 @@
4846
:teleported="false"
4947
v-model="form_data.model_id"
5048
@focus="getSelectModel"
51-
:placeholder="
52-
$t('views.workflow.nodes.imageToVideoGenerate.model.requiredMessage')
53-
"
49+
:placeholder="$t('views.workflow.nodes.imageToVideoGenerate.model.requiredMessage')"
5450
:options="modelOptions"
5551
showFooter
5652
:model-type="'ITV'"
@@ -108,21 +104,15 @@
108104
</div>
109105
<el-tooltip effect="dark" placement="right" popper-class="max-w-200">
110106
<template #content
111-
>{{
112-
$t(
113-
'views.workflow.nodes.imageToVideoGenerate.negative_prompt.tooltip',
114-
)
115-
}}
107+
>{{ $t('views.workflow.nodes.imageToVideoGenerate.negative_prompt.tooltip') }}
116108
</template>
117109
<AppIcon iconName="app-warning" class="app-warning-icon"></AppIcon>
118110
</el-tooltip>
119111
</div>
120112
</template>
121113
<MdEditorMagnify
122114
@wheel="wheel"
123-
:title="
124-
$t('views.workflow.nodes.imageToVideoGenerate.negative_prompt.label')
125-
"
115+
:title="$t('views.workflow.nodes.imageToVideoGenerate.negative_prompt.label')"
126116
v-model="form_data.negative_prompt"
127117
:placeholder="
128118
$t('views.workflow.nodes.imageToVideoGenerate.negative_prompt.placeholder')
@@ -136,9 +126,7 @@
136126
:rules="{
137127
type: 'array',
138128
required: true,
139-
message: $t(
140-
'views.workflow.nodes.imageToVideoGenerate.first_frame.requiredMessage',
141-
),
129+
message: $t('views.workflow.nodes.imageToVideoGenerate.first_frame.requiredMessage'),
142130
trigger: 'change',
143131
}"
144132
>
@@ -161,9 +149,7 @@
161149
:rules="{
162150
type: 'array',
163151
required: false,
164-
message: $t(
165-
'views.workflow.nodes.imageToVideoGenerate.last_frame.requiredMessage',
166-
),
152+
message: $t('views.workflow.nodes.imageToVideoGenerate.last_frame.requiredMessage'),
167153
trigger: 'change',
168154
}"
169155
>
@@ -184,13 +170,12 @@
184170
<el-form-item
185171
:label="$t('views.workflow.nodes.aiChatNode.returnContent.label')"
186172
@click.prevent
173+
v-if="[WorkflowMode.Application, WorkflowMode.ApplicationLoop].includes(workflowMode)"
187174
>
188175
<template #label>
189176
<div class="flex align-center">
190177
<div class="mr-4">
191-
<span>{{
192-
$t('views.workflow.nodes.aiChatNode.returnContent.label')
193-
}}</span>
178+
<span>{{ $t('views.workflow.nodes.aiChatNode.returnContent.label') }}</span>
194179
</div>
195180
<el-tooltip effect="dark" placement="right" popper-class="max-w-200">
196181
<template #content>
@@ -218,7 +203,8 @@ import { t } from '@/locales'
218203
import { useRoute } from 'vue-router'
219204
import { loadSharedApi } from '@/utils/dynamics-api/shared-api'
220205
import NodeCascader from '@/workflow/common/NodeCascader.vue'
221-
206+
import { WorkflowMode } from '@/enums/application'
207+
const workflowMode = (inject('workflowMode') as WorkflowMode) || WorkflowMode.Application
222208
const getResourceDetail = inject('getResourceDetail') as any
223209
const route = useRoute()
224210

‎ui/src/workflow/nodes/image-understand/index.vue‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@
1616
prop="model_id"
1717
:rules="{
1818
required: true,
19-
message: $t(
20-
'views.workflow.nodes.imageUnderstandNode.model.requiredMessage',
21-
),
19+
message: $t('views.workflow.nodes.imageUnderstandNode.model.requiredMessage'),
2220
trigger: 'change',
2321
}"
2422
>
@@ -46,9 +44,7 @@
4644
@wheel="wheel"
4745
:teleported="false"
4846
v-model="form_data.model_id"
49-
:placeholder="
50-
$t('views.workflow.nodes.imageUnderstandNode.model.requiredMessage')
51-
"
47+
:placeholder="$t('views.workflow.nodes.imageUnderstandNode.model.requiredMessage')"
5248
:options="modelOptions"
5349
showFooter
5450
:model-type="'IMAGE'"
@@ -143,9 +139,7 @@
143139
:rules="{
144140
type: 'array',
145141
required: true,
146-
message: $t(
147-
'views.workflow.nodes.imageUnderstandNode.image.requiredMessage',
148-
),
142+
message: $t('views.workflow.nodes.imageUnderstandNode.image.requiredMessage'),
149143
trigger: 'change',
150144
}"
151145
>
@@ -157,22 +151,19 @@
157151
ref="nodeCascaderRef"
158152
:nodeModel="nodeModel"
159153
class="w-full"
160-
:placeholder="
161-
$t('views.workflow.nodes.imageUnderstandNode.image.requiredMessage')
162-
"
154+
:placeholder="$t('views.workflow.nodes.imageUnderstandNode.image.requiredMessage')"
163155
v-model="form_data.image_list"
164156
/>
165157
</el-form-item>
166158
<el-form-item
167159
:label="$t('views.workflow.nodes.aiChatNode.returnContent.label')"
168160
@click.prevent
161+
v-if="[WorkflowMode.Application, WorkflowMode.ApplicationLoop].includes(workflowMode)"
169162
>
170163
<template #label>
171164
<div class="flex align-center">
172165
<div class="mr-4">
173-
<span>{{
174-
$t('views.workflow.nodes.aiChatNode.returnContent.label')
175-
}}</span>
166+
<span>{{ $t('views.workflow.nodes.aiChatNode.returnContent.label') }}</span>
176167
</div>
177168
<el-tooltip effect="dark" placement="right" popper-class="max-w-200">
178169
<template #content>
@@ -202,7 +193,8 @@ import { t } from '@/locales'
202193
import { useRoute } from 'vue-router'
203194
import { loadSharedApi } from '@/utils/dynamics-api/shared-api'
204195
import GeneratePromptDialog from '@/views/application/component/GeneratePromptDialog.vue'
205-
196+
import { WorkflowMode } from '@/enums/application'
197+
const workflowMode = (inject('workflowMode') as WorkflowMode) || WorkflowMode.Application
206198
const getResourceDetail = inject('getResourceDetail') as any
207199
const route = useRoute()
208200

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,13 +120,12 @@
120120
<el-form-item
121121
:label="$t('views.workflow.nodes.aiChatNode.returnContent.label')"
122122
@click.prevent
123+
v-if="[WorkflowMode.Application, WorkflowMode.ApplicationLoop].includes(workflowMode)"
123124
>
124125
<template #label>
125126
<div class="flex align-center">
126127
<div class="mr-4">
127-
<span>{{
128-
$t('views.workflow.nodes.aiChatNode.returnContent.label')
129-
}}</span>
128+
<span>{{ $t('views.workflow.nodes.aiChatNode.returnContent.label') }}</span>
130129
</div>
131130
<el-tooltip effect="dark" placement="right" popper-class="max-w-200">
132131
<template #content>
@@ -155,6 +154,8 @@ import { isLastNode } from '@/workflow/common/data'
155154
import { t } from '@/locales'
156155
import { useRoute } from 'vue-router'
157156
import { loadSharedApi } from '@/utils/dynamics-api/shared-api'
157+
import { WorkflowMode } from '@/enums/application'
158+
const workflowMode = (inject('workflowMode') as WorkflowMode) || WorkflowMode.Application
158159
const getResourceDetail = inject('getResourceDetail') as any
159160
const route = useRoute()
160161

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

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,8 @@
1919
size="small"
2020
style="width: 85px"
2121
>
22-
<el-option
23-
:label="$t('views.workflow.variable.Referencing')"
24-
value="referencing"
25-
/>
26-
<el-option
27-
:label="$t('common.custom')"
28-
value="content"
29-
/>
22+
<el-option :label="$t('views.workflow.variable.Referencing')" value="referencing" />
23+
<el-option :label="$t('common.custom')" value="content" />
3024
</el-select>
3125
</div>
3226
</template>
@@ -44,22 +38,19 @@
4438
ref="nodeCascaderRef"
4539
:nodeModel="nodeModel"
4640
class="w-full"
47-
:placeholder="
48-
$t('views.workflow.nodes.searchKnowledgeNode.searchQuestion.placeholder')
49-
"
41+
:placeholder="$t('views.workflow.nodes.searchKnowledgeNode.searchQuestion.placeholder')"
5042
v-model="form_data.fields"
5143
/>
5244
</el-form-item>
5345
<el-form-item
46+
v-if="[WorkflowMode.Application, WorkflowMode.ApplicationLoop].includes(workflowMode)"
5447
:label="$t('views.workflow.nodes.aiChatNode.returnContent.label')"
5548
@click.prevent
5649
>
5750
<template #label>
5851
<div class="flex align-center">
5952
<div class="mr-4">
60-
<span>{{
61-
$t('views.workflow.nodes.aiChatNode.returnContent.label')
62-
}}</span>
53+
<span>{{ $t('views.workflow.nodes.aiChatNode.returnContent.label') }}</span>
6354
</div>
6455
<el-tooltip effect="dark" placement="right" popper-class="max-w-200">
6556
<template #content>
@@ -79,9 +70,10 @@
7970
import { set } from 'lodash'
8071
import NodeContainer from '@/workflow/common/NodeContainer.vue'
8172
import NodeCascader from '@/workflow/common/NodeCascader.vue'
82-
import { ref, computed, onMounted } from 'vue'
73+
import { ref, computed, onMounted, inject } from 'vue'
8374
import { isLastNode } from '@/workflow/common/data'
84-
75+
import { WorkflowMode } from '@/enums/application'
76+
const workflowMode = (inject('workflowMode') as WorkflowMode) || WorkflowMode.Application
8577
const props = defineProps<{ nodeModel: any }>()
8678
8779
const wheel = (e: any) => {
@@ -111,7 +103,7 @@ const form_data = computed({
111103
},
112104
set: (value) => {
113105
set(props.nodeModel.properties, 'node_data', value)
114-
}
106+
},
115107
})
116108
117109
function submitDialog(val: string) {
@@ -123,7 +115,7 @@ const nodeCascaderRef = ref()
123115
const validate = () => {
124116
return Promise.all([
125117
nodeCascaderRef.value ? nodeCascaderRef.value.validate() : Promise.resolve(''),
126-
replyNodeFormRef.value?.validate()
118+
replyNodeFormRef.value?.validate(),
127119
]).catch((err: any) => {
128120
return Promise.reject({ node: props.nodeModel, errMessage: err })
129121
})

‎ui/src/workflow/nodes/speech-to-text-node/index.vue‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,12 @@
8181
<el-form-item
8282
:label="$t('views.workflow.nodes.aiChatNode.returnContent.label')"
8383
@click.prevent
84+
v-if="[WorkflowMode.Application, WorkflowMode.ApplicationLoop].includes(workflowMode)"
8485
>
8586
<template #label>
8687
<div class="flex align-center">
8788
<div class="mr-4">
88-
<span>{{
89-
$t('views.workflow.nodes.aiChatNode.returnContent.label')
90-
}}</span>
89+
<span>{{ $t('views.workflow.nodes.aiChatNode.returnContent.label') }}</span>
9190
</div>
9291
<el-tooltip effect="dark" placement="right" popper-class="max-w-200">
9392
<template #content>
@@ -116,8 +115,10 @@ import { t } from '@/locales'
116115
import { useRoute } from 'vue-router'
117116
import { loadSharedApi } from '@/utils/dynamics-api/shared-api'
118117
import STTModeParamSettingDialog from '@/views/application/component/STTModelParamSettingDialog.vue'
118+
import { WorkflowMode } from '@/enums/application'
119119
const getResourceDetail = inject('getResourceDetail') as any
120120
const route = useRoute()
121+
const workflowMode = (inject('workflowMode') as WorkflowMode) || WorkflowMode.Application
121122
122123
const {
123124
params: { id },

0 commit comments

Comments
 (0)