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

package/es/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/es/locale/en/index.mjs

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

package/es/locale/zh-CN/index.mjs

@@ -798,6 +798,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/es/panel-component/user-message/internal-message/common/internal-message-container/internal-message-container.mjs

@@ -26,7 +26,8 @@ const InternalMessageContainer = /* @__PURE__ */ defineComponent({
   },
   emits: {
     toolbarClick: (_key) => true,
-    close: () => true
+    close: () => true,
+    read: () => true
   },
   setup(props, {
     emit
@@ -49,7 +50,7 @@ const InternalMessageContainer = /* @__PURE__ */ defineComponent({
     const onToolbarClick = (event, key) => {
       event.stopPropagation();
       if (key === "read") {
-        ibiz.hub.notice.internalMessage.markRead(props.message);
+        emit("read");
       } else {
         emit("toolbarClick", key);
       }
@@ -63,18 +64,18 @@ const InternalMessageContainer = /* @__PURE__ */ 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/es/panel-component/user-message/internal-message/common/internal-message-default/internal-message-default.mjs

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

package/es/panel-component/user-message/internal-message/common/internal-message-default/internal-message-default.provider.mjs

@@ -23,7 +23,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/es/panel-component/user-message/internal-message/index.mjs

@@ -8,10 +8,12 @@ import { InternalMessageHTML } from './internal-message-html/internal-message-ht
 import { InternalMessageHTMLtProvider } from './internal-message-html/internal-message-html.provider.mjs';
 import { InternalMessageTextProvider } from './internal-message-text/internal-message-text.provider.mjs';
 import { InternalMessageText } from './internal-message-text/internal-message-text.mjs';
+import { InternalMessagGroup } from './internal-message-group/internal-message-group.mjs';
 export { InternalMessageTab } from './internal-message-tab/internal-message-tab.mjs';
 
 "use strict";
 function installInternalMessage(v) {
+  v.component(InternalMessagGroup.name, InternalMessagGroup);
   v.component(InternalMessageContainer.name, InternalMessageContainer);
   v.component(InternalMessageDefault.name, InternalMessageDefault);
   v.component(InternalMessageJSON.name, InternalMessageJSON);

package/es/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/es/panel-component/user-message/internal-message/internal-message-group/internal-message-group.mjs

@@ -0,0 +1,122 @@
+import { defineComponent, createVNode, resolveComponent, ref, computed } from 'vue';
+import { useNamespace } from '@ibiz-template/vue3-util';
+import { showTitle } from '@ibiz-template/core';
+import { getInternalMessageProvider } from '@ibiz-template/runtime';
+import '../../../../util/index.mjs';
+import './internal-message-group.css';
+import { parseHtml } from '../../../../util/wang-editor-util/wang-editor-util.mjs';
+
+"use strict";
+const InternalMessagGroup = /* @__PURE__ */ 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 = useNamespace("internal-message-group");
+    const isExpand = ref(false);
+    const onExpandChange = () => {
+      isExpand.value = !isExpand.value;
+    };
+    const html = computed(() => {
+      const {
+        content_type,
+        content
+      } = props.message;
+      if (content_type === "JSON")
+        return content ? JSON.parse(content).html : content;
+      if (content === "HTML")
+        return 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 createVNode("div", {
+      "class": this.ns.b()
+    }, [createVNode("div", {
+      "class": this.ns.e("content")
+    }, [createVNode("div", {
+      "innerHTML": this.html,
+      "onClick": this.onClick,
+      "class": this.ns.em("content", "html")
+    }, null), createVNode("div", {
+      "class": this.ns.e("action")
+    }, [createVNode("ion-icon", {
+      "class": this.ns.em("action", "item"),
+      "title": 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), createVNode(resolveComponent("iBizBadge"), {
+      "class": this.ns.e("badge"),
+      "value": (_a = this.message.children) == null ? void 0 : _a.length
+    }, null), createVNode(resolveComponent("iBizIcon"), {
+      "baseDir": "iconfont",
+      "icon": {
+        imagePath: "svg/read.svg"
+      },
+      "class": [this.ns.em("action", "item"), this.ns.em("action", "read")],
+      "title": showTitle(ibiz.i18n.t("panelComponent.userMessage.internalMessageContainer.markAsRead")),
+      "onClick": () => this.onRead(this.message)
+    }, null)])]), this.isExpand && createVNode("div", {
+      "class": this.ns.e("children")
+    }, [(_b = this.message.children) == null ? void 0 : _b.map((msg) => {
+      let provider;
+      try {
+        provider = 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 createVNode("div", {
+        "class": this.ns.em("children", "item")
+      }, [ibiz.i18n.t("panelComponent.userMessage.internalMessageTab.noSupportType", {
+        type: msg.content_type
+      })]);
+    })])]);
+  }
+});
+
+export { InternalMessagGroup };

package/es/panel-component/user-message/internal-message/internal-message-html/internal-message-html.mjs

@@ -1,7 +1,7 @@
 import { defineComponent, createVNode, resolveComponent, computed } from 'vue';
 import { useNamespace } from '@ibiz-template/vue3-util';
-import './internal-message-html.css';
 import '../../../../util/index.mjs';
+import './internal-message-html.css';
 import { parseHtml } from '../../../../util/wang-editor-util/wang-editor-util.mjs';
 
 "use strict";
@@ -18,7 +18,8 @@ const InternalMessageHTML = /* @__PURE__ */ defineComponent({
     }
   },
   emits: {
-    close: () => true
+    close: () => true,
+    read: () => true
   },
   setup(props) {
     const ns = useNamespace("internal-message-html");
@@ -35,6 +36,7 @@ const InternalMessageHTML = /* @__PURE__ */ defineComponent({
       "class": [this.ns.b()],
       "message": this.message,
       "provider": this.provider,
+      "onRead": () => this.$emit("read"),
       "onClose": () => this.$emit("close")
     }, {
       default: () => [createVNode("div", {

package/es/panel-component/user-message/internal-message/internal-message-json/internal-message-json.mjs

@@ -19,7 +19,8 @@ const InternalMessageJSON = /* @__PURE__ */ defineComponent({
     }
   },
   emits: {
-    close: () => true
+    close: () => true,
+    read: () => true
   },
   setup(props, {
     emit
@@ -58,10 +59,10 @@ const InternalMessageJSON = /* @__PURE__ */ defineComponent({
     };
     return {
       ns,
-      jsonContent,
-      toolbarItems,
       redirectUrl,
       isWFMessage,
+      jsonContent,
+      toolbarItems,
       onToolbarClick
     };
   },
@@ -104,6 +105,7 @@ const InternalMessageJSON = /* @__PURE__ */ 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/es/panel-component/user-message/internal-message/internal-message-tab/internal-message-tab.mjs

@@ -1,8 +1,9 @@
 import { defineComponent, createVNode, resolveComponent, ref, watch, reactive, onUnmounted, onMounted } from 'vue';
+import dayjs from 'dayjs';
+import { clone } from 'ramda';
 import { useNamespace } from '@ibiz-template/vue3-util';
 import { getInternalMessageProvider } from '@ibiz-template/runtime';
 import './internal-message-tab.css';
-import { clone } from 'ramda';
 
 "use strict";
 const InternalMessageTab = /* @__PURE__ */ defineComponent({
@@ -28,6 +29,18 @@ const InternalMessageTab = /* @__PURE__ */ 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 = ref(false);
@@ -45,15 +58,55 @@ const InternalMessageTab = /* @__PURE__ */ defineComponent({
       }
     });
     const allItems = ref([]);
+    const messages = ref([]);
     const state = 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 = clone(c.messages);
       state.total = c.total;
       state.pageSize = c.size;
+      allItems.value = clone(c.messages);
+      handleMessageGroup();
     };
     updateData();
     const updateUnreadOnlyChange = (val) => {
@@ -90,11 +143,14 @@ const InternalMessageTab = /* @__PURE__ */ defineComponent({
     });
     return {
       ns,
-      allItems,
       state,
-      hiddenPopover,
+      allItems,
+      messages,
       showMore,
-      switchChange
+      onMarkRead,
+      onGroupClose,
+      switchChange,
+      hiddenPopover
     };
   },
   render() {
@@ -103,20 +159,27 @@ const InternalMessageTab = /* @__PURE__ */ defineComponent({
       "class": [this.ns.b()]
     }, [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 = 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) ? createVNode(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 createVNode("div", {
         "class": this.ns.e("item")
       }, [ibiz.i18n.t("panelComponent.userMessage.internalMessageTab.noSupportType", {
@@ -135,7 +198,7 @@ const InternalMessageTab = /* @__PURE__ */ 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")])]);
   }
 });
 

package/es/panel-component/user-message/internal-message/internal-message-text/internal-message-text.mjs

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

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

@@ -34,6 +34,7 @@ class AIChatUtil {
    * @param data
    */
   async getEditorExAIChatParams(editorParams, context, params, data, deACMode, args) {
+    var _a;
     const containerOptions = {};
     if (editorParams.enableaiminimize) {
       containerOptions.enableAIMinimize = editorParams.enableaiminimize === "true";
@@ -273,13 +274,16 @@ class AIChatUtil {
       }
       return null;
     };
+    const app = ibiz.hub.getApp(context.srfappid);
+    const folder = app.model.defaultOSSCat || ((_a = app.model.userParam) == null ? void 0 : _a.DefaultOSSCat);
     chatOptions.uploader = {
+      folder: "".concat(folder, "$"),
       onUpload: async (file, reportProgress, options) => {
         const fileMeata = ibiz.util.file.calcFileUpDownUrl(
           (options == null ? void 0 : options.context) || context,
           (options == null ? void 0 : options.params) || params,
           {},
-          { enableNoAccess: true }
+          { enableNoAccess: true, osscat: folder }
         );
         const fielUploadHeaders = ibiz.util.file.getUploadHeaders();
         const formData = new FormData();
@@ -295,16 +299,38 @@ class AIChatUtil {
           }
         });
         return res.data;
+      },
+      onDownLoad: async (file, options) => {
+        const { downloadUrl } = ibiz.util.file.calcFileUpDownUrl(
+          (options == null ? void 0 : options.context) || context,
+          (options == null ? void 0 : options.params) || params,
+          {},
+          { enableNoAccess: true, osscat: folder }
+        );
+        const url = downloadUrl.replace("%fileId%", file.fileid);
+        await ibiz.util.file.fileDownload(
+          url,
+          file.filename,
+          {
+            context: (options == null ? void 0 : options.context) || context,
+            params: (options == null ? void 0 : options.params) || params,
+            data: {},
+            file: { fileId: file.id, ...file },
+            extraParams: { enableNoAccess: true, osscat: folder }
+          },
+          void 0,
+          true
+        );
       }
     };
     chatOptions.extendToolbarClick = async (event, source, context2, params2, data2) => {
-      var _a, _b, _c;
+      var _a2, _b, _c;
       const { id: id2, isPluginApp } = source;
       let appId = source.appId;
       const tempContext = IBizContext.create(context2);
       if (isPluginApp) {
         const mainApp = ibiz.hub.getApp();
-        const targetApp = (_a = mainApp.model.subAppRefs) == null ? void 0 : _a.find(
+        const targetApp = (_a2 = mainApp.model.subAppRefs) == null ? void 0 : _a2.find(
           (subAppRef) => subAppRef.appId.endsWith("__".concat(appId))
         );
         if (targetApp) {
@@ -355,6 +381,7 @@ class AIChatUtil {
    * @returns
    */
   async getUIActionExAIChatParams(context, params, data, deACMode, args) {
+    var _a;
     const containerOptions = {};
     if (params.hasOwnProperty("enableaiminimize")) {
       containerOptions.enableAIMinimize = params.enableaiminimize === "true";
@@ -651,13 +678,16 @@ class AIChatUtil {
       }
       return null;
     };
+    const app = ibiz.hub.getApp(context.srfappid);
+    const folder = app.model.defaultOSSCat || ((_a = app.model.userParam) == null ? void 0 : _a.DefaultOSSCat);
     chatOptions.uploader = {
+      folder: "".concat(folder, "$"),
       onUpload: async (file, reportProgress, options) => {
         const { uploadUrl } = ibiz.util.file.calcFileUpDownUrl(
           (options == null ? void 0 : options.context) || context,
           (options == null ? void 0 : options.params) || params,
           {},
-          { enableNoAccess: true }
+          { enableNoAccess: true, osscat: folder }
         );
         const headers = ibiz.util.file.getUploadHeaders();
         const formData = new FormData();
@@ -673,16 +703,38 @@ class AIChatUtil {
           }
         });
         return res.data;
+      },
+      onDownLoad: async (file, options) => {
+        const { downloadUrl } = ibiz.util.file.calcFileUpDownUrl(
+          (options == null ? void 0 : options.context) || context,
+          (options == null ? void 0 : options.params) || params,
+          {},
+          { enableNoAccess: true, osscat: folder }
+        );
+        const url = downloadUrl.replace("%fileId%", file.fileid);
+        await ibiz.util.file.fileDownload(
+          url,
+          file.filename,
+          {
+            context: (options == null ? void 0 : options.context) || context,
+            params: (options == null ? void 0 : options.params) || params,
+            data: {},
+            file: { fileId: file.id, ...file },
+            extraParams: { enableNoAccess: true, osscat: folder }
+          },
+          void 0,
+          true
+        );
       }
     };
     chatOptions.extendToolbarClick = async (event, source, context2, params2, data2) => {
-      var _a, _b, _c;
+      var _a2, _b, _c;
       const { id: id2, isPluginApp } = source;
       let appId = source.appId;
       const tempContext = IBizContext.create(context2);
       if (isPluginApp) {
         const mainApp = ibiz.hub.getApp();
-        const targetApp = (_a = mainApp.model.subAppRefs) == null ? void 0 : _a.find(
+        const targetApp = (_a2 = mainApp.model.subAppRefs) == null ? void 0 : _a2.find(
           (subAppRef) => subAppRef.appId.endsWith("__".concat(appId))
         );
         if (targetApp) {

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/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: {