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

fix:bug修复，功能优化

Browse Source
main
liu.tao3 2 years ago
parent 7f01fc4191
commit 510731cb3d
31 changed files with 179 additions and 94 deletions
Show Stats Download Patch File Download Diff File

2
data-room-ui/packages/BasicComponents/FlyMap/settingConfig.js
Unescape Escape View File

@ -110,7 +110,7 @@ export const FlyMapData = {
name: '飞线图', name: '飞线图',
title: '飞线图', title: '飞线图',
icon: Icon.getNameList()[18], icon: Icon.getNameList()[18],
border:{type:'',titleHeight:60,fontSize:30,isTitle:true,padding:[0,0,0,0]}, border:{type:'',titleHeight:60,fontSize:16,isTitle:true,padding:[0,0,0,0]},
className: className:
'com.gccloud.dataroom.core.module.chart.components.ScreenFlyMapChart', 'com.gccloud.dataroom.core.module.chart.components.ScreenFlyMapChart',
w: 800, w: 800,

2
data-room-ui/packages/BasicComponents/Map/settingConfig.js
Unescape Escape View File

@ -102,7 +102,7 @@ export const mapData = {
name: '地图', name: '地图',
title: '地图', title: '地图',
icon: Icon.getNameList()[5], icon: Icon.getNameList()[5],
border:{type:'',titleHeight:60,fontSize:30,isTitle:true,padding:[0,0,0,0]}, border:{type:'',titleHeight:60,fontSize:16,isTitle:true,padding:[0,0,0,0]},
className: className:
'com.gccloud.dataroom.core.module.chart.components.ScreenMapChart', 'com.gccloud.dataroom.core.module.chart.components.ScreenMapChart',
w: 800, w: 800,

18
data-room-ui/packages/BigScreenDesign/ComponentDialog/index.vue
Unescape Escape View File

@ -140,15 +140,6 @@
> >
<div class="big-screen-list-wrap"> <div class="big-screen-list-wrap">
<div class="top-search-wrap"> <div class="top-search-wrap">
<el-input
v-model="name"
class="bs-el-input"
placeholder="请输入组件名称"
prefix-icon="el-icon-search"
clearable
@clear="reSearch"
@keyup.enter.native="reSearch"
/>
<el-select <el-select
v-model="code" v-model="code"
class="bs-el-select" class="bs-el-select"
@ -164,6 +155,15 @@
:value="item.code" :value="item.code"
/> />
</el-select> </el-select>
<el-input
v-model="name"
class="bs-el-input"
placeholder="请输入组件名称"
prefix-icon="el-icon-search"
clearable
@clear="reSearch"
@keyup.enter.native="reSearch"
/>
<el-button <el-button
size="small" size="small"
type="primary" type="primary"

2
data-room-ui/packages/BigScreenDesign/RightSetting/BorderColorSetting/index.vue
Unescape Escape View File

@ -58,7 +58,7 @@ export default {
this.endColor = this.colors[1] this.endColor = this.colors[1]
}, },
colorChange (val) { colorChange (val) {
const colorsValue = [this.startColor,this.endColor] const colorsValue = (this.startColor||this.endColor)?[this.startColor,this.endColor]:[]
this.$emit('change', colorsValue) this.$emit('change', colorsValue)
} }
} }

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

@ -119,6 +119,19 @@
show-alpha show-alpha
/> />
</el-form-item> </el-form-item>
<!-- <el-form-item
v-if="config.type=='GcBorder15'"
:label-width="labelWidth"
label="外侧边框线宽度"
>
<el-input-number
v-model="borderWidth"
class="bs-el-input-number"
:step="1"
:min="0"
:max="100000"
/>
</el-form-item> -->
<div <div
v-for="(setting, settingIndex) in list.setting" v-for="(setting, settingIndex) in list.setting"
:key="settingIndex+1" :key="settingIndex+1"
@ -272,8 +285,13 @@ export default {
} }
}, },
watch:{ watch:{
// borderWidth:{
// handler (val) {
// this.config.borderWidth=val
// }
// },
'config.type':{ 'config.type':{
handler () { handler (val) {
this.config.isTitle=this.list.isTitle this.config.isTitle=this.list.isTitle
plotList[Symbol.iterator]=function*(){ plotList[Symbol.iterator]=function*(){
let keys=Object.keys(plotList) let keys=Object.keys(plotList)
@ -282,11 +300,12 @@ export default {
} }
} }
for(let [key,value] of plotList){ for(let [key,value] of plotList){
if(value.padding&&val==value.type){
this.config.padding=[...value.padding]
}
if(value.type==this.config.type){ if(value.type==this.config.type){
value.setting.forEach((item)=>{ value.setting.forEach((item)=>{
if(item.value){ this.$set(this.config,item.field,item.value)
this.config[item.field]=item.value? item.value:this.config[item.field]
}
}) })
} }
} }
@ -297,6 +316,7 @@ export default {
title:{ title:{
set(){ set(){
this.config.type='' this.config.type=''
this.config.padding=[16,16,16,16]
}, },
get(){ get(){
plotList[Symbol.iterator]=function*(){ plotList[Symbol.iterator]=function*(){
@ -332,9 +352,13 @@ export default {
}, },
data () { data () {
return { return {
// borderWidth:0
} }
}, },
mounted () { mounted () {
// if(this.config.borderWidth){
// this.borderWidth=this.config.borderWidth
// }
}, },
methods: { methods: {
init(){ init(){

15
data-room-ui/packages/BigScreenDesign/index.vue
Unescape Escape View File

@ -205,6 +205,15 @@ export default {
} }
}, },
watch: { watch: {
chartList(val){
// console.log(val,this.activeCode)
// if(val.findIndex(item=>item.code==this.activeCode)==-1){
// this.updateRightVisiable(false)
// }
// if(val.length==0){
// this.updateRightVisiable(false)
// }
},
fitZoom (zoom) { fitZoom (zoom) {
this.zoomList[0] = { this.zoomList[0] = {
label: `自适应(${zoom}%)`, label: `自适应(${zoom}%)`,
@ -252,7 +261,9 @@ export default {
} }
}, },
mounted () { mounted () {
EventBus.$on('closeRightPanel', () => { this.rightVisiable = false }) EventBus.$on('closeRightPanel', () => {
this.updateRightVisiable(false)
})
}, },
beforeDestroy () { beforeDestroy () {
this.clearTimeline() this.clearTimeline()
@ -298,7 +309,7 @@ export default {
getScreenInfo(component.code).then(res => { getScreenInfo(component.code).then(res => {
res.chartList.forEach((item) => { res.chartList.forEach((item) => {
if (!item.border) { if (!item.border) {
item.border={type:'',titleHeight:60,fontSize:30,isTitle:true,padding:[0,0,0,0]} item.border={type:'',titleHeight:60,fontSize:16,isTitle:true,padding:[0,0,0,0]}
} }
if(!item.border.padding){ if(!item.border.padding){
item.border.padding=[0,0,0,0] item.border.padding=[0,0,0,0]

11
data-room-ui/packages/BorderComponents/GcBorder1/setting.js
Unescape Escape View File

@ -1,9 +1,11 @@
const type = 'GcBorder1' const type = 'GcBorder1'
const name = '边框一' const name = '边框1'
const isTitle=false const isTitle = false
const padding =[16,16,16,16]
// 右侧配置项 // 右侧配置项
const setting = [ const setting = [
@ -43,7 +45,7 @@ const setting = [
// 是否多选 // 是否多选
multiple: false, multiple: false,
// 绑定的值 // 绑定的值
value: '', value: [],
}, },
{ {
label: '渐变色方向', label: '渐变色方向',
@ -102,5 +104,6 @@ export default {
setting, setting,
type, type,
name, name,
isTitle isTitle,
padding
} }

9
data-room-ui/packages/BorderComponents/GcBorder10/setting.js
Unescape Escape View File

@ -1,7 +1,9 @@
const type = 'GcBorder10' const type = 'GcBorder10'
const name = '边框十' const name = '边框10'
const padding =[16,16,16,16]
const isTitle=false const isTitle=false
// 右侧配置项 // 右侧配置项
@ -42,7 +44,7 @@ const setting = [
// 是否多选 // 是否多选
multiple: false, multiple: false,
// 绑定的值 // 绑定的值
value: '', value: [],
}, },
{ {
label: '渐变色方向', label: '渐变色方向',
@ -101,5 +103,6 @@ export default {
setting, setting,
type, type,
name, name,
isTitle isTitle,
padding
} }

9
data-room-ui/packages/BorderComponents/GcBorder11/setting.js
Unescape Escape View File

@ -1,7 +1,9 @@
const type = 'GcBorder11' const type = 'GcBorder11'
const name = '边框十一' const name = '边框11'
const padding =[36,16,16,16]
const isTitle=true const isTitle=true
// 右侧配置项 // 右侧配置项
@ -53,7 +55,7 @@ const setting = [
// 是否多选 // 是否多选
multiple: false, multiple: false,
// 绑定的值 // 绑定的值
value: '', value: [],
}, },
{ {
label: '渐变色方向', label: '渐变色方向',
@ -111,5 +113,6 @@ export default {
setting, setting,
type, type,
name, name,
isTitle isTitle,
padding
} }

9
data-room-ui/packages/BorderComponents/GcBorder12/setting.js
Unescape Escape View File

@ -1,7 +1,9 @@
const type = 'GcBorder12' const type = 'GcBorder12'
const name = '边框十二' const name = '边框12'
const padding =[16,16,16,16]
const isTitle=false const isTitle=false
@ -43,7 +45,7 @@ const setting = [
// 是否多选 // 是否多选
multiple: false, multiple: false,
// 绑定的值 // 绑定的值
value: '', value: [],
}, },
{ {
label: '渐变色方向', label: '渐变色方向',
@ -102,5 +104,6 @@ export default {
setting, setting,
type, type,
name, name,
isTitle isTitle,
padding
} }

9
data-room-ui/packages/BorderComponents/GcBorder13/setting.js
Unescape Escape View File

@ -1,7 +1,9 @@
const type = 'GcBorder13' const type = 'GcBorder13'
const name = '边框十三' const name = '边框13'
const padding =[16,16,16,16]
const isTitle=false const isTitle=false
// 右侧配置项 // 右侧配置项
@ -42,7 +44,7 @@ const setting = [
// 是否多选 // 是否多选
multiple: false, multiple: false,
// 绑定的值 // 绑定的值
value: '', value: [],
}, },
{ {
label: '渐变色方向', label: '渐变色方向',
@ -101,5 +103,6 @@ export default {
setting, setting,
type, type,
name, name,
isTitle isTitle,
padding
} }

BIN
data-room-ui/packages/BorderComponents/GcBorder14/component.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 930 B

After

Width:  |  Height:  |  Size: 6.1 KiB

6
data-room-ui/packages/BorderComponents/GcBorder14/index.vue
Unescape Escape View File

@ -60,17 +60,17 @@ export default {
return this.config.border.borderColor || '' return this.config.border.borderColor || ''
}, },
width () { width () {
return this.config.border.borderWidth || 2 return this.config.border.borderWidth || 0
}, },
gradientColor0 () { gradientColor0 () {
if (this.config.border.gradientColor) { if (this.config.border.gradientColor&&this.config.border.gradientColor.length) {
return this.config.border.gradientColor[0] || this.config.border.gradientColor[1] return this.config.border.gradientColor[0] || this.config.border.gradientColor[1]
} else { } else {
return 'transparent' return 'transparent'
} }
}, },
gradientColor1 () { gradientColor1 () {
if (this.config.border.gradientColor) { if (this.config.border.gradientColor&&this.config.border.gradientColor.length) {
return this.config.border.gradientColor[1] || this.config.border.gradientColor[0] return this.config.border.gradientColor[1] || this.config.border.gradientColor[0]
} else { } else {
return 'transparent' return 'transparent'

9
data-room-ui/packages/BorderComponents/GcBorder14/setting.js
Unescape Escape View File

@ -1,7 +1,9 @@
const type = 'GcBorder14' const type = 'GcBorder14'
const name = '边框十四' const name = '边框14'
const padding =[16,16,16,16]
const isTitle=false const isTitle=false
// 右侧配置项 // 右侧配置项
@ -42,7 +44,7 @@ const setting = [
// 是否多选 // 是否多选
multiple: false, multiple: false,
// 绑定的值 // 绑定的值
value: '', value: ['#83bff6','#188df0'],
}, },
{ {
label: '渐变色方向', label: '渐变色方向',
@ -152,5 +154,6 @@ export default {
setting, setting,
type, type,
name, name,
isTitle isTitle,
padding
} }

BIN
data-room-ui/packages/BorderComponents/GcBorder15/component.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 930 B

After

Width:  |  Height:  |  Size: 1.7 KiB

14
data-room-ui/packages/BorderComponents/GcBorder15/index.vue
Unescape Escape View File

@ -22,7 +22,7 @@
:style="` :style="`
line-height:${config.border.titleHeight}px; line-height:${config.border.titleHeight}px;
height:${config.border.titleHeight}; height:${config.border.titleHeight};
border-bottom:3px solid ${fontBottomColor}; border-bottom:${fontBottomColor?3:0}px solid ${fontBottomColor};
background-image: linear-gradient(${gradientDirection}, ${ background-image: linear-gradient(${gradientDirection}, ${
fontGradientColor0 ? fontGradientColor0 : fontGradientColor1 fontGradientColor0 ? fontGradientColor0 : fontGradientColor1
} , ${fontGradientColor1 ? fontGradientColor1 : fontGradientColor0}) } , ${fontGradientColor1 ? fontGradientColor1 : fontGradientColor0})
@ -70,31 +70,31 @@ export default {
return this.config.border.borderColor || '' return this.config.border.borderColor || ''
}, },
width () { width () {
return this.config.border.borderWidth!=null?this.config.border.borderWidth : 2 return this.config.border.borderWidth!=null?this.config.border.borderWidth : 0
}, },
gradientColor0 () { gradientColor0 () {
if(this.config.border.gradientColor){ if(this.config.border.gradientColor&&this.config.border.gradientColor.length){
return this.config.border.gradientColor[0] ||this.config.border.gradientColor[1] return this.config.border.gradientColor[0] ||this.config.border.gradientColor[1]
}else{ }else{
return 'transparent' return 'transparent'
} }
}, },
gradientColor1 () { gradientColor1 () {
if(this.config.border.gradientColor){ if(this.config.border.gradientColor&&this.config.border.gradientColor.length){
return this.config.border.gradientColor[1] ||this.config.border.gradientColor[0] return this.config.border.gradientColor[1] ||this.config.border.gradientColor[0]
}else{ }else{
return 'transparent' return 'transparent'
} }
}, },
fontGradientColor0 () { fontGradientColor0 () {
if(this.config.border.fontGradientColor){ if(this.config.border.fontGradientColor&&this.config.border.fontGradientColor.length){
return this.config.border.fontGradientColor[0] ||this.config.border.fontGradientColor[1] return this.config.border.fontGradientColor[0] ||this.config.border.fontGradientColor[1]
}else{ }else{
return 'transparent' return 'transparent'
} }
}, },
fontGradientColor1 () { fontGradientColor1 () {
if(this.config.border.fontGradientColor){ if(this.config.border.fontGradientColor&&this.config.border.fontGradientColor.length){
return this.config.border.fontGradientColor[1]||this.config.border.fontGradientColor[0] return this.config.border.fontGradientColor[1]||this.config.border.fontGradientColor[0]
}else{ }else{
return 'transparent' return 'transparent'
@ -107,7 +107,7 @@ export default {
return this.config.border.fontBottomColor || '' return this.config.border.fontBottomColor || ''
}, },
fontLeftWidth(){ fontLeftWidth(){
return this.config.border.fontLeftWidth!=null?this.config.border.fontLeftWidth : 6 return this.config.border.fontLeftWidth || 6
}, },
radiusLeftTop () { radiusLeftTop () {
return this.config.border.radiusLeftTop || 2 return this.config.border.radiusLeftTop || 2

19
data-room-ui/packages/BorderComponents/GcBorder15/setting.js
Unescape Escape View File

@ -1,9 +1,11 @@
const type = 'GcBorder15' const type = 'GcBorder15'
const name = '边框十五' const name = '边框15'
const isTitle=true const isTitle = true
const padding =[0,0,0,0]
// 右侧配置项 // 右侧配置项
const setting = [ const setting = [
@ -17,7 +19,7 @@ const setting = [
// 是否多选 // 是否多选
multiple: false, multiple: false,
// 绑定的值 // 绑定的值
value: '', value: [],
}, },
// 背景色 // 背景色
// { // {
@ -66,7 +68,7 @@ const setting = [
// 是否多选 // 是否多选
multiple: false, multiple: false,
// 绑定的值 // 绑定的值
value: 6, value: 4,
}, },
{ {
label:'标题底部分割线颜色', label:'标题底部分割线颜色',
@ -78,7 +80,7 @@ const setting = [
// 是否多选 // 是否多选
multiple: false, multiple: false,
// 绑定的值 // 绑定的值
value: '#007aff', value: '',
}, },
{ {
label:'外边框线颜色', label:'外边框线颜色',
@ -102,7 +104,7 @@ const setting = [
// 是否多选 // 是否多选
multiple: false, multiple: false,
// 绑定的值 // 绑定的值
value: 1, value: 0,
}, },
{ {
label:'背景色', label:'背景色',
@ -114,7 +116,7 @@ const setting = [
// 是否多选 // 是否多选
multiple: false, multiple: false,
// 绑定的值 // 绑定的值
value: '', value: [],
}, },
// { // {
// label:'背景色一', // label:'背景色一',
@ -248,5 +250,6 @@ export default {
setting, setting,
type, type,
name, name,
isTitle isTitle,
padding
} }

9
data-room-ui/packages/BorderComponents/GcBorder2/setting.js
Unescape Escape View File

@ -1,7 +1,9 @@
const type = 'GcBorder2' const type = 'GcBorder2'
const name = '边框二' const name = '边框2'
const padding =[16,16,16,16]
const isTitle=false const isTitle=false
// 右侧配置项 // 右侧配置项
@ -41,7 +43,7 @@ const setting = [
// 是否多选 // 是否多选
multiple: false, multiple: false,
// 绑定的值 // 绑定的值
value: '', value: [],
}, },
{ {
label: '渐变色方向', label: '渐变色方向',
@ -100,5 +102,6 @@ export default {
setting, setting,
type, type,
name, name,
isTitle isTitle,
padding
} }

9
data-room-ui/packages/BorderComponents/GcBorder3/setting.js
Unescape Escape View File

@ -1,7 +1,9 @@
const type = 'GcBorder3' const type = 'GcBorder3'
const name = '边框三' const name = '边框3'
const padding =[16,16,16,16]
const isTitle=false const isTitle=false
// 右侧配置项 // 右侧配置项
@ -42,7 +44,7 @@ const setting = [
// 是否多选 // 是否多选
multiple: false, multiple: false,
// 绑定的值 // 绑定的值
value: '', value: [],
}, },
{ {
label: '渐变色方向', label: '渐变色方向',
@ -101,5 +103,6 @@ export default {
setting, setting,
type, type,
name, name,
isTitle isTitle,
padding
} }

8
data-room-ui/packages/BorderComponents/GcBorder4/setting.js
Unescape Escape View File

@ -3,7 +3,8 @@ const type = 'GcBorder4'
const isTitle=false const isTitle=false
const name='边框四' const name = '边框4'
const padding =[16,16,16,16]
// 右侧配置项 // 右侧配置项
const setting = [ const setting = [
// 背景色 // 背景色
@ -42,7 +43,7 @@ const setting = [
// 是否多选 // 是否多选
multiple: false, multiple: false,
// 绑定的值 // 绑定的值
value: '', value: [],
}, },
{ {
label: '渐变色方向', label: '渐变色方向',
@ -113,5 +114,6 @@ export default {
setting, setting,
type, type,
name, name,
isTitle isTitle,
padding
} }

9
data-room-ui/packages/BorderComponents/GcBorder5/setting.js
Unescape Escape View File

@ -1,7 +1,9 @@
const type = 'GcBorder5' const type = 'GcBorder5'
const name = '边框五' const name = '边框5'
const padding =[16,16,16,16]
const isTitle=false const isTitle=false
// 右侧配置项 // 右侧配置项
@ -42,7 +44,7 @@ const setting = [
// 是否多选 // 是否多选
multiple: false, multiple: false,
// 绑定的值 // 绑定的值
value: '', value: [],
}, },
{ {
label: '渐变色方向', label: '渐变色方向',
@ -112,5 +114,6 @@ export default {
setting, setting,
type, type,
name, name,
isTitle isTitle,
padding
} }

9
data-room-ui/packages/BorderComponents/GcBorder6/setting.js
Unescape Escape View File

@ -1,7 +1,9 @@
const type = 'GcBorder6' const type = 'GcBorder6'
const name = '边框六' const name = '边框6'
const padding =[16,16,16,16]
const isTitle=false const isTitle=false
// 右侧配置项 // 右侧配置项
@ -42,7 +44,7 @@ const setting = [
// 是否多选 // 是否多选
multiple: false, multiple: false,
// 绑定的值 // 绑定的值
value: '', value: [],
}, },
{ {
label: '渐变色方向', label: '渐变色方向',
@ -100,5 +102,6 @@ export default {
setting, setting,
type, type,
name, name,
isTitle isTitle,
padding
} }

9
data-room-ui/packages/BorderComponents/GcBorder7/setting.js
Unescape Escape View File

@ -1,7 +1,9 @@
const type = 'GcBorder7' const type = 'GcBorder7'
const name = '边框七' const name = '边框7'
const padding =[16,16,16,16]
const isTitle=false const isTitle=false
// 右侧配置项 // 右侧配置项
@ -42,7 +44,7 @@ const setting = [
// 是否多选 // 是否多选
multiple: false, multiple: false,
// 绑定的值 // 绑定的值
value: '', value: [],
}, },
{ {
label: '渐变色方向', label: '渐变色方向',
@ -100,5 +102,6 @@ export default {
setting, setting,
type, type,
name, name,
isTitle isTitle,
padding
} }

9
data-room-ui/packages/BorderComponents/GcBorder8/setting.js
Unescape Escape View File

@ -1,7 +1,9 @@
const type = 'GcBorder8' const type = 'GcBorder8'
const name = '边框八' const name = '边框8'
const padding =[16,16,16,16]
const isTitle=false const isTitle=false
// 右侧配置项 // 右侧配置项
@ -42,7 +44,7 @@ const setting = [
// 是否多选 // 是否多选
multiple: false, multiple: false,
// 绑定的值 // 绑定的值
value: '', value: [],
}, },
{ {
label: '渐变色方向', label: '渐变色方向',
@ -126,5 +128,6 @@ export default {
setting, setting,
type, type,
name, name,
isTitle isTitle,
padding
} }

9
data-room-ui/packages/BorderComponents/GcBorder9/setting.js
Unescape Escape View File

@ -1,7 +1,9 @@
const type = 'GcBorder9' const type = 'GcBorder9'
const name = '边框九' const name = '边框9'
const padding =[16,16,16,16]
const isTitle=false const isTitle=false
// 右侧配置项 // 右侧配置项
@ -42,7 +44,7 @@ const setting = [
// 是否多选 // 是否多选
multiple: false, multiple: false,
// 绑定的值 // 绑定的值
value: '', value: [],
}, },
{ {
label: '渐变色方向', label: '渐变色方向',
@ -100,5 +102,6 @@ export default {
setting, setting,
type, type,
name, name,
isTitle isTitle,
padding
} }

13
data-room-ui/packages/BorderComponents/settingList.js
Unescape Escape View File

@ -5,12 +5,13 @@ const plotList = []
// ./折线图/基础折线图.js // ./折线图/基础折线图.js
// 取到 "基础折线图" // 取到 "基础折线图"
const config = files(key).default const config = files(key).default
plotList.push({ plotList.push({
type: config.type, type: config.type,
setting: config.setting, setting: config.setting,
name: config.name, name: config.name,
isTitle:config.isTitle isTitle: config.isTitle,
}) padding: config.padding
})
}) })
export default plotList export default plotList

3
data-room-ui/packages/BorderSelect/index.vue
Unescape Escape View File

@ -126,6 +126,9 @@ export default {
}, },
mounted () { mounted () {
this.remoteComponentlist = [...borderComponents] this.remoteComponentlist = [...borderComponents]
this.remoteComponentlist.sort((a,b)=>{
return a.title.slice(8) - b.title.slice(8)
})
}, },
methods: { methods: {
getName(title){ getName(title){

4
data-room-ui/packages/G2Plots/plotList.js
Unescape Escape View File

@ -32,7 +32,7 @@ function getPlotList (files) {
category: configMapKey, category: configMapKey,
name: config.name, name: config.name,
title: config.title, title: config.title,
border:{ type: '', titleHeight: 60, fontSize: 30, isTitle: true, padding: [16, 16, 16, 16] }, border:{ type: '', titleHeight: 60, fontSize: 16, isTitle: true, padding: [16, 16, 16, 16] },
icon: null, icon: null,
img: require(`../G2Plots/images/componentLogo/${config.title}.png`), img: require(`../G2Plots/images/componentLogo/${config.title}.png`),
className: className:
@ -66,7 +66,7 @@ export function getCustomPlots () {
category: config.category, category: config.category,
name: config.name, name: config.name,
title: config.title, title: config.title,
border:{ type: '', titleHeight: 60, fontSize: 30, isTitle: true, padding: [16, 16, 16, 16] }, border:{ type: '', titleHeight: 60, fontSize: 16, isTitle: true, padding: [16, 16, 16, 16] },
icon: null, icon: null,
img: config.img, img: config.img,
className: className:

4
data-room-ui/packages/RemoteComponents/remoteComponentsList.js
Unescape Escape View File

@ -32,7 +32,7 @@ export function getRemoteComponents (comList) {
title: config.title, title: config.title,
icon: null, icon: null,
img: config.img, img: config.img,
border:{type:'',titleHeight:60,fontSize:30,isTitle:true,padding:[16,16,16,16]}, border:{type:'',titleHeight:60,fontSize:16,isTitle:true,padding:[16,16,16,16]},
className: className:
'com.gccloud.dataroom.core.module.chart.components.RemoteComponentChart', 'com.gccloud.dataroom.core.module.chart.components.RemoteComponentChart',
w: 450, w: 450,
@ -64,7 +64,7 @@ export function getRemoteComponentConfig (code, name) {
title: name, title: name,
icon: null, icon: null,
img: null, img: null,
border:{type:'',titleHeight:60,fontSize:30,isTitle:true,padding:[16,16,16,16]}, border:{type:'',titleHeight:60,fontSize:16,isTitle:true,padding:[16,16,16,16]},
className: className:
'com.gccloud.dataroom.core.module.chart.components.RemoteComponentChart', 'com.gccloud.dataroom.core.module.chart.components.RemoteComponentChart',
w: 450, w: 450,

2
data-room-ui/packages/js/store/actions.js
Unescape Escape View File

@ -19,7 +19,7 @@ export default {
// 兼容边框配置 // 兼容边框配置
pageInfo.chartList.forEach((item) => { pageInfo.chartList.forEach((item) => {
if (!item.border) { if (!item.border) {
item.border = { type: '', titleHeight: 60, fontSize: 30, isTitle: true, padding: [0, 0, 0, 0] } item.border = { type: '', titleHeight: 60, fontSize: 16, isTitle: true, padding: [0, 0, 0, 0] }
} }
if (!item.border.padding) { if (!item.border.padding) {
item.border.padding = [0, 0, 0, 0] item.border.padding = [0, 0, 0, 0]

10
data-room-ui/packages/js/store/mutations.js
Unescape Escape View File

@ -166,11 +166,13 @@ export default {
} }
// 存储删除后的状态 // 存储删除后的状态
saveTimeLineFunc(state, '删除组件') saveTimeLineFunc(state, '删除组件')
// 删除后，清空当前选中组件 if (state.pageInfo.chartList.findIndex(item=>item.code===state.activeCode)==-1) {
state.activeItemConfig = null state.activeItemConfig = null
state.activeCode = null state.activeCode = null
EventBus.$emit('closeRightPanel')
}
// 发送事件，关闭配置面板 // 发送事件，关闭配置面板
EventBus.$emit('closeRightPanel')
}, },
changePageConfig (state, pageConfig) { changePageConfig (state, pageConfig) {
Vue.set(state.pageInfo, 'pageConfig', cloneDeep(pageConfig)) Vue.set(state.pageInfo, 'pageConfig', cloneDeep(pageConfig))

Write Preview
Loading…
Cancel
Save