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

package/es/util/inline-ai-util/inline-ai-textarea/inline-ai-textarea.hook.mjs

@@ -1,7 +1,7 @@
 import qs from 'qs';
 import { notNilEmpty } from 'qx-util';
 import { useUIStore } from '@ibiz-template/vue3-util';
-import { onMounted, onUnmounted, ref, computed, watch, nextTick } from 'vue';
+import { onMounted, onUnmounted, ref, watch, nextTick } from 'vue';
 import { calcResPath } from '@ibiz-template/runtime';
 import { RegenerateIcon, insertTextIcon, ReplaceTextIcon, CopyTextIcon, CancelIcon } from './icon.mjs';
 
@@ -24,9 +24,9 @@ const computedInLineAIParams = (props) => {
     inlinecompletionmode: (_g = (_f = params.inlinecompletionmode) != null ? _f : editorParams.inlinecompletionmode) != null ? _g : "async"
   };
 };
-const useInLineAIContainerClick = (props, message, isLoading, abortController) => {
+const useInLineAIContainerClick = (props, opts) => {
+  const { message, isLoading, stopAsk } = opts;
   const handMousedown = async (evt) => {
-    var _a;
     const target = evt.target;
     if (!target.closest(".ibiz-inline-ai-textarea-container") && !target.closest(".ibiz-inline-ai-alert")) {
       const isChange = props.content !== message.value.content;
@@ -40,12 +40,8 @@ const useInLineAIContainerClick = (props, message, isLoading, abortController) =
           }
         });
       }
-      if (isClose) {
-        if (isLoading.value) {
-          (_a = abortController.value) == null ? void 0 : _a.abort();
-        }
-        props.unMountAIChat();
-      }
+      if (isClose)
+        await stopAsk();
     }
   };
   onMounted(() => {
@@ -93,7 +89,6 @@ const useAI = (props, opts) => {
       );
     }
   };
-  const abortController = ref();
   const attachUrlParam = (url) => {
     {
       const urlSplit = url.split("?");
@@ -172,6 +167,8 @@ const useAI = (props, opts) => {
     }
     return { think, content, toolcalls };
   };
+  let asyncacitonid;
+  const abortController = ref();
   const asyncAskAI = (question, callBack, errorBack) => {
     return new Promise((resolve) => {
       abortController.value = new AbortController();
@@ -187,6 +184,8 @@ const useAI = (props, opts) => {
             if (e.data) {
               const msg = JSON.parse(e.data);
               let content = msg.actionresult || "";
+              if (msg.actionstate === 20)
+                asyncacitonid = msg.asyncacitonid;
               if (msg.actionstate === 30 && content)
                 content = (_a = JSON.parse(content).choices) == null ? void 0 : _a[0].content;
               callBack({ state: msg.actionstate, content });
@@ -233,12 +232,28 @@ const useAI = (props, opts) => {
       return answer;
     }
   };
+  const stopAsk = async () => {
+    var _a;
+    (_a = abortController.value) == null ? void 0 : _a.abort();
+    if (asyncacitonid) {
+      const deService = await app.deService.getService(
+        context,
+        deACMode.appDataEntityId
+      );
+      await deService.aiChatCancel(context, params, {
+        asyncacitonid,
+        sessionid
+      });
+      asyncacitonid = void 0;
+    }
+    props.unMountAIChat();
+  };
   return {
+    stopAsk,
     syncAskAI,
     asyncAskAI,
     parseContent,
-    loadAiHistory,
-    abortController
+    loadAiHistory
   };
 };
 const useBase = (props, element, message) => {
@@ -295,11 +310,8 @@ const useBase = (props, element, message) => {
     height: options.height ? "".concat(options.height, "px") : "auto",
     "max-height": "".concat(options.maxHeight || (options.height && options.height > 300 ? options.height : 300), "px")
   });
-  const toolcalls = computed(() => {
-    return message.value.toolcalls || [];
-  });
   watch(
-    () => [toolcalls.value.length, message.value.think, message.value.content],
+    () => message.value,
     () => {
       nextTick(() => {
         if (!textareaRef.value)
@@ -310,6 +322,7 @@ const useBase = (props, element, message) => {
       });
     },
     {
+      deep: true,
       immediate: true
     }
   );

package/es/util/inline-ai-util/inline-ai-textarea/inline-ai-textarea.mjs

@@ -96,22 +96,21 @@ const InlineAITextArea = /* @__PURE__ */ defineComponent({
       textareaRef
     }, message);
     const {
+      stopAsk,
       syncAskAI,
       asyncAskAI,
       parseContent,
-      loadAiHistory,
-      abortController
+      loadAiHistory
     } = useAI(props, {
       srfmode,
       srfaiagent,
       srfaiappendcurdata
     });
-    useInLineAIContainerClick(props, message, isLoading, abortController);
-    const stopQuestionAndClose = () => {
-      var _a;
-      (_a = abortController.value) == null ? void 0 : _a.abort();
-      props.unMountAIChat();
-    };
+    useInLineAIContainerClick(props, {
+      message,
+      isLoading,
+      stopAsk
+    });
     const handleAnswer = (answer) => {
       switch (answer.state) {
         case 20:
@@ -253,12 +252,12 @@ const InlineAITextArea = /* @__PURE__ */ defineComponent({
       containerRef,
       contentStyle,
       containerStyle,
+      stopAsk,
       onKeydown,
       renderError,
       sendQuestion,
       handleAction,
-      renderLoading,
-      stopQuestionAndClose
+      renderLoading
     };
   },
   render() {
@@ -296,7 +295,7 @@ const InlineAITextArea = /* @__PURE__ */ defineComponent({
       "class": this.ns.em("content", "suffix")
     }, [this.isLoading && createVNode("div", {
       "class": this.ns.em("content", "stop-icon"),
-      "onClick": () => this.stopQuestionAndClose()
+      "onClick": () => this.stopAsk()
     }, [StopIcon, createVNode("span", null, [ibiz.i18n.t("util.inlineAiUtil.stopEdit")])]), !this.disabled && createVNode("div", {
       "class": this.ns.em("content", "sand-icon"),
       "onClick": () => this.sendQuestion(this.message.content)

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

@@ -222,7 +222,7 @@ class WFDynaEditViewEngine extends EditViewEngine {
     const submitView = getWFSubmitViewId(this.view.model, link);
     if (!submitView) {
       await this.form.wfSubmit({ viewParam: newParams });
-      await this.view.closeView();
+      await this.view.closeView({ ok: true, data: this.form.getData() });
       return;
     }
     const result = await ibiz.commands.execute(
@@ -232,7 +232,7 @@ class WFDynaEditViewEngine extends EditViewEngine {
       newParams
     );
     if (result.ok) {
-      await this.view.closeView();
+      await this.view.closeView({ ok: true, data: this.form.getData() });
     }
   }
 }

package/lib/common/action-toolbar/action-toolbar.css

@@ -1 +1 @@
-@charset "UTF-8";.ibiz-action-toolbar{--ibiz-action-toolbar-item-margin:var(--ibiz-spacing-none) var(--ibiz-spacing-extra-tight) var(--ibiz-spacing-none) var(--ibiz-spacing-none);--ibiz-action-toolbar-item-padding:var(--ibiz-spacing-extra-tight) var(--ibiz-spacing-none);--ibiz-action-toolbar-separator-height:var(--ibiz-spacing-base-loose);--ibiz-action-toolbar-separator-width:var(--ibiz-spacing-super-tight);--ibiz-action-toolbar-separator-color:var(--ibiz-color-border);--ibiz-action-toolbar-popover-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-none);--ibiz-action-toolbar-popover-button-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base-loose);--ibiz-action-toolbar-popover-button-color:var(--ibiz-color-text-2);--ibiz-action-toolbar-popover-button-hover-bg:var(--ibiz-color-bg-0);display:flex;flex-wrap:wrap}.ibiz-action-toolbar__item{padding:var(--ibiz-action-toolbar-item-padding);margin:var(--ibiz-action-toolbar-item-margin)}.ibiz-action-toolbar__item--icon.is-has-icon{display:flex;align-items:baseline;justify-content:center;width:var(--ibiz-width-icon-medium);height:var(--ibiz-width-icon-medium);margin-right:var(--ibiz-spacing-extra-tight);margin-left:var(--ibiz-spacing-extra-tight);font-size:var(--ibiz-width-icon-medium)}.ibiz-action-toolbar__item--label.is-has-caption{margin-right:var(--ibiz-spacing-extra-tight)}.ibiz-action-toolbar__item+.ibiz-action-toolbar__item{margin:var(--ibiz-action-toolbar-item-margin)}.ibiz-action-toolbar__group-item>span{width:100%}.ibiz-action-toolbar__group-item--content{display:flex;gap:var(--ibiz-spacing-extra-tight);align-items:center;justify-content:space-between;width:100%}.ibiz-action-toolbar__group-item--caption{display:flex;align-items:center;padding:var(--ibiz-action-toolbar-item-padding);margin:var(--ibiz-action-toolbar-item-margin)}.ibiz-action-toolbar__separator{height:auto}.ibiz-action-toolbar__popover{--ibiz-action-toolbar-item-margin:var(--ibiz-spacing-none) var(--ibiz-spacing-extra-tight) var(--ibiz-spacing-none) var(--ibiz-spacing-none);--ibiz-action-toolbar-item-padding:var(--ibiz-spacing-extra-tight) var(--ibiz-spacing-none);--ibiz-action-toolbar-separator-height:var(--ibiz-spacing-base-loose);--ibiz-action-toolbar-separator-width:var(--ibiz-spacing-super-tight);--ibiz-action-toolbar-separator-color:var(--ibiz-color-border);--ibiz-action-toolbar-popover-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-none);--ibiz-action-toolbar-popover-button-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base-loose);--ibiz-action-toolbar-popover-button-color:var(--ibiz-color-text-2);--ibiz-action-toolbar-popover-button-hover-bg:var(--ibiz-color-bg-0);width:auto!important;min-width:150px;--el-popover-padding:var(--ibiz-action-toolbar-popover-padding)}.ibiz-action-toolbar__popover .el-button{--el-button-size:getCssVar("height-control", "large");display:block;width:100%;padding:var(--ibiz-action-toolbar-popover-button-padding);margin:var(--ibiz-spacing-none);font-size:var(--ibiz-font-size-regular);color:var(--ibiz-action-toolbar-popover-button-color);text-align:left;border-radius:0}.ibiz-action-toolbar__popover .el-button:hover{background-color:var(--ibiz-action-toolbar-popover-button-hover-bg)}.ibiz-action-toolbar__popover .el-button .ibiz-icon{margin-right:var(--ibiz-spacing-extra-tight)}.ibiz-action-toolbar__popover .ibiz-action-toolbar__separator{margin:var(--ibiz-spacing-none)}.ibiz-action-toolbar--dropdown .ibiz-action-toolbar__caption{cursor:pointer}.ibiz-action-toolbar--dropdown .ibiz-action-toolbar__caption-icon{vertical-align:bottom}
+@charset "UTF-8";.ibiz-action-toolbar{--ibiz-action-toolbar-item-margin:var(--ibiz-spacing-none) var(--ibiz-spacing-extra-tight) var(--ibiz-spacing-none) var(--ibiz-spacing-none);--ibiz-action-toolbar-item-padding:var(--ibiz-spacing-extra-tight) var(--ibiz-spacing-none);--ibiz-action-toolbar-separator-height:var(--ibiz-spacing-base-loose);--ibiz-action-toolbar-separator-width:var(--ibiz-spacing-super-tight);--ibiz-action-toolbar-separator-color:var(--ibiz-color-border);--ibiz-action-toolbar-popover-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-none);--ibiz-action-toolbar-popover-button-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base-loose);--ibiz-action-toolbar-popover-button-color:var(--ibiz-color-text-2);--ibiz-action-toolbar-popover-button-hover-bg:var(--ibiz-color-bg-0);display:flex;flex-wrap:wrap}.ibiz-action-toolbar__item{padding:var(--ibiz-action-toolbar-item-padding);margin:var(--ibiz-action-toolbar-item-margin)}.ibiz-action-toolbar__item--icon.is-has-icon{position:relative;display:flex;align-items:baseline;justify-content:center;width:var(--ibiz-width-icon-medium);height:var(--ibiz-width-icon-medium);margin-right:var(--ibiz-spacing-extra-tight);margin-left:var(--ibiz-spacing-extra-tight);font-size:var(--ibiz-width-icon-medium)}.ibiz-action-toolbar__item--icon.is-has-icon .ibiz-icon{position:absolute;top:50%;left:0;transform:translateY(-50%)}.ibiz-action-toolbar__item--label.is-has-caption{margin-right:var(--ibiz-spacing-extra-tight)}.ibiz-action-toolbar__item+.ibiz-action-toolbar__item{margin:var(--ibiz-action-toolbar-item-margin)}.ibiz-action-toolbar__group-item>span{width:100%}.ibiz-action-toolbar__group-item--content{display:flex;gap:var(--ibiz-spacing-extra-tight);align-items:center;justify-content:space-between;width:100%}.ibiz-action-toolbar__group-item--caption{display:flex;align-items:center;padding:var(--ibiz-action-toolbar-item-padding);margin:var(--ibiz-action-toolbar-item-margin)}.ibiz-action-toolbar__separator{height:auto}.ibiz-action-toolbar__popover{--ibiz-action-toolbar-item-margin:var(--ibiz-spacing-none) var(--ibiz-spacing-extra-tight) var(--ibiz-spacing-none) var(--ibiz-spacing-none);--ibiz-action-toolbar-item-padding:var(--ibiz-spacing-extra-tight) var(--ibiz-spacing-none);--ibiz-action-toolbar-separator-height:var(--ibiz-spacing-base-loose);--ibiz-action-toolbar-separator-width:var(--ibiz-spacing-super-tight);--ibiz-action-toolbar-separator-color:var(--ibiz-color-border);--ibiz-action-toolbar-popover-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-none);--ibiz-action-toolbar-popover-button-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base-loose);--ibiz-action-toolbar-popover-button-color:var(--ibiz-color-text-2);--ibiz-action-toolbar-popover-button-hover-bg:var(--ibiz-color-bg-0);width:auto!important;min-width:150px;--el-popover-padding:var(--ibiz-action-toolbar-popover-padding)}.ibiz-action-toolbar__popover .el-button{--el-button-size:getCssVar("height-control", "large");display:block;width:100%;padding:var(--ibiz-action-toolbar-popover-button-padding);margin:var(--ibiz-spacing-none);font-size:var(--ibiz-font-size-regular);color:var(--ibiz-action-toolbar-popover-button-color);text-align:left;border-radius:0}.ibiz-action-toolbar__popover .el-button:hover{background-color:var(--ibiz-action-toolbar-popover-button-hover-bg)}.ibiz-action-toolbar__popover .el-button .ibiz-action-toolbar__item--icon.is-has-icon{margin:0 var(--ibiz-spacing-tight) 0 0}.ibiz-action-toolbar__popover .ibiz-action-toolbar__separator{margin:var(--ibiz-spacing-none)}.ibiz-action-toolbar--dropdown .ibiz-action-toolbar__caption{cursor:pointer}.ibiz-action-toolbar--dropdown .ibiz-action-toolbar__caption-icon{vertical-align:bottom}

package/lib/control/form/form-detail/form-button/form-button.cjs

@@ -45,7 +45,7 @@ const FormButton = /* @__PURE__ */ vue.defineComponent({
       return null;
     }
     return vue.createVNode("div", {
-      "class": [this.ns.b(), this.ns.m(this.modelData.codeName), this.ns.is("loading", this.controller.state.loading), this.modelData.detailStyle && this.ns.m(this.modelData.detailStyle.toLowerCase()), ...this.controller.containerClass]
+      "class": [this.ns.b(), this.ns.m(this.modelData.codeName), this.ns.is("loading", this.controller.state.loading), this.ns.is("readonly", this.controller.state.readonly), this.modelData.detailStyle && this.ns.m(this.modelData.detailStyle.toLowerCase()), ...this.controller.containerClass]
     }, [vue.createVNode(vue.resolveComponent("el-button"), {
       "sime": "small",
       "onClick": this.controller.onClick.bind(this.controller),

package/lib/control/form/form-detail/form-button/form-button.css

@@ -1 +1 @@
-.ibiz-form-button{--ibiz-form-button-icon-margin:var(--ibiz-spacing-extra-tight);--ibiz-form-button-icon-max-width:var(--ibiz-width-icon-medium);--ibiz-form-button-icon-max-height:var(--ibiz-width-icon-medium);width:100%;height:100%;padding:var(--ibiz-spacing-tight);overflow:hidden}.ibiz-form-button .el-button{width:100%;height:100%}.ibiz-form-button .el-button .ibiz-form-button-content{display:flex;align-items:center;justify-content:flex-start}.ibiz-form-button .el-button .ibiz-form-button-content i,.ibiz-form-button .el-button .ibiz-form-button-content img{display:inline-block;max-width:var(--ibiz-form-button-icon-max-width);max-height:var(--ibiz-form-button-icon-max-height)}.ibiz-form-button .el-button .ibiz-form-button-content .ibiz-icon+.ibiz-form-button-content--caption{margin-left:var(--ibiz-form-button-icon-margin)}.ibiz-form-button.is-loading .el-button .ibiz-icon{display:none}
+.ibiz-form-button{--ibiz-form-button-icon-margin:var(--ibiz-spacing-extra-tight);--ibiz-form-button-icon-max-width:var(--ibiz-width-icon-medium);--ibiz-form-button-icon-max-height:var(--ibiz-width-icon-medium);width:100%;height:100%;padding:var(--ibiz-spacing-tight);overflow:hidden}.ibiz-form-button .el-button{width:100%;height:100%}.ibiz-form-button .el-button .ibiz-form-button-content{display:flex;align-items:center;justify-content:flex-start}.ibiz-form-button .el-button .ibiz-form-button-content i,.ibiz-form-button .el-button .ibiz-form-button-content img{display:inline-block;max-width:var(--ibiz-form-button-icon-max-width);max-height:var(--ibiz-form-button-icon-max-height)}.ibiz-form-button .el-button .ibiz-form-button-content .ibiz-icon+.ibiz-form-button-content--caption{margin-left:var(--ibiz-form-button-icon-margin)}.ibiz-form-button.is-loading .el-button .ibiz-icon{display:none}.ibiz-form-button.is-readonly{display:none}

package/lib/locale/en/index.cjs

@@ -806,6 +806,10 @@ var index = {
         notificationYet: "Current no notification",
         loadMore: "Load more({length})",
         onlyShowUnread: "Only show unread"
+      },
+      internalMessageGroup: {
+        expand: "Expand",
+        collapse: "Collapse"
       }
     },
     customSetting: {

package/lib/locale/zh-CN/index.cjs

@@ -802,6 +802,10 @@ var index = {
         notificationYet: "\u6682\u65E0\u901A\u77E5",
         loadMore: "\u52A0\u8F7D\u66F4\u591A({length})",
         onlyShowUnread: "\u53EA\u663E\u793A\u672A\u8BFB"
+      },
+      internalMessageGroup: {
+        expand: "\u5C55\u5F00",
+        collapse: "\u6536\u8D77"
       }
     },
     customSetting: {

package/lib/panel-component/user-message/internal-message/common/internal-message-container/internal-message-container.cjs

@@ -28,7 +28,8 @@ const InternalMessageContainer = /* @__PURE__ */ vue.defineComponent({
   },
   emits: {
     toolbarClick: (_key) => true,
-    close: () => true
+    close: () => true,
+    read: () => true
   },
   setup(props, {
     emit
@@ -51,7 +52,7 @@ const InternalMessageContainer = /* @__PURE__ */ vue.defineComponent({
     const onToolbarClick = (event, key) => {
       event.stopPropagation();
       if (key === "read") {
-        ibiz.hub.notice.internalMessage.markRead(props.message);
+        emit("read");
       } else {
         emit("toolbarClick", key);
       }
@@ -65,18 +66,18 @@ const InternalMessageContainer = /* @__PURE__ */ vue.defineComponent({
     const onClick = async (event) => {
       if (isClickable.value && props.provider.onClick) {
         const isClose = await props.provider.onClick(props.message, event);
-        if (isClose) {
+        if (isClose)
           emit("close");
-        }
       }
+      emit("read");
     };
     return {
       ns,
       isUnread,
       isClickable,
       finalToolbarItems,
-      onToolbarClick,
-      onClick
+      onClick,
+      onToolbarClick
     };
   },
   render() {

package/lib/panel-component/user-message/internal-message/common/internal-message-default/internal-message-default.cjs

@@ -36,7 +36,8 @@ const InternalMessageDefault = /* @__PURE__ */ vue.defineComponent({
     }
   },
   emits: {
-    close: () => true
+    close: () => true,
+    read: () => true
   },
   setup() {
     const ns = vue3Util.useNamespace("internal-message");
@@ -58,6 +59,7 @@ const InternalMessageDefault = /* @__PURE__ */ vue.defineComponent({
       "class": [this.ns.b()],
       "message": this.message,
       "provider": this.provider,
+      "onRead": () => this.$emit("read"),
       "onClose": () => this.$emit("close")
     }, {
       default: () => [vue.createVNode("div", {

package/lib/panel-component/user-message/internal-message/common/internal-message-default/internal-message-default.provider.cjs

@@ -25,7 +25,6 @@ class InternalMessageDefaultProvider {
     });
   }
   async onClick(message, _event) {
-    await ibiz.hub.notice.internalMessage.markRead(message);
     const redirectUrl = ibiz.env.isMob ? message.mobile_url : message.url;
     return this.openViewByUrl(redirectUrl);
   }

package/lib/panel-component/user-message/internal-message/index.cjs

@@ -10,10 +10,12 @@ var internalMessageHtml = require('./internal-message-html/internal-message-html
 var internalMessageHtml_provider = require('./internal-message-html/internal-message-html.provider.cjs');
 var internalMessageText_provider = require('./internal-message-text/internal-message-text.provider.cjs');
 var internalMessageText = require('./internal-message-text/internal-message-text.cjs');
+var internalMessageGroup = require('./internal-message-group/internal-message-group.cjs');
 var internalMessageTab = require('./internal-message-tab/internal-message-tab.cjs');
 
 "use strict";
 function installInternalMessage(v) {
+  v.component(internalMessageGroup.InternalMessagGroup.name, internalMessageGroup.InternalMessagGroup);
   v.component(internalMessageContainer.InternalMessageContainer.name, internalMessageContainer.InternalMessageContainer);
   v.component(internalMessageDefault.InternalMessageDefault.name, internalMessageDefault.InternalMessageDefault);
   v.component(internalMessageJson.InternalMessageJSON.name, internalMessageJson.InternalMessageJSON);

package/lib/panel-component/user-message/internal-message/internal-message-group/internal-message-group.cjs

@@ -0,0 +1,124 @@
+'use strict';
+
+var vue = require('vue');
+var vue3Util = require('@ibiz-template/vue3-util');
+var core = require('@ibiz-template/core');
+var runtime = require('@ibiz-template/runtime');
+require('../../../../util/index.cjs');
+require('./internal-message-group.css');
+var wangEditorUtil = require('../../../../util/wang-editor-util/wang-editor-util.cjs');
+
+"use strict";
+const InternalMessagGroup = /* @__PURE__ */ vue.defineComponent({
+  name: "IBizInternalMessageGroup",
+  props: {
+    message: {
+      type: Object,
+      required: true
+    },
+    provider: {
+      type: Object,
+      required: true
+    }
+  },
+  emits: {
+    close: (_msg) => true,
+    read: (_msg) => true
+  },
+  setup(props, {
+    emit
+  }) {
+    const ns = vue3Util.useNamespace("internal-message-group");
+    const isExpand = vue.ref(false);
+    const onExpandChange = () => {
+      isExpand.value = !isExpand.value;
+    };
+    const html = vue.computed(() => {
+      const {
+        content_type,
+        content
+      } = props.message;
+      if (content_type === "JSON")
+        return content ? JSON.parse(content).html : content;
+      if (content === "HTML")
+        return wangEditorUtil.parseHtml(content);
+      return content;
+    });
+    const onClose = (msg) => {
+      emit("close", msg);
+    };
+    const onRead = (msg) => {
+      emit("read", msg);
+    };
+    const onClick = async (event) => {
+      if (props.provider.onClick) {
+        const isClose = await props.provider.onClick(props.message, event);
+        if (isClose)
+          onClose();
+      }
+      onRead(props.message);
+    };
+    return {
+      ns,
+      html,
+      isExpand,
+      onRead,
+      onClose,
+      onClick,
+      onExpandChange
+    };
+  },
+  render() {
+    var _a, _b;
+    return vue.createVNode("div", {
+      "class": this.ns.b()
+    }, [vue.createVNode("div", {
+      "class": this.ns.e("content")
+    }, [vue.createVNode("div", {
+      "innerHTML": this.html,
+      "onClick": this.onClick,
+      "class": this.ns.em("content", "html")
+    }, null), vue.createVNode("div", {
+      "class": this.ns.e("action")
+    }, [vue.createVNode("ion-icon", {
+      "class": this.ns.em("action", "item"),
+      "title": core.showTitle(this.isExpand ? ibiz.i18n.t("panelComponent.userMessage.internalMessageGroup.collapse") : ibiz.i18n.t("panelComponent.userMessage.internalMessageGroup.expand")),
+      "name": this.isExpand ? "chevron-down-outline" : "chevron-forward-outline",
+      "onClick": this.onExpandChange
+    }, null), vue.createVNode(vue.resolveComponent("iBizBadge"), {
+      "class": this.ns.e("badge"),
+      "value": (_a = this.message.children) == null ? void 0 : _a.length
+    }, null), vue.createVNode(vue.resolveComponent("iBizIcon"), {
+      "baseDir": "iconfont",
+      "icon": {
+        imagePath: "svg/read.svg"
+      },
+      "class": [this.ns.em("action", "item"), this.ns.em("action", "read")],
+      "title": core.showTitle(ibiz.i18n.t("panelComponent.userMessage.internalMessageContainer.markAsRead")),
+      "onClick": () => this.onRead(this.message)
+    }, null)])]), this.isExpand && vue.createVNode("div", {
+      "class": this.ns.e("children")
+    }, [(_b = this.message.children) == null ? void 0 : _b.map((msg) => {
+      let provider;
+      try {
+        provider = runtime.getInternalMessageProvider(msg);
+      } catch (error) {
+        ibiz.log.error(error);
+      }
+      if (provider)
+        return provider.render({
+          message: msg,
+          class: this.ns.em("children", "item"),
+          onClose: () => this.onClose(msg),
+          onRead: () => this.onRead(msg)
+        });
+      return vue.createVNode("div", {
+        "class": this.ns.em("children", "item")
+      }, [ibiz.i18n.t("panelComponent.userMessage.internalMessageTab.noSupportType", {
+        type: msg.content_type
+      })]);
+    })])]);
+  }
+});
+
+exports.InternalMessagGroup = InternalMessagGroup;

package/lib/panel-component/user-message/internal-message/internal-message-group/internal-message-group.css

@@ -0,0 +1 @@
+.ibiz-internal-message-group{display:flex;flex-flow:column nowrap;height:auto}.ibiz-internal-message-group__content{position:relative;flex-shrink:0;min-height:60px;padding:var(--ibiz-spacing-tight);cursor:pointer}.ibiz-internal-message-group__content:hover{background-color:var(--ibiz-color-fill-1)}.ibiz-internal-message-group__content:hover .ibiz-internal-message-group__badge{display:none}.ibiz-internal-message-group__content:hover .ibiz-internal-message-group__action--read{display:block}.ibiz-internal-message-group__badge{color:var(--ibiz-color-white)!important;background-color:var(--ibiz-color-danger)!important}.ibiz-internal-message-group__action{position:absolute;top:var(--ibiz-spacing-tight);right:var(--ibiz-spacing-tight);display:flex;gap:var(--ibiz-spacing-tight);align-items:center;width:40px;height:18px}.ibiz-internal-message-group__action--item{cursor:pointer}.ibiz-internal-message-group__action--item:hover{color:var(--ibiz-color-primary)}.ibiz-internal-message-group__action--read{display:none}.ibiz-internal-message-group__children{flex-grow:1;padding-left:var(--ibiz-spacing-loose)}.ibiz-internal-message-group__children--item{min-height:60px;padding:var(--ibiz-spacing-tight)}.ibiz-internal-message-group__children--item:hover{background-color:var(--ibiz-color-fill-1)}

package/lib/panel-component/user-message/internal-message/internal-message-html/internal-message-html.cjs

@@ -2,8 +2,8 @@
 
 var vue = require('vue');
 var vue3Util = require('@ibiz-template/vue3-util');
-require('./internal-message-html.css');
 require('../../../../util/index.cjs');
+require('./internal-message-html.css');
 var wangEditorUtil = require('../../../../util/wang-editor-util/wang-editor-util.cjs');
 
 "use strict";
@@ -20,7 +20,8 @@ const InternalMessageHTML = /* @__PURE__ */ vue.defineComponent({
     }
   },
   emits: {
-    close: () => true
+    close: () => true,
+    read: () => true
   },
   setup(props) {
     const ns = vue3Util.useNamespace("internal-message-html");
@@ -37,6 +38,7 @@ const InternalMessageHTML = /* @__PURE__ */ vue.defineComponent({
       "class": [this.ns.b()],
       "message": this.message,
       "provider": this.provider,
+      "onRead": () => this.$emit("read"),
       "onClose": () => this.$emit("close")
     }, {
       default: () => [vue.createVNode("div", {

package/lib/panel-component/user-message/internal-message/internal-message-json/internal-message-json.cjs

@@ -21,7 +21,8 @@ const InternalMessageJSON = /* @__PURE__ */ vue.defineComponent({
     }
   },
   emits: {
-    close: () => true
+    close: () => true,
+    read: () => true
   },
   setup(props, {
     emit
@@ -60,10 +61,10 @@ const InternalMessageJSON = /* @__PURE__ */ vue.defineComponent({
     };
     return {
       ns,
-      jsonContent,
-      toolbarItems,
       redirectUrl,
       isWFMessage,
+      jsonContent,
+      toolbarItems,
       onToolbarClick
     };
   },
@@ -106,6 +107,7 @@ const InternalMessageJSON = /* @__PURE__ */ vue.defineComponent({
       "clickable": !!this.redirectUrl || !!this.isWFMessage,
       "toolbarItems": this.toolbarItems,
       "onToolbarClick": this.onToolbarClick,
+      "onRead": () => this.$emit("read"),
       "onClose": () => this.$emit("close")
     }, _isSlot(content) ? content : {
       default: () => [content]

package/lib/panel-component/user-message/internal-message/internal-message-tab/internal-message-tab.cjs

@@ -1,10 +1,11 @@
 'use strict';
 
 var vue = require('vue');
+var dayjs = require('dayjs');
+var ramda = require('ramda');
 var vue3Util = require('@ibiz-template/vue3-util');
 var runtime = require('@ibiz-template/runtime');
 require('./internal-message-tab.css');
-var ramda = require('ramda');
 
 "use strict";
 const InternalMessageTab = /* @__PURE__ */ vue.defineComponent({
@@ -30,6 +31,18 @@ const InternalMessageTab = /* @__PURE__ */ vue.defineComponent({
     const hiddenPopover = () => {
       emit("hiddenPopover");
     };
+    const onMarkRead = async (message, filter) => {
+      var _a2;
+      if ((_a2 = message.children) == null ? void 0 : _a2.length) {
+        await Promise.all(message.children.filter((child) => child.id !== (filter == null ? void 0 : filter.id)).map((child) => ibiz.hub.notice.internalMessage.markRead(child)));
+      } else {
+        await ibiz.hub.notice.internalMessage.markRead(message);
+      }
+    };
+    const onGroupClose = async (message, filter) => {
+      hiddenPopover();
+      await onMarkRead(message, filter);
+    };
     const c = props.controller;
     const unreadOnlyTag = "".concat((_a = ibiz.appData) == null ? void 0 : _a.context.srfsystemid, "-unreadOnly");
     const hasNotice = vue.ref(false);
@@ -47,15 +60,55 @@ const InternalMessageTab = /* @__PURE__ */ vue.defineComponent({
       }
     });
     const allItems = vue.ref([]);
+    const messages = vue.ref([]);
     const state = vue.reactive({
       total: 0,
       pageSize: 0,
       unreadOnly: c.unreadOnly
     });
+    const handleMessageGroup = () => {
+      const grouped = {};
+      const ungrouped = [];
+      allItems.value.forEach((item) => {
+        const key = ibiz.env.isMob ? "".concat(item.message_type).concat(item.mobile_url) : "".concat(item.message_type).concat(item.url);
+        const shouldGroup = key && item.status === "RECEIVED";
+        if (shouldGroup) {
+          if (!grouped[key])
+            grouped[key] = [];
+          grouped[key].push({
+            ...item
+          });
+        } else {
+          ungrouped.push({
+            ...item
+          });
+        }
+      });
+      const finalResult = [...ungrouped];
+      Object.values(grouped).forEach((group) => {
+        if (group.length === 1) {
+          finalResult.push({
+            ...group[0]
+          });
+        } else {
+          const parent = {
+            ...group[0]
+          };
+          parent.children = group.map((item) => ({
+            ...item
+          }));
+          finalResult.push(parent);
+        }
+      });
+      messages.value = finalResult.sort((a, b) => {
+        return dayjs(a.update_time).isAfter(b.update_time) ? -1 : 1;
+      });
+    };
     const updateData = () => {
-      allItems.value = ramda.clone(c.messages);
       state.total = c.total;
       state.pageSize = c.size;
+      allItems.value = ramda.clone(c.messages);
+      handleMessageGroup();
     };
     updateData();
     const updateUnreadOnlyChange = (val) => {
@@ -92,11 +145,14 @@ const InternalMessageTab = /* @__PURE__ */ vue.defineComponent({
     });
     return {
       ns,
-      allItems,
       state,
-      hiddenPopover,
+      allItems,
+      messages,
       showMore,
-      switchChange
+      onMarkRead,
+      onGroupClose,
+      switchChange,
+      hiddenPopover
     };
   },
   render() {
@@ -105,20 +161,27 @@ const InternalMessageTab = /* @__PURE__ */ vue.defineComponent({
       "class": [this.ns.b()]
     }, [vue.createVNode("div", {
       "class": this.ns.b("content")
-    }, [this.allItems.length > 0 && this.allItems.map((msg) => {
+    }, [this.allItems.length > 0 && this.messages.map((msg) => {
+      var _a;
       let provider;
       try {
         provider = runtime.getInternalMessageProvider(msg);
       } catch (error) {
         ibiz.log.error(error);
       }
-      if (provider) {
-        return provider.render({
-          class: [this.ns.e("item")],
+      if (provider)
+        return ((_a = msg.children) == null ? void 0 : _a.length) ? vue.createVNode(vue.resolveComponent("iBizInternalMessageGroup"), {
+          "message": msg,
+          "provider": provider,
+          "class": this.ns.e("group"),
+          "onRead": this.onMarkRead,
+          "onClose": (filter) => this.onGroupClose(msg, filter)
+        }, null) : provider.render({
           message: msg,
-          onClose: this.hiddenPopover
+          class: this.ns.e("item"),
+          onClose: this.hiddenPopover,
+          onRead: () => this.onMarkRead(msg)
         });
-      }
       return vue.createVNode("div", {
         "class": this.ns.e("item")
       }, [ibiz.i18n.t("panelComponent.userMessage.internalMessageTab.noSupportType", {
@@ -137,7 +200,7 @@ const InternalMessageTab = /* @__PURE__ */ vue.defineComponent({
       "value": this.state.unreadOnly,
       "onChange": this.switchChange,
       "class": this.ns.be("footer", "switch")
-    }, null), " ", ibiz.i18n.t("panelComponent.userMessage.internalMessageTab.onlyShowUnread")])]);
+    }, null), ibiz.i18n.t("panelComponent.userMessage.internalMessageTab.onlyShowUnread")])]);
   }
 });