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

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenIndexCardChart.java

@@ -68,6 +68,18 @@ public class ScreenIndexCardChart extends Chart {
         @ApiModelProperty(notes = "第二行字体内容")
         private String secondLine;
 
+        @ApiModelProperty(notes = "字体")
+        private String fontFamily;
+
+        @ApiModelProperty(notes = "单位")
+        private String unit;
+
+        @ApiModelProperty(notes = "单位字体大小")
+        private Integer unitSize;
+
+        @ApiModelProperty(notes = "单位字体颜色")
+        private String unitColor;
+
     }
 
 }

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenIndicatorCardChart.java

@@ -59,6 +59,19 @@ public class ScreenIndicatorCardChart extends Chart {
         @ApiModelProperty(notes = "第二行字体内容")
         private String secondLine;
 
+        @ApiModelProperty(notes = "字体")
+        private String fontFamily;
+
+        @ApiModelProperty(notes = "单位")
+        private String unit;
+
+        @ApiModelProperty(notes = "单位字体大小")
+        private Integer unitSize;
+
+        @ApiModelProperty(notes = "单位字体颜色")
+        private String unitColor;
+
+
     }
 
 }

data-room-ui/packages/BasicComponents/Button/setting.vue

@@ -135,6 +135,7 @@ import IconPicker from 'data-room-ui/IconPicker/index.vue'
 import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
 import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
+import {predefineColors} from "data-room-ui/js/utils/colorList";
 
 export default {
   name: 'Border14Setting',

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

@@ -231,6 +231,7 @@ import SettingTitle from 'data-room-ui/SettingTitle/index.vue'
 import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
 import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
+import {predefineColors} from "data-room-ui/js/utils/colorList";
 export default {
   name: 'DateTimePickerSetting',
   components: {

data-room-ui/packages/BasicComponents/DigitalFlop/setting.vue

@@ -165,6 +165,7 @@ import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
 import BorderSetting from 'data-room-ui/BigScreenDesign/RightSetting/BorderSetting.vue'
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
 import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
+import {predefineColors} from "data-room-ui/js/utils/colorList";
 export default {
   name: 'BarSetting',
   components: {

data-room-ui/packages/BasicComponents/FlyMap/setting.vue

@@ -352,6 +352,7 @@ import BorderSetting from 'data-room-ui/BigScreenDesign/RightSetting/BorderSetti
 import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
 import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
+import {predefineColors} from "data-room-ui/js/utils/colorList";
 export default {
   name: 'BarSetting',
   components: {

data-room-ui/packages/BasicComponents/HorizontalLine/setting.vue

@@ -94,6 +94,7 @@ import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
 import BorderSetting from 'data-room-ui/BigScreenDesign/RightSetting/BorderSetting.vue'
 import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
+import {predefineColors} from "data-room-ui/js/utils/colorList";
 
 export default {
   name: 'Border14Setting',

data-room-ui/packages/BasicComponents/IndicatorCard2/setting.vue

@@ -206,7 +206,7 @@
 <script>
 import SettingTitle from 'data-room-ui/SettingTitle/index.vue'
 import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
-import {predefineColors} from "data-room-ui/js/utils/colorList";
+import {predefineColors} from 'data-room-ui/js/utils/colorList';
 import BorderSetting from 'data-room-ui/BigScreenDesign/RightSetting/BorderSetting.vue'
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
 import fontList from 'data-room-ui/js/utils/fontList'

data-room-ui/packages/BasicComponents/Input/setting.vue

@@ -192,6 +192,7 @@ import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
 import BorderSetting from 'data-room-ui/BigScreenDesign/RightSetting/BorderSetting.vue'
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
 import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
+import {predefineColors} from "data-room-ui/js/utils/colorList";
 export default {
   name: 'InputSetting',
   components: {

data-room-ui/packages/BasicComponents/Map/setting.vue

@@ -328,6 +328,7 @@ import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
 import BorderSetting from 'data-room-ui/BigScreenDesign/RightSetting/BorderSetting.vue'
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
 import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
+import {predefineColors} from "data-room-ui/js/utils/colorList";
 export default {
   name: 'BarSetting',
   components: {

data-room-ui/packages/BasicComponents/Marquee/setting.vue

@@ -330,6 +330,7 @@ import BorderSetting from 'data-room-ui/BigScreenDesign/RightSetting/BorderSetti
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
 import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
 import IconSvg from 'data-room-ui/SvgIcon'
+import {predefineColors} from "data-room-ui/js/utils/colorList";
 export default {
   name: 'TextSetting',
   components: {

data-room-ui/packages/BasicComponents/ScreenScrollBoard/setting.vue

@@ -129,6 +129,7 @@ import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
 import BorderSetting from 'data-room-ui/BigScreenDesign/RightSetting/BorderSetting.vue'
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
 import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
+import {predefineColors} from "data-room-ui/js/utils/colorList";
 export default {
   name: 'BarSetting',
   components: {

data-room-ui/packages/BasicComponents/Select/setting.vue

@@ -93,6 +93,7 @@ import BorderSetting from 'data-room-ui/BigScreenDesign/RightSetting/BorderSetti
 import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
 import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
+import {predefineColors} from "data-room-ui/js/utils/colorList";
 export default {
   name: 'Border14Setting',
   components: {

data-room-ui/packages/BasicComponents/Tables/setting.vue

@@ -115,6 +115,7 @@ import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
 import { chartSettingMixins } from 'data-room-ui/js/mixins/chartSettingMixins'
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
 import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
+import {predefineColors} from "data-room-ui/js/utils/colorList";
 export default {
   components: {
     ColorPicker,

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

@@ -187,6 +187,7 @@ import SettingTitle from 'data-room-ui/SettingTitle/index.vue'
 import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
 import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
+import {predefineColors} from "data-room-ui/js/utils/colorList";
 export default {
   name: 'TimePickerSetting',
   components: {

data-room-ui/packages/BasicComponents/VerticalLine/setting.vue

@@ -93,6 +93,7 @@ import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
 import BorderSetting from 'data-room-ui/BigScreenDesign/RightSetting/BorderSetting.vue'
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
 import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
+import {predefineColors} from "data-room-ui/js/utils/colorList";
 export default {
   name: 'Border14Setting',
   components: {

data-room-ui/packages/BigScreenDesign/BorderSetting.vue

@@ -134,6 +134,7 @@ import SettingTitle from 'data-room-ui/SettingTitle/index.vue'
 import ColorPicker from 'data-room-ui/ColorPicker/index.vue'
 import PosWhSetting from 'data-room-ui/BigScreenDesign/RightSetting/PosWhSetting.vue'
 import RotateSetting from 'data-room-ui/BigScreenDesign/RightSetting/RotateSetting.vue'
+import {predefineColors} from "data-room-ui/js/utils/colorList";
 export default {
   name: 'BorderSetting',
   components: {