wotokol-edm 1.2.65 → 1.2.67

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wotokol-edm",
-  "version": "1.2.65",
+  "version": "1.2.67",
   "description": "",
   "main": "wotokol-edm.common.js",
   "scripts": {

package/wotokol-edm.common.js

@@ -111132,7 +111132,8 @@ const message = {
     no_cancle: "cancel",
     // 暂不取消
     infoPop: "Usually, using template variables in emails can effectively improve work efficiency",
-    add_email: "Add email"
+    add_email: "Add email",
+    cc_max: "抄送人限制100个"
   },
   // 上传附件
   uploadDialog: {
@@ -112247,7 +112248,8 @@ const zh_message = {
     cancle_delay: "取消定时发送",
     no_cancle: "暂不取消",
     infoPop: "通常在邮件中使用一下模板变量，能够有效提高工作效率。",
-    add_email: "添加邮箱"
+    add_email: "添加邮箱",
+    cc_max: "抄送人限制100个"
   },
   // 上传附件
   uploadDialog: {
@@ -119216,8 +119218,8 @@ var detail_component = normalizeComponent(
 )
 
 /* harmony default export */ var detail = (detail_component.exports);
-;// ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/write-email/index.vue?vue&type=template&id=534adaac&scoped=true
-var write_emailvue_type_template_id_534adaac_scoped_true_render = function render() {
+;// ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/write-email/index.vue?vue&type=template&id=17af98bf&scoped=true
+var write_emailvue_type_template_id_17af98bf_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -120065,7 +120067,7 @@ var write_emailvue_type_template_id_534adaac_scoped_true_render = function rende
     }
   }) : _vm._e()], 1);
 };
-var write_emailvue_type_template_id_534adaac_scoped_true_staticRenderFns = [function () {
+var write_emailvue_type_template_id_17af98bf_scoped_true_staticRenderFns = [function () {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -120086,7 +120088,7 @@ var write_emailvue_type_template_id_534adaac_scoped_true_staticRenderFns = [func
   }, [_c('span', [_vm._v("$4.98")]), _vm._v(" /per ordered item ")]);
 }];
 
-;// ./src/package/write-email/index.vue?vue&type=template&id=534adaac&scoped=true
+;// ./src/package/write-email/index.vue?vue&type=template&id=17af98bf&scoped=true
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.set.difference.v2.js
 var es_set_difference_v2 = __webpack_require__(7642);
@@ -131090,6 +131092,10 @@ var vuedraggable_umd_default = /*#__PURE__*/__webpack_require__.n(vuedraggable_u
         this.ccInputValue = "";
         return;
       }
+      // 抄送人邮箱数量不得超过 100
+      if (this.ccTags.length >= 100) {
+        return this.$message.warning(this.$t("writeMail.cc_max"));
+      }
       // 验证 value 是否符合邮箱格式
       const emailReg = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
       if (!emailReg.test(value)) {
@@ -131289,9 +131295,11 @@ var vuedraggable_umd_default = /*#__PURE__*/__webpack_require__.n(vuedraggable_u
           if (chatData && chatData.length > 0) {
             if (replyId && replyContentId) {
               // 邮箱内容
+              let idVal = nowChatId || replyContentId;
               const res_content = chatData.find(
-              // 20260311--sqw--改为根据 nowChatId 取邮件回显内容 // item => item.id.toString() === replyContentId
-              item => item.id.toString() === nowChatId);
+              // 20260311--sqw--改为根据 nowChatId 取邮件回显内容。当路由没有传 nowChatId 时，就取原来的 ID。
+              // 原来的代码：item => item.id.toString() === replyContentId
+              item => item.id.toString() === idVal);
               this.replyInfo = res_content;
               // 邮箱标题
               const res_subject = chatData.find(item => item.id.toString() === replyId);
@@ -131300,7 +131308,9 @@ var vuedraggable_umd_default = /*#__PURE__*/__webpack_require__.n(vuedraggable_u
               this.replyInfo.id = replyId;
             } else {
               // 邮箱内容
-              const res_content1 = chatData.find(item => item.id.toString() === replyId);
+              let idVal = nowChatId || replyId;
+              const res_content1 = chatData.find(item => item.id.toString() === idVal // replyId
+              );
               this.replyInfo = res_content1;
               // 邮箱标题
               this.mailList[0].subject = res_content1.subject;
@@ -131410,7 +131420,7 @@ var vuedraggable_umd_default = /*#__PURE__*/__webpack_require__.n(vuedraggable_u
       let sendProductCard = `<product-card cardIds=${cardIds}><div style="display:flex;overflow-x:auto">${cardHtml}</div></product-card>`;
       let data = {
         replyIds: ids,
-        content: this.mailList[0].getContent() + sendProductCard,
+        content: this.formatTableInlineStyle(this.mailList[0].getContent() + sendProductCard),
         attachments: this.mailList[0].fileList,
         sendEntryKey: "inboxMultiReply"
       };
@@ -131792,6 +131802,25 @@ var vuedraggable_umd_default = /*#__PURE__*/__webpack_require__.n(vuedraggable_u
       // 跳转中间页面
       return `<div style="display: flex"><div style="box-sizing:border-box;width: 274px; min-height: 310px; border-radius: 14px; border: 1px solid #e8e8e8; padding: 12px;margin-right:8px"><div style="margin-bottom: 10px;width:250px;height:250px;"><img style="border: 1px solid #333;width: 100%;height: 100%;border-radius: 14px;object-fit:contain;" src="${item.imageUrls && item.imageUrls.length ? item.imageUrls[0] : ""}"/></div><div style="display: flex;align-items: center;flex-wrap:wrap;margin-bottom: 8px;">${promotePlatformTypeImg}${typeName}</div><div style="margin-bottom: 16px"><div style="font-weight: 600;font-size: 16px;color: #333333;line-height: 22px;margin-bottom: 4px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">${nameEn}</div><div style="font-weight: 400;font-size: 14px;color: #666666;line-height: 20px;margin-bottom: 4px;">Price：${symbol}${item.priceDollar || "—"}</div><div style="font-weight: 400;font-size: 14px;color: #666666;line-height: 20px;margin-bottom: 0;">Commission rate：${item.commissionPercent || "—"}%</div></div><div style="display: flex; align-items: center"><div style="font-weight: 400;font-size: 12px;color: #999999;line-height: 17px;margin-right: 20px;"><span style="font-family: MiSans, MiSans;font-weight: 800;font-size: 18px;color: #f85277;line-height: 24px;padding-right: 6px;">${symbol}${(item.priceDollar * (item.commissionPercent / 100)).toFixed(2)}</span> /per ordered item</div><div style="width: 75px;height: 36px;border-radius: 10px;background: #f85277;font-weight: 600;font-size: 16px;color: #ffffff;line-height: 34px;text-align: center;"><a rel="noopener noreferrer" style="color:#fff;text-decoration:none" href='${currentApi}/user/productCard/noAuth/email/apply?productId=${item.id}' target='_blank'>Apply</a></div></div></div></div>`;
     },
+    // 发送前给表格补齐行内样式（content 是 HTML 字符串）
+    formatTableInlineStyle(content = "") {
+      if (!content || typeof content !== "string") return content;
+      if (!/<table\b/i.test(content)) return content;
+      const wrapper = document.createElement("div");
+      wrapper.innerHTML = content;
+      const tables = wrapper.querySelectorAll("table");
+      if (!tables.length) return content;
+      tables.forEach(table => {
+        table.style.setProperty("border-collapse", "collapse");
+        table.style.setProperty("border", "1px solid #000");
+        const cells = table.querySelectorAll("td, th");
+        cells.forEach(cell => {
+          cell.style.setProperty("border", "1px solid #000");
+          cell.style.setProperty("padding", "8px");
+        });
+      });
+      return wrapper.innerHTML;
+    },
     // 检测之后主动发信，区分继续发件/过滤重复触达
     async selfSend(sendStr) {
       // 商品卡处理
@@ -131810,7 +131839,7 @@ var vuedraggable_umd_default = /*#__PURE__*/__webpack_require__.n(vuedraggable_u
         return {
           id: item.id,
           subject: item.subject,
-          content: content,
+          content: this.formatTableInlineStyle(content),
           attachments: item.fileList,
           templateId: item.templateId
         };
@@ -132573,15 +132602,15 @@ var vuedraggable_umd_default = /*#__PURE__*/__webpack_require__.n(vuedraggable_u
 });
 ;// ./src/package/write-email/index.vue?vue&type=script&lang=js
  /* harmony default export */ var package_write_emailvue_type_script_lang_js = (write_emailvue_type_script_lang_js); 
-;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/write-email/index.vue?vue&type=style&index=0&id=534adaac&prod&lang=scss&scoped=true
+;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/write-email/index.vue?vue&type=style&index=0&id=17af98bf&prod&lang=scss&scoped=true
 // extracted by mini-css-extract-plugin
 
-;// ./src/package/write-email/index.vue?vue&type=style&index=0&id=534adaac&prod&lang=scss&scoped=true
+;// ./src/package/write-email/index.vue?vue&type=style&index=0&id=17af98bf&prod&lang=scss&scoped=true
 
-;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/write-email/index.vue?vue&type=style&index=1&id=534adaac&prod&lang=scss
+;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/package/write-email/index.vue?vue&type=style&index=1&id=17af98bf&prod&lang=scss
 // extracted by mini-css-extract-plugin
 
-;// ./src/package/write-email/index.vue?vue&type=style&index=1&id=534adaac&prod&lang=scss
+;// ./src/package/write-email/index.vue?vue&type=style&index=1&id=17af98bf&prod&lang=scss
 
 ;// ./src/package/write-email/index.vue
 
@@ -132595,11 +132624,11 @@ var vuedraggable_umd_default = /*#__PURE__*/__webpack_require__.n(vuedraggable_u
 
 var write_email_component = normalizeComponent(
   package_write_emailvue_type_script_lang_js,
-  write_emailvue_type_template_id_534adaac_scoped_true_render,
-  write_emailvue_type_template_id_534adaac_scoped_true_staticRenderFns,
+  write_emailvue_type_template_id_17af98bf_scoped_true_render,
+  write_emailvue_type_template_id_17af98bf_scoped_true_staticRenderFns,
   false,
   null,
-  "534adaac",
+  "17af98bf",
   null
   
 )