From 73705282d3c310c8030893cd2ebe5d83e21c1625 Mon Sep 17 00:00:00 2001 From: "hong.yang" Date: Wed, 11 Oct 2023 17:41:29 +0800 Subject: [PATCH 1/7] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=87=AA=E5=8A=A8=E8=A7=A3=E6=9E=90=E4=B8=8B?= =?UTF-8?q?=E4=B8=80=E7=BA=A7=E6=97=B6=EF=BC=8C=E4=B8=8B=E4=B8=80=E7=BA=A7?= =?UTF-8?q?=E7=9A=84GeoJSON=E6=98=BE=E7=A4=BA=E4=B8=BAnull=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../packages/MapDataManagement/src/EditForm.vue | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/data-room-ui/packages/MapDataManagement/src/EditForm.vue b/data-room-ui/packages/MapDataManagement/src/EditForm.vue index 53d00a6f..aa77b010 100644 --- a/data-room-ui/packages/MapDataManagement/src/EditForm.vue +++ b/data-room-ui/packages/MapDataManagement/src/EditForm.vue @@ -173,7 +173,7 @@ export default { computed: { autoParseNextLevelShow () { // geoJson 不为空，且未上传过（说明是刚上传的） - return !this.isWhitespace(this.mapForm.geoJson) && this.mapForm.uploadedGeoJson === 0 + return !this.isWhitespace(this.mapForm.geoJson) && !this.isEmpty(this.mapForm.geoJson) && this.mapForm.uploadedGeoJson === 0 }, outRangeLabel() { return `级别${this.mapForm.level + 1}`; @@ -264,6 +264,8 @@ export default { this.mapForm = _.cloneDeep(map) if (!this.isWhitespace(this.mapForm.geoJson)) { this.mapForm.geoJson = JSON.parse(this.mapForm.geoJson) + } else { + this.mapForm.geoJson = {} } }, handleClose () { @@ -275,7 +277,7 @@ export default { return false } let geoJson - // 如果geoJson是空的，包括空字符串，纯空格、空对象，空数组，都不允许提交 + // 如果geoJson是空的，包括空字符串，纯空格、空对象，空数组，都置为空字符串 if (this.isWhitespace(this.mapForm.geoJson) || this.mapForm.geoJson === '{}' || this.mapForm.geoJson === '[]') { geoJson = '' } else { @@ -300,6 +302,15 @@ export default { } return /^\s*$/.test(str) }, + isEmpty (obj) { + if (typeof obj === 'object') { + return Object.keys(obj).length === 0 && obj.constructor === Object + } + if (typeof obj === 'string') { + return /^\s*$/.test(obj) + } + return Array.isArray(obj) && obj.length === 0 + }, upload () { this.$refs.geoJsonFile.click() }, From 2440493bc3394208816a66a124fd10ff55df36f2 Mon Sep 17 00:00:00 2001 From: "hong.yang" Date: Wed, 11 Oct 2023 17:43:54 +0800 Subject: [PATCH 2/7] =?UTF-8?q?fix:=20=E5=9C=B0=E5=9B=BE=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E9=99=8D?= =?UTF-8?q?=E5=BA=8F=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/module/map/service/impl/DataRoomMapServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/map/service/impl/DataRoomMapServiceImpl.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/map/service/impl/DataRoomMapServiceImpl.java index ccdc7439..4ebcbe98 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/map/service/impl/DataRoomMapServiceImpl.java +++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/map/service/impl/DataRoomMapServiceImpl.java @@ -52,6 +52,7 @@ public class DataRoomMapServiceImpl extends ServiceImpl entityList = this.list(wrapper); List idList = entityList.stream().map(DataRoomMapEntity::getId).collect(Collectors.toList()); List voList = Lists.newArrayList(); @@ -66,7 +67,6 @@ public class DataRoomMapServiceImpl extends ServiceImpl Date: Wed, 11 Oct 2023 17:45:25 +0800 Subject: [PATCH 3/7] =?UTF-8?q?fix:=20=E7=BB=84=E4=BB=B6=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gccloud/dataroom/core/module/chart/bean/Chart.java | 3 +++ .../core/module/chart/components/CustomComponentChart.java | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/bean/Chart.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/bean/Chart.java index c4d3ad54..004a3119 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/bean/Chart.java +++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/bean/Chart.java @@ -36,6 +36,9 @@ public class Chart { @ApiModelProperty(notes = "图表标题") private String title; + @ApiModelProperty(notes = "名称") + private String name; + @ApiModelProperty(notes = "组件类型") private String type; diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/CustomComponentChart.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/CustomComponentChart.java index 79ed3237..e54d4a8b 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/CustomComponentChart.java +++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/CustomComponentChart.java @@ -41,8 +41,8 @@ public class CustomComponentChart extends Chart { @ApiModelProperty(notes = "右侧面板自定义配置") private List> setting; - @ApiModelProperty(notes = "组件的唯一名称") - private String name; + @ApiModelProperty(notes = "组件类别") + private String category; @Data public static class Setting { From 556326d546c281c8e97f770ab07d4ef3cc5cad0c Mon Sep 17 00:00:00 2001 From: "wu.jian2" Date: Wed, 11 Oct 2023 17:50:43 +0800 Subject: [PATCH 4/7] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=99=A8=E5=88=87=E6=8D=A2=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B=E6=97=B6=EF=BC=8C=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E6=95=B0=E6=8D=AE=E4=B8=BA=E7=A9=BA=E7=9A=84=E6=83=85?= =?UTF-8?q?=E5=86=B5=EF=BC=8C=E8=B0=83=E6=95=B4=E4=B8=BA=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../packages/BasicComponents/TimePicker/index.vue | 10 +++++----- .../BasicComponents/TimePicker/setting.vue | 15 ++++++++++++++- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/data-room-ui/packages/BasicComponents/TimePicker/index.vue b/data-room-ui/packages/BasicComponents/TimePicker/index.vue index 26764193..7d25a70f 100644 --- a/data-room-ui/packages/BasicComponents/TimePicker/index.vue +++ b/data-room-ui/packages/BasicComponents/TimePicker/index.vue @@ -50,15 +50,15 @@ export default { } }, watch: { - 'config.customize.formatType': { handler (val) { if (val === 'timestamp') { - this.value = 0 - this.config.customize.valueFormat = 'timestamp' + this.value = new Date().getTime() + // this.config.customize.format = 'timestamp' + // this.config.customize.valueFormat = 'timestamp' } else if (val === 'custom') { - this.config.customize.valueFormat = 'HH:mm:ss' - this.value = '' + // this.config.customize.valueFormat = 'HH:mm:ss' + this.value = moment(new Date()).format('HH:mm:ss') } }, immediate: true diff --git a/data-room-ui/packages/BasicComponents/TimePicker/setting.vue b/data-room-ui/packages/BasicComponents/TimePicker/setting.vue index 0efd7845..37aad971 100644 --- a/data-room-ui/packages/BasicComponents/TimePicker/setting.vue +++ b/data-room-ui/packages/BasicComponents/TimePicker/setting.vue @@ -214,6 +214,20 @@ export default { } } }, + watch: { + 'config.customize.formatType': { + handler (val) { + if (val === 'timestamp') { + this.config.customize.format = 'timestamp' + this.config.customize.valueFormat = 'timestamp' + } else if (val === 'custom') { + this.config.customize.format = 'HH:mm:ss' + this.config.customize.valueFormat = 'HH:mm:ss' + } + }, + immediate: true + } + }, data () { return { // 时间格式化类型选项 @@ -223,7 +237,6 @@ export default { ] } }, - watch: {}, mounted () {}, methods: { } } From fb53633a5810d12765678e73b6a12973ec784b0e Mon Sep 17 00:00:00 2001 From: "wu.jian2" Date: Wed, 11 Oct 2023 17:53:14 +0800 Subject: [PATCH 5/7] =?UTF-8?q?refactor:=20=E8=87=AA=E5=8A=A9=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=9B=86=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=3D>select=20=20=20*=20=20=20from=20=20=E8=A1=A8?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../packages/DataSetManagement/src/CustomEditForm.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue b/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue index c9a565a5..2713e5e4 100644 --- a/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue +++ b/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue @@ -157,7 +157,7 @@ Date: Thu, 12 Oct 2023 09:15:32 +0800 Subject: [PATCH 6/7] =?UTF-8?q?refactor:=20=E8=87=AA=E5=8A=A9=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=9B=86=EF=BC=8C=E6=95=B0=E6=8D=AE=E7=BC=93=E5=AD=98?= =?UTF-8?q?=3D>=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue b/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue index 2713e5e4..c31669dc 100644 --- a/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue +++ b/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue @@ -157,7 +157,7 @@ Date: Thu, 12 Oct 2023 09:52:03 +0800 Subject: [PATCH 7/7] =?UTF-8?q?refactor:=20=E8=B0=83=E6=95=B4=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E9=80=89=E6=8B=A9=E5=99=A8=E3=80=81=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=80=89=E6=8B=A9=E5=99=A8=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B=E9=85=8D=E7=BD=AE=E7=9A=84?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DateTimePicker/setting.vue | 58 +++++++++---------- .../BasicComponents/TimePicker/setting.vue | 57 +++++++++--------- 2 files changed, 58 insertions(+), 57 deletions(-) diff --git a/data-room-ui/packages/BasicComponents/DateTimePicker/setting.vue b/data-room-ui/packages/BasicComponents/DateTimePicker/setting.vue index 5523bbaf..6341de5a 100644 --- a/data-room-ui/packages/BasicComponents/DateTimePicker/setting.vue +++ b/data-room-ui/packages/BasicComponents/DateTimePicker/setting.vue @@ -108,6 +108,35 @@ 日期时间格式
+ +
+ + + + + +
+ 时间戳：从1970年1月1日开始计算的秒数，数据类型为数值型，例如：1483326245000。
+ 自定义：通过输入特定的格式字符串来指定时间的数据格式，例如：yyyy-MM-dd HH:mm:ss对应数据为 2023-10-08 09:30:00。
+
+ +
+
- -
- - - - - -
- 时间戳：从1970年1月1日开始计算的秒数，数据类型为数值型，例如：1483326245000。
- 自定义：通过输入特定的格式字符串来指定时间的数据格式，例如：yyyy-MM-dd HH:mm:ss对应数据为 2023-10-08 09:30:00。
-
- -
- 时间格式
+ +
+ + + + + +
+ 时间戳：从1970年1月1日开始计算的秒数，数据类型为数值型，例如：1483326245000。
+ 自定义：通过输入特定的格式字符串来指定时间的数据格式，例如：HH:mm:ss对应数据为 09:30:00。
+
+ +
+
- -
- - - - - -
- 时间戳：从1970年1月1日开始计算的秒数，数据类型为数值型，例如：1483326245000。
- 自定义：通过输入特定的格式字符串来指定时间的数据格式，例如：HH:mm:ss对应数据为 09:30:00。
-
- -
- +