yx-web-sdk 0.0.18 → 0.0.20

package/dist/yx-web-sdk.es.js

@@ -1,4 +1,4 @@
-import { inject, ref, getCurrentInstance, nextTick, h, reactive, defineComponent, createVNode, computed, openBlock, createElementBlock, normalizeStyle, createCommentVNode, toDisplayString, watch, onBeforeUnmount, normalizeClass, createElementVNode, withModifiers, createBlock, unref, withCtx, withDirectives, vShow, Teleport, Fragment, renderList, onMounted, onUnmounted, createTextVNode } from "vue";
+import { inject, ref, getCurrentInstance, nextTick, h, reactive, defineComponent, createVNode, computed, openBlock, createElementBlock, normalizeStyle, createCommentVNode, toDisplayString, createElementVNode, unref, onBeforeUnmount, watch, normalizeClass, Fragment, withModifiers, createBlock, withCtx, withDirectives, vShow, Teleport, renderList, onMounted, onUnmounted, createTextVNode } from "vue";
 import { useClipboard, useEventListener, useDebounceFn, useLocalStorage } from "@vueuse/core";
 import { message, Image, Button, Input, Popover, Upload, List, Typography, Form, Tooltip, Badge, Modal, Spin as Spin$1, Result, Empty } from "ant-design-vue";
 import { defineStore, createPinia } from "pinia";
@@ -718,7 +718,7 @@ function updateCSS(css, key) {
   newNode.setAttribute(getMark(option), key);
   return newNode;
 }
-function _objectSpread$b(target) {
+function _objectSpread$c(target) {
   for (var i = 1; i < arguments.length; i++) {
     var source = arguments[i] != null ? Object(arguments[i]) : {};
     var ownKeys = Object.keys(source);
@@ -728,12 +728,12 @@ function _objectSpread$b(target) {
       }));
     }
     ownKeys.forEach(function(key) {
-      _defineProperty$b(target, key, source[key]);
+      _defineProperty$c(target, key, source[key]);
     });
   }
   return target;
 }
-function _defineProperty$b(obj, key, value) {
+function _defineProperty$c(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, { value, enumerable: true, configurable: true, writable: true });
   } else {
@@ -754,13 +754,13 @@ function isIconDefinition(target) {
 }
 function generate(node, key, rootProps) {
   if (!rootProps) {
-    return h(node.tag, _objectSpread$b({
+    return h(node.tag, _objectSpread$c({
       key
     }, node.attrs), (node.children || []).map(function(child, index2) {
       return generate(child, "".concat(key, "-").concat(node.tag, "-").concat(index2));
     }));
   }
-  return h(node.tag, _objectSpread$b({
+  return h(node.tag, _objectSpread$c({
     key
   }, rootProps, node.attrs), (node.children || []).map(function(child, index2) {
     return generate(child, "".concat(key, "-").concat(node.tag, "-").concat(index2));
@@ -843,7 +843,7 @@ function _objectWithoutPropertiesLoose$3(source, excluded) {
   }
   return target;
 }
-function _objectSpread$a(target) {
+function _objectSpread$b(target) {
   for (var i = 1; i < arguments.length; i++) {
     var source = arguments[i] != null ? Object(arguments[i]) : {};
     var ownKeys = Object.keys(source);
@@ -853,12 +853,12 @@ function _objectSpread$a(target) {
       }));
     }
     ownKeys.forEach(function(key) {
-      _defineProperty$a(target, key, source[key]);
+      _defineProperty$b(target, key, source[key]);
     });
   }
   return target;
 }
-function _defineProperty$a(obj, key, value) {
+function _defineProperty$b(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, { value, enumerable: true, configurable: true, writable: true });
   } else {
@@ -878,10 +878,10 @@ function setTwoToneColors(_ref) {
   twoToneColorPalette.calculated = !!secondaryColor;
 }
 function getTwoToneColors() {
-  return _objectSpread$a({}, twoToneColorPalette);
+  return _objectSpread$b({}, twoToneColorPalette);
 }
 var IconBase = function IconBase2(props, context) {
-  var _props$context$attrs = _objectSpread$a({}, props, context.attrs), icon = _props$context$attrs.icon, primaryColor = _props$context$attrs.primaryColor, secondaryColor = _props$context$attrs.secondaryColor, restProps = _objectWithoutProperties$3(_props$context$attrs, _excluded$3);
+  var _props$context$attrs = _objectSpread$b({}, props, context.attrs), icon = _props$context$attrs.icon, primaryColor = _props$context$attrs.primaryColor, secondaryColor = _props$context$attrs.secondaryColor, restProps = _objectWithoutProperties$3(_props$context$attrs, _excluded$3);
   var colors = twoToneColorPalette;
   if (primaryColor) {
     colors = {
@@ -895,11 +895,11 @@ var IconBase = function IconBase2(props, context) {
   }
   var target = icon;
   if (target && typeof target.icon === "function") {
-    target = _objectSpread$a({}, target, {
+    target = _objectSpread$b({}, target, {
       icon: target.icon(colors.primaryColor, colors.secondaryColor)
     });
   }
-  return generate(target.icon, "svg-".concat(target.name), _objectSpread$a({}, restProps, {
+  return generate(target.icon, "svg-".concat(target.name), _objectSpread$b({}, restProps, {
     "data-icon": target.name,
     width: "1em",
     height: "1em",
@@ -1037,7 +1037,7 @@ function _iterableToArrayLimit(arr, i) {
 function _arrayWithHoles(arr) {
   if (Array.isArray(arr)) return arr;
 }
-function _objectSpread$9(target) {
+function _objectSpread$a(target) {
   for (var i = 1; i < arguments.length; i++) {
     var source = arguments[i] != null ? Object(arguments[i]) : {};
     var ownKeys = Object.keys(source);
@@ -1047,12 +1047,12 @@ function _objectSpread$9(target) {
       }));
     }
     ownKeys.forEach(function(key) {
-      _defineProperty$9(target, key, source[key]);
+      _defineProperty$a(target, key, source[key]);
     });
   }
   return target;
 }
-function _defineProperty$9(obj, key, value) {
+function _defineProperty$a(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, { value, enumerable: true, configurable: true, writable: true });
   } else {
@@ -1090,9 +1090,9 @@ function _objectWithoutPropertiesLoose$2(source, excluded) {
 setTwoToneColor(blue.primary);
 var Icon$1 = function Icon(props, context) {
   var _classObj;
-  var _props$context$attrs = _objectSpread$9({}, props, context.attrs), cls = _props$context$attrs["class"], icon = _props$context$attrs.icon, spin = _props$context$attrs.spin, rotate = _props$context$attrs.rotate, tabindex = _props$context$attrs.tabindex, twoToneColor = _props$context$attrs.twoToneColor, onClick = _props$context$attrs.onClick, restProps = _objectWithoutProperties$2(_props$context$attrs, _excluded$2);
+  var _props$context$attrs = _objectSpread$a({}, props, context.attrs), cls = _props$context$attrs["class"], icon = _props$context$attrs.icon, spin = _props$context$attrs.spin, rotate = _props$context$attrs.rotate, tabindex = _props$context$attrs.tabindex, twoToneColor = _props$context$attrs.twoToneColor, onClick = _props$context$attrs.onClick, restProps = _objectWithoutProperties$2(_props$context$attrs, _excluded$2);
   var _useInjectIconContext = useInjectIconContext(), prefixCls = _useInjectIconContext.prefixCls, rootClassName = _useInjectIconContext.rootClassName;
-  var classObj = (_classObj = {}, _defineProperty$9(_classObj, rootClassName.value, !!rootClassName.value), _defineProperty$9(_classObj, prefixCls.value, true), _defineProperty$9(_classObj, "".concat(prefixCls.value, "-").concat(icon.name), Boolean(icon.name)), _defineProperty$9(_classObj, "".concat(prefixCls.value, "-spin"), !!spin || icon.name === "loading"), _classObj);
+  var classObj = (_classObj = {}, _defineProperty$a(_classObj, rootClassName.value, !!rootClassName.value), _defineProperty$a(_classObj, prefixCls.value, true), _defineProperty$a(_classObj, "".concat(prefixCls.value, "-").concat(icon.name), Boolean(icon.name)), _defineProperty$a(_classObj, "".concat(prefixCls.value, "-spin"), !!spin || icon.name === "loading"), _classObj);
   var iconTabIndex = tabindex;
   if (iconTabIndex === void 0 && onClick) {
     iconTabIndex = -1;
@@ -1102,7 +1102,7 @@ var Icon$1 = function Icon(props, context) {
     transform: "rotate(".concat(rotate, "deg)")
   } : void 0;
   var _normalizeTwoToneColo = normalizeTwoToneColors(twoToneColor), _normalizeTwoToneColo2 = _slicedToArray(_normalizeTwoToneColo, 2), primaryColor = _normalizeTwoToneColo2[0], secondaryColor = _normalizeTwoToneColo2[1];
-  return createVNode("span", _objectSpread$9({
+  return createVNode("span", _objectSpread$a({
     "role": "img",
     "aria-label": icon.name
   }, restProps, {
@@ -1127,7 +1127,7 @@ Icon$1.inheritAttrs = false;
 Icon$1.getTwoToneColor = getTwoToneColor;
 Icon$1.setTwoToneColor = setTwoToneColor;
 var CloseOutlined$1 = { "icon": { "tag": "svg", "attrs": { "fill-rule": "evenodd", "viewBox": "64 64 896 896", "focusable": "false" }, "children": [{ "tag": "path", "attrs": { "d": "M799.86 166.31c.02 0 .04.02.08.06l57.69 57.7c.04.03.05.05.06.08a.12.12 0 010 .06c0 .03-.02.05-.06.09L569.93 512l287.7 287.7c.04.04.05.06.06.09a.12.12 0 010 .07c0 .02-.02.04-.06.08l-57.7 57.69c-.03.04-.05.05-.07.06a.12.12 0 01-.07 0c-.03 0-.05-.02-.09-.06L512 569.93l-287.7 287.7c-.04.04-.06.05-.09.06a.12.12 0 01-.07 0c-.02 0-.04-.02-.08-.06l-57.69-57.7c-.04-.03-.05-.05-.06-.07a.12.12 0 010-.07c0-.03.02-.05.06-.09L454.07 512l-287.7-287.7c-.04-.04-.05-.06-.06-.09a.12.12 0 010-.07c0-.02.02-.04.06-.08l57.7-57.69c.03-.04.05-.05.07-.06a.12.12 0 01.07 0c.03 0 .05.02.09.06L512 454.07l287.7-287.7c.04-.04.06-.05.09-.06a.12.12 0 01.07 0z" } }] }, "name": "close", "theme": "outlined" };
-function _objectSpread$8(target) {
+function _objectSpread$9(target) {
   for (var i = 1; i < arguments.length; i++) {
     var source = arguments[i] != null ? Object(arguments[i]) : {};
     var ownKeys = Object.keys(source);
@@ -1137,12 +1137,12 @@ function _objectSpread$8(target) {
       }));
     }
     ownKeys.forEach(function(key) {
-      _defineProperty$8(target, key, source[key]);
+      _defineProperty$9(target, key, source[key]);
     });
   }
   return target;
 }
-function _defineProperty$8(obj, key, value) {
+function _defineProperty$9(obj, key, value) {
   if (key in obj) {
     Object.defineProperty(obj, key, { value, enumerable: true, configurable: true, writable: true });
   } else {
@@ -1151,14 +1151,46 @@ function _defineProperty$8(obj, key, value) {
   return obj;
 }
 var CloseOutlined = function CloseOutlined2(props, context) {
-  var p = _objectSpread$8({}, props, context.attrs);
-  return createVNode(Icon$1, _objectSpread$8({}, p, {
+  var p = _objectSpread$9({}, props, context.attrs);
+  return createVNode(Icon$1, _objectSpread$9({}, p, {
     "icon": CloseOutlined$1
   }), null);
 };
 CloseOutlined.displayName = "CloseOutlined";
 CloseOutlined.inheritAttrs = false;
 var CrownOutlined$1 = { "icon": { "tag": "svg", "attrs": { "viewBox": "64 64 896 896", "focusable": "false" }, "children": [{ "tag": "path", "attrs": { "d": "M899.6 276.5L705 396.4 518.4 147.5a8.06 8.06 0 00-12.9 0L319 396.4 124.3 276.5c-5.7-3.5-13.1 1.2-12.2 7.9L188.5 865c1.1 7.9 7.9 14 16 14h615.1c8 0 14.9-6 15.9-14l76.4-580.6c.8-6.7-6.5-11.4-12.3-7.9zm-126 534.1H250.3l-53.8-409.4 139.8 86.1L512 252.9l175.7 234.4 139.8-86.1-53.9 409.4zM512 509c-62.1 0-112.6 50.5-112.6 112.6S449.9 734.2 512 734.2s112.6-50.5 112.6-112.6S574.1 509 512 509zm0 160.9c-26.6 0-48.2-21.6-48.2-48.3 0-26.6 21.6-48.3 48.2-48.3s48.2 21.6 48.2 48.3c0 26.6-21.6 48.3-48.2 48.3z" } }] }, "name": "crown", "theme": "outlined" };
+function _objectSpread$8(target) {
+  for (var i = 1; i < arguments.length; i++) {
+    var source = arguments[i] != null ? Object(arguments[i]) : {};
+    var ownKeys = Object.keys(source);
+    if (typeof Object.getOwnPropertySymbols === "function") {
+      ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+        return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+      }));
+    }
+    ownKeys.forEach(function(key) {
+      _defineProperty$8(target, key, source[key]);
+    });
+  }
+  return target;
+}
+function _defineProperty$8(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, { value, enumerable: true, configurable: true, writable: true });
+  } else {
+    obj[key] = value;
+  }
+  return obj;
+}
+var CrownOutlined = function CrownOutlined2(props, context) {
+  var p = _objectSpread$8({}, props, context.attrs);
+  return createVNode(Icon$1, _objectSpread$8({}, p, {
+    "icon": CrownOutlined$1
+  }), null);
+};
+CrownOutlined.displayName = "CrownOutlined";
+CrownOutlined.inheritAttrs = false;
+var DeleteOutlined$1 = { "icon": { "tag": "svg", "attrs": { "viewBox": "64 64 896 896", "focusable": "false" }, "children": [{ "tag": "path", "attrs": { "d": "M360 184h-8c4.4 0 8-3.6 8-8v8h304v-8c0 4.4 3.6 8 8 8h-8v72h72v-80c0-35.3-28.7-64-64-64H352c-35.3 0-64 28.7-64 64v80h72v-72zm504 72H160c-17.7 0-32 14.3-32 32v32c0 4.4 3.6 8 8 8h60.4l24.7 523c1.6 34.1 29.8 61 63.9 61h454c34.2 0 62.3-26.8 63.9-61l24.7-523H888c4.4 0 8-3.6 8-8v-32c0-17.7-14.3-32-32-32zM731.3 840H292.7l-24.2-512h487l-24.2 512z" } }] }, "name": "delete", "theme": "outlined" };
 function _objectSpread$7(target) {
   for (var i = 1; i < arguments.length; i++) {
     var source = arguments[i] != null ? Object(arguments[i]) : {};
@@ -1182,14 +1214,14 @@ function _defineProperty$7(obj, key, value) {
   }
   return obj;
 }
-var CrownOutlined = function CrownOutlined2(props, context) {
+var DeleteOutlined = function DeleteOutlined2(props, context) {
   var p = _objectSpread$7({}, props, context.attrs);
   return createVNode(Icon$1, _objectSpread$7({}, p, {
-    "icon": CrownOutlined$1
+    "icon": DeleteOutlined$1
   }), null);
 };
-CrownOutlined.displayName = "CrownOutlined";
-CrownOutlined.inheritAttrs = false;
+DeleteOutlined.displayName = "DeleteOutlined";
+DeleteOutlined.inheritAttrs = false;
 var ExclamationCircleFilled$1 = { "icon": { "tag": "svg", "attrs": { "viewBox": "64 64 896 896", "focusable": "false" }, "children": [{ "tag": "path", "attrs": { "d": "M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm-32 232c0-4.4 3.6-8 8-8h48c4.4 0 8 3.6 8 8v272c0 4.4-3.6 8-8 8h-48c-4.4 0-8-3.6-8-8V296zm32 440a48.01 48.01 0 010-96 48.01 48.01 0 010 96z" } }] }, "name": "exclamation-circle", "theme": "filled" };
 function _objectSpread$6(target) {
   for (var i = 1; i < arguments.length; i++) {
@@ -1661,12 +1693,12 @@ const promiseDebounce = (func, wait) => {
   return function(...args) {
     return new Promise((resolve, reject) => {
       queue.push([resolve, reject]);
-      clearTimeout(timer);
+      clearTimeout(timer != null ? timer : void 0);
       timer = setTimeout(() => {
         func.apply(this, args).then((res) => {
-          queue.map((item) => item[0]).forEach((item) => item(res));
+          queue.forEach(([resolver]) => resolver(res));
         }).catch((err) => {
-          queue.map((item) => item[1]).forEach((item) => item(err));
+          queue.forEach(([, rejecter]) => rejecter(err));
         }).finally(() => {
           queue.length = 0;
           timer = null;
@@ -1694,6 +1726,9 @@ function getImageMsgDisplaySize(attach) {
   h2 = Math.min(IMG_MSG_SIDE_MAX, h0 * scale);
   return { width: Math.round(w), height: Math.round(h2) };
 }
+const getMByteSize = (size) => {
+  return (size / 1024 / 1024).toFixed(2);
+};
 const useGlobalStore = defineStore("global", {
   state: () => ({
     loginStatus: false
@@ -37640,7 +37675,6 @@ const useServerStore = defineStore("server", {
     async getSeverList(options) {
       if (window.qchat) {
         const res = await window.qchat.qchatServer.getServersByPage(options);
-        console.log("getSeverList", res);
         this.setSeverList(res);
       }
     },
@@ -37940,8 +37974,11 @@ const useChannelStore = defineStore("channel", {
     serverUnReadCountList: []
   }),
   actions: {
-    // 设置频道列表（原 mutations 转为 actions）
-    setChannelList(payload) {
+    /**
+     * 设置频道列表并获取未读数
+     * @param payload 频道列表数据
+     */
+    async setChannelList(payload) {
       const serverStore = useServerStore();
       serverStore.resetServerUnReadCount();
       this.channelList = payload.datas;
@@ -37957,65 +37994,89 @@ const useChannelStore = defineStore("channel", {
         });
       }
       this.channelListQueryTag = payload.listQueryTag;
+      await this.subscribleChannels();
     },
-    // 订阅频道（原 mutations 转为 actions）
-    subscribleChannels() {
+    /**
+     * 订阅频道并获取未读数
+     * @description 先使用 getChannelUnreadInfos 主动查询未读数（获取登录前积累的未读），再订阅频道接收实时更新
+     */
+    async subscribleChannels() {
+      var _a, _b;
       this.channelUnReadInfoList = [];
       const channels = [];
       this.channelList.forEach((item) => {
         channels.push({ serverId: item.serverId, channelId: item.channelId });
       });
-      window.qchat.qchatChannel.subscribeChannel({
+      if (channels.length === 0) {
+        return;
+      }
+      try {
+        const unreadInfos = await ((_a = window.qchat) == null ? void 0 : _a.qchatChannel.getChannelUnreadInfos({
+          channels
+        }));
+        this.applyUnreadInfosToChannels(unreadInfos);
+      } catch (error) {
+        console.error("[subscribleChannels] 查询未读数失败:", error);
+      }
+      (_b = window.qchat) == null ? void 0 : _b.qchatChannel.subscribeChannel({
         type: 2,
         opeType: 1,
         channels
-      }).then((resp) => {
-        const unreadInfos = resp;
-        unreadInfos.forEach((item) => {
-          if (this.channelList && this.channelList.length > 0) {
-            this.channelList.forEach((channelItem) => {
-              if (channelItem.channelId === item.channelId) {
-                channelItem["unreadCount"] = item.unreadCount;
-              }
-            });
-          }
-          this.channelUnReadInfoList.push({
-            channelId: item.channelId,
-            unreadCount: item.unreadCount,
-            serverId: item.serverId
-          });
-        });
-        this.serverUnReadCountList = [];
-        this.channelUnReadInfoList.forEach((item) => {
-          let existsFlag = false;
-          for (let index2 = 0; index2 < this.serverUnReadCountList.length; index2++) {
-            const serverCount = this.serverUnReadCountList[index2];
-            if (serverCount.serverId === item.serverId) {
-              existsFlag = true;
-              break;
-            }
-          }
-          if (!existsFlag) {
-            this.serverUnReadCountList.push({
-              serverId: item.serverId,
-              unreadCount: item.unreadCount
-            });
-          } else {
-            for (let index2 = 0; index2 < this.serverUnReadCountList.length; index2++) {
-              const serverUnReadCountAgg = this.serverUnReadCountList[index2];
-              if (serverUnReadCountAgg.serverId == item.serverId) {
-                serverUnReadCountAgg.unreadCount = serverUnReadCountAgg.unreadCount + item.unreadCount;
-                break;
-              }
+      }).catch((error) => {
+        console.error("[subscribleChannels] 订阅频道失败:", error);
+      });
+    },
+    /**
+     * 将未读信息应用到频道列表
+     * @param unreadInfos 未读信息列表
+     */
+    applyUnreadInfosToChannels(unreadInfos) {
+      unreadInfos.forEach((item) => {
+        if (this.channelList && this.channelList.length > 0) {
+          this.channelList.forEach((channelItem) => {
+            if (channelItem.channelId === item.channelId) {
+              channelItem["unreadCount"] = item.unreadCount;
             }
-          }
+          });
+        }
+        this.channelUnReadInfoList.push({
+          channelId: item.channelId,
+          unreadCount: item.unreadCount,
+          serverId: item.serverId
         });
-        const serverStore = useServerStore();
-        serverStore.setUnReadInfo(this.serverUnReadCountList);
       });
+      this.serverUnReadCountList = [];
+      this.channelUnReadInfoList.forEach((item) => {
+        const existingServer = this.serverUnReadCountList.find(
+          (s) => s.serverId === item.serverId
+        );
+        if (existingServer) {
+          existingServer.unreadCount += item.unreadCount;
+        } else {
+          this.serverUnReadCountList.push({
+            serverId: item.serverId,
+            unreadCount: item.unreadCount
+          });
+        }
+      });
+      const serverStore = useServerStore();
+      serverStore.setUnReadInfo(this.serverUnReadCountList);
     },
-    // 设置 channel 的未读消息数（原 mutations 转为 actions）
+    /**
+     * 设置 channel 的未读消息数
+     * @param payload 未读信息
+     * @description 如果是当前频道的未读更新，会忽略（因为用户正在查看该频道）
+     */
     setUnReadNum(payload) {
+      var _a;
+      if (this.currentChannel && this.currentChannel.channelId === payload.channelId) {
+        (_a = window.qchat) == null ? void 0 : _a.qchatMsg.markMessageRead({
+          serverId: payload.serverId,
+          channelId: payload.channelId,
+          time: Date.now()
+        });
+        return;
+      }
       if (this.channelList && this.channelList.length > 0) {
         this.channelList.forEach((channelItem) => {
           if (channelItem.channelId === payload.channelId) {
@@ -38092,6 +38153,7 @@ const useChannelStore = defineStore("channel", {
     },
     // 重置频道未读计数（原 mutations 转为 actions）
     resetChannelUnReadCount() {
+      var _a;
       if (this.currentChannel) {
         if (this.channelUnReadInfoList) {
           let finalIndex = -1;
@@ -38125,7 +38187,7 @@ const useChannelStore = defineStore("channel", {
           maxCount: 99,
           lastMsgTime: (/* @__PURE__ */ new Date()).getTime()
         };
-        window.qchat.qchatMsg.markMessageRead(markMessageReadOption);
+        (_a = window.qchat) == null ? void 0 : _a.qchatMsg.markMessageRead(markMessageReadOption);
         this.currentChannel["unreadCount"] = 0;
       }
     },
@@ -38174,6 +38236,15 @@ const useChannelStore = defineStore("channel", {
         (i) => payload.every((j) => j.msgIdClient !== i.msgIdClient)
       );
     },
+    // 更新当前频道消息
+    updateCurChannelMsgs(msg) {
+      this.currentChannelMsgs = this.currentChannelMsgs.map((msgItem) => {
+        if (msgItem.msgIdClient === msg.msgIdClient) {
+          return msg;
+        }
+        return msgItem;
+      });
+    },
     // 设置当前频道消息（原 mutations 转为 actions）
     setCurChannelMsgs(payload) {
       this.currentChannelMsgs = payload;
@@ -38190,7 +38261,7 @@ const useChannelStore = defineStore("channel", {
             throw new Error("QChat no login");
           }
           const res = await window.qchat.qchatChannel.getChannelsByPage(options);
-          this.setChannelList(res);
+          await this.setChannelList(res);
         },
         1e3
       );
@@ -38266,7 +38337,27 @@ const useChannelStore = defineStore("channel", {
       });
       return msgs;
     },
-    // 发送文本消息
+    /**
+     * 上传图片
+     * @param options - 上传选项，包含图片文件和回调函数
+     * @returns Promise<UploadFileResult> 返回上传结果，包含图片URL、宽高等信息
+     */
+    async uploadImage(options) {
+      if (!window.qchat) {
+        throw new Error("QChat no login");
+      }
+      const uploadResult = await window.qchat.cloudStorage.uploadFile({
+        type: "image",
+        file: options.file,
+        onUploadStart: options.onUploadStart,
+        onUploadDone: options.onUploadDone
+      });
+      return uploadResult;
+    },
+    /**
+     * 发送文本消息
+     * @param options - 发送选项，包含消息内容和可选附件
+     */
     async sendTextMsg(options) {
       var _a;
       if (!window.qchat) {
@@ -38281,6 +38372,8 @@ const useChannelStore = defineStore("channel", {
           channelId: this.currentChannel.channelId,
           type: "text",
           body: options.body,
+          attach: options == null ? void 0 : options.attach,
+          // 如果有附件，塞到attach字段
           ext: (options == null ? void 0 : options.ext) ? JSON.stringify(options == null ? void 0 : options.ext) : void 0,
           mentionAccids: options == null ? void 0 : options.mentionAccids,
           onSendBefore: (msg2) => {
@@ -38427,6 +38520,15 @@ const useChannelStore = defineStore("channel", {
         this.addCurChannelMsgs({ data: [msg], isUnShift: false });
       }
     },
+    // 撤回消息
+    async revokeMessage(options) {
+      if (!window.qchat) {
+        throw new Error("QChat no login");
+      }
+      window.qchat.qchatMsg.revokeMessage(options).then((res) => {
+        this.updateCurChannelMsgs(res);
+      });
+    },
     // 获取频道黑白名单
     async getWhiteBlackMembersPage(options) {
       if (!window.qchat) {
@@ -38467,6 +38569,9 @@ const useChannelStore = defineStore("channel", {
     },
     // 获取频道身份组
     async getChannelRoles(options) {
+      if (!window.qchat) {
+        throw new Error("QChat no login");
+      }
       const res = await window.qchat.qchatRole.getChannelRoles(options);
       return res;
     },
@@ -38526,11 +38631,17 @@ const useChannelStore = defineStore("channel", {
     },
     // 获取成员角色
     async getMemberRoles(options) {
+      if (!window.qchat) {
+        throw new Error("QChat no login");
+      }
       const res = await window.qchat.qchatRole.getMemberRoles(options);
       return res;
     },
     // 获取已存在的成员角色 accids
     async getExistingAccidsOfMemberRoles(options) {
+      if (!window.qchat) {
+        throw new Error("QChat no login");
+      }
       const res = await window.qchat.qchatRole.getExistingAccidsOfMemberRoles(
         options
       );
@@ -38559,9 +38670,9 @@ const useUserStore = defineStore("user", {
   }
 });
 createPinia();
-const _hoisted_1$9 = { class: "yx-common-avatar-container" };
-const _hoisted_2$8 = ["src"];
-const _sfc_main$9 = /* @__PURE__ */ defineComponent({
+const _hoisted_1$a = { class: "yx-common-avatar-container" };
+const _hoisted_2$9 = ["src"];
+const _sfc_main$a = /* @__PURE__ */ defineComponent({
   ...{
     name: "CommonAvatar"
   },
@@ -38617,14 +38728,14 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
     });
     return (_ctx, _cache) => {
       var _a, _b;
-      return openBlock(), createElementBlock("div", _hoisted_1$9, [
+      return openBlock(), createElementBlock("div", _hoisted_1$a, [
         __props.avatar || ((_a = matchedMember.value) == null ? void 0 : _a.avatar) ? (openBlock(), createElementBlock("img", {
           key: 0,
           alt: "",
           class: "image",
           src: __props.avatar,
           style: normalizeStyle("width:" + widthAndHeight.value + "height:" + widthAndHeight.value + "border:" + borderStyle.value)
-        }, null, 12, _hoisted_2$8)) : createCommentVNode("", true),
+        }, null, 12, _hoisted_2$9)) : createCommentVNode("", true),
         !__props.avatar && !((_b = matchedMember.value) == null ? void 0 : _b.avatar) ? (openBlock(), createElementBlock("div", {
           key: 1,
           class: "text",
@@ -38673,26 +38784,87 @@ const IconFont$1 = defineComponent({
     };
   }
 });
+const _hoisted_1$9 = { class: "yx-attach-box-img-info-wrapper" };
+const _hoisted_2$8 = {
+  style: { "min-width": "21px", "min-height": "18px" },
+  width: "21",
+  height: "18",
+  viewBox: "0 0 21 18",
+  fill: "var(--theme-head-title-link, #3B3E55)",
+  xmlns: "http://www.w3.org/2000/svg"
+};
+const _hoisted_3$8 = { class: "yx-attach-box-img-info-text" };
+const _hoisted_4$8 = { class: "yx-attach-box-img-info-text-name" };
+const _hoisted_5$7 = ["href", "download"];
+const _hoisted_6$7 = { class: "yx-attach-box-img-info-text-size" };
+const _sfc_main$9 = /* @__PURE__ */ defineComponent({
+  ...{ name: "ImgInfoWrapper" },
+  __name: "index",
+  props: {
+    attach: {}
+  },
+  setup(__props) {
+    return (_ctx, _cache) => {
+      var _a, _b, _c, _d;
+      return openBlock(), createElementBlock("div", _hoisted_1$9, [
+        (openBlock(), createElementBlock("svg", _hoisted_2$8, [..._cache[0] || (_cache[0] = [
+          createElementVNode("path", {
+            d: "M15.75 9C16.9926 9 18 7.99264 18 6.75C18 5.50736 16.9926 4.5 15.75 4.5C14.5074 4.5 13.5 5.50736 13.5 6.75C13.5 7.99264 14.5074 9 15.75 9Z",
+            fill: "#9198A1"
+          }, null, -1),
+          createElementVNode("path", {
+            "fill-rule": "evenodd",
+            "clip-rule": "evenodd",
+            d: "M3 0C1.34315 0 0 1.34315 0 3V15C0 16.6569 1.34315 18 3 18H18C19.6569 18 21 16.6569 21 15V3C21 1.34315 19.6569 0 18 0H3ZM18 1.5H3C2.17157 1.5 1.5 2.17157 1.5 3V8.68934L6 4.18934L18.2838 16.4732C18.9765 16.3405 19.5 15.7314 19.5 15V3C19.5 2.17157 18.8284 1.5 18 1.5ZM1.5 15V10.8107L6 6.31066L16.1893 16.5H3C2.17157 16.5 1.5 15.8284 1.5 15Z",
+            fill: "#9198A1"
+          }, null, -1)
+        ])])),
+        createElementVNode("div", _hoisted_3$8, [
+          createElementVNode("div", _hoisted_4$8, [
+            createElementVNode("a", {
+              class: "yx-attach-box-img-info-text-name-link",
+              href: (_a = __props.attach) == null ? void 0 : _a.url,
+              download: (_b = __props.attach) == null ? void 0 : _b.name
+            }, toDisplayString((_c = __props.attach) == null ? void 0 : _c.name), 9, _hoisted_5$7)
+          ]),
+          createElementVNode("div", _hoisted_6$7, toDisplayString(unref(getMByteSize)(((_d = __props.attach) == null ? void 0 : _d.size) || 0)) + "MB", 1)
+        ])
+      ]);
+    };
+  }
+});
 const _hoisted_1$8 = ["data-msg-id-client"];
-const _hoisted_2$7 = { class: "chatCardAvatar" };
-const _hoisted_3$7 = { class: "chatCardContent" };
-const _hoisted_4$7 = { class: "chatCardInfo" };
-const _hoisted_5$6 = { class: "chatCardInfoName" };
-const _hoisted_6$6 = { class: "chatCardInfoTime" };
-const _hoisted_7$4 = ["innerHTML"];
-const _hoisted_8$4 = ["href"];
-const _hoisted_9$3 = { class: "fileMsgContent" };
-const _hoisted_10$3 = { class: "fileMsgName" };
-const _hoisted_11$3 = { class: "fileMsgSize" };
-const _hoisted_12$3 = { class: "ant-image-mask-info" };
-const _hoisted_13$3 = {
+const _hoisted_2$7 = {
+  key: 0,
+  class: "chat-withdraw-msg"
+};
+const _hoisted_3$7 = { class: "chatCardAvatar" };
+const _hoisted_4$7 = { class: "chatCardContent" };
+const _hoisted_5$6 = { class: "chatCardInfo" };
+const _hoisted_6$6 = { class: "chatCardInfoName" };
+const _hoisted_7$4 = { class: "chatCardInfoTime" };
+const _hoisted_8$4 = ["innerHTML"];
+const _hoisted_9$3 = ["href"];
+const _hoisted_10$3 = { class: "fileMsgContent" };
+const _hoisted_11$3 = { class: "fileMsgName" };
+const _hoisted_12$3 = { class: "fileMsgSize" };
+const _hoisted_13$3 = { class: "ant-image-mask-info" };
+const _hoisted_14$3 = {
   key: 4,
+  class: "chatCardMainContent attach-box"
+};
+const _hoisted_15$3 = { class: "ant-image-mask-info" };
+const _hoisted_16$2 = {
+  key: 5,
   class: "chatCardMainContent"
 };
-const _hoisted_14$3 = { class: "chatCardQuoteMsgName" };
-const _hoisted_15$3 = ["innerHTML"];
-const _hoisted_16$2 = { class: "ant-image-mask-info" };
-const _hoisted_17$2 = { class: "chatCardStatus" };
+const _hoisted_17$2 = { class: "chatCardQuoteMsgAttachBox" };
+const _hoisted_18$2 = { class: "chatCardQuoteMsgName" };
+const _hoisted_19$2 = ["innerHTML"];
+const _hoisted_20$2 = { class: "ant-image-mask-info" };
+const _hoisted_21$2 = { class: "chatCardStatus" };
+const MAX_IMG_PREVIEW_SIZE = 2 * 1024 * 1024;
+const REVOCATION_INTERVAL = 120 * 1e3;
 const _sfc_main$8 = /* @__PURE__ */ defineComponent({
   ...{
     name: "ChatCard"
@@ -38702,10 +38874,30 @@ const _sfc_main$8 = /* @__PURE__ */ defineComponent({
     msg: {},
     myAccid: { default: "" }
   },
-  emits: ["resendText", "resendImg", "resendFile", "quote", "contextMenuSwitch", "quoteMsgClick"],
+  emits: ["resendText", "resendImg", "resendFile", "quote", "contextMenuSwitch", "quoteMsgClick", "revokeMessage"],
   setup(__props, { emit: __emit }) {
     const serverStore = useServerStore();
     const props = __props;
+    const nowTime = ref(Date.now());
+    let timer = null;
+    timer = setInterval(() => {
+      nowTime.value = Date.now();
+      if (nowTime.value - props.msg.time > REVOCATION_INTERVAL) {
+        if (timer) {
+          clearInterval(timer);
+          timer = null;
+        }
+      }
+    }, 1e3);
+    onBeforeUnmount(() => {
+      if (timer) {
+        clearInterval(timer);
+        timer = null;
+      }
+    });
+    const isRevocation = computed(() => {
+      return props.msg.fromAccount === props.myAccid && nowTime.value - props.msg.time <= REVOCATION_INTERVAL;
+    });
     const { copy } = useClipboard();
     const emit = __emit;
     const textMsgContextMenuVisible = ref(false);
@@ -38718,13 +38910,25 @@ const _sfc_main$8 = /* @__PURE__ */ defineComponent({
       textMsgContextMenuVisible.value = true;
     }
     function onCopyClick() {
-      copy(props.msg.body).then(() => {
-      }).catch((err) => {
-        console.error("copy error: ", err);
-        message.error("复制失败");
-      }).finally(() => {
-        textMsgContextMenuVisible.value = false;
-      });
+      var _a;
+      if (props.msg.type === "text") {
+        copy(props.msg.body).then(() => {
+        }).catch((err) => {
+          console.error("copy error: ", err);
+          message.error("复制失败");
+        }).finally(() => {
+          textMsgContextMenuVisible.value = false;
+        });
+      }
+      if (props.msg.type === "image") {
+        copy((_a = props.msg.attach) == null ? void 0 : _a.url).then(() => {
+        }).catch((err) => {
+          console.error("copy error: ", err);
+          message.error("复制失败");
+        }).finally(() => {
+          textMsgContextMenuVisible.value = false;
+        });
+      }
     }
     function onQuoteClick() {
       var _a;
@@ -38743,6 +38947,14 @@ const _sfc_main$8 = /* @__PURE__ */ defineComponent({
       emit("quote", msg);
       textMsgContextMenuVisible.value = false;
     }
+    const onRevocationClick = () => {
+      textMsgContextMenuVisible.value = false;
+      if (!isRevocation.value) {
+        message.error("消息已超过撤回时间");
+        return;
+      }
+      emit("revokeMessage", props.msg);
+    };
     function onQuoteMsgClick() {
       var _a;
       emit("quoteMsgClick", (_a = msgExt.value) == null ? void 0 : _a.quoteMsg);
@@ -38851,159 +39063,185 @@ const _sfc_main$8 = /* @__PURE__ */ defineComponent({
       }
     };
     return (_ctx, _cache) => {
-      var _a, _b, _c, _d, _e, _f, _g, _h;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s;
       return openBlock(), createElementBlock("div", {
         class: normalizeClass(["yx-chatCardWrapper", { reverse: __props.msg.fromAccount === __props.myAccid }]),
         "data-msg-id-client": __props.msg.msgIdClient
       }, [
-        createElementVNode("div", _hoisted_2$7, [
-          createVNode(_sfc_main$9, {
-            avatar: myAvatar.value,
-            nick: __props.msg.fromNick,
-            accid: __props.msg.fromAccount,
-            width: 32,
-            border: 0,
-            style: { "min-width": "32px" }
-          }, null, 8, ["avatar", "nick", "accid"])
-        ]),
-        createElementVNode("div", _hoisted_3$7, [
-          createElementVNode("div", null, [
-            createElementVNode("div", _hoisted_4$7, [
-              createElementVNode("span", _hoisted_5$6, toDisplayString(__props.msg.fromNick), 1),
-              createElementVNode("span", _hoisted_6$6, toDisplayString(time.value), 1)
-            ]),
-            __props.msg.type === "text" ? (openBlock(), createElementBlock("div", {
-              key: 0,
-              class: normalizeClass(["chatCardMainContent", { myMsg: __props.msg.fromAccount === __props.myAccid, otherMsg: __props.msg.fromAccount !== __props.myAccid }])
-            }, [
-              createElementVNode("div", {
-                class: "textMsg flash-target",
-                onContextmenu: withModifiers(onTextMsgContextMenu, ["prevent"]),
-                innerHTML: textMsgBody.value
-              }, null, 40, _hoisted_7$4)
-            ], 2)) : __props.msg.type === "file" ? (openBlock(), createElementBlock("div", {
-              key: 1,
-              class: normalizeClass(["chatCardMainContent", { myMsg: __props.msg.fromAccount === __props.myAccid, otherMsg: __props.msg.fromAccount !== __props.myAccid }])
-            }, [
-              createElementVNode("a", {
-                class: "fileMsg",
-                target: "_blank",
-                href: (_b = (_a = __props.msg) == null ? void 0 : _a.attach) == null ? void 0 : _b.url
+        ((_a = __props.msg.updateOperatorInfo) == null ? void 0 : _a.ps) ? (openBlock(), createElementBlock("div", _hoisted_2$7, toDisplayString(__props.msg.fromAccount === __props.myAccid ? "你" : `“${__props.msg.fromNick}”`) + " " + toDisplayString((_b = __props.msg.updateOperatorInfo) == null ? void 0 : _b.ps), 1)) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
+          createElementVNode("div", _hoisted_3$7, [
+            createVNode(_sfc_main$a, {
+              avatar: myAvatar.value,
+              nick: __props.msg.fromNick,
+              accid: __props.msg.fromAccount,
+              width: 32,
+              border: 0,
+              style: { "min-width": "32px" }
+            }, null, 8, ["avatar", "nick", "accid"])
+          ]),
+          createElementVNode("div", _hoisted_4$7, [
+            createElementVNode("div", null, [
+              createElementVNode("div", _hoisted_5$6, [
+                createElementVNode("span", _hoisted_6$6, toDisplayString(__props.msg.fromNick), 1),
+                createElementVNode("span", _hoisted_7$4, toDisplayString(time.value), 1)
+              ]),
+              __props.msg.type === "text" ? (openBlock(), createElementBlock("div", {
+                key: 0,
+                class: normalizeClass(["chatCardMainContent", { myMsg: __props.msg.fromAccount === __props.myAccid, otherMsg: __props.msg.fromAccount !== __props.myAccid }])
               }, [
-                ext.value === "pdf" ? (openBlock(), createBlock(unref(FileIconFont), {
-                  key: 0,
-                  type: "icon-PDF",
-                  style: { "font-size": "40px" }
-                })) : ext.value === "word" ? (openBlock(), createBlock(unref(FileIconFont), {
-                  key: 1,
-                  type: "icon-Word",
-                  style: { "font-size": "40px" }
-                })) : ext.value === "excel" ? (openBlock(), createBlock(unref(FileIconFont), {
-                  key: 2,
-                  type: "icon-Excel",
-                  style: { "font-size": "40px" }
-                })) : ext.value === "ppt" ? (openBlock(), createBlock(unref(FileIconFont), {
-                  key: 3,
-                  type: "icon-PPT",
-                  style: { "font-size": "40px" }
-                })) : ext.value === "zip" ? (openBlock(), createBlock(unref(FileIconFont), {
-                  key: 4,
-                  type: "icon-RAR1",
-                  style: { "font-size": "40px" }
-                })) : ext.value === "video" ? (openBlock(), createBlock(unref(FileIconFont), {
-                  key: 5,
-                  type: "icon-shipin",
-                  style: { "font-size": "40px" }
-                })) : ext.value === "audio" ? (openBlock(), createBlock(unref(FileIconFont), {
-                  key: 6,
-                  type: "icon-yinle",
-                  style: { "font-size": "40px" }
-                })) : ext.value === "img" ? (openBlock(), createBlock(unref(FileIconFont), {
-                  key: 7,
-                  type: "icon-tupian2",
-                  style: { "font-size": "40px" }
-                })) : ext.value === "txt" ? (openBlock(), createBlock(unref(FileIconFont), {
-                  key: 8,
-                  type: "icon-qita",
-                  style: { "font-size": "40px" }
-                })) : (openBlock(), createBlock(unref(FileIconFont), {
-                  key: 9,
-                  type: "icon-weizhiwenjian",
-                  style: { "font-size": "40px" }
-                })),
-                createElementVNode("div", _hoisted_9$3, [
-                  createElementVNode("div", _hoisted_10$3, toDisplayString((_d = (_c = __props.msg) == null ? void 0 : _c.attach) == null ? void 0 : _d.name), 1),
-                  createElementVNode("div", _hoisted_11$3, toDisplayString(size.value), 1)
-                ])
-              ], 8, _hoisted_8$4)
-            ], 2)) : __props.msg.type === "image" ? (openBlock(), createElementBlock("div", {
-              key: 2,
-              class: normalizeClass(["chatCardMainContent flash-target", { myMsg: __props.msg.fromAccount === __props.myAccid, otherMsg: __props.msg.fromAccount !== __props.myAccid }]),
-              onContextmenu: withModifiers(onTextMsgContextMenu, ["prevent"])
-            }, [
-              createVNode(unref(Image), {
-                class: "imgMsg",
-                src: (_f = (_e = __props.msg) == null ? void 0 : _e.attach) == null ? void 0 : _f.url,
-                width: imageMsgSize.value.width,
-                height: imageMsgSize.value.height
-              }, {
-                previewMask: withCtx(() => [
-                  createElementVNode("div", _hoisted_12$3, [
-                    createVNode(unref(EyeOutlined))
+                createElementVNode("div", {
+                  class: "textMsg flash-target",
+                  onContextmenu: withModifiers(onTextMsgContextMenu, ["prevent"]),
+                  innerHTML: textMsgBody.value
+                }, null, 40, _hoisted_8$4)
+              ], 2)) : __props.msg.type === "file" ? (openBlock(), createElementBlock("div", {
+                key: 1,
+                class: normalizeClass(["chatCardMainContent", { myMsg: __props.msg.fromAccount === __props.myAccid, otherMsg: __props.msg.fromAccount !== __props.myAccid }])
+              }, [
+                createElementVNode("a", {
+                  class: "fileMsg",
+                  target: "_blank",
+                  href: (_d = (_c = __props.msg) == null ? void 0 : _c.attach) == null ? void 0 : _d.url
+                }, [
+                  ext.value === "pdf" ? (openBlock(), createBlock(unref(FileIconFont), {
+                    key: 0,
+                    type: "icon-PDF",
+                    style: { "font-size": "40px" }
+                  })) : ext.value === "word" ? (openBlock(), createBlock(unref(FileIconFont), {
+                    key: 1,
+                    type: "icon-Word",
+                    style: { "font-size": "40px" }
+                  })) : ext.value === "excel" ? (openBlock(), createBlock(unref(FileIconFont), {
+                    key: 2,
+                    type: "icon-Excel",
+                    style: { "font-size": "40px" }
+                  })) : ext.value === "ppt" ? (openBlock(), createBlock(unref(FileIconFont), {
+                    key: 3,
+                    type: "icon-PPT",
+                    style: { "font-size": "40px" }
+                  })) : ext.value === "zip" ? (openBlock(), createBlock(unref(FileIconFont), {
+                    key: 4,
+                    type: "icon-RAR1",
+                    style: { "font-size": "40px" }
+                  })) : ext.value === "video" ? (openBlock(), createBlock(unref(FileIconFont), {
+                    key: 5,
+                    type: "icon-shipin",
+                    style: { "font-size": "40px" }
+                  })) : ext.value === "audio" ? (openBlock(), createBlock(unref(FileIconFont), {
+                    key: 6,
+                    type: "icon-yinle",
+                    style: { "font-size": "40px" }
+                  })) : ext.value === "img" ? (openBlock(), createBlock(unref(FileIconFont), {
+                    key: 7,
+                    type: "icon-tupian2",
+                    style: { "font-size": "40px" }
+                  })) : ext.value === "txt" ? (openBlock(), createBlock(unref(FileIconFont), {
+                    key: 8,
+                    type: "icon-qita",
+                    style: { "font-size": "40px" }
+                  })) : (openBlock(), createBlock(unref(FileIconFont), {
+                    key: 9,
+                    type: "icon-weizhiwenjian",
+                    style: { "font-size": "40px" }
+                  })),
+                  createElementVNode("div", _hoisted_10$3, [
+                    createElementVNode("div", _hoisted_11$3, toDisplayString((_f = (_e = __props.msg) == null ? void 0 : _e.attach) == null ? void 0 : _f.name), 1),
+                    createElementVNode("div", _hoisted_12$3, toDisplayString(size.value), 1)
                   ])
-                ]),
-                _: 1
-              }, 8, ["src", "width", "height"])
-            ], 34)) : (openBlock(), createElementBlock("div", {
-              key: 3,
-              class: normalizeClass(["chatCardMainContent", { myMsg: __props.msg.fromAccount === __props.myAccid, otherMsg: __props.msg.fromAccount !== __props.myAccid }])
-            }, [..._cache[1] || (_cache[1] = [
-              createElementVNode("div", { class: "textMsg" }, toDisplayString("暂不支持该消息"), -1)
-            ])], 2)),
-            ((_g = msgExt.value) == null ? void 0 : _g.quoteMsg) ? (openBlock(), createElementBlock("div", _hoisted_13$3, [
-              createElementVNode("div", {
-                class: "chatCardQuoteMsg",
-                onClick: onQuoteMsgClick
+                ], 8, _hoisted_9$3)
+              ], 2)) : __props.msg.type === "image" ? (openBlock(), createElementBlock("div", {
+                key: 2,
+                class: normalizeClass(["chatCardMainContent flash-target", { myMsg: __props.msg.fromAccount === __props.myAccid, otherMsg: __props.msg.fromAccount !== __props.myAccid }]),
+                onContextmenu: withModifiers(onTextMsgContextMenu, ["prevent"])
               }, [
-                createElementVNode("div", _hoisted_14$3, toDisplayString(msgExt.value.quoteMsg.fromNick) + "：", 1),
-                msgExt.value.quoteMsg.body ? (openBlock(), createElementBlock("div", {
+                createVNode(unref(Image), {
+                  class: "imgMsg",
+                  src: (_h = (_g = __props.msg) == null ? void 0 : _g.attach) == null ? void 0 : _h.url,
+                  width: imageMsgSize.value.width,
+                  height: imageMsgSize.value.height
+                }, {
+                  previewMask: withCtx(() => [
+                    createElementVNode("div", _hoisted_13$3, [
+                      createVNode(unref(EyeOutlined))
+                    ])
+                  ]),
+                  _: 1
+                }, 8, ["src", "width", "height"])
+              ], 34)) : (openBlock(), createElementBlock("div", {
+                key: 3,
+                class: normalizeClass(["chatCardMainContent", { myMsg: __props.msg.fromAccount === __props.myAccid, otherMsg: __props.msg.fromAccount !== __props.myAccid }])
+              }, [..._cache[1] || (_cache[1] = [
+                createElementVNode("div", { class: "textMsg" }, toDisplayString("暂不支持该消息"), -1)
+              ])], 2)),
+              __props.msg.type === "text" && ["jpg", "jpeg", "png", "gif"].includes(((_j = (_i = __props.msg) == null ? void 0 : _i.attach) == null ? void 0 : _j.ext) || "") ? (openBlock(), createElementBlock("div", _hoisted_14$3, [
+                ((_l = (_k = __props.msg) == null ? void 0 : _k.attach) == null ? void 0 : _l.size) && ((_n = (_m = __props.msg) == null ? void 0 : _m.attach) == null ? void 0 : _n.size) < MAX_IMG_PREVIEW_SIZE ? (openBlock(), createBlock(unref(Image), {
                   key: 0,
-                  class: "quoteMsgText",
-                  innerHTML: msgExt.value.quoteMsg.body
-                }, null, 8, _hoisted_15$3)) : createCommentVNode("", true),
-                msgExt.value.quoteMsg.type === "image" ? (openBlock(), createBlock(unref(Image), {
-                  key: 1,
-                  class: "imgMsg quoteMsgImg",
-                  src: (_h = msgExt.value.quoteMsg.attach) == null ? void 0 : _h.url,
-                  width: quoteImageMsgSize.value.width,
-                  height: quoteImageMsgSize.value.height,
-                  onClick: _cache[0] || (_cache[0] = withModifiers(() => {
-                  }, ["stop", "prevent"]))
+                  class: "imgMsg",
+                  src: (_p = (_o = __props.msg) == null ? void 0 : _o.attach) == null ? void 0 : _p.url,
+                  width: imageMsgSize.value.width,
+                  height: imageMsgSize.value.height
                 }, {
                   previewMask: withCtx(() => [
-                    createElementVNode("div", _hoisted_16$2, [
+                    createElementVNode("div", _hoisted_15$3, [
                       createVNode(unref(EyeOutlined))
                     ])
                   ]),
                   _: 1
-                }, 8, ["src", "width", "height"])) : createCommentVNode("", true)
-              ])
-            ])) : createCommentVNode("", true)
-          ]),
-          createElementVNode("div", _hoisted_17$2, [
-            __props.msg.deliveryStatus === "failed" ? (openBlock(), createBlock(unref(Button), {
-              key: 0,
-              type: "text",
-              danger: "",
-              onClick: resendHandler
-            }, {
-              icon: withCtx(() => [
-                createVNode(unref(ExclamationCircleFilled))
-              ]),
-              _: 1
-            })) : __props.msg.deliveryStatus === "sending" ? (openBlock(), createBlock(unref(LoadingOutlined), { key: 1 })) : createCommentVNode("", true)
+                }, 8, ["src", "width", "height"])) : (openBlock(), createBlock(_sfc_main$9, {
+                  key: 1,
+                  attach: (_q = __props.msg) == null ? void 0 : _q.attach
+                }, null, 8, ["attach"]))
+              ])) : createCommentVNode("", true),
+              ((_r = msgExt.value) == null ? void 0 : _r.quoteMsg) ? (openBlock(), createElementBlock("div", _hoisted_16$2, [
+                createElementVNode("div", {
+                  class: "chatCardQuoteMsg",
+                  onClick: onQuoteMsgClick
+                }, [
+                  createElementVNode("div", _hoisted_17$2, [
+                    createVNode(_sfc_main$9, {
+                      attach: msgExt.value.quoteMsg.attach
+                    }, null, 8, ["attach"])
+                  ]),
+                  createElementVNode("div", _hoisted_18$2, toDisplayString(msgExt.value.quoteMsg.fromNick) + "：", 1),
+                  msgExt.value.quoteMsg.body ? (openBlock(), createElementBlock("div", {
+                    key: 0,
+                    class: "quoteMsgText",
+                    innerHTML: msgExt.value.quoteMsg.body
+                  }, null, 8, _hoisted_19$2)) : createCommentVNode("", true),
+                  msgExt.value.quoteMsg.type === "image" ? (openBlock(), createBlock(unref(Image), {
+                    key: 1,
+                    class: "imgMsg quoteMsgImg",
+                    src: (_s = msgExt.value.quoteMsg.attach) == null ? void 0 : _s.url,
+                    width: quoteImageMsgSize.value.width,
+                    height: quoteImageMsgSize.value.height,
+                    onClick: _cache[0] || (_cache[0] = withModifiers(() => {
+                    }, ["stop", "prevent"]))
+                  }, {
+                    previewMask: withCtx(() => [
+                      createElementVNode("div", _hoisted_20$2, [
+                        createVNode(unref(EyeOutlined))
+                      ])
+                    ]),
+                    _: 1
+                  }, 8, ["src", "width", "height"])) : createCommentVNode("", true)
+                ])
+              ])) : createCommentVNode("", true)
+            ]),
+            createElementVNode("div", _hoisted_21$2, [
+              __props.msg.deliveryStatus === "failed" ? (openBlock(), createBlock(unref(Button), {
+                key: 0,
+                type: "text",
+                danger: "",
+                onClick: resendHandler
+              }, {
+                icon: withCtx(() => [
+                  createVNode(unref(ExclamationCircleFilled))
+                ]),
+                _: 1
+              })) : __props.msg.deliveryStatus === "sending" ? (openBlock(), createBlock(unref(LoadingOutlined), { key: 1 })) : createCommentVNode("", true)
+            ])
           ])
-        ]),
+        ], 64)),
         withDirectives(createElementVNode("div", {
           ref_key: "textMsgContextMenuRef",
           ref: textMsgContextMenuRef,
@@ -39017,7 +39255,12 @@ const _sfc_main$8 = /* @__PURE__ */ defineComponent({
           createElementVNode("div", {
             class: "yx-chatCardTextMsgContextMenu-item",
             onClick: onQuoteClick
-          }, "引用")
+          }, "引用"),
+          isRevocation.value ? (openBlock(), createElementBlock("div", {
+            key: 0,
+            class: "yx-chatCardTextMsgContextMenu-item",
+            onClick: onRevocationClick
+          }, " 撤回 ")) : createCommentVNode("", true)
         ], 4), [
           [vShow, textMsgContextMenuVisible.value]
         ])
@@ -39139,7 +39382,7 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
                 onMousedown: withModifiers(($event) => onSelect($event, index2), ["prevent"])
               }, [
                 createElementVNode("div", _hoisted_3$6, [
-                  createVNode(_sfc_main$9, {
+                  createVNode(_sfc_main$a, {
                     avatar: item.avatar,
                     nick: item.nick,
                     accid: item.accid,
@@ -39681,19 +39924,29 @@ const _hoisted_8$3 = {
   key: 0,
   class: "chatroomInputQuoteWrapper"
 };
-const _hoisted_9$2 = { class: "chatroomInputQuoteText" };
-const _hoisted_10$2 = { class: "chatroomInputQuoteTextName" };
-const _hoisted_11$2 = ["innerHTML"];
-const _hoisted_12$2 = {
+const _hoisted_9$2 = { class: "chatroomInputQuoteAttachBox" };
+const _hoisted_10$2 = { class: "chatroomInputQuoteText" };
+const _hoisted_11$2 = { class: "chatroomInputQuoteTextName" };
+const _hoisted_12$2 = ["innerHTML"];
+const _hoisted_13$2 = {
   key: 0,
   class: "chatroomInputQuoteWrapperImg"
 };
-const _hoisted_13$2 = { class: "chatroomInputWrapper" };
-const _hoisted_14$2 = { class: "chatroomInputLeft" };
-const _hoisted_15$2 = { style: { "width": "400px" } };
-const _hoisted_16$1 = ["onClick"];
-const _hoisted_17$1 = { class: "chatroomController" };
-const MAX_IMG_SIZE = 20;
+const _hoisted_14$2 = {
+  key: 1,
+  class: "chatroomInputAttachmentWrapper"
+};
+const _hoisted_15$2 = {
+  key: 0,
+  class: "chatroomInputAttachmentWrapperImg"
+};
+const _hoisted_16$1 = { class: "chatroomInputAttachmentWrapperImgMask" };
+const _hoisted_17$1 = { class: "chatroomInputWrapper" };
+const _hoisted_18$1 = { class: "chatroomInputLeft" };
+const _hoisted_19$1 = { style: { "width": "400px" } };
+const _hoisted_20$1 = ["onClick"];
+const _hoisted_21$1 = { class: "chatroomController" };
+const MAX_IMG_SIZE = 10;
 const _sfc_main$5 = /* @__PURE__ */ defineComponent({
   ...{
     name: "ChatContent"
@@ -39719,8 +39972,10 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
     const props = __props;
     const emit = __emit;
     const quoteMsg = ref();
+    const attachment = ref();
     const curText = ref("");
     const cursorIndex = ref(0);
+    const attachmentUploading = ref(false);
     const contentRef = ref();
     const contentScrollLocked = ref(false);
     const loadingMore = ref(false);
@@ -39808,9 +40063,18 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
         }
       });
     };
+    const handleRevokeMessage = (msg) => {
+      channelStore.revokeMessage({
+        ps: "撤回了一条消息",
+        message: msg
+      });
+    };
     const handleDeleteQuoteMsg = () => {
       quoteMsg.value = void 0;
     };
+    const handleDeleteAttachment = () => {
+      attachment.value = void 0;
+    };
     watch(
       () => props.msgs,
       (value, oldValue) => {
@@ -39842,11 +40106,27 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
         }
       }
     );
+    const inputMap = /* @__PURE__ */ new Map();
     watch(
       () => channelStore.currentChannel,
-      () => {
-        curText.value = "";
-        quoteMsg.value = void 0;
+      (value, oldValue) => {
+        if (oldValue == null ? void 0 : oldValue.channelId) {
+          inputMap.set(oldValue == null ? void 0 : oldValue.channelId, {
+            input: curText.value,
+            quoteMsg: quoteMsg.value,
+            attachment: attachment.value
+          });
+        }
+        if ((value == null ? void 0 : value.channelId) && inputMap.has((value == null ? void 0 : value.channelId) || "")) {
+          const mapValue = inputMap.get((value == null ? void 0 : value.channelId) || "");
+          curText.value = (mapValue == null ? void 0 : mapValue.input) || "";
+          quoteMsg.value = mapValue == null ? void 0 : mapValue.quoteMsg;
+          attachment.value = mapValue == null ? void 0 : mapValue.attachment;
+        } else {
+          curText.value = "";
+          quoteMsg.value = void 0;
+          attachment.value = void 0;
+        }
       }
     );
     const inputPlaceholder = computed(
@@ -39882,10 +40162,13 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
             ext: {
               quoteMsg: quoteMsg.value
             },
-            mentionAccids: mentionAccids.value
+            mentionAccids: mentionAccids.value,
+            attach: attachment.value
+            // 传递附件
           });
           curText.value = "";
           quoteMsg.value = void 0;
+          attachment.value = void 0;
           scrollToBottomAfterSend();
         }
       }
@@ -39897,10 +40180,13 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
           ext: {
             quoteMsg: quoteMsg.value
           },
-          mentionAccids: mentionAccids.value
+          mentionAccids: mentionAccids.value,
+          attach: attachment.value
+          // 传递附件
         });
         curText.value = "";
         quoteMsg.value = void 0;
+        attachment.value = void 0;
         scrollToBottomAfterSend();
       }
     };
@@ -39922,8 +40208,8 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
         });
       }
     };
-    const handlePaste = (e) => {
-      if (props.sendDisabled) return;
+    const handlePaste = async (e) => {
+      if (props.sendDisabled || attachmentUploading.value) return;
       const clipboardData = e.clipboardData;
       if (!clipboardData) return;
       const items = clipboardData.items;
@@ -39937,20 +40223,51 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
               message.error("图片大小最大支持20M");
               return;
             }
-            emit("sendImg", file);
-            scrollToBottomAfterSend();
+            attachmentUploading.value = true;
+            try {
+              const uploadResult = await channelStore.uploadImage({
+                file,
+                onUploadStart: () => {
+                  attachmentUploading.value = true;
+                },
+                onUploadDone: () => {
+                  attachmentUploading.value = false;
+                }
+              });
+              attachment.value = uploadResult;
+            } catch (error) {
+              console.error("上传图片失败:", error);
+              message.error("上传图片失败");
+              attachmentUploading.value = false;
+            }
           }
           return;
         }
       }
     };
-    const uploadImgHandler = (file) => {
+    const uploadImgHandler = async (file) => {
       if (!isLt(file.size, MAX_IMG_SIZE)) {
         message.error(`图片大小最大支持${MAX_IMG_SIZE}M`);
-        return;
+        return false;
       }
-      emit("sendImg", file);
-      scrollToBottomAfterSend();
+      attachmentUploading.value = true;
+      try {
+        const uploadResult = await channelStore.uploadImage({
+          file,
+          onUploadStart: () => {
+            attachmentUploading.value = true;
+          },
+          onUploadDone: () => {
+            attachmentUploading.value = false;
+          }
+        });
+        attachment.value = uploadResult;
+      } catch (error) {
+        console.error("上传图片失败:", error);
+        message.error("上传图片失败");
+        attachmentUploading.value = false;
+      }
+      return false;
     };
     const emjjData = [
       "😀",
@@ -40144,7 +40461,8 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
                 onResendFile: handleResendFile,
                 onContextMenuSwitch,
                 onQuote: handleQuote,
-                onQuoteMsgClick: handleQuoteMsgClick
+                onQuoteMsgClick: handleQuoteMsgClick,
+                onRevokeMessage: handleRevokeMessage
               }, null, 8, ["msg", "my-avatar", "my-accid"]);
             }), 128))
           ])) : (openBlock(), createElementBlock("div", {
@@ -40165,14 +40483,19 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
                 onClick: handleDeleteQuoteMsg
               }),
               createElementVNode("div", _hoisted_9$2, [
-                createElementVNode("div", _hoisted_10$2, toDisplayString(quoteMsg.value.fromNick) + "：", 1),
+                createVNode(_sfc_main$9, {
+                  attach: quoteMsg.value.attach
+                }, null, 8, ["attach"])
+              ]),
+              createElementVNode("div", _hoisted_10$2, [
+                createElementVNode("div", _hoisted_11$2, toDisplayString(quoteMsg.value.fromNick) + "：", 1),
                 ((_d = quoteMsg.value) == null ? void 0 : _d.body) ? (openBlock(), createElementBlock("div", {
                   key: 0,
                   class: "chatroomInputQuoteTextBody",
                   innerHTML: (_e = quoteMsg.value) == null ? void 0 : _e.body
-                }, null, 8, _hoisted_11$2)) : createCommentVNode("", true)
+                }, null, 8, _hoisted_12$2)) : createCommentVNode("", true)
               ]),
-              quoteMsg.value.type === "image" ? (openBlock(), createElementBlock("div", _hoisted_12$2, [
+              quoteMsg.value.type === "image" ? (openBlock(), createElementBlock("div", _hoisted_13$2, [
                 createVNode(unref(Image), {
                   preview: false,
                   class: "imgMsg quoteImg",
@@ -40182,17 +40505,34 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
                 }, null, 8, ["src", "width", "height"])
               ])) : createCommentVNode("", true)
             ])) : createCommentVNode("", true),
-            createElementVNode("div", _hoisted_13$2, [
-              createElementVNode("div", _hoisted_14$2, [
+            attachment.value ? (openBlock(), createElementBlock("div", _hoisted_14$2, [
+              ["jpg", "jpeg", "png", "gif"].includes(attachment.value.ext || "") && attachment.value.url ? (openBlock(), createElementBlock("div", _hoisted_15$2, [
+                createElementVNode("div", _hoisted_16$1, [
+                  createVNode(unref(DeleteOutlined), {
+                    class: "chatroomInputAttachmentDeleteBtn",
+                    onClick: handleDeleteAttachment
+                  })
+                ]),
+                createVNode(unref(Image), {
+                  preview: false,
+                  class: "imgMsg quoteImg",
+                  src: attachment.value.url,
+                  width: 60,
+                  height: 60
+                }, null, 8, ["src"])
+              ])) : createCommentVNode("", true)
+            ])) : createCommentVNode("", true),
+            createElementVNode("div", _hoisted_17$1, [
+              createElementVNode("div", _hoisted_18$1, [
                 createVNode(unref(Popover), { placement: "topLeft" }, {
                   content: withCtx(() => [
-                    createElementVNode("div", _hoisted_15$2, [
+                    createElementVNode("div", _hoisted_19$1, [
                       (openBlock(), createElementBlock(Fragment, null, renderList(emjjData, (value, i) => {
                         return createElementVNode("span", {
                           key: i,
                           style: { "font-size": "16px", "cursor": "pointer" },
                           onClick: ($event) => insertEmj(i)
-                        }, toDisplayString(value), 9, _hoisted_16$1);
+                        }, toDisplayString(value), 9, _hoisted_20$1);
                       }), 64))
                     ])
                   ]),
@@ -40237,19 +40577,20 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
                 onBlur: handleInputBlur,
                 onPaste: handlePaste
               }, null, 8, ["value", "placeholder", "disabled", "onKeydown", "onClick"]),
-              createElementVNode("div", _hoisted_17$1, [
+              createElementVNode("div", _hoisted_21$1, [
                 createVNode(unref(Upload), {
                   "before-upload": uploadImgHandler,
                   "show-upload-list": false,
                   accept: ".jpg,.png,.jpeg",
-                  disabled: __props.sendDisabled
+                  disabled: __props.sendDisabled || attachmentUploading.value,
+                  class: "chatroomInputUpload"
                 }, {
                   default: withCtx(() => [
                     createVNode(unref(Button), {
                       class: "chatroomButton",
                       type: "text",
-                      loading: __props.imgUploading,
-                      disabled: __props.sendDisabled
+                      loading: attachmentUploading.value,
+                      disabled: __props.sendDisabled || attachmentUploading.value
                     }, {
                       icon: withCtx(() => [..._cache[4] || (_cache[4] = [
                         createElementVNode("svg", {
@@ -40375,7 +40716,13 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
     );
     const sendMessage = (type, file, option) => {
       if (type === "textMsg") {
-        channelStore.sendTextMsg({ body: file, ext: option == null ? void 0 : option.ext, mentionAccids: option == null ? void 0 : option.mentionAccids });
+        channelStore.sendTextMsg({
+          body: file,
+          ext: option == null ? void 0 : option.ext,
+          mentionAccids: option == null ? void 0 : option.mentionAccids,
+          attach: option == null ? void 0 : option.attach
+          // 传递附件
+        });
         return;
       }
       if (type === "SendImg") {
@@ -40869,6 +41216,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     };
     const getChannelUnread = (channelId) => {
       const channel = channelList.value.find((c) => c.channelId === channelId);
+      console.log("channel", channel);
       return (channel == null ? void 0 : channel.unreadCount) || 0;
     };
     const handleSelectServer = async (server) => {
@@ -40958,11 +41306,11 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
         cancelText: "取消",
         wrapClassName: "delete-channel-modal",
         async onOk() {
-          var _a;
+          var _a, _b;
           try {
-            await window.qchat.qchatChannel.deleteChannel({
+            await ((_a = window.qchat) == null ? void 0 : _a.qchatChannel.deleteChannel({
               channelId: channelForm.value.channelId
-            });
+            }));
             message.success("删除成功");
             channelModalVisible.value = false;
             await channelStore.getChannelsByPage({
@@ -40970,7 +41318,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
               timetag: 0,
               limit
             });
-            if (((_a = currentChannel.value) == null ? void 0 : _a.channelId) === channelForm.value.channelId) {
+            if (((_b = currentChannel.value) == null ? void 0 : _b.channelId) === channelForm.value.channelId) {
               if (channelStore.channelList.length > 0) {
                 emit("selectChannel", channelStore.channelList[0]);
               } else {
@@ -41140,7 +41488,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
           style: normalizeStyle({ width: userPanelWidth.value + "px" })
         }, [
           createElementVNode("div", _hoisted_15, [
-            createVNode(_sfc_main$9, {
+            createVNode(_sfc_main$a, {
               avatar: userProfile.value.avatar,
               nick: userProfile.value.nick,
               accid: currentAccount.value,
@@ -41319,7 +41667,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const ServerChannelSidebar = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-aa044ccf"]]);
+const ServerChannelSidebar = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-961f30d7"]]);
 const _hoisted_1$1 = { class: "members-header" };
 const _hoisted_2$1 = {
   key: 0,
@@ -41456,7 +41804,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
               }, {
                 default: withCtx(() => [
                   createElementVNode("div", _hoisted_4$1, [
-                    createVNode(_sfc_main$9, {
+                    createVNode(_sfc_main$a, {
                       avatar: member.avatar,
                       nick: member.nick,
                       accid: member.accid,
@@ -41829,7 +42177,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const IndexEntry = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-40788bbc"]]);
+const IndexEntry = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-240f366f"]]);
 const componentList = [
   "chat-card",
   "chat-content",
@@ -41850,7 +42198,7 @@ const components = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePr
   ChatContent: _sfc_main$5,
   ChatPage: _sfc_main$3,
   ChatRoom: _sfc_main$4,
-  CommonAvatar: _sfc_main$9,
+  CommonAvatar: _sfc_main$a,
   IconFont: IconFont$1,
   IndexEntry,
   MembersSidebar,