Skip to content

Commit 6a84537

Browse files
zhanweizhang7zhanweizhang7
committed
fix: Nodecascader of model reference
1 parent 11ed8b8 commit 6a84537

File tree

5 files changed

+40
-31
lines changed

5 files changed

+40
-31
lines changed

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

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@
2727
<div class="flex-between w-full">
2828
<div>
2929
<span
30-
>{{
31-
t('workflow.nodes.imageUnderstandNode.model.label')
30+
>{{ t('workflow.nodes.imageUnderstandNode.model.label')
3231
}}<span class="color-danger">*</span></span
3332
>
3433
</div>
@@ -68,7 +67,7 @@
6867
</div>
6968
<NodeCascader
7069
v-else
71-
ref="nodeCascaderRef"
70+
ref="modelCascaderRef"
7271
:nodeModel="nodeModel"
7372
class="w-full"
7473
:placeholder="$t('workflow.variable.placeholder')"
@@ -120,8 +119,7 @@
120119
<div class="flex align-center">
121120
<div class="mr-4">
122121
<span
123-
>{{
124-
$t('views.application.form.prompt.label')
122+
>{{ $t('views.application.form.prompt.label')
125123
}}<span class="color-danger">*</span></span
126124
>
127125
</div>
@@ -159,8 +157,8 @@
159157
style="width: 100px"
160158
:teleported="false"
161159
>
162-
<el-option :label="$t('workflow.node')" value="NODE"/>
163-
<el-option :label="$t('workflow.workflow')" value="WORKFLOW"/>
160+
<el-option :label="$t('workflow.node')" value="NODE" />
161+
<el-option :label="$t('workflow.workflow')" value="WORKFLOW" />
164162
</el-select>
165163
</div>
166164
</template>
@@ -184,8 +182,7 @@
184182
}"
185183
>
186184
<template #label
187-
>{{
188-
$t('workflow.nodes.imageUnderstandNode.image.label')
185+
>{{ $t('workflow.nodes.imageUnderstandNode.image.label')
189186
}}<span class="color-danger">*</span></template
190187
>
191188
<NodeCascader
@@ -246,33 +243,32 @@
246243
</el-tooltip>
247244
</div>
248245
</template>
249-
<el-switch size="small" v-model="form_data.is_result"/>
246+
<el-switch size="small" v-model="form_data.is_result" />
250247
</el-form-item>
251248
</el-form>
252249
</el-card>
253-
<AIModeParamSettingDialog ref="AIModeParamSettingDialogRef" @refresh="refreshParam"/>
250+
<AIModeParamSettingDialog ref="AIModeParamSettingDialogRef" @refresh="refreshParam" />
254251
<ReasoningParamSettingDialog
255252
ref="ReasoningParamSettingDialogRef"
256253
@refresh="submitReasoningDialog"
257254
/>
258-
<GeneratePromptDialog @replace="replace" ref="GeneratePromptDialogRef"/>
255+
<GeneratePromptDialog @replace="replace" ref="GeneratePromptDialogRef" />
259256
</NodeContainer>
260257
</template>
261258

262259
<script setup lang="ts">
263260
import NodeContainer from '@/workflow/common/NodeContainer.vue'
264-
import {computed, onMounted, ref, inject} from 'vue'
265-
import {cloneDeep, groupBy, set} from 'lodash'
261+
import { computed, onMounted, ref, inject } from 'vue'
262+
import { cloneDeep, groupBy, set } from 'lodash'
266263
import NodeCascader from '@/workflow/common/NodeCascader.vue'
267-
import type {FormInstance} from 'element-plus'
264+
import type { FormInstance } from 'element-plus'
268265
import AIModeParamSettingDialog from '@/views/application/component/AIModeParamSettingDialog.vue'
269-
import {t} from '@/locales'
270-
import {useRoute} from 'vue-router'
271-
import {loadSharedApi} from '@/utils/dynamics-api/shared-api'
266+
import { t } from '@/locales'
267+
import { useRoute } from 'vue-router'
268+
import { loadSharedApi } from '@/utils/dynamics-api/shared-api'
272269
import GeneratePromptDialog from '@/views/application/component/GeneratePromptDialog.vue'
273-
import {WorkflowMode} from '@/enums/application'
274-
import ReasoningParamSettingDialog
275-
from "@/views/application/component/ReasoningParamSettingDialog.vue";
270+
import { WorkflowMode } from '@/enums/application'
271+
import ReasoningParamSettingDialog from '@/views/application/component/ReasoningParamSettingDialog.vue'
276272
277273
const workflowMode = (inject('workflowMode') as WorkflowMode) || WorkflowMode.Application
278274
const getResourceDetail = inject('getResourceDetail') as any
@@ -282,7 +278,7 @@ const openReasoningParamSettingDialog = () => {
282278
ReasoningParamSettingDialogRef.value?.open(form_data.value.model_setting)
283279
}
284280
const {
285-
params: {id},
281+
params: { id },
286282
} = route as any
287283
288284
const apiType = computed(() => {
@@ -301,12 +297,15 @@ const AIModeParamSettingDialogRef = ref<InstanceType<typeof AIModeParamSettingDi
301297
302298
const aiChatNodeFormRef = ref<FormInstance>()
303299
const nodeCascaderRef = ref()
300+
const modelCascaderRef = ref()
301+
304302
const validate = () => {
305303
return Promise.all([
306304
nodeCascaderRef.value ? nodeCascaderRef.value.validate() : Promise.resolve(''),
305+
modelCascaderRef.value ? modelCascaderRef.value.validate() : Promise.resolve(''),
307306
aiChatNodeFormRef.value?.validate(),
308307
]).catch((err: any) => {
309-
return Promise.reject({node: props.nodeModel, errMessage: err})
308+
return Promise.reject({ node: props.nodeModel, errMessage: err })
310309
})
311310
}
312311

‎ui/src/workflow/nodes/intent-classify-node/index.vue‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
</div>
7070
<NodeCascader
7171
v-else
72-
ref="nodeCascaderRef"
72+
ref="modelCascaderRef"
7373
:nodeModel="nodeModel"
7474
class="w-full"
7575
:placeholder="$t('workflow.variable.placeholder')"
@@ -357,10 +357,12 @@ const props = defineProps<{ nodeModel: any }>()
357357
358358
const IntentClassifyNodeFormRef = ref<FormInstance>()
359359
const modelOptions = ref<any>(null)
360+
const modelCascaderRef = ref()
360361
361362
const validate = () => {
362363
return Promise.all([
363364
nodeCascaderRef.value ? nodeCascaderRef.value.validate() : Promise.resolve(''),
365+
modelCascaderRef.value ? modelCascaderRef.value.validate() : Promise.resolve(''),
364366
IntentClassifyNodeFormRef.value?.validate(),
365367
])
366368
.then(() => {

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
</div>
6767
<NodeCascader
6868
v-else
69-
ref="nodeCascaderRef"
69+
ref="modelCascaderRef"
7070
:nodeModel="nodeModel"
7171
class="w-full"
7272
:placeholder="$t('workflow.variable.placeholder')"
@@ -169,10 +169,13 @@ const modelOptions = ref<any>(null)
169169
const STTModeParamSettingDialogRef = ref<InstanceType<typeof STTModeParamSettingDialog>>()
170170
171171
const aiChatNodeFormRef = ref<FormInstance>()
172+
const modelCascaderRef = ref()
173+
172174
const nodeCascaderRef = ref()
173175
const validate = () => {
174176
return Promise.all([
175177
nodeCascaderRef.value ? nodeCascaderRef.value.validate() : Promise.resolve(''),
178+
modelCascaderRef.value ? modelCascaderRef.value.validate() : Promise.resolve(''),
176179
aiChatNodeFormRef.value?.validate(),
177180
]).catch((err: any) => {
178181
return Promise.reject({ node: props.nodeModel, errMessage: err })

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
</div>
6666
<NodeCascader
6767
v-else
68-
ref="nodeCascaderRef"
68+
ref="modelCascaderRef"
6969
:nodeModel="nodeModel"
7070
class="w-full"
7171
:placeholder="$t('workflow.variable.placeholder')"
@@ -168,10 +168,13 @@ const TTSModeParamSettingDialogRef = ref<InstanceType<typeof TTSModeParamSetting
168168
const modelOptions = ref<any>(null)
169169
170170
const aiChatNodeFormRef = ref<FormInstance>()
171+
const modelCascaderRef = ref()
172+
171173
const nodeCascaderRef = ref()
172174
const validate = () => {
173175
return Promise.all([
174176
nodeCascaderRef.value ? nodeCascaderRef.value.validate() : Promise.resolve(''),
177+
modelCascaderRef.value ? modelCascaderRef.value.validate() : Promise.resolve(''),
175178
aiChatNodeFormRef.value?.validate(),
176179
]).catch((err: any) => {
177180
return Promise.reject({ node: props.nodeModel, errMessage: err })

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
</div>
6868
<NodeCascader
6969
v-else
70-
ref="nodeCascaderRef"
70+
ref="modelCascaderRef"
7171
:nodeModel="nodeModel"
7272
class="w-full"
7373
:placeholder="$t('workflow.variable.placeholder')"
@@ -247,7 +247,7 @@
247247
</el-form>
248248
</el-card>
249249
<AIModeParamSettingDialog ref="AIModeParamSettingDialogRef" @refresh="refreshParam" />
250-
<ReasoningParamSettingDialog
250+
<ReasoningParamSettingDialog
251251
ref="ReasoningParamSettingDialogRef"
252252
@refresh="submitReasoningDialog"
253253
/>
@@ -258,7 +258,7 @@
258258
<script setup lang="ts">
259259
import NodeContainer from '@/workflow/common/NodeContainer.vue'
260260
import { computed, onMounted, ref, inject } from 'vue'
261-
import {cloneDeep, groupBy, set} from 'lodash'
261+
import { cloneDeep, groupBy, set } from 'lodash'
262262
import NodeCascader from '@/workflow/common/NodeCascader.vue'
263263
import type { FormInstance } from 'element-plus'
264264
import AIModeParamSettingDialog from '@/views/application/component/AIModeParamSettingDialog.vue'
@@ -267,8 +267,7 @@ import { useRoute } from 'vue-router'
267267
import { loadSharedApi } from '@/utils/dynamics-api/shared-api'
268268
import GeneratePromptDialog from '@/views/application/component/GeneratePromptDialog.vue'
269269
import { WorkflowMode } from '@/enums/application'
270-
import ReasoningParamSettingDialog
271-
from "@/views/application/component/ReasoningParamSettingDialog.vue";
270+
import ReasoningParamSettingDialog from '@/views/application/component/ReasoningParamSettingDialog.vue'
272271
const workflowMode = (inject('workflowMode') as WorkflowMode) || WorkflowMode.Application
273272
const getResourceDetail = inject('getResourceDetail') as any
274273
const route = useRoute()
@@ -297,9 +296,12 @@ const AIModeParamSettingDialogRef = ref<InstanceType<typeof AIModeParamSettingDi
297296
298297
const aiChatNodeFormRef = ref<FormInstance>()
299298
const nodeCascaderRef = ref()
299+
const modelCascaderRef = ref()
300+
300301
const validate = () => {
301302
return Promise.all([
302303
nodeCascaderRef.value ? nodeCascaderRef.value.validate() : Promise.resolve(''),
304+
modelCascaderRef.value ? modelCascaderRef.value.validate() : Promise.resolve(''),
303305
aiChatNodeFormRef.value?.validate(),
304306
]).catch((err: any) => {
305307
return Promise.reject({ node: props.nodeModel, errMessage: err })

0 commit comments

Comments
 (0)