diff --git a/data-room-ui/packages/BasicComponents/DigitalFlop/setting.vue b/data-room-ui/packages/BasicComponents/DigitalFlop/setting.vue index b19ec83f..de5dd4f5 100644 --- a/data-room-ui/packages/BasicComponents/DigitalFlop/setting.vue +++ b/data-room-ui/packages/BasicComponents/DigitalFlop/setting.vue @@ -31,7 +31,7 @@
diff --git a/data-room-ui/packages/BasicComponents/FlyMap/settingConfig.js b/data-room-ui/packages/BasicComponents/FlyMap/settingConfig.js index ee7bf77b..e75a155c 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}, + border:{type:'',titleHeight:60,fontSize:30,isTitle:true,paddingTop:10}, 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 a4c1e3b0..0358f8b1 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}, + border:{type:'',titleHeight:60,fontSize:30,isTitle:true,paddingTop:30}, className: 'com.gccloud.dataroom.core.module.chart.components.ScreenMapChart', w: 800, diff --git a/data-room-ui/packages/BasicComponents/Select/setting.vue b/data-room-ui/packages/BasicComponents/Select/setting.vue index 3b336f65..40510abd 100644 --- a/data-room-ui/packages/BasicComponents/Select/setting.vue +++ b/data-room-ui/packages/BasicComponents/Select/setting.vue @@ -25,7 +25,7 @@
diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/BorderSetting.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/BorderSetting.vue index 70b7eb20..9dcd4507 100644 --- a/data-room-ui/packages/BigScreenDesign/RightSetting/BorderSetting.vue +++ b/data-room-ui/packages/BigScreenDesign/RightSetting/BorderSetting.vue @@ -27,7 +27,32 @@ ref="BorderSelect" /> +
+ + + + + + @@ -39,6 +64,7 @@ /> @@ -49,13 +75,25 @@ :step="1" /> + + +
+
diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/G2CustomSetting.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/G2CustomSetting.vue index 852248e6..2e459e8d 100644 --- a/data-room-ui/packages/BigScreenDesign/RightSetting/G2CustomSetting.vue +++ b/data-room-ui/packages/BigScreenDesign/RightSetting/G2CustomSetting.vue @@ -21,8 +21,9 @@ /> + 边框
- { + res.chartList.forEach((item) => { + if (!item.border) { + item.border={type:'',titleHeight:60,fontSize:30,isTitle:true,paddingTop:20} + } + }) // 给组件库导入的组件加入统一的前缀 const randomStr = randomString(8) const pageInfo = handleResData(res) diff --git a/data-room-ui/packages/BorderComponents/GcBorder1/index.vue b/data-room-ui/packages/BorderComponents/GcBorder1/index.vue index 1793c29d..cbd49801 100644 --- a/data-room-ui/packages/BorderComponents/GcBorder1/index.vue +++ b/data-room-ui/packages/BorderComponents/GcBorder1/index.vue @@ -9,6 +9,7 @@ :key="updateKey" >
diff --git a/data-room-ui/packages/js/config/basicComponentsConfig.js b/data-room-ui/packages/js/config/basicComponentsConfig.js index 46e0c563..1819e27c 100644 --- a/data-room-ui/packages/js/config/basicComponentsConfig.js +++ b/data-room-ui/packages/js/config/basicComponentsConfig.js @@ -44,7 +44,7 @@ basicConfigList = basicConfigList.map((item) => { export function basicComponentsConfig (item) { return { ...item, - border:{type:'',titleHeight:60,fontSize:30}, + border:{type:'',titleHeight:60,fontSize:30,isTitle:true,paddingTop:30}, option: cloneDeep(setModules[item.type]), ...cloneDeep(dataModules[item.type]) } diff --git a/data-room-ui/packages/js/store/actions.js b/data-room-ui/packages/js/store/actions.js index f9d57791..8827c5fa 100644 --- a/data-room-ui/packages/js/store/actions.js +++ b/data-room-ui/packages/js/store/actions.js @@ -13,6 +13,12 @@ export default { initLayout ({ commit, dispatch }, code) { return new Promise(resolve => { getScreenInfo(code).then(data => { + // 兼容边框配置 + data.chartList.forEach((item) => { + if (!item.border) { + item.border={type:'',titleHeight:60,fontSize:30,isTitle:true,paddingTop:10} + } + }) const pageInfo = handleResData(data) // 改变页面数据 commit('changePageInfo', pageInfo)