From e067f714c0588407b1c20ddd6b7af3b2043e35f8 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 29 九月 2025 11:29:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
admin/src/components/common/ImageCropper.vue | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/admin/src/components/common/ImageCropper.vue b/admin/src/components/common/ImageCropper.vue
index 5ef77d9..a58eedc 100644
--- a/admin/src/components/common/ImageCropper.vue
+++ b/admin/src/components/common/ImageCropper.vue
@@ -13,8 +13,8 @@
:canMove="options.canMove"
:output-size="options.outputSize"
:centerBox="options.centerBox"
- :autoCropWidth="options.autoCropWidth"
- :autoCropHeight="options.autoCropHeight"
+ :autoCropWidth="autoCrop.width || options.autoCropWidth"
+ :autoCropHeight="autoCrop.height || options.autoCropHeight"
@realTime="realTime"
></vue-cropper>
</div>
@@ -28,7 +28,7 @@
<script>
import { VueCropper } from 'vue-cropper'
-import {upload} from "@/api/system/common";
+import { upload } from '@/api/system/common'
export default {
name: 'ImageCropper',
components: { VueCropper },
@@ -36,6 +36,12 @@
imgSrc: {
type: String,
default: ''
+ },
+ autoCrop: {
+ type: Object,
+ default () {
+ return { width: 500, height: 500 }
+ }
},
// 鍥炴樉涓婃淇濆瓨鐨勬埅鍥剧殑浣嶇疆
location: {
@@ -76,7 +82,7 @@
centerBox: true,
height: 500,
width: 500,
- outputSize:{width: 500, height: 500 },
+ outputSize: 1,
autoCropWidth: 500,
autoCropHeight: 500,
fixed: true,
@@ -94,7 +100,7 @@
watch: {
},
methods: {
- getImagecropper(){
+ getImagecropper () {
return this.$refs.cropper
},
// 瀛︿範鎴浘妗嗗彉鍖栦簨浠�
--
Gitblit v1.9.3