@ibiz-template/vue3-components 0.7.41-alpha.50 → 0.7.41-alpha.52

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

@@ -81,12 +81,9 @@ class AIChatUtil {
     if (editorParams.srfaiagent) {
       chatOptions.activeAIAgentID = editorParams.srfaiagent;
     }
-    const aiAgentlist = await this.getAIAgentList(
-      context,
-      params,
-      editorParams
-    );
-    chatOptions.aiAgentlist = aiAgentlist;
+    chatOptions.fetchAgentList = () => {
+      return this.getAIAgentList(context, params, editorParams);
+    };
     if (deACMode) {
       const {
         contentToolbarItems,
@@ -183,7 +180,8 @@ class AIChatUtil {
                 state: msg.actionstate,
                 type: "DEFAULT",
                 role: "ASSISTANT",
-                content: msg.actionresult
+                content: msg.actionresult,
+                status: "pending"
               });
             } else if (msg.actionstate === 30 && msg.actionresult) {
               const result = JSON.parse(msg.actionresult);
@@ -195,7 +193,8 @@ class AIChatUtil {
                   type: "DEFAULT",
                   role: "ASSISTANT",
                   content: choices[0].content || "",
-                  realmessageid: choices[0].messageid
+                  realmessageid: choices[0].messageid,
+                  status: "sent"
                 });
               }
             } else if (msg.actionstate === 40) {
@@ -204,7 +203,8 @@ class AIChatUtil {
                 state: msg.actionstate,
                 type: "ERROR",
                 role: "ASSISTANT",
-                content: msg.actionresult
+                content: msg.actionresult,
+                status: "failed"
               });
             }
           },
@@ -219,7 +219,8 @@ class AIChatUtil {
           state: 40,
           type: "ERROR",
           role: "ASSISTANT",
-          content: error.message || ibiz.i18n.t("app.aiError")
+          content: error.message || ibiz.i18n.t("app.aiError"),
+          status: "failed"
         });
         abortController == null ? void 0 : abortController.abort();
       } finally {
@@ -249,7 +250,8 @@ class AIChatUtil {
         state: 30,
         type: "DEFAULT",
         role: "ASSISTANT",
-        content: ""
+        content: "",
+        status: "canceled"
       });
       await aiChat.completeMessage(id, true);
     };
@@ -298,18 +300,32 @@ class AIChatUtil {
       }
     };
     chatOptions.extendToolbarClick = async (event, source, context2, params2, data2) => {
-      var _a, _b;
+      var _a, _b, _c;
+      const { id: id2, isPluginApp } = source;
+      let appId = source.appId;
+      const tempContext = core.IBizContext.create(context2);
+      if (isPluginApp) {
+        const mainApp = ibiz.hub.getApp();
+        const targetApp = (_a = mainApp.model.subAppRefs) == null ? void 0 : _a.find(
+          (subAppRef) => subAppRef.appId.endsWith("__".concat(appId))
+        );
+        if (targetApp) {
+          const targetAppId = targetApp.appId;
+          tempContext.srfappid = targetAppId;
+          appId = targetAppId;
+        }
+      }
       const result = await runtime.UIActionUtil.exec(
-        source.id,
+        id2,
         {
           view,
           ctrl,
-          context: core.IBizContext.create(context2),
+          context: tempContext,
           params: params2,
           data: [data2],
           event
         },
-        source.appId
+        appId
       );
       if (result.closeView) {
         view.closeView({ ok: true });
@@ -319,10 +335,10 @@ class AIChatUtil {
             view.callUIAction(runtime.SysUIActionTag.REFRESH);
             break;
           case 2:
-            (_a = view.parentView) == null ? void 0 : _a.callUIAction(runtime.SysUIActionTag.REFRESH);
+            (_b = view.parentView) == null ? void 0 : _b.callUIAction(runtime.SysUIActionTag.REFRESH);
             break;
           case 3:
-            (_b = view.getTopView()) == null ? void 0 : _b.callUIAction(runtime.SysUIActionTag.REFRESH);
+            (_c = view.getTopView()) == null ? void 0 : _c.callUIAction(runtime.SysUIActionTag.REFRESH);
             break;
           default:
         }
@@ -445,8 +461,9 @@ class AIChatUtil {
       delete params.srfenableaiagentchange;
     }
     chatOptions.enableAIAgentChange = enableAIAgentChange;
-    const aiAgentlist = await this.getAIAgentList(context, params);
-    chatOptions.aiAgentlist = aiAgentlist;
+    chatOptions.fetchAgentList = () => {
+      return this.getAIAgentList(context, params);
+    };
     if (deACMode) {
       const {
         contentToolbarItems,
@@ -541,7 +558,8 @@ class AIChatUtil {
                 state: msg.actionstate,
                 type: "DEFAULT",
                 role: "ASSISTANT",
-                content: msg.actionresult
+                content: msg.actionresult,
+                status: "pending"
               });
             } else if (msg.actionstate === 30 && msg.actionresult) {
               const result = JSON.parse(msg.actionresult);
@@ -553,7 +571,8 @@ class AIChatUtil {
                   type: "DEFAULT",
                   role: "ASSISTANT",
                   content: choices[0].content || "",
-                  realmessageid: choices[0].messageid
+                  realmessageid: choices[0].messageid,
+                  status: "sent"
                 });
               }
             } else if (msg.actionstate === 40) {
@@ -562,7 +581,8 @@ class AIChatUtil {
                 state: msg.actionstate,
                 type: "ERROR",
                 role: "ASSISTANT",
-                content: msg.actionresult
+                content: msg.actionresult,
+                status: "failed"
               });
             }
           },
@@ -577,7 +597,8 @@ class AIChatUtil {
           state: 40,
           type: "ERROR",
           role: "ASSISTANT",
-          content: error.message || ibiz.i18n.t("app.aiError")
+          content: error.message || ibiz.i18n.t("app.aiError"),
+          status: "failed"
         });
         abortController == null ? void 0 : abortController.abort();
       } finally {
@@ -607,7 +628,8 @@ class AIChatUtil {
         state: 30,
         type: "DEFAULT",
         role: "ASSISTANT",
-        content: ""
+        content: "",
+        status: "canceled"
       });
       await aiChat.completeMessage(id, true);
     };
@@ -656,18 +678,32 @@ class AIChatUtil {
       }
     };
     chatOptions.extendToolbarClick = async (event, source, context2, params2, data2) => {
-      var _a, _b;
+      var _a, _b, _c;
+      const { id: id2, isPluginApp } = source;
+      let appId = source.appId;
+      const tempContext = core.IBizContext.create(context2);
+      if (isPluginApp) {
+        const mainApp = ibiz.hub.getApp();
+        const targetApp = (_a = mainApp.model.subAppRefs) == null ? void 0 : _a.find(
+          (subAppRef) => subAppRef.appId.endsWith("__".concat(appId))
+        );
+        if (targetApp) {
+          const targetAppId = targetApp.appId;
+          tempContext.srfappid = targetAppId;
+          appId = targetAppId;
+        }
+      }
       const result = await runtime.UIActionUtil.exec(
-        source.id,
+        id2,
         {
           view,
           ctrl,
-          context: core.IBizContext.create(context2),
+          context: tempContext,
           params: params2,
           data: [data2],
           event
         },
-        source.appId
+        appId
       );
       if (result.closeView) {
         view.closeView({ ok: true });
@@ -677,10 +713,10 @@ class AIChatUtil {
             view.callUIAction(runtime.SysUIActionTag.REFRESH);
             break;
           case 2:
-            (_a = view.parentView) == null ? void 0 : _a.callUIAction(runtime.SysUIActionTag.REFRESH);
+            (_b = view.parentView) == null ? void 0 : _b.callUIAction(runtime.SysUIActionTag.REFRESH);
             break;
           case 3:
-            (_b = view.getTopView()) == null ? void 0 : _b.callUIAction(runtime.SysUIActionTag.REFRESH);
+            (_c = view.getTopView()) == null ? void 0 : _c.callUIAction(runtime.SysUIActionTag.REFRESH);
             break;
           default:
         }

package/lib/util/fullscreen/fullscreen-util.cjs

@@ -2,7 +2,7 @@
 
 var vue = require('vue');
 var ElementPlus = require('element-plus');
-var namespace = require('../../node_modules/.pnpm/@ibiz-template_core@0.7.41-alpha.52_axios@1.12.2_lodash-es@4.17.21_qs@6.14.0_qx-util@0.4.8_ramda@0.29.1/node_modules/@ibiz-template/core/out/utils/namespace/namespace.cjs');
+var namespace = require('../../node_modules/.pnpm/@ibiz-template_core@0.7.41-alpha.53_axios@1.12.2_lodash-es@4.17.21_qs@6.14.0_qx-util@0.4.8_ramda@0.29.1/node_modules/@ibiz-template/core/out/utils/namespace/namespace.cjs');
 var fullscreenToolbar = require('../../common/fullscreen-toolbar/fullscreen-toolbar.cjs');
 
 "use strict";

package/lib/util/inline-ai-util/inline-ai-textarea/inline-ai-textarea.cjs

@@ -98,22 +98,21 @@ const InlineAITextArea = /* @__PURE__ */ vue.defineComponent({
       textareaRef
     }, message);
     const {
+      stopAsk,
       syncAskAI,
       asyncAskAI,
       parseContent,
-      loadAiHistory,
-      abortController
+      loadAiHistory
     } = inlineAiTextarea_hook.useAI(props, {
       srfmode,
       srfaiagent,
       srfaiappendcurdata
     });
-    inlineAiTextarea_hook.useInLineAIContainerClick(props, message, isLoading, abortController);
-    const stopQuestionAndClose = () => {
-      var _a;
-      (_a = abortController.value) == null ? void 0 : _a.abort();
-      props.unMountAIChat();
-    };
+    inlineAiTextarea_hook.useInLineAIContainerClick(props, {
+      message,
+      isLoading,
+      stopAsk
+    });
     const handleAnswer = (answer) => {
       switch (answer.state) {
         case 20:
@@ -255,12 +254,12 @@ const InlineAITextArea = /* @__PURE__ */ vue.defineComponent({
       containerRef,
       contentStyle,
       containerStyle,
+      stopAsk,
       onKeydown,
       renderError,
       sendQuestion,
       handleAction,
-      renderLoading,
-      stopQuestionAndClose
+      renderLoading
     };
   },
   render() {
@@ -298,7 +297,7 @@ const InlineAITextArea = /* @__PURE__ */ vue.defineComponent({
       "class": this.ns.em("content", "suffix")
     }, [this.isLoading && vue.createVNode("div", {
       "class": this.ns.em("content", "stop-icon"),
-      "onClick": () => this.stopQuestionAndClose()
+      "onClick": () => this.stopAsk()
     }, [icon.StopIcon, vue.createVNode("span", null, [ibiz.i18n.t("util.inlineAiUtil.stopEdit")])]), !this.disabled && vue.createVNode("div", {
       "class": this.ns.em("content", "sand-icon"),
       "onClick": () => this.sendQuestion(this.message.content)

package/lib/util/inline-ai-util/inline-ai-textarea/inline-ai-textarea.hook.cjs

@@ -26,9 +26,9 @@ const computedInLineAIParams = (props) => {
     inlinecompletionmode: (_g = (_f = params.inlinecompletionmode) != null ? _f : editorParams.inlinecompletionmode) != null ? _g : "async"
   };
 };
-const useInLineAIContainerClick = (props, message, isLoading, abortController) => {
+const useInLineAIContainerClick = (props, opts) => {
+  const { message, isLoading, stopAsk } = opts;
   const handMousedown = async (evt) => {
-    var _a;
     const target = evt.target;
     if (!target.closest(".ibiz-inline-ai-textarea-container") && !target.closest(".ibiz-inline-ai-alert")) {
       const isChange = props.content !== message.value.content;
@@ -42,12 +42,8 @@ const useInLineAIContainerClick = (props, message, isLoading, abortController) =
           }
         });
       }
-      if (isClose) {
-        if (isLoading.value) {
-          (_a = abortController.value) == null ? void 0 : _a.abort();
-        }
-        props.unMountAIChat();
-      }
+      if (isClose)
+        await stopAsk();
     }
   };
   vue.onMounted(() => {
@@ -95,7 +91,6 @@ const useAI = (props, opts) => {
       );
     }
   };
-  const abortController = vue.ref();
   const attachUrlParam = (url) => {
     {
       const urlSplit = url.split("?");
@@ -174,6 +169,8 @@ const useAI = (props, opts) => {
     }
     return { think, content, toolcalls };
   };
+  let asyncacitonid;
+  const abortController = vue.ref();
   const asyncAskAI = (question, callBack, errorBack) => {
     return new Promise((resolve) => {
       abortController.value = new AbortController();
@@ -189,6 +186,8 @@ const useAI = (props, opts) => {
             if (e.data) {
               const msg = JSON.parse(e.data);
               let content = msg.actionresult || "";
+              if (msg.actionstate === 20)
+                asyncacitonid = msg.asyncacitonid;
               if (msg.actionstate === 30 && content)
                 content = (_a = JSON.parse(content).choices) == null ? void 0 : _a[0].content;
               callBack({ state: msg.actionstate, content });
@@ -235,12 +234,28 @@ const useAI = (props, opts) => {
       return answer;
     }
   };
+  const stopAsk = async () => {
+    var _a;
+    (_a = abortController.value) == null ? void 0 : _a.abort();
+    if (asyncacitonid) {
+      const deService = await app.deService.getService(
+        context,
+        deACMode.appDataEntityId
+      );
+      await deService.aiChatCancel(context, params, {
+        asyncacitonid,
+        sessionid
+      });
+      asyncacitonid = void 0;
+    }
+    props.unMountAIChat();
+  };
   return {
+    stopAsk,
     syncAskAI,
     asyncAskAI,
     parseContent,
-    loadAiHistory,
-    abortController
+    loadAiHistory
   };
 };
 const useBase = (props, element, message) => {
@@ -297,11 +312,8 @@ const useBase = (props, element, message) => {
     height: options.height ? "".concat(options.height, "px") : "auto",
     "max-height": "".concat(options.maxHeight || (options.height && options.height > 300 ? options.height : 300), "px")
   });
-  const toolcalls = vue.computed(() => {
-    return message.value.toolcalls || [];
-  });
   vue.watch(
-    () => [toolcalls.value.length, message.value.think, message.value.content],
+    () => message.value,
     () => {
       vue.nextTick(() => {
         if (!textareaRef.value)
@@ -312,6 +324,7 @@ const useBase = (props, element, message) => {
       });
     },
     {
+      deep: true,
       immediate: true
     }
   );