diff --git a/src/components/Canvas/FlowCanvas/index.vue b/src/components/Canvas/FlowCanvas/index.vue index 67d9108..fd5c39c 100644 --- a/src/components/Canvas/FlowCanvas/index.vue +++ b/src/components/Canvas/FlowCanvas/index.vue @@ -18,16 +18,19 @@ const {t:$t} = useI18n() const open = async (options) => { let json = [] + let isGetJson = false await new Promise((resolve) => { getSketchFlowCanvas({ id: options.imgId },true).then((res:any) => { if (res) { json = JSON.parse(res) } + isGetJson = true resolve(true) }).catch(() => { - resolve(true) + resolve(false) }) }) + if(!isGetJson)return config.value = options || {} config.value.json = json dialogVisible.value = true diff --git a/src/views/home/agent/components/Agent.vue b/src/views/home/agent/components/Agent.vue index 40fdc23..b8223a3 100644 --- a/src/views/home/agent/components/Agent.vue +++ b/src/views/home/agent/components/Agent.vue @@ -187,7 +187,7 @@ isPaused.value = false isGenerating.value = true params.message = message.text - if (message.hasOwnProperty('useReport')) { + if (Object.prototype.hasOwnProperty.call(message, 'useReport')) { params.useReport = message.useReport } @@ -589,7 +589,7 @@ thinkingText: combinedThinkingText, text: combinedContent, image_url: combinedImageUrl, - webAddress: !!webAddress ? JSON.parse(webAddress) : null, + webAddress: webAddress ? JSON.parse(webAddress) : null, isUser: false, id: result.length + 1, sessionId: sessionId @@ -688,7 +688,8 @@ } defineExpose({ - setChatInfo + setChatInfo, + isGenerating }) diff --git a/src/views/home/agent/components/Preview.vue b/src/views/home/agent/components/Preview.vue index d1e4632..43bb673 100644 --- a/src/views/home/agent/components/Preview.vue +++ b/src/views/home/agent/components/Preview.vue @@ -6,7 +6,7 @@ >