From 0b0e387388b95e3edadb40e9e384a68c52f9f1da Mon Sep 17 00:00:00 2001
From: zhufu <17863654727@163.com>
Date: Tue, 18 Feb 2025 11:12:11 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E5=9B=BE=E7=89=87=E7=BB=84=E4=BB=B6?=
=?UTF-8?q?=E5=B1=9E=E6=80=A7=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Informations/Mores/Image/config.ts | 5 ++-
.../Informations/Mores/Image/config.vue | 43 +++++++++++++++++++
.../components/PreviewRenderList/index.vue | 2 +
src/views/preview/utils/style.ts | 14 ++++++
4 files changed, 63 insertions(+), 1 deletion(-)
diff --git a/src/packages/components/Informations/Mores/Image/config.ts b/src/packages/components/Informations/Mores/Image/config.ts
index 80be43c..bd06224 100644
--- a/src/packages/components/Informations/Mores/Image/config.ts
+++ b/src/packages/components/Informations/Mores/Image/config.ts
@@ -10,7 +10,10 @@ export const option = {
// 适应方式
fit: 'contain',
// 圆角
- borderRadius: 10
+ borderRadius: 10,
+ photoMouseEventClose: false,
+ mouseSelectClose: false,
+ mouseCursor: 'default'
}
export default class Config extends PublicConfigClass implements CreateComponentType
diff --git a/src/packages/components/Informations/Mores/Image/config.vue b/src/packages/components/Informations/Mores/Image/config.vue
index 8383672..aec4be7 100644
--- a/src/packages/components/Informations/Mores/Image/config.vue
+++ b/src/packages/components/Informations/Mores/Image/config.vue
@@ -22,6 +22,31 @@
>
+
+
+
+
+
+
+
+
+
+ 是否禁用
+
+
+
+
+
+
+
+ 是否允许
+
+
+
@@ -64,4 +89,22 @@ const fitList = [
label: 'none'
},
]
+const mouseCursor = [
+ { value: 'default', label: 'default', },
+ { value: 'none', label: 'none', },
+ { value: 'context-menu', label: 'context-menu', },
+ { value: 'pointer', label: 'pointer', },
+ { value: 'help', label: 'help', },
+ { value: 'wait', label: 'wait', },
+ { value: 'progress', label: 'progress', },
+ { value: 'text', label: 'text', },
+ { value: 'vertical-text', label: 'vertical-text', },
+ { value: 'move', label: 'move', },
+ { value: 'grab', label: 'grab', },
+ { value: 'grabbing', label: 'grabbing', },
+ { value: 'move', label: 'move', },
+ { value: 'move', label: 'move', },
+ { value: 'move', label: 'move', },
+ { value: 'move', label: 'move', },
+]
diff --git a/src/views/preview/components/PreviewRenderList/index.vue b/src/views/preview/components/PreviewRenderList/index.vue
index 589a110..9006e25 100644
--- a/src/views/preview/components/PreviewRenderList/index.vue
+++ b/src/views/preview/components/PreviewRenderList/index.vue
@@ -12,6 +12,7 @@
...getPreviewConfigStyle(item.preview),
...(getBlendModeStyle(item.styles) as any),
...getSizeStyle(item.attr),
+ ...setMouseEventClose(item.option)
}"
>
@@ -60,6 +61,7 @@
getComponentAttrStyle,
getStatusStyle,
getPreviewConfigStyle,
+ setMouseEventClose,
} from '../../utils';
import { useLifeHandler } from '@/hooks';
diff --git a/src/views/preview/utils/style.ts b/src/views/preview/utils/style.ts
index 945aa8c..2daab9d 100644
--- a/src/views/preview/utils/style.ts
+++ b/src/views/preview/utils/style.ts
@@ -56,3 +56,17 @@ export const getEditCanvasConfigStyle = (canvas: EditCanvasConfigType) => {
...computedBackground
}
}
+// 图片设置禁用鼠标事件
+export const setMouseEventClose = (option) => {
+ let resultObj = {}
+ if(option.photoMouseEventClose){
+ resultObj['pointer-events'] = 'none'
+ }
+ if(option.mouseSelectClose){
+ resultObj['user-select'] = 'none'
+ }
+ if(option.mouseCursor){
+ resultObj['cursor'] = option.mouseCursor
+ }
+ return resultObj
+}
\ No newline at end of file
From ffc7ddcb824b0428cfd2c942c456b62273674e0f Mon Sep 17 00:00:00 2001
From: zhufu <17863654727@163.com>
Date: Tue, 18 Feb 2025 14:52:55 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E5=9B=BE=E7=89=87=20=E5=85=81=E8=AE=B8?=
=?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=A4=9A=E5=BC=A0=EF=BC=8C=E6=B7=BB=E5=8A=A0?=
=?UTF-8?q?=E5=90=8E=E5=86=8D=E6=AC=A1=E6=89=93=E5=BC=80=E5=8F=96=E6=B6=88?=
=?UTF-8?q?=E9=80=89=E4=B8=AD=EF=BC=8C=E7=82=B9=E5=87=BB=E5=9B=BE=E7=89=87?=
=?UTF-8?q?=E5=B0=B1=E9=80=89=E4=B8=AD=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=88=B0?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A4=9A=E5=BC=A0=E6=97=B6=EF=BC=8C=E5=8F=AA?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=80=E5=BC=A0=E9=97=AE=E9=A2=98=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/store/modules/packagesStore/packagesStore.d.ts | 2 +-
src/store/modules/packagesStore/packagesStore.ts | 4 ++--
.../components/ChartsOptionContent/index.vue | 8 ++++----
.../ContentCharts/components/PhotoModal/index.vue | 14 +++++++++-----
4 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/src/store/modules/packagesStore/packagesStore.d.ts b/src/store/modules/packagesStore/packagesStore.d.ts
index 0507895..e3fbed2 100644
--- a/src/store/modules/packagesStore/packagesStore.d.ts
+++ b/src/store/modules/packagesStore/packagesStore.d.ts
@@ -5,5 +5,5 @@ export { ConfigType }
export { PackagesType }
export interface PackagesStoreType {
packagesList: PackagesType,
- newPhoto?: ConfigType
+ newPhoto?: ConfigType[]
}
diff --git a/src/store/modules/packagesStore/packagesStore.ts b/src/store/modules/packagesStore/packagesStore.ts
index 2911731..6a5dcd2 100644
--- a/src/store/modules/packagesStore/packagesStore.ts
+++ b/src/store/modules/packagesStore/packagesStore.ts
@@ -17,9 +17,9 @@ export const usePackagesStore = defineStore({
}
},
actions: {
- addPhotos(newPhoto: ConfigType, index: number) {
+ addPhotos(newPhoto: ConfigType[], index: number) {
this.newPhoto = newPhoto
- this.packagesList.Photos.splice(index, 0, newPhoto)
+ this.packagesList.Photos.splice(index, 0, ...newPhoto)
},
deletePhotos(photoInfo: ConfigType, index: number) {
this.packagesList.Photos.splice(index, 1)
diff --git a/src/views/chart/ContentCharts/components/ChartsOptionContent/index.vue b/src/views/chart/ContentCharts/components/ChartsOptionContent/index.vue
index 72e0a37..1a00c8c 100644
--- a/src/views/chart/ContentCharts/components/ChartsOptionContent/index.vue
+++ b/src/views/chart/ContentCharts/components/ChartsOptionContent/index.vue
@@ -105,10 +105,10 @@ watch(
watch(
() => packagesStore.newPhoto,
newPhoto => {
- if (!newPhoto) return
- const newPhotoCategory = newPhoto.category
- packages.categorys[newPhotoCategory].splice(1, 0, newPhoto)
- packages.categorys['all'].splice(1, 0, newPhoto)
+ if (!newPhoto || newPhoto.length <= 0) return
+ const newPhotoCategory = newPhoto[0].category
+ packages.categorys[newPhotoCategory].splice(1, 0, ...newPhoto)
+ packages.categorys['all'].splice(1, 0, ...newPhoto)
}
)
diff --git a/src/views/chart/ContentCharts/components/PhotoModal/index.vue b/src/views/chart/ContentCharts/components/PhotoModal/index.vue
index 563c0bf..c49154e 100644
--- a/src/views/chart/ContentCharts/components/PhotoModal/index.vue
+++ b/src/views/chart/ContentCharts/components/PhotoModal/index.vue
@@ -7,20 +7,20 @@