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

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

@@ -1,6 +1,8 @@
 'use strict';
 
+var core = require('@ibiz-template/core');
 var runtime = require('@ibiz-template/runtime');
+var ramda = require('ramda');
 
 "use strict";
 var __defProp = Object.defineProperty;
@@ -19,6 +21,43 @@ class CodeEditorController extends runtime.EditorController {
      * @memberof CodeEditorController
      */
     __publicField(this, "deACMode");
+    /**
+     * editor 实例
+     *
+     * @private
+     * @type {Monaco.editor.IStandaloneCodeEditor}
+     * @memberof HtmlEditorController
+     */
+    __publicField(this, "editor");
+    /**
+     * monaco 实例
+     *
+     * @private
+     * @type {IMonaco}
+     * @memberof CodeEditorController
+     */
+    __publicField(this, "monaco");
+    /**
+     * editor 当前选区
+     *
+     * @type {monaco.Selection}
+     * @memberof CodeEditorController
+     */
+    __publicField(this, "currentSelection");
+    /**
+     * AI 聊天自填模式
+     *
+     * @type {boolean}
+     * @memberof CodeEditorController
+     */
+    __publicField(this, "chatCompletion", false);
+    /**
+     * AI行内聊天框高度
+     *
+     * @type {number}
+     * @memberof CodeEditorController
+     */
+    __publicField(this, "inlineAiChatHeight");
   }
   /**
    * 语言类型
@@ -47,6 +86,12 @@ class CodeEditorController extends runtime.EditorController {
    */
   async onInit() {
     await super.onInit();
+    if (this.editorParams) {
+      const { inlineaichatheight } = this.editorParams;
+      if (inlineaichatheight) {
+        this.inlineAiChatHeight = Number(inlineaichatheight);
+      }
+    }
     const { appDEACModeId, appDataEntityId } = this.model;
     if (appDEACModeId)
       this.deACMode = await runtime.getDeACMode(
@@ -54,6 +99,199 @@ class CodeEditorController extends runtime.EditorController {
         appDataEntityId,
         this.context.srfappid
       );
+    if (this.deACMode) {
+      if (this.deACMode.actype === "CHATCOMPLETION") {
+        this.chatCompletion = true;
+      }
+    }
+  }
+  /**
+   * editor 创建完成
+   *
+   * @private
+   * @param {Monaco.editor.IStandaloneCodeEditor} editor
+   */
+  onCreated(editor, monaco) {
+    this.editor = editor;
+    this.monaco = monaco;
+  }
+  /**
+   * 获取选中文本
+   * @return {*}  {string} 选中文本
+   */
+  getSelectionText() {
+    var _a, _b, _c;
+    const selection = (_a = this.editor) == null ? void 0 : _a.getSelection();
+    let selectedText;
+    if (selection) {
+      selectedText = (_c = (_b = this.editor) == null ? void 0 : _b.getModel()) == null ? void 0 : _c.getValueInRange(selection);
+    }
+    return selectedText || "";
+  }
+  /**
+   * 插入文本
+   * @param {string} text 文本
+   */
+  insertText(text) {
+    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 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(
+          insertLine,
+          insertColumn,
+          insertLine,
+          insertColumn
+          // 光标位置纯插入，不替换任何内容
+        ),
+        text: formattedText
+      }
+    ]);
+    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();
+  }
+  /**
+   * 替换选中文本
+   * @param {string} text
+   */
+  replaceSelectionText(text) {
+    var _a;
+    const selection = (_a = this.editor) == null ? void 0 : _a.getSelection();
+    if (!selection || selection.isEmpty() || !this.monaco || !this.editor) {
+      return;
+    }
+    const startPosition = selection.getStartPosition();
+    this.editor.executeEdits("", [
+      {
+        range: selection,
+        text
+      }
+    ]);
+    const textLines = text.split("\n");
+    const lineCount = textLines.length;
+    const lastLineChars = textLines[lineCount - 1].length;
+    let finalLineNumber;
+    let finalColumn;
+    if (lineCount === 1) {
+      finalLineNumber = startPosition.lineNumber;
+      finalColumn = startPosition.column + lastLineChars;
+    } else {
+      finalLineNumber = startPosition.lineNumber + (lineCount - 1);
+      finalColumn = 1 + lastLineChars;
+    }
+    const newSelection = new this.monaco.Range(
+      finalLineNumber,
+      finalColumn,
+      finalLineNumber,
+      finalColumn
+    );
+    this.editor.createDecorationsCollection().clear();
+    this.editor.setSelection(newSelection);
+    this.editor.focus();
+  }
+  /**
+   * 恢复选取
+   */
+  restoreSelection() {
+    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"));
+    }
+    const position = (_c = this.currentSelection) == null ? void 0 : _c.getStartPosition();
+    if (!position) {
+      throw new core.RuntimeError(ibiz.i18n.t("editor.code.noSelStart"));
+    }
+    const coordinates = (_d = this.editor) == null ? void 0 : _d.getScrolledVisiblePosition(position);
+    const editorRect = (_f = (_e = this.editor) == null ? void 0 : _e.getDomNode()) == null ? void 0 : _f.getBoundingClientRect();
+    if (!editorRect) {
+      throw new core.RuntimeError(ibiz.i18n.t("editor.code.noEditorRect"));
+    }
+    if (!coordinates) {
+      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 + coordinates.height,
+      // 编辑器编辑区宽度 - 代码预览区宽度 - 代码预览区标尺宽度
+      width: rect.width - layoutInfo.minimap.minimapWidth - layoutInfo.overviewRuler.width,
+      editorElement: this.getInLineAiEditorElement(),
+      editorTheme: this.getInLineAiEditorTheme(),
+      height: this.inlineAiChatHeight
+    };
+  }
+  /**
+   * 执行内联AIUI操作
+   * @param uiActionId
+   * @param appId
+   */
+  async doInLineAIUIAction(uiActionId, appId) {
+    const eventArgs = this.ctrl.getEventArgs();
+    eventArgs.params = ramda.clone(eventArgs.params);
+    eventArgs.params.editor = this;
+    if (this.editorParams.srfaiappendcurdata && this.editorParams.srfaiappendcurdata === "true") {
+      eventArgs.context.srfaiappendcurdata = true;
+    }
+    await runtime.UIActionUtil.exec(
+      uiActionId,
+      {
+        ...eventArgs
+      },
+      appId
+    );
   }
 }
 

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

@@ -4,13 +4,11 @@ var vue = require('vue');
 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.4.0_monaco-editor@0.45.0/node_modules/@monaco-editor/loader/lib/es/index.cjs');
+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('../../../util/index.cjs');
 require('./monaco-editor.css');
-var aiUtil = require('../../../util/ai-util/ai-util.cjs');
-var index = require('../../../node_modules/.pnpm/@monaco-editor_loader@1.4.0_monaco-editor@0.45.0/node_modules/@monaco-editor/loader/lib/es/loader/index.cjs');
+var index = require('../../../node_modules/.pnpm/@monaco-editor_loader@1.5.0/node_modules/@monaco-editor/loader/lib/es/loader/index.cjs');
 
 "use strict";
 const IBizCode = /* @__PURE__ */ vue.defineComponent({
@@ -25,12 +23,22 @@ const IBizCode = /* @__PURE__ */ vue.defineComponent({
     const c = props.controller;
     const UUID = qxUtil.createUUID();
     const currentVal = vue.ref("");
+    const {
+      UIStore,
+      zIndex
+    } = vue3Util.useUIStore();
     const enableEdit = vue.ref(true);
     const hasEnableEdit = vue.ref(false);
     const readonlyState = vue.ref(false);
     const enableFullScreen = vue.ref(false);
     const isFullScreen = vue.ref(false);
     const isLoading = vue.ref(false);
+    const textTBRef = vue.ref();
+    const textTBStyle = vue.ref({
+      [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) {
@@ -38,9 +46,17 @@ const IBizCode = /* @__PURE__ */ vue.defineComponent({
         readonlyState.value = true;
         enableEdit.value = c.toBoolean(editorModel.editorParams.enableEdit) && !props.readonly && !props.disabled;
       }
+      if (editorModel.editorParams.enableedit) {
+        hasEnableEdit.value = true;
+        readonlyState.value = true;
+        enableEdit.value = c.toBoolean(editorModel.editorParams.enableedit) && !props.readonly && !props.disabled;
+      }
       if (editorModel.editorParams.enableFullScreen) {
         enableFullScreen.value = c.toBoolean(editorModel.editorParams.enableFullScreen);
       }
+      if (editorModel.editorParams.enablefullscreen) {
+        enableFullScreen.value = c.toBoolean(editorModel.editorParams.enablefullscreen);
+      }
     }
     let editor;
     let monacoEditor;
@@ -48,16 +64,16 @@ const IBizCode = /* @__PURE__ */ vue.defineComponent({
     let inlineCompletionsProviderDisposable;
     let decorationsCollection;
     let chatInstance;
-    const {
-      UIStore,
-      zIndex
-    } = vue3Util.useUIStore();
     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";
       }
+      if (ibiz.config.codeEditorTheme) {
+        return ibiz.config.codeEditorTheme === "dark" ? "vs-dark" : "vs";
+      }
       return name === "dark" ? "vs-".concat(UIStore.theme) : "vs";
     };
     vue.watch(() => UIStore.theme, (newVal) => {
@@ -103,19 +119,24 @@ 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
-      } = aiUtil.calcAiToolbarItemsByAc(c.deACMode);
-      const module = await import('@ibiz-template-plugin/ai-chat');
-      chatInstance = module.chat || module.default.chat;
+      } = ibiz.aiChatUtil.calcAiToolbarItemsByAc(c.deACMode);
+      const {
+        containerOptions,
+        chatOptions
+      } = ibiz.aiChatUtil.getEditorExAIChatParams(c.editorParams, c.context, c.params, props.data);
+      chatInstance = await ibiz.aiChatUtil.getAIChat();
       let id = "";
       let abortController;
       chatInstance.create({
         containerOptions: {
-          zIndex: zIndex.increment()
+          zIndex: zIndex.increment(),
+          ...containerOptions
         },
         chatOptions: {
           caption: c.deACMode.logicName,
@@ -126,20 +147,28 @@ const IBizCode = /* @__PURE__ */ vue.defineComponent({
             ...c.params,
             srfactag: c.deACMode.codeName
           },
-          // 编辑器参数srfaiappendcurdata，是否传入对象参数，用于历史查询传参
-          appendCurData: c.editorParams.srfaiappendcurdata === "true" ? props.data : void 0,
-          // 编辑器参数srfaiappendcurcontent，传入编辑内容作为用户消息,获取历史数据后附加
-          appendCurContent: c.editorParams.srfaiappendcurcontent ? core.StringUtil.fill(c.editorParams.srfaiappendcurcontent, c.context, c.params, props.data) : void 0,
           appDataEntityId: c.model.appDataEntityId,
           contentToolbarItems,
           footerToolbarItems,
           questionToolbarItems,
           otherToolbarItems,
-          question: async (aiChat, ctx, param, other, arr) => {
+          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({
@@ -171,7 +200,7 @@ const IBizCode = /* @__PURE__ */ vue.defineComponent({
                   });
                 }
               }, abortController, ctx, param, {
-                messages: arr
+                ...questionRequestData
               });
             } catch (error) {
               aiChat.replaceMessage({
@@ -204,8 +233,23 @@ const IBizCode = /* @__PURE__ */ vue.defineComponent({
           },
           history: async (ctx, param, other) => {
             const deService = await ibiz.hub.getApp(ctx.srfappid).deService.getService(ctx, other.appDataEntityId);
-            const historyData = other.appendCurData ? other.appendCurData : {};
-            const result = await deService.aiChatHistory(ctx, param, historyData);
+            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) => {
@@ -244,13 +288,7 @@ const IBizCode = /* @__PURE__ */ vue.defineComponent({
           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 = {};
-              const token = core.getAppCookie(core.CoreConst.TOKEN);
-              if (token) {
-                Object.assign(uploadHeaders, {
-                  ["".concat(ibiz.env.tokenHeader, "Authorization")]: "".concat(ibiz.env.tokenPrefix, "Bearer ").concat(token)
-                });
-              }
+              const uploadHeaders = ibiz.util.file.getUploadHeaders();
               const formData = new FormData();
               formData.append("file", file);
               const res = await ibiz.net.axios({
@@ -305,15 +343,81 @@ const IBizCode = /* @__PURE__ */ vue.defineComponent({
         return false;
       return true;
     };
+    const updateTextToolbarPos = (selection) => {
+      var _a;
+      const position = selection.getStartPosition();
+      if (position) {
+        const coordinates = editor == null ? void 0 : editor.getScrolledVisiblePosition(position);
+        const editorRect = (_a = editor == null ? void 0 : editor.getDomNode()) == null ? void 0 : _a.getBoundingClientRect();
+        if (!editorRect || !coordinates)
+          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 + coordinates.height, "px")
+        };
+      }
+    };
+    const setTextTBVisible = () => {
+      if (props.readonly || !enableEdit.value || !c.deACMode || !c.chatCompletion)
+        return;
+      const selection = editor == null ? void 0 : editor.getSelection();
+      textTBVisible.value = !!(selection && !selection.isEmpty());
+    };
+    const onSelectionChange = (e) => {
+      const selection = e.selection;
+      if (selection) {
+        updateTextToolbarPos(selection);
+        c.currentSelection = selection;
+      }
+    };
+    const handleLineAiClick = (_e) => {
+      var _a, _b;
+      const position = (_a = editor == null ? void 0 : editor.getSelection()) == null ? void 0 : _a.getStartPosition();
+      if (!position)
+        return;
+      const coordinates = editor == null ? void 0 : editor.getScrolledVisiblePosition(position);
+      const editorRect = (_b = editor == null ? void 0 : editor.getDomNode()) == null ? void 0 : _b.getBoundingClientRect();
+      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 + coordinates.height + textTBHeight,
+        items
+      );
+    };
+    const handleEditorClick = (e) => {
+      var _a;
+      if (!((_a = textTBRef.value) == null ? void 0 : _a.contains(e.target))) {
+        setTimeout(setTextTBVisible, 100);
+      }
+    };
+    const handleMousedown = (e) => {
+      var _a;
+      if (textTBVisible.value && !((_a = textTBRef.value) == null ? void 0 : _a.contains(e.target))) {
+        textTBVisible.value = false;
+      }
+    };
     const editorInit = () => {
       vue.nextTick(() => {
         isLoading.value = true;
         index.default.config({
           paths: {
-            vs: "".concat(ibiz.env.pluginBaseUrl, "/monaco-editor@0.45.0/min/vs")
+            vs: "".concat(ibiz.env.pluginBaseUrl, "/monaco-editor@0.52.2/min/vs")
           }
         });
         index.default.init().then((loaderMonaco) => {
+          var _a;
           isLoading.value = false;
           if (!editor) {
             monacoEditor = loaderMonaco.editor;
@@ -370,6 +474,7 @@ const IBizCode = /* @__PURE__ */ vue.defineComponent({
               });
             }
           }
+          c.onCreated(editor, loaderMonaco);
           setTimeout(() => {
             editor.layout();
             editor.setValue(currentVal.value);
@@ -402,11 +507,14 @@ const IBizCode = /* @__PURE__ */ vue.defineComponent({
             createDecorationsCollection();
           });
           editor.onDidChangeModelContent(() => {
+            setTextTBVisible();
             if (!hasEnableEdit.value) {
               currentVal.value = editor.getValue();
               emit("change", currentVal.value);
             }
           });
+          editor.onDidChangeCursorSelection(onSelectionChange);
+          (_a = editor.getDomNode()) == null ? void 0 : _a.addEventListener("click", handleEditorClick);
           window.addEventListener("resize", () => {
             editor.layout();
           });
@@ -522,11 +630,37 @@ const IBizCode = /* @__PURE__ */ vue.defineComponent({
         }
       }, null);
     };
+    const renderTextEditorToolbar = () => {
+      if (!textTBVisible.value)
+        return null;
+      return vue.createVNode("div", {
+        "ref": "textTBRef",
+        "class": [ns.b("text-editor-toolbar")],
+        "style": {
+          ...textTBStyle.value
+        }
+      }, [vue.createVNode("div", {
+        "class": [ns.be("text-editor-toolbar", "item")],
+        "title": "AI",
+        "onClick": handleLineAiClick
+      }, [vue.createVNode("svg", {
+        "version": "1.1",
+        "xmlns": "http://www.w3.org/2000/svg",
+        "viewBox": "0 0 1024 1024",
+        "width": "1em",
+        "height": "1em",
+        "fill": "currentColor"
+      }, [vue.createVNode("path", {
+        "d": "M274.344554 173.673875c16.429399 0 30.950568 8.00526 39.956484 20.338945a34.906655 34.906655 0 0 1 14.660796 15.754537l1.117013 2.815803 210.138065 597.927736c6.795162 19.268474-5.329083 40.817516-27.041022 48.147913-20.641469 6.95806-42.493035-1.419537-50.451753-18.803052l-1.117013-2.815803-54.477653-154.939008H134.997185L80.566074 837.039954c-6.771891 19.268474-29.856826 28.949253-51.568765 21.618855-20.641469-6.981331-32.602816-26.761769-27.925325-45.239025l0.861031-2.908888L212.047809 212.58316c4.025901-11.426112 13.799764-19.477914 25.598214-22.619512 9.029188-10.006575 22.107548-16.289773 36.67526-16.289773z m386.416675 169.460176c21.828295 0 39.723774 10.890876 41.469106 24.713912l0.116356 2.210755v461.652153c0 14.893506-18.616883 26.947938-41.585462 26.947938-21.805024 0-39.700503-10.890876-41.422565-24.737183l-0.162897-2.210755V370.081989c0-14.870235 18.616883-26.924667 41.585462-26.924667z m-389.697901-48.171184L163.620643 600.628812h214.88537l-107.442685-305.665945z m602.163076-206.181978a12.566396 12.566396 0 0 1 8.144887 8.051802l32.509731 99.041817 101.694723 36.07021a12.566396 12.566396 0 0 1-0.791218 23.922695l-99.53051 27.995137-30.857483 97.552467a12.566396 12.566396 0 0 1-23.899423 0.116355l-32.509732-99.018546-98.669479-31.322905a12.566396 12.566396 0 0 1-0.186169-23.876152l97.505924-32.812256 30.834212-97.529195a12.566396 12.566396 0 0 1 15.754537-8.191429zM649.544557 0.513593c2.676177 0.884302 4.770576 3.025243 5.608336 5.724692l18.523798 59.294772 60.970292 20.66474a8.796477 8.796477 0 0 1-0.325796 16.755194l-60.73758 18.058377-19.780438 59.550754a8.796477 8.796477 0 0 1-16.731924-0.162898l-18.523798-59.271501-59.062061-17.825665a8.796477 8.796477 0 0 1-0.395609-16.708653l59.574025-20.943993 19.780438-59.574025a8.796477 8.796477 0 0 1 11.100317-5.561794z"
+      }, null)])])]);
+    };
     vue.onMounted(() => {
       editorInit();
+      window.addEventListener("mousedown", handleMousedown.bind(this));
     });
     vue.onUnmounted(() => {
       unload();
+      window.removeEventListener("mousedown", handleMousedown.bind(this));
     });
     return {
       ns,
@@ -536,8 +670,11 @@ const IBizCode = /* @__PURE__ */ vue.defineComponent({
       hasEnableEdit,
       readonlyState,
       isLoading,
+      textTBRef,
+      editorTheme,
       renderFooter,
       renderHeaderToolbar,
+      renderTextEditorToolbar,
       renderCodeContent,
       changeFullScreenState
     };
@@ -546,24 +683,24 @@ 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
       }, this.ns.is("enable", this.hasEnableEdit)]
-    }, [this.renderHeaderToolbar(), this.renderCodeContent(), this.hasEnableEdit && !this.readonlyState ? this.renderFooter() : null]), [[vue.resolveDirective("loading"), isLoading]]) : vue.createVNode(vue.resolveComponent("el-dialog"), {
+    }, [this.renderTextEditorToolbar(), this.renderHeaderToolbar(), this.renderCodeContent(), this.hasEnableEdit && !this.readonlyState ? this.renderFooter() : null]), [[vue.resolveDirective("loading"), isLoading]]) : vue.createVNode(vue.resolveComponent("el-dialog"), {
       "modelValue": this.isFullScreen,
       "onUpdate:modelValue": ($event) => this.isFullScreen = $event,
       "class": this.ns.b("dialog-full-screen"),
       "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
         }]
-      }, [this.renderHeaderToolbar(), this.renderCodeContent(), this.hasEnableEdit && !this.readonlyState ? this.renderFooter() : null]), [[vue.resolveDirective("loading"), isLoading]])]
+      }, [this.renderTextEditorToolbar(), this.renderHeaderToolbar(), this.renderCodeContent(), this.hasEnableEdit && !this.readonlyState ? this.renderFooter() : null]), [[vue.resolveDirective("loading"), isLoading]])]
     });
   }
 });

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-footer-toolbar-height:36px;--ibiz-code-footer-button-height:36px;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-footer-toolbar-height:36px;--ibiz-code-footer-button-height:36px}.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{--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/color-picker/color-picker-editor.controller.cjs

@@ -21,10 +21,13 @@ class ColorPickerEditorController extends runtime.EditorController {
   }
   async onInit() {
     await super.onInit();
-    const { defaultVal } = this.editorParams;
+    const { defaultVal, defaultval } = this.editorParams;
     if (defaultVal) {
       this.defaultVal = JSON.parse(defaultVal);
     }
+    if (defaultval) {
+      this.defaultVal = JSON.parse(defaultval);
+    }
   }
 }