From b69b5f6329ca5f87932436b7a6c1ddfc3377e10f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 16 五月 2024 10:56:41 +0800
Subject: [PATCH] 2024-05-16
---
src/tabviews/custom/components/chart/antv-X6/index.jsx | 75 ++++++++++++++++++++++++++++++++-----
1 files changed, 64 insertions(+), 11 deletions(-)
diff --git a/src/tabviews/custom/components/chart/antv-X6/index.jsx b/src/tabviews/custom/components/chart/antv-X6/index.jsx
index 4e155ba..ad2f38a 100644
--- a/src/tabviews/custom/components/chart/antv-X6/index.jsx
+++ b/src/tabviews/custom/components/chart/antv-X6/index.jsx
@@ -388,7 +388,8 @@
status: 0,
flowname: '',
flowcode: '',
- orgs: []
+ orgs: [],
+ empty: true
}
selectNode = null
@@ -526,6 +527,7 @@
worker_id: work.worker_id || '',
workercode: work.workercode || '',
workername: work.workername || '',
+ job_type: job.job_type || '',
parentIds: [com.OrgCode, dep.co_pro_code, job.jobcode],
parentNames: [com.OrgName, dep.co_pro_name, job.jobname]
}
@@ -553,6 +555,7 @@
worker_id: work.worker_id || '',
workercode: work.workercode || '',
workername: work.workername || '',
+ job_type: job.job_type || '',
parentIds: [com.OrgCode, dep.co_pro_code, job.jobcode, group.work_group],
parentNames: [com.OrgName, dep.co_pro_name, job.jobname, group.work_group]
}
@@ -590,8 +593,8 @@
const { BID } = this.state
if (!BID) {
+ this.cells = []
if (!is(fromJS(this.data), fromJS([]))) {
- this.cells = []
this.handleData()
}
this.setState({empty: true})
@@ -624,7 +627,8 @@
status: item.status || 0,
flowname: item.works_flow_name || '',
flowcode: item.works_flow_code || '',
- loading: false
+ loading: false,
+ empty: cells.length === 0
})
if (result.message) {
@@ -994,6 +998,18 @@
graph.clearTransformWidgets()
})
+
+ graph.on('node:dblclick', () => {
+ setTimeout(() => {
+ MKEmitter.emit('mk-x6-dbclick')
+ }, 100)
+ })
+ graph.on('edge:dblclick', () => {
+ setTimeout(() => {
+ MKEmitter.emit('mk-x6-dbclick')
+ }, 100)
+ })
+
graph.on('blank:click', () => {
this.selectNode = null
@@ -1003,15 +1019,30 @@
if (!isNew) return
let target = edge.getTargetCell()
+ let source = edge.getSourceCell()
- if (!target) return
+ if (!target || !source) return
+
+ if (source.prop('mknode') === 'end') {
+ notification.warning({
+ top: 92,
+ message: '缁撴潫鑺傜偣涓嶅彲娣诲姞鍒嗘敮锛�',
+ duration: 2
+ })
+ graph.removeCells([edge])
+ return
+ }
let mkdata = target.prop('mkdata')
- if (target.prop('mknode') === 'end') {
+ if (source.prop('mknode') === 'start' && target.prop('mknode') === 'end') {
+ edge.prop('mknode', 'throughEdge')
+ } else if (target.prop('mknode') === 'end') {
edge.prop('mknode', 'endEdge')
} else if (target.prop('mknode') === 'start') {
edge.prop('mknode', 'startEdge')
+ } else if (source.prop('mknode') === 'start') {
+ edge.prop('mknode', 'firstEdge')
}
if (mkdata) {
edge.prop('mkdata', {status: mkdata.status, statusName: mkdata.statusName})
@@ -1594,7 +1625,13 @@
} else if (item.mknode === 'end') {
end_num++
} else if (item.shape === 'edge') {
- if (item.mknode !== 'endEdge' && item.mknode !== 'startEdge' && (!item.mkdata.members || item.mkdata.members.length === 0)) {
+ if (item.mknode === 'throughEdge') {
+ if (!item.mkdata.seniorbers || item.mkdata.seniorbers.length === 0) {
+ unvalid = true
+ }
+ } else if (item.mkdata.seniorCondition === 'open') {
+
+ } else if (item.mknode !== 'endEdge' && item.mknode !== 'startEdge' && (!item.mkdata.members || item.mkdata.members.length === 0)) {
unvalid = true
} else if (item.mknode === 'startEdge' || item.mkdata.flowType === 'reject') {
if (map.has(item.source.cell)) {
@@ -1857,6 +1894,16 @@
}
}
+ delCell = () => {
+ const { node } = this.state
+
+ let cell = this.mkGraph.getCellById(node.id)
+
+ this.mkGraph.removeCells([cell])
+
+ this.setState({node: null})
+ }
+
changeProps = (value, key) => {
const { node } = this.state
@@ -2062,7 +2109,13 @@
} else if (item.mknode === 'end') {
end_num++
} else if (item.shape === 'edge' && !unvalidId && !rejectId && !approvalId) {
- if (item.mknode !== 'endEdge' && item.mknode !== 'startEdge' && (!item.mkdata.members || item.mkdata.members.length === 0)) {
+ if (item.mknode === 'throughEdge') {
+ if (!item.mkdata.seniorbers || item.mkdata.seniorbers.length === 0) {
+ unvalidId = item.id
+ }
+ } else if (item.mkdata.seniorCondition === 'open') {
+
+ } else if (item.mknode !== 'endEdge' && item.mknode !== 'startEdge' && (!item.mkdata.members || item.mkdata.members.length === 0)) {
unvalidId = item.id
} else if (item.mknode === 'startEdge' || item.mkdata.flowType === 'reject') {
if (map.has(item.source.cell)) {
@@ -2224,12 +2277,12 @@
}
render() {
- const { loading, config, node, orgs, status, flowname } = this.state
+ const { loading, config, node, orgs, status, flowname, empty } = this.state
let style = {...config.style}
if (config.plot.function === 'show') {
- if (config.plot.empty === 'hidden' && this.cells.length === 0) {
+ if (config.plot.empty === 'hidden' && empty) {
style.position = 'absolute'
style.width = '100%'
style.zIndex = -1
@@ -2286,7 +2339,7 @@
<Tooltip title="娓呯┖">
<ClearOutlined onClick={this.clearNode}/>
</Tooltip>
- <Tooltip overlayStyle={{maxWidth: 260}} title="蹇嵎閿細澶嶅埗锛坈trl+c锛夈�佸壀鍒囷紙ctrl+x锛夈�佺矘璐达紙ctrl+v锛夈�佸悗閫�锛坈trl+z锛夈�佸墠杩涳紙ctrl+shift+z锛夈�佸垹闄わ紙backspace 鎴� delete锛�">
+ <Tooltip overlayStyle={{maxWidth: 310}} title="蹇嵎閿細澶嶅埗锛坈trl+c锛夈�佸壀鍒囷紙ctrl+x锛夈�佺矘璐达紙ctrl+v锛夈�佸悗閫�锛坈trl+z锛夈�佸墠杩涳紙ctrl+shift+z锛夈�佸垹闄わ紙backspace 鎴� delete锛夛紱鍙屽嚮鑺傜偣鎴栬繛绾垮彲缂栬緫鑷畾涔変俊鎭��">
<QuestionCircleOutlined />
</Tooltip>
</div>
@@ -2302,7 +2355,7 @@
<div id={config.uuid + 'container'} className="mk-container"></div>
<div className="mk-node-edit">
<div className="header">璁剧疆</div>
- {!node ? <div className="empty">鏈�変腑</div> : <NodeUpdate node={node} orgs={orgs} onChange={this.changeProps}/>}
+ {!node ? <div className="empty">鏈�変腑</div> : <NodeUpdate node={node} orgs={orgs} onChange={this.changeProps} onDel={this.delCell}/>}
</div>
</div>
</div>
--
Gitblit v1.8.0