Merge branch 'master' of github.com:gcpaas/DataRoom

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;
 

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;
 

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;
 
     }
 

data-room-ui/packages/BasicComponents/DateTimePicker/index.vue

@@ -448,8 +448,8 @@ export default {
 
 <style lang="scss" scoped>
 .basic-component-date-picker {
-  width: 100%;
+  width: 100% !important;
-  height: 100%;
+  height: 100% !important;
 
   // 范围时间选择器连接符
   ::v-deep .el-range-separator {

data-room-ui/packages/BasicComponents/TimePicker/index.vue

@@ -264,8 +264,8 @@ export default {
 
 <style lang="scss" scoped>
 .basic-component-time-picker {
-  width: 100%;
+  width: 100% !important;
-  height: 100%;
+  height: 100% !important;
 
   .el-input--mini ::v-deep .el-input__inner {
     height: 100% !important;