@ibiz-template/vue3-components 0.7.41-alpha.38 → 0.7.41-alpha.39

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

@@ -43,6 +43,13 @@ class CodeEditorController extends runtime.EditorController {
      * @memberof CodeEditorController
      */
     __publicField(this, "currentSelection");
+    /**
+     * AI 聊天自填模式
+     *
+     * @type {boolean}
+     * @memberof CodeEditorController
+     */
+    __publicField(this, "chatCompletion", false);
   }
   /**
    * 语言类型
@@ -78,6 +85,11 @@ class CodeEditorController extends runtime.EditorController {
         appDataEntityId,
         this.context.srfappid
       );
+    if (this.deACMode) {
+      if (this.deACMode.actype === "CHATCOMPLETION") {
+        this.chatCompletion = true;
+      }
+    }
   }
   /**
    * editor 创建完成
@@ -107,33 +119,38 @@ class CodeEditorController extends runtime.EditorController {
    * @param {string} text 文本
    */
   insertText(text) {
-    var _a, _b, _c, _d, _e, _f;
-    const model = (_a = this.editor) == null ? void 0 : _a.getModel();
-    if (!model || !this.monaco)
+    var _a, _b, _c, _d;
+    if (!this.editor || !this.monaco) {
+      throw new core.RuntimeError(ibiz.i18n.t("editor.code.editorNotInit"));
+    }
+    const selections = this.editor.getSelections();
+    if (!selections || selections.length === 0)
       return;
-    const lastLineNumber = model.getLineCount();
-    const lastLineContent = model.getLineContent(lastLineNumber);
-    const lastColumn = lastLineContent.length + 1;
-    (_b = this.editor) == null ? void 0 : _b.executeEdits("", [
+    const activeSelection = selections[selections.length - 1];
+    const insertLine = activeSelection.positionLineNumber;
+    const insertColumn = activeSelection.positionColumn;
+    const formattedText = "\n".concat(text, "\n");
+    (_a = this.editor) == null ? void 0 : _a.executeEdits("", [
       {
         range: new this.monaco.Range(
-          lastLineNumber,
-          lastColumn,
-          lastLineNumber,
-          lastColumn
+          insertLine,
+          insertColumn,
+          insertLine,
+          insertColumn
+          // 光标位置纯插入，不替换任何内容
         ),
-        text
+        text: formattedText
       }
     ]);
-    const newLastLine = lastLineNumber + (text.includes("\n") ? 1 : 0);
-    const newLastColumn = ((_c = text.split("\n").pop()) == null ? void 0 : _c.length) || 0;
-    (_d = this.editor) == null ? void 0 : _d.setPosition(
-      new this.monaco.Position(newLastLine, newLastColumn)
-    );
-    (_e = this.editor) == null ? void 0 : _e.revealPositionInCenter(
-      new this.monaco.Position(newLastLine, newLastColumn)
-    );
-    (_f = this.editor) == null ? void 0 : _f.focus();
+    const linesInText = formattedText.split("\n");
+    const linesAdded = linesInText.length - 1;
+    const lastLineOfInsert = insertLine + linesAdded - 1;
+    const lastLineContent = linesInText[linesInText.length - 2] || "";
+    const newColumn = lastLineContent.length + 1;
+    const newPosition = new this.monaco.Position(lastLineOfInsert, newColumn);
+    (_b = this.editor) == null ? void 0 : _b.setPosition(newPosition);
+    (_c = this.editor) == null ? void 0 : _c.revealPositionInCenter(newPosition);
+    (_d = this.editor) == null ? void 0 : _d.focus();
   }
   /**
    * 替换选中文本
@@ -181,11 +198,37 @@ class CodeEditorController extends runtime.EditorController {
     var _a;
     (_a = this.editor) == null ? void 0 : _a.focus();
   }
+  /**
+   * 获取内联AI编辑器元素
+   */
+  getInLineAiEditorElement() {
+    if (!this.editor) {
+      throw new core.RuntimeError(ibiz.i18n.t("editor.code.editorNotInit"));
+    }
+    return this.editor.getDomNode();
+  }
+  /**
+   * 获取内联AI编辑器主题
+   */
+  getInLineAiEditorTheme() {
+    var _a, _b, _c;
+    const currentTheme = (_c = (_b = (_a = this.editor) == null ? void 0 : _a._themeService) == null ? void 0 : _b._theme) == null ? void 0 : _c.themeName;
+    switch (currentTheme) {
+      case "vs-dark":
+        return "dark";
+      case "vs":
+      default:
+        return "light";
+    }
+  }
   /**
    * 获取内联AI聊天参数
    */
   getInLineAiChatOptions() {
     var _a, _b, _c, _d, _e, _f;
+    if (!this.editor || !this.monaco) {
+      throw new core.RuntimeError(ibiz.i18n.t("editor.code.editorNotInit"));
+    }
     const contentArea = (_b = (_a = this.editor) == null ? void 0 : _a.getDomNode()) == null ? void 0 : _b.querySelector(".editor-scrollable");
     if (!contentArea) {
       throw new core.RuntimeError(ibiz.i18n.t("editor.code.noEditorArea"));
@@ -203,12 +246,16 @@ class CodeEditorController extends runtime.EditorController {
       throw new core.RuntimeError(ibiz.i18n.t("editor.code.noSelCoords"));
     }
     const rect = contentArea.getBoundingClientRect();
+    const layoutInfo = this.editor.getLayoutInfo();
     return {
+      // 编辑器编辑区左侧距离
       left: rect.left,
-      top: editorRect.top + coordinates.top + 28,
-      // 减去 20px 的行高度及 8px 向下偏移
-      width: rect.width - 160
-      // 减去 左侧占位 及 右侧代码预览 边距
+      // 编辑器上方距离 + 选区距离编辑器上方距离 + 行高度
+      top: editorRect.top + coordinates.top + coordinates.height,
+      // 编辑器编辑区宽度 - 代码预览区宽度 - 代码预览区标尺宽度
+      width: rect.width - layoutInfo.minimap.minimapWidth - layoutInfo.overviewRuler.width,
+      editorElement: this.getInLineAiEditorElement(),
+      editorTheme: this.getInLineAiEditorTheme()
     };
   }
   /**

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

@@ -41,6 +41,7 @@ const IBizCode = /* @__PURE__ */ vue.defineComponent({
       [ns.cssVarBlockName("text-editor-toolbar-z-index")]: zIndex.increment()
     });
     const textTBVisible = vue.ref(false);
+    const editorTheme = vue.ref("");
     const editorModel = c.model;
     if (editorModel.editorParams) {
       if (editorModel.editorParams.enableEdit) {
@@ -74,8 +75,9 @@ const IBizCode = /* @__PURE__ */ vue.defineComponent({
     let decorationsCollection;
     let chatInstance;
     const getMonacoTheme = (name) => {
-      var _a;
-      const customTheme = (_a = c == null ? void 0 : c.editorParams) == null ? void 0 : _a.customTheme;
+      var _a, _b;
+      editorTheme.value = ((_a = c == null ? void 0 : c.editorParams) == null ? void 0 : _a.customTheme) || ibiz.config.codeEditorTheme || name;
+      const customTheme = (_b = c == null ? void 0 : c.editorParams) == null ? void 0 : _b.customTheme;
       if (customTheme) {
         return customTheme === "dark" ? "vs-dark" : "vs";
       }
@@ -342,13 +344,15 @@ const IBizCode = /* @__PURE__ */ vue.defineComponent({
           return;
         textTBStyle.value = {
           ...textTBStyle.value,
+          // 编辑器左侧距离 + 选区距离编辑器左侧距离
           [ns.cssVarBlockName("text-editor-toolbar-left")]: "".concat(editorRect.left + coordinates.left, "px"),
-          [ns.cssVarBlockName("text-editor-toolbar-top")]: "".concat(editorRect.top + coordinates.top + 28, "px")
+          // 编辑器上方距离 + 选区距离编辑器上方距离 + 行高度
+          [ns.cssVarBlockName("text-editor-toolbar-top")]: "".concat(editorRect.top + coordinates.top + coordinates.height, "px")
         };
       }
     };
     const setTextTBVisible = () => {
-      if (props.readonly || !enableEdit.value || !c.deACMode)
+      if (props.readonly || !enableEdit.value || !c.deACMode || !c.chatCompletion)
         return;
       const selection = editor == null ? void 0 : editor.getSelection();
       textTBVisible.value = !!(selection && !selection.isEmpty());
@@ -367,14 +371,21 @@ const IBizCode = /* @__PURE__ */ vue.defineComponent({
         return;
       const coordinates = editor == null ? void 0 : editor.getScrolledVisiblePosition(position);
       const editorRect = (_b = editor == null ? void 0 : editor.getDomNode()) == null ? void 0 : _b.getBoundingClientRect();
-      if (!coordinates || !editorRect)
+      const textTBHeight = textTBRef.value.offsetHeight;
+      if (!coordinates || !editorRect || !textTBHeight)
         return;
       const items = ibiz.inLineAIUtil.calcContextMenus(c.deACMode, (tag) => {
         c.doInLineAIUIAction(tag, c.model.appId);
       });
       if (items.length === 0)
         return;
-      ibiz.inLineAIUtil.showContextMenus(editorRect.left + coordinates.left, editorRect.top + coordinates.top + 28 + 40, items);
+      ibiz.inLineAIUtil.showContextMenus(
+        // 编辑器左侧距离 + 选区距离编辑器左侧距离
+        editorRect.left + coordinates.left,
+        // 编辑器上方距离 + 选区距离编辑器上方距离 + 行高度 + 工具栏高度
+        editorRect.top + coordinates.top + coordinates.height + textTBHeight,
+        items
+      );
     };
     const handleEditorClick = (e) => {
       var _a;
@@ -651,6 +662,7 @@ const IBizCode = /* @__PURE__ */ vue.defineComponent({
       readonlyState,
       isLoading,
       textTBRef,
+      editorTheme,
       renderFooter,
       renderHeaderToolbar,
       renderTextEditorToolbar,
@@ -662,7 +674,7 @@ const IBizCode = /* @__PURE__ */ vue.defineComponent({
     var _a, _b;
     const isLoading = !((_b = (_a = this.controller.view) == null ? void 0 : _a.state) == null ? void 0 : _b.isLoading) && this.isLoading;
     return !this.isFullScreen ? vue.withDirectives(vue.createVNode("div", {
-      "class": [this.ns.b(), {
+      "class": [this.ns.b(), this.ns.is(this.editorTheme, !!this.editorTheme), {
         [this.ns.b("editor-readonly")]: this.readonlyState
       }, {
         [this.ns.b("editor-enable")]: !this.readonlyState
@@ -674,7 +686,7 @@ const IBizCode = /* @__PURE__ */ vue.defineComponent({
       "onClose": () => this.changeFullScreenState()
     }, {
       default: () => [vue.withDirectives(vue.createVNode("div", {
-        "class": [this.ns.b(), {
+        "class": [this.ns.b(), this.ns.is(this.editorTheme, !!this.editorTheme), {
           [this.ns.b("editor-readonly")]: this.readonlyState
         }, {
           [this.ns.b("editor-enable")]: !this.readonlyState

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

@@ -1 +1 @@
-.ibiz-code{display:flex;flex-direction:column;width:100%;height:100%}.ibiz-code__box{width:100%;height:100%;min-height:200px;overflow:hidden}.ibiz-code__first-prompt::before{padding-right:var(--ibiz-spacing-base);content:var(--ibiz-code-placeholder)}.ibiz-code-toolbar{position:absolute;top:4px;right:18px;z-index:10;display:flex;align-items:center;justify-content:end;width:auto;height:auto;padding-right:0;font-size:var(--ibiz-font-size-header-6)}.ibiz-code-toolbar>*+*{margin-left:var(--ibiz-spacing-base-loose)}.ibiz-code-toolbar__fullscreen{height:38px;padding:0 12px;font-size:var(--ibiz-font-size-regular);font-style:normal;line-height:2.8;cursor:pointer}.ibiz-code-toolbar__fullscreen:hover{background-color:var(--ibiz-color-bg-3)}.ibiz-code-footer{--ibiz-code-height-text-editor-toolbar:40px;--ibiz-code-footer-toolbar-height:36px;--ibiz-code-footer-button-height:36px;--ibiz-code-text-editor-toolbar-z-index:1;--ibiz-code-text-editor-toolbar-left:0;--ibiz-code-text-editor-toolbar-top:0;display:flex;align-items:center;justify-content:end;width:100%;min-height:var(--ibiz-code-footer-toolbar-height);margin-top:var(--ibiz-spacing-base-tight);margin-right:var(--ibiz-spacing-tight)}.ibiz-code-footer>*+*{margin-left:var(--ibiz-spacing-base)}.ibiz-code-footer__cancel{height:var(--ibiz-code-footer-button-height);line-height:var(--ibiz-code-footer-button-height);color:var(--ibiz-color-text-1);cursor:pointer;opacity:.7}.ibiz-code-footer__cancel:hover{color:var(--ibiz-color-primary);opacity:1}.ibiz-code-footer__save{width:96px;height:var(--ibiz-code-footer-button-height);line-height:var(--ibiz-code-footer-button-height);color:var(--ibiz-color-primary-active-text);text-align:center;cursor:pointer;background-color:var(--ibiz-color-primary);border-radius:var(--ibiz-border-radius-small)}.ibiz-code-footer__save:hover{box-shadow:0 2px 5px 1px var(--ibiz-color-primary)}.ibiz-code-message{width:500px;max-width:unset}.ibiz-code-message__message-content--message-tip{color:var(--ibiz-color-text-3)}.ibiz-code-message__message-cancel{color:var(--ibiz-color-text-1);background-color:transparent}.ibiz-code-message__message-cancel:hover{color:var(--ibiz-color-primary);background-color:transparent}.ibiz-code-message__message-comfire{background-color:var(--ibiz-color-danger)!important}.ibiz-code-message__message-comfire:hover{box-shadow:0 2px 5px 1px var(--ibiz-color-danger)}.ibiz-code-editor-enable{--ibiz-code-height-text-editor-toolbar:40px;--ibiz-code-footer-toolbar-height:36px;--ibiz-code-footer-button-height:36px;--ibiz-code-text-editor-toolbar-z-index:1;--ibiz-code-text-editor-toolbar-left:0;--ibiz-code-text-editor-toolbar-top:0}.ibiz-code-editor-enable .ibiz-code__box{height:100%}.ibiz-code-editor-enable:has(.ibiz-code-footer) .ibiz-code__box{height:calc(100% - var(--ibiz-code-footer-toolbar-height))}.ibiz-code-dialog-full-screen{width:100%!important;height:100%!important;margin:0!important}.ibiz-code-dialog-full-screen .ibiz-code-footer{--ibiz-code-footer-toolbar-height:68px}.ibiz-code-dialog-full-screen .ibiz-code{gap:0;padding:0 var(--ibiz-spacing-extra-loose);--w-e-toolbar-bg-color:var(--ibiz-color-bg-0)}.ibiz-code-dialog-full-screen .ibiz-code .ibiz-code-toolbar{right:calc(var(--ibiz-spacing-extra-loose) + 18px)}.ibiz-code-dialog-full-screen .el-dialog__header{display:none!important}.ibiz-code-dialog-full-screen .el-dialog__body{width:100%;height:100%;padding:0 0 var(--ibiz-spacing-base)}.ibiz-code-dialog-full-screen .el-dialog__body:has(.ibiz-code-footer){padding-bottom:0}.ibiz-code-footer-dialog{margin-top:0}.ibiz-code-text-editor-toolbar{--ibiz-code-height-text-editor-toolbar:40px;--ibiz-code-footer-toolbar-height:36px;--ibiz-code-footer-button-height:36px;--ibiz-code-text-editor-toolbar-z-index:1;--ibiz-code-text-editor-toolbar-left:0;--ibiz-code-text-editor-toolbar-top:0;position:fixed;top:var(--ibiz-code-text-editor-toolbar-top);left:var(--ibiz-code-text-editor-toolbar-left);z-index:var(--ibiz-code-text-editor-toolbar-z-index);display:flex;gap:var(--ibiz-spacing-tight);height:var(--ibiz-code-height-text-editor-toolbar);padding:var(--ibiz-spacing-extra-tight);font-size:var(--ibiz-font-size-regular);background-color:var(--ibiz-color-bg-2);border-radius:var(--ibiz-border-radius-extra-small);box-shadow:var(--ibiz-shadow-elevated)}.ibiz-code-text-editor-toolbar__item{display:flex;align-items:center;justify-content:center;padding:var(--ibiz-spacing-extra-tight) var(--ibiz-spacing-tight);cursor:pointer;border-radius:var(--ibiz-border-radius-extra-small)}.ibiz-code-text-editor-toolbar__item:hover{color:var(--ibiz-color-primary);background-color:var(--ibiz-color-primary-light-default)}
+.ibiz-code{--ibiz-code-color-text-editor-toolbar-bg:var(--ibiz-color-bg-2);--ibiz-code-color-text-editor-toolbar-text:var(--ibiz-color-text-0);--ibiz-code-color-text-editor-toolbar-item-bg-hover:var(--ibiz-color-primary-light-default);--ibiz-code-color-text-editor-toolbar-item-text-hover:var(--ibiz-color-primary);--ibiz-code-height-text-editor-toolbar:40px;--ibiz-code-footer-toolbar-height:36px;--ibiz-code-footer-button-height:36px;--ibiz-code-spacing-code-text-editor-toolbar-padding:var(--ibiz-spacing-extra-tight);--ibiz-code-spacing-code-text-editor-toolbar-item-padding:var(--ibiz-spacing-extra-tight) var(--ibiz-spacing-tight);--ibiz-code-spacing-code-text-editor-toolbar-circle:var(--ibiz-border-radius-extra-small);--ibiz-code-spacing-code-text-editor-toolbar-item-circle:var(--ibiz-border-radius-extra-small);--ibiz-code-text-editor-toolbar-z-index:1;--ibiz-code-text-editor-toolbar-left:0;--ibiz-code-text-editor-toolbar-top:0;display:flex;flex-direction:column;width:100%;height:100%}.ibiz-code__box{width:100%;height:100%;min-height:200px;overflow:hidden}.ibiz-code__first-prompt::before{padding-right:var(--ibiz-spacing-base);content:var(--ibiz-code-placeholder)}.ibiz-code-toolbar{position:absolute;top:4px;right:18px;z-index:10;display:flex;align-items:center;justify-content:end;width:auto;height:auto;padding-right:0;font-size:var(--ibiz-font-size-header-6)}.ibiz-code-toolbar>*+*{margin-left:var(--ibiz-spacing-base-loose)}.ibiz-code-toolbar__fullscreen{height:38px;padding:0 12px;font-size:var(--ibiz-font-size-regular);font-style:normal;line-height:2.8;cursor:pointer}.ibiz-code-toolbar__fullscreen:hover{background-color:var(--ibiz-color-bg-3)}.ibiz-code-footer{display:flex;align-items:center;justify-content:end;width:100%;min-height:var(--ibiz-code-footer-toolbar-height);margin-top:var(--ibiz-spacing-base-tight);margin-right:var(--ibiz-spacing-tight)}.ibiz-code-footer>*+*{margin-left:var(--ibiz-spacing-base)}.ibiz-code-footer__cancel{height:var(--ibiz-code-footer-button-height);line-height:var(--ibiz-code-footer-button-height);color:var(--ibiz-color-text-1);cursor:pointer;opacity:.7}.ibiz-code-footer__cancel:hover{color:var(--ibiz-color-primary);opacity:1}.ibiz-code-footer__save{width:96px;height:var(--ibiz-code-footer-button-height);line-height:var(--ibiz-code-footer-button-height);color:var(--ibiz-color-primary-active-text);text-align:center;cursor:pointer;background-color:var(--ibiz-color-primary);border-radius:var(--ibiz-border-radius-small)}.ibiz-code-footer__save:hover{box-shadow:0 2px 5px 1px var(--ibiz-color-primary)}.ibiz-code-message{width:500px;max-width:unset}.ibiz-code-message__message-content--message-tip{color:var(--ibiz-color-text-3)}.ibiz-code-message__message-cancel{color:var(--ibiz-color-text-1);background-color:transparent}.ibiz-code-message__message-cancel:hover{color:var(--ibiz-color-primary);background-color:transparent}.ibiz-code-message__message-comfire{background-color:var(--ibiz-color-danger)!important}.ibiz-code-message__message-comfire:hover{box-shadow:0 2px 5px 1px var(--ibiz-color-danger)}.ibiz-code-editor-enable .ibiz-code__box{height:100%}.ibiz-code-editor-enable:has(.ibiz-code-footer) .ibiz-code__box{height:calc(100% - var(--ibiz-code-footer-toolbar-height))}.ibiz-code-dialog-full-screen{width:100%!important;height:100%!important;margin:0!important}.ibiz-code-dialog-full-screen .ibiz-code-footer{--ibiz-code-footer-toolbar-height:68px}.ibiz-code-dialog-full-screen .ibiz-code{gap:0;padding:0 var(--ibiz-spacing-extra-loose);--w-e-toolbar-bg-color:var(--ibiz-color-bg-0)}.ibiz-code-dialog-full-screen .ibiz-code .ibiz-code-toolbar{right:calc(var(--ibiz-spacing-extra-loose) + 18px)}.ibiz-code-dialog-full-screen .el-dialog__header{display:none!important}.ibiz-code-dialog-full-screen .el-dialog__body{width:100%;height:100%;padding:0 0 var(--ibiz-spacing-base)}.ibiz-code-dialog-full-screen .el-dialog__body:has(.ibiz-code-footer){padding-bottom:0}.ibiz-code-footer-dialog{margin-top:0}.ibiz-code-text-editor-toolbar{position:fixed;top:var(--ibiz-code-text-editor-toolbar-top);left:var(--ibiz-code-text-editor-toolbar-left);z-index:var(--ibiz-code-text-editor-toolbar-z-index);display:flex;gap:var(--ibiz-spacing-tight);height:var(--ibiz-code-height-text-editor-toolbar);padding:var(--ibiz-code-spacing-code-text-editor-toolbar-padding);font-size:var(--ibiz-font-size-regular);color:var(--ibiz-code-color-text-editor-toolbar-text);background-color:var(--ibiz-code-color-text-editor-toolbar-bg);border-radius:var(--ibiz-code-spacing-code-text-editor-toolbar-circle);box-shadow:var(--ibiz-shadow-elevated)}.ibiz-code-text-editor-toolbar__item{display:flex;align-items:center;justify-content:center;padding:var(--ibiz-code-spacing-code-text-editor-toolbar-item-padding);cursor:pointer;border-radius:var(--ibiz-code-spacing-code-text-editor-toolbar-item-circle)}.ibiz-code-text-editor-toolbar__item:hover{color:var(--ibiz-code-color-text-editor-toolbar-item-text-hover);background-color:var(--ibiz-code-color-text-editor-toolbar-item-bg-hover)}.ibiz-code.is-dark{--ibiz-code-color-text-editor-toolbar-bg:rgb(53, 54, 60);--ibiz-code-color-text-editor-toolbar-text:rgb(249, 249, 249);--ibiz-code-color-text-editor-toolbar-item-bg-hover:rgba(255, 255, 255, 0.12);--ibiz-code-color-text-editor-toolbar-item-text-hover:rgb(249, 249, 249)}

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

@@ -300,7 +300,24 @@ class HtmlEditorController extends runtime.EditorController {
    */
   insertText(text) {
     if (this.wangEditor) {
-      this.wangEditor.insertText(text);
+      const newParagraph = {
+        type: "paragraph",
+        children: [{ text }]
+      };
+      const selection = this.wangEditor.selection;
+      if (selection) {
+        const collapsedSelection = {
+          anchor: selection.anchor,
+          focus: selection.anchor
+        };
+        if (selection.anchor.path !== selection.focus.path || selection.anchor.offset !== selection.focus.offset) {
+          collapsedSelection.anchor = selection.focus;
+          collapsedSelection.focus = selection.focus;
+        }
+        this.wangEditor.select(collapsedSelection);
+      }
+      this.wangEditor.insertNode(newParagraph);
+      this.wangEditor.move(1);
     }
   }
   /**
@@ -309,8 +326,12 @@ class HtmlEditorController extends runtime.EditorController {
    */
   replaceSelectionText(text) {
     if (this.wangEditor) {
-      this.wangEditor.deleteFragment();
-      this.wangEditor.insertText(text);
+      if (this.wangEditor.selection) {
+        this.wangEditor.deleteFragment();
+        this.wangEditor.insertText(text);
+      } else {
+        this.wangEditor.insertText(text);
+      }
     }
   }
   /**
@@ -321,6 +342,25 @@ class HtmlEditorController extends runtime.EditorController {
       this.wangEditor.restoreSelection();
     }
   }
+  /**
+   * 获取内联AI编辑器元素
+   */
+  getInLineAiEditorElement() {
+    if (!this.wangEditor) {
+      throw new core.RuntimeError("\u7F16\u8F91\u5668\u672A\u521D\u59CB\u5316");
+    }
+    return this.wangEditor.getEditableContainer();
+  }
+  /**
+   * 获取内联AI编辑器主题
+   */
+  getInLineAiEditorTheme() {
+    const appTheme = ibiz.util.theme.getTheme();
+    if (appTheme.indexOf("dark") !== -1) {
+      return "dark";
+    }
+    return "light";
+  }
   /**
    * 获取内联AI参数
    */
@@ -333,9 +373,14 @@ class HtmlEditorController extends runtime.EditorController {
       throw new core.RuntimeError("\u83B7\u53D6\u9009\u533A\u4F4D\u7F6E\u5931\u8D25");
     const editorBoundingClientRect = this.wangEditor.getEditableContainer().getBoundingClientRect();
     return {
+      // 编辑器的左侧距离 + 默认padding
       left: editorBoundingClientRect.x + 10,
+      // 编辑器的上方距离+选区距离编辑器上方距离
       top: editorBoundingClientRect.y + Number(selectionPosition.top.replace("px", "")),
-      width: editorBoundingClientRect.width - 20
+      // 编辑器的宽度 - 左右padding
+      width: editorBoundingClientRect.width - 20,
+      editorElement: this.getInLineAiEditorElement(),
+      editorTheme: this.getInLineAiEditorTheme()
     };
   }
   /**

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

@@ -433,7 +433,13 @@ const IBizHtml = /* @__PURE__ */ vue.defineComponent({
         if (items.length === 0)
           return;
         const editorBoundingClientRect = editor.getEditableContainer().getBoundingClientRect();
-        ibiz.inLineAIUtil.showContextMenus(editorBoundingClientRect.x + Number(selectionPosition.left.replace("px", "")), editorBoundingClientRect.y + Number(selectionPosition.top.replace("px", "")) + 60, items);
+        ibiz.inLineAIUtil.showContextMenus(
+          // 编辑器的左侧距离+选区距离编辑器左侧距离
+          editorBoundingClientRect.x + Number(selectionPosition.left.replace("px", "")),
+          // 编辑器的上方距离+选区距离编辑器上方距离+悬浮工具栏高度
+          editorBoundingClientRect.y + Number(selectionPosition.top.replace("px", "")) + 42,
+          items
+        );
       });
     };
     const handleChange = (editor) => {

package/lib/editor/markdown/ibiz-markdown-editor/custom-menu.cjs

@@ -11,15 +11,11 @@ function initCustomMenu(c) {
       content: "<svg\n                viewBox='0 0 16 16'\n                xmlns='http://www.w3.org/2000/svg'\n                fill='currentColor'\n                height='1em'\n                width='1em'\n                preserveAspectRatio='xMidYMid meet'\n                focusable='false'\n              >\n                <g\n                  id='aae1.Base\u57FA\u7840/1.icon\u56FE\u6807/2.normal/ai-star'\n                  stroke-width='1'\n                  fill-rule='evenodd'\n                >\n                  <path\n                    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'\n                    id='aae\u5F62\u72B6\u7ED3\u5408'\n                  ></path>\n                </g>\n              </svg>\n            "
     },
     onClick: (_selection, _menukey, event) => {
-      var _a, _b;
-      const startPos = (_a = c.mdeditor) == null ? void 0 : _a.editor.editor.getCursor("start");
-      const endPos = (_b = c.mdeditor) == null ? void 0 : _b.editor.editor.getCursor("end");
-      c.setCursorPos(startPos, endPos);
       event.stopPropagation();
       event.preventDefault();
       vue.nextTick(() => {
-        var _a2;
-        if ((_a2 = c.mdeditor) == null ? void 0 : _a2.bubble) {
+        var _a;
+        if ((_a = c.mdeditor) == null ? void 0 : _a.bubble) {
           c.mdeditor.bubble.visible = true;
           const selectionPosition = c.mdeditor.bubble.bubbleDom.getBoundingClientRect();
           if (!selectionPosition || !selectionPosition.left || !selectionPosition.top)
@@ -33,8 +29,10 @@ function initCustomMenu(c) {
           if (items.length === 0)
             return;
           ibiz.inLineAIUtil.showContextMenus(
+            // 浮动工具栏的左侧距离
             selectionPosition.left,
-            selectionPosition.top + 60,
+            // 浮动工具栏的顶部距离 + 浮动工具栏的高度
+            selectionPosition.top + 43,
             items
           );
         }

package/lib/editor/markdown/ibiz-markdown-editor/ibiz-markdown-editor.cjs

@@ -215,12 +215,37 @@ const IBizMarkDown = /* @__PURE__ */ vue.defineComponent({
     const handleKeyDown = (_e) => {
       _e.stopPropagation();
       if (_e.key === "Escape") {
+        _e.preventDefault();
         if (isFullscreen()) {
           closeFullscreen();
           isFullScreen.value = false;
         }
       }
     };
+    const changeMainTheme = (_theme) => {
+      c == null ? void 0 : c.setCurrentEditorTheme(_theme);
+    };
+    const selectionChange = (event) => {
+      var _a2, _b2;
+      const {
+        info
+      } = event;
+      let isForwardSelection = true;
+      const firstRange = info.ranges && info.ranges[0];
+      if (!firstRange) {
+        isForwardSelection = true;
+      } else {
+        const {
+          anchor,
+          head
+        } = firstRange;
+        isForwardSelection = c.isPositionBefore(anchor, head);
+      }
+      const startPos = (_a2 = c.mdeditor) == null ? void 0 : _a2.editor.editor.getCursor("start");
+      const endPos = (_b2 = c.mdeditor) == null ? void 0 : _b2.editor.editor.getCursor("end");
+      c.setCursorPos(startPos, endPos);
+      c.setSelectionDirection(isForwardSelection);
+    };
     const editorInit = () => {
       if (props.disabled || props.readonly || showmode === "manual") {
         defaultModel.value = "previewOnly";
@@ -228,7 +253,7 @@ const IBizMarkDown = /* @__PURE__ */ vue.defineComponent({
       vue.nextTick(() => {
         var _a2;
         const bubble = ["bold", "italic", "underline", "strikethrough", "sub", "sup", "|", "size", "color"];
-        if (c.editorParams.ac && c.deACMode) {
+        if (c && c.chatCompletion) {
           bubble.unshift("AI");
         }
         editor = new Cherry({
@@ -294,6 +319,10 @@ const IBizMarkDown = /* @__PURE__ */ vue.defineComponent({
             afterChange,
             beforeImageMounted
           },
+          event: {
+            changeMainTheme,
+            selectionChange
+          },
           engine: {
             syntax: {
               table: {
@@ -314,7 +343,7 @@ const IBizMarkDown = /* @__PURE__ */ vue.defineComponent({
         span.appendChild(createCherryIcon("fullscreen"));
         const parentElement = props.disabled ? editor.editor.options.editorDom.parentElement : (_a2 = editor.editor.options.editorDom.parentElement) == null ? void 0 : _a2.querySelector(".cherry-toolbar>.toolbar-right");
         parentElement == null ? void 0 : parentElement.appendChild(span);
-        c.setMDEditor(editor);
+        c == null ? void 0 : c.setMDEditor(editor);
       });
     };
     vue.watch(() => UIStore.theme, (newVal) => {
@@ -370,9 +399,14 @@ const IBizMarkDown = /* @__PURE__ */ vue.defineComponent({
       isIgnoreChange = false;
       onResetEditState();
     };
+    const onFocusEditor = () => {
+      const target = document.getElementById(id);
+      target == null ? void 0 : target.focus();
+    };
     const renderHeader = () => {
       if (showmode === "manual" && !isEditing.value) {
         return vue.createVNode("div", {
+          "onClick": onFocusEditor,
           "class": [ns.e("header"), ns.is("fullscreen", isFullScreen.value)]
         }, [!props.disabled && !props.readonly && vue.createVNode("div", {
           "class": ns.em("header", "edit"),
@@ -398,6 +432,7 @@ const IBizMarkDown = /* @__PURE__ */ vue.defineComponent({
     const renderFooter = () => {
       if (showmode === "manual" && isEditing.value && !props.disabled && !props.readonly) {
         return vue.createVNode("div", {
+          "onClick": onFocusEditor,
           "class": [ns.e("footer"), ns.is("fullscreen", isFullScreen.value)]
         }, [vue.createVNode("div", {
           "class": ns.em("footer", "cancel"),
@@ -409,12 +444,14 @@ const IBizMarkDown = /* @__PURE__ */ vue.defineComponent({
       }
     };
     vue.onMounted(() => {
+      var _a2;
       editorInit();
       calcMarkDownStyle();
-      document.addEventListener("keydown", handleKeyDown.bind(this));
+      (_a2 = markDownBox.value) == null ? void 0 : _a2.addEventListener("keydown", handleKeyDown.bind(this));
     });
     vue.onBeforeUnmount(() => {
-      document.removeEventListener("keydown", handleKeyDown.bind(this));
+      var _a2;
+      (_a2 = markDownBox.value) == null ? void 0 : _a2.removeEventListener("keydown", handleKeyDown.bind(this));
     });
     vue.onUnmounted(() => {
       editor = null;
@@ -446,6 +483,7 @@ const IBizMarkDown = /* @__PURE__ */ vue.defineComponent({
       "ref": "markDownBox",
       "class": [this.ns.b(), this.ns.is("disabled", this.disabled), this.ns.is("manual", this.showmode === "manual"), this.ns.is("editing", this.isEditing)]
     }, [this.renderHeader(), this.renderFooter(), vue.createVNode("div", {
+      "tabindex": "-1",
       "id": this.id,
       "style": this.cssVars,
       "class": this.ns.b("cherry")

package/lib/editor/markdown/ibiz-markdown-editor/ibiz-markdown-editor.css

@@ -1 +1 @@
-.ibiz-markdown{--ibiz-markdown-width:100%;--ibiz-markdown-color-manual-toolbar-bg-save:var(--ibiz-color-primary);--ibiz-markdown-color-manual-toolbar-text-save:var(--ibiz-color-primary-active-text);--ibiz-markdown-color-manual-toolbar-text-cancel:var(--ibiz-color-text-1);--ibiz-markdown-color-manual-toolbar-text-cancel-hover:var(--ibiz-color-primary);--ibiz-markdown-spacing-manual-toolbar-height:32px;--ibiz-markdown-spacing-manual-toolbar-gap:var(--ibiz-spacing-base);--ibiz-markdown-spacing-manual-toolbar-item-padding:0 var(--ibiz-spacing-base);--ibiz-markdown-spacing-manual-toolbar-margin:var(--ibiz-spacing-base-tight) var(--ibiz-spacing-tight) 0 0;--ibiz-markdown-spacing-manual-toolbar-fullscreen-height:var(--ibiz-height-control-default);--ibiz-markdown-spacing-manual-toolbar-fullscreen-padding:0 var(--ibiz-spacing-extra-loose);--ibiz-markdown-spacing-manual-toolbar-fullscreen-height-header:var(--ibiz-spacing-super-loose);--ibiz-markdown-height-manual-toolbar-height:var(--ibiz-height-control-default);--ibiz-markdown-border-radius-manual-toolbar-item:var(--ibiz-border-radius-small);--ibiz-markdown-border-manual-toolbar-fullscreen-footer:1px solid var(--ibiz-color-border)}.ibiz-markdown__header{display:flex;flex-shrink:0;gap:var(--ibiz-markdown-spacing-manual-toolbar-gap);align-items:center;justify-content:end;height:var(--ibiz-markdown-spacing-manual-toolbar-height)}.ibiz-markdown__header--edit{cursor:pointer}.ibiz-markdown__header--full{cursor:pointer}.ibiz-markdown__header.is-fullscreen{position:fixed;top:0;right:0;left:0;z-index:999;width:100%;height:calc(var(--ibiz-markdown-spacing-manual-toolbar-fullscreen-height-header));padding:var(--ibiz-markdown-spacing-manual-toolbar-fullscreen-padding);margin-top:0;background-color:var(--ibiz-view-bg-color)}.ibiz-markdown__header.is-fullscreen+.ibiz-markdown-cherry .cherry.fullscreen{top:calc(var(--ibiz-markdown-spacing-manual-toolbar-fullscreen-height-header));height:calc(100% - var(--ibiz-markdown-spacing-manual-toolbar-fullscreen-height-header))}.ibiz-markdown__footer{display:flex;gap:var(--ibiz-markdown-spacing-manual-toolbar-gap);align-items:center;justify-content:end;height:var(--ibiz-markdown-spacing-manual-toolbar-height);margin:var(--ibiz-markdown-spacing-manual-toolbar-margin)}.ibiz-markdown__footer--save{height:var(--ibiz-markdown-height-manual-toolbar-height);padding:var(--ibiz-markdown-spacing-manual-toolbar-item-padding);line-height:var(--ibiz-markdown-height-manual-toolbar-height);color:var(--ibiz-markdown-color-manual-toolbar-text-save);text-align:center;cursor:pointer;background-color:var(--ibiz-markdown-color-manual-toolbar-bg-save);border-radius:var(--ibiz-markdown-border-radius-manual-toolbar-item)}.ibiz-markdown__footer--cancel{color:var(--ibiz-markdown-color-manual-toolbar-text-cancel);cursor:pointer}.ibiz-markdown__footer--cancel:hover{color:var(--ibiz-markdown-color-manual-toolbar-text-cancel-hover)}.ibiz-markdown__footer.is-fullscreen{position:fixed;right:0;bottom:0;left:0;z-index:999;width:100%;height:calc(var(--ibiz-markdown-spacing-manual-toolbar-fullscreen-height) * 2);padding:var(--ibiz-markdown-spacing-manual-toolbar-fullscreen-padding);margin-top:0;background-color:var(--ibiz-view-bg-color);border-top:var(--ibiz-markdown-border-manual-toolbar-fullscreen-footer)}.ibiz-markdown__footer.is-fullscreen+.ibiz-markdown-cherry .cherry.fullscreen{height:calc(100% - var(--ibiz-markdown-spacing-manual-toolbar-fullscreen-height) * 2)}.ibiz-markdown .ibiz-markdown-cherry{width:var(--ibiz-markdown-width)}.ibiz-markdown .ibiz-markdown-cherry .cherry{width:100%;border:1px solid var(--ibiz-color-border);box-shadow:none}.ibiz-markdown .ibiz-markdown-cherry .cherry .cherry-toolbar{background-color:var(--ibiz-color-bg-0);box-shadow:none}.ibiz-markdown .ibiz-markdown-cherry .cherry .cherry-editor{border-top:1px solid var(--ibiz-color-border)}.ibiz-markdown .ibiz-markdown-cherry .cherry .cherry-previewer{border-top:1px solid var(--ibiz-color-border)}.ibiz-markdown .ibiz-markdown-cherry .cherry .cherry-sidebar{border-left:1px solid var(--ibiz-color-border);box-shadow:none}.ibiz-markdown.is-disabled .cherry{min-height:auto}.ibiz-markdown.is-disabled .ibiz-markdown__fullscreen{position:absolute;top:8px;right:12px;z-index:98;font-size:var(--ibiz-font-size-regular);line-height:2.8}.ibiz-markdown.is-disabled .theme__dark .ibiz-markdown__fullscreen{color:var(--ibiz-color-text-0)}.ibiz-markdown.is-disabled .theme__dark .ibiz-markdown__fullscreen:hover{background-color:var(--ibiz-color-bg-3)}.ibiz-markdown.is-manual{display:flex;flex-direction:column}.ibiz-markdown.is-manual .ibiz-markdown-cherry{flex-grow:1;height:calc(100% - var(--ibiz-markdown-spacing-manual-toolbar-height))!important}.ibiz-markdown.is-manual.is-editing{flex-direction:column-reverse}.ibiz-markdown .cherry-preview--full{border-left:none}.ibiz-markdown .theme__dark,.ibiz-markdown .theme__light{color:var(--ibiz-form-item-text-color)}.ibiz-markdown .cherry-markdown h1 a::before,.ibiz-markdown .cherry-markdown h2 a::before,.ibiz-markdown .cherry-markdown h3 a::before,.ibiz-markdown .cherry-markdown h4 a::before,.ibiz-markdown .cherry-markdown h5 a::before,.ibiz-markdown .cherry-markdown h6 a::before{display:none}.ibiz-markdown .cherry.fullscreen{z-index:999}
+.ibiz-markdown{--ibiz-markdown-width:100%;--ibiz-markdown-color-manual-toolbar-bg-save:var(--ibiz-color-primary);--ibiz-markdown-color-manual-toolbar-text-save:var(--ibiz-color-primary-active-text);--ibiz-markdown-color-manual-toolbar-text-cancel:var(--ibiz-color-text-1);--ibiz-markdown-color-manual-toolbar-text-cancel-hover:var(--ibiz-color-primary);--ibiz-markdown-spacing-manual-toolbar-height:32px;--ibiz-markdown-spacing-manual-toolbar-gap:var(--ibiz-spacing-base);--ibiz-markdown-spacing-manual-toolbar-item-padding:0 var(--ibiz-spacing-base);--ibiz-markdown-spacing-manual-toolbar-margin:var(--ibiz-spacing-base-tight) var(--ibiz-spacing-tight) 0 0;--ibiz-markdown-spacing-manual-toolbar-fullscreen-height:var(--ibiz-height-control-default);--ibiz-markdown-spacing-manual-toolbar-fullscreen-padding:0 var(--ibiz-spacing-extra-loose);--ibiz-markdown-spacing-manual-toolbar-fullscreen-height-header:var(--ibiz-spacing-super-loose);--ibiz-markdown-height-manual-toolbar-height:var(--ibiz-height-control-default);--ibiz-markdown-border-radius-manual-toolbar-item:var(--ibiz-border-radius-small);--ibiz-markdown-border-manual-toolbar-fullscreen-footer:1px solid var(--ibiz-color-border)}.ibiz-markdown__header{display:flex;flex-shrink:0;gap:var(--ibiz-markdown-spacing-manual-toolbar-gap);align-items:center;justify-content:end;height:var(--ibiz-markdown-spacing-manual-toolbar-height)}.ibiz-markdown__header--edit{cursor:pointer}.ibiz-markdown__header--full{cursor:pointer}.ibiz-markdown__header.is-fullscreen{position:fixed;top:0;right:0;left:0;z-index:999;width:100%;height:calc(var(--ibiz-markdown-spacing-manual-toolbar-fullscreen-height-header));padding:var(--ibiz-markdown-spacing-manual-toolbar-fullscreen-padding);margin-top:0;background-color:var(--ibiz-view-bg-color)}.ibiz-markdown__header.is-fullscreen+.ibiz-markdown-cherry .cherry.fullscreen{top:calc(var(--ibiz-markdown-spacing-manual-toolbar-fullscreen-height-header));height:calc(100% - var(--ibiz-markdown-spacing-manual-toolbar-fullscreen-height-header))}.ibiz-markdown__footer{display:flex;gap:var(--ibiz-markdown-spacing-manual-toolbar-gap);align-items:center;justify-content:end;height:var(--ibiz-markdown-spacing-manual-toolbar-height);margin:var(--ibiz-markdown-spacing-manual-toolbar-margin)}.ibiz-markdown__footer--save{height:var(--ibiz-markdown-height-manual-toolbar-height);padding:var(--ibiz-markdown-spacing-manual-toolbar-item-padding);line-height:var(--ibiz-markdown-height-manual-toolbar-height);color:var(--ibiz-markdown-color-manual-toolbar-text-save);text-align:center;cursor:pointer;background-color:var(--ibiz-markdown-color-manual-toolbar-bg-save);border-radius:var(--ibiz-markdown-border-radius-manual-toolbar-item)}.ibiz-markdown__footer--cancel{color:var(--ibiz-markdown-color-manual-toolbar-text-cancel);cursor:pointer}.ibiz-markdown__footer--cancel:hover{color:var(--ibiz-markdown-color-manual-toolbar-text-cancel-hover)}.ibiz-markdown__footer.is-fullscreen{position:fixed;right:0;bottom:0;left:0;z-index:999;width:100%;height:calc(var(--ibiz-markdown-spacing-manual-toolbar-fullscreen-height) * 2);padding:var(--ibiz-markdown-spacing-manual-toolbar-fullscreen-padding);margin-top:0;background-color:var(--ibiz-view-bg-color);border-top:var(--ibiz-markdown-border-manual-toolbar-fullscreen-footer)}.ibiz-markdown__footer.is-fullscreen+.ibiz-markdown-cherry .cherry.fullscreen{height:calc(100% - var(--ibiz-markdown-spacing-manual-toolbar-fullscreen-height) * 2)}.ibiz-markdown .ibiz-markdown-cherry{width:var(--ibiz-markdown-width);outline:0}.ibiz-markdown .ibiz-markdown-cherry .cherry{width:100%;border:1px solid var(--ibiz-color-border);box-shadow:none}.ibiz-markdown .ibiz-markdown-cherry .cherry .cherry-toolbar{background-color:var(--ibiz-color-bg-0);box-shadow:none}.ibiz-markdown .ibiz-markdown-cherry .cherry .cherry-editor{border-top:1px solid var(--ibiz-color-border)}.ibiz-markdown .ibiz-markdown-cherry .cherry .cherry-previewer{border-top:1px solid var(--ibiz-color-border)}.ibiz-markdown .ibiz-markdown-cherry .cherry .cherry-sidebar{border-left:1px solid var(--ibiz-color-border);box-shadow:none}.ibiz-markdown.is-disabled .cherry{min-height:auto}.ibiz-markdown.is-disabled .ibiz-markdown__fullscreen{position:absolute;top:8px;right:12px;z-index:98;font-size:var(--ibiz-font-size-regular);line-height:2.8}.ibiz-markdown.is-disabled .theme__dark .ibiz-markdown__fullscreen{color:var(--ibiz-color-text-0)}.ibiz-markdown.is-disabled .theme__dark .ibiz-markdown__fullscreen:hover{background-color:var(--ibiz-color-bg-3)}.ibiz-markdown.is-manual{display:flex;flex-direction:column}.ibiz-markdown.is-manual .ibiz-markdown-cherry{flex-grow:1;height:calc(100% - var(--ibiz-markdown-spacing-manual-toolbar-height))!important}.ibiz-markdown.is-manual.is-editing{flex-direction:column-reverse}.ibiz-markdown .cherry-preview--full{border-left:none}.ibiz-markdown .theme__dark,.ibiz-markdown .theme__light{color:var(--ibiz-form-item-text-color)}.ibiz-markdown .cherry-markdown h1 a::before,.ibiz-markdown .cherry-markdown h2 a::before,.ibiz-markdown .cherry-markdown h3 a::before,.ibiz-markdown .cherry-markdown h4 a::before,.ibiz-markdown .cherry-markdown h5 a::before,.ibiz-markdown .cherry-markdown h6 a::before{display:none}.ibiz-markdown .cherry.fullscreen{z-index:999}