diff --git a/data-room-ui/packages/BasicComponents/FlyMap/settingConfig.js b/data-room-ui/packages/BasicComponents/FlyMap/settingConfig.js index acd975b1..5038de9e 100644 --- a/data-room-ui/packages/BasicComponents/FlyMap/settingConfig.js +++ b/data-room-ui/packages/BasicComponents/FlyMap/settingConfig.js @@ -106,7 +106,7 @@ export const FlyMapData = { name: '飞线图', title: '飞线图', icon: Icon.getNameList()[18], - border:{type:'',titleHeight:60,fontSize:30,color:['#5B8FF9', '#61DDAA', '#5D7092', '#F6BD16', '#6F5EF9']}, + border:{type:'',titleHeight:60,fontSize:30}, 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 501feec9..9f980757 100644 --- a/data-room-ui/packages/BasicComponents/Map/settingConfig.js +++ b/data-room-ui/packages/BasicComponents/Map/settingConfig.js @@ -95,7 +95,7 @@ export const mapData = { name: '地图', title: '地图', icon: Icon.getNameList()[5], - border:{type:'',titleHeight:60,fontSize:30,color:['#5B8FF9', '#61DDAA', '#5D7092', '#F6BD16', '#6F5EF9']}, + border:{type:'',titleHeight:60,fontSize:30}, className: 'com.gccloud.dataroom.core.module.chart.components.ScreenMapChart', w: 800, diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/BorderSetting.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/BorderSetting.vue index d3f24695..ac3b9f84 100644 --- a/data-room-ui/packages/BigScreenDesign/RightSetting/BorderSetting.vue +++ b/data-room-ui/packages/BigScreenDesign/RightSetting/BorderSetting.vue @@ -7,7 +7,6 @@ > - -
+ + + + + + -
-
+ + + + + + + + + + + + diff --git a/data-room-ui/packages/BorderComponents/GcBorder10/setting.js b/data-room-ui/packages/BorderComponents/GcBorder10/setting.js new file mode 100644 index 00000000..5c9924ad --- /dev/null +++ b/data-room-ui/packages/BorderComponents/GcBorder10/setting.js @@ -0,0 +1,44 @@ + +const type = 'GcBorder10' + +const name='边框十' +// 右侧配置项 +const setting = [ + // 背景色 + { + label:'背景色', + // 设置组件类型, select / input / colorPicker + type: 'colorPicker', + // 字段 + field: 'backgroundColor', + optionField: 'backgroundColor', // 对应options中的字段 + // 是否多选 + multiple: false, + // 绑定的值 + value: '', + }, + // 标题字体颜色 + { + label:'标题字体颜色', + // 设置组件类型, select / input / colorPicker + type: 'colorPicker', + // 字段 + field: 'fontColor', + optionField: 'fontColor', // 对应options中的字段 + // 是否多选 + multiple: false, + // 绑定的值 + value: '', + }, + + +] + + + + +export default { + setting, + type, + name +} diff --git a/data-room-ui/packages/BorderComponents/GcBorder11/component.png b/data-room-ui/packages/BorderComponents/GcBorder11/component.png new file mode 100644 index 00000000..90d0744a Binary files /dev/null and b/data-room-ui/packages/BorderComponents/GcBorder11/component.png differ diff --git a/data-room-ui/packages/BorderComponents/GcBorder11/index.vue b/data-room-ui/packages/BorderComponents/GcBorder11/index.vue new file mode 100644 index 00000000..40fada1e --- /dev/null +++ b/data-room-ui/packages/BorderComponents/GcBorder11/index.vue @@ -0,0 +1,88 @@ + + + + diff --git a/data-room-ui/packages/BorderComponents/GcBorder11/setting.js b/data-room-ui/packages/BorderComponents/GcBorder11/setting.js new file mode 100644 index 00000000..93e7a25d --- /dev/null +++ b/data-room-ui/packages/BorderComponents/GcBorder11/setting.js @@ -0,0 +1,44 @@ + +const type = 'GcBorder11' + +const name='边框十一' +// 右侧配置项 +const setting = [ + // 背景色 + { + label:'背景色', + // 设置组件类型, select / input / colorPicker + type: 'colorPicker', + // 字段 + field: 'backgroundColor', + optionField: 'backgroundColor', // 对应options中的字段 + // 是否多选 + multiple: false, + // 绑定的值 + value: '', + }, + // 标题字体颜色 + { + label:'标题字体颜色', + // 设置组件类型, select / input / colorPicker + type: 'colorPicker', + // 字段 + field: 'fontColor', + optionField: 'fontColor', // 对应options中的字段 + // 是否多选 + multiple: false, + // 绑定的值 + value: '', + }, + + +] + + + + +export default { + setting, + type, + name +} diff --git a/data-room-ui/packages/BorderComponents/GcBorder12/component.png b/data-room-ui/packages/BorderComponents/GcBorder12/component.png new file mode 100644 index 00000000..2761932b Binary files /dev/null and b/data-room-ui/packages/BorderComponents/GcBorder12/component.png differ diff --git a/data-room-ui/packages/BorderComponents/GcBorder12/index.vue b/data-room-ui/packages/BorderComponents/GcBorder12/index.vue new file mode 100644 index 00000000..9da31a4f --- /dev/null +++ b/data-room-ui/packages/BorderComponents/GcBorder12/index.vue @@ -0,0 +1,88 @@ + + + + diff --git a/data-room-ui/packages/BorderComponents/GcBorder12/setting.js b/data-room-ui/packages/BorderComponents/GcBorder12/setting.js new file mode 100644 index 00000000..a67f48a5 --- /dev/null +++ b/data-room-ui/packages/BorderComponents/GcBorder12/setting.js @@ -0,0 +1,45 @@ + +const type = 'GcBorder12' + +const name = '边框十二' + +// 右侧配置项 +const setting = [ + // 背景色 + { + label:'背景色', + // 设置组件类型, select / input / colorPicker + type: 'colorPicker', + // 字段 + field: 'backgroundColor', + optionField: 'backgroundColor', // 对应options中的字段 + // 是否多选 + multiple: false, + // 绑定的值 + value: '', + }, + // 标题字体颜色 + { + label:'标题字体颜色', + // 设置组件类型, select / input / colorPicker + type: 'colorPicker', + // 字段 + field: 'fontColor', + optionField: 'fontColor', // 对应options中的字段 + // 是否多选 + multiple: false, + // 绑定的值 + value: '', + }, + + +] + + + + +export default { + setting, + type, + name +} diff --git a/data-room-ui/packages/BorderComponents/GcBorder13/component.png b/data-room-ui/packages/BorderComponents/GcBorder13/component.png new file mode 100644 index 00000000..e1f52b7b Binary files /dev/null and b/data-room-ui/packages/BorderComponents/GcBorder13/component.png differ diff --git a/data-room-ui/packages/BorderComponents/GcBorder13/index.vue b/data-room-ui/packages/BorderComponents/GcBorder13/index.vue new file mode 100644 index 00000000..886dce76 --- /dev/null +++ b/data-room-ui/packages/BorderComponents/GcBorder13/index.vue @@ -0,0 +1,88 @@ + + + + diff --git a/data-room-ui/packages/BorderComponents/GcBorder13/setting.js b/data-room-ui/packages/BorderComponents/GcBorder13/setting.js new file mode 100644 index 00000000..6064f98d --- /dev/null +++ b/data-room-ui/packages/BorderComponents/GcBorder13/setting.js @@ -0,0 +1,44 @@ + +const type = 'GcBorder8' + +const name='边框十三' +// 右侧配置项 +const setting = [ + // 背景色 + { + label:'背景色', + // 设置组件类型, select / input / colorPicker + type: 'colorPicker', + // 字段 + field: 'backgroundColor', + optionField: 'backgroundColor', // 对应options中的字段 + // 是否多选 + multiple: false, + // 绑定的值 + value: '', + }, + // 标题字体颜色 + { + label:'标题字体颜色', + // 设置组件类型, select / input / colorPicker + type: 'colorPicker', + // 字段 + field: 'fontColor', + optionField: 'fontColor', // 对应options中的字段 + // 是否多选 + multiple: false, + // 绑定的值 + value: '', + }, + + +] + + + + +export default { + setting, + type, + name +} diff --git a/data-room-ui/packages/BorderComponents/GcBorder2/component.png b/data-room-ui/packages/BorderComponents/GcBorder2/component.png new file mode 100644 index 00000000..624bdbe0 Binary files /dev/null and b/data-room-ui/packages/BorderComponents/GcBorder2/component.png differ diff --git a/data-room-ui/packages/BorderComponents/BorderComponent2/index.vue b/data-room-ui/packages/BorderComponents/GcBorder2/index.vue similarity index 59% rename from data-room-ui/packages/BorderComponents/BorderComponent2/index.vue rename to data-room-ui/packages/BorderComponents/GcBorder2/index.vue index c6c12a3e..205574d2 100644 --- a/data-room-ui/packages/BorderComponents/BorderComponent2/index.vue +++ b/data-room-ui/packages/BorderComponents/GcBorder2/index.vue @@ -3,15 +3,25 @@ style="width: 100%;height: 100%" class="bs-design-wrap" > - -
{{config.title}}
+
+ {{config.title}}
+ + diff --git a/data-room-ui/packages/BorderComponents/GcBorder3/setting.js b/data-room-ui/packages/BorderComponents/GcBorder3/setting.js new file mode 100644 index 00000000..727d9bad --- /dev/null +++ b/data-room-ui/packages/BorderComponents/GcBorder3/setting.js @@ -0,0 +1,44 @@ + +const type = 'GcBorder3' + +const name='边框三' +// 右侧配置项 +const setting = [ + // 背景色 + { + label:'背景色', + // 设置组件类型, select / input / colorPicker + type: 'colorPicker', + // 字段 + field: 'backgroundColor', + optionField: 'backgroundColor', // 对应options中的字段 + // 是否多选 + multiple: false, + // 绑定的值 + value: '', + }, + // 标题字体颜色 + { + label:'标题字体颜色', + // 设置组件类型, select / input / colorPicker + type: 'colorPicker', + // 字段 + field: 'fontColor', + optionField: 'fontColor', // 对应options中的字段 + // 是否多选 + multiple: false, + // 绑定的值 + value: '', + }, + + +] + + + + +export default { + setting, + type, + name +} diff --git a/data-room-ui/packages/BorderComponents/GcBorder4/component.png b/data-room-ui/packages/BorderComponents/GcBorder4/component.png new file mode 100644 index 00000000..fbd685ea Binary files /dev/null and b/data-room-ui/packages/BorderComponents/GcBorder4/component.png differ diff --git a/data-room-ui/packages/BorderComponents/GcBorder4/index.vue b/data-room-ui/packages/BorderComponents/GcBorder4/index.vue new file mode 100644 index 00000000..ebb0e245 --- /dev/null +++ b/data-room-ui/packages/BorderComponents/GcBorder4/index.vue @@ -0,0 +1,88 @@ + + + + diff --git a/data-room-ui/packages/BorderComponents/GcBorder4/setting.js b/data-room-ui/packages/BorderComponents/GcBorder4/setting.js new file mode 100644 index 00000000..07bc3042 --- /dev/null +++ b/data-room-ui/packages/BorderComponents/GcBorder4/setting.js @@ -0,0 +1,44 @@ + +const type = 'GcBorder4' + +const name='边框四' +// 右侧配置项 +const setting = [ + // 背景色 + { + label:'背景色', + // 设置组件类型, select / input / colorPicker + type: 'colorPicker', + // 字段 + field: 'backgroundColor', + optionField: 'backgroundColor', // 对应options中的字段 + // 是否多选 + multiple: false, + // 绑定的值 + value: '', + }, + // 标题字体颜色 + { + label:'标题字体颜色', + // 设置组件类型, select / input / colorPicker + type: 'colorPicker', + // 字段 + field: 'fontColor', + optionField: 'fontColor', // 对应options中的字段 + // 是否多选 + multiple: false, + // 绑定的值 + value: '', + }, + + +] + + + + +export default { + setting, + type, + name +} diff --git a/data-room-ui/packages/BorderComponents/GcBorder5/component.png b/data-room-ui/packages/BorderComponents/GcBorder5/component.png new file mode 100644 index 00000000..5b7654ff Binary files /dev/null and b/data-room-ui/packages/BorderComponents/GcBorder5/component.png differ diff --git a/data-room-ui/packages/BorderComponents/GcBorder5/index.vue b/data-room-ui/packages/BorderComponents/GcBorder5/index.vue new file mode 100644 index 00000000..7abe83d3 --- /dev/null +++ b/data-room-ui/packages/BorderComponents/GcBorder5/index.vue @@ -0,0 +1,88 @@ + + + + diff --git a/data-room-ui/packages/BorderComponents/GcBorder5/setting.js b/data-room-ui/packages/BorderComponents/GcBorder5/setting.js new file mode 100644 index 00000000..60f494b7 --- /dev/null +++ b/data-room-ui/packages/BorderComponents/GcBorder5/setting.js @@ -0,0 +1,44 @@ + +const type = 'GcBorder5' + +const name='边框五' +// 右侧配置项 +const setting = [ + // 背景色 + { + label:'背景色', + // 设置组件类型, select / input / colorPicker + type: 'colorPicker', + // 字段 + field: 'backgroundColor', + optionField: 'backgroundColor', // 对应options中的字段 + // 是否多选 + multiple: false, + // 绑定的值 + value: '', + }, + // 标题字体颜色 + { + label:'标题字体颜色', + // 设置组件类型, select / input / colorPicker + type: 'colorPicker', + // 字段 + field: 'fontColor', + optionField: 'fontColor', // 对应options中的字段 + // 是否多选 + multiple: false, + // 绑定的值 + value: '', + }, + + +] + + + + +export default { + setting, + type, + name +} diff --git a/data-room-ui/packages/BorderComponents/GcBorder6/component.png b/data-room-ui/packages/BorderComponents/GcBorder6/component.png new file mode 100644 index 00000000..62b646b4 Binary files /dev/null and b/data-room-ui/packages/BorderComponents/GcBorder6/component.png differ diff --git a/data-room-ui/packages/BorderComponents/GcBorder6/index.vue b/data-room-ui/packages/BorderComponents/GcBorder6/index.vue new file mode 100644 index 00000000..cf279bbb --- /dev/null +++ b/data-room-ui/packages/BorderComponents/GcBorder6/index.vue @@ -0,0 +1,88 @@ + + + + diff --git a/data-room-ui/packages/BorderComponents/GcBorder6/setting.js b/data-room-ui/packages/BorderComponents/GcBorder6/setting.js new file mode 100644 index 00000000..65ada105 --- /dev/null +++ b/data-room-ui/packages/BorderComponents/GcBorder6/setting.js @@ -0,0 +1,44 @@ + +const type = 'GcBorder6' + +const name = '边框六' +// 右侧配置项 +const setting = [ + // 背景色 + { + label:'背景色', + // 设置组件类型, select / input / colorPicker + type: 'colorPicker', + // 字段 + field: 'backgroundColor', + optionField: 'backgroundColor', // 对应options中的字段 + // 是否多选 + multiple: false, + // 绑定的值 + value: '', + }, + // 标题字体颜色 + { + label:'标题字体颜色', + // 设置组件类型, select / input / colorPicker + type: 'colorPicker', + // 字段 + field: 'fontColor', + optionField: 'fontColor', // 对应options中的字段 + // 是否多选 + multiple: false, + // 绑定的值 + value: '', + }, + + +] + + + + +export default { + setting, + type, + name +} diff --git a/data-room-ui/packages/BorderComponents/GcBorder7/component.png b/data-room-ui/packages/BorderComponents/GcBorder7/component.png new file mode 100644 index 00000000..1dfbdb02 Binary files /dev/null and b/data-room-ui/packages/BorderComponents/GcBorder7/component.png differ diff --git a/data-room-ui/packages/BorderComponents/GcBorder7/index.vue b/data-room-ui/packages/BorderComponents/GcBorder7/index.vue new file mode 100644 index 00000000..ac6808b6 --- /dev/null +++ b/data-room-ui/packages/BorderComponents/GcBorder7/index.vue @@ -0,0 +1,88 @@ + + + + diff --git a/data-room-ui/packages/BorderComponents/GcBorder7/setting.js b/data-room-ui/packages/BorderComponents/GcBorder7/setting.js new file mode 100644 index 00000000..9cdcfe38 --- /dev/null +++ b/data-room-ui/packages/BorderComponents/GcBorder7/setting.js @@ -0,0 +1,44 @@ + +const type = 'GcBorder7' + +const name= '边框七' +// 右侧配置项 +const setting = [ + // 背景色 + { + label:'背景色', + // 设置组件类型, select / input / colorPicker + type: 'colorPicker', + // 字段 + field: 'backgroundColor', + optionField: 'backgroundColor', // 对应options中的字段 + // 是否多选 + multiple: false, + // 绑定的值 + value: '', + }, + // 标题字体颜色 + { + label:'标题字体颜色', + // 设置组件类型, select / input / colorPicker + type: 'colorPicker', + // 字段 + field: 'fontColor', + optionField: 'fontColor', // 对应options中的字段 + // 是否多选 + multiple: false, + // 绑定的值 + value: '', + }, + + +] + + + + +export default { + setting, + type, + name +} diff --git a/data-room-ui/packages/BorderComponents/GcBorder8/component.png b/data-room-ui/packages/BorderComponents/GcBorder8/component.png new file mode 100644 index 00000000..c9b3a1cc Binary files /dev/null and b/data-room-ui/packages/BorderComponents/GcBorder8/component.png differ diff --git a/data-room-ui/packages/BorderComponents/GcBorder8/index.vue b/data-room-ui/packages/BorderComponents/GcBorder8/index.vue new file mode 100644 index 00000000..ae941a29 --- /dev/null +++ b/data-room-ui/packages/BorderComponents/GcBorder8/index.vue @@ -0,0 +1,88 @@ + + + + diff --git a/data-room-ui/packages/BorderComponents/GcBorder8/setting.js b/data-room-ui/packages/BorderComponents/GcBorder8/setting.js new file mode 100644 index 00000000..99033210 --- /dev/null +++ b/data-room-ui/packages/BorderComponents/GcBorder8/setting.js @@ -0,0 +1,44 @@ + +const type = 'GcBorder8' + +const name='边框八' +// 右侧配置项 +const setting = [ + // 背景色 + { + label:'背景色', + // 设置组件类型, select / input / colorPicker + type: 'colorPicker', + // 字段 + field: 'backgroundColor', + optionField: 'backgroundColor', // 对应options中的字段 + // 是否多选 + multiple: false, + // 绑定的值 + value: '', + }, + // 标题字体颜色 + { + label:'标题字体颜色', + // 设置组件类型, select / input / colorPicker + type: 'colorPicker', + // 字段 + field: 'fontColor', + optionField: 'fontColor', // 对应options中的字段 + // 是否多选 + multiple: false, + // 绑定的值 + value: '', + }, + + +] + + + + +export default { + setting, + type, + name +} diff --git a/data-room-ui/packages/BorderComponents/GcBorder9/component.png b/data-room-ui/packages/BorderComponents/GcBorder9/component.png new file mode 100644 index 00000000..33befc5e Binary files /dev/null and b/data-room-ui/packages/BorderComponents/GcBorder9/component.png differ diff --git a/data-room-ui/packages/BorderComponents/GcBorder9/index.vue b/data-room-ui/packages/BorderComponents/GcBorder9/index.vue new file mode 100644 index 00000000..fda5e02f --- /dev/null +++ b/data-room-ui/packages/BorderComponents/GcBorder9/index.vue @@ -0,0 +1,88 @@ + + + + diff --git a/data-room-ui/packages/BorderComponents/GcBorder9/setting.js b/data-room-ui/packages/BorderComponents/GcBorder9/setting.js new file mode 100644 index 00000000..ab22eb7c --- /dev/null +++ b/data-room-ui/packages/BorderComponents/GcBorder9/setting.js @@ -0,0 +1,44 @@ + +const type = 'GcBorder9' + +const name='边框九' +// 右侧配置项 +const setting = [ + // 背景色 + { + label:'背景色', + // 设置组件类型, select / input / colorPicker + type: 'colorPicker', + // 字段 + field: 'backgroundColor', + optionField: 'backgroundColor', // 对应options中的字段 + // 是否多选 + multiple: false, + // 绑定的值 + value: '', + }, + // 标题字体颜色 + { + label:'标题字体颜色', + // 设置组件类型, select / input / colorPicker + type: 'colorPicker', + // 字段 + field: 'fontColor', + optionField: 'fontColor', // 对应options中的字段 + // 是否多选 + multiple: false, + // 绑定的值 + value: '', + }, + + +] + + + + +export default { + setting, + type, + name +} diff --git a/data-room-ui/packages/BorderComponents/bordersList.js b/data-room-ui/packages/BorderComponents/bordersList.js index 76c5e86e..35447063 100644 --- a/data-room-ui/packages/BorderComponents/bordersList.js +++ b/data-room-ui/packages/BorderComponents/bordersList.js @@ -9,7 +9,7 @@ files.keys().forEach(key => { const img = require(`../BorderComponents/${title}/component.png`) borderComponents.push({ title:title, - img + img, }) }) // 抛出内置系统组件 diff --git a/data-room-ui/packages/BorderComponents/settingList.js b/data-room-ui/packages/BorderComponents/settingList.js new file mode 100644 index 00000000..b37922a4 --- /dev/null +++ b/data-room-ui/packages/BorderComponents/settingList.js @@ -0,0 +1,16 @@ +const files = require.context('../BorderComponents/', true, /setting.js$/) +const plotList = [] +// 获取plot配置 + files.keys().forEach((key) => { + // ./折线图/基础折线图.js + // 取到 "基础折线图" + const config = files(key).default + plotList.push({ + type: config.type, + setting: config.setting, + name:config.name + }) + }) +export default plotList + + diff --git a/data-room-ui/packages/BorderSelect/index.vue b/data-room-ui/packages/BorderSelect/index.vue index 4d6b71e1..41e55500 100644 --- a/data-room-ui/packages/BorderSelect/index.vue +++ b/data-room-ui/packages/BorderSelect/index.vue @@ -17,7 +17,6 @@ :style="{ display: remoteComponentsGridComputed ? 'grid' : 'flex', justifyContent: remoteComponentsGridComputed ? 'space-around' : 'flex-start', - height: 'calc(100vh - 430px)' }" >
{ export function basicComponentsConfig (item) { return { ...item, - border:{type:'',titleHeight:60,fontSize:30,color:['#5B8FF9', '#61DDAA', '#5D7092', '#F6BD16', '#6F5EF9']}, + border:{type:'',titleHeight:60,fontSize:30}, option: cloneDeep(setModules[item.type]), ...cloneDeep(dataModules[item.type]) }