Skip to content

🐞 fix(fix cropper error): #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

🐞 fix(fix cropper error): #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 31 additions & 31 deletions lib/EleUploadImage.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
:on-success="handleUploadSuccess"
:show-file-list="false"
:style="{
marginBottom: multiple && computedValues.length ? '20px' : '0px'
marginBottom: multiple && computedValues.length ? '20px' : '0px',
}"
:withCredentials="withCredentials"
ref="upload"
Expand All @@ -43,7 +43,7 @@
:style="{
width: size + 'px',
height: size + 'px',
lineHeight: size + 'px'
lineHeight: size + 'px',
}"
>
<i class="el-icon-plus"></i>
Expand All @@ -70,7 +70,7 @@
:style="{
width: size + 'px',
height: size + 'px',
lineHeight: size + 'px'
lineHeight: size + 'px',
}"
@click="isShowCrop = true"
class="el-upload el-upload--picture-card"
Expand Down Expand Up @@ -115,7 +115,7 @@
</template>

<script>
import Cropper from "vue-image-crop-upload";
import Cropper from "vue-image-crop-upload/upload-2.vue";
import EleGallery from "vue-ele-gallery";

export default {
Expand All @@ -126,63 +126,63 @@ export default {
type: [String, Array],
default() {
return [];
}
},
},
// 是否剪裁
crop: {
type: Boolean,
default: false
default: false,
},
// 图片显示大小
size: {
type: Number,
default: 150
default: 150,
},
// 裁剪高度
cropHeight: {
type: Number
type: Number,
},
// 裁剪宽度
cropWidth: {
type: Number
type: Number,
},
// 大小限制(MB)
fileSize: {
type: Number
type: Number,
},
// 响应处理函数
responseFn: Function,
// 文件类型, 例如['png', 'jpg', 'jpeg']
fileType: {
type: Array,
default: () => []
default: () => [],
},
// 是否显示上传成功的提示
isShowSuccessTip: {
type: Boolean,
default: true
default: true,
},
// 缩略图后缀, 例如七牛云缩略图样式 (?imageView2/1/w/20/h/20)
thumbSuffix: {
type: String,
default: ""
default: "",
},
// 是否显示提示
isShowTip: {
type: Boolean,
default: true
default: true,
},
// 弹窗标题
title: String,
// 图片懒加载
lazy: {
type: Boolean,
default: false
default: false,
},
// 上传地址 (同官网)
action: {
type: String,
required: true
required: true,
},
// 设置上传的请求头部(同官网)
headers: Object,
Expand All @@ -191,42 +191,42 @@ export default {
// 是否启用拖拽上传 (同官网)
drag: {
type: Boolean,
default: false
default: false,
},
// 支持发送 cookie 凭证信息 (同官网)
withCredentials: {
type: Boolean,
default: false
default: false,
},
// 是否支持多选文件 (同官网)
multiple: {
type: Boolean,
default: false
default: false,
},
// 上传时附带的额外参数(同官网)
data: Object,
// 上传的文件字段名 (同官网)
name: {
type: String,
default: "file"
default: "file",
},
// 覆盖默认的上传行为，可以自定义上传的实现 (同官网)
httpRequest: Function,
// 接受上传的文件类型（thumbnail-mode 模式下此参数无效）(同官网)
accept: String,
// 删除前的操作
beforeRemove: Function
beforeRemove: Function,
},
components: {
Cropper,
EleGallery
EleGallery,
},
data() {
return {
cropData: {},
isShowCrop: false,
uploading: false,
fileList: []
fileList: [],
};
},
computed: {
Expand All @@ -253,15 +253,15 @@ export default {
}
},
successFiles() {
return this.fileList.filter(file => file.status === "success");
}
return this.fileList.filter((file) => file.status === "success");
},
},
watch: {
isShowCrop(value) {
if (value === false) {
this.cropData = {};
}
}
},
},
methods: {
handleSetFileSet(fileName, fileType, fileSize) {
Expand All @@ -272,7 +272,7 @@ export default {
size: fileSize,
type: fileType,
status: "ready",
uid: uid
uid: uid,
};
},
handleCropSuccess(b64Data) {
Expand All @@ -287,7 +287,7 @@ export default {
this.cropData.percentage = 100;
this.cropData.response = response;
const file = Object.assign({}, this.cropData);
let index = this.fileList.findIndex(item => item.uid === file.uid);
let index = this.fileList.findIndex((item) => item.uid === file.uid);
if (index > -1) {
this.fileList.splice(index, 1, file);
} else {
Expand All @@ -303,7 +303,7 @@ export default {
if (file.name.lastIndexOf(".") > -1) {
fileExtension = file.name.slice(file.name.lastIndexOf(".") + 1);
}
isImg = this.fileType.some(type => {
isImg = this.fileType.some((type) => {
if (file.type.indexOf(type) > -1) return true;
if (fileExtension && fileExtension.indexOf(type) > -1) return true;
return false;
Expand Down Expand Up @@ -393,14 +393,14 @@ export default {
this.doRemove(index);
}
}
}
},
},
mounted() {
// 插入到body中, 避免弹出层被遮盖
if (this.crop && this.$refs.cropper) {
document.body.appendChild(this.$refs.cropper.$el);
}
}
},
};
</script>

Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "vue-ele-upload-image",
"description": "通过对 element-ui 的 upload 组件进一步封装, 使得图片上传更加容易",
"version": "2.0.11",
"version": "2.0.12",
"private": false,
"license": "MIT",
"scripts": {
Expand All @@ -25,7 +25,7 @@
],
"dependencies": {
"vue-ele-gallery": "^2.1.6",
"vue-image-crop-upload": "^2.5.0"
"vue-image-crop-upload": "^3.0.3"
},
"devDependencies": {
"@vue/cli-plugin-babel": "^3.8.0",
Expand All @@ -44,4 +44,4 @@
"> 1%",
"last 2 versions"
]
}
}
45 changes: 30 additions & 15 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -907,7 +907,7 @@
lodash.mapvalues "^4.6.0"
lodash.transform "^4.6.0"
mini-css-extract-plugin "^0.6.0"
minimist "^1.2.2"
minimist "^1.2.0"
ora "^3.4.0"
portfinder "^1.0.20"
postcss-loader "^3.0.0"
Expand Down Expand Up @@ -2146,7 +2146,7 @@ copy-webpack-plugin@^4.6.0:
loader-utils "^1.1.0"
minimatch "^3.0.4"
p-limit "^1.0.0"
serialize-javascript "^2.1.1"
serialize-javascript "^1.4.0"

core-js@^2.4.0, core-js@^2.6.5:
version "2.6.9"
Expand Down Expand Up @@ -4201,14 +4201,14 @@ json5@^1.0.1:
resolved "https://registry.npm.taobao.org/json5/download/json5-1.0.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjson5%2Fdownload%2Fjson5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
integrity sha1-d5+wAYYE+oVOrL9iUhgNg1Q+Pb4=
dependencies:
minimist "^1.2.2"
minimist "^1.2.0"

json5@^2.1.0:
version "2.1.1"
resolved "https://registry.npm.taobao.org/json5/download/json5-2.1.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjson5%2Fdownload%2Fjson5-2.1.1.tgz#81b6cb04e9ba496f1c7005d07b4368a2638f90b6"
integrity sha1-gbbLBOm6SW8ccAXQe0NoomOPkLY=
dependencies:
minimist "^1.2.2"
minimist "^1.2.0"

jsonfile@^4.0.0:
version "4.0.0"
Expand Down Expand Up @@ -4603,6 +4603,16 @@ minimatch@^3.0.4:
dependencies:
brace-expansion "^1.1.7"

minimist@1.2.2:
version "1.2.2"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.2.tgz#b00a00230a1108c48c169e69a291aafda3aacd63"
integrity sha512-rIqbOrKb8GJmx/5bc2M0QchhUouMXSpd1RTclXsB41JdL+VtnojfaJR+h7F9k18/4kHUsBFgk80Uk+q569vjPA==

minimist@^1.2.2:
version "1.2.6"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==

minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0:
version "2.9.0"
resolved "https://registry.npm.taobao.org/minipass/download/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
Expand Down Expand Up @@ -4663,7 +4673,7 @@ mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1:
resolved "https://registry.npm.taobao.org/mkdirp/download/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
dependencies:
minimist "1.2.2"
minimist "0.0.8"

move-concurrently@^1.0.1:
version "1.0.1"
Expand Down Expand Up @@ -5923,7 +5933,7 @@ rc@^1.2.7:
dependencies:
deep-extend "^0.6.0"
ini "~1.3.0"
minimist "^1.2.2"
minimist "^1.2.0"
strip-json-comments "~2.0.1"

read-pkg@^5.0.0:
Expand Down Expand Up @@ -6310,6 +6320,11 @@ send@0.17.1:
range-parser "~1.2.1"
statuses "~1.5.0"

serialize-javascript@^2.1.1:
version "2.1.2"
resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61"
integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==

serve-index@^1.9.1:
version "1.9.1"
resolved "https://registry.npm.taobao.org/serve-index/download/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
Expand Down Expand Up @@ -6850,7 +6865,7 @@ terser-webpack-plugin@^1.2.3, terser-webpack-plugin@^1.4.1:
find-cache-dir "^2.1.0"
is-wsl "^1.1.0"
schema-utils "^1.0.0"
serialize-javascript "^2.1.1"
serialize-javascript "^1.7.0"
source-map "^0.6.1"
terser "^4.1.2"
webpack-sources "^1.4.0"
Expand Down Expand Up @@ -7238,20 +7253,20 @@ vm-browserify@^1.0.1:
resolved "https://registry.npm.taobao.org/vm-browserify/download/vm-browserify-1.1.0.tgz#bd76d6a23323e2ca8ffa12028dc04559c75f9019"
integrity sha1-vXbWojMj4sqP+hICjcBFWcdfkBk=

vue-ele-gallery@^2.1.5:
version "2.1.5"
resolved "https://registry.npm.taobao.org/vue-ele-gallery/download/vue-ele-gallery-2.1.5.tgz#a7d67b0991f4bab5a8d309df48ca3d387b418913"
integrity sha1-p9Z7CZH0urWo0wnfSMo9OHtBiRM=
vue-ele-gallery@^2.1.6:
version "2.1.7"
resolved "https://registry.yarnpkg.com/vue-ele-gallery/-/vue-ele-gallery-2.1.7.tgz#2491058668c60e75451ebc97f40f6869b8bf6ebb"
integrity sha512-it2po/Gz3DvxvEznwtZsl7Oths/rbc9pmuJB1tA8/4PoIWPSinxeJ+YRa+Qso3pcYSbJoehKBdnSzOOw7IklXw==

vue-hot-reload-api@^2.3.0:
version "2.3.4"
resolved "https://registry.npm.taobao.org/vue-hot-reload-api/download/vue-hot-reload-api-2.3.4.tgz?cache=0&sync_timestamp=1568190386192&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-hot-reload-api%2Fdownload%2Fvue-hot-reload-api-2.3.4.tgz#532955cc1eb208a3d990b3a9f9a70574657e08f2"
integrity sha1-UylVzB6yCKPZkLOp+acFdGV+CPI=

vue-image-crop-upload@^2.5.0:
version "2.5.0"
resolved "https://registry.npm.taobao.org/vue-image-crop-upload/download/vue-image-crop-upload-2.5.0.tgz#2dcf499e5b4944bc5077fc30b5f24d5e977f313c"
integrity sha1-Lc9JnltJRLxQd/wwtfJNXpd/MTw=
vue-image-crop-upload@^3.0.3:
version "3.0.3"
resolved "https://registry.yarnpkg.com/vue-image-crop-upload/-/vue-image-crop-upload-3.0.3.tgz#0183cf8ebee30c08afba09a6fcb0a8fcd395e236"
integrity sha512-VeBsU0oI1hXeCvdpnu19DM/r3KTlI8SUXTxsHsU4MhDXR0ahRziiL9tf4FbILGx+gRVNZhGbl32yuM6TiaGNhA==
dependencies:
babel-runtime "^6.11.6"

Expand Down