tzjy-code
/
DataRoom
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
main
liu.tao3 1 year ago
parent 2e888cd262 372ae84692
commit 13daad29ca
17 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File

12
DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenIndexCardChart.java
Unescape Escape View File

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

13
DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/ScreenIndicatorCardChart.java
Unescape Escape View File

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

1
data-room-ui/packages/BasicComponents/Button/setting.vue
Unescape Escape View File

@ -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',

1
data-room-ui/packages/BasicComponents/DateTimePicker/setting.vue
Unescape Escape View File

@ -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: {

1
data-room-ui/packages/BasicComponents/DigitalFlop/setting.vue
Unescape Escape View File

@ -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: {

1
data-room-ui/packages/BasicComponents/FlyMap/setting.vue
Unescape Escape View File

@ -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: {

1
data-room-ui/packages/BasicComponents/HorizontalLine/setting.vue
Unescape Escape View File

@ -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',

2
data-room-ui/packages/BasicComponents/IndicatorCard2/setting.vue
Unescape Escape View File

@ -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'

1
data-room-ui/packages/BasicComponents/Input/setting.vue
Unescape Escape View File

@ -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: {

1
data-room-ui/packages/BasicComponents/Map/setting.vue
Unescape Escape View File

@ -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: {

1
data-room-ui/packages/BasicComponents/Marquee/setting.vue
Unescape Escape View File

@ -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: {

1
data-room-ui/packages/BasicComponents/ScreenScrollBoard/setting.vue
Unescape Escape View File

@ -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: {

1
data-room-ui/packages/BasicComponents/Select/setting.vue
Unescape Escape View File

@ -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: {

1
data-room-ui/packages/BasicComponents/Tables/setting.vue
Unescape Escape View File

@ -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,

1
data-room-ui/packages/BasicComponents/TimePicker/setting.vue
Unescape Escape View File

@ -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: {

1
data-room-ui/packages/BasicComponents/VerticalLine/setting.vue
Unescape Escape View File

@ -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: {

1
data-room-ui/packages/BigScreenDesign/BorderSetting.vue
Unescape Escape View File

@ -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: {

Write Preview
Loading…
Cancel
Save