@ibiz-template/vue3-components 0.7.41-alpha.153 → 0.7.41-alpha.154

package/es/util/ai-chat-util/ai-chat-util.mjs

@@ -253,8 +253,15 @@ class AIChatUtil {
     }
     const sessionid = this.getChatSessionId("TEMP");
     chatOptions.sessionid = sessionid;
-    let id = "";
-    let abortController;
+    const chatStateMap = /* @__PURE__ */ new WeakMap();
+    const getChatState = (aiChat) => {
+      let state = chatStateMap.get(aiChat);
+      if (!state) {
+        state = { id: "", abortController: new AbortController() };
+        chatStateMap.set(aiChat, state);
+      }
+      return state;
+    };
     const { chatInstance, view, ctrl } = args;
     let filePreviewMode = ibiz.config.common.aiFilePreviewMode;
     if (editorParams.srfaifilepreviewmode) {
@@ -323,8 +330,10 @@ class AIChatUtil {
     };
     chatOptions.question = async (aiChat, ctx, param, other, arr, sessionid2, srfaiagent, srfmode, srfscope, srfknowledgebases, srfaiagentconfig, appendcurdata, mcpservers, sessionmeta, srfproject, localMsgID) => {
       let updateFlag = true;
-      id = createUUID();
-      abortController = new AbortController();
+      const state = getChatState(aiChat);
+      state.id = createUUID();
+      state.abortController = new AbortController();
+      const { id, abortController } = state;
       const deService = await ibiz.hub.getApp(ctx.srfappid).deService.getService(ctx, other.appDataEntityId);
       try {
         const questionRequestData = {
@@ -446,6 +455,7 @@ class AIChatUtil {
       }
     };
     chatOptions.abortQuestion = async (aiChat, ctx, param, other) => {
+      const { id, abortController } = getChatState(aiChat);
       abortController == null ? void 0 : abortController.abort();
       const asyncacitonid = aiChat.getActiveAsyncacitonId();
       if (asyncacitonid) {
@@ -480,8 +490,10 @@ class AIChatUtil {
     };
     chatOptions.resumeQuestion = async (aiChat, ctx, param, other, arr) => {
       if (other.asyncacitonid) {
-        id = createUUID();
-        abortController = new AbortController();
+        const state = getChatState(aiChat);
+        state.id = createUUID();
+        state.abortController = new AbortController();
+        const { id, abortController } = state;
         const deService = await ibiz.hub.getApp(ctx.srfappid).deService.getService(ctx, other.appDataEntityId);
         const resumeRequestData = { asyncacitonid: other.asyncacitonid };
         if (other.sessionid) {
@@ -499,11 +511,9 @@ class AIChatUtil {
             srfproject: other.srfproject
           });
         try {
-          aiChat.addWaitingMessage(id);
           await deService.aiResumeSse(
             (msg) => {
               if (msg.actionstate === 20 && msg.actionresult) {
-                aiChat.removeWaitingMessage(id);
                 aiChat.isLoading.value = true;
                 if (!aiChat.getActiveAsyncacitonId()) {
                   aiChat.setActiveAsyncacitonId(msg.asyncacitonid);
@@ -573,7 +583,6 @@ class AIChatUtil {
           }
           abortController == null ? void 0 : abortController.abort();
         } finally {
-          aiChat.removeWaitingMessage(id);
           aiChat.isLoading.value = false;
           aiChat.completeMessage(id, true);
           aiChat.setActiveAsyncacitonId("");
@@ -733,7 +742,7 @@ class AIChatUtil {
     chatOptions.uploader.maxSize = uploadMaxSize;
     chatOptions.extendToolbarClick = async (event, source, context2, params2, data2) => {
       var _a2, _b, _c;
-      const { id: id2, isPluginApp } = source;
+      const { id, isPluginApp } = source;
       let appId = source.appId;
       const tempContext = IBizContext.create(context2);
       if (isPluginApp) {
@@ -748,7 +757,7 @@ class AIChatUtil {
         }
       }
       const result = await UIActionUtil.exec(
-        id2,
+        id,
         {
           view,
           ctrl,
@@ -1066,8 +1075,15 @@ class AIChatUtil {
       chatOptions.questionToolbarItems = questionToolbarItems;
       chatOptions.otherToolbarItems = otherToolbarItems;
     }
-    let id = "";
-    let abortController;
+    const chatStateMap = /* @__PURE__ */ new WeakMap();
+    const getChatState = (aiChat) => {
+      let state = chatStateMap.get(aiChat);
+      if (!state) {
+        state = { id: "", abortController: new AbortController() };
+        chatStateMap.set(aiChat, state);
+      }
+      return state;
+    };
     const { chatInstance, view, ctrl } = args;
     let filePreviewMode = ibiz.config.common.aiFilePreviewMode;
     if (params.hasOwnProperty("srfaifilepreviewmode")) {
@@ -1137,8 +1153,10 @@ class AIChatUtil {
     };
     chatOptions.question = async (aiChat, ctx, param, other, arr, sessionid, srfaiagent, srfmode, srfscope, srfknowledgebases, srfaiagentconfig, appendcurdata, mcpservers, sessionmeta, srfproject, localMsgID) => {
       let updateFlag = true;
-      id = createUUID();
-      abortController = new AbortController();
+      const state = getChatState(aiChat);
+      state.id = createUUID();
+      state.abortController = new AbortController();
+      const { id, abortController } = state;
       const deService = await ibiz.hub.getApp(ctx.srfappid).deService.getService(ctx, other.appDataEntityId);
       try {
         const questionRequestData = {
@@ -1258,6 +1276,7 @@ class AIChatUtil {
       }
     };
     chatOptions.abortQuestion = async (aiChat, ctx, param, other) => {
+      const { id, abortController } = getChatState(aiChat);
       abortController == null ? void 0 : abortController.abort();
       const asyncacitonid = aiChat.getActiveAsyncacitonId();
       if (asyncacitonid) {
@@ -1292,8 +1311,10 @@ class AIChatUtil {
     };
     chatOptions.resumeQuestion = async (aiChat, ctx, param, other, arr) => {
       if (other.asyncacitonid) {
-        id = createUUID();
-        abortController = new AbortController();
+        const state = getChatState(aiChat);
+        state.id = createUUID();
+        state.abortController = new AbortController();
+        const { id, abortController } = state;
         const deService = await ibiz.hub.getApp(ctx.srfappid).deService.getService(ctx, other.appDataEntityId);
         const resumeRequestData = { asyncacitonid: other.asyncacitonid };
         if (other.sessionid) {
@@ -1311,11 +1332,9 @@ class AIChatUtil {
             srfproject: other.srfproject
           });
         try {
-          aiChat.addWaitingMessage(id);
           await deService.aiResumeSse(
             (msg) => {
               if (msg.actionstate === 20 && msg.actionresult) {
-                aiChat.removeWaitingMessage(id);
                 aiChat.isLoading.value = true;
                 if (!aiChat.getActiveAsyncacitonId()) {
                   aiChat.setActiveAsyncacitonId(msg.asyncacitonid);
@@ -1385,7 +1404,6 @@ class AIChatUtil {
           }
           abortController == null ? void 0 : abortController.abort();
         } finally {
-          aiChat.removeWaitingMessage(id);
           aiChat.isLoading.value = false;
           aiChat.completeMessage(id, true);
           aiChat.setActiveAsyncacitonId("");
@@ -1547,7 +1565,7 @@ class AIChatUtil {
     chatOptions.uploader.maxSize = uploadMaxSize;
     chatOptions.extendToolbarClick = async (event, source, context2, params2, data2) => {
       var _a2, _b, _c;
-      const { id: id2, isPluginApp } = source;
+      const { id, isPluginApp } = source;
       let appId = source.appId;
       const tempContext = IBizContext.create(context2);
       if (isPluginApp) {
@@ -1562,7 +1580,7 @@ class AIChatUtil {
         }
       }
       const result = await UIActionUtil.exec(
-        id2,
+        id,
         {
           view,
           ctrl,

package/lib/util/ai-chat-util/ai-chat-util.cjs

@@ -255,8 +255,15 @@ class AIChatUtil {
     }
     const sessionid = this.getChatSessionId("TEMP");
     chatOptions.sessionid = sessionid;
-    let id = "";
-    let abortController;
+    const chatStateMap = /* @__PURE__ */ new WeakMap();
+    const getChatState = (aiChat) => {
+      let state = chatStateMap.get(aiChat);
+      if (!state) {
+        state = { id: "", abortController: new AbortController() };
+        chatStateMap.set(aiChat, state);
+      }
+      return state;
+    };
     const { chatInstance, view, ctrl } = args;
     let filePreviewMode = ibiz.config.common.aiFilePreviewMode;
     if (editorParams.srfaifilepreviewmode) {
@@ -325,8 +332,10 @@ class AIChatUtil {
     };
     chatOptions.question = async (aiChat, ctx, param, other, arr, sessionid2, srfaiagent, srfmode, srfscope, srfknowledgebases, srfaiagentconfig, appendcurdata, mcpservers, sessionmeta, srfproject, localMsgID) => {
       let updateFlag = true;
-      id = qxUtil.createUUID();
-      abortController = new AbortController();
+      const state = getChatState(aiChat);
+      state.id = qxUtil.createUUID();
+      state.abortController = new AbortController();
+      const { id, abortController } = state;
       const deService = await ibiz.hub.getApp(ctx.srfappid).deService.getService(ctx, other.appDataEntityId);
       try {
         const questionRequestData = {
@@ -448,6 +457,7 @@ class AIChatUtil {
       }
     };
     chatOptions.abortQuestion = async (aiChat, ctx, param, other) => {
+      const { id, abortController } = getChatState(aiChat);
       abortController == null ? void 0 : abortController.abort();
       const asyncacitonid = aiChat.getActiveAsyncacitonId();
       if (asyncacitonid) {
@@ -482,8 +492,10 @@ class AIChatUtil {
     };
     chatOptions.resumeQuestion = async (aiChat, ctx, param, other, arr) => {
       if (other.asyncacitonid) {
-        id = qxUtil.createUUID();
-        abortController = new AbortController();
+        const state = getChatState(aiChat);
+        state.id = qxUtil.createUUID();
+        state.abortController = new AbortController();
+        const { id, abortController } = state;
         const deService = await ibiz.hub.getApp(ctx.srfappid).deService.getService(ctx, other.appDataEntityId);
         const resumeRequestData = { asyncacitonid: other.asyncacitonid };
         if (other.sessionid) {
@@ -501,11 +513,9 @@ class AIChatUtil {
             srfproject: other.srfproject
           });
         try {
-          aiChat.addWaitingMessage(id);
           await deService.aiResumeSse(
             (msg) => {
               if (msg.actionstate === 20 && msg.actionresult) {
-                aiChat.removeWaitingMessage(id);
                 aiChat.isLoading.value = true;
                 if (!aiChat.getActiveAsyncacitonId()) {
                   aiChat.setActiveAsyncacitonId(msg.asyncacitonid);
@@ -575,7 +585,6 @@ class AIChatUtil {
           }
           abortController == null ? void 0 : abortController.abort();
         } finally {
-          aiChat.removeWaitingMessage(id);
           aiChat.isLoading.value = false;
           aiChat.completeMessage(id, true);
           aiChat.setActiveAsyncacitonId("");
@@ -735,7 +744,7 @@ class AIChatUtil {
     chatOptions.uploader.maxSize = uploadMaxSize;
     chatOptions.extendToolbarClick = async (event, source, context2, params2, data2) => {
       var _a2, _b, _c;
-      const { id: id2, isPluginApp } = source;
+      const { id, isPluginApp } = source;
       let appId = source.appId;
       const tempContext = core.IBizContext.create(context2);
       if (isPluginApp) {
@@ -750,7 +759,7 @@ class AIChatUtil {
         }
       }
       const result = await runtime.UIActionUtil.exec(
-        id2,
+        id,
         {
           view,
           ctrl,
@@ -1068,8 +1077,15 @@ class AIChatUtil {
       chatOptions.questionToolbarItems = questionToolbarItems;
       chatOptions.otherToolbarItems = otherToolbarItems;
     }
-    let id = "";
-    let abortController;
+    const chatStateMap = /* @__PURE__ */ new WeakMap();
+    const getChatState = (aiChat) => {
+      let state = chatStateMap.get(aiChat);
+      if (!state) {
+        state = { id: "", abortController: new AbortController() };
+        chatStateMap.set(aiChat, state);
+      }
+      return state;
+    };
     const { chatInstance, view, ctrl } = args;
     let filePreviewMode = ibiz.config.common.aiFilePreviewMode;
     if (params.hasOwnProperty("srfaifilepreviewmode")) {
@@ -1139,8 +1155,10 @@ class AIChatUtil {
     };
     chatOptions.question = async (aiChat, ctx, param, other, arr, sessionid, srfaiagent, srfmode, srfscope, srfknowledgebases, srfaiagentconfig, appendcurdata, mcpservers, sessionmeta, srfproject, localMsgID) => {
       let updateFlag = true;
-      id = qxUtil.createUUID();
-      abortController = new AbortController();
+      const state = getChatState(aiChat);
+      state.id = qxUtil.createUUID();
+      state.abortController = new AbortController();
+      const { id, abortController } = state;
       const deService = await ibiz.hub.getApp(ctx.srfappid).deService.getService(ctx, other.appDataEntityId);
       try {
         const questionRequestData = {
@@ -1260,6 +1278,7 @@ class AIChatUtil {
       }
     };
     chatOptions.abortQuestion = async (aiChat, ctx, param, other) => {
+      const { id, abortController } = getChatState(aiChat);
       abortController == null ? void 0 : abortController.abort();
       const asyncacitonid = aiChat.getActiveAsyncacitonId();
       if (asyncacitonid) {
@@ -1294,8 +1313,10 @@ class AIChatUtil {
     };
     chatOptions.resumeQuestion = async (aiChat, ctx, param, other, arr) => {
       if (other.asyncacitonid) {
-        id = qxUtil.createUUID();
-        abortController = new AbortController();
+        const state = getChatState(aiChat);
+        state.id = qxUtil.createUUID();
+        state.abortController = new AbortController();
+        const { id, abortController } = state;
         const deService = await ibiz.hub.getApp(ctx.srfappid).deService.getService(ctx, other.appDataEntityId);
         const resumeRequestData = { asyncacitonid: other.asyncacitonid };
         if (other.sessionid) {
@@ -1313,11 +1334,9 @@ class AIChatUtil {
             srfproject: other.srfproject
           });
         try {
-          aiChat.addWaitingMessage(id);
           await deService.aiResumeSse(
             (msg) => {
               if (msg.actionstate === 20 && msg.actionresult) {
-                aiChat.removeWaitingMessage(id);
                 aiChat.isLoading.value = true;
                 if (!aiChat.getActiveAsyncacitonId()) {
                   aiChat.setActiveAsyncacitonId(msg.asyncacitonid);
@@ -1387,7 +1406,6 @@ class AIChatUtil {
           }
           abortController == null ? void 0 : abortController.abort();
         } finally {
-          aiChat.removeWaitingMessage(id);
           aiChat.isLoading.value = false;
           aiChat.completeMessage(id, true);
           aiChat.setActiveAsyncacitonId("");
@@ -1549,7 +1567,7 @@ class AIChatUtil {
     chatOptions.uploader.maxSize = uploadMaxSize;
     chatOptions.extendToolbarClick = async (event, source, context2, params2, data2) => {
       var _a2, _b, _c;
-      const { id: id2, isPluginApp } = source;
+      const { id, isPluginApp } = source;
       let appId = source.appId;
       const tempContext = core.IBizContext.create(context2);
       if (isPluginApp) {
@@ -1564,7 +1582,7 @@ class AIChatUtil {
         }
       }
       const result = await runtime.UIActionUtil.exec(
-        id2,
+        id,
         {
           view,
           ctrl,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/vue3-components",
-  "version": "0.7.41-alpha.153",
+  "version": "0.7.41-alpha.154",
   "description": "web端组件库(vue3)",
   "main": "lib/index.cjs",
   "module": "es/index.mjs",
@@ -31,16 +31,16 @@
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@floating-ui/dom": "^1.5.3",
-    "@ibiz-template-plugin/ai-chat": "^0.0.118",
+    "@ibiz-template-plugin/ai-chat": "^0.0.119",
     "@ibiz-template-plugin/gantt": "0.1.8-alpha.468",
     "@ibiz-template-plugin/bi-report": "0.0.32",
     "@ibiz-template-plugin/data-view": "0.0.8",
     "@ibiz-template/core": "0.7.41-alpha.152",
     "@ibiz-template/devtool": "0.0.17",
-    "@ibiz-template/model-helper": "0.7.41-alpha.153",
-    "@ibiz-template/runtime": "0.7.41-alpha.153",
+    "@ibiz-template/model-helper": "0.7.41-alpha.154",
+    "@ibiz-template/runtime": "0.7.41-alpha.154",
     "@ibiz-template/theme": "0.7.39",
-    "@ibiz-template/vue3-util": "0.7.41-alpha.153",
+    "@ibiz-template/vue3-util": "0.7.41-alpha.154",
     "@ibiz-template/web-theme": "3.16.0",
     "@ibiz/model-core": "^0.1.89",
     "@imengyu/vue3-context-menu": "^1.3.5",

package/src/util/ai-chat-util/ai-chat-util.ts

@@ -383,8 +383,19 @@ export class AIChatUtil implements IApiAIChatUtil {
     const sessionid = this.getChatSessionId('TEMP');
     chatOptions.sessionid = sessionid;
 
-    let id: string = '';
-    let abortController: AbortController;
+    // 按聊天控制器实例隔离提问状态，避免多话题会话共用闭包变量相互污染
+    const chatStateMap = new WeakMap<
+      object,
+      { id: string; abortController: AbortController }
+    >();
+    const getChatState = (aiChat: object) => {
+      let state = chatStateMap.get(aiChat);
+      if (!state) {
+        state = { id: '', abortController: new AbortController() };
+        chatStateMap.set(aiChat, state);
+      }
+      return state;
+    };
     const { chatInstance, view, ctrl } = args;
 
     // 文件系统操作参数
@@ -484,8 +495,10 @@ export class AIChatUtil implements IApiAIChatUtil {
     ) => {
       // 更新标记，主要用于更新用户消息真实消息ID（每条消息都会回asextparam，只需要设置一次即可）
       let updateFlag = true;
-      id = createUUID();
-      abortController = new AbortController();
+      const state = getChatState(aiChat);
+      state.id = createUUID();
+      state.abortController = new AbortController();
+      const { id, abortController } = state;
       const deService = await ibiz.hub
         .getApp(ctx.srfappid)
         .deService.getService(ctx, other.appDataEntityId);
@@ -624,6 +637,7 @@ export class AIChatUtil implements IApiAIChatUtil {
       param: IParams,
       other: IParams,
     ) => {
+      const { id, abortController } = getChatState(aiChat);
       abortController?.abort();
       const asyncacitonid = aiChat.getActiveAsyncacitonId();
       if (asyncacitonid) {
@@ -668,8 +682,10 @@ export class AIChatUtil implements IApiAIChatUtil {
       arr: IChatMessage[],
     ) => {
       if (other.asyncacitonid) {
-        id = createUUID();
-        abortController = new AbortController();
+        const state = getChatState(aiChat);
+        state.id = createUUID();
+        state.abortController = new AbortController();
+        const { id, abortController } = state;
         const deService = await ibiz.hub
           .getApp(ctx.srfappid)
           .deService.getService(ctx, other.appDataEntityId);
@@ -689,14 +705,10 @@ export class AIChatUtil implements IApiAIChatUtil {
             srfproject: other.srfproject,
           });
         try {
-          // 新增等待回复消息（AI首条内容到达前显示loading气泡）
-          aiChat.addWaitingMessage(id);
           await deService.aiResumeSse(
             (msg: IPortalAsyncAction) => {
               // 20: 持续回答中，消息会持续推送。同一个消息 id 会显示在同一个框内
               if (msg.actionstate === 20 && msg.actionresult) {
-                // 移除等待回复消息
-                aiChat.removeWaitingMessage(id);
                 // 设置当前聊天在加载中
                 aiChat.isLoading.value = true;
                 // 不存在才设置，存在则不设置（下方设置的时候需要去存储话题数据中）
@@ -774,8 +786,6 @@ export class AIChatUtil implements IApiAIChatUtil {
           }
           abortController?.abort();
         } finally {
-          // 移除等待回复消息
-          aiChat.removeWaitingMessage(id);
           // 设置当前聊天加载状态已完成
           aiChat.isLoading.value = false;
           // 标记当前消息已经交互完成
@@ -1405,8 +1415,19 @@ export class AIChatUtil implements IApiAIChatUtil {
       chatOptions.otherToolbarItems = otherToolbarItems;
     }
 
-    let id: string = '';
-    let abortController: AbortController;
+    // 按聊天控制器实例隔离提问状态，避免多话题会话共用闭包变量相互污染
+    const chatStateMap = new WeakMap<
+      object,
+      { id: string; abortController: AbortController }
+    >();
+    const getChatState = (aiChat: object) => {
+      let state = chatStateMap.get(aiChat);
+      if (!state) {
+        state = { id: '', abortController: new AbortController() };
+        chatStateMap.set(aiChat, state);
+      }
+      return state;
+    };
     const { chatInstance, view, ctrl } = args;
     // 文件系统操作参数
 
@@ -1507,8 +1528,10 @@ export class AIChatUtil implements IApiAIChatUtil {
     ) => {
       // 更新标记，主要用于更新用户消息真实消息ID（每条消息都会回asextparam，只需要设置一次即可）
       let updateFlag = true;
-      id = createUUID();
-      abortController = new AbortController();
+      const state = getChatState(aiChat);
+      state.id = createUUID();
+      state.abortController = new AbortController();
+      const { id, abortController } = state;
       const deService = await ibiz.hub
         .getApp(ctx.srfappid)
         .deService.getService(ctx, other.appDataEntityId);
@@ -1645,6 +1668,7 @@ export class AIChatUtil implements IApiAIChatUtil {
       param: IParams,
       other: IParams,
     ) => {
+      const { id, abortController } = getChatState(aiChat);
       abortController?.abort();
       const asyncacitonid = aiChat.getActiveAsyncacitonId();
       if (asyncacitonid) {
@@ -1689,8 +1713,10 @@ export class AIChatUtil implements IApiAIChatUtil {
       arr: IChatMessage[],
     ) => {
       if (other.asyncacitonid) {
-        id = createUUID();
-        abortController = new AbortController();
+        const state = getChatState(aiChat);
+        state.id = createUUID();
+        state.abortController = new AbortController();
+        const { id, abortController } = state;
         const deService = await ibiz.hub
           .getApp(ctx.srfappid)
           .deService.getService(ctx, other.appDataEntityId);
@@ -1710,14 +1736,10 @@ export class AIChatUtil implements IApiAIChatUtil {
             srfproject: other.srfproject,
           });
         try {
-          // 新增等待回复消息（AI首条内容到达前显示loading气泡）
-          aiChat.addWaitingMessage(id);
           await deService.aiResumeSse(
             (msg: IPortalAsyncAction) => {
               // 20: 持续回答中，消息会持续推送。同一个消息 id 会显示在同一个框内
               if (msg.actionstate === 20 && msg.actionresult) {
-                // 移除等待回复消息
-                aiChat.removeWaitingMessage(id);
                 // 设置当前聊天在加载中
                 aiChat.isLoading.value = true;
                 // 不存在才设置，存在则不设置（下方设置的时候需要去存储话题数据中）
@@ -1795,8 +1817,6 @@ export class AIChatUtil implements IApiAIChatUtil {
           }
           abortController?.abort();
         } finally {
-          // 移除等待回复消息
-          aiChat.removeWaitingMessage(id);
           // 设置当前聊天加载状态已完成
           aiChat.isLoading.value = false;
           // 标记当前消息已经交互完成