From 510731cb3d27e717db533af2fc6d207d8c98d6e0 Mon Sep 17 00:00:00 2001 From: "liu.tao3" Date: Mon, 25 Sep 2023 15:17:55 +0800 Subject: [PATCH] =?UTF-8?q?fix:bug=E4=BF=AE=E5=A4=8D=EF=BC=8C=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BasicComponents/FlyMap/settingConfig.js | 2 +- .../BasicComponents/Map/settingConfig.js | 2 +- .../BigScreenDesign/ComponentDialog/index.vue | 18 +++++----- .../RightSetting/BorderColorSetting/index.vue | 2 +- .../RightSetting/BorderSetting.vue | 32 +++++++++++++++--- .../packages/BigScreenDesign/index.vue | 15 ++++++-- .../BorderComponents/GcBorder1/setting.js | 11 +++--- .../BorderComponents/GcBorder10/setting.js | 9 +++-- .../BorderComponents/GcBorder11/setting.js | 9 +++-- .../BorderComponents/GcBorder12/setting.js | 9 +++-- .../BorderComponents/GcBorder13/setting.js | 9 +++-- .../BorderComponents/GcBorder14/component.png | Bin 930 -> 6282 bytes .../BorderComponents/GcBorder14/index.vue | 6 ++-- .../BorderComponents/GcBorder14/setting.js | 9 +++-- .../BorderComponents/GcBorder15/component.png | Bin 930 -> 1710 bytes .../BorderComponents/GcBorder15/index.vue | 14 ++++---- .../BorderComponents/GcBorder15/setting.js | 19 ++++++----- .../BorderComponents/GcBorder2/setting.js | 9 +++-- .../BorderComponents/GcBorder3/setting.js | 9 +++-- .../BorderComponents/GcBorder4/setting.js | 8 +++-- .../BorderComponents/GcBorder5/setting.js | 9 +++-- .../BorderComponents/GcBorder6/setting.js | 9 +++-- .../BorderComponents/GcBorder7/setting.js | 9 +++-- .../BorderComponents/GcBorder8/setting.js | 9 +++-- .../BorderComponents/GcBorder9/setting.js | 9 +++-- .../packages/BorderComponents/settingList.js | 13 +++---- data-room-ui/packages/BorderSelect/index.vue | 3 ++ data-room-ui/packages/G2Plots/plotList.js | 4 +-- .../RemoteComponents/remoteComponentsList.js | 4 +-- data-room-ui/packages/js/store/actions.js | 2 +- data-room-ui/packages/js/store/mutations.js | 10 +++--- 31 files changed, 179 insertions(+), 94 deletions(-) diff --git a/data-room-ui/packages/BasicComponents/FlyMap/settingConfig.js b/data-room-ui/packages/BasicComponents/FlyMap/settingConfig.js index 0b0a1897..c6c1962f 100644 --- a/data-room-ui/packages/BasicComponents/FlyMap/settingConfig.js +++ b/data-room-ui/packages/BasicComponents/FlyMap/settingConfig.js @@ -110,7 +110,7 @@ export const FlyMapData = { name: '飞线图', title: '飞线图', 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: 'com.gccloud.dataroom.core.module.chart.components.ScreenFlyMapChart', w: 800, diff --git a/data-room-ui/packages/BasicComponents/Map/settingConfig.js b/data-room-ui/packages/BasicComponents/Map/settingConfig.js index c908cf38..389acdd8 100644 --- a/data-room-ui/packages/BasicComponents/Map/settingConfig.js +++ b/data-room-ui/packages/BasicComponents/Map/settingConfig.js @@ -102,7 +102,7 @@ export const mapData = { name: '地图', title: '地图', 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: 'com.gccloud.dataroom.core.module.chart.components.ScreenMapChart', w: 800, diff --git a/data-room-ui/packages/BigScreenDesign/ComponentDialog/index.vue b/data-room-ui/packages/BigScreenDesign/ComponentDialog/index.vue index 4409ad5d..fd1e0c66 100644 --- a/data-room-ui/packages/BigScreenDesign/ComponentDialog/index.vue +++ b/data-room-ui/packages/BigScreenDesign/ComponentDialog/index.vue @@ -140,15 +140,6 @@ >
- + +
{ - if(item.value){ - this.config[item.field]=item.value? item.value:this.config[item.field] - } + this.$set(this.config,item.field,item.value) }) } } @@ -297,6 +316,7 @@ export default { title:{ set(){ this.config.type='' + this.config.padding=[16,16,16,16] }, get(){ plotList[Symbol.iterator]=function*(){ @@ -332,9 +352,13 @@ export default { }, data () { return { + // borderWidth:0 } }, mounted () { + // if(this.config.borderWidth){ + // this.borderWidth=this.config.borderWidth + // } }, methods: { init(){ diff --git a/data-room-ui/packages/BigScreenDesign/index.vue b/data-room-ui/packages/BigScreenDesign/index.vue index fe4bd27d..b8f4609c 100644 --- a/data-room-ui/packages/BigScreenDesign/index.vue +++ b/data-room-ui/packages/BigScreenDesign/index.vue @@ -205,6 +205,15 @@ export default { } }, 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) { this.zoomList[0] = { label: `自适应(${zoom}%)`, @@ -252,7 +261,9 @@ export default { } }, mounted () { - EventBus.$on('closeRightPanel', () => { this.rightVisiable = false }) + EventBus.$on('closeRightPanel', () => { + this.updateRightVisiable(false) + }) }, beforeDestroy () { this.clearTimeline() @@ -298,7 +309,7 @@ export default { getScreenInfo(component.code).then(res => { res.chartList.forEach((item) => { 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){ item.border.padding=[0,0,0,0] diff --git a/data-room-ui/packages/BorderComponents/GcBorder1/setting.js b/data-room-ui/packages/BorderComponents/GcBorder1/setting.js index 0ab9a4d2..3d2e7131 100644 --- a/data-room-ui/packages/BorderComponents/GcBorder1/setting.js +++ b/data-room-ui/packages/BorderComponents/GcBorder1/setting.js @@ -1,9 +1,11 @@ const type = 'GcBorder1' -const name = '边框一' +const name = '边框1' -const isTitle=false +const isTitle = false + +const padding =[16,16,16,16] // 右侧配置项 const setting = [ @@ -43,7 +45,7 @@ const setting = [ // 是否多选 multiple: false, // 绑定的值 - value: '', + value: [], }, { label: '渐变色方向', @@ -102,5 +104,6 @@ export default { setting, type, name, - isTitle + isTitle, + padding } diff --git a/data-room-ui/packages/BorderComponents/GcBorder10/setting.js b/data-room-ui/packages/BorderComponents/GcBorder10/setting.js index 224ea530..19f47a71 100644 --- a/data-room-ui/packages/BorderComponents/GcBorder10/setting.js +++ b/data-room-ui/packages/BorderComponents/GcBorder10/setting.js @@ -1,7 +1,9 @@ const type = 'GcBorder10' -const name = '边框十' +const name = '边框10' + +const padding =[16,16,16,16] const isTitle=false // 右侧配置项 @@ -42,7 +44,7 @@ const setting = [ // 是否多选 multiple: false, // 绑定的值 - value: '', + value: [], }, { label: '渐变色方向', @@ -101,5 +103,6 @@ export default { setting, type, name, - isTitle + isTitle, + padding } diff --git a/data-room-ui/packages/BorderComponents/GcBorder11/setting.js b/data-room-ui/packages/BorderComponents/GcBorder11/setting.js index a575d00c..935c1131 100644 --- a/data-room-ui/packages/BorderComponents/GcBorder11/setting.js +++ b/data-room-ui/packages/BorderComponents/GcBorder11/setting.js @@ -1,7 +1,9 @@ const type = 'GcBorder11' -const name = '边框十一' +const name = '边框11' + +const padding =[36,16,16,16] const isTitle=true // 右侧配置项 @@ -53,7 +55,7 @@ const setting = [ // 是否多选 multiple: false, // 绑定的值 - value: '', + value: [], }, { label: '渐变色方向', @@ -111,5 +113,6 @@ export default { setting, type, name, - isTitle + isTitle, + padding } diff --git a/data-room-ui/packages/BorderComponents/GcBorder12/setting.js b/data-room-ui/packages/BorderComponents/GcBorder12/setting.js index df9deb21..29348df3 100644 --- a/data-room-ui/packages/BorderComponents/GcBorder12/setting.js +++ b/data-room-ui/packages/BorderComponents/GcBorder12/setting.js @@ -1,7 +1,9 @@ const type = 'GcBorder12' -const name = '边框十二' +const name = '边框12' + +const padding =[16,16,16,16] const isTitle=false @@ -43,7 +45,7 @@ const setting = [ // 是否多选 multiple: false, // 绑定的值 - value: '', + value: [], }, { label: '渐变色方向', @@ -102,5 +104,6 @@ export default { setting, type, name, - isTitle + isTitle, + padding } diff --git a/data-room-ui/packages/BorderComponents/GcBorder13/setting.js b/data-room-ui/packages/BorderComponents/GcBorder13/setting.js index 2298e1a1..c33889d1 100644 --- a/data-room-ui/packages/BorderComponents/GcBorder13/setting.js +++ b/data-room-ui/packages/BorderComponents/GcBorder13/setting.js @@ -1,7 +1,9 @@ const type = 'GcBorder13' -const name = '边框十三' +const name = '边框13' + +const padding =[16,16,16,16] const isTitle=false // 右侧配置项 @@ -42,7 +44,7 @@ const setting = [ // 是否多选 multiple: false, // 绑定的值 - value: '', + value: [], }, { label: '渐变色方向', @@ -101,5 +103,6 @@ export default { setting, type, name, - isTitle + isTitle, + padding } diff --git a/data-room-ui/packages/BorderComponents/GcBorder14/component.png b/data-room-ui/packages/BorderComponents/GcBorder14/component.png index 5303c7651b147bfe258886acb4c2be941835a6be..56a3df78641ee7aad3b5b59bfb412f0799618127 100644 GIT binary patch literal 6282 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 Y4)g2^Is|L{m4FD|8@dPDb?nl=0Ov?Ye*gdg literal 930 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrV9xY(aSW-L^Y+@oz^Fu#wui+V z8*VsWa@?W(dji)Ht|av&^<_*OnTS8{m3J;lI^6r0>2l}E=GSKNCj2sM_w0E5;^wcpZT76hGtBPV?Q-t#M1JReX7W#VPiHv& zv}jY*+IOEhgqsgOSe1J_Qf_+*+lGnvnd+4v728?Vp0E7f{&VMY^M*fS63@0Duu-ym z+I;z|e*S-p{Qtr8zJFoc;K-u>{=pAvcIF!=IL;Y2z3$l2*RlTRgCDlfi>E)n|MZ7` v<-4zm3?JMWjtV*yvINL5in!xt-l=a2-L-D%FTJV2yvN|_>gTe~DWM4fG7XJr diff --git a/data-room-ui/packages/BorderComponents/GcBorder14/index.vue b/data-room-ui/packages/BorderComponents/GcBorder14/index.vue index 52a988a7..e1423a8f 100644 --- a/data-room-ui/packages/BorderComponents/GcBorder14/index.vue +++ b/data-room-ui/packages/BorderComponents/GcBorder14/index.vue @@ -60,17 +60,17 @@ export default { return this.config.border.borderColor || '' }, width () { - return this.config.border.borderWidth || 2 + return this.config.border.borderWidth || 0 }, 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] } else { return 'transparent' } }, 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] } else { return 'transparent' diff --git a/data-room-ui/packages/BorderComponents/GcBorder14/setting.js b/data-room-ui/packages/BorderComponents/GcBorder14/setting.js index e2dd650b..c49db291 100644 --- a/data-room-ui/packages/BorderComponents/GcBorder14/setting.js +++ b/data-room-ui/packages/BorderComponents/GcBorder14/setting.js @@ -1,7 +1,9 @@ const type = 'GcBorder14' -const name = '边框十四' +const name = '边框14' + +const padding =[16,16,16,16] const isTitle=false // 右侧配置项 @@ -42,7 +44,7 @@ const setting = [ // 是否多选 multiple: false, // 绑定的值 - value: '', + value: ['#83bff6','#188df0'], }, { label: '渐变色方向', @@ -152,5 +154,6 @@ export default { setting, type, name, - isTitle + isTitle, + padding } diff --git a/data-room-ui/packages/BorderComponents/GcBorder15/component.png b/data-room-ui/packages/BorderComponents/GcBorder15/component.png index 5303c7651b147bfe258886acb4c2be941835a6be..af6d4530e2807188ef27fb4fb7017f5de7779061 100644 GIT binary patch literal 1710 zcmeAS@N?(olHy`uVBq!ia0y~yVDtjAUve-3$+KHtE(20*N#5=*4F5rJ!QSPQfg+p* z9+AZi417mGm~pB$pEOXFpQnpsNX4ADcjGhWmdhUh82>M#b*s5|>@~;jtdX~pGLCz7 zpA}-C%*!3U+q6*QuFJA>Vo|c~jva5D+60)CJG9SeufG$!`ZAx6_uCtjmR{8?Q(oiS z?smI-R@Mi9N8haKJr=PXv$H*_+-@Ad-W_9e-txTS{o;?$ewJG-e>i#j7IB5Z;;*Nk zX06owF5ysXVrF(;*L-@=x|o0GKk+hO@l6i?{O9UwZC>8q(}p|&=2u@;^B)f7-S`BC zW_fG=zjZ5KN=oW~N_a$Zb z_dnU$$f|4j-txM~mn$zjtKU~|m{OGU<3qM`@@@GSK+Rviy{XxB$==ASZ0>*YhzpDK z*ZzI-pnutNHS^pz6{|MY|9SH9-MVx9w~7w`D!m*$8Hl8>t&iTC_4LQd$Nr(;?$_O3 zt1nme@Xt=;zqM0e&z6Zeu;_E$j_()StIGaA>`$LBTea@-x!mhF_~%>MUc7Yc+NE1% zufDiwK9v{Oe|I;0=6{Y43!_dQtUSKlyr$-8m#x3ez1y2VPczNVQom80mabp>{{a7~ z-PP}JDXZ80bkkh=^q6%0=hfl-a=$Wd)!4;0O!<9}-|oZDpi?hybk3YP(|zBUsnf1) z+xuHfIQ?Gbiu7{t?Ax=pzGZH92BPe1+pd4R3MBvkIdSn;c6wS`-S^)otM)NJVAipE z|8L)^`2XL&bJzbn{o}{&xp%*Re|O8!>{HR(mHPJIj^4UiQ6Byr=;y7%?{D4z-p2OI z)^bCG>+`)?S5JNXxIO#y-PpOYvA6m5mn_+4Rr6(Pkk|WlvdW8-Wy|xjGjprUUhFi# zFO?5uZMqci6}kUi-__O8ugq-}zU^;sY+w-*{qFA8q;=|m-`m&WzxOdPx z)c&q5-u-S?v;DuDXWryozdQftuBYpKrLC)~%dV}P@9!IXp9r|HtQbmW^wV~r|f-WGwyHLIi={|ote-1d8P)rxg7^0v;4j3U%m>jU2FdK zZn$Ojw>!&vWq~PS{@Z=kPftnDvo|oYHU0T$p?Kc@x7XH2zgzX*n(^M^#II-P@2dGZ zDL=che^=JlTQ{zl{NH^o1eW$8nP6R9O7(wp6=wO;V*BI^8}<}4Tt9hU;=q5wN@tx> zG#Ubwg}|C;L0+1?SF=iIvNOI~yK~{jl{+_P?mW)$>ij{=Ba_V0(Jy^gE=%qgb^JSk P)eVEEtDnm{r-UW|?hy>} literal 930 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrV9xY(aSW-L^Y+@oz^Fu#wui+V z8*VsWa@?W(dji)Ht|av&^<_*OnTS8{m3J;lI^6r0>2l}E=GSKNCj2sM_w0E5;^wcpZT76hGtBPV?Q-t#M1JReX7W#VPiHv& zv}jY*+IOEhgqsgOSe1J_Qf_+*+lGnvnd+4v728?Vp0E7f{&VMY^M*fS63@0Duu-ym z+I;z|e*S-p{Qtr8zJFoc;K-u>{=pAvcIF!=IL;Y2z3$l2*RlTRgCDlfi>E)n|MZ7` v<-4zm3?JMWjtV*yvINL5in!xt-l=a2-L-D%FTJV2yvN|_>gTe~DWM4fG7XJr diff --git a/data-room-ui/packages/BorderComponents/GcBorder15/index.vue b/data-room-ui/packages/BorderComponents/GcBorder15/index.vue index 14ff0f01..8dee0798 100644 --- a/data-room-ui/packages/BorderComponents/GcBorder15/index.vue +++ b/data-room-ui/packages/BorderComponents/GcBorder15/index.vue @@ -22,7 +22,7 @@ :style="` line-height:${config.border.titleHeight}px; height:${config.border.titleHeight}; - border-bottom:3px solid ${fontBottomColor}; + border-bottom:${fontBottomColor?3:0}px solid ${fontBottomColor}; background-image: linear-gradient(${gradientDirection}, ${ fontGradientColor0 ? fontGradientColor0 : fontGradientColor1 } , ${fontGradientColor1 ? fontGradientColor1 : fontGradientColor0}) @@ -70,31 +70,31 @@ export default { return this.config.border.borderColor || '' }, width () { - return this.config.border.borderWidth!=null?this.config.border.borderWidth : 2 + return this.config.border.borderWidth!=null?this.config.border.borderWidth : 0 }, 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] }else{ return 'transparent' } }, 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] }else{ return 'transparent' } }, 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] }else{ return 'transparent' } }, 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] }else{ return 'transparent' @@ -107,7 +107,7 @@ export default { return this.config.border.fontBottomColor || '' }, fontLeftWidth(){ - return this.config.border.fontLeftWidth!=null?this.config.border.fontLeftWidth : 6 + return this.config.border.fontLeftWidth || 6 }, radiusLeftTop () { return this.config.border.radiusLeftTop || 2 diff --git a/data-room-ui/packages/BorderComponents/GcBorder15/setting.js b/data-room-ui/packages/BorderComponents/GcBorder15/setting.js index b93bdf19..5705ac46 100644 --- a/data-room-ui/packages/BorderComponents/GcBorder15/setting.js +++ b/data-room-ui/packages/BorderComponents/GcBorder15/setting.js @@ -1,9 +1,11 @@ const type = 'GcBorder15' -const name = '边框十五' +const name = '边框15' -const isTitle=true +const isTitle = true + +const padding =[0,0,0,0] // 右侧配置项 const setting = [ @@ -17,7 +19,7 @@ const setting = [ // 是否多选 multiple: false, // 绑定的值 - value: '', + value: [], }, // 背景色 // { @@ -66,7 +68,7 @@ const setting = [ // 是否多选 multiple: false, // 绑定的值 - value: 6, + value: 4, }, { label:'标题底部分割线颜色', @@ -78,7 +80,7 @@ const setting = [ // 是否多选 multiple: false, // 绑定的值 - value: '#007aff', + value: '', }, { label:'外边框线颜色', @@ -102,7 +104,7 @@ const setting = [ // 是否多选 multiple: false, // 绑定的值 - value: 1, + value: 0, }, { label:'背景色', @@ -114,7 +116,7 @@ const setting = [ // 是否多选 multiple: false, // 绑定的值 - value: '', + value: [], }, // { // label:'背景色一', @@ -248,5 +250,6 @@ export default { setting, type, name, - isTitle + isTitle, + padding } diff --git a/data-room-ui/packages/BorderComponents/GcBorder2/setting.js b/data-room-ui/packages/BorderComponents/GcBorder2/setting.js index 37e0468a..88211451 100644 --- a/data-room-ui/packages/BorderComponents/GcBorder2/setting.js +++ b/data-room-ui/packages/BorderComponents/GcBorder2/setting.js @@ -1,7 +1,9 @@ const type = 'GcBorder2' -const name = '边框二' +const name = '边框2' + +const padding =[16,16,16,16] const isTitle=false // 右侧配置项 @@ -41,7 +43,7 @@ const setting = [ // 是否多选 multiple: false, // 绑定的值 - value: '', + value: [], }, { label: '渐变色方向', @@ -100,5 +102,6 @@ export default { setting, type, name, - isTitle + isTitle, + padding } diff --git a/data-room-ui/packages/BorderComponents/GcBorder3/setting.js b/data-room-ui/packages/BorderComponents/GcBorder3/setting.js index 0709432f..33238a97 100644 --- a/data-room-ui/packages/BorderComponents/GcBorder3/setting.js +++ b/data-room-ui/packages/BorderComponents/GcBorder3/setting.js @@ -1,7 +1,9 @@ const type = 'GcBorder3' -const name = '边框三' +const name = '边框3' + +const padding =[16,16,16,16] const isTitle=false // 右侧配置项 @@ -42,7 +44,7 @@ const setting = [ // 是否多选 multiple: false, // 绑定的值 - value: '', + value: [], }, { label: '渐变色方向', @@ -101,5 +103,6 @@ export default { setting, type, name, - isTitle + isTitle, + padding } diff --git a/data-room-ui/packages/BorderComponents/GcBorder4/setting.js b/data-room-ui/packages/BorderComponents/GcBorder4/setting.js index 5e291ee1..a6b1eff5 100644 --- a/data-room-ui/packages/BorderComponents/GcBorder4/setting.js +++ b/data-room-ui/packages/BorderComponents/GcBorder4/setting.js @@ -3,7 +3,8 @@ const type = 'GcBorder4' const isTitle=false -const name='边框四' +const name = '边框4' +const padding =[16,16,16,16] // 右侧配置项 const setting = [ // 背景色 @@ -42,7 +43,7 @@ const setting = [ // 是否多选 multiple: false, // 绑定的值 - value: '', + value: [], }, { label: '渐变色方向', @@ -113,5 +114,6 @@ export default { setting, type, name, - isTitle + isTitle, + padding } diff --git a/data-room-ui/packages/BorderComponents/GcBorder5/setting.js b/data-room-ui/packages/BorderComponents/GcBorder5/setting.js index 9e3a37df..1fe3a75b 100644 --- a/data-room-ui/packages/BorderComponents/GcBorder5/setting.js +++ b/data-room-ui/packages/BorderComponents/GcBorder5/setting.js @@ -1,7 +1,9 @@ const type = 'GcBorder5' -const name = '边框五' +const name = '边框5' + +const padding =[16,16,16,16] const isTitle=false // 右侧配置项 @@ -42,7 +44,7 @@ const setting = [ // 是否多选 multiple: false, // 绑定的值 - value: '', + value: [], }, { label: '渐变色方向', @@ -112,5 +114,6 @@ export default { setting, type, name, - isTitle + isTitle, + padding } diff --git a/data-room-ui/packages/BorderComponents/GcBorder6/setting.js b/data-room-ui/packages/BorderComponents/GcBorder6/setting.js index 3deb2996..c607fa17 100644 --- a/data-room-ui/packages/BorderComponents/GcBorder6/setting.js +++ b/data-room-ui/packages/BorderComponents/GcBorder6/setting.js @@ -1,7 +1,9 @@ const type = 'GcBorder6' -const name = '边框六' +const name = '边框6' + +const padding =[16,16,16,16] const isTitle=false // 右侧配置项 @@ -42,7 +44,7 @@ const setting = [ // 是否多选 multiple: false, // 绑定的值 - value: '', + value: [], }, { label: '渐变色方向', @@ -100,5 +102,6 @@ export default { setting, type, name, - isTitle + isTitle, + padding } diff --git a/data-room-ui/packages/BorderComponents/GcBorder7/setting.js b/data-room-ui/packages/BorderComponents/GcBorder7/setting.js index ce726655..e7b934bc 100644 --- a/data-room-ui/packages/BorderComponents/GcBorder7/setting.js +++ b/data-room-ui/packages/BorderComponents/GcBorder7/setting.js @@ -1,7 +1,9 @@ const type = 'GcBorder7' -const name = '边框七' +const name = '边框7' + +const padding =[16,16,16,16] const isTitle=false // 右侧配置项 @@ -42,7 +44,7 @@ const setting = [ // 是否多选 multiple: false, // 绑定的值 - value: '', + value: [], }, { label: '渐变色方向', @@ -100,5 +102,6 @@ export default { setting, type, name, - isTitle + isTitle, + padding } diff --git a/data-room-ui/packages/BorderComponents/GcBorder8/setting.js b/data-room-ui/packages/BorderComponents/GcBorder8/setting.js index 01def878..1e8e6e78 100644 --- a/data-room-ui/packages/BorderComponents/GcBorder8/setting.js +++ b/data-room-ui/packages/BorderComponents/GcBorder8/setting.js @@ -1,7 +1,9 @@ const type = 'GcBorder8' -const name = '边框八' +const name = '边框8' + +const padding =[16,16,16,16] const isTitle=false // 右侧配置项 @@ -42,7 +44,7 @@ const setting = [ // 是否多选 multiple: false, // 绑定的值 - value: '', + value: [], }, { label: '渐变色方向', @@ -126,5 +128,6 @@ export default { setting, type, name, - isTitle + isTitle, + padding } diff --git a/data-room-ui/packages/BorderComponents/GcBorder9/setting.js b/data-room-ui/packages/BorderComponents/GcBorder9/setting.js index f257ce06..6e47646a 100644 --- a/data-room-ui/packages/BorderComponents/GcBorder9/setting.js +++ b/data-room-ui/packages/BorderComponents/GcBorder9/setting.js @@ -1,7 +1,9 @@ const type = 'GcBorder9' -const name = '边框九' +const name = '边框9' + +const padding =[16,16,16,16] const isTitle=false // 右侧配置项 @@ -42,7 +44,7 @@ const setting = [ // 是否多选 multiple: false, // 绑定的值 - value: '', + value: [], }, { label: '渐变色方向', @@ -100,5 +102,6 @@ export default { setting, type, name, - isTitle + isTitle, + padding } diff --git a/data-room-ui/packages/BorderComponents/settingList.js b/data-room-ui/packages/BorderComponents/settingList.js index 4d78fe17..f3bcc97e 100644 --- a/data-room-ui/packages/BorderComponents/settingList.js +++ b/data-room-ui/packages/BorderComponents/settingList.js @@ -5,12 +5,13 @@ const plotList = [] // ./折线图/基础折线图.js // 取到 "基础折线图" const config = files(key).default - plotList.push({ - type: config.type, - setting: config.setting, - name: config.name, - isTitle:config.isTitle - }) + plotList.push({ + type: config.type, + setting: config.setting, + name: config.name, + isTitle: config.isTitle, + padding: config.padding + }) }) export default plotList diff --git a/data-room-ui/packages/BorderSelect/index.vue b/data-room-ui/packages/BorderSelect/index.vue index ad8f74a7..e3b30f6d 100644 --- a/data-room-ui/packages/BorderSelect/index.vue +++ b/data-room-ui/packages/BorderSelect/index.vue @@ -126,6 +126,9 @@ export default { }, mounted () { this.remoteComponentlist = [...borderComponents] + this.remoteComponentlist.sort((a,b)=>{ + return a.title.slice(8) - b.title.slice(8) + }) }, methods: { getName(title){ diff --git a/data-room-ui/packages/G2Plots/plotList.js b/data-room-ui/packages/G2Plots/plotList.js index 18f7595c..3a644fa9 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: 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, 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: 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, img: config.img, className: diff --git a/data-room-ui/packages/RemoteComponents/remoteComponentsList.js b/data-room-ui/packages/RemoteComponents/remoteComponentsList.js index 4a38268c..34289c06 100644 --- a/data-room-ui/packages/RemoteComponents/remoteComponentsList.js +++ b/data-room-ui/packages/RemoteComponents/remoteComponentsList.js @@ -32,7 +32,7 @@ export function getRemoteComponents (comList) { title: config.title, icon: null, 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: 'com.gccloud.dataroom.core.module.chart.components.RemoteComponentChart', w: 450, @@ -64,7 +64,7 @@ export function getRemoteComponentConfig (code, name) { title: name, icon: 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: 'com.gccloud.dataroom.core.module.chart.components.RemoteComponentChart', w: 450, diff --git a/data-room-ui/packages/js/store/actions.js b/data-room-ui/packages/js/store/actions.js index a16edc2f..3da88517 100644 --- a/data-room-ui/packages/js/store/actions.js +++ b/data-room-ui/packages/js/store/actions.js @@ -19,7 +19,7 @@ export default { // 兼容边框配置 pageInfo.chartList.forEach((item) => { 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) { item.border.padding = [0, 0, 0, 0] diff --git a/data-room-ui/packages/js/store/mutations.js b/data-room-ui/packages/js/store/mutations.js index 35498e04..a5e7f32c 100644 --- a/data-room-ui/packages/js/store/mutations.js +++ b/data-room-ui/packages/js/store/mutations.js @@ -166,11 +166,13 @@ export default { } // 存储删除后的状态 saveTimeLineFunc(state, '删除组件') - // 删除后，清空当前选中组件 - state.activeItemConfig = null - state.activeCode = null + if (state.pageInfo.chartList.findIndex(item=>item.code===state.activeCode)==-1) { + state.activeItemConfig = null + state.activeCode = null + EventBus.$emit('closeRightPanel') + } // 发送事件，关闭配置面板 - EventBus.$emit('closeRightPanel') + }, changePageConfig (state, pageConfig) { Vue.set(state.pageInfo, 'pageConfig', cloneDeep(pageConfig))