merged some changes

Author: ChengFai

.gitignore

@@ -12,6 +12,7 @@ XAgentServer/logs/
 XAgentServer/prod_server_envs.py
 
 XAgentWeb/node_modules
+**/node_modules/
 XAgentWeb/dist
 
 .DS_Store

XAgentWeb/index.html

@@ -10,14 +10,14 @@
   <title>
     XAgent
   </title>
-  <script defer src="/third/notebook-js/vendor/es5-shim.min.js"></script>
-  <script defer src="/third/notebook-js/vendor/marked.min.js"></script>
-  <script defer src="/third/notebook-js/vendor/purify.min.js"></script>
-  <script defer src="/third/notebook-js/vendor/ansi_up.min.js"></script>
-  <script defer src="/third/notebook-js/vendor/prism.min.js"></script>
-  <script defer src="/third/notebook-js/vendor/katex.min.js"></script>
-  <script defer src="/third/notebook-js/vendor/katex-auto-render.min.js"></script>
-  <script defer src="/third/notebook-js/vendor/notebook.min.js"></script>
+  <script  src="/third/notebook-js/vendor/es5-shim.min.js"></script>
+  <script  src="/third/notebook-js/vendor/marked.min.js"></script>
+  <script  src="/third/notebook-js/vendor/purify.min.js"></script>
+  <script  src="/third/notebook-js/vendor/ansi_up.min.js"></script>
+  <script  src="/third/notebook-js/vendor/prism.min.js"></script>
+  <script  src="/third/notebook-js/vendor/katex.min.js"></script>
+  <script  src="/third/notebook-js/vendor/katex-auto-render.min.js"></script>
+  <script  src="/third/notebook-js/vendor/notebook.min.js"></script>
   <link rel="stylesheet" href="/third/notebook-js/styles/vendor/katex.min.css" />
   <link rel="stylesheet" href="/third/notebook-js/styles/vendor/prism.css" />
   <link rel="stylesheet" href="/third/notebook-js/styles/notebook.css" />

XAgentWeb/src/composables/useApi.ts

@@ -35,7 +35,6 @@ httpService.interceptors.response.use(
   (res: AxiosResponse) => {
     const authStore = useAuthStore()
     const userStore = useUserStore()
-    const router = useRouter()
     // 1009 无效token 1005 用户不存在  1008 无效的token 1017用户不存在
     if ( res.status === 401
       // unauthorized
@@ -45,9 +44,8 @@ httpService.interceptors.response.use(
       // res?.data?.code === 1017 || 
       // res?.data?.code === 1018
     ) {
-      authStore.clearLoginState()
-      userStore.clearUserInfo()
-      router.push('/login')
+      authStore.clearLoginState();
+      userStore.clearUserInfo();
     }
     return res?.data
   },

XAgentWeb/src/views/playground/chat.vue

@@ -125,8 +125,6 @@ import throttle from '/@/utils/throttle'
 import Tab from './components/Tab.vue'
 import WorkSpace from './components/WorkSpace.vue'
 
-const { proxy: global_instance } = getCurrentInstance() as any
-
 const route = useRoute()
 const router = useRouter()
 const taskStore = useTaskStore()
@@ -179,7 +177,7 @@ let pageMode = computed(() => {
     }
   }
   return route.query.mode as string || '';
-}); // Redirected from other page, playback, review, or start a new conversation
+}); // 从其他页面跳转进来，是回放模式 还是浏览模式 还是开启一个新对话
 
 
 if(pageMode.value === "recorder") {
@@ -549,7 +547,7 @@ const newTalkConnection = () => {
   }
 }
 
-// Input answer
+// 输入回答
 const sendMessage = async (val: string) => {
   if (!val) return
   chatMsgInfoStore.setCurrentInput(val)
@@ -966,7 +964,7 @@ const wormText = (params: IChatRequest, {tasks, costTime, msgId }: {tasks: any;
       costTimeMilli: costTime,
       subTasks: [],
       isLatest: true
-      // Is the current inner the latest message
+      // 当前的inenr是不是最新的那条信息
     }
     chatMsgInfo.value.forEach((item) => {
       item.isLatest = false
@@ -986,7 +984,7 @@ const wormText = (params: IChatRequest, {tasks, costTime, msgId }: {tasks: any;
 }
 
 
-// Regenerate the message
+// 执行重新生成操作
 const regenerate = () => {
   const input = currentInput.value
   sendMessage(input)

XAgentWeb/src/views/playground/components/HistorySidebar.vue

@@ -173,6 +173,12 @@ const isBetaUser = computed(() => true)
 
 
 
+const {
+  userInfo: userInfo
+} = storeToRefs(userStore)
+
+const isBetaUser = true;
+
 const { isRequestingAi } = storeToRefs(chatMsgInfoStore)
 const emits = defineEmits<{ (e: 'createTalk'): void; (e: 'clear'): void }>();
 

XAgentWeb/src/views/playground/components/SubmitSubtaskInfo.vue

@@ -112,7 +112,6 @@
                     :value="viewedCodeStr" 
                     :isShowLineNum="showLineNum"
                 />
-
                 <template v-slot:footer>
                     <el-button 
                         type="primary"

XAgentWeb/src/views/playground/components/WorkSpace.vue

@@ -50,7 +50,7 @@
 
 <script setup lang="ts">
 
-import { ref, onMounted } from 'vue'
+import { ref, onMounted, toRefs } from 'vue'
 import CodeViewer from './CodeViewer.vue'
 import PythonNotebookViewer from './PythonNotebookViewer.vue'
 import ImagesViewer from './ImagesViewer.vue'