npm - @ibiz-template/vue3-components - Versions diffs - 0.7.41-alpha.5 → 0.7.41-alpha.51 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (1882) hide show

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

@@ -4,13 +4,9 @@ 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');
-var runtime = require('@ibiz-template/runtime');
-var core = require('@ibiz-template/core');
-require('../../../util/index.cjs');
+require('../../../node_modules/.pnpm/@monaco-editor_loader@1.5.0/node_modules/@monaco-editor/loader/lib/es/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 +21,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 +44,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 +62,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 +117,21 @@ const IBizCode = /* @__PURE__ */ vue.defineComponent({
     const openAIChat = async () => {
       if (!c.deACMode || !c.model.appDataEntityId)
         return;
+      chatInstance = await ibiz.aiChatUtil.getAIChat();
       const {
-        contentToolbarItems,
-        footerToolbarItems,
-        questionToolbarItems,
-        otherToolbarItems
-      } = aiUtil.calcAiToolbarItemsByAc(c.deACMode);
-      const module = await import('@ibiz-template-plugin/ai-chat');
-      chatInstance = module.chat || module.default.chat;
-      let id = "";
-      let abortController;
+        containerOptions,
+        chatOptions
+      } = await ibiz.aiChatUtil.getEditorExAIChatParams(c.editorParams, c.context, c.params, props.data, c.deACMode, {
+        chatInstance,
+        view: c.view,
+        ctrl: c.ctrl
+      });
+      const resourceOptions = await ibiz.aiChatUtil.getAIResourceOptions(c.context, c.params);
       chatInstance.create({
+        resourceOptions,
         containerOptions: {
-          zIndex: zIndex.increment()
+          zIndex: zIndex.increment(),
+          ...containerOptions
         },
         chatOptions: {
           caption: c.deACMode.logicName,
@@ -126,175 +142,11 @@ 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) => {
-            id = qxUtil.createUUID();
-            abortController = new AbortController();
-            const deService = await ibiz.hub.getApp(ctx.srfappid).deService.getService(ctx, other.appDataEntityId);
-            try {
-              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, {
-                messages: arr
-              });
-            } 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);
-          },
+          ...chatOptions,
           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 historyData = other.appendCurData ? other.appendCurData : {};
-            const result = await deService.aiChatHistory(ctx, param, historyData);
-            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 = {};
-              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 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;
           }
         }
       });
@@ -305,15 +157,87 @@ 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,
+        {
+          zIndex: zIndex.increment(),
+          onClose: () => {
+            zIndex.decrement();
+          }
+        }
+      );
+    };
+    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;
@@ -344,7 +268,7 @@ const IBizCode = /* @__PURE__ */ vue.defineComponent({
               // 不要滚动条的边框
             });
             editor.__instanceId = UUID;
-            if (c.deACMode && ibiz.env.enableAI) {
+            if (c.chatCompletion && ibiz.env.enableAI) {
               codeLensProviderDisposable = loaderMonaco.languages.registerCodeLensProvider(props.language || props.controller.language, {
                 provideCodeLenses: function(model, _token) {
                   if (!validate(model))
@@ -370,6 +294,7 @@ const IBizCode = /* @__PURE__ */ vue.defineComponent({
               });
             }
           }
+          c.onCreated(editor, loaderMonaco);
           setTimeout(() => {
             editor.layout();
             editor.setValue(currentVal.value);
@@ -402,11 +327,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 +450,37 @@ const IBizCode = /* @__PURE__ */ vue.defineComponent({
         }
       }, null);
     };
+    const renderTextEditorToolbar = () => {
+      if (!textTBVisible.value || !c.chatCompletion)
+        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 +490,11 @@ const IBizCode = /* @__PURE__ */ vue.defineComponent({
       hasEnableEdit,
       readonlyState,
       isLoading,
+      textTBRef,
+      editorTheme,
       renderFooter,
       renderHeaderToolbar,
+      renderTextEditorToolbar,
       renderCodeContent,
       changeFullScreenState
     };
@@ -546,24 +503,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 CHANGED Viewed

	@@ -1 +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}
1	+ .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 CHANGED Viewed

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

package/lib/editor/color-picker/ibiz-color-picker/ibiz-color-picker.cjs CHANGED Viewed

@@ -14,15 +14,15 @@ const IBizColorPicker = /* @__PURE__ */ vue.defineComponent({
   setup(props, {
     emit
   }) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     const ns = vue3Util.useNamespace("color-picker");
     const c = props.controller;
     const currentVal = vue.ref("");
     const colorPicker = vue.ref(null);
-    const multiple = ((_a = c.editorParams) == null ? void 0 : _a.MULTIPLE) === "true";
-    const isCustom = ((_b = c.editorParams) == null ? void 0 : _b.CUSTOM) === "true";
-    const type = (_c = c.editorParams) == null ? void 0 : _c.TYPE;
-    const customColorList = ((_d = c.editorParams) == null ? void 0 : _d.CUSTOMCOLORLIST) || "";
+    const multiple = ((_a = c.editorParams) == null ? void 0 : _a.MULTIPLE) === "true" || ((_b = c.editorParams) == null ? void 0 : _b.multiple) === "true";
+    const isCustom = ((_c = c.editorParams) == null ? void 0 : _c.CUSTOM) === "true" || ((_d = c.editorParams) == null ? void 0 : _d.custom) === "true";
+    const type = ((_e = c.editorParams) == null ? void 0 : _e.TYPE) || ((_f = c.editorParams) == null ? void 0 : _f.type);
+    const customColorList = ((_g = c.editorParams) == null ? void 0 : _g.CUSTOMCOLORLIST) || ((_h = c.editorParams) == null ? void 0 : _h.customcolorlist) || "";
     const predefineColors = vue.ref(["#000000", "#2C2C2C", "#50555C", "#ACB3BF", "#D0D3D9", "#C4C4C4", "#DADADA", "#E5E5E5", "#F0F0F0", "#F24E1E", "#E99C58", "#FFC700", "#FF4D00", "#FF00D6", "#D82E57", "#8E1DE8", "#0ACF83", "#18A0FB", "#A259FF", "#907CFF"]);
     const showFormDefaultContent = vue.computed(() => {
       if (props.controlParams && props.controlParams.editmode === "hover" && !props.readonly) {
@@ -54,7 +54,7 @@ const IBizColorPicker = /* @__PURE__ */ vue.defineComponent({
     const handleChange = (e) => {
       emit("change", e);
     };
-    const showPicker = (_e) => {
+    const showPicker = (_e2) => {
       setTimeout(() => {
         if (colorPicker.value) {
           colorPicker.value.show();
@@ -96,7 +96,7 @@ const IBizColorPicker = /* @__PURE__ */ vue.defineComponent({
     };
   },
   render() {
-    var _a, _b;
+    var _a, _b, _c;
     if (this.multiple) {
       if (this.isCustom) {
         return vue.createVNode(ibizColorMpickerCustom.IBizColorMPickerCustom, {
@@ -135,7 +135,7 @@ const IBizColorPicker = /* @__PURE__ */ vue.defineComponent({
         "size": "small",
         "predefine": this.predefineColors,
         "show-alpha": true
-      }, this.$attrs), null), ((_b = this.c.editorParams) == null ? void 0 : _b.isHiddenText) === "true" ? null : vue.createVNode("span", {
+      }, this.$attrs), null), ((_b = this.c.editorParams) == null ? void 0 : _b.isHiddenText) === "true" || ((_c = this.c.editorParams) == null ? void 0 : _c.ishiddentext) === "true" ? null : vue.createVNode("span", {
         "class": this.ns.b("text")
       }, [this.currentVal])]);
     }