diff --git a/data-room-ui/packages/BasicComponents/DigitalFlop/index.vue b/data-room-ui/packages/BasicComponents/DigitalFlop/index.vue index 74578409..de08a48f 100644 --- a/data-room-ui/packages/BasicComponents/DigitalFlop/index.vue +++ b/data-room-ui/packages/BasicComponents/DigitalFlop/index.vue @@ -14,6 +14,7 @@ 'background-color': option.bgColor, 'font-size': option.fontSize + 'px', 'min-width': option.width + 'px', + 'height': option.height + 'px', color: option.color, 'border-radius': option.borderRadius + 'px', 'font-weight': option.fontWeight, @@ -149,6 +150,7 @@ export default { justify-content: center; align-items: center; border: 1px solid rgba(131, 191, 246, 0); + overflow: hidden; } } } diff --git a/data-room-ui/packages/BasicComponents/DigitalFlop/settingConfig.js b/data-room-ui/packages/BasicComponents/DigitalFlop/settingConfig.js index 3d011d69..f161dec6 100644 --- a/data-room-ui/packages/BasicComponents/DigitalFlop/settingConfig.js +++ b/data-room-ui/packages/BasicComponents/DigitalFlop/settingConfig.js @@ -47,7 +47,8 @@ const customConfig = { slotRight: '', marginRight: 20, numberDigits: 5, - placeHolder: '0' + placeHolder: '0', + height: 125 } } export const dataConfig = { diff --git a/data-room-ui/packages/BasicComponents/HorizontalLine/index.vue b/data-room-ui/packages/BasicComponents/HorizontalLine/index.vue index df392e4c..ebc9c7e1 100644 --- a/data-room-ui/packages/BasicComponents/HorizontalLine/index.vue +++ b/data-room-ui/packages/BasicComponents/HorizontalLine/index.vue @@ -8,7 +8,7 @@ class="custom-border-box" :style="{ height: lineHeight + 'px', - opacity: opacity / 100, + opacity: opacity, 'background-image': `linear-gradient(to right, ${ gradientColor0 ? gradientColor0 : gradientColor1 } , ${gradientColor1 ? gradientColor1 : gradientColor0})` diff --git a/data-room-ui/packages/BasicComponents/HorizontalLine/setting.vue b/data-room-ui/packages/BasicComponents/HorizontalLine/setting.vue index 6bf6add3..08b0615f 100644 --- a/data-room-ui/packages/BasicComponents/HorizontalLine/setting.vue +++ b/data-room-ui/packages/BasicComponents/HorizontalLine/setting.vue @@ -57,12 +57,14 @@ label="不透明度" label-width="100px" > - diff --git a/data-room-ui/packages/BasicComponents/Input/index.vue b/data-room-ui/packages/BasicComponents/Input/index.vue index 15115892..8ba9fb33 100644 --- a/data-room-ui/packages/BasicComponents/Input/index.vue +++ b/data-room-ui/packages/BasicComponents/Input/index.vue @@ -48,26 +48,33 @@ export default { data () { return { } }, + watch: { + 'config.customize.value': { + handler (val) { + this.$store.commit('bigScreen/changeActiveItemConfig', { ...this.config, customize: { ...this.config.customize, value: this.config.customize.value } }) + } + } + }, mounted () { this.chartInit() - this.updateComponent() + // this.changeStyle() }, methods: { - updateComponent () { - const input = document.querySelector(`#el-input-${this.config.code}`) + changeStyle (config) { + const input = document.querySelector(`#el-input-${config.code}`) // const inputIcon = input.querySelector(`.${this.config.customize.icon.name}`) - input.style.backgroundColor = this.config.customize.backgroundStyle.backgroundColor - input.style.fontSize = this.config.customize.inputStyle.fontSize + 'px' - input.style.color = this.config.customize.inputStyle.color - input.style.borderColor = this.config.customize.borderStyle.borderColor - input.style.borderWidth = this.config.customize.borderStyle.borderWidth + 'px' - input.style.borderStyle = this.config.customize.borderStyle.borderStyle - input.style.borderRadius = this.config.customize.borderStyle.borderRadius + 'px' + input.style.backgroundColor = config.customize.backgroundStyle.backgroundColor + input.style.fontSize = config.customize.inputStyle.fontSize + 'px' + input.style.color = config.customize.inputStyle.color + input.style.borderColor = config.customize.borderStyle.borderColor + input.style.borderWidth = config.customize.borderStyle.borderWidth + 'px' + input.style.borderStyle = config.customize.borderStyle.borderStyle + input.style.borderRadius = config.customize.borderStyle.borderRadius + 'px' // inputIcon.style.fontSize = this.config.customize.inputStyle.fontSize + 'px' - if (this.config.customize.icon.name) { - const inputIcon = document.querySelector(`.${this.config.customize.icon.name}`) - inputIcon.style.fontSize = this.config.customize.inputStyle.fontSize + 'px' + if (config.customize.icon.name) { + const inputIcon = document.querySelector(`.${config.customize.icon.name}`) + inputIcon.style.fontSize = config.customize.inputStyle.fontSize + 'px' } } } @@ -96,6 +103,8 @@ export default { ::v-deep .el-input__inner { height: 100%; width: 100%; + background-color:#151a26; + border: 1px solid #DCDFE6; } } diff --git a/data-room-ui/packages/BasicComponents/Texts/setting.vue b/data-room-ui/packages/BasicComponents/Texts/setting.vue index 3b04502c..14ac96f0 100644 --- a/data-room-ui/packages/BasicComponents/Texts/setting.vue +++ b/data-room-ui/packages/BasicComponents/Texts/setting.vue @@ -13,8 +13,8 @@ :rules="rules" class="bs-el-form" > - 基础 -
+ 标题 +
+
+ 位置 +
+ +
+ 基础 +
- 位置 -
- -
diff --git a/data-room-ui/packages/BasicComponents/VerticalLine/index.vue b/data-room-ui/packages/BasicComponents/VerticalLine/index.vue index e6978a9f..c8fc666d 100644 --- a/data-room-ui/packages/BasicComponents/VerticalLine/index.vue +++ b/data-room-ui/packages/BasicComponents/VerticalLine/index.vue @@ -8,7 +8,7 @@ class="custom-border-box" :style="{ width: width + 'px', - opacity: opacity / 100, + opacity: opacity, 'background-image': `linear-gradient(to bottom, ${ gradientColor0 ? gradientColor0 : gradientColor1 } , ${gradientColor1 ? gradientColor1 : gradientColor0})` diff --git a/data-room-ui/packages/BasicComponents/VerticalLine/setting.vue b/data-room-ui/packages/BasicComponents/VerticalLine/setting.vue index 9d1257d2..91c6854c 100644 --- a/data-room-ui/packages/BasicComponents/VerticalLine/setting.vue +++ b/data-room-ui/packages/BasicComponents/VerticalLine/setting.vue @@ -57,12 +57,14 @@ label="不透明度" label-width="100px" > - diff --git a/data-room-ui/packages/BasicComponents/Video/index.vue b/data-room-ui/packages/BasicComponents/Video/index.vue index 189b7573..73b12f25 100644 --- a/data-room-ui/packages/BasicComponents/Video/index.vue +++ b/data-room-ui/packages/BasicComponents/Video/index.vue @@ -79,7 +79,10 @@ export default { mounted () {}, methods: { // 由于静态组件没有混入公共函数，所以需要定义一个changeStyle方法，以免报错 - changeStyle () { + changeStyle (config) { + this.videoOptions.sources.type = config.customize.videoType + this.videoOptions.sources.type = config.customize.videoUrl + this.videoOptions.poster = config.customize.posterUrl } } } diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/G2CustomSetting.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/G2CustomSetting.vue index da13665c..13ed4c95 100644 --- a/data-room-ui/packages/BigScreenDesign/RightSetting/G2CustomSetting.vue +++ b/data-room-ui/packages/BigScreenDesign/RightSetting/G2CustomSetting.vue @@ -231,15 +231,15 @@ export default { // 1、原数组，2、修改后的数组只包含custom，3、合并的时候xy的配置必须放在最前面 handler (val) { const setList = [].concat(...val.map(item => item.list)) - const newSetList = [...this.config.setting,...setList] - let newArr = []; //存新数组 - let hash={} - newArr= newSetList.reduce(function (acc, cru,index) { - if (!hash[cru['field']]) { - hash[cru['field']] = { index: index } + const newSetList = [...this.config.setting, ...setList] + let newArr = [] // 存新数组 + const hash = {} + newArr = newSetList.reduce(function (acc, cru, index) { + if (!hash[cru.field]) { + hash[cru.field] = { index: index } acc.push(cru) } else { - acc.splice(hash[cru['field']]['index'], 1, cru) + acc.splice(hash[cru.field].index, 1, cru) } return acc }, [])