From da66bd0b3fff6402074b3480616811bac7f64876 Mon Sep 17 00:00:00 2001
From: "zhu.yawen" <zhu.yawen@ustcinfo.com>
Date: Fri, 10 Nov 2023 10:41:21 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E8=AE=BE=E8=AE=A1?=
=?UTF-8?q?=E5=99=A8=E9=9D=A2=E6=9D=BF=E5=8F=B3=E4=BE=A7=E5=8C=BA=E5=9F=9F?=
=?UTF-8?q?=E6=A1=86=E9=80=89=E4=BD=8D=E7=BD=AE=E5=81=8F=E7=A7=BBBUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../BigScreenDesign/MouseSelect/index.vue | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/data-room-ui/packages/BigScreenDesign/MouseSelect/index.vue b/data-room-ui/packages/BigScreenDesign/MouseSelect/index.vue
index 39004caf..07bbf59a 100644
--- a/data-room-ui/packages/BigScreenDesign/MouseSelect/index.vue
+++ b/data-room-ui/packages/BigScreenDesign/MouseSelect/index.vue
@@ -51,10 +51,8 @@ export default {
}),
getSelectionBoxStyle () {
// 计算虚线框的样式
- let left = Math.min(this.startX, this.endX) + 'px'
- let top = Math.min(this.startY, this.endY) + 'px'
- const left1 = Math.min(this.startX, this.endX) + 50 * this.scale + 'px'
- const top1 = Math.min(this.startY, this.endY) + 50 * this.scale + 'px'
+ const left = Math.min(this.startX, this.endX) + 'px'
+ const top = Math.min(this.startY, this.endY) + 'px'
const width = Math.abs(this.endX - this.startX) + 'px'
const height = Math.abs(this.endY - this.startY) + 'px'
if (!this.isSelecting) {
@@ -100,11 +98,12 @@ export default {
this.endX = event.offsetX + 50
this.startY = event.offsetY + 50
this.endY = event.offsetY + 50
+ } else if (event.target.className === '') {
+ this.startX = event.offsetX
+ this.endX = event.offsetX
+ this.startY = event.offsetY
+ this.endY = event.offsetY
}
- // this.startX = (event.x - this.offsetX + 50) / this.scale
- // this.startY = (event.y - this.offsetY + 50) / this.scale
- // this.endX = (event.x - this.offsetX + 50) / this.scale
- // this.endY = (event.y - this.offsetY + 50) / this.scale
}
},
handleMouseMove (event) {
@@ -119,8 +118,8 @@ export default {
if (typeof event.target.className === 'string' && event.target.className.indexOf('mouse-select-wrap') !== -1) {
this.endX = event.offsetX
this.endY = event.offsetY
- } else if (typeof event.target.className === 'string' && event.target.className.indexOf('design-drag-wrap') !== -1) {
- this.startX = event.offsetX + 50
+ } else if (typeof event.target.className === 'string' && (event.target.className.indexOf('design-drag-wrap') !== -1)) {
+ this.endX = event.offsetX + 50
this.endY = event.offsetY + 50
}
}
From 7e771d3ce32af1fbab01dc9e2ee376f99eeb2d36 Mon Sep 17 00:00:00 2001
From: "zhu.yawen" <zhu.yawen@ustcinfo.com>
Date: Fri, 10 Nov 2023 10:54:25 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E8=AE=BE=E8=AE=A1?=
=?UTF-8?q?=E5=99=A8=E9=9D=A2=E6=9D=BF=E5=8F=B3=E4=BE=A7=E5=8C=BA=E5=9F=9F?=
=?UTF-8?q?=E6=8B=96=E6=8B=BD=E4=BD=8D=E7=BD=AE=E9=94=99=E4=B9=B1=E9=97=AE?=
=?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../packages/BigScreenDesign/MouseSelect/index.vue | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/data-room-ui/packages/BigScreenDesign/MouseSelect/index.vue b/data-room-ui/packages/BigScreenDesign/MouseSelect/index.vue
index 07bbf59a..d8f347e4 100644
--- a/data-room-ui/packages/BigScreenDesign/MouseSelect/index.vue
+++ b/data-room-ui/packages/BigScreenDesign/MouseSelect/index.vue
@@ -99,10 +99,10 @@ export default {
this.startY = event.offsetY + 50
this.endY = event.offsetY + 50
} else if (event.target.className === '') {
- this.startX = event.offsetX
- this.endX = event.offsetX
- this.startY = event.offsetY
- this.endY = event.offsetY
+ this.startX = event.offsetX + 50
+ this.endX = event.offsetX + 50
+ this.startY = event.offsetY + 50
+ this.endY = event.offsetY + 50
}
}
},
From 497e9f844501829674cf4ec40d22628b2ed191ae Mon Sep 17 00:00:00 2001
From: "hong.yang" <hong.yang@ustcinfo.com>
Date: Fri, 10 Nov 2023 11:04:26 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E5=9C=B0=E5=9B=BE=E6=96=B0=E5=A2=9E?=
=?UTF-8?q?=E6=96=87=E6=9C=AC=E6=A0=B7=E5=BC=8F=E9=85=8D=E7=BD=AE=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../core/module/chart/components/ScreenMapChart.java | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenMapChart.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenMapChart.java
index 8c8856df..c2327160 100644
--- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenMapChart.java
+++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenMapChart.java
@@ -29,6 +29,15 @@ public class ScreenMapChart extends Chart {
@ApiModelProperty(notes = "是否显示文字")
private Boolean mapName;
+ @ApiModelProperty(notes = "文字颜色")
+ private String mapNameColor;
+
+ @ApiModelProperty(notes = "文字大小")
+ private Integer mapNameSize;
+
+ @ApiModelProperty(notes = "文字权重")
+ private Integer mapNameWeight;
+
@ApiModelProperty(notes = "地图背景色")
private String backgroundColor;