fix: 更改html2canvas到rc4,做出兼容处理

package.json

@@ -17,7 +17,6 @@
     "@qg/ui-track-web": "0.0.3",
     "core-js": "^3.6.5",
     "crypto-js": "^3.1.9-1",
-    "html2canvas": "^1.3.2",
     "intersection-observer": "^0.12.0",
     "js-cookie": "^2.2.1",
     "qiniu-js": "^3.3.1",

src/components/sharePic.vue

@@ -126,7 +126,7 @@
   </div>
 </template>
 <script>
-import html2canvas from 'html2canvas';
+import html2canvas from '@/service/html2canvas.service';
 import qiNiuApi from '@/api/qiniu.api';
 import groupBuyApi from '@/api/groupBuy';
 import { upload } from 'qiniu-js';
@@ -173,12 +173,12 @@ export default {
       this.handleAvator(rawData);
 
       // 将每个字符套入行内标签，用于解决canvas fillText的不换行问题
-      let skuName = '';
-      const originSkuName = rawData.skuName || '';
-      for (let i = 0; i < originSkuName.length; i++) {
-        skuName += `<span>${originSkuName[i]}</span>`;
-      }
-      this.skuName = skuName;
+      // let skuName = '';
+      // const originSkuName = rawData.skuName || '';
+      // for (let i = 0; i < originSkuName.length; i++) {
+      //   skuName += `<span>${originSkuName[i]}</span>`;
+      // }
+      this.skuName = rawData.skuName || '';
 
       const [endTimeYMD, endTimeHMS = ''] = (rawData.endTime && rawData.endTime.split(' ')) || [];
       if (endTimeYMD) {
@@ -422,12 +422,7 @@ body {
 }
 .skuName {
   color: #333333;
-  text-overflow: -o-ellipsis-lastline;
   overflow: hidden;
-  text-overflow: ellipsis;
-  display: -webkit-box;
-  -webkit-line-clamp: 2;
-  -webkit-box-orient: vertical;
 }
 .shareInfo {
   background: #f7f8f9;

yarn.lock

@@ -1867,11 +1867,6 @@
   "resolved" "http://npmprivate.quantgroups.com/base64-arraybuffer/-/base64-arraybuffer-0.2.0.tgz"
   "version" "0.2.0"
 
-"base64-arraybuffer@^1.0.1":
-  "integrity" "sha512-vFIUq7FdLtjZMhATwDul5RZWv2jpXQ09Pd6jcVEOvIsqCWTRFD/ONHNfyOS8dA/Ippi5dsIgpyKWKZaAKZltbA=="
-  "resolved" "http://npmprivate.quantgroups.com/base64-arraybuffer/-/base64-arraybuffer-1.0.1.tgz"
-  "version" "1.0.1"
-
 "base64-js@^1.0.2":
   "integrity" "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="
   "resolved" "http://npmprivate.quantgroups.com/base64-js/-/base64-js-1.3.1.tgz"
@@ -2915,10 +2910,10 @@
     "postcss" "^7.0.1"
     "timsort" "^0.3.0"
 
-"css-line-break@2.0.1":
-  "integrity" "sha512-gwKYIMUn7xodIcb346wgUhE2Dt5O1Kmrc16PWi8sL4FTfyDj8P5095rzH7+O8CTZudJr+uw2GCI/hwEkDJFI2w=="
-  "resolved" "http://npmprivate.quantgroups.com/css-line-break/-/css-line-break-2.0.1.tgz"
-  "version" "2.0.1"
+"css-line-break@1.1.1":
+  "integrity" "sha512-1feNVaM4Fyzdj4mKPIQNL2n70MmuYzAXZ1aytlROFX1JsOo070OsugwGjj7nl6jnDJWHDM8zRZswkmeYVWZJQA=="
+  "resolved" "http://npmprivate.quantgroups.com/css-line-break/-/css-line-break-1.1.1.tgz"
+  "version" "1.1.1"
   dependencies:
     "base64-arraybuffer" "^0.2.0"
 
@@ -3352,9 +3347,9 @@
   "resolved" "http://npmprivate.quantgroups.com/dom-walk/-/dom-walk-0.1.2.tgz"
   "version" "0.1.2"
 
-"dom7@^2.1.3":
-  "integrity" "sha512-xnhwVgyOh3eD++/XGtH+5qBwYTgCm0aW91GFgPJ3XG+jlsRLyJivnbP0QmUBFhI+Oaz9FV0s7cxgXHezwOEBYA=="
-  "resolved" "http://npmprivate.quantgroups.com/dom7/-/dom7-2.1.5.tgz"
+"dom7@^2.0.1", "dom7@^2.1.3":
+  "integrity" "sha1-p5QRAXgAsx2EAAcM2uu/ySwfY3c="
+  "resolved" "https://registry.nlark.com/dom7/download/dom7-2.1.5.tgz?cache=0&sync_timestamp=1629879453685&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdom7%2Fdownload%2Fdom7-2.1.5.tgz"
   "version" "2.1.5"
   dependencies:
     "ssr-window" "^2.0.0"
@@ -4673,13 +4668,12 @@
     "toposort" "^1.0.0"
     "util.promisify" "1.0.0"
 
-"html2canvas@^1.3.2":
-  "integrity" "sha512-4+zqv87/a1LsaCrINV69wVLGG8GBZcYBboz1JPWEgiXcWoD9kroLzccsBRU/L9UlfV2MAZ+3J92U9IQPVMDeSQ=="
-  "resolved" "http://npmprivate.quantgroups.com/html2canvas/-/html2canvas-1.3.2.tgz"
-  "version" "1.3.2"
+"html2canvas@1.0.0-rc.4":
+  "integrity" "sha512-5sJ+oM3FfNFpGVbMQkJFDl1WH5Sa293l2koMEZWbaehJ3dWHty4mSrmZtfWlWDoLckfGojZS9aZ7Zk3uFouyPw=="
+  "resolved" "http://npmprivate.quantgroups.com/html2canvas/-/html2canvas-1.0.0-rc.4.tgz"
+  "version" "1.0.0-rc.4"
   dependencies:
-    "css-line-break" "2.0.1"
-    "text-segmentation" "^1.0.2"
+    "css-line-break" "1.1.1"
 
 "htmlparser2@^3.3.0", "htmlparser2@^3.8.3":
   "integrity" "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ=="
@@ -8325,13 +8319,13 @@
     "tweetnacl" "~0.14.0"
 
 "ssr-window@^1.0.1":
-  "integrity" "sha512-dgFqB+f00LJTEgb6UXhx0h+SrG50LJvti2yMKMqAgzfUmUXZrLSv2fjULF7AWGwK25EXu8+smLR3jYsJQChPsg=="
-  "resolved" "http://npmprivate.quantgroups.com/ssr-window/-/ssr-window-1.0.1.tgz"
+  "integrity" "sha1-MHUqakZm53Z/C35qpvwv29DZs2k="
+  "resolved" "https://registry.nlark.com/ssr-window/download/ssr-window-1.0.1.tgz?cache=0&sync_timestamp=1629879256060&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fssr-window%2Fdownload%2Fssr-window-1.0.1.tgz"
   "version" "1.0.1"
 
 "ssr-window@^2.0.0":
-  "integrity" "sha512-NXzN+/HPObKAx191H3zKlYomE5WrVIkoCB5IaSdvKokxTpjBdWfr0RaP+1Z5KOfDT0ZVz+2tdtiBkhsEQ9p+0A=="
-  "resolved" "http://npmprivate.quantgroups.com/ssr-window/-/ssr-window-2.0.0.tgz"
+  "integrity" "sha1-mMMBrvmVIzF/jWlhjwAQeRCW78Q="
+  "resolved" "https://registry.nlark.com/ssr-window/download/ssr-window-2.0.0.tgz?cache=0&sync_timestamp=1629879256060&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fssr-window%2Fdownload%2Fssr-window-2.0.0.tgz"
   "version" "2.0.0"
 
 "ssri@^6.0.1":
@@ -8674,12 +8668,11 @@
     "util.promisify" "~1.0.0"
 
 "swiper@^4.0.7":
-  "integrity" "sha512-se6I7PWWu950NAMXXT+ENtF/6SVb8mPyO+bTfNxbQBILSeLqsYp3Ndap+YOA0EczOIUlea274PKejT6gKZDseA=="
-  "resolved" "http://npmprivate.quantgroups.com/swiper/-/swiper-4.5.1.tgz"
-  "version" "4.5.1"
+  "integrity" "sha1-iRdcKiPYZiLtqDRHQMJKNwGmsnA="
+  "resolved" "https://registry.npmmirror.com/swiper/download/swiper-4.0.7.tgz?cache=0&sync_timestamp=1632899438741&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fswiper%2Fdownload%2Fswiper-4.0.7.tgz"
+  "version" "4.0.7"
   dependencies:
-    "dom7" "^2.1.3"
-    "ssr-window" "^1.0.1"
+    "dom7" "^2.0.1"
 
 "table@^5.2.3":
   "integrity" "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug=="
@@ -8735,13 +8728,6 @@
     "source-map" "~0.6.1"
     "source-map-support" "~0.5.12"
 
-"text-segmentation@^1.0.2":
-  "integrity" "sha512-uTqvLxdBrVnx/CFQOtnf8tfzSXFm+1Qxau7Xi54j4OPTZokuDOX8qncQzrg2G8ZicAMOM8TgzFAYTb+AqNO4Cw=="
-  "resolved" "http://npmprivate.quantgroups.com/text-segmentation/-/text-segmentation-1.0.2.tgz"
-  "version" "1.0.2"
-  dependencies:
-    "utrie" "^1.0.1"
-
 "text-table@^0.2.0":
   "integrity" "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ="
   "resolved" "http://npmprivate.quantgroups.com/text-table/-/text-table-0.2.0.tgz"
@@ -9148,13 +9134,6 @@
   "resolved" "http://npmprivate.quantgroups.com/utils-merge/-/utils-merge-1.0.1.tgz"
   "version" "1.0.1"
 
-"utrie@^1.0.1":
-  "integrity" "sha512-JPaDXF3vzgZxfeEwutdGzlrNoVFL5UvZcbO6Qo9D4GoahrieUPoMU8GCpVpR7MQqcKhmShIh8VlbEN3PLM3EBg=="
-  "resolved" "http://npmprivate.quantgroups.com/utrie/-/utrie-1.0.1.tgz"
-  "version" "1.0.1"
-  dependencies:
-    "base64-arraybuffer" "^1.0.1"
-
 "uuid@^3.3.2", "uuid@^3.4.0":
   "integrity" "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
   "resolved" "http://npmprivate.quantgroups.com/uuid/-/uuid-3.4.0.tgz"
@@ -9274,8 +9253,8 @@
   "version" "1.1.2"
 
 "vue-awesome-swiper@3.1.3":
-  "integrity" "sha512-E7suzkyApO8vNZbgdEnjSmnpsmQZyRvSVXJ7sey3XYwKPOkLhH3+GnHroBw+5PZIQXvWBwdCeQsPG1xQ1r1Rhg=="
-  "resolved" "http://npmprivate.quantgroups.com/vue-awesome-swiper/-/vue-awesome-swiper-3.1.3.tgz"
+  "integrity" "sha1-BVALUB/7P+yb9+uZhbz0roNg7Z4="
+  "resolved" "https://registry.npm.taobao.org/vue-awesome-swiper/download/vue-awesome-swiper-3.1.3.tgz"
   "version" "3.1.3"
   dependencies:
     "object-assign" "^4.1.1"