diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/BorderColorSetting/index.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/BorderColorSetting/index.vue
index b08881c9..d819ce3c 100644
--- a/data-room-ui/packages/BigScreenDesign/RightSetting/BorderColorSetting/index.vue
+++ b/data-room-ui/packages/BigScreenDesign/RightSetting/BorderColorSetting/index.vue
@@ -4,12 +4,14 @@
@@ -32,11 +34,14 @@ export default {
return {
startColor: '', // 初始颜色
endColor: '', // 终止颜色
- }
+ }
},
computed: {
},
watch: {
+ colors(){
+ this.init()
+ },
startColor () {
this.colorChange()
},
@@ -53,8 +58,8 @@ export default {
this.endColor = this.colors[1]
},
colorChange (val) {
- this.colorsValue = [this.startColor,this.endColor]
- this.$emit('change', this.colorsValue)
+ const colorsValue = [this.startColor,this.endColor]
+ this.$emit('change', colorsValue)
}
}
}
diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/BorderSetting.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/BorderSetting.vue
index 2cae2ec8..2302e549 100644
--- a/data-room-ui/packages/BigScreenDesign/RightSetting/BorderSetting.vue
+++ b/data-room-ui/packages/BigScreenDesign/RightSetting/BorderSetting.vue
@@ -290,7 +290,7 @@ export default {
})
}
}
- },immediate: true
+ }
},
},
computed:{
diff --git a/data-room-ui/packages/BorderComponents/GcBorder1/setting.js b/data-room-ui/packages/BorderComponents/GcBorder1/setting.js
index 2f2e8437..0ab9a4d2 100644
--- a/data-room-ui/packages/BorderComponents/GcBorder1/setting.js
+++ b/data-room-ui/packages/BorderComponents/GcBorder1/setting.js
@@ -91,18 +91,6 @@ const setting = [
}
]
},
- {
- label:'不透明度',
- // 设置组件类型, select / input / colorPicker
- type: 'inputNumber',
- // 字段
- field: 'opacity',
- optionField: 'opacity', // 对应options中的字段
- // 是否多选
- multiple: false,
- // 绑定的值
- value: 100,
- },
]
diff --git a/data-room-ui/packages/BorderComponents/GcBorder10/setting.js b/data-room-ui/packages/BorderComponents/GcBorder10/setting.js
index ebe8c15a..224ea530 100644
--- a/data-room-ui/packages/BorderComponents/GcBorder10/setting.js
+++ b/data-room-ui/packages/BorderComponents/GcBorder10/setting.js
@@ -90,18 +90,6 @@ const setting = [
}
]
},
- {
- label:'不透明度',
- // 设置组件类型, select / input / colorPicker
- type: 'inputNumber',
- // 字段
- field: 'opacity',
- optionField: 'opacity', // 对应options中的字段
- // 是否多选
- multiple: false,
- // 绑定的值
- value: 100,
- },
]
diff --git a/data-room-ui/packages/BorderComponents/GcBorder11/setting.js b/data-room-ui/packages/BorderComponents/GcBorder11/setting.js
index 29172f2c..a575d00c 100644
--- a/data-room-ui/packages/BorderComponents/GcBorder11/setting.js
+++ b/data-room-ui/packages/BorderComponents/GcBorder11/setting.js
@@ -101,18 +101,6 @@ const setting = [
}
]
},
- {
- label:'不透明度',
- // 设置组件类型, select / input / colorPicker
- type: 'inputNumber',
- // 字段
- field: 'opacity',
- optionField: 'opacity', // 对应options中的字段
- // 是否多选
- multiple: false,
- // 绑定的值
- value: 100,
- },
]
diff --git a/data-room-ui/packages/BorderComponents/GcBorder12/setting.js b/data-room-ui/packages/BorderComponents/GcBorder12/setting.js
index 08e34b5d..df9deb21 100644
--- a/data-room-ui/packages/BorderComponents/GcBorder12/setting.js
+++ b/data-room-ui/packages/BorderComponents/GcBorder12/setting.js
@@ -91,18 +91,6 @@ const setting = [
}
]
},
- {
- label:'不透明度',
- // 设置组件类型, select / input / colorPicker
- type: 'inputNumber',
- // 字段
- field: 'opacity',
- optionField: 'opacity', // 对应options中的字段
- // 是否多选
- multiple: false,
- // 绑定的值
- value: 100,
- },
]
diff --git a/data-room-ui/packages/BorderComponents/GcBorder13/setting.js b/data-room-ui/packages/BorderComponents/GcBorder13/setting.js
index 59cb5f88..2298e1a1 100644
--- a/data-room-ui/packages/BorderComponents/GcBorder13/setting.js
+++ b/data-room-ui/packages/BorderComponents/GcBorder13/setting.js
@@ -90,18 +90,6 @@ const setting = [
}
]
},
- {
- label:'不透明度',
- // 设置组件类型, select / input / colorPicker
- type: 'inputNumber',
- // 字段
- field: 'opacity',
- optionField: 'opacity', // 对应options中的字段
- // 是否多选
- multiple: false,
- // 绑定的值
- value: 100,
- },
]
diff --git a/data-room-ui/packages/BorderComponents/GcBorder14/index.vue b/data-room-ui/packages/BorderComponents/GcBorder14/index.vue
index 8ce4cd69..7cd9caf3 100644
--- a/data-room-ui/packages/BorderComponents/GcBorder14/index.vue
+++ b/data-room-ui/packages/BorderComponents/GcBorder14/index.vue
@@ -61,6 +61,7 @@ export default {
return this.config.border.borderWidth || 2
},
gradientColor0 () {
+ console.log(this.config.border.gradientColor)
if(this.config.border.gradientColor){
return this.config.border.gradientColor[0] ||this.config.border.gradientColor[1]
}else{
@@ -68,6 +69,7 @@ export default {
}
},
gradientColor1 () {
+ console.log(this.config.border.gradientColor)
if(this.config.border.gradientColor){
return this.config.border.gradientColor[1] ||this.config.border.gradientColor[0]
}else{
diff --git a/data-room-ui/packages/BorderComponents/GcBorder14/setting.js b/data-room-ui/packages/BorderComponents/GcBorder14/setting.js
index 2d249fa7..e2dd650b 100644
--- a/data-room-ui/packages/BorderComponents/GcBorder14/setting.js
+++ b/data-room-ui/packages/BorderComponents/GcBorder14/setting.js
@@ -90,18 +90,6 @@ const setting = [
}
]
},
- {
- label:'不透明度',
- // 设置组件类型, select / input / colorPicker
- type: 'inputNumber',
- // 字段
- field: 'opacity',
- optionField: 'opacity', // 对应options中的字段
- // 是否多选
- multiple: false,
- // 绑定的值
- value: 100,
- },
{
label:'左上圆角值',
// 设置组件类型, select / input / colorPicker
diff --git a/data-room-ui/packages/BorderComponents/GcBorder15/index.vue b/data-room-ui/packages/BorderComponents/GcBorder15/index.vue
index ebdbe2b5..14ff0f01 100644
--- a/data-room-ui/packages/BorderComponents/GcBorder15/index.vue
+++ b/data-room-ui/packages/BorderComponents/GcBorder15/index.vue
@@ -73,14 +73,14 @@ export default {
return this.config.border.borderWidth!=null?this.config.border.borderWidth : 2
},
gradientColor0 () {
- if(this.config.border.gradientColor){
+ if(this.config.border.gradientColor){
return this.config.border.gradientColor[0] ||this.config.border.gradientColor[1]
}else{
return 'transparent'
}
},
gradientColor1 () {
- if(this.config.border.gradientColor){
+ if(this.config.border.gradientColor){
return this.config.border.gradientColor[1] ||this.config.border.gradientColor[0]
}else{
return 'transparent'
diff --git a/data-room-ui/packages/BorderComponents/GcBorder2/setting.js b/data-room-ui/packages/BorderComponents/GcBorder2/setting.js
index bd7d2f10..37e0468a 100644
--- a/data-room-ui/packages/BorderComponents/GcBorder2/setting.js
+++ b/data-room-ui/packages/BorderComponents/GcBorder2/setting.js
@@ -89,18 +89,6 @@ const setting = [
}
]
},
- {
- label:'不透明度',
- // 设置组件类型, select / input / colorPicker
- type: 'inputNumber',
- // 字段
- field: 'opacity',
- optionField: 'opacity', // 对应options中的字段
- // 是否多选
- multiple: false,
- // 绑定的值
- value: 100,
- },
]
diff --git a/data-room-ui/packages/BorderComponents/GcBorder3/setting.js b/data-room-ui/packages/BorderComponents/GcBorder3/setting.js
index 79a59f93..0709432f 100644
--- a/data-room-ui/packages/BorderComponents/GcBorder3/setting.js
+++ b/data-room-ui/packages/BorderComponents/GcBorder3/setting.js
@@ -90,18 +90,6 @@ const setting = [
}
]
},
- {
- label:'不透明度',
- // 设置组件类型, select / input / colorPicker
- type: 'inputNumber',
- // 字段
- field: 'opacity',
- optionField: 'opacity', // 对应options中的字段
- // 是否多选
- multiple: false,
- // 绑定的值
- value: 100,
- },
]
diff --git a/data-room-ui/packages/BorderComponents/GcBorder4/setting.js b/data-room-ui/packages/BorderComponents/GcBorder4/setting.js
index 0da48eed..5e291ee1 100644
--- a/data-room-ui/packages/BorderComponents/GcBorder4/setting.js
+++ b/data-room-ui/packages/BorderComponents/GcBorder4/setting.js
@@ -90,18 +90,6 @@ const setting = [
}
]
},
- {
- label:'不透明度',
- // 设置组件类型, select / input / colorPicker
- type: 'inputNumber',
- // 字段
- field: 'opacity',
- optionField: 'opacity', // 对应options中的字段
- // 是否多选
- multiple: false,
- // 绑定的值
- value: 100,
- },
{
label:'翻转形态',
// 设置组件类型, select / input / colorPicker
diff --git a/data-room-ui/packages/BorderComponents/GcBorder5/setting.js b/data-room-ui/packages/BorderComponents/GcBorder5/setting.js
index 4b88479e..9e3a37df 100644
--- a/data-room-ui/packages/BorderComponents/GcBorder5/setting.js
+++ b/data-room-ui/packages/BorderComponents/GcBorder5/setting.js
@@ -90,18 +90,6 @@ const setting = [
}
]
},
- {
- label:'不透明度',
- // 设置组件类型, select / input / colorPicker
- type: 'inputNumber',
- // 字段
- field: 'opacity',
- optionField: 'opacity', // 对应options中的字段
- // 是否多选
- multiple: false,
- // 绑定的值
- value: 100,
- },
{
label:'翻转形态',
// 设置组件类型, select / input / colorPicker
diff --git a/data-room-ui/packages/BorderComponents/GcBorder6/setting.js b/data-room-ui/packages/BorderComponents/GcBorder6/setting.js
index 45ce0c62..3deb2996 100644
--- a/data-room-ui/packages/BorderComponents/GcBorder6/setting.js
+++ b/data-room-ui/packages/BorderComponents/GcBorder6/setting.js
@@ -90,18 +90,6 @@ const setting = [
}
]
},
- {
- label:'不透明度',
- // 设置组件类型, select / input / colorPicker
- type: 'inputNumber',
- // 字段
- field: 'opacity',
- optionField: 'opacity', // 对应options中的字段
- // 是否多选
- multiple: false,
- // 绑定的值
- value: 100,
- },
]
diff --git a/data-room-ui/packages/BorderComponents/GcBorder7/setting.js b/data-room-ui/packages/BorderComponents/GcBorder7/setting.js
index 98595272..ce726655 100644
--- a/data-room-ui/packages/BorderComponents/GcBorder7/setting.js
+++ b/data-room-ui/packages/BorderComponents/GcBorder7/setting.js
@@ -90,18 +90,6 @@ const setting = [
}
]
},
- {
- label:'不透明度',
- // 设置组件类型, select / input / colorPicker
- type: 'inputNumber',
- // 字段
- field: 'opacity',
- optionField: 'opacity', // 对应options中的字段
- // 是否多选
- multiple: false,
- // 绑定的值
- value: 100,
- },
]
diff --git a/data-room-ui/packages/BorderComponents/GcBorder8/setting.js b/data-room-ui/packages/BorderComponents/GcBorder8/setting.js
index a89e9c63..01def878 100644
--- a/data-room-ui/packages/BorderComponents/GcBorder8/setting.js
+++ b/data-room-ui/packages/BorderComponents/GcBorder8/setting.js
@@ -90,18 +90,6 @@ const setting = [
}
]
},
- {
- label:'不透明度',
- // 设置组件类型, select / input / colorPicker
- type: 'inputNumber',
- // 字段
- field: 'opacity',
- optionField: 'opacity', // 对应options中的字段
- // 是否多选
- multiple: false,
- // 绑定的值
- value: 100,
- },
{
label:'翻转形态',
// 设置组件类型, select / input / colorPicker
diff --git a/data-room-ui/packages/BorderComponents/GcBorder9/setting.js b/data-room-ui/packages/BorderComponents/GcBorder9/setting.js
index 76e3b0d9..f257ce06 100644
--- a/data-room-ui/packages/BorderComponents/GcBorder9/setting.js
+++ b/data-room-ui/packages/BorderComponents/GcBorder9/setting.js
@@ -90,18 +90,6 @@ const setting = [
}
]
},
- {
- label:'不透明度',
- // 设置组件类型, select / input / colorPicker
- type: 'inputNumber',
- // 字段
- field: 'opacity',
- optionField: 'opacity', // 对应options中的字段
- // 是否多选
- multiple: false,
- // 绑定的值
- value: 100,
- },
]
diff --git a/data-room-ui/packages/G2Plots/plotList.js b/data-room-ui/packages/G2Plots/plotList.js
index ced1c2d8..18f7595c 100644
--- a/data-room-ui/packages/G2Plots/plotList.js
+++ b/data-room-ui/packages/G2Plots/plotList.js
@@ -32,7 +32,7 @@ function getPlotList (files) {
category: configMapKey,
name: config.name,
title: config.title,
- border: { type: '', titleHeight: 100, fontSize: 30, isTitle: true, padding: [16, 16, 16, 16] },
+ border:{ type: '', titleHeight: 60, fontSize: 30, isTitle: true, padding: [16, 16, 16, 16] },
icon: null,
img: require(`../G2Plots/images/componentLogo/${config.title}.png`),
className:
@@ -66,7 +66,7 @@ export function getCustomPlots () {
category: config.category,
name: config.name,
title: config.title,
- border: { type: '', titleHeight: 100, fontSize: 30, isTitle: true, padding: [16, 16, 16, 16] },
+ border:{ type: '', titleHeight: 60, fontSize: 30, isTitle: true, padding: [16, 16, 16, 16] },
icon: null,
img: config.img,
className: