@ibiz-template/vue3-components 0.7.41-alpha.41 → 0.7.41-alpha.43

package/lib/editor/code/monaco-editor/monaco-editor.cjs

@@ -5,8 +5,6 @@ var vue3Util = require('@ibiz-template/vue3-util');
 var qxUtil = require('qx-util');
 var ElementPlus = require('element-plus');
 require('../../../node_modules/.pnpm/@monaco-editor_loader@1.5.0/node_modules/@monaco-editor/loader/lib/es/index.cjs');
-var runtime = require('@ibiz-template/runtime');
-var core = require('@ibiz-template/core');
 require('./monaco-editor.css');
 var index = require('../../../node_modules/.pnpm/@monaco-editor_loader@1.5.0/node_modules/@monaco-editor/loader/lib/es/loader/index.cjs');
 
@@ -119,20 +117,15 @@ const IBizCode = /* @__PURE__ */ vue.defineComponent({
     const openAIChat = async () => {
       if (!c.deACMode || !c.model.appDataEntityId)
         return;
-      const aiAgentlist = await ibiz.aiChatUtil.getAIAgentList(c.context, c.params);
-      const {
-        contentToolbarItems,
-        footerToolbarItems,
-        questionToolbarItems,
-        otherToolbarItems
-      } = ibiz.aiChatUtil.calcAiToolbarItemsByAc(c.deACMode);
+      chatInstance = await ibiz.aiChatUtil.getAIChat();
       const {
         containerOptions,
         chatOptions
-      } = ibiz.aiChatUtil.getEditorExAIChatParams(c.editorParams, c.context, c.params, props.data);
-      chatInstance = await ibiz.aiChatUtil.getAIChat();
-      let id = "";
-      let abortController;
+      } = await ibiz.aiChatUtil.getEditorExAIChatParams(c.editorParams, c.context, c.params, props.data, c.deACMode, {
+        chatInstance,
+        view: c.view,
+        ctrl: c.ctrl
+      });
       chatInstance.create({
         containerOptions: {
           zIndex: zIndex.increment(),
@@ -148,191 +141,10 @@ const IBizCode = /* @__PURE__ */ vue.defineComponent({
             srfactag: c.deACMode.codeName
           },
           appDataEntityId: c.model.appDataEntityId,
-          contentToolbarItems,
-          footerToolbarItems,
-          questionToolbarItems,
-          otherToolbarItems,
-          aiAgentlist,
           ...chatOptions,
-          question: async (aiChat, ctx, param, other, arr, sessionid, srfaiagent, srfmode) => {
-            id = qxUtil.createUUID();
-            abortController = new AbortController();
-            const deService = await ibiz.hub.getApp(ctx.srfappid).deService.getService(ctx, other.appDataEntityId);
-            try {
-              const questionRequestData = {
-                messages: arr,
-                sessionid
-              };
-              if (srfaiagent) {
-                questionRequestData.srfaiagent = srfaiagent;
-              }
-              if (srfmode) {
-                questionRequestData.mode = srfmode;
-              }
-              await deService.aiChatSse((msg) => {
-                if (msg.actionstate === 20 && msg.actionresult) {
-                  aiChat.addMessage({
-                    messageid: id,
-                    state: msg.actionstate,
-                    type: "DEFAULT",
-                    role: "ASSISTANT",
-                    content: msg.actionresult
-                  });
-                } else if (msg.actionstate === 30 && msg.actionresult) {
-                  const result = JSON.parse(msg.actionresult);
-                  const choices = result.choices;
-                  if (choices && choices.length > 0) {
-                    aiChat.replaceMessage({
-                      messageid: id,
-                      state: msg.actionstate,
-                      type: "DEFAULT",
-                      role: "ASSISTANT",
-                      content: choices[0].content || ""
-                    });
-                  }
-                } else if (msg.actionstate === 40) {
-                  aiChat.replaceMessage({
-                    messageid: id,
-                    state: msg.actionstate,
-                    type: "ERROR",
-                    role: "ASSISTANT",
-                    content: msg.actionresult
-                  });
-                }
-              }, abortController, ctx, param, {
-                ...questionRequestData
-              });
-            } catch (error) {
-              aiChat.replaceMessage({
-                messageid: id,
-                state: 40,
-                type: "ERROR",
-                role: "ASSISTANT",
-                content: error.message || ibiz.i18n.t("app.aiError")
-              });
-              abortController == null ? void 0 : abortController.abort();
-            } finally {
-              aiChat.completeMessage(id, true);
-              return true;
-            }
-          },
-          abortQuestion: async (aiChat) => {
-            abortController == null ? void 0 : abortController.abort();
-            await aiChat.stopMessage({
-              messageid: id,
-              state: 30,
-              type: "DEFAULT",
-              role: "ASSISTANT",
-              content: ""
-            });
-            await aiChat.completeMessage(id, true);
-          },
           action: (action, message) => {
             if (action === "backfill")
               emit("change", message.realcontent);
-          },
-          history: async (ctx, param, other) => {
-            const deService = await ibiz.hub.getApp(ctx.srfappid).deService.getService(ctx, other.appDataEntityId);
-            const historyRequestData = {};
-            if (other.appendCurData) {
-              Object.assign(historyRequestData, {
-                ...other.appendCurData
-              });
-            }
-            if (other.srfaiagent) {
-              Object.assign(historyRequestData, {
-                srfaiagent: other.srfaiagent
-              });
-            }
-            if (other.srfmode) {
-              Object.assign(historyRequestData, {
-                mode: other.srfmode
-              });
-            }
-            const result = await deService.aiChatHistory(ctx, param, historyRequestData);
-            if (result.data && Array.isArray(result.data)) {
-              let preMsg;
-              result.data.forEach((item) => {
-                if (item.role === "TOOL") {
-                  if (preMsg && item.content) {
-                    chatInstance.aiChat.updateRecommendPrompt(preMsg, item.content);
-                  }
-                } else {
-                  const msg = {
-                    messageid: qxUtil.createUUID(),
-                    state: 30,
-                    type: "DEFAULT",
-                    role: item.role,
-                    content: item.content,
-                    completed: true
-                  };
-                  preMsg = msg;
-                  chatInstance.aiChat.addMessage(msg);
-                }
-              });
-            }
-            return true;
-          },
-          recommendPrompt: async (ctx, param, other) => {
-            const deService = await ibiz.hub.getApp(ctx.srfappid).deService.getService(ctx, other.appDataEntityId);
-            const result = await deService.aiChatRecommendPrompt(ctx, param, other.message);
-            if (result.ok && result.data) {
-              const choices = result.data.choices;
-              if (choices && choices.length > 0) {
-                return choices[0];
-              }
-              return null;
-            }
-            return null;
-          },
-          uploader: {
-            onUpload: async (file, reportProgress, options) => {
-              const fileMeata = ibiz.util.file.calcFileUpDownUrl((options == null ? void 0 : options.context) || c.context, (options == null ? void 0 : options.params) || c.params, {});
-              const uploadHeaders = ibiz.util.file.getUploadHeaders();
-              const formData = new FormData();
-              formData.append("file", file);
-              const res = await ibiz.net.axios({
-                url: fileMeata.uploadUrl,
-                method: "post",
-                headers: uploadHeaders,
-                data: formData,
-                onUploadProgress: (progressEvent) => {
-                  const percent = progressEvent.loaded / progressEvent.total * 100;
-                  reportProgress(percent);
-                }
-              });
-              return res.data;
-            }
-          },
-          extendToolbarClick: async (event, source, context, params, data) => {
-            var _a, _b;
-            const result = await runtime.UIActionUtil.exec(source.id, {
-              view: c.view,
-              ctrl: c.ctrl,
-              context: core.IBizContext.create(context),
-              params,
-              data: [data],
-              event
-            }, source.appId);
-            if (result.closeView) {
-              c.view.closeView({
-                ok: true
-              });
-            } else if (result.refresh) {
-              switch (result.refreshMode) {
-                case 1:
-                  c.view.callUIAction(runtime.SysUIActionTag.REFRESH);
-                  break;
-                case 2:
-                  (_a = c.view.parentView) == null ? void 0 : _a.callUIAction(runtime.SysUIActionTag.REFRESH);
-                  break;
-                case 3:
-                  (_b = c.view.getTopView()) == null ? void 0 : _b.callUIAction(runtime.SysUIActionTag.REFRESH);
-                  break;
-                default:
-              }
-            }
-            return result;
           }
         }
       });
@@ -393,7 +205,13 @@ const IBizCode = /* @__PURE__ */ vue.defineComponent({
         editorRect.left + coordinates.left,
         // 编辑器上方距离 + 选区距离编辑器上方距离 + 行高度 + 工具栏高度
         editorRect.top + coordinates.top + coordinates.height + textTBHeight,
-        items
+        items,
+        {
+          zIndex: zIndex.increment(),
+          onClose: () => {
+            zIndex.decrement();
+          }
+        }
       );
     };
     const handleEditorClick = (e) => {

package/lib/editor/html/wang-editor/module/ai-module.cjs

@@ -22,7 +22,7 @@ class AIButtonMenu {
      * @type {string}
      * @memberof AIButtonMenu
      */
-    __publicField(this, "iconSvg", '<svg xmlns="http://www.w3.org/2000/svg" version="1.1"> <text x="0" y="13" font-size="16" fill="black">AI</text></svg>');
+    __publicField(this, "iconSvg", '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor" height="1em" width="1em" preserveAspectRatio="xMidYMid meet" focusable="false" class="cherry-menu-AIChart"><g id="aae1.Base\u57FA\u7840/1.icon\u56FE\u6807/2.normal/ai-star" stroke-width="1" fill-rule="evenodd"><path d="M5.817 1.53l3.158 8.797h.054v.152l1.443 4.021-1.402.001-1.041-2.982H2.495l-1.03 2.982L0 14.5 4.671 1.533l1.146-.003zm7.86 5.424V14.5h-1.213V6.954h1.212zM5.248 3.549l-2.342 6.778h4.706L5.249 3.55zM13.046 0c.075 0 .147.02.204.071a.318.318 0 01.094.181l.064.273c.097.417.17.727.255.968.084.24.177.4.31.523.134.124.318.218.599.306.281.088.65.166 1.15.265a.358.358 0 01.195.095c.056.057.083.13.083.213a.289.289 0 01-.083.21.362.362 0 01-.197.094c-.528.093-.918.167-1.214.255-.295.088-.485.187-.621.324-.137.138-.23.324-.31.606-.08.283-.145.651-.23 1.147a.329.329 0 01-.093.184.293.293 0 01-.206.075.308.308 0 01-.207-.072.322.322 0 01-.1-.188l-.006-.033c-.085-.486-.149-.845-.228-1.12-.079-.274-.17-.452-.305-.585-.135-.133-.323-.23-.618-.32s-.683-.168-1.21-.273a.353.353 0 01-.2-.096.29.29 0 01-.08-.208c0-.079.023-.153.079-.211a.35.35 0 01.2-.097c.5-.098.869-.176 1.15-.263.282-.087.465-.18.597-.302.132-.12.224-.278.306-.511.082-.236.151-.539.244-.947l.071-.312a.312.312 0 01.102-.183.311.311 0 01.205-.069z" id="aae\u5F62\u72B6\u7ED3\u5408"></path></g></svg>');
     /**
      *
      *

package/lib/editor/html/wang-editor/wang-editor.cjs

@@ -4,11 +4,9 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var vue = require('vue');
 var editorForVue = require('@wangeditor/editor-for-vue');
-var qxUtil = require('qx-util');
 var ramda = require('ramda');
 var vue3Util = require('@ibiz-template/vue3-util');
 var core = require('@ibiz-template/core');
-var runtime = require('@ibiz-template/runtime');
 var ElementPlus = require('element-plus');
 require('./module/index.cjs');
 require('./config/index.cjs');
@@ -201,24 +199,19 @@ const IBizHtml = /* @__PURE__ */ vue.defineComponent({
       const appDataEntityId = c.model.appDataEntityId;
       if (!appDataEntityId || !c.deACMode)
         return;
-      const aiAgentlist = await ibiz.aiChatUtil.getAIAgentList(c.context, c.params);
-      const {
-        contentToolbarItems,
-        footerToolbarItems,
-        questionToolbarItems,
-        otherToolbarItems
-      } = ibiz.aiChatUtil.calcAiToolbarItemsByAc(c.deACMode);
-      const {
-        containerOptions,
-        chatOptions
-      } = ibiz.aiChatUtil.getEditorExAIChatParams(c.editorParams, c.context, c.params, props.data);
       const {
         zIndex
       } = vue3Util.useUIStore();
       const containerZIndex = zIndex.increment();
       chatInstance = await ibiz.aiChatUtil.getAIChat();
-      let id = "";
-      let abortController;
+      const {
+        containerOptions,
+        chatOptions
+      } = await ibiz.aiChatUtil.getEditorExAIChatParams(c.editorParams, c.context, c.params, props.data, c.deACMode, {
+        chatInstance,
+        view: c.view,
+        ctrl: c.ctrl
+      });
       chatInstance.create({
         containerOptions: {
           zIndex: containerZIndex,
@@ -234,85 +227,7 @@ const IBizHtml = /* @__PURE__ */ vue.defineComponent({
             srfactag: c.deACMode.codeName
           },
           appDataEntityId,
-          contentToolbarItems,
-          footerToolbarItems,
-          questionToolbarItems,
-          otherToolbarItems,
-          aiAgentlist,
           ...chatOptions,
-          question: async (aiChat, ctx, param, other, arr, sessionid, srfaiagent, srfmode) => {
-            id = qxUtil.createUUID();
-            abortController = new AbortController();
-            const deService = await ibiz.hub.getApp(ctx.srfappid).deService.getService(ctx, other.appDataEntityId);
-            try {
-              const questionRequestData = {
-                messages: arr,
-                sessionid
-              };
-              if (srfaiagent) {
-                questionRequestData.srfaiagent = srfaiagent;
-              }
-              if (srfmode) {
-                questionRequestData.mode = srfmode;
-              }
-              await deService.aiChatSse((msg) => {
-                if (msg.actionstate === 20 && msg.actionresult) {
-                  aiChat.addMessage({
-                    messageid: id,
-                    state: msg.actionstate,
-                    type: "DEFAULT",
-                    role: "ASSISTANT",
-                    content: msg.actionresult
-                  });
-                } else if (msg.actionstate === 30 && msg.actionresult) {
-                  const result = JSON.parse(msg.actionresult);
-                  const choices = result.choices;
-                  if (choices && choices.length > 0) {
-                    aiChat.replaceMessage({
-                      messageid: id,
-                      state: msg.actionstate,
-                      type: "DEFAULT",
-                      role: "ASSISTANT",
-                      content: choices[0].content || ""
-                    });
-                  }
-                } else if (msg.actionstate === 40) {
-                  aiChat.replaceMessage({
-                    messageid: id,
-                    state: msg.actionstate,
-                    type: "ERROR",
-                    role: "ASSISTANT",
-                    content: msg.actionresult
-                  });
-                }
-              }, abortController, ctx, param, {
-                ...questionRequestData
-              });
-            } catch (error) {
-              aiChat.replaceMessage({
-                messageid: id,
-                state: 40,
-                type: "ERROR",
-                role: "ASSISTANT",
-                content: error.message || ibiz.i18n.t("app.aiError")
-              });
-              abortController == null ? void 0 : abortController.abort();
-            } finally {
-              aiChat.completeMessage(id, true);
-              return true;
-            }
-          },
-          abortQuestion: async (aiChat) => {
-            abortController == null ? void 0 : abortController.abort();
-            await aiChat.stopMessage({
-              messageid: id,
-              state: 30,
-              type: "DEFAULT",
-              role: "ASSISTANT",
-              content: ""
-            });
-            await aiChat.completeMessage(id, true);
-          },
           action: (action, message) => {
             if (action === "backfill") {
               if (hasEnableEdit.value) {
@@ -321,109 +236,6 @@ const IBizHtml = /* @__PURE__ */ vue.defineComponent({
                 emit("change", message.realcontent);
               }
             }
-          },
-          history: async (ctx, param, other) => {
-            const deService = await ibiz.hub.getApp(ctx.srfappid).deService.getService(ctx, other.appDataEntityId);
-            const historyRequestData = {};
-            if (other.appendCurData) {
-              Object.assign(historyRequestData, {
-                ...other.appendCurData
-              });
-            }
-            if (other.srfaiagent) {
-              Object.assign(historyRequestData, {
-                srfaiagent: other.srfaiagent
-              });
-            }
-            if (other.srfmode) {
-              Object.assign(historyRequestData, {
-                mode: other.srfmode
-              });
-            }
-            const result = await deService.aiChatHistory(ctx, param, historyRequestData);
-            if (result.data && Array.isArray(result.data)) {
-              let preMsg;
-              result.data.forEach((item) => {
-                if (item.role === "TOOL") {
-                  if (preMsg && item.content) {
-                    chatInstance.aiChat.updateRecommendPrompt(preMsg, item.content);
-                  }
-                } else {
-                  const msg = {
-                    messageid: qxUtil.createUUID(),
-                    state: 30,
-                    type: "DEFAULT",
-                    role: item.role,
-                    content: item.content,
-                    completed: true
-                  };
-                  preMsg = msg;
-                  chatInstance.aiChat.addMessage(msg);
-                }
-              });
-            }
-            return true;
-          },
-          recommendPrompt: async (ctx, param, other) => {
-            const deService = await ibiz.hub.getApp(ctx.srfappid).deService.getService(ctx, other.appDataEntityId);
-            const result = await deService.aiChatRecommendPrompt(ctx, param, other.message);
-            if (result.ok && result.data) {
-              const choices = result.data.choices;
-              if (choices && choices.length > 0) {
-                return choices[0];
-              }
-              return null;
-            }
-            return null;
-          },
-          uploader: {
-            onUpload: async (file, reportProgress, options) => {
-              const fileMeata = ibiz.util.file.calcFileUpDownUrl((options == null ? void 0 : options.context) || c.context, (options == null ? void 0 : options.params) || c.params, {});
-              const fielUploadHeaders = ibiz.util.file.getUploadHeaders();
-              const formData = new FormData();
-              formData.append("file", file);
-              const res = await ibiz.net.axios({
-                url: fileMeata.uploadUrl,
-                method: "post",
-                headers: fielUploadHeaders,
-                data: formData,
-                onUploadProgress: (progressEvent) => {
-                  const percent = progressEvent.loaded / progressEvent.total * 100;
-                  reportProgress(percent);
-                }
-              });
-              return res.data;
-            }
-          },
-          extendToolbarClick: async (event, source, context, params, data) => {
-            var _a, _b;
-            const result = await runtime.UIActionUtil.exec(source.id, {
-              view: c.view,
-              ctrl: c.ctrl,
-              context: core.IBizContext.create(context),
-              params,
-              data: [data],
-              event
-            }, source.appId);
-            if (result.closeView) {
-              c.view.closeView({
-                ok: true
-              });
-            } else if (result.refresh) {
-              switch (result.refreshMode) {
-                case 1:
-                  c.view.callUIAction(runtime.SysUIActionTag.REFRESH);
-                  break;
-                case 2:
-                  (_a = c.view.parentView) == null ? void 0 : _a.callUIAction(runtime.SysUIActionTag.REFRESH);
-                  break;
-                case 3:
-                  (_b = c.view.getTopView()) == null ? void 0 : _b.callUIAction(runtime.SysUIActionTag.REFRESH);
-                  break;
-                default:
-              }
-            }
-            return result;
           }
         }
       });
@@ -436,21 +248,38 @@ const IBizHtml = /* @__PURE__ */ vue.defineComponent({
         onClickAI();
       });
       editor.on("lineAiClick", () => {
-        const selectionPosition = editor.getSelectionPosition();
-        if (!selectionPosition || !selectionPosition.left || !selectionPosition.top)
+        const container = editor.getEditableContainer();
+        const hoverToolbar = container.querySelector(".w-e-hover-bar");
+        if (!hoverToolbar) {
           return;
+        }
+        const {
+          offsetLeft,
+          offsetTop,
+          offsetHeight
+        } = hoverToolbar;
         const items = ibiz.inLineAIUtil.calcContextMenus(c.deACMode, (tag) => {
           c.doInLineAIUIAction(tag, c.model.appId);
         });
         if (items.length === 0)
           return;
         const editorBoundingClientRect = editor.getEditableContainer().getBoundingClientRect();
+        const {
+          zIndex
+        } = vue3Util.useUIStore();
+        const popoverZIndex = zIndex.increment();
         ibiz.inLineAIUtil.showContextMenus(
           // 编辑器的左侧距离+选区距离编辑器左侧距离
-          editorBoundingClientRect.x + Number(selectionPosition.left.replace("px", "")),
+          editorBoundingClientRect.x + offsetLeft,
           // 编辑器的上方距离+选区距离编辑器上方距离+悬浮工具栏高度
-          editorBoundingClientRect.y + Number(selectionPosition.top.replace("px", "")) + 42,
-          items
+          editorBoundingClientRect.y + offsetTop + offsetHeight,
+          items,
+          {
+            zIndex: popoverZIndex,
+            onClose: () => {
+              zIndex.decrement();
+            }
+          }
         );
       });
     };