diff --git a/data-room-ui/packages/BasicComponents/Sankey/index.vue b/data-room-ui/packages/BasicComponents/Sankey/index.vue
index c7b42865..4f76ddfa 100644
--- a/data-room-ui/packages/BasicComponents/Sankey/index.vue
+++ b/data-room-ui/packages/BasicComponents/Sankey/index.vue
@@ -199,6 +199,10 @@ export default {
series: [
{
type: 'sankey',
+ top: config.customize.top || 20,
+ bottom: config.customize.bottom || 20,
+ left: config.customize.left || 20,
+ right: config.customize.right || 50,
label: {
show: true,
position: config.customize.normal.labelPosition || 'right',
diff --git a/data-room-ui/packages/BasicComponents/Sankey/setting.vue b/data-room-ui/packages/BasicComponents/Sankey/setting.vue
index 0ce8885f..e94a3f01 100644
--- a/data-room-ui/packages/BasicComponents/Sankey/setting.vue
+++ b/data-room-ui/packages/BasicComponents/Sankey/setting.vue
@@ -290,6 +290,35 @@
</el-select>
</el-form-item>
</div>
+ <SettingTitle>
+ 边距
+ </SettingTitle>
+ <div class="lc-field-body">
+ <el-form-item label="上边距">
+ <el-input-number
+ v-model="config.customize.top"
+ class="bs-el-input-number"
+ />
+ </el-form-item>
+ <el-form-item label="下边距">
+ <el-input-number
+ v-model="config.customize.bottom"
+ class="bs-el-input-number"
+ />
+ </el-form-item>
+ <el-form-item label="左边距">
+ <el-input-number
+ v-model="config.customize.left"
+ class="bs-el-input-number"
+ />
+ </el-form-item>
+ <el-form-item label="右边距">
+ <el-input-number
+ v-model="config.customize.right"
+ class="bs-el-input-number"
+ />
+ </el-form-item>
+ </div>
</el-form>
</div>
</template>
diff --git a/data-room-ui/packages/BasicComponents/Sankey/settingConfig.js b/data-room-ui/packages/BasicComponents/Sankey/settingConfig.js
index 5180548a..11656abe 100644
--- a/data-room-ui/packages/BasicComponents/Sankey/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/Sankey/settingConfig.js
@@ -51,6 +51,10 @@ const customConfig = {
},
customize: {
// 自定义样式
+ top: 20,
+ bottom: 20,
+ left: 20,
+ right: 50,
normal: {
labelPosition: 'right',
labelColor: '#fff',
@@ -83,7 +87,7 @@ export const dataConfig = {
export const sankeyData = {
name: '桑基图',
title: '桑基图',
- icon: Icon.getNameList()[18],
+ icon: Icon.getNameList()[35],
border: { type: '', titleHeight: 60, fontSize: 16, isTitle: true, padding: [0, 0, 0, 0] },
className:
'com.gccloud.dataroom.core.module.chart.components.ScreenCandlestickChart',
diff --git a/data-room-ui/packages/G2Plots/plotListSort.js b/data-room-ui/packages/G2Plots/plotListSort.js
index 88fd6e53..7e9d6dea 100644
--- a/data-room-ui/packages/G2Plots/plotListSort.js
+++ b/data-room-ui/packages/G2Plots/plotListSort.js
@@ -30,7 +30,6 @@ export default [
'基础玉珏图',
- '基础桑基图',
'基础瀑布图',
'水波图',
diff --git a/data-room-ui/packages/G2Plots/桑基图/基础桑基图.js b/data-room-ui/packages/G2Plots/桑基图/基础桑基图.js
deleted file mode 100644
index 1eae0fc4..00000000
--- a/data-room-ui/packages/G2Plots/桑基图/基础桑基图.js
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * @description: 桑基图
- * @Date: 2024-0625
- * @Author: liu.shiyi
- */
-
-// 配置版本号
-const version = '2023111501'
-// 分类
-const category = 'Sankey'
-// 标题
-const title = '基础桑基图'
-// 类别， new Line()
-const chartType = 'Sankey'
-// 用于标识，唯一，和文件夹名称一致
-const name = 'JICHUSANGJITU'
-
-// 右侧配置项
-const setting = [
- {
- label: '起始节点',
- type: 'select', // 设置组件类型
- field: 'sourceField', // 字段
- optionField: 'sourceField', // 对应options中的字段
- // 是否多选
- multiple: false,
- value: '',
- tabName: 'data'
- },
- {
- label: '目标节点',
- type: 'select', // 设置组件类型
- field: 'targetField', // 字段
- optionField: 'targetField', // 对应options中的字段
- // 是否多选
- multiple: false,
- value: '',
- tabName: 'data'
- },
- {
- label: '权重',
- type: 'select', // 设置组件类型
- field: 'weightField', // 字段
- optionField: 'weightField', // 对应options中的字段
- // 是否多选
- multiple: false,
- value: '',
- tabName: 'data'
- },
- /** 样式配置 **/
- // 图表 graph
- {
- label: '背景颜色',
- // 设置组件类型
- type: 'colorSelect',
- // 字段
- field: 'color',
- // 对应options中的字段
- optionField: 'color',
- value: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
- tabName: 'custom',
- groupName: 'graph'
- },
- {
- label: '节点背景颜色',
- type: 'colorPicker',
- field: 'nodeStyle_fill',
- optionField: 'nodeStyle.fill',
- value: '#E5E6EB10',
- tabName: 'custom',
- groupName: 'graph'
- },
- {
- label: '节点边框颜色',
- type: 'colorPicker',
- field: 'nodeStyle_stroke',
- optionField: 'nodeStyle.stroke',
- value: '#E5E6EB10',
- tabName: 'custom',
- groupName: 'graph'
- }
- // X轴 xAxis
-]
-
-// 模拟数据
-const data = [
- { source: '首次打开', target: '首页 UV', value: 160 },
- { source: '结果页', target: '首页 UV', value: 40 },
- { source: '验证页', target: '首页 UV', value: 10 },
- { source: '我的', target: '首页 UV', value: 10 },
- { source: '朋友', target: '首页 UV', value: 8 },
- { source: '其他来源', target: '首页 UV', value: 27 },
- { source: '首页 UV', target: '理财', value: 30 },
- { source: '首页 UV', target: '扫一扫', value: 40 },
- { source: '首页 UV', target: '服务', value: 35 },
- { source: '首页 UV', target: '蚂蚁森林', value: 25 },
- { source: '首页 UV', target: '跳失', value: 10 },
- { source: '首页 UV', target: '借呗', value: 30 },
- { source: '首页 UV', target: '花呗', value: 40 },
- { source: '首页 UV', target: '其他流向', value: 45 }
-]
-// 配置处理脚本
-const optionHandler = ''
-
-// 数据处理脚本
-const dataHandler = ''
-
-// 图表配置 new Line('domName', option)
-const option = {
- // 数据将要放入到哪个字段中
- dataKey: 'data',
- // 图表内边距
- appendPadding: [0, 0, 0, 0],
- data,
- sourceField: 'source',
- targetField: 'target',
- weightField: 'value',
- nodeWidthRatio: 0.008,
- nodePaddingRatio: 0.03,
- color: ['#6b74e4', '#4391f4', '#38bbe5', '#69d6fd', '#36c6a0'],
- nodeStyle: {
- fill: '#72CC4A', // 设置节点颜色
- stroke: '#72CC4A'
- },
- // edgeStyle: {
- // fill: '#E6E6E6', // 设置边颜色
- // stroke: '#E6E6E6',
- // fillOpacity: 0.6
- // }
-}
-export default {
- category,
- version,
- title,
- chartType,
- name,
- option,
- setting,
- dataHandler,
- optionHandler
-}
diff --git a/data-room-ui/packages/assets/images/bigScreenIcon/svg/35sankey.svg b/data-room-ui/packages/assets/images/bigScreenIcon/svg/35sankey.svg
new file mode 100644
index 00000000..98e598e7
--- /dev/null
+++ b/data-room-ui/packages/assets/images/bigScreenIcon/svg/35sankey.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1719391963543" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6430" xmlns:xlink="http://www.w3.org/1999/xlink" width="260" height="260"><path d="M533.504 529.92c31.744 33.792 62.464 67.584 94.208 99.328 11.776-5.632 23.552-11.264 35.84-16.384-38.912-29.696-74.752-64.512-111.104-99.84-6.656 5.632-12.8 11.264-18.944 16.896z" fill="#0DA8E0" p-id="6431"></path><path d="M481.792 579.584C380.416 678.4 284.672 773.12 143.36 773.12v71.68c200.704 0 294.4-101.376 422.912-181.248-27.648-28.16-55.296-56.832-84.48-83.968zM771.072 580.096c38.912-7.68 81.408-11.776 130.048-11.776V358.4c-119.808 0-210.944 44.544-289.28 104.448 50.176 47.616 101.376 90.624 159.232 117.248zM143.36 604.16v87.04c142.848 0 231.424-61.44 316.416-131.584-24.064-20.992-49.152-40.448-76.288-57.344C313.856 560.64 239.104 604.16 143.36 604.16zM516.608 512c6.144-5.12 12.288-10.24 18.944-15.36-23.552-22.528-48.128-45.568-73.728-66.56-5.12 4.608-10.24 9.728-14.848 14.336 24.064 21.504 47.104 44.544 69.632 67.584z" fill="#0CAAD7" p-id="6432"></path><path d="M519.68 374.272c26.624 25.088 52.736 51.2 78.336 75.776C675.328 398.336 767.488 358.4 901.12 358.4V189.44c-169.472 0-281.088 89.088-381.44 184.832z" fill="#0CAAD7" p-id="6433"></path><path d="M143.36 194.56v117.248c142.848 0 238.08 52.224 318.464 118.272 18.944-18.432 38.4-37.376 57.856-55.808C420.352 280.576 309.76 194.56 143.36 194.56zM901.12 696.32v-87.04c-47.616 0-90.624-10.752-130.048-29.184-39.936 7.68-75.264 18.944-108.032 32.256 64.512 49.152 138.24 83.968 238.08 83.968zM551.936 513.024c18.944-17.408 38.912-34.304 59.392-49.664-4.608-4.096-9.216-8.704-13.824-12.8-22.016 14.848-42.496 30.72-62.464 46.592 6.144 5.12 11.776 10.24 16.896 15.872z" fill="#E2F2F9" p-id="6434"></path><path d="M551.936 513.024c36.352 35.328 72.192 70.144 111.104 99.84 32.256-13.312 68.096-24.576 108.032-32.256-57.856-26.624-109.056-69.632-159.744-117.248-19.968 15.36-39.936 32.256-59.392 49.664zM598.016 450.048c-26.112-25.088-51.712-50.688-78.336-75.776-19.456 18.432-38.912 37.376-57.856 55.808 25.6 20.992 50.176 44.032 73.728 66.56 19.968-15.872 40.448-31.744 62.464-46.592z" fill="#128CB2" p-id="6435"></path><path d="M901.12 844.8v-71.68c-110.592 0-193.536-64-273.408-144.384-21.504 10.752-41.984 22.528-61.952 34.816 91.648 93.696 182.272 181.248 335.36 181.248zM516.608 512l-56.832 47.616c7.68 6.656 14.848 13.312 22.016 19.968 16.896-16.384 34.304-33.28 51.712-49.664-5.632-6.144-11.264-11.776-16.896-17.92zM143.36 317.44v117.248c99.328 0 175.616 27.136 240.128 67.072 21.504-17.92 42.496-37.376 63.488-57.344C365.056 372.736 270.336 317.44 143.36 317.44z" fill="#E2F2F9" p-id="6436"></path><path d="M481.792 579.584c29.184 27.136 56.832 55.808 83.968 83.968 19.456-12.288 39.936-24.064 61.952-34.816-31.232-31.744-61.952-65.536-94.208-99.328l-51.712 50.176zM446.976 444.416c-20.992 19.968-41.984 39.424-63.488 57.344 27.648 16.896 52.736 36.352 76.288 57.344 18.944-15.36 37.888-31.744 56.832-47.616-22.528-22.528-45.568-45.568-69.632-67.072z" fill="#128CB2" p-id="6437"></path></svg>
\ No newline at end of file