From f18eef383f288e453b7b6d0a34237ddf6e6620e8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 13 五月 2025 20:50:41 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/chart/antv-X6/index.jsx | 136 +++++++--------------------------------------
1 files changed, 22 insertions(+), 114 deletions(-)
diff --git a/src/menu/components/chart/antv-X6/index.jsx b/src/menu/components/chart/antv-X6/index.jsx
index 9f923b2..b5f7239 100644
--- a/src/menu/components/chart/antv-X6/index.jsx
+++ b/src/menu/components/chart/antv-X6/index.jsx
@@ -3,17 +3,16 @@
import { is, fromJS } from 'immutable'
import { Popover } from 'antd'
import { ToolOutlined, DeleteOutlined, FontColorsOutlined } from '@ant-design/icons'
-import { Graph, Shape } from '@antv/x6'
+import { Graph } from '@antv/x6'
import MKEmitter from '@/utils/events.js'
import asyncComponent from '@/utils/asyncComponent'
import asyncIconComponent from '@/utils/asyncIconComponent'
-import { resetStyle, getTables, checkComponent } from '@/utils/utils-custom.js'
+import { resetStyle } from '@/utils/utils-custom.js'
import lanes from './lane.json'
import xflows from './xflow.json'
import './index.scss'
-const SettingComponent = asyncIconComponent(() => import('@/menu/datasource'))
const ChartCompileForm = asyncIconComponent(() => import('./chartcompile'))
const CopyComponent = asyncIconComponent(() => import('@/menu/components/share/copycomponent'))
const NormalHeader = asyncComponent(() => import('@/menu/components/share/normalheader'))
@@ -69,8 +68,8 @@
'mk-rect',
{
inherit: 'rect',
- width: 66,
- height: 36,
+ width: 100,
+ height: 32,
attrs: {
body: {
strokeWidth: 1,
@@ -90,8 +89,8 @@
'mk-polygon',
{
inherit: 'polygon',
- width: 66,
- height: 36,
+ width: 100,
+ height: 32,
attrs: {
body: {
strokeWidth: 1,
@@ -111,8 +110,8 @@
'mk-circle',
{
inherit: 'circle',
- width: 36,
- height: 36,
+ width: 40,
+ height: 40,
attrs: {
body: {
strokeWidth: 1,
@@ -132,8 +131,8 @@
'mk-ellipse',
{
inherit: 'ellipse',
- width: 66,
- height: 36,
+ width: 100,
+ height: 32,
attrs: {
body: {
strokeWidth: 1,
@@ -153,8 +152,8 @@
'mk-star',
{
inherit: 'polygon',
- width: 36,
- height: 36,
+ width: 40,
+ height: 40,
points: '100,10 40,198 190,78 10,78 160,198',
attrs: {
body: {
@@ -176,8 +175,8 @@
'mk-text',
{
inherit: 'rect',
- width: 66,
- height: 36,
+ width: 100,
+ height: 50,
attrs: {
body: {
strokeWidth: 0,
@@ -221,7 +220,8 @@
}
},
gridType: 'dot',
- export: 'png'
+ function: 'show',
+ supModule: []
}
let _card = {
@@ -233,7 +233,7 @@
width: _plot.width,
name: _plot.name,
subtype: card.subtype,
- setting: { interType: 'system' },
+ setting: { interType: '' },
style: {
borderWidth: '1px', borderColor: 'rgb(217, 217, 217)',
marginLeft: '8px', marginRight: '8px', marginTop: '8px', marginBottom: '8px'
@@ -314,6 +314,7 @@
max: 2
},
autoResize: true,
+ interacting: false,
background: {
color: card.plot.backgroundColor || 'transparent'
},
@@ -335,36 +336,6 @@
allowBlank: false,
snap: {
radius: 20
- },
- createEdge() {
- return new Shape.Edge({
- attrs: {
- line: {
- stroke: '#000000',
- strokeWidth: 1,
- targetMarker: {
- name: 'block',
- width: 12,
- height: 8
- }
- }
- },
- zIndex: 0
- })
- },
- validateConnection({ targetMagnet }) {
- return !!targetMagnet
- }
- },
- highlighting: {
- magnetAdsorbed: {
- name: 'stroke',
- args: {
- attrs: {
- fill: '#5F95FF',
- stroke: '#5F95FF'
- }
- }
}
}
})
@@ -391,6 +362,7 @@
max: 2
},
autoResize: true,
+ interacting: false,
background: { color: '#ffffff' },
mousewheel: {
enabled: true,
@@ -410,55 +382,6 @@
allowBlank: false,
snap: {
radius: 20
- },
- createEdge() {
- return new Shape.Edge({
- attrs: {
- line: {
- stroke: '#000000',
- strokeWidth: 1,
- targetMarker: {
- name: 'block',
- width: 12,
- height: 8
- }
- }
- },
- zIndex: 2
- })
- },
- validateConnection({ targetMagnet }) {
- return !!targetMagnet
- }
- },
- highlighting: {
- magnetAdsorbed: {
- name: 'stroke',
- args: {
- attrs: {
- fill: '#5F95FF',
- stroke: '#5F95FF'
- }
- }
- }
- },
- translating: {
- restrict(cellView) {
- const cell = cellView.cell
- const parentId = cell.prop('parent')
-
- if (parentId) {
- const parentNode = graph.getCellById(parentId)
- if (parentNode) {
- return parentNode.getBBox().moveAndExpand({
- x: 0,
- y: 36,
- width: 0,
- height: -36,
- })
- }
- }
- return cell.getBBox()
}
}
})
@@ -479,13 +402,8 @@
card.width = card.plot.width
card.name = card.plot.name
card.subtype = card.plot.subtype
-
- card.$c_ds = true
- card.errors = checkComponent(card)
-
- if (card.errors.length === 0) {
- card.$tables = getTables(card)
- }
+ card.errors = []
+ card.$tables = []
this.setState({
card: card
@@ -526,10 +444,9 @@
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
<ChartCompileForm config={card} plotchange={this.plotchange}/>
- <CopyComponent type="antvG6" card={card}/>
+ <CopyComponent type="antvX6" card={card}/>
<FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle}/>
<DeleteOutlined className="close" title="delete" onClick={() => this.props.deletecomponent(card.uuid)}/>
- <SettingComponent config={card} updateConfig={this.updateComponent}/>
</div>
} trigger="hover">
<ToolOutlined/>
@@ -541,15 +458,6 @@
<div className="component-name">
<div className="center">
<div className="title">{card.name}</div>
- <div className="content">
- {card.errors && card.errors.map((err, index) => {
- if (err.level === 0) {
- return <span key={index} className="error">{err.detail}</span>
- } else {
- return <span key={index} className="waring">{err.detail}锛�</span>
- }
- })}
- </div>
</div>
</div>
</div>
--
Gitblit v1.8.0