yx-web-sdk 0.0.21 → 0.0.23

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

@@ -38436,6 +38436,7 @@ const useChannelStore = defineStore("channel", {
           channelId: this.currentChannel.channelId,
           type: "image",
           file: options.file,
+          ext: (options == null ? void 0 : options.ext) ? JSON.stringify(options == null ? void 0 : options.ext) : void 0,
           onUploadStart: options.onUploadStart,
           onUploadDone: options.onUploadDone,
           onSendBefore: (msg2) => {
@@ -38880,6 +38881,7 @@ const _sfc_main$8 = /* @__PURE__ */ defineComponent({
   emits: ["resendText", "resendImg", "resendFile", "quote", "contextMenuSwitch", "quoteMsgClick", "revokeMessage"],
   setup(__props, { emit: __emit }) {
     const serverStore = useServerStore();
+    const IMG_EXT = ["png", "jpg", "jpeg"];
     const props = __props;
     const nowTime = ref(Date.now());
     let timer = null;
@@ -39176,7 +39178,7 @@ const _sfc_main$8 = /* @__PURE__ */ defineComponent({
               }, [..._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, [
+              __props.msg.type === "text" && IMG_EXT.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: "imgMsg",
@@ -39974,6 +39976,7 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
   setup(__props, { emit: __emit }) {
     const router = useRouter();
     const channelStore = useChannelStore();
+    const IMG_EXT = ["png", "jpg", "jpeg"];
     const Textarea = Input.TextArea;
     const props = __props;
     const emit = __emit;
@@ -40181,21 +40184,36 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
       }
     };
     const handleSendText = () => {
+      var _a;
       const text = filterStr(curText.value.trim());
       if (text) {
-        emit("sendText", text, {
-          ext: {
-            quoteMsg: quoteMsg.value
-          },
+        if (attachment.value) {
+          delete attachment.value.__file;
+        }
+        const sendOption = {
           mentionAccids: mentionAccids.value,
           attach: attachment.value
           // 传递附件
-        });
+        };
+        if (quoteMsg.value) {
+          sendOption.ext = { quoteMsg: quoteMsg.value };
+        }
+        emit("sendText", text, sendOption);
         curText.value = "";
         quoteMsg.value = void 0;
         attachment.value = void 0;
         scrollToBottomAfterSend();
       }
+      if (attachment.value && IMG_EXT.includes(attachment.value.ext) && ((_a = attachment.value) == null ? void 0 : _a.__file)) {
+        let sendOption;
+        if (quoteMsg.value) {
+          sendOption = { ext: { quoteMsg: quoteMsg.value } };
+        }
+        emit("sendImg", attachment.value.__file, sendOption);
+        quoteMsg.value = void 0;
+        attachment.value = void 0;
+        scrollToBottomAfterSend();
+      }
     };
     const scrollHandler = async (e) => {
       var _a;
@@ -40254,7 +40272,7 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
     };
     const uploadImgHandler = async (file) => {
       if (!isLt(file.size, MAX_IMG_SIZE)) {
-        message.error(`图片大小最大支持${MAX_IMG_SIZE}M`);
+        message.error(`图片大小最大支持${MAX_IMG_SIZE}MB`);
         return false;
       }
       attachmentUploading.value = true;
@@ -40268,6 +40286,7 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
             attachmentUploading.value = false;
           }
         });
+        uploadResult.__file = file;
         attachment.value = uploadResult;
       } catch (error) {
         console.error("上传图片失败:", error);
@@ -40513,7 +40532,7 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
               ])) : createCommentVNode("", true)
             ])) : createCommentVNode("", true),
             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, [
+              IMG_EXT.includes(attachment.value.ext || "") && attachment.value.url ? (openBlock(), createElementBlock("div", _hoisted_15$2, [
                 createElementVNode("div", _hoisted_16$1, [
                   createVNode(unref(DeleteOutlined), {
                     class: "chatroomInputAttachmentDeleteBtn",
@@ -40588,7 +40607,7 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
                 createVNode(unref(Upload), {
                   "before-upload": uploadImgHandler,
                   "show-upload-list": false,
-                  accept: ".jpg,.png,.jpeg",
+                  accept: IMG_EXT.map((ext) => `.${ext}`).join(","),
                   disabled: __props.sendDisabled || attachmentUploading.value,
                   class: "chatroomInputUpload"
                 }, {
@@ -40623,7 +40642,7 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
                     }, 8, ["loading", "disabled"])
                   ]),
                   _: 1
-                }, 8, ["disabled"]),
+                }, 8, ["accept", "disabled"]),
                 _cache[6] || (_cache[6] = createElementVNode("span", { class: "lineSeparator" }, null, -1)),
                 createVNode(unref(Button), {
                   class: "chatroomButtonArrowUp",
@@ -40736,6 +40755,7 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
         imgUploading.value = true;
         channelStore.sendImageMsg({
           file,
+          ext: option == null ? void 0 : option.ext,
           onUploadStart: () => {
             imgUploading.value = true;
           },
@@ -40781,8 +40801,8 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
     const handleSendText = (text, option) => {
       checkSendAuth("textMsg", text, option);
     };
-    const handleSendImg = (file) => {
-      checkSendAuth("SendImg", file);
+    const handleSendImg = (file, option) => {
+      checkSendAuth("SendImg", file, option);
     };
     const handleSendFile = (file) => {
       checkSendAuth("SendFile", file);
@@ -41674,7 +41694,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const ServerChannelSidebar = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-961f30d7"]]);
+const ServerChannelSidebar = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-83471ee8"]]);
 const _hoisted_1$1 = { class: "members-header" };
 const _hoisted_2$1 = {
   key: 0,

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

@@ -38433,6 +38433,7 @@
             channelId: this.currentChannel.channelId,
             type: "image",
             file: options.file,
+            ext: (options == null ? void 0 : options.ext) ? JSON.stringify(options == null ? void 0 : options.ext) : void 0,
             onUploadStart: options.onUploadStart,
             onUploadDone: options.onUploadDone,
             onSendBefore: (msg2) => {
@@ -38877,6 +38878,7 @@
     emits: ["resendText", "resendImg", "resendFile", "quote", "contextMenuSwitch", "quoteMsgClick", "revokeMessage"],
     setup(__props, { emit: __emit }) {
       const serverStore = useServerStore();
+      const IMG_EXT = ["png", "jpg", "jpeg"];
       const props = __props;
       const nowTime = vue.ref(Date.now());
       let timer = null;
@@ -39173,7 +39175,7 @@
                 }, [..._cache[1] || (_cache[1] = [
                   vue.createElementVNode("div", { class: "textMsg" }, vue.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) || "") ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_14$3, [
+                __props.msg.type === "text" && IMG_EXT.includes(((_j = (_i = __props.msg) == null ? void 0 : _i.attach) == null ? void 0 : _j.ext) || "") ? (vue.openBlock(), vue.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 ? (vue.openBlock(), vue.createBlock(vue.unref(antDesignVue.Image), {
                     key: 0,
                     class: "imgMsg",
@@ -39971,6 +39973,7 @@
     setup(__props, { emit: __emit }) {
       const router = vueRouter.useRouter();
       const channelStore = useChannelStore();
+      const IMG_EXT = ["png", "jpg", "jpeg"];
       const Textarea = antDesignVue.Input.TextArea;
       const props = __props;
       const emit = __emit;
@@ -40178,21 +40181,36 @@
         }
       };
       const handleSendText = () => {
+        var _a;
         const text = filterStr(curText.value.trim());
         if (text) {
-          emit("sendText", text, {
-            ext: {
-              quoteMsg: quoteMsg.value
-            },
+          if (attachment.value) {
+            delete attachment.value.__file;
+          }
+          const sendOption = {
             mentionAccids: mentionAccids.value,
             attach: attachment.value
             // 传递附件
-          });
+          };
+          if (quoteMsg.value) {
+            sendOption.ext = { quoteMsg: quoteMsg.value };
+          }
+          emit("sendText", text, sendOption);
           curText.value = "";
           quoteMsg.value = void 0;
           attachment.value = void 0;
           scrollToBottomAfterSend();
         }
+        if (attachment.value && IMG_EXT.includes(attachment.value.ext) && ((_a = attachment.value) == null ? void 0 : _a.__file)) {
+          let sendOption;
+          if (quoteMsg.value) {
+            sendOption = { ext: { quoteMsg: quoteMsg.value } };
+          }
+          emit("sendImg", attachment.value.__file, sendOption);
+          quoteMsg.value = void 0;
+          attachment.value = void 0;
+          scrollToBottomAfterSend();
+        }
       };
       const scrollHandler = async (e) => {
         var _a;
@@ -40251,7 +40269,7 @@
       };
       const uploadImgHandler = async (file) => {
         if (!isLt(file.size, MAX_IMG_SIZE)) {
-          antDesignVue.message.error(`图片大小最大支持${MAX_IMG_SIZE}M`);
+          antDesignVue.message.error(`图片大小最大支持${MAX_IMG_SIZE}MB`);
           return false;
         }
         attachmentUploading.value = true;
@@ -40265,6 +40283,7 @@
               attachmentUploading.value = false;
             }
           });
+          uploadResult.__file = file;
           attachment.value = uploadResult;
         } catch (error) {
           console.error("上传图片失败:", error);
@@ -40510,7 +40529,7 @@
                 ])) : vue.createCommentVNode("", true)
               ])) : vue.createCommentVNode("", true),
               attachment.value ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_14$2, [
-                ["jpg", "jpeg", "png", "gif"].includes(attachment.value.ext || "") && attachment.value.url ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_15$2, [
+                IMG_EXT.includes(attachment.value.ext || "") && attachment.value.url ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_15$2, [
                   vue.createElementVNode("div", _hoisted_16$1, [
                     vue.createVNode(vue.unref(DeleteOutlined), {
                       class: "chatroomInputAttachmentDeleteBtn",
@@ -40585,7 +40604,7 @@
                   vue.createVNode(vue.unref(antDesignVue.Upload), {
                     "before-upload": uploadImgHandler,
                     "show-upload-list": false,
-                    accept: ".jpg,.png,.jpeg",
+                    accept: IMG_EXT.map((ext) => `.${ext}`).join(","),
                     disabled: __props.sendDisabled || attachmentUploading.value,
                     class: "chatroomInputUpload"
                   }, {
@@ -40620,7 +40639,7 @@
                       }, 8, ["loading", "disabled"])
                     ]),
                     _: 1
-                  }, 8, ["disabled"]),
+                  }, 8, ["accept", "disabled"]),
                   _cache[6] || (_cache[6] = vue.createElementVNode("span", { class: "lineSeparator" }, null, -1)),
                   vue.createVNode(vue.unref(antDesignVue.Button), {
                     class: "chatroomButtonArrowUp",
@@ -40733,6 +40752,7 @@
           imgUploading.value = true;
           channelStore.sendImageMsg({
             file,
+            ext: option == null ? void 0 : option.ext,
             onUploadStart: () => {
               imgUploading.value = true;
             },
@@ -40778,8 +40798,8 @@
       const handleSendText = (text, option) => {
         checkSendAuth("textMsg", text, option);
       };
-      const handleSendImg = (file) => {
-        checkSendAuth("SendImg", file);
+      const handleSendImg = (file, option) => {
+        checkSendAuth("SendImg", file, option);
       };
       const handleSendFile = (file) => {
         checkSendAuth("SendFile", file);
@@ -41671,7 +41691,7 @@
       };
     }
   });
-  const ServerChannelSidebar = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-961f30d7"]]);
+  const ServerChannelSidebar = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-83471ee8"]]);
   const _hoisted_1$1 = { class: "members-header" };
   const _hoisted_2$1 = {
     key: 0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yx-web-sdk",
-  "version": "0.0.21",
+  "version": "0.0.23",
   "private": false,
   "main": "dist/yx-web-sdk.umd.js",
   "module": "dist/yx-web-sdk.es.js",