From d26e04319b316f7810bd65cc34c8d56595e6a9d7 Mon Sep 17 00:00:00 2001
From: "hong.yang" <hong.yang@ustcinfo.com>
Date: Wed, 27 Sep 2023 09:21:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E5=8E=BB=E9=99=A4=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=A4=9A=E4=BD=99=E7=9A=84=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

去除组件多余的属性
---
 .../module/chart/components/ScreenDateTimePickerChart.java  | 6 ------
 .../core/module/chart/components/ScreenInputChart.java      | 3 ---
 .../core/module/chart/components/ScreenTimePickerChart.java | 5 -----
 3 files changed, 14 deletions(-)

diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenDateTimePickerChart.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenDateTimePickerChart.java
index 9954ec63..1a9deefb 100644
--- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenDateTimePickerChart.java
+++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenDateTimePickerChart.java
@@ -25,9 +25,6 @@ public class ScreenDateTimePickerChart extends Chart {
     @Data
     public static class Customize {
 
-        @ApiModelProperty(notes = "值")
-        private String value;
-
         @ApiModelProperty(notes = "选择框背景颜色")
         private String bgColor;
 
@@ -46,9 +43,6 @@ public class ScreenDateTimePickerChart extends Chart {
         @ApiModelProperty(notes = "绑定值的格式")
         private String valueFormat;
 
-        @ApiModelProperty(notes = "占位提示")
-        private String placeholder;
-
         @ApiModelProperty(notes = "下拉框")
         private Map<String, Object> dropDownBox;
 
diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenInputChart.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenInputChart.java
index a4cf89bc..d1d9ca80 100644
--- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenInputChart.java
+++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenInputChart.java
@@ -44,9 +44,6 @@ public class ScreenInputChart extends Chart {
         @ApiModelProperty(notes = "背景样式")
         private BackgroundStyle backgroundStyle;
 
-        @ApiModelProperty(notes = "输入值")
-        private String value;
-
         @ApiModelProperty(notes = "图标")
         private Icon icon;
 
diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenTimePickerChart.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenTimePickerChart.java
index 6661d00e..1b8d0aee 100644
--- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenTimePickerChart.java
+++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenTimePickerChart.java
@@ -23,9 +23,6 @@ public class ScreenTimePickerChart extends Chart {
     @Data
     public static class Customize {
 
-        @ApiModelProperty(notes = "值")
-        private String value;
-
         @ApiModelProperty(notes = "选择框背景颜色")
         private String backgroundColor;
 
@@ -56,8 +53,6 @@ public class ScreenTimePickerChart extends Chart {
         @ApiModelProperty(notes = "绑定值的格式")
         private String valueFormat;
 
-        @ApiModelProperty("占位提示")
-        private String placeholder;
 
     }
 

From 9bc4d626b25b2775270532fbaf58fd83f8776ca9 Mon Sep 17 00:00:00 2001
From: "wu.jian2" <distantmtn@gmail.com>
Date: Wed, 27 Sep 2023 09:45:05 +0800
Subject: [PATCH 2/2] =?UTF-8?q?style:=20=E6=97=B6=E9=97=B4=E3=80=81?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=97=B6=E9=97=B4=E9=80=89=E6=8B=A9=E5=99=A8?=
 =?UTF-8?q?=E7=9A=84=E5=AE=BD=E5=BA=A6=E5=80=BC=E5=A2=9E=E5=8A=A0=E6=9D=83?=
 =?UTF-8?q?=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../packages/BasicComponents/DateTimePicker/index.vue         | 4 ++--
 data-room-ui/packages/BasicComponents/TimePicker/index.vue    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/data-room-ui/packages/BasicComponents/DateTimePicker/index.vue b/data-room-ui/packages/BasicComponents/DateTimePicker/index.vue
index 8822625e..bbcfabea 100644
--- a/data-room-ui/packages/BasicComponents/DateTimePicker/index.vue
+++ b/data-room-ui/packages/BasicComponents/DateTimePicker/index.vue
@@ -448,8 +448,8 @@ export default {
 
 <style lang="scss" scoped>
 .basic-component-date-picker {
-  width: 100%;
-  height: 100%;
+  width: 100% !important;
+  height: 100% !important;
 
   // 范围时间选择器连接符
   ::v-deep .el-range-separator {
diff --git a/data-room-ui/packages/BasicComponents/TimePicker/index.vue b/data-room-ui/packages/BasicComponents/TimePicker/index.vue
index c77788f4..f777b074 100644
--- a/data-room-ui/packages/BasicComponents/TimePicker/index.vue
+++ b/data-room-ui/packages/BasicComponents/TimePicker/index.vue
@@ -264,8 +264,8 @@ export default {
 
 <style lang="scss" scoped>
 .basic-component-time-picker {
-  width: 100%;
-  height: 100%;
+  width: 100% !important;
+  height: 100% !important;
 
   .el-input--mini ::v-deep .el-input__inner {
     height: 100% !important;