From fbd8ffa2d6860ab7c69e93ba726221f7bb7987bd Mon Sep 17 00:00:00 2001
From: toesbieya <1647775459@qq.com>
Date: Sun, 5 Jul 2020 13:30:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dworker=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/src/plugin/imageCompress/cjpeg.js            |  3 ++-
 vue/src/plugin/imageCompress/pngquant.js         |  3 ++-
 .../components/ImageCompressTest.vue             | 16 ++++++++--------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/vue/src/plugin/imageCompress/cjpeg.js b/vue/src/plugin/imageCompress/cjpeg.js
index aeac37f..2d0c3f0 100644
--- a/vue/src/plugin/imageCompress/cjpeg.js
+++ b/vue/src/plugin/imageCompress/cjpeg.js
@@ -1,7 +1,8 @@
 import {createWorker} from "@/utils/worker"
 
 export default function (uint8Array, quality = 75) {
-    const url = `${process.env.BASE_URL}static/js/cjpeg.min.js`
+    const {protocol, host} = document.location
+    const url = `${protocol}//${host}${process.env.BASE_URL}static/js/cjpeg.min.js`
     return new Promise(resolve => {
         let worker = createWorker(handler, {url, data: uint8Array, quality}, ({data}) => {
             resolve(data)
diff --git a/vue/src/plugin/imageCompress/pngquant.js b/vue/src/plugin/imageCompress/pngquant.js
index 8fe05fb..24c771a 100644
--- a/vue/src/plugin/imageCompress/pngquant.js
+++ b/vue/src/plugin/imageCompress/pngquant.js
@@ -1,7 +1,8 @@
 import {createWorker} from "@/utils/worker"
 
 export default function (uint8Array, quality = 75, speed = 4) {
-    const url = `${process.env.BASE_URL}static/js/pngquant.min.js`
+    const {protocol, host} = document.location
+    const url = `${protocol}//${host}${process.env.BASE_URL}static/js/pngquant.min.js`
     return new Promise(resolve => {
         let worker = createWorker(handler, {url, data: uint8Array, quality, speed}, ({data}) => {
             resolve(data)
diff --git a/vue/src/views/example/developingTest/components/ImageCompressTest.vue b/vue/src/views/example/developingTest/components/ImageCompressTest.vue
index 90342ac..fb19a21 100644
--- a/vue/src/views/example/developingTest/components/ImageCompressTest.vue
+++ b/vue/src/views/example/developingTest/components/ImageCompressTest.vue
@@ -5,8 +5,8 @@
             <a href="https://github.com/LI-NA/mozjpeg.js" target="_blank">使用mozjpeg</a>
             <div class="container">
                 <div v-show="!jpg.input.src" class="file-select">
-                    <input ref="jpg" type="file" accept="image/jpeg" @change="select($event,'jpg')">
-                    <el-button type="primary" @click="$refs.jpg.click()">选择图片</el-button>
+                    <input ref="jpg" type="file" accept="image/jpeg" @change="e => select(e,'jpg')">
+                    <el-button type="primary" @click="() => $refs.jpg.click()">选择图片</el-button>
                 </div>
                 <div v-show="jpg.input.src" class="image-container">
                     <p>原始图片：{{jpg.name}} ({{jpg.input.size|numberFormatter}})</p>
@@ -26,8 +26,8 @@
                     <el-slider v-model="jpg.quality" :disabled="jpg.loading" :min="0" :max="100" style="flex: 1"/>
                 </el-row>
                 <el-row type="flex" justify="center">
-                    <el-button :loading="jpg.loading" type="primary" @click="compress('jpg')">压缩</el-button>
-                    <el-button plain @click="cancel('jpg')">重置</el-button>
+                    <el-button :loading="jpg.loading" type="primary" @click="() => compress('jpg')">压缩</el-button>
+                    <el-button plain @click="() => cancel('jpg')">重置</el-button>
                 </el-row>
             </div>
         </div>
@@ -36,8 +36,8 @@
             <a href="https://github.com/psych0der/pngquantjs" target="_blank">使用pngquant</a>
             <div class="container">
                 <div v-show="!png.input.src" class="file-select">
-                    <input ref="png" type="file" accept="image/x-png" @change="select($event,'png')">
-                    <el-button type="primary" @click="$refs.png.click()">选择图片</el-button>
+                    <input ref="png" type="file" accept="image/x-png" @change="e => select(e,'png')">
+                    <el-button type="primary" @click="() => $refs.png.click()">选择图片</el-button>
                 </div>
                 <div v-show="png.input.src" class="image-container">
                     <p>原始图片：{{png.name}} ({{png.input.size|numberFormatter}})</p>
@@ -61,8 +61,8 @@
                     <el-slider v-model="png.speed" :disabled="png.loading" :min="0" :max="10" style="flex: 1"/>
                 </el-row>
                 <el-row type="flex" justify="center">
-                    <el-button :loading="png.loading" type="primary" @click="compress('png')">压缩</el-button>
-                    <el-button plain @click="cancel('png')">重置</el-button>
+                    <el-button :loading="png.loading" type="primary" @click="() => compress('png')">压缩</el-button>
+                    <el-button plain @click="() => cancel('png')">重置</el-button>
                 </el-row>
             </div>
         </div>