@ibiz-template/vue3-components 0.7.41-alpha.46 → 0.7.41-alpha.48

package/es/control/drbar/drbar.controller.mjs

@@ -1,4 +1,5 @@
 import { ControlController, Srfuf, calcItemVisibleByCounter, calcItemVisible, calcNavParams, hasSubRoute, CounterService } from '@ibiz-template/runtime';
+import { isNil } from 'ramda';
 
 "use strict";
 var __defProp = Object.defineProperty;
@@ -253,7 +254,11 @@ class DRBarController extends ControlController {
         const data = event.data[0];
         this.view.state.srfactiveviewdata = data;
         if (Object.prototype.hasOwnProperty.call(data, "srfreadonly")) {
-          this.view.context.srfreadonly = data.srfreadonly;
+          if (data.srfreadonly) {
+            this.view.context.srfreadonly = true;
+          } else if (isNil(this.view.context.srfreadonly)) {
+            this.view.context.srfreadonly = false;
+          }
         }
         await this.calcDrBarItemsState();
         this.handleFormChange();

package/es/control/drbar/drbar.mjs

@@ -1,4 +1,4 @@
-import { defineComponent, createVNode, resolveComponent, reactive, onUnmounted, watch } from 'vue';
+import { defineComponent, createVNode, resolveComponent, ref, onUnmounted, watch } from 'vue';
 import { useControlController, useNamespace, getNestedRoutePath, route2routePath } from '@ibiz-template/vue3-util';
 import { useRouter, useRoute } from 'vue-router';
 import { DRBarController } from './drbar.controller.mjs';
@@ -63,9 +63,9 @@ const DRBarControl = /* @__PURE__ */ defineComponent({
     const c = useControlController((...args) => new DRBarController(...args));
     const ns = useNamespace("control-".concat(c.model.controlType.toLowerCase()));
     const router = useRouter();
-    const counterData = reactive({});
+    const counterData = ref({});
     const fn = (counter) => {
-      Object.assign(counterData, counter);
+      counterData.value = counter;
     };
     c.evt.on("onCreated", () => {
       if (c.counter) {
@@ -157,9 +157,9 @@ const DRBarControl = /* @__PURE__ */ defineComponent({
         default: () => [createVNode(resolveComponent("iBizIcon"), {
           "class": ns.e("icon"),
           "icon": item.sysImage
-        }, null), createVNode("span", null, [item.caption]), item.counterId && counterData[item.counterId] != null && createVNode(resolveComponent("iBizBadge"), {
+        }, null), createVNode("span", null, [item.caption]), item.counterId && counterData.value[item.counterId] != null && createVNode(resolveComponent("iBizBadge"), {
           "class": ns.e("counter"),
-          "value": counterData[item.counterId],
+          "value": counterData.value[item.counterId],
           "counterMode": item.counterMode
         }, null)]
       });

package/es/control/drtab/drtab-control.util.mjs

@@ -39,7 +39,7 @@ function useAppDRTab(c, controlRef, counterData) {
     drTabPages.forEach((tab, index) => {
       if (!tab.hidden) {
         const caption = tab.caption || "";
-        const counterNum = tab.counterId ? counterData[tab.counterId] : void 0;
+        const counterNum = tab.counterId ? counterData.value[tab.counterId] : void 0;
         const fontSize = "var(--".concat(defaultNamespace, "-font-size-regular)");
         if (counterNum != null && !(!counterNum && counterNum !== 0) && !(tab.counterMode === 1 && counterNum <= 0)) {
           const counterStyle = {

package/es/control/drtab/drtab.controller.mjs

@@ -1,6 +1,7 @@
 import { createUUID } from 'qx-util';
 import { ControlController, calcItemVisibleByCounter, calcItemVisible, Srfuf, hasSubRoute, calcNavParams, CounterService } from '@ibiz-template/runtime';
 import { getNestedRoutePath } from '@ibiz-template/vue3-util';
+import { isNil } from 'ramda';
 
 "use strict";
 var __defProp = Object.defineProperty;
@@ -270,7 +271,11 @@ class DRTabController extends ControlController {
         const data = event.data[0];
         this.view.state.srfactiveviewdata = data;
         if (Object.prototype.hasOwnProperty.call(data, "srfreadonly")) {
-          this.view.context.srfreadonly = data.srfreadonly;
+          if (data.srfreadonly) {
+            this.view.context.srfreadonly = true;
+          } else if (isNil(this.view.context.srfreadonly)) {
+            this.view.context.srfreadonly = false;
+          }
         }
         await this.calcDrTabPagesState();
         this.handleFormChange();

package/es/control/drtab/drtab.mjs

@@ -1,4 +1,4 @@
-import { defineComponent, createVNode, resolveComponent, createTextVNode, ref, reactive, computed, onUnmounted, watch } from 'vue';
+import { defineComponent, createVNode, resolveComponent, createTextVNode, ref, computed, onUnmounted, watch } from 'vue';
 import { useControlController, useNamespace, getNestedRoutePath, route2routePath } from '@ibiz-template/vue3-util';
 import { useRouter, useRoute } from 'vue-router';
 import { hasSubRoute } from '@ibiz-template/runtime';
@@ -55,13 +55,13 @@ const DRTabControl = /* @__PURE__ */ defineComponent({
     const ns = useNamespace("control-".concat(c.model.controlType.toLowerCase()));
     const router = useRouter();
     const controlRef = ref();
-    const counterData = reactive({});
+    const counterData = ref({});
     const {
       visibleItems,
       moreItems
     } = useAppDRTab(c, controlRef, counterData);
     const fn = (counter) => {
-      Object.assign(counterData, counter);
+      counterData.value = counter;
     };
     const tabPosition = ((_a = c.view.model.tabLayout) == null ? void 0 : _a.toLowerCase()) || "top";
     c.evt.on("onCreated", () => {
@@ -148,7 +148,7 @@ const DRTabControl = /* @__PURE__ */ defineComponent({
           }, null), createVNode("div", {
             "class": "caption"
           }, [(_b = activeTab.value) == null ? void 0 : _b.caption, ((_c = activeTab.value) == null ? void 0 : _c.counterId) && createVNode(resolveComponent("iBizBadge"), {
-            "value": counterData[activeTab.value.counterId],
+            "value": counterData.value[activeTab.value.counterId],
             "counterMode": activeTab.value.counterMode
           }, null)]), createVNode("ion-icon", {
             "name": "chevron-down-outline"
@@ -169,7 +169,7 @@ const DRTabControl = /* @__PURE__ */ defineComponent({
                 }, null), createVNode("span", {
                   "class": "caption"
                 }, [tab.caption]), tab.counterId && createVNode(resolveComponent("iBizBadge"), {
-                  "value": counterData[tab.counterId],
+                  "value": counterData.value[tab.counterId],
                   "counterMode": tab.counterMode
                 }, null), tab.tag === c.state.activeName && createVNode("ion-icon", {
                   "name": "checkmark-outline"

package/es/control/form/form-detail/form-item/composite-form-item-ex/composite-form-item-ex.controller.mjs

@@ -32,7 +32,7 @@ class CompositeFormItemExController extends FormItemController {
     __publicField(this, "codeListId", "");
     /**
      * @description 切换菜单选项
-     * @type {{ id: string; name: string; icon?: ISysImage, editor?: IData }[]}
+     * @type {{ id: string; name: string; icon?: ISysImage, editor?: IData, valueItem?: string }[]}
      * @memberof CompositeFormItemExController
      */
     __publicField(this, "switchOptions", []);
@@ -47,6 +47,16 @@ class CompositeFormItemExController extends FormItemController {
     var _a;
     return new CompositeFormItemExState((_a = this.parent) == null ? void 0 : _a.state);
   }
+  get name() {
+    return this.state.editorValueItem || this.model.id;
+  }
+  get value() {
+    var _a;
+    const option = this.switchOptions.find(
+      (item) => item.id === this.state.editorId
+    );
+    return (_a = this.data) == null ? void 0 : _a[(option == null ? void 0 : option.valueItem) || this.model.id];
+  }
   async onInit() {
     var _a, _b, _c, _d;
     await super.onInit();
@@ -71,7 +81,8 @@ class CompositeFormItemExController extends FormItemController {
             id: item.value,
             name: item.text,
             icon: item.sysImage,
-            editor: item.data
+            editor: item.data,
+            valueItem: item.userData
           };
         });
         this.defaultType = ((_b = this.switchOptions[0]) == null ? void 0 : _b.id) || "";
@@ -102,6 +113,7 @@ class CompositeFormItemExController extends FormItemController {
     if (!option) {
       return;
     }
+    this.state.editorValueItem = option.valueItem || "";
     const editorModel = {
       ...this.createEditorModel(),
       ...option.editor
@@ -147,7 +159,6 @@ class CompositeFormItemExController extends FormItemController {
     if (!id || id === this.state.editorId) {
       return;
     }
-    this.setDataValue("", this.name);
     if (this.valueItem && this.valueItem.id) {
       this.setDataValue(id, this.valueItem.id);
     }

package/es/control/form/form-detail/form-item/composite-form-item-ex/composite-form-item-ex.mjs

@@ -23,8 +23,8 @@ const CompositeFormItemEx = /* @__PURE__ */ defineComponent({
     const ns = useNamespace("form-item");
     const ns2 = useNamespace("composite-form-item-ex");
     const c = props.controller;
-    const onValueChange = (val, name, ignore = false) => {
-      props.controller.setDataValue(val, name, ignore);
+    const onValueChange = (val, _name, ignore = false) => {
+      props.controller.setDataValue(val, c.name, ignore);
     };
     const loading = ref(true);
     const editorRef = ref();

package/es/control/form/form-detail/form-item/composite-form-item-ex/composite-form-item-ex.state.mjs

@@ -16,6 +16,12 @@ class CompositeFormItemExState extends FormItemState {
      * @memberof CompositeFormItemExState
      */
     __publicField(this, "editorId", "");
+    /**
+     * @description 当前选中的编辑器值项
+     * @type {string}
+     * @memberof CompositeFormItemExState
+     */
+    __publicField(this, "editorValueItem", "");
   }
 }
 

package/es/editor/code/monaco-editor/monaco-editor.mjs

@@ -266,7 +266,7 @@ const IBizCode = /* @__PURE__ */ 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))
@@ -449,7 +449,7 @@ const IBizCode = /* @__PURE__ */ defineComponent({
       }, null);
     };
     const renderTextEditorToolbar = () => {
-      if (!textTBVisible.value)
+      if (!textTBVisible.value || !c.chatCompletion)
         return null;
       return createVNode("div", {
         "ref": "textTBRef",

package/es/editor/markdown/ibiz-markdown-editor/ibiz-markdown-editor.mjs

@@ -15,7 +15,7 @@ const IBizMarkDown = /* @__PURE__ */ defineComponent({
     emit,
     slots
   }) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     const ns = useNamespace("markdown");
     const c = props.controller;
     const currentVal = ref("");
@@ -51,8 +51,12 @@ const IBizMarkDown = /* @__PURE__ */ defineComponent({
     const lastDirectoryState = ref("pure");
     let isIgnoreChange = false;
     let chatInstance;
+    let disabledirectory = false;
+    if ((_e = c == null ? void 0 : c.editorParams) == null ? void 0 : _e.disabledirectory) {
+      disabledirectory = c.editorParams.disabledirectory === "true";
+    }
     let tocPos = "absolute";
-    if ((_e = c == null ? void 0 : c.editorParams) == null ? void 0 : _e.tocpos) {
+    if ((_f = c == null ? void 0 : c.editorParams) == null ? void 0 : _f.tocpos) {
       tocPos = c.editorParams.tocpos === "fixed" ? "fixed" : "absolute";
     }
     const [AIMenu, AIChart] = initCustomMenu(c, {
@@ -274,7 +278,7 @@ const IBizMarkDown = /* @__PURE__ */ defineComponent({
         defaultModel.value = "previewOnly";
       }
       nextTick(() => {
-        var _a2;
+        var _a2, _b2, _c2;
         const bubble = ["bold", "italic", "underline", "strikethrough", "sub", "sup", "|", "size", "color"];
         const toolbar = ["bold", "italic", "underline", "strikethrough", "|", "color", "header", "|", "list", "image", {
           insert: ["link", "hr", "br", "code", "formula", "toc", "table", "line-table", "bar-table"]
@@ -328,7 +332,7 @@ const IBizMarkDown = /* @__PURE__ */ defineComponent({
             // 定义顶部右侧工具栏，默认为空
             toolbarRight: [],
             // 目录
-            toc: {
+            toc: !disabledirectory && {
               updateLocationHash: false,
               // 要不要更新URL的hash
               defaultModel: "pure",
@@ -361,7 +365,7 @@ const IBizMarkDown = /* @__PURE__ */ defineComponent({
         editor.toggleToc("pure");
         const html = editor.engine.makeHtml(currentVal.value);
         editor.previewer.update(html);
-        editor.toc.updateTocList();
+        (_b2 = (_a2 = editor.toc) == null ? void 0 : _a2.updateTocList) == null ? void 0 : _b2.call(_a2);
         editor.setTheme(theme.value);
         if (customTheme) {
           editor.setTheme(customTheme);
@@ -371,7 +375,7 @@ const IBizMarkDown = /* @__PURE__ */ defineComponent({
         span.title = ibiz.i18n.t("editor.common.fullscreen");
         span.onclick = onSwitchFullscreen;
         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");
+        const parentElement = props.disabled ? editor.editor.options.editorDom.parentElement : (_c2 = editor.editor.options.editorDom.parentElement) == null ? void 0 : _c2.querySelector(".cherry-toolbar>.toolbar-right");
         parentElement == null ? void 0 : parentElement.appendChild(span);
         c == null ? void 0 : c.setMDEditor(editor);
         onMDEditorCreated(editor);

package/es/util/ai-chat-util/ai-chat-util.mjs

@@ -101,6 +101,7 @@ class AIChatUtil {
     chatOptions.sessionid = sessionid;
     let id = "";
     let abortController;
+    let asyncacitonid = "";
     const { chatInstance, view, ctrl } = args;
     chatOptions.history = async (ctx, param, other) => {
       const deService = await ibiz.hub.getApp(ctx.srfappid).deService.getService(ctx, other.appDataEntityId);
@@ -174,6 +175,7 @@ class AIChatUtil {
         await deService.aiChatSse(
           (msg) => {
             if (msg.actionstate === 20 && msg.actionresult) {
+              asyncacitonid = msg.asyncacitonid;
               aiChat.addMessage({
                 messageid: id,
                 state: msg.actionstate,
@@ -223,8 +225,23 @@ class AIChatUtil {
         return true;
       }
     };
-    chatOptions.abortQuestion = async (aiChat) => {
+    chatOptions.abortQuestion = async (aiChat, ctx, param, other) => {
       abortController == null ? void 0 : abortController.abort();
+      if (asyncacitonid) {
+        const deService = await ibiz.hub.getApp(ctx.srfappid).deService.getService(ctx, other.appDataEntityId);
+        const abortRequestData = { asyncacitonid };
+        if (other.sessionid) {
+          Object.assign(abortRequestData, {
+            sessionid: other.sessionid
+          });
+        }
+        const result = await deService.aiChatCancel(
+          ctx,
+          param,
+          abortRequestData
+        );
+        asyncacitonid = "";
+      }
       await aiChat.stopMessage({
         messageid: id,
         state: 30,
@@ -442,6 +459,7 @@ class AIChatUtil {
     }
     let id = "";
     let abortController;
+    let asyncacitonid = "";
     const { chatInstance, view, ctrl } = args;
     chatOptions.history = async (ctx, param, other) => {
       const deService = await ibiz.hub.getApp(ctx.srfappid).deService.getService(ctx, other.appDataEntityId);
@@ -515,6 +533,7 @@ class AIChatUtil {
         await deService.aiChatSse(
           (msg) => {
             if (msg.actionstate === 20 && msg.actionresult) {
+              asyncacitonid = msg.asyncacitonid;
               aiChat.addMessage({
                 messageid: id,
                 state: msg.actionstate,
@@ -564,8 +583,23 @@ class AIChatUtil {
         return true;
       }
     };
-    chatOptions.abortQuestion = async (aiChat) => {
+    chatOptions.abortQuestion = async (aiChat, ctx, param, other) => {
       abortController == null ? void 0 : abortController.abort();
+      if (asyncacitonid) {
+        const deService = await ibiz.hub.getApp(ctx.srfappid).deService.getService(ctx, other.appDataEntityId);
+        const abortRequestData = { asyncacitonid };
+        if (other.sessionid) {
+          Object.assign(abortRequestData, {
+            sessionid: other.sessionid
+          });
+        }
+        const result = await deService.aiChatCancel(
+          ctx,
+          param,
+          abortRequestData
+        );
+        asyncacitonid = "";
+      }
       await aiChat.stopMessage({
         messageid: id,
         state: 30,

package/es/util/app-popover/app-popover-component.css

@@ -1 +1 @@
-.ibiz-popover{position:absolute;top:0;left:0;z-index:1;display:none;width:-moz-max-content;width:max-content;background-color:var(--ibiz-color-bg-2);border:1px solid var(--ibiz-color-border);border-radius:var(--ibiz-border-radius-medium)}.ibiz-popover__arrow{position:absolute;z-index:-1;width:var(--ibiz-width-icon-extra-small);height:var(--ibiz-width-icon-extra-small);background:var(--ibiz-color-bg-2);transform:rotate(45deg)}.ibiz-popover.is-show{display:block}.ibiz-popover__overlay{position:fixed;inset:0;background-color:transparent}
+.ibiz-popover{position:absolute;top:0;left:0;z-index:1;display:none;width:-moz-max-content;width:max-content;background-color:var(--ibiz-color-bg-2);border:1px solid var(--ibiz-color-border);border-radius:var(--ibiz-border-radius-medium)}.ibiz-popover__arrow{position:absolute;z-index:-1;width:var(--ibiz-width-icon-extra-small);height:var(--ibiz-width-icon-extra-small);background:var(--ibiz-color-bg-2);transform:rotate(45deg)}.ibiz-popover__arrow[data-placement^=top]{border-right:1px solid var(--ibiz-color-border);border-bottom:1px solid var(--ibiz-color-border)}.ibiz-popover__arrow[data-placement^=bottom]{border-top:1px solid var(--ibiz-color-border);border-left:1px solid var(--ibiz-color-border)}.ibiz-popover__arrow[data-placement^=left]{border-top:1px solid var(--ibiz-color-border);border-right:1px solid var(--ibiz-color-border)}.ibiz-popover__arrow[data-placement^=right]{border-bottom:1px solid var(--ibiz-color-border);border-left:1px solid var(--ibiz-color-border)}.ibiz-popover.is-show{display:block}.ibiz-popover__overlay{position:fixed;inset:0;background-color:transparent}

package/es/util/app-popover/app-popover-component.mjs

@@ -53,6 +53,7 @@ async function computePos(element, el, arrEl, opts) {
         bottom: "",
         [staticSide]: "-4px"
       });
+      arrEl.setAttribute("data-placement", placement);
     }
   }
 }

package/es/view-engine/edit-view.engine.mjs

@@ -1,3 +1,4 @@
+import { isNil } from 'ramda';
 import { RuntimeError } from '@ibiz-template/core';
 import { DEMainViewEngine, getControl, getControlsByView, calcDeCodeNameById, SysUIActionTag, ViewCallTag, ControlVO, getAppViewRef, OpenAppViewCommand, calcDynaSysParams, getDeDataMajorField, convertNavData } from '@ibiz-template/runtime';
 
@@ -121,7 +122,11 @@ class EditViewEngine extends DEMainViewEngine {
         const data = event.data[0];
         this.view.state.srfactiveviewdata = data;
         if (Object.prototype.hasOwnProperty.call(data, "srfreadonly")) {
-          this.view.context.srfreadonly = data.srfreadonly;
+          if (data.srfreadonly) {
+            this.view.context.srfreadonly = true;
+          } else if (isNil(this.view.context.srfreadonly)) {
+            this.view.context.srfreadonly = false;
+          }
         }
         evt.emit("onDataChange", { ...event, actionType: "LOAD" });
       });

package/es/view-engine/opt-view.engine.mjs

@@ -1,4 +1,5 @@
 import { ViewEngineBase, getControl, getControlsByView, SysUIActionTag, ViewCallTag } from '@ibiz-template/runtime';
+import { isNil } from 'ramda';
 
 "use strict";
 class OptViewEngine extends ViewEngineBase {
@@ -77,7 +78,11 @@ class OptViewEngine extends ViewEngineBase {
       const data = event.data[0];
       this.view.state.srfactiveviewdata = data;
       if (Object.prototype.hasOwnProperty.call(data, "srfreadonly")) {
-        this.view.context.srfreadonly = data.srfreadonly;
+        if (data.srfreadonly) {
+          this.view.context.srfreadonly = true;
+        } else if (isNil(this.view.context.srfreadonly)) {
+          this.view.context.srfreadonly = false;
+        }
       }
       formDataStateChange(event);
     });

package/lib/control/drbar/drbar.cjs

@@ -65,9 +65,9 @@ const DRBarControl = /* @__PURE__ */ vue.defineComponent({
     const c = vue3Util.useControlController((...args) => new drbar_controller.DRBarController(...args));
     const ns = vue3Util.useNamespace("control-".concat(c.model.controlType.toLowerCase()));
     const router = vueRouter.useRouter();
-    const counterData = vue.reactive({});
+    const counterData = vue.ref({});
     const fn = (counter) => {
-      Object.assign(counterData, counter);
+      counterData.value = counter;
     };
     c.evt.on("onCreated", () => {
       if (c.counter) {
@@ -159,9 +159,9 @@ const DRBarControl = /* @__PURE__ */ vue.defineComponent({
         default: () => [vue.createVNode(vue.resolveComponent("iBizIcon"), {
           "class": ns.e("icon"),
           "icon": item.sysImage
-        }, null), vue.createVNode("span", null, [item.caption]), item.counterId && counterData[item.counterId] != null && vue.createVNode(vue.resolveComponent("iBizBadge"), {
+        }, null), vue.createVNode("span", null, [item.caption]), item.counterId && counterData.value[item.counterId] != null && vue.createVNode(vue.resolveComponent("iBizBadge"), {
           "class": ns.e("counter"),
-          "value": counterData[item.counterId],
+          "value": counterData.value[item.counterId],
           "counterMode": item.counterMode
         }, null)]
       });

package/lib/control/drbar/drbar.controller.cjs

@@ -1,6 +1,7 @@
 'use strict';
 
 var runtime = require('@ibiz-template/runtime');
+var ramda = require('ramda');
 
 "use strict";
 var __defProp = Object.defineProperty;
@@ -255,7 +256,11 @@ class DRBarController extends runtime.ControlController {
         const data = event.data[0];
         this.view.state.srfactiveviewdata = data;
         if (Object.prototype.hasOwnProperty.call(data, "srfreadonly")) {
-          this.view.context.srfreadonly = data.srfreadonly;
+          if (data.srfreadonly) {
+            this.view.context.srfreadonly = true;
+          } else if (ramda.isNil(this.view.context.srfreadonly)) {
+            this.view.context.srfreadonly = false;
+          }
         }
         await this.calcDrBarItemsState();
         this.handleFormChange();

package/lib/control/drtab/drtab-control.util.cjs

@@ -41,7 +41,7 @@ function useAppDRTab(c, controlRef, counterData) {
     drTabPages.forEach((tab, index) => {
       if (!tab.hidden) {
         const caption = tab.caption || "";
-        const counterNum = tab.counterId ? counterData[tab.counterId] : void 0;
+        const counterNum = tab.counterId ? counterData.value[tab.counterId] : void 0;
         const fontSize = "var(--".concat(namespace.defaultNamespace, "-font-size-regular)");
         if (counterNum != null && !(!counterNum && counterNum !== 0) && !(tab.counterMode === 1 && counterNum <= 0)) {
           const counterStyle = {

package/lib/control/drtab/drtab.cjs

@@ -57,13 +57,13 @@ const DRTabControl = /* @__PURE__ */ vue.defineComponent({
     const ns = vue3Util.useNamespace("control-".concat(c.model.controlType.toLowerCase()));
     const router = vueRouter.useRouter();
     const controlRef = vue.ref();
-    const counterData = vue.reactive({});
+    const counterData = vue.ref({});
     const {
       visibleItems,
       moreItems
     } = drtabControl_util.useAppDRTab(c, controlRef, counterData);
     const fn = (counter) => {
-      Object.assign(counterData, counter);
+      counterData.value = counter;
     };
     const tabPosition = ((_a = c.view.model.tabLayout) == null ? void 0 : _a.toLowerCase()) || "top";
     c.evt.on("onCreated", () => {
@@ -150,7 +150,7 @@ const DRTabControl = /* @__PURE__ */ vue.defineComponent({
           }, null), vue.createVNode("div", {
             "class": "caption"
           }, [(_b = activeTab.value) == null ? void 0 : _b.caption, ((_c = activeTab.value) == null ? void 0 : _c.counterId) && vue.createVNode(vue.resolveComponent("iBizBadge"), {
-            "value": counterData[activeTab.value.counterId],
+            "value": counterData.value[activeTab.value.counterId],
             "counterMode": activeTab.value.counterMode
           }, null)]), vue.createVNode("ion-icon", {
             "name": "chevron-down-outline"
@@ -171,7 +171,7 @@ const DRTabControl = /* @__PURE__ */ vue.defineComponent({
                 }, null), vue.createVNode("span", {
                   "class": "caption"
                 }, [tab.caption]), tab.counterId && vue.createVNode(vue.resolveComponent("iBizBadge"), {
-                  "value": counterData[tab.counterId],
+                  "value": counterData.value[tab.counterId],
                   "counterMode": tab.counterMode
                 }, null), tab.tag === c.state.activeName && vue.createVNode("ion-icon", {
                   "name": "checkmark-outline"

package/lib/control/drtab/drtab.controller.cjs

@@ -3,6 +3,7 @@
 var qxUtil = require('qx-util');
 var runtime = require('@ibiz-template/runtime');
 var vue3Util = require('@ibiz-template/vue3-util');
+var ramda = require('ramda');
 
 "use strict";
 var __defProp = Object.defineProperty;
@@ -272,7 +273,11 @@ class DRTabController extends runtime.ControlController {
         const data = event.data[0];
         this.view.state.srfactiveviewdata = data;
         if (Object.prototype.hasOwnProperty.call(data, "srfreadonly")) {
-          this.view.context.srfreadonly = data.srfreadonly;
+          if (data.srfreadonly) {
+            this.view.context.srfreadonly = true;
+          } else if (ramda.isNil(this.view.context.srfreadonly)) {
+            this.view.context.srfreadonly = false;
+          }
         }
         await this.calcDrTabPagesState();
         this.handleFormChange();

package/lib/control/form/form-detail/form-item/composite-form-item-ex/composite-form-item-ex.cjs

@@ -27,8 +27,8 @@ const CompositeFormItemEx = /* @__PURE__ */ vue.defineComponent({
     const ns = vue3Util.useNamespace("form-item");
     const ns2 = vue3Util.useNamespace("composite-form-item-ex");
     const c = props.controller;
-    const onValueChange = (val, name, ignore = false) => {
-      props.controller.setDataValue(val, name, ignore);
+    const onValueChange = (val, _name, ignore = false) => {
+      props.controller.setDataValue(val, c.name, ignore);
     };
     const loading = vue.ref(true);
     const editorRef = vue.ref();

package/lib/control/form/form-detail/form-item/composite-form-item-ex/composite-form-item-ex.controller.cjs

@@ -34,7 +34,7 @@ class CompositeFormItemExController extends runtime.FormItemController {
     __publicField(this, "codeListId", "");
     /**
      * @description 切换菜单选项
-     * @type {{ id: string; name: string; icon?: ISysImage, editor?: IData }[]}
+     * @type {{ id: string; name: string; icon?: ISysImage, editor?: IData, valueItem?: string }[]}
      * @memberof CompositeFormItemExController
      */
     __publicField(this, "switchOptions", []);
@@ -49,6 +49,16 @@ class CompositeFormItemExController extends runtime.FormItemController {
     var _a;
     return new compositeFormItemEx_state.CompositeFormItemExState((_a = this.parent) == null ? void 0 : _a.state);
   }
+  get name() {
+    return this.state.editorValueItem || this.model.id;
+  }
+  get value() {
+    var _a;
+    const option = this.switchOptions.find(
+      (item) => item.id === this.state.editorId
+    );
+    return (_a = this.data) == null ? void 0 : _a[(option == null ? void 0 : option.valueItem) || this.model.id];
+  }
   async onInit() {
     var _a, _b, _c, _d;
     await super.onInit();
@@ -73,7 +83,8 @@ class CompositeFormItemExController extends runtime.FormItemController {
             id: item.value,
             name: item.text,
             icon: item.sysImage,
-            editor: item.data
+            editor: item.data,
+            valueItem: item.userData
           };
         });
         this.defaultType = ((_b = this.switchOptions[0]) == null ? void 0 : _b.id) || "";
@@ -104,6 +115,7 @@ class CompositeFormItemExController extends runtime.FormItemController {
     if (!option) {
       return;
     }
+    this.state.editorValueItem = option.valueItem || "";
     const editorModel = {
       ...this.createEditorModel(),
       ...option.editor
@@ -149,7 +161,6 @@ class CompositeFormItemExController extends runtime.FormItemController {
     if (!id || id === this.state.editorId) {
       return;
     }
-    this.setDataValue("", this.name);
     if (this.valueItem && this.valueItem.id) {
       this.setDataValue(id, this.valueItem.id);
     }

package/lib/control/form/form-detail/form-item/composite-form-item-ex/composite-form-item-ex.state.cjs

@@ -18,6 +18,12 @@ class CompositeFormItemExState extends runtime.FormItemState {
      * @memberof CompositeFormItemExState
      */
     __publicField(this, "editorId", "");
+    /**
+     * @description 当前选中的编辑器值项
+     * @type {string}
+     * @memberof CompositeFormItemExState
+     */
+    __publicField(this, "editorValueItem", "");
   }
 }
 

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

@@ -268,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))
@@ -451,7 +451,7 @@ const IBizCode = /* @__PURE__ */ vue.defineComponent({
       }, null);
     };
     const renderTextEditorToolbar = () => {
-      if (!textTBVisible.value)
+      if (!textTBVisible.value || !c.chatCompletion)
         return null;
       return vue.createVNode("div", {
         "ref": "textTBRef",