This commit is contained in:
Binlin B Wang 2022-08-14 17:09:03 +08:00
parent 1431a586ab
commit 454224f069
4 changed files with 234 additions and 135 deletions

View File

@ -3,6 +3,6 @@ server:
spring:
datasource: #数据源相关配置
url: jdbc:mysql://localhost:3306/resume?userUnicode=true&characterEncodinf=UTF-8&autoReconnect=true
username: resume
password: cKWpc2BhYhrGEwMT
url: jdbc:mysql://192.168.101.100:3306/flowable_web?userUnicode=true&characterEncodinf=UTF-8&autoReconnect=true
username: root
password: password

View File

@ -7,6 +7,7 @@ Vue.use(Vuex)
export default new Vuex.Store({
state: {
nodeMap: new Map(),
parentMap: new Map(),
isEdit: null,
selectedNode: {},
selectFormItem: null,

View File

@ -48,7 +48,9 @@ export default {
isNew: true,
validStep: 0,
timer: null,
activeSelect: 'baseSetting',
//todo
// activeSelect: 'baseSetting',
activeSelect: 'processDesign',
validVisible: false,
validResult: {},
validOptions: [
@ -58,6 +60,7 @@ export default {
{title: '扩展设置', description: '', icon: '', status: ''}
],
validComponents: ['baseSetting', 'formSetting', 'processDesign', 'proSetting'],
array:[],
}
},
computed: {
@ -202,11 +205,31 @@ export default {
},
doAfter() {
if (this.validResult.success) {
// let process = this.setup.process
// console.log(process)
// this.tarry(process)
//
//
// console.log(this.array)
// this.setup.process = this.array
this.doPublish()
} else {
this.activeSelect = this.validComponents[this.validStep]
this.validVisible = false
}
},
tarry(node){
if (node&&node.id){
let newNode = {...node}
newNode.children=null
this.array.push(newNode)
this.tarry(node.children)
}
},
stopTimer() {
if (this.timer) {
@ -219,6 +242,7 @@ export default {
publishProcess() {
this.validateDesign()
},
// todo
doPublish() {
this.$confirm('如果您只想预览请选择预览,确认发布后流程立即生效,是否继续?', '提示', {
confirmButtonText: '发布',

View File

@ -20,92 +20,124 @@ export default {
valid: true
}
},
computed:{
nodeMap(){
computed: {
nodeMap() {
return this.$store.state.nodeMap;
},
dom(){
parentIdMap() {
return this.$store.state.parentMap;
},
dom() {
return this.$store.state.design.process;
}
},
render(h, ctx) {
console.log("渲染流程树")
this.nodeMap.clear()
let processTrees = this.getDomTree(h, this.dom)
this.toMapping(this.dom)
console.log(this.nodeMap, this.parentIdMap)
// let processTrees = this.getDomTreeOld(h, this.dom)
let processTrees = this.getDomTree(h, "admin")
//
processTrees.push(h('div', {style:{'text-align': 'center'}}, [
h('div', {class:{'process-end': true}, domProps: {innerHTML:'流程结束'}})
processTrees.push(h('div', {style: {'text-align': 'center'}}, [
h('div', {class: {'process-end': true}, domProps: {innerHTML: '流程结束'}})
]))
console.log(processTrees)
return h('div', {class:{'_root': true}, ref:'_root'}, processTrees)
return h('div', {class: {'_root': true}, ref: '_root'}, processTrees)
},
methods: {
// demo
getDomTree(h, node) {
this.toMapping(node);
if (this.isPrimaryNode(node)){
getDomTree(h, id) {
let nodeList = this.getNodeByParentId(id)
if (nodeList.length===0){
return []
}
let doms = nodeList.map(node =>{
console.log(node, "node")
//
let childDoms = this.getDomTree(h, node.children)
let childDoms = this.getDomTree(h, node.id)
console.log(childDoms,"前")
this.decodeAppendDom(h, node, childDoms)
return [h('div', {'class':{'primary-node': true}}, childDoms)];
}else if (this.isBranchNode(node)){
console.log(childDoms,"后")
return [h('div', {'class': {'primary-node': true}}, childDoms)];
})
return [h('div', {'class': {'primary-node': true}}, doms)];
},
getDomTreeOld(h, node) {
this.toMappingOld(node);
if (this.isPrimaryNode(node)) {
//
let childDoms = this.getDomTreeOld(h, node.children)
this.decodeAppendDom(h, node, childDoms)
return [h('div', {'class': {'primary-node': true}}, childDoms)];
} else if (this.isBranchNode(node)) {
let index = 0;
//
let branchItems = node.branchs.map(branchNode => {
//
this.toMapping(branchNode);
let childDoms = this.getDomTree(h, branchNode.children)
this.toMappingOld(branchNode);
let childDoms = this.getDomTreeOld(h, branchNode.children)
this.decodeAppendDom(h, branchNode, childDoms, {level: index + 1, size: node.branchs.length})
//4线线
this.insertCoverLine(h, index, childDoms, node.branchs)
//
index++;
return h('div', {'class':{'branch-node-item': true}}, childDoms);
return h('div', {'class': {'branch-node-item': true}}, childDoms);
})
///
branchItems.unshift(h('div',{'class':{'add-branch-btn': true}}, [
branchItems.unshift(h('div', {'class': {'add-branch-btn': true}}, [
h('el-button', {
'class':{'add-branch-btn-el': true},
'class': {'add-branch-btn-el': true},
props: {size: 'small', round: true},
on:{click: () => this.addBranchNode(node)},
domProps: {innerHTML: `添加${this.isConditionNode(node)?'条件':'分支'}`},
on: {click: () => this.addBranchNode(node)},
domProps: {innerHTML: `添加${this.isConditionNode(node) ? '条件' : '分支'}`},
}, [])
]));
let bchDom = [h('div', {'class':{'branch-node': true}}, branchItems)]
let bchDom = [h('div', {'class': {'branch-node': true}}, branchItems)]
//
let afterChildDoms = this.getDomTree(h, node.children)
let afterChildDoms = this.getDomTreeOld(h, node.children)
return [h('div', {}, [bchDom, afterChildDoms])]
}else if (this.isEmptyNode(node)){
} else if (this.isEmptyNode(node)) {
//
let childDoms = this.getDomTree(h, node.children)
let childDoms = this.getDomTreeOld(h, node.children)
this.decodeAppendDom(h, node, childDoms)
return [h('div', {'class':{'empty-node': true}}, childDoms)];
}else {
return [h('div', {'class': {'empty-node': true}}, childDoms)];
} else {
//
return [];
}
},
//dom
decodeAppendDom(h, node, dom, props = {}){
decodeAppendDom(h, node, dom, props = {}) {
props.config = node
dom.unshift(h(node.type.toLowerCase(), {
props: props,
ref: node.id,
key: node.id,
///
on:{
on: {
insertNode: type => this.insertNode(type, node),
delNode: () => this.delNode(node),
selected: () => this.selectNode(node),
copy:() => this.copyBranch(node),
copy: () => this.copyBranch(node),
leftMove: () => this.branchMove(node, -1),
rightMove: () => this.branchMove(node, 1)
}
}, []))
},
toMapping(node) {
node.forEach(node => {
this.nodeMap.set(node.id, node)
this.parentIdMap.set(node.parentId, node)
})
},
//idmap
toMapping(node){
if (node && node.id){
toMappingOld(node) {
if (node && node.id) {
//console.log("node=> " + node.id + " name:" + node.name + " type:" + node.type)
let newNode = {
...node
@ -113,33 +145,32 @@ export default {
newNode.children = []
this.nodeMap.set(newNode.id, newNode)
}
console.log(this.nodeMap)
},
insertCoverLine(h, index, doms, branchs){
if (index === 0){
insertCoverLine(h, index, doms, branchs) {
if (index === 0) {
//
doms.unshift(h('div', {'class':{'line-top-left': true}}, []))
doms.unshift(h('div', {'class':{'line-bot-left': true}}, []))
}else if (index === branchs.length - 1){
doms.unshift(h('div', {'class': {'line-top-left': true}}, []))
doms.unshift(h('div', {'class': {'line-bot-left': true}}, []))
} else if (index === branchs.length - 1) {
//
doms.unshift(h('div', {'class':{'line-top-right': true}}, []))
doms.unshift(h('div', {'class':{'line-bot-right': true}}, []))
doms.unshift(h('div', {'class': {'line-top-right': true}}, []))
doms.unshift(h('div', {'class': {'line-bot-right': true}}, []))
}
},
copyBranch(node){
copyBranch(node) {
let parentNode = this.nodeMap.get(node.parentId)
let branchNode = this.$deepCopy(node)
branchNode.name = branchNode.name + '-copy'
this.forEachNode(parentNode, branchNode, (parent, node) => {
let id = this.getRandomId()
console.log(node, '新id =>'+ id, '老nodeId:' + node.id )
console.log(node, '新id =>' + id, '老nodeId:' + node.id)
node.id = id
node.parentId = parent.id
})
parentNode.branchs.splice(parentNode.branchs.indexOf(node), 0, branchNode)
this.$forceUpdate()
},
branchMove(node, offset){
branchMove(node, offset) {
let parentNode = this.nodeMap.get(node.parentId)
let index = parentNode.branchs.indexOf(node)
let branch = parentNode.branchs[index + offset]
@ -148,89 +179,123 @@ export default {
this.$forceUpdate()
},
//
isPrimaryNode(node){
isPrimaryNode(node) {
return node &&
(node.type === 'ROOT' || node.type === 'APPROVAL'
|| node.type === 'CC' || node.type === 'DELAY'
|| node.type === 'TRIGGER');
},
isBranchNode(node){
isBranchNode(node) {
return node && (node.type === 'CONDITIONS' || node.type === 'CONCURRENTS');
},
isEmptyNode(node){
isEmptyNode(node) {
return node && (node.type === 'EMPTY')
},
//
isConditionNode(node){
isConditionNode(node) {
return node.type === 'CONDITIONS';
},
//
isBranchSubNode(node){
isBranchSubNode(node) {
return node && (node.type === 'CONDITION' || node.type === 'CONCURRENT');
},
isConcurrentNode(node){
isConcurrentNode(node) {
return node.type === 'CONCURRENTS'
},
getRandomId(){
return `node_${new Date().getTime().toString().substring(5)}${Math.round(Math.random()*9000+1000)}`
getRandomId() {
return `node_${new Date().getTime().toString().substring(5)}${Math.round(Math.random() * 9000 + 1000)}`
},
//
selectNode(node){
selectNode(node) {
this.$store.commit('selectedNode', node)
this.$emit('selectedNode', node)
},
getNodeByParentId(id) {
let nodeList = []
this.dom.forEach(node => {
if (node.parentId === id)
nodeList.push(node)
})
return nodeList;
},
//
insertNode(type, parentNode){
insertNode(type, parentNode) {
console.log(parentNode, "111");
this.$refs['_root'].click()
//
let afterNode = parentNode.children
console.log(afterNode)
//
parentNode.children = {
let children = {
id: this.getRandomId(),
parentId: parentNode.id,
props: {},
// props: {},
type: type,
}
switch (type){
case 'APPROVAL': this.insertApprovalNode(parentNode, afterNode); break;
case 'CC': this.insertCcNode(parentNode); break;
case 'DELAY': this.insertDelayNode(parentNode); break;
case 'TRIGGER': this.insertTriggerNode(parentNode); break;
case 'CONDITIONS': this.insertConditionsNode(parentNode); break;
case 'CONCURRENTS': this.insertConcurrentsNode(parentNode); break;
default: break;
switch (type) {
case 'APPROVAL':
this.insertApprovalNode(children, afterNode);
break;
case 'CC':
this.insertCcNode(parentNode);
break;
case 'DELAY':
this.insertDelayNode(parentNode);
break;
case 'TRIGGER':
this.insertTriggerNode(parentNode);
break;
case 'CONDITIONS':
this.insertConditionsNode(parentNode);
break;
case 'CONCURRENTS':
this.insertConcurrentsNode(parentNode);
break;
default:
break;
}
//
if (this.isBranchNode({type: type})){
if (afterNode && afterNode.id){
if (this.isBranchNode({type: type})) {
if (afterNode && afterNode.id) {
afterNode.parentId = parentNode.children.children.id
}
this.$set(parentNode.children.children, 'children', afterNode)
}else {
if (afterNode && afterNode.id){
} else {
if (afterNode && afterNode.id) {
afterNode.parentId = parentNode.children.id
}
this.$set(parentNode.children, 'children', afterNode)
}
this.$forceUpdate()
},
insertApprovalNode(parentNode){
this.$set(parentNode.children, "name", "审批人")
this.$set(parentNode.children, "props", this.$deepCopy(DefaultProps.APPROVAL_PROPS))
insertApprovalNode(parentNode) {
console.log(parentNode)
let node = {
...parentNode,
name: "审批人",
props: this.$deepCopy(DefaultProps.APPROVAL_PROPS)
}
this.dom.push(node)
// this.$set(parentNode.children, "name", "")
// this.$set(parentNode.children, "props", this.$deepCopy(DefaultProps.APPROVAL_PROPS))
},
insertCcNode(parentNode){
insertCcNode(parentNode) {
this.$set(parentNode.children, "name", "抄送人")
this.$set(parentNode.children, "props", this.$deepCopy(DefaultProps.CC_PROPS))
},
insertDelayNode(parentNode){
insertDelayNode(parentNode) {
this.$set(parentNode.children, "name", "延时处理")
this.$set(parentNode.children, "props", this.$deepCopy(DefaultProps.DELAY_PROPS))
},
insertTriggerNode(parentNode){
insertTriggerNode(parentNode) {
this.$set(parentNode.children, "name", "触发器")
this.$set(parentNode.children, "props", this.$deepCopy(DefaultProps.TRIGGER_PROPS))
},
insertConditionsNode(parentNode){
insertConditionsNode(parentNode) {
this.$set(parentNode.children, "name", "条件分支")
this.$set(parentNode.children, 'children', {
id: this.getRandomId(),
@ -244,20 +309,20 @@ export default {
type: "CONDITION",
props: this.$deepCopy(DefaultProps.CONDITION_PROPS),
name: "条件1",
children:{}
},{
children: {}
}, {
id: this.getRandomId(),
parentId: parentNode.children.id,
type: "CONDITION",
props: this.$deepCopy(DefaultProps.CONDITION_PROPS),
name: "条件2",
children:{}
children: {}
}
])
},
insertConcurrentsNode(parentNode){
insertConcurrentsNode(parentNode) {
this.$set(parentNode.children, "name", "并行分支")
this.$set(parentNode.children, 'children',{
this.$set(parentNode.children, 'children', {
id: this.getRandomId(),
parentId: parentNode.children.id,
type: "EMPTY"
@ -269,53 +334,53 @@ export default {
parentId: parentNode.children.id,
type: "CONCURRENT",
props: {},
children:{}
},{
children: {}
}, {
id: this.getRandomId(),
name: "分支2",
parentId: parentNode.children.id,
type: "CONCURRENT",
props: {},
children:{}
children: {}
}
])
},
getBranchEndNode(conditionNode){
if (!conditionNode.children || !conditionNode.children.id){
getBranchEndNode(conditionNode) {
if (!conditionNode.children || !conditionNode.children.id) {
return conditionNode;
}
return this.getBranchEndNode(conditionNode.children);
},
addBranchNode(node){
if (node.branchs.length < 8){
addBranchNode(node) {
if (node.branchs.length < 8) {
node.branchs.push({
id: this.getRandomId(),
parentId: node.id,
name: (this.isConditionNode(node) ? '条件':'分支') + (node.branchs.length + 1),
props: this.isConditionNode(node) ? this.$deepCopy(DefaultProps.CONDITION_PROPS):{},
type: this.isConditionNode(node) ? "CONDITION":"CONCURRENT",
children:{}
name: (this.isConditionNode(node) ? '条件' : '分支') + (node.branchs.length + 1),
props: this.isConditionNode(node) ? this.$deepCopy(DefaultProps.CONDITION_PROPS) : {},
type: this.isConditionNode(node) ? "CONDITION" : "CONCURRENT",
children: {}
})
}else {
} else {
this.$message.warning("最多只能添加 8 项😥")
}
},
//
delNode(node){
delNode(node) {
console.log("删除节点", node)
//
let parentNode = this.nodeMap.get(node.parentId)
if (parentNode){
if (parentNode) {
//
if (this.isBranchNode(parentNode)){
if (this.isBranchNode(parentNode)) {
//
parentNode.branchs.splice(parentNode.branchs.indexOf(node), 1)
//1
if (parentNode.branchs.length < 2){
if (parentNode.branchs.length < 2) {
//
let ppNode = this.nodeMap.get(parentNode.parentId)
//
if (parentNode.branchs[0].children && parentNode.branchs[0].children.id){
if (parentNode.branchs[0].children && parentNode.branchs[0].children.id) {
//
ppNode.children = parentNode.branchs[0].children
ppNode.children.parentId = ppNode.id
@ -323,18 +388,18 @@ export default {
let endNode = this.getBranchEndNode(parentNode.branchs[0])
//, EMPTY
endNode.children = parentNode.children.children
if (endNode.children && endNode.children.id){
if (endNode.children && endNode.children.id) {
endNode.children.parentId = endNode.id
}
}else {
} else {
//EMPTY
ppNode.children = parentNode.children.children
if (ppNode.children && ppNode.children.id){
if (ppNode.children && ppNode.children.id) {
ppNode.children.parentId = ppNode.id
}
}
}
}else {
} else {
//
if (node.children && node.children.id) {
node.children.parentId = parentNode.id
@ -342,45 +407,45 @@ export default {
parentNode.children = node.children
}
this.$forceUpdate()
}else {
} else {
this.$message.warning("出现错误,找不到上级节点😥")
}
},
validateProcess(){
validateProcess() {
this.valid = true
let err = []
this.validate(err, this.dom)
return err
},
validateNode(err, node){
if (this.$refs[node.id].validate){
validateNode(err, node) {
if (this.$refs[node.id].validate) {
this.valid = this.$refs[node.id].validate(err)
}
},
//dom
nodeDomUpdate(node){
nodeDomUpdate(node) {
this.$refs[node.id].$forceUpdate()
},
//
forEachNode(parent, node, callback){
if (this.isBranchNode(node)){
forEachNode(parent, node, callback) {
if (this.isBranchNode(node)) {
callback(parent, node)
this.forEachNode(node, node.children, callback)
node.branchs.map(branchNode => {
callback(node, branchNode)
this.forEachNode(branchNode, branchNode.children, callback)
})
}else if (this.isPrimaryNode(node) || this.isEmptyNode(node) || this.isBranchSubNode(node)){
} else if (this.isPrimaryNode(node) || this.isEmptyNode(node) || this.isBranchSubNode(node)) {
callback(parent, node)
this.forEachNode(node, node.children, callback)
}
},
//
validate(err, node){
if (this.isPrimaryNode(node)){
validate(err, node) {
if (this.isPrimaryNode(node)) {
this.validateNode(err, node)
this.validate(err, node.children)
}else if (this.isBranchNode(node)){
} else if (this.isBranchNode(node)) {
//
node.branchs.map(branchNode => {
//
@ -389,23 +454,21 @@ export default {
this.validate(err, branchNode.children)
})
this.validate(err, node.children)
}else if (this.isEmptyNode(node)){
} else if (this.isEmptyNode(node)) {
this.validate(err, node.children)
}
}
},
watch:{
}
watch: {}
}
</script>
<style lang="less" scoped>
._root{
._root {
margin: 0 auto;
}
.process-end{
.process-end {
width: 60px;
margin: 0 auto;
margin-bottom: 20px;
@ -416,18 +479,21 @@ export default {
background-color: #f2f2f2;
box-shadow: 0 0 10px 0 #bcbcbc;
}
.primary-node{
.primary-node {
display: flex;
align-items: center;
flex-direction: column;
}
.branch-node{
.branch-node {
display: flex;
justify-content: center;
/*border-top: 2px solid #cccccc;
border-bottom: 2px solid #cccccc;*/
}
.branch-node-item{
.branch-node-item {
position: relative;
display: flex;
background: #f5f6f6;
@ -435,7 +501,8 @@ export default {
align-items: center;
border-top: 2px solid #cccccc;
border-bottom: 2px solid #cccccc;
&:before{
&:before {
content: "";
position: absolute;
top: 0;
@ -445,40 +512,47 @@ export default {
height: 100%;
background-color: #CACACA;
}
.line-top-left, .line-top-right, .line-bot-left, .line-bot-right{
.line-top-left, .line-top-right, .line-bot-left, .line-bot-right {
position: absolute;
width: 50%;
height: 4px;
background-color: #f5f6f6;
}
.line-top-left{
.line-top-left {
top: -2px;
left: -1px;
}
.line-top-right{
.line-top-right {
top: -2px;
right: -1px;
}
.line-bot-left{
.line-bot-left {
bottom: -2px;
left: -1px;
}
.line-bot-right{
.line-bot-right {
bottom: -2px;
right: -1px;
}
}
.add-branch-btn{
.add-branch-btn {
position: absolute;
width: 80px;
.add-branch-btn-el{
.add-branch-btn-el {
z-index: 999;
position: absolute;
top: -15px;
}
}
.empty-node{
.empty-node {
display: flex;
justify-content: center;
flex-direction: column;