From 1c3a486a620a384aac5e5abb5c0589f16edf7710 Mon Sep 17 00:00:00 2001 From: "liu.shiyi" Date: Sat, 14 Oct 2023 10:47:24 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=99=A8=E7=9A=84=E9=A2=84=E8=AE=BE=E9=A2=9C?= =?UTF-8?q?=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../packages/BasicComponents/Button/index.vue | 17 +++-------------- .../packages/BasicComponents/Button/setting.vue | 16 ++-------------- .../BasicComponents/DateTimePicker/setting.vue | 16 ++-------------- .../BasicComponents/DigitalFlop/setting.vue | 12 +----------- .../packages/BasicComponents/FlyMap/setting.vue | 12 +----------- .../BasicComponents/HorizontalLine/setting.vue | 16 ++-------------- .../BasicComponents/IndexCard/setting.vue | 12 +----------- .../BasicComponents/IndexCard2/setting.vue | 12 +----------- .../BasicComponents/IndicatorCard/setting.vue | 12 +----------- .../BasicComponents/IndicatorCard2/setting.vue | 12 +----------- .../packages/BasicComponents/Input/setting.vue | 16 ++-------------- .../packages/BasicComponents/Map/setting.vue | 12 +----------- .../BasicComponents/Marquee/setting.vue | 12 +----------- .../ScreenScrollBoard/setting.vue | 12 +----------- .../ScreenScrollRanking/setting.vue | 13 ++----------- .../packages/BasicComponents/Select/setting.vue | 16 ++-------------- .../packages/BasicComponents/Tables/setting.vue | 12 +----------- .../BasicComponents/TimePicker/setting.vue | 16 ++-------------- .../BasicComponents/VerticalLine/setting.vue | 16 ++-------------- .../packages/BasicComponents/Video/setting.vue | 17 +++-------------- .../packages/BigScreenDesign/BorderSetting.vue | 16 ++-------------- .../BigScreenDesign/OverallSetting/index.vue | 13 ++----------- .../packages/Borders/Border1/setting.vue | 13 ++----------- .../packages/Borders/Border10/setting.vue | 13 ++----------- .../packages/Borders/Border11/setting.vue | 13 ++----------- .../packages/Borders/Border12/setting.vue | 13 ++----------- .../packages/Borders/Border13/setting.vue | 13 ++----------- .../packages/Borders/Border14/setting.vue | 15 ++------------- .../packages/Borders/Border15/setting.vue | 17 +++-------------- .../packages/Borders/Border2/setting.vue | 13 ++----------- .../packages/Borders/Border3/setting.vue | 13 ++----------- .../packages/Borders/Border4/setting.vue | 13 ++----------- .../packages/Borders/Border5/setting.vue | 13 ++----------- .../packages/Borders/Border6/setting.vue | 13 ++----------- .../packages/Borders/Border7/setting.vue | 13 ++----------- .../packages/Borders/Border8/setting.vue | 13 ++----------- .../packages/Borders/Border9/setting.vue | 13 ++----------- data-room-ui/packages/ColorPicker/index.vue | 13 ++----------- .../Decorations/Decoration1/setting.vue | 13 ++----------- .../Decorations/Decoration10/setting.vue | 13 ++----------- .../Decorations/Decoration11/setting.vue | 13 ++----------- .../Decorations/Decoration12/setting.vue | 13 ++----------- .../Decorations/Decoration2/setting.vue | 13 ++----------- .../Decorations/Decoration2Reverse/setting.vue | 13 ++----------- .../Decorations/Decoration3/setting.vue | 13 ++----------- .../Decorations/Decoration4/setting.vue | 13 ++----------- .../Decorations/Decoration4Reverse/setting.vue | 13 ++----------- .../Decorations/Decoration5/setting.vue | 13 ++----------- .../Decorations/Decoration6/setting.vue | 13 ++----------- .../Decorations/Decoration8/setting.vue | 13 ++----------- .../Decorations/Decoration8Reverse/setting.vue | 13 ++----------- .../Decorations/Decoration9/setting.vue | 13 ++----------- data-room-ui/packages/js/utils/colorList.js | 11 +++++++++++ 53 files changed, 108 insertions(+), 607 deletions(-) create mode 100644 data-room-ui/packages/js/utils/colorList.js diff --git a/data-room-ui/packages/BasicComponents/Button/index.vue b/data-room-ui/packages/BasicComponents/Button/index.vue index b6a271f5..8b1c31a8 100644 --- a/data-room-ui/packages/BasicComponents/Button/index.vue +++ b/data-room-ui/packages/BasicComponents/Button/index.vue @@ -30,6 +30,7 @@ import commonMixins from 'data-room-ui/js/mixins/commonMixins' import linkageMixins from 'data-room-ui/js/mixins/linkageMixins' import { mapState } from 'vuex' +import {predefineColors} from "data-room-ui/js/utils/colorList"; export default { name: 'BasicComponentButton', mixins: [commonMixins, linkageMixins], @@ -44,21 +45,9 @@ export default { type: Object, default: () => ({}) }, - predefineThemeColors: { + predefineThemeColors: { type: Array, - default: () => { - return [ - '#007aff', - '#1aa97b', - '#ff4d53', - '#1890FF', - '#DF0E1B', - '#0086CC', - '#2B74CF', - '#00BC9D', - '#ED7D32' - ] - } + default: () => predefineColors } }, mounted () { diff --git a/data-room-ui/packages/BasicComponents/Button/setting.vue b/data-room-ui/packages/BasicComponents/Button/setting.vue index cba1938b..4d2d8c29 100644 --- a/data-room-ui/packages/BasicComponents/Button/setting.vue +++ b/data-room-ui/packages/BasicComponents/Button/setting.vue @@ -151,21 +151,9 @@ export default { type: Object, required: true }, - predefineThemeColors: { + predefineThemeColors: { type: Array, - default: () => { - return [ - '#007aff', - '#1aa97b', - '#ff4d53', - '#1890FF', - '#DF0E1B', - '#0086CC', - '#2B74CF', - '#00BC9D', - '#ED7D32' - ] - } + default: () => predefineColors } }, data () { diff --git a/data-room-ui/packages/BasicComponents/DateTimePicker/setting.vue b/data-room-ui/packages/BasicComponents/DateTimePicker/setting.vue index 2cccb2ca..2953e376 100644 --- a/data-room-ui/packages/BasicComponents/DateTimePicker/setting.vue +++ b/data-room-ui/packages/BasicComponents/DateTimePicker/setting.vue @@ -244,21 +244,9 @@ export default { type: Object, required: true }, - predefineThemeColors: { + predefineThemeColors: { type: Array, - default: () => { - return [ - '#007aff', - '#1aa97b', - '#ff4d53', - '#1890FF', - '#DF0E1B', - '#0086CC', - '#2B74CF', - '#00BC9D', - '#ED7D32' - ] - } + default: () => predefineColors } }, diff --git a/data-room-ui/packages/BasicComponents/DigitalFlop/setting.vue b/data-room-ui/packages/BasicComponents/DigitalFlop/setting.vue index 0933ee49..d2843c9b 100644 --- a/data-room-ui/packages/BasicComponents/DigitalFlop/setting.vue +++ b/data-room-ui/packages/BasicComponents/DigitalFlop/setting.vue @@ -177,17 +177,7 @@ export default { data () { return { // 预设主题色 - predefineThemeColors: [ - '#007aff', - '#1aa97b', - '#ff4d53', - '#1890FF', - '#DF0E1B', - '#0086CC', - '#2B74CF', - '#00BC9D', - '#ED7D32' - ] + predefineThemeColors: predefineColors } }, computed: { diff --git a/data-room-ui/packages/BasicComponents/FlyMap/setting.vue b/data-room-ui/packages/BasicComponents/FlyMap/setting.vue index 5d456ed5..c3783d4e 100644 --- a/data-room-ui/packages/BasicComponents/FlyMap/setting.vue +++ b/data-room-ui/packages/BasicComponents/FlyMap/setting.vue @@ -369,17 +369,7 @@ export default { mapTree: [], mapList: [], currentMap: {}, - predefineThemeColors: [ - '#007aff', - '#1aa97b', - '#ff4d53', - '#1890FF', - '#DF0E1B', - '#0086CC', - '#2B74CF', - '#00BC9D', - '#ED7D32' - ], + predefineThemeColors: predefineColors, symbolList:[ { name:'箭头', diff --git a/data-room-ui/packages/BasicComponents/HorizontalLine/setting.vue b/data-room-ui/packages/BasicComponents/HorizontalLine/setting.vue index af80c4b7..1a0fa7a3 100644 --- a/data-room-ui/packages/BasicComponents/HorizontalLine/setting.vue +++ b/data-room-ui/packages/BasicComponents/HorizontalLine/setting.vue @@ -109,21 +109,9 @@ export default { type: Object, required: true }, - predefineThemeColors: { + predefineThemeColors: { type: Array, - default: () => { - return [ - '#007aff', - '#1aa97b', - '#ff4d53', - '#1890FF', - '#DF0E1B', - '#0086CC', - '#2B74CF', - '#00BC9D', - '#ED7D32' - ] - } + default: () => predefineColors } }, data () { diff --git a/data-room-ui/packages/BasicComponents/IndexCard/setting.vue b/data-room-ui/packages/BasicComponents/IndexCard/setting.vue index b3dd79b8..ace44f3e 100644 --- a/data-room-ui/packages/BasicComponents/IndexCard/setting.vue +++ b/data-room-ui/packages/BasicComponents/IndexCard/setting.vue @@ -265,17 +265,7 @@ export default { } ], // 预设主题色 - predefineThemeColors: [ - '#007aff', - '#1aa97b', - '#ff4d53', - '#1890FF', - '#DF0E1B', - '#0086CC', - '#2B74CF', - '#00BC9D', - '#ED7D32' - ] + predefineThemeColors: predefineColors } }, computed: { diff --git a/data-room-ui/packages/BasicComponents/IndexCard2/setting.vue b/data-room-ui/packages/BasicComponents/IndexCard2/setting.vue index 3d680fdc..8e4c5f4d 100644 --- a/data-room-ui/packages/BasicComponents/IndexCard2/setting.vue +++ b/data-room-ui/packages/BasicComponents/IndexCard2/setting.vue @@ -265,17 +265,7 @@ export default { } ], // 预设主题色 - predefineThemeColors: [ - '#007aff', - '#1aa97b', - '#ff4d53', - '#1890FF', - '#DF0E1B', - '#0086CC', - '#2B74CF', - '#00BC9D', - '#ED7D32' - ] + predefineThemeColors: predefineColors } }, computed: { diff --git a/data-room-ui/packages/BasicComponents/IndicatorCard/setting.vue b/data-room-ui/packages/BasicComponents/IndicatorCard/setting.vue index a970c615..c23818d8 100644 --- a/data-room-ui/packages/BasicComponents/IndicatorCard/setting.vue +++ b/data-room-ui/packages/BasicComponents/IndicatorCard/setting.vue @@ -238,17 +238,7 @@ export default { } ], // 预设主题色 - predefineThemeColors: [ - '#007aff', - '#1aa97b', - '#ff4d53', - '#1890FF', - '#DF0E1B', - '#0086CC', - '#2B74CF', - '#00BC9D', - '#ED7D32' - ] + predefineThemeColors: predefineColors } }, computed: { diff --git a/data-room-ui/packages/BasicComponents/IndicatorCard2/setting.vue b/data-room-ui/packages/BasicComponents/IndicatorCard2/setting.vue index a970c615..c23818d8 100644 --- a/data-room-ui/packages/BasicComponents/IndicatorCard2/setting.vue +++ b/data-room-ui/packages/BasicComponents/IndicatorCard2/setting.vue @@ -238,17 +238,7 @@ export default { } ], // 预设主题色 - predefineThemeColors: [ - '#007aff', - '#1aa97b', - '#ff4d53', - '#1890FF', - '#DF0E1B', - '#0086CC', - '#2B74CF', - '#00BC9D', - '#ED7D32' - ] + predefineThemeColors: predefineColors } }, computed: { diff --git a/data-room-ui/packages/BasicComponents/Input/setting.vue b/data-room-ui/packages/BasicComponents/Input/setting.vue index dd5fcf79..08c4a9ef 100644 --- a/data-room-ui/packages/BasicComponents/Input/setting.vue +++ b/data-room-ui/packages/BasicComponents/Input/setting.vue @@ -207,21 +207,9 @@ export default { type: Object, required: true }, - predefineThemeColors: { + predefineThemeColors: { type: Array, - default: () => { - return [ - '#007aff', - '#1aa97b', - '#ff4d53', - '#1890FF', - '#DF0E1B', - '#0086CC', - '#2B74CF', - '#00BC9D', - '#ED7D32' - ] - } + default: () => predefineColors } }, data () { diff --git a/data-room-ui/packages/BasicComponents/Map/setting.vue b/data-room-ui/packages/BasicComponents/Map/setting.vue index ca805f03..05ca3e15 100644 --- a/data-room-ui/packages/BasicComponents/Map/setting.vue +++ b/data-room-ui/packages/BasicComponents/Map/setting.vue @@ -343,17 +343,7 @@ export default { data () { return { mapList: [], - predefineThemeColors: [ - '#007aff', - '#1aa97b', - '#ff4d53', - '#1890FF', - '#DF0E1B', - '#0086CC', - '#2B74CF', - '#00BC9D', - '#ED7D32' - ], + predefineThemeColors: predefineColors, mapTree: [], currentMap: {}, levelList: [ diff --git a/data-room-ui/packages/BasicComponents/Marquee/setting.vue b/data-room-ui/packages/BasicComponents/Marquee/setting.vue index 17ac4f6e..2b0124f2 100644 --- a/data-room-ui/packages/BasicComponents/Marquee/setting.vue +++ b/data-room-ui/packages/BasicComponents/Marquee/setting.vue @@ -342,17 +342,7 @@ export default { }, data () { return { - predefineThemeColors: [ - '#007aff', - '#1aa97b', - '#ff4d53', - '#1890FF', - '#DF0E1B', - '#0086CC', - '#2B74CF', - '#00BC9D', - '#ED7D32' - ], + predefineThemeColors: predefineColors, directionList: [ { value: 'right', diff --git a/data-room-ui/packages/BasicComponents/ScreenScrollBoard/setting.vue b/data-room-ui/packages/BasicComponents/ScreenScrollBoard/setting.vue index 2ff4d702..86c9ff1d 100644 --- a/data-room-ui/packages/BasicComponents/ScreenScrollBoard/setting.vue +++ b/data-room-ui/packages/BasicComponents/ScreenScrollBoard/setting.vue @@ -141,17 +141,7 @@ export default { data () { return { // 预设主题色 - predefineThemeColors: [ - '#007aff', - '#1aa97b', - '#ff4d53', - '#1890FF', - '#DF0E1B', - '#0086CC', - '#2B74CF', - '#00BC9D', - '#ED7D32' - ] + predefineThemeColors: predefineColors } }, computed: { diff --git a/data-room-ui/packages/BasicComponents/ScreenScrollRanking/setting.vue b/data-room-ui/packages/BasicComponents/ScreenScrollRanking/setting.vue index d4f349b8..640b8571 100644 --- a/data-room-ui/packages/BasicComponents/ScreenScrollRanking/setting.vue +++ b/data-room-ui/packages/BasicComponents/ScreenScrollRanking/setting.vue @@ -88,6 +88,7 @@ import SettingTitle from 'data-room-ui/SettingTitle/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: 'BarSetting', components: { @@ -99,17 +100,7 @@ export default { data () { return { // 预设主题色 - predefineThemeColors: [ - '#007aff', - '#1aa97b', - '#ff4d53', - '#1890FF', - '#DF0E1B', - '#0086CC', - '#2B74CF', - '#00BC9D', - '#ED7D32' - ] + predefineThemeColors: predefineColors } }, computed: { diff --git a/data-room-ui/packages/BasicComponents/Select/setting.vue b/data-room-ui/packages/BasicComponents/Select/setting.vue index 94046918..683887d7 100644 --- a/data-room-ui/packages/BasicComponents/Select/setting.vue +++ b/data-room-ui/packages/BasicComponents/Select/setting.vue @@ -108,21 +108,9 @@ export default { type: Object, required: true }, - predefineThemeColors: { + predefineThemeColors: { type: Array, - default: () => { - return [ - '#007aff', - '#1aa97b', - '#ff4d53', - '#1890FF', - '#DF0E1B', - '#0086CC', - '#2B74CF', - '#00BC9D', - '#ED7D32' - ] - } + default: () => predefineColors } }, data () { diff --git a/data-room-ui/packages/BasicComponents/Tables/setting.vue b/data-room-ui/packages/BasicComponents/Tables/setting.vue index 5a8248c9..7708cd33 100644 --- a/data-room-ui/packages/BasicComponents/Tables/setting.vue +++ b/data-room-ui/packages/BasicComponents/Tables/setting.vue @@ -126,17 +126,7 @@ export default { mixins: [chartSettingMixins], data () { return { - predefineThemeColors: [ - '#007aff', - '#1aa97b', - '#ff4d53', - '#1890FF', - '#DF0E1B', - '#0086CC', - '#2B74CF', - '#00BC9D', - '#ED7D32' - ] + predefineThemeColors: predefineColors } }, computed: { diff --git a/data-room-ui/packages/BasicComponents/TimePicker/setting.vue b/data-room-ui/packages/BasicComponents/TimePicker/setting.vue index fdecf0f5..93d56416 100644 --- a/data-room-ui/packages/BasicComponents/TimePicker/setting.vue +++ b/data-room-ui/packages/BasicComponents/TimePicker/setting.vue @@ -200,21 +200,9 @@ export default { type: Object, required: true }, - predefineThemeColors: { + predefineThemeColors: { type: Array, - default: () => { - return [ - '#007aff', - '#1aa97b', - '#ff4d53', - '#1890FF', - '#DF0E1B', - '#0086CC', - '#2B74CF', - '#00BC9D', - '#ED7D32' - ] - } + default: () => predefineColors } }, watch: {}, diff --git a/data-room-ui/packages/BasicComponents/VerticalLine/setting.vue b/data-room-ui/packages/BasicComponents/VerticalLine/setting.vue index fc2af370..65ce3250 100644 --- a/data-room-ui/packages/BasicComponents/VerticalLine/setting.vue +++ b/data-room-ui/packages/BasicComponents/VerticalLine/setting.vue @@ -107,21 +107,9 @@ export default { type: Object, required: true }, - predefineThemeColors: { + predefineThemeColors: { type: Array, - default: () => { - return [ - '#007aff', - '#1aa97b', - '#ff4d53', - '#1890FF', - '#DF0E1B', - '#0086CC', - '#2B74CF', - '#00BC9D', - '#ED7D32' - ] - } + default: () => predefineColors } }, data () { diff --git a/data-room-ui/packages/BasicComponents/Video/setting.vue b/data-room-ui/packages/BasicComponents/Video/setting.vue index ad4c38ae..12b066a0 100644 --- a/data-room-ui/packages/BasicComponents/Video/setting.vue +++ b/data-room-ui/packages/BasicComponents/Video/setting.vue @@ -81,6 +81,7 @@ import SettingTitle from 'data-room-ui/SettingTitle/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: { @@ -94,21 +95,9 @@ export default { type: Object, required: true }, - predefineThemeColors: { + predefineThemeColors: { type: Array, - default: () => { - return [ - '#007aff', - '#1aa97b', - '#ff4d53', - '#1890FF', - '#DF0E1B', - '#0086CC', - '#2B74CF', - '#00BC9D', - '#ED7D32' - ] - } + default: () => predefineColors } }, data () { diff --git a/data-room-ui/packages/BigScreenDesign/BorderSetting.vue b/data-room-ui/packages/BigScreenDesign/BorderSetting.vue index 245ba255..7eedcd2e 100644 --- a/data-room-ui/packages/BigScreenDesign/BorderSetting.vue +++ b/data-room-ui/packages/BigScreenDesign/BorderSetting.vue @@ -147,21 +147,9 @@ export default { type: Object, required: true }, - predefineThemeColors: { + predefineThemeColors: { type: Array, - default: () => { - return [ - '#007aff', - '#1aa97b', - '#ff4d53', - '#1890FF', - '#DF0E1B', - '#0086CC', - '#2B74CF', - '#00BC9D', - '#ED7D32' - ] - } + default: () => predefineColors } }, data () { diff --git a/data-room-ui/packages/BigScreenDesign/OverallSetting/index.vue b/data-room-ui/packages/BigScreenDesign/OverallSetting/index.vue index 1610b0c3..8d2a37cd 100644 --- a/data-room-ui/packages/BigScreenDesign/OverallSetting/index.vue +++ b/data-room-ui/packages/BigScreenDesign/OverallSetting/index.vue @@ -189,6 +189,7 @@ import ColorPicker from 'data-room-ui/ColorPicker/index.vue' import BgImg from './BgImgDialog.vue' import { mapState, mapMutations } from 'vuex' import { themeToSetting } from 'data-room-ui/js/utils/themeFormatting' +import {predefineColors} from 'data-room-ui/js/utils/colorList' export default { name: 'OverallSetting', components: { @@ -293,17 +294,7 @@ export default { fitMode: 'none' }, // 预设主题色 - predefineColors: [ - '#007aff', - '#1aa97b', - '#ff4d53', - '#1890FF', - '#DF0E1B', - '#0086CC', - '#2B74CF', - '#00BC9D', - '#ED7D32' - ], + predefineColors, // 图表列表 chartOptions: [] } diff --git a/data-room-ui/packages/Borders/Border1/setting.vue b/data-room-ui/packages/Borders/Border1/setting.vue index fe97823f..85bc92f6 100644 --- a/data-room-ui/packages/Borders/Border1/setting.vue +++ b/data-room-ui/packages/Borders/Border1/setting.vue @@ -12,6 +12,7 @@