diff --git a/data-room-ui/packages/BasicComponents/Candlestick/index.vue b/data-room-ui/packages/BasicComponents/Candlestick/index.vue new file mode 100644 index 00000000..e16adb86 --- /dev/null +++ b/data-room-ui/packages/BasicComponents/Candlestick/index.vue @@ -0,0 +1,240 @@ + + + + diff --git a/data-room-ui/packages/BasicComponents/Candlestick/setting.vue b/data-room-ui/packages/BasicComponents/Candlestick/setting.vue new file mode 100644 index 00000000..39e67ad0 --- /dev/null +++ b/data-room-ui/packages/BasicComponents/Candlestick/setting.vue @@ -0,0 +1,570 @@ + + + + diff --git a/data-room-ui/packages/BasicComponents/Candlestick/settingConfig.js b/data-room-ui/packages/BasicComponents/Candlestick/settingConfig.js new file mode 100644 index 00000000..0eba99fe --- /dev/null +++ b/data-room-ui/packages/BasicComponents/Candlestick/settingConfig.js @@ -0,0 +1,145 @@ +import { commonConfig, displayOption } from 'data-room-ui/js/config' +import Icon from 'data-room-ui/assets/images/bigScreenIcon/export' +import cloneDeep from 'lodash/cloneDeep' + +export const settingConfig = { + padding: [30, 30, 50, 80], + legend: false, + isGroup: true, + data: [], + color: '', + theme: 'dark', + displayOption: { + ...displayOption, + params: { + enable: true + }, + headerField: { + enable: false + }, + mapField: { + enable: true + }, + metricField: { + // 指标 + label: '维度', + enable: false, + multiple: false // 是否多选 + }, + dimensionField: { + // 表格列 + label: '展示字段', // 维度/查询字段 + enable: false, + multiple: false // 是否多选 + } + } +} +const customConfig = { + type: 'candlestick', + root: { + version: '2023071001', + contribution: false, + // 绕x轴旋转角度 + rotateX: 0, + // 绕y轴旋转角度 + rotateY: 0, + // 绕z轴旋转角度 + rotateZ: 0, + // 透视距离 + perspective: 0, + skewX: 0, + skewY: 0 + }, + customize: { + mapId: '667', + // 缩放尺寸 + zoom: 1, + center1: 50, + center2: 50, + // 是否显示文字 + mapName: true, + // 文字颜色 + mapNameColor: '#fff', + // 文字大小 + mapNameSize: 8, + // 文字权重 + mapNameWeight: 500, + // 地图背景色 + backgroundColor: 'rgb(0,0,0,0)', + // 是否打点 + scatter: true, + // 悬浮框背景色 + tooltipBackgroundColor: '#0C121C', + // 悬浮框边框色 + borderColor: 'rgba(0, 0, 0, 0.16)', + // 悬浮框数值标题 + tooltipTitle: 'GDP', + // 点颜色 + scatterBackgroundColor: 'rgba(255,0,0,.7)', + // 显示点文字 + showScatterValue: true, + // 点文字颜色 + scatterColor: '#fff', + // 点形状 + scatterSymbol: 'circle', + // 点大小 + scatterSize: 40, + // 分割线颜色 + mapLineColor: 'rgba(53, 86, 165, 1)', + fontGraphicColor: '#fff', + fontSize: '30', + // 是否开启下钻 + down: true, + // 允许下钻的层级 + downLevel: 1, + // 地图级别 + level: '2', + // 范围 + scope: '中国', + // 地图区域颜色 + areaColor: 'rgba(31, 50, 121, 1)', + // 地图区域悬浮颜色 + emphasisColor: '#389BB7', + // 是否开启筛选 + visual: false, + // 筛选范围 + range: [0, 6000], + // 从上到下的颜色 + rangeColor: ['#007aff', '#A5CC82'], + // 地图数据 + dataMap: '中华人民共和国.json', + // 展示字段 + value: '', + // 横坐标 + xaxis: '', + // 纵坐标 + yaxis: '', + // 名称 + name: '' + + } +} + +export const dataConfig = { + ...commonConfig(customConfig) +} + +export const candlestickData = { + name: 'K线图', + title: 'K线图', + icon: Icon.getNameList()[34], + border: { type: '', titleHeight: 60, fontSize: 16, isTitle: true, padding: [0, 0, 0, 0] }, + className: + 'com.gccloud.dataroom.core.module.chart.components.ScreenMapChart', + w: 800, + h: 700, + x: 0, + y: 0, + type: 'candlestick', + option: { + ...cloneDeep(settingConfig) + }, + setting: undefined, // 右侧面板自定义配置 + dataHandler: {}, // 数据自定义处理js脚本 + ...cloneDeep(dataConfig) +} diff --git a/data-room-ui/packages/G2Plots/plotList.js b/data-room-ui/packages/G2Plots/plotList.js index 410979ef..a4c1cf14 100644 --- a/data-room-ui/packages/G2Plots/plotList.js +++ b/data-room-ui/packages/G2Plots/plotList.js @@ -6,6 +6,7 @@ import { dataConfig, settingConfig } from '../PlotRender/settingConfig' import { mapData } from 'data-room-ui/BasicComponents/Map/settingConfig' import { FlyMapData } from 'data-room-ui/BasicComponents/FlyMap/settingConfig' +import { candlestickData } from 'data-room-ui/BasicComponents/Candlestick/settingConfig' // import _ from 'lodash' import cloneDeep from 'lodash/cloneDeep' import sortList from './plotListSort' @@ -96,5 +97,6 @@ export function getCustomPlots () { return list } -const plots = [...plotList, ...customPlots, mapData, FlyMapData] +const plots = [...plotList, ...customPlots, candlestickData, mapData, FlyMapData] +console.log('plotList', plots) export default plots diff --git a/data-room-ui/packages/G2Plots/桑基图/基础桑基图.js b/data-room-ui/packages/G2Plots/桑基图/基础桑基图.js index 0262b90f..1eae0fc4 100644 --- a/data-room-ui/packages/G2Plots/桑基图/基础桑基图.js +++ b/data-room-ui/packages/G2Plots/桑基图/基础桑基图.js @@ -68,7 +68,7 @@ const setting = [ optionField: 'nodeStyle.fill', value: '#E5E6EB10', tabName: 'custom', - groupName: 'grid' + groupName: 'graph' }, { label: '节点边框颜色', @@ -77,7 +77,7 @@ const setting = [ optionField: 'nodeStyle.stroke', value: '#E5E6EB10', tabName: 'custom', - groupName: 'grid' + groupName: 'graph' } // X轴 xAxis ] diff --git a/data-room-ui/packages/Render/RenderCard2.vue b/data-room-ui/packages/Render/RenderCard2.vue index fc3ec297..c2ae137d 100644 --- a/data-room-ui/packages/Render/RenderCard2.vue +++ b/data-room-ui/packages/Render/RenderCard2.vue @@ -26,8 +26,9 @@ import CustomComponent from '../PlotRender/index.vue' import Svgs from '../Svgs/index.vue' import EchartsComponent from '../EchartsRender/index.vue' import RemoteComponent from 'data-room-ui/RemoteComponents/index.vue' -import Map from 'data-room-ui/BasicComponents/Map/index.vue' +import Map from 'data-room-ui/BasicComponents/Map/index.vue' import FlyMap from 'data-room-ui/BasicComponents/FlyMap/index.vue' +import candlestick from 'data-room-ui/BasicComponents/Candlestick/index.vue' const components = {} for (const key in pcComponent) { if (Object.hasOwnProperty.call(pcComponent, key)) { @@ -43,6 +44,7 @@ export default { Svgs, Map, FlyMap, + candlestick, RemoteComponent, EchartsComponent }, @@ -76,7 +78,7 @@ export default { // 切换主题时针对远程组件触发样式修改的方法 styleHandler (config) { this.$emit('styleHandler', config) - }, + } // // 打开右侧面板 // openRightPanel () { // this.$emit('openRightPanel', this.currentChart) diff --git a/data-room-ui/packages/assets/images/bigScreenIcon/svg/34candlestick.svg b/data-room-ui/packages/assets/images/bigScreenIcon/svg/34candlestick.svg new file mode 100644 index 00000000..8da511d0 --- /dev/null +++ b/data-room-ui/packages/assets/images/bigScreenIcon/svg/34candlestick.svg @@ -0,0 +1 @@ + \ No newline at end of file