@ibiz-template/vue3-components 0.7.41-alpha.51 → 0.7.41-alpha.53

package/lib/panel-component/user-message/internal-message/internal-message-text/internal-message-text.cjs

@@ -18,7 +18,8 @@ const InternalMessageText = /* @__PURE__ */ vue.defineComponent({
     }
   },
   emits: {
-    close: () => true
+    close: () => true,
+    read: () => true
   },
   setup() {
     const ns = vue3Util.useNamespace("internal-message-text");
@@ -36,6 +37,7 @@ const InternalMessageText = /* @__PURE__ */ vue.defineComponent({
       "class": [this.ns.b()],
       "message": this.message,
       "provider": this.provider,
+      "onRead": () => this.$emit("read"),
       "onClose": () => this.$emit("close")
     }, {
       default: () => [vue.createVNode("div", {

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

@@ -36,6 +36,7 @@ class AIChatUtil {
    * @param data
    */
   async getEditorExAIChatParams(editorParams, context, params, data, deACMode, args) {
+    var _a;
     const containerOptions = {};
     if (editorParams.enableaiminimize) {
       containerOptions.enableAIMinimize = editorParams.enableaiminimize === "true";
@@ -81,12 +82,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,
@@ -278,13 +276,16 @@ class AIChatUtil {
       }
       return null;
     };
+    const app = ibiz.hub.getApp(context.srfappid);
+    const folder = app.model.defaultOSSCat || ((_a = app.model.userParam) == null ? void 0 : _a.DefaultOSSCat);
     chatOptions.uploader = {
+      folder: "".concat(folder, "$"),
       onUpload: async (file, reportProgress, options) => {
         const fileMeata = ibiz.util.file.calcFileUpDownUrl(
           (options == null ? void 0 : options.context) || context,
           (options == null ? void 0 : options.params) || params,
           {},
-          { enableNoAccess: true }
+          { enableNoAccess: true, osscat: folder }
         );
         const fielUploadHeaders = ibiz.util.file.getUploadHeaders();
         const formData = new FormData();
@@ -300,17 +301,39 @@ class AIChatUtil {
           }
         });
         return res.data;
+      },
+      onDownLoad: async (file, options) => {
+        const { downloadUrl } = ibiz.util.file.calcFileUpDownUrl(
+          (options == null ? void 0 : options.context) || context,
+          (options == null ? void 0 : options.params) || params,
+          {},
+          { enableNoAccess: true, osscat: folder }
+        );
+        const url = downloadUrl.replace("%fileId%", file.fileid);
+        await ibiz.util.file.fileDownload(
+          url,
+          file.filename,
+          {
+            context: (options == null ? void 0 : options.context) || context,
+            params: (options == null ? void 0 : options.params) || params,
+            data: {},
+            file: { fileId: file.id, ...file },
+            extraParams: { enableNoAccess: true, osscat: folder }
+          },
+          void 0,
+          true
+        );
       }
     };
     chatOptions.extendToolbarClick = async (event, source, context2, params2, data2) => {
-      var _a, _b, _c;
+      var _a2, _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(appId)
+        const targetApp = (_a2 = mainApp.model.subAppRefs) == null ? void 0 : _a2.find(
+          (subAppRef) => subAppRef.appId.endsWith("__".concat(appId))
         );
         if (targetApp) {
           const targetAppId = targetApp.appId;
@@ -360,6 +383,7 @@ class AIChatUtil {
    * @returns
    */
   async getUIActionExAIChatParams(context, params, data, deACMode, args) {
+    var _a;
     const containerOptions = {};
     if (params.hasOwnProperty("enableaiminimize")) {
       containerOptions.enableAIMinimize = params.enableaiminimize === "true";
@@ -464,8 +488,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,
@@ -655,13 +680,16 @@ class AIChatUtil {
       }
       return null;
     };
+    const app = ibiz.hub.getApp(context.srfappid);
+    const folder = app.model.defaultOSSCat || ((_a = app.model.userParam) == null ? void 0 : _a.DefaultOSSCat);
     chatOptions.uploader = {
+      folder: "".concat(folder, "$"),
       onUpload: async (file, reportProgress, options) => {
         const { uploadUrl } = ibiz.util.file.calcFileUpDownUrl(
           (options == null ? void 0 : options.context) || context,
           (options == null ? void 0 : options.params) || params,
           {},
-          { enableNoAccess: true }
+          { enableNoAccess: true, osscat: folder }
         );
         const headers = ibiz.util.file.getUploadHeaders();
         const formData = new FormData();
@@ -677,17 +705,39 @@ class AIChatUtil {
           }
         });
         return res.data;
+      },
+      onDownLoad: async (file, options) => {
+        const { downloadUrl } = ibiz.util.file.calcFileUpDownUrl(
+          (options == null ? void 0 : options.context) || context,
+          (options == null ? void 0 : options.params) || params,
+          {},
+          { enableNoAccess: true, osscat: folder }
+        );
+        const url = downloadUrl.replace("%fileId%", file.fileid);
+        await ibiz.util.file.fileDownload(
+          url,
+          file.filename,
+          {
+            context: (options == null ? void 0 : options.context) || context,
+            params: (options == null ? void 0 : options.params) || params,
+            data: {},
+            file: { fileId: file.id, ...file },
+            extraParams: { enableNoAccess: true, osscat: folder }
+          },
+          void 0,
+          true
+        );
       }
     };
     chatOptions.extendToolbarClick = async (event, source, context2, params2, data2) => {
-      var _a, _b, _c;
+      var _a2, _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(appId)
+        const targetApp = (_a2 = mainApp.model.subAppRefs) == null ? void 0 : _a2.find(
+          (subAppRef) => subAppRef.appId.endsWith("__".concat(appId))
         );
         if (targetApp) {
           const targetAppId = targetApp.appId;

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
     }
   );

package/lib/view-engine/wf-dyna-edit-view.engine.cjs

@@ -224,7 +224,7 @@ class WFDynaEditViewEngine extends editView_engine.EditViewEngine {
     const submitView = runtime.getWFSubmitViewId(this.view.model, link);
     if (!submitView) {
       await this.form.wfSubmit({ viewParam: newParams });
-      await this.view.closeView();
+      await this.view.closeView({ ok: true, data: this.form.getData() });
       return;
     }
     const result = await ibiz.commands.execute(
@@ -234,7 +234,7 @@ class WFDynaEditViewEngine extends editView_engine.EditViewEngine {
       newParams
     );
     if (result.ok) {
-      await this.view.closeView();
+      await this.view.closeView({ ok: true, data: this.form.getData() });
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/vue3-components",
-  "version": "0.7.41-alpha.51",
+  "version": "0.7.41-alpha.53",
   "description": "web端组件库(vue3)",
   "main": "lib/index.cjs",
   "module": "es/index.mjs",
@@ -30,16 +30,16 @@
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@floating-ui/dom": "^1.5.3",
-    "@ibiz-template-plugin/ai-chat": "^0.0.42",
+    "@ibiz-template-plugin/ai-chat": "^0.0.44",
     "@ibiz-template-plugin/gantt": "0.1.8-alpha.378",
-    "@ibiz-template-plugin/bi-report": "0.0.30",
+    "@ibiz-template-plugin/bi-report": "0.0.31",
     "@ibiz-template-plugin/data-view": "0.0.6",
     "@ibiz-template/core": "0.7.41-alpha.53",
-    "@ibiz-template/devtool": "0.0.13",
-    "@ibiz-template/model-helper": "0.7.41-alpha.53",
-    "@ibiz-template/runtime": "0.7.41-alpha.53",
+    "@ibiz-template/devtool": "0.0.14",
+    "@ibiz-template/model-helper": "0.7.41-alpha.55",
+    "@ibiz-template/runtime": "0.7.41-alpha.55",
     "@ibiz-template/theme": "0.7.39",
-    "@ibiz-template/vue3-util": "0.7.41-alpha.53",
+    "@ibiz-template/vue3-util": "0.7.41-alpha.55",
     "@ibiz-template/web-theme": "3.10.0",
     "@ibiz/model-core": "^0.1.84",
     "@imengyu/vue3-context-menu": "^1.3.5",
@@ -74,7 +74,7 @@
   "devDependencies": {
     "@commitlint/cli": "^18.5.0",
     "@commitlint/config-conventional": "^18.5.0",
-    "@ibiz-template/cli": "^0.3.23",
+    "@ibiz-template/cli": "^0.3.31",
     "@types/lodash-es": "^4.17.12",
     "@types/sortablejs": "^1.15.8",
     "@types/node": "^20.11.5",