diff --git a/src/components/Upload/index.vue b/src/components/Upload/index.vue
index 41f12c1193580b21a55e303563af202fb9887f94..6c1bb4391e467217efc2e6bf78b14c5e6d5d7e81 100644
--- a/src/components/Upload/index.vue
+++ b/src/components/Upload/index.vue
@@ -6,7 +6,7 @@ import { IconUpload, IconVisible, IconDelete, IconCaretRight } from '@computing/
import type { UploadFile, ElUploadProgressEvent, ElFile } from 'element-plus/es/components/upload/src/upload.type';
import { Codemirror } from 'vue-codemirror';
import { api } from 'src/apis';
-import { successMsg } from 'src/components/Message';
+import { errorMsg, successMsg } from 'src/components/Message';
const handleCreateapi = () => {
api
@@ -17,7 +17,10 @@ const handleCreateapi = () => {
.then(res => {
getServiceJson.value = res[1].result.apis;
uploadtype.value = 'get';
- });
+ }).catch(err=>{
+ errorMsg('解析失败');
+ })
+ ;
};
const props = defineProps({
diff --git a/src/store/conversation.ts b/src/store/conversation.ts
index c0aa626e8ee8ab97d1a0238f9af0fc3c3cfcc6ae..23d70620e23d7865fb518e7d86cffc23054192b6 100644
--- a/src/store/conversation.ts
+++ b/src/store/conversation.ts
@@ -233,7 +233,6 @@ export const useSessionStore = defineStore('conversation', () => {
break;
}
const { done, value } = await reader.read();
- console.log(value, 'value')
const decodedValue = decoder.decode(value, { stream: true });
const isLegal = judgeMessage(answerIndex, decodedValue);
if (!isLegal) {
diff --git a/src/views/api/index.vue b/src/views/api/index.vue
index db1f53e9debc88770a60d724e71bae5b7b151cb6..934f969224817435f0dee2155553ccc4ea57e68b 100644
--- a/src/views/api/index.vue
+++ b/src/views/api/index.vue
@@ -90,7 +90,7 @@
-
+
diff --git a/src/views/app/index.vue b/src/views/app/index.vue
index 0c9b11a76939b28f8cd27642dcba3539f99e384c..826698d899a34b2ec7bb1513f4410ea1be188f78 100644
--- a/src/views/app/index.vue
+++ b/src/views/app/index.vue
@@ -145,7 +145,8 @@ const handleCreateApp = () => {
const routerToDetail = appItem => {
if (!appItem.published) {
- return;
+ //调试时注释
+ // return;
}
//获取appItem.id & appItem.name
router.push(`/copilot?appId=${appItem.appId}&name=${appItem.name}`);
diff --git a/src/views/createapp/components/appConfig.vue b/src/views/createapp/components/appConfig.vue
index e791b7e5eee5573ff2e6bf69b54ff8c318f08a97..2eae57f1bf13f3c38cdebc9e35668f93928146db 100644
--- a/src/views/createapp/components/appConfig.vue
+++ b/src/views/createapp/components/appConfig.vue
@@ -8,6 +8,7 @@ import { useRoute } from 'vue-router';
import { api } from 'src/apis';
import { ElMessage } from 'element-plus';
import { fa } from 'element-plus/es/locale';
+import AppInitalPreview from 'src/views/dialogue/components/AppInitalPreview.vue';
const activeName = ref([1, 2, 3]);
const activeNames = ref([1, 2, 3]);
const route = useRoute();
@@ -358,7 +359,8 @@ defineExpose({
界面预览
diff --git a/src/views/createapp/components/workFlowDebug.vue b/src/views/createapp/components/workFlowDebug.vue
index db54ce4cba3db1d2792f0d3c85a74a01cf083ff6..45ddab5f9753d16879016e3d5aa935932bc11334 100644
--- a/src/views/createapp/components/workFlowDebug.vue
+++ b/src/views/createapp/components/workFlowDebug.vue
@@ -112,7 +112,6 @@ const handleSendMessage = async (groupId: string | undefined, question: string,
const len = conversationList.value.length;
if (len > 0 && !(conversationList.value[len - 1] as RobotConversationItem).isFinish) return;
dialogueInput.value = '';
- // console.log(!currentSelectedSession.value, 'currentSelectedSession')
if (!tmpConversationId.value) {
const res = await generateSessionDebug({ debug: true });
tmpConversationId.value = res || 1;
diff --git a/src/views/dialogue/Copilot.vue b/src/views/dialogue/Copilot.vue
index 2f612d67f03258ef74cd51475925ebd2772c2c84..628fead81dbaca53abfe23f7e0e6a674a71703c6 100644
--- a/src/views/dialogue/Copilot.vue
+++ b/src/views/dialogue/Copilot.vue
@@ -1,20 +1,13 @@
+
\ No newline at end of file
diff --git a/src/views/dialogue/components/DialogueAside.vue b/src/views/dialogue/components/DialogueAside.vue
index 5ad58898bb78e9982fda755e71c0df0c4368c675..784b630261234181d38482fab9725007399e129c 100644
--- a/src/views/dialogue/components/DialogueAside.vue
+++ b/src/views/dialogue/components/DialogueAside.vue
@@ -21,6 +21,7 @@ import i18n from 'src/i18n';
import appIcon from '@/assets/images/app.png'
import { IconChevronUp } from '@computing/opendesign-icons';
import { onMounted } from 'vue';
+import { appendFile } from 'fs';
const { user_selected_app } = storeToRefs(useHistorySessionStore());
interface HistorySession {
@@ -217,12 +218,16 @@ const toggleCollapse = () => {
isCollapsed.value = !isCollapsed.value;
};
-const selectApp = id => {
+const selectApp = (id) => {
if(selectedAppId.value === id) {
selectedAppId.value = "";
+ user_selected_app.value = [''];
+ app.value.selectedAppId = '';
}else{
selectedAppId.value = id;
user_selected_app.value =[id];
+ // app.value.appId = id;
+ app.value.selectedAppId = id;
}
};
function ensureAppAtFirstPosition() {
@@ -241,24 +246,6 @@ function ensureAppAtFirstPosition() {
user_selected_app.value = [app.value.appId];
}
-onMounted(async() => {
- //获取 top5 list
- // const [_, res] = await api.getTopFiveApp(5);
- // if (res?.result) {
- // appList.value = res.result.applications;
- // apps.value = res.result.applications;
- // }
- // // if(_ && res){
- // // appList.value = res.result.applications;
- // // apps.value = res.result.applications;
- // // }
- // // else {
- // // appList.value = apps.value;
- // // }
- // if(app.value.appId){
- // selectedAppId.value = app.value.appId;
- // }
-});
const getAppsValue = async () => {
//获取 top5 list
@@ -276,8 +263,8 @@ const [_, res] = await api.getTopFiveApp(5);
// }
if(app.value.appId){
selectedAppId.value = app.value.appId;
+ app.value.selectedAppId = app.value.appId;
}
-
ensureAppAtFirstPosition();
}
@@ -290,6 +277,7 @@ watch(
immediate: true,
},
);
+
@@ -311,12 +299,12 @@ watch(
-
- {{ app.name }}
+ {{ apps.name }}
diff --git a/src/views/dialogue/components/DialogueSession.vue b/src/views/dialogue/components/DialogueSession.vue
index 31b48dd4b705c8f924f39311d4ff759771fe83f4..65438d3e6290533267d3f8fb2f25f48648b60e6f 100644
--- a/src/views/dialogue/components/DialogueSession.vue
+++ b/src/views/dialogue/components/DialogueSession.vue
@@ -24,18 +24,18 @@ export interface DialogueSession {
}
const props = withDefaults(defineProps(), {});
-// const props = withDefaults(defineProps<{
-// createAppForm: any,
-// }>(), {});
+
enum SupportMap {
support = 1,
against = 0,
}
-// const dialogueRef = ref();
+const Form = ref(props.createAppForm);
+const AppForm = ref(props.createAppForm);
const { pausedStream} = useSessionStore();
const themeStore = useChangeThemeStore();
const isCreateApp = ref(props?.isCreateApp);
// const isCreateApp = ref(true);
+const { app } = storeToRefs(useSessionStore());
const questions = [
{
groupId: 0,
@@ -293,6 +293,8 @@ const isAllowToSend = computed(() => {
return defaultStatus;
});
+
+
// 会话切换时
watch(currentSelectedSession, async newVal => {
if (!newVal) return;
@@ -578,16 +580,12 @@ const clearSuggestion = (index: number): void => {
};
onMounted(() => {
- // 全局数据初始化
- // getMode();
- // isCreateApp.value = props.isCreateApp;
+ // 数据初始化
+ AppForm.value = props.createAppForm;
if (!inputRef.value) return;
inputRef.value.focus();
});
-watch(() => props.createAppForm, () => {
-}, {deep: true, immediate: true})
-
watch(selectMode, (newValue, oldValue) => {
user_selected_app.value = [];
let first = true;
@@ -650,6 +648,51 @@ const handlePauseAndReGenerate = (cid?: number) => {
// 停止生成handlePauseAndReGenerate
pausedStream(cid);
};
+
+const getappMode = (appId: string) => {
+ api
+ .querySingleAppData({
+ id: appId as string,
+ })
+ .then(res => {
+ const appInfo = res?.[1]?.result;
+ if (appInfo) {
+ Form.value = {
+ icon: appInfo?.icon,
+ name: appInfo?.name,
+ description: appInfo?.description,
+ links: appInfo?.links?.map(item => item.url),
+ recommendedQuestions: appInfo?.recommendedQuestions,
+ dialogRounds: appInfo?.dialogRounds,
+ permission: {
+ visibility: appInfo?.permission?.visibility,
+ authorizedUsers: appInfo?.permission?.authorizedUsers,
+ },
+ };
+ }
+ });
+ };
+
+watch(() => user_selected_app, (val) => {
+ if(user_selected_app.value[0] && !isCreateApp.value){
+ getappMode(user_selected_app.value[0]);
+ }
+ if(!isCreateApp.value){
+ Form.value = props.createAppForm;
+ }
+},{
+ immediate: true,
+ deep: true
+})
+
+watch(() => isCreateApp, (val) => {
+ if(isCreateApp.value === true){
+ AppForm.value = props.createAppForm;
+ }
+},{
+ immediate: true,
+ deep: true
+})
@@ -685,12 +728,12 @@ const handlePauseAndReGenerate = (cid?: number) => {
@handleSendMessage="handleSendMessage"
@clearSuggestion="clearSuggestion(index)"
/>
-
-
diff --git a/src/views/dialogue/components/InterPreview.vue b/src/views/dialogue/components/InterPreview.vue
index 5944c56846ccf965b09330e3d55cbc6c94eda06f..8ef4d284abba255edf2008ea693f6a5c7b316ce6 100644
--- a/src/views/dialogue/components/InterPreview.vue
+++ b/src/views/dialogue/components/InterPreview.vue
@@ -19,11 +19,11 @@
>
-
你好,我是
-
+
你好,我是
+
{{ interPreviewInfo.name }}
-
-
,很高兴为你服务
+
+ ,很高兴为你服务