update flow

This commit is contained in:
lb 2023-10-24 11:17:07 +08:00
parent 106d0ed89c
commit 6006ae13d9
6 changed files with 420 additions and 189 deletions

View File

@ -109,7 +109,7 @@
<script> <script>
import { getAccessToken } from '@/utils/auth'; import { getAccessToken } from '@/utils/auth';
import tupleImg from '@/assets/images/tuple.png'; import tupleImg from '@/assets/images/tuple.png';
import cache from '@/views/extend/processFlow/cache'; import cache from '@/utils/cache';
/** /**
* 找到最长的label * 找到最长的label

View File

@ -44,7 +44,7 @@
<script> <script>
import basicPageMixin from '@/mixins/lb/basicPageMixin'; import basicPageMixin from '@/mixins/lb/basicPageMixin';
// import cache from './cache'; // import cache from '@/utils/cache';
const ProcessItem = { const ProcessItem = {
name: 'ProcessItem', name: 'ProcessItem',

View File

@ -12,180 +12,337 @@
<div <div
class="btns" class="btns"
style="text-align: right; position: absolute; top: 20px; right: 20px"> style="text-align: right; position: absolute; top: 20px; right: 20px">
<el-button
type="warning"
@click="undo"
plain
v-if="allowUndo"
:disabled="!allowUndo"
icon="el-icon-back">
撤销
</el-button>
<el-button
type="warning"
@click="redo"
plain
v-if="allowRedo"
:disabled="!allowRedo">
下一步
<i class="el-icon-right el-icon--right"></i>
</el-button>
<el-button <el-button
type="primary" type="primary"
plain plain
class="btn-create" class="btn-create"
icon="el-icon-plus" icon="el-icon-plus"
@click="createDet"> @click="handleAdd">
新建工序 新建工序
</el-button> </el-button>
<el-button class="btn-serialize" @click="graphToJson">序列化</el-button> <el-button class="btn-serialize" @click="graphToJson">序列化</el-button>
<el-button class="btn-antiserialize" @click="jsonToGraph"> <el-button class="btn-antiserialize" @click="jsonToGraph">
反序列化 反序列化
</el-button> </el-button>
<el-button class="btn-edit" @click="handleEdit">编辑</el-button>
<el-button type="error" class="btn-delete" @click="handleDelete">
删除
</el-button>
</div> </div>
<div class="process-graph__panel" ref="panel"></div> <div class="process-graph__panel" ref="panel"></div>
<!-- 对话框(添加 / 修改) -->
<base-dialog
:dialogTitle="title"
:dialogVisible="open"
width="35%"
@close="cancel"
@cancel="cancel"
@confirm="submitForm">
<DialogForm v-if="open" ref="form" v-model="form" :rows="rows" />
</base-dialog>
</section> </section>
</template> </template>
<script> <script>
import { Graph } from '@antv/x6'; import { Graph } from '@antv/x6';
import ProcessNode from './ProcessNode'; import ProcessNode from './ProcessNode';
import DialogForm from '@/components/DialogForm';
Graph.registerNode('process-node', ProcessNode); Graph.registerNode('process-node', ProcessNode);
export default { export default {
name: 'ProcessGraph', name: 'ProcessGraph',
components: {}, components: { DialogForm },
props: {}, props: {},
inject: ['getFlowId'],
data() { data() {
return { return {
allowRedo: false,
allowUndo: false,
graph: null, graph: null,
searchBarFormConfig: [{ label: '工序列表' }], searchBarFormConfig: [{ label: '工序列表' }],
title: '',
open: false,
form: {
name: '', //
sectionId: '', // id
remark: '', //
},
rows: [
[
{
input: true,
label: '工序名称',
prop: 'name',
rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
},
],
[
{
select: true,
label: '工段',
prop: 'sectionId',
url: '/base/core-workshop-section/listAll',
rules: [{ required: true, message: '不能为空', trigger: 'blur' }],
bind: {
filterable: true,
},
},
],
[
{
textarea: true,
label: '工序说明',
prop: 'remark',
},
],
],
updateUrl: '/extend/process-flow-det/update',
addUrl: '/extend/process-flow-det/create',
// pageUrl: '/extend/process-flow-det/get',
infoUrl: '/extend/process-flow-det/get',
}; };
}, },
watch: {
'form.sectionId': {
handler(id) {
// const { form } = this;
// const { sectionId } = form;
// if (sectionId) {
// const { label } = this.$refs['form'].getSelectItem(
// 'sectionId',
// sectionId
// );
// form.workshopName = label;
// }
},
immediate: false,
},
},
mounted() { mounted() {
const graph = new Graph({ const graph = new Graph({
container: this.$refs.panel, container: this.$refs.panel,
grid: { grid: {
size: 10, size: 10,
visible: false, visible: true,
type: 'dot', },
args: { history: true,
color: '#f005', selecting: {
thickness: 1, enabled: true,
}, rubberband: true,
movable: true,
showNodeSelectionBox: true,
className: 'process-selected',
},
snapline: true,
scroller: {
enabled: true,
}, },
}); });
graph.on('node:click', ({ node }) => {
const { processId } = node.attrs;
console.log('node:click', processId.text);
});
// const pn1 = graph.addNode({
// shape: 'process-node',
// x: 30,
// y: 30,
// processName: '00A',
// workshopName: '1',
// processDesc: 'test test test',
// processId: '1',
// tools: [{ name: 'button-remove' }],
// });
// const pn2 = graph.addNode({
// shape: 'process-node',
// x: 240,
// y: 30,
// processName: '00B',
// workshopName: '1',
// processDesc: 'test test test',
// processId: '1',
// });
// const pn3 = graph.addNode({
// shape: 'process-node',
// x: 360,
// y: 30,
// processName: '00C',
// workshopName: '1',
// processDesc: 'test test test',
// processId: '1',
// });
// const pn4 = graph.addNode({
// shape: 'process-node',
// x: 360,
// y: 120,
// processName: '00D',
// workshopName: '1',
// processDesc: 'test test test',
// processId: '1',
// });
// const pn5 = graph.addNode({
// shape: 'process-node',
// x: 500,
// y: 30,
// processName: '00E',
// workshopName: '1',
// processDesc: 'test test test',
// processId: '1',
// });
// graph.addEdge({
// source: pn1,
// target: pn2,
// router: {
// name: 'er',
// },
// attrs: {
// line: {
// stroke: '#0b58ff',
// strokeWidth: 1,
// targetMarker: {
// // name: 'classic',
// // name: 'async',
// size: 0,
// },
// },
// },
// });
// graph.addEdge({
// source: pn2,
// target: pn3,
// router: {
// name: 'er',
// },
// attrs: {
// line: {
// stroke: '#0b58ff',
// strokeWidth: 1,
// targetMarker: {
// // name: 'classic',
// // name: 'async',
// size: 0,
// },
// },
// },
// });
// graph.addEdge({
// source: pn2,
// target: pn4,
// router: {
// name: 'er',
// },
// attrs: {
// line: {
// stroke: '#0b58ff',
// strokeWidth: 1,
// targetMarker: {
// // name: 'classic',
// // name: 'async',
// size: 0,
// },
// },
// },
// });
// graph.addEdge({
// source: pn3,
// target: pn5,
// router: {
// name: 'er',
// },
// attrs: {
// line: {
// stroke: '#0b58ff',
// strokeWidth: 1,
// targetMarker: {
// // name: 'classic',
// // name: 'async',
// size: 0,
// },
// },
// },
// });
// graph.addEdge({
// source: pn4,
// target: pn5,
// router: {
// name: 'er',
// },
// attrs: {
// line: {
// stroke: '#0b58ff',
// strokeWidth: 1,
// targetMarker: {
// // name: 'classic',
// // name: 'async',
// size: 0,
// },
// },
// },
// });
const pn1 = graph.addNode({ const pn1 = graph.addNode({
shape: 'process-node', shape: 'process-node',
x: 30, x: 0,
y: 30, y: 0,
processName: '工序00A', detName: '测试工序', //
workshopName: '工段1', sectionName: 'default', //
processDesc: 'test test test', detDesc: 'loremakdfkd...', //
processId: '1', processId: 'p-1', // ID
}); detId: 'det-id-1', // ID
const pn2 = graph.addNode({ tools: [{ name: 'button-remove' }],
shape: 'process-node',
x: 240,
y: 30,
processName: '工序00B',
workshopName: '工段1',
processDesc: 'test test test',
processId: '1',
}); });
const pn3 = graph.addNode({ // const htmlNode = graph.addNode({
shape: 'process-node', // x: 0,
x: 360, // y: 0,
y: 30, // width: 200,
processName: '工序00C', // height: 100,
workshopName: '工段1', // shape: 'html',
processDesc: 'test test test', // html() {
processId: '1', // const ctn = document.createElement('div');
}); // ctn.style.width = '100%';
// ctn.style.height = '100%';
// ctn.style.border = '1px solid #ccc';
// ctn.style.background = '#fff';
// ctn.innerText = 'hello';
const pn4 = graph.addNode({ // return ctn;
shape: 'process-node', // },
x: 360, // });
y: 120,
processName: '工序00D',
workshopName: '工段1',
processDesc: 'test test test',
processId: '1',
});
const pn5 = graph.addNode({ graph.on('cell:selected', ({ cell, options }) => {
shape: 'process-node', console.log('cell:selected', cell, options);
x: 500,
y: 30,
processName: '工序00E',
workshopName: '工段1',
processDesc: 'test test test',
processId: '1',
});
graph.addEdge({
source: pn1,
target: pn2,
attrs: {
line: {
stroke: '#0b58ff',
strokeWidth: 1,
targetMarker: {
// name: 'classic',
// name: 'async',
size: 0,
},
},
},
});
graph.addEdge({
source: pn2,
target: pn3,
attrs: {
line: {
stroke: '#0b58ff',
strokeWidth: 1,
targetMarker: {
// name: 'classic',
// name: 'async',
size: 0,
},
},
},
});
graph.addEdge({
source: pn2,
target: pn4,
attrs: {
line: {
stroke: '#0b58ff',
strokeWidth: 1,
targetMarker: {
// name: 'classic',
// name: 'async',
size: 0,
},
},
},
});
graph.addEdge({
source: pn3,
target: pn5,
attrs: {
line: {
stroke: '#0b58ff',
strokeWidth: 1,
targetMarker: {
// name: 'classic',
// name: 'async',
size: 0,
},
},
},
});
graph.addEdge({
source: pn4,
target: pn5,
attrs: {
line: {
stroke: '#0b58ff',
strokeWidth: 1,
targetMarker: {
// name: 'classic',
// name: 'async',
size: 0,
},
},
},
}); });
this.graph = graph; this.graph = graph;
// console.log('selected:', this.graph.selection.widget.container)
}, },
computed: {}, computed: {},
methods: { methods: {
@ -196,6 +353,109 @@ export default {
console.log(JSON.stringify(this.graph.toJSON(), null, 2)); console.log(JSON.stringify(this.graph.toJSON(), null, 2));
} }
}, },
reset() {
this.form = {
name: '', //
sectionId: '', // id
remark: '', //
};
this.resetForm('form');
},
/** 取消按钮 */
cancel() {
this.open = false;
this.reset();
},
handleAdd() {
this.reset();
this.open = true;
this.title = '添加工序';
},
handleEdit() {
this.open = true;
this.title = '编辑工序';
},
handleDelete(id) {},
/** 提交按钮 */
submitForm() {
this.$refs['form'].validate((valid) => {
if (!valid) {
return;
}
//
if (this.form.id != null) {
this.updateProcess();
return;
}
this.createProcess().then((id) => {
if (!id) return;
this.graph.addNode(
this.createProcessNode({
flowId: this.flowId,
...this.form,
id,
})
);
});
});
},
createProcessNode({ flowId, name, id, remark, sectionId }) {
return {
shape: 'process-node',
x: 0,
y: 0,
detName: name, //
sectionName: 'default', //
detDesc: remark, //
processId: flowId, // ID
detId: id, // ID
tools: [{ name: 'button-remove' }],
};
},
updateProcess() {
return updateEquipmentType(this.form).then((response) => {
this.$modal.msgSuccess('修改成功');
this.open = false;
// this.getList();
});
},
createProcess() {
const flowId = this.$route.params.id;
// const t = this.getFlowId(); // it also works
if (!flowId) {
this.$modal.msgError('工艺ID不能为空');
return Promise.reject(null);
}
//
return this.post({ flowId: this.flowId, ...this.form }).then(
({ code, data }) => {
this.$modal.msgSuccess('新增成功');
this.open = false;
// this.getList();
return data;
}
);
},
put(payload) {
return this.http(this.updateUrl, 'put', payload);
},
post(payload) {
return this.http(this.addUrl, 'post', payload);
},
recv(payload) {
return this.http(this.pageUrl, 'get', payload);
},
info(payload) {
return this.http(this.infoUrl, 'get', payload);
},
http(url, method, payload) {
return this.$axios({
url,
method,
params: method === 'get' ? payload : null,
data: method !== 'get' ? payload : null,
})
},
}, },
}; };
</script> </script>
@ -212,3 +472,9 @@ export default {
height: 300px; height: 300px;
} }
</style> </style>
<style>
.x6-widget-selection-selected {
border: 1px solid red;
}
</style>

View File

@ -11,13 +11,14 @@ ProcessNode.config({
markup: [ markup: [
{ {
tagName: 'rect', tagName: 'rect',
selector: 'container',
attrs: { attrs: {
x: 0, x: 0,
y: 0, y: 0,
width: 200, width: 200,
height: 100, height: 100,
fill: 'transparent', fill: 'transparent',
stroke: '#0b58ff' stroke: '#ccc'
}, },
}, },
{ {
@ -42,7 +43,7 @@ ProcessNode.config({
}, },
{ {
tagName: 'text', tagName: 'text',
selector: 'processName', selector: 'detName',
attrs: { attrs: {
x: 20, x: 20,
y: 30, y: 30,
@ -52,7 +53,7 @@ ProcessNode.config({
}, },
{ {
tagName: 'text', tagName: 'text',
selector: 'workshopName', selector: 'sectionName',
attrs: { attrs: {
x: 115, x: 115,
y: 30, y: 30,
@ -62,74 +63,27 @@ ProcessNode.config({
}, },
{ {
tagName: 'text', tagName: 'text',
selector: 'processDesc', selector: 'detDesc',
// textContent: '工序00A', // textContent: '工序00A',
attrs: { attrs: {
x: 26, x: 26,
y: 80, y: 80,
fill: '#777', fill: '#777',
fontSize: 14 fontSize: 14,
fill: '#1a90fc',
// lengthAdjust: 'spacingAndGlyphs',
// textLength: 180
}, },
}, },
// {
// tagName: 'text',
// textContent: '工序名称',
// attrs: {
// x: 20,
// y: 30,
// },
// },
// {
// tagName: 'text',
// textContent: '工段名称',
// attrs: {
// x: 115,
// y: 30,
// },
// },
// {
// tagName: 'text',
// selector: 'processName',
// // textContent: '工序00A',
// attrs: {
// x: 26,
// y: 80,
// fill: '#777',
// fontSize: 14
// },
// },
// {
// tagName: 'text',
// selector: 'workshopName',
// // textContent: '工段1',
// attrs: {
// x: 128,
// y: 80,
// fill: '#777',
// fontSize: 14
// },
// },
], ],
//
propHooks(metadata) { propHooks(metadata) {
const { processName, workshopName, processDesc, processId, ...others } = metadata; const { detId, detName, detDesc, sectionName, processId, ...others } = metadata;
// debugger; // debugger;
if (processName) { if (detName) ObjectExt.setByPath(others, 'attrs/detName/text', detName);
console.log("processName", processName) if (detDesc) ObjectExt.setByPath(others, 'attrs/detDesc/text', detDesc);
ObjectExt.setByPath(others, 'attrs/processName/text', processName); if (sectionName) ObjectExt.setByPath(others, 'attrs/sectionName/text', sectionName);
} if (detId) ObjectExt.setByPath(others, 'attrs/detId', detId);
if (workshopName) { if (processId) ObjectExt.setByPath(others, 'attrs/processId', processId);
console.log("workshopName", workshopName)
ObjectExt.setByPath(others, 'attrs/workshopName/text', workshopName);
}
if (processDesc) {
console.log("processDesc", processDesc)
ObjectExt.setByPath(others, 'attrs/processDesc/text', processDesc);
}
if (processId) {
console.log("processId", processId)
ObjectExt.setByPath(others, 'processId', processId);
}
return others; return others;
} }
}) })

View File

@ -23,10 +23,21 @@ export default {
components: { ProcessInfo, ProcessDetail, ProcessBomList }, components: { ProcessInfo, ProcessDetail, ProcessBomList },
props: {}, props: {},
data() { data() {
return {}; return {
flowId: null,
};
},
provide() {
const that = this;
return {
getFlowId() {
return that.flowId;
},
};
}, },
activated() { activated() {
console.log('activated...', this.$route.params); console.log('activated...', this.$route.params);
this.flowId = this.$route.params.id;
}, },
computed: {}, computed: {},
methods: {}, methods: {},