开始魔改

flowable-engine-java/src/main/java/cn/odliken/flow/config/CorsConfig.java

@@ -35,7 +35,7 @@ public class CorsConfig extends OncePerRequestFilter implements WebMvcConfigurer
         WebMvcConfigurer.super.addCorsMappings(registry);
         registry.addMapping("/**")
                 .allowedHeaders("*")
-                .allowedMethods("POST", "GET")
+                .allowedMethods("POST", "GET","PUT","DELETE")
                 .allowedOrigins("*");
     }
 
@@ -72,7 +72,8 @@ public class CorsConfig extends OncePerRequestFilter implements WebMvcConfigurer
             //自定义跨域域名检查
             response.setHeader("Access-Control-Allow-Origin", originUrl);
             response.setHeader("Access-Control-Allow-Credentials", "true");
-            response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS");
+            response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE, PUT");
+            //response.setHeader("Access-Control-Allow-Methods", "*");
             response.setHeader("Access-Control-Max-Age", "1800");//30分钟
             response.setHeader("Access-Control-Allow-Headers", "x-requested-with, content-type");
         }

flowable-engine-web/src/views/admin/layout/ProcessDesign.vue

@@ -31,7 +31,7 @@
 <script>
 import ProcessTree from './process/ProcessTree.vue'
 import NodeConfig from '../../common/process/config/NodeConfig'
-
+//流程设计器
 export default {
   name: "ProcessDesign",
   components: {ProcessTree, NodeConfig},

flowable-engine-web/src/views/admin/layout/process/ProcessTree.vue

@@ -36,9 +36,11 @@ export default {
     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)
   },
   methods: {
+    // 获取demo的树形结构
     getDomTree(h, node) {
       this.toMapping(node);
       if (this.isPrimaryNode(node)){
@@ -105,8 +107,13 @@ export default {
     toMapping(node){
       if (node && node.id){
         //console.log("node=> " + node.id + " name:" + node.name + " type:" + node.type)
-        this.nodeMap.set(node.id, node)
+        let newNode = {
+          ...node
+        }
+        newNode.children = []
+        this.nodeMap.set(newNode.id, newNode)
       }
+      console.log(this.nodeMap)
     },
     insertCoverLine(h, index, doms, branchs){
       if (index === 0){

flowable-engine-web/src/views/admin/layout/process/ProcessTreeBack.vue

@@ -0,0 +1,487 @@
+<script>
+//导入所有节点组件
+import Approval from '@/views/common/process/nodes/ApprovalNode.vue'
+import Cc from '@/views/common/process/nodes/CcNode.vue'
+import Concurrent from '@/views/common/process/nodes/ConcurrentNode.vue'
+import Condition from '@/views/common/process/nodes/ConditionNode.vue'
+import Trigger from '@/views/common/process/nodes/TriggerNode.vue'
+import Delay from '@/views/common/process/nodes/DelayNode.vue'
+import Empty from '@/views/common/process/nodes/EmptyNode.vue'
+import Root from '@/views/common/process/nodes/RootNode.vue'
+import Node from '@/views/common/process/nodes/Node.vue'
+
+import DefaultProps from "./DefaultNodeProps"
+
+export default {
+  name: "ProcessTree",
+  components: {Node, Root, Approval, Cc, Trigger, Concurrent, Condition, Delay, Empty},
+  data() {
+    return {
+      valid: true
+    }
+  },
+  computed:{
+    nodeMap(){
+      return this.$store.state.nodeMap;
+    },
+    dom(){
+      return this.$store.state.design.process;
+    }
+  },
+  render(h, ctx) {
+    console.log("渲染流程树")
+    this.nodeMap.clear()
+    let processTrees = this.getDomTree(h, this.dom)
+    //插入末端节点
+    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)
+  },
+  methods: {
+    // 获取demo的树形结构
+    getDomTree(h, node) {
+      this.toMapping(node);
+      if (this.isPrimaryNode(node)){
+        //普通业务节点
+        let childDoms = this.getDomTree(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.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);
+        })
+        //插入添加分支/条件的按钮
+        branchItems.unshift(h('div',{'class':{'add-branch-btn': true}}, [
+          h('el-button', {
+           'class':{'add-branch-btn-el': true},
+            props: {size: 'small', round: true},
+            on:{click: () => this.addBranchNode(node)},
+            domProps: {innerHTML: `添加${this.isConditionNode(node)?'条件':'分支'}`},
+          }, [])
+        ]));
+        let bchDom = [h('div', {'class':{'branch-node': true}}, branchItems)]
+        //继续遍历分支后的节点
+        let afterChildDoms = this.getDomTree(h, node.children)
+        return [h('div', {}, [bchDom, afterChildDoms])]
+      }else if (this.isEmptyNode(node)){
+        //空节点，存在于分支尾部
+        let childDoms = this.getDomTree(h, node.children)
+        this.decodeAppendDom(h, node, childDoms)
+        return [h('div', {'class':{'empty-node': true}}, childDoms)];
+      }else {
+        //遍历到了末端，无子节点
+        return [];
+      }
+    },
+    //解码渲染的时候插入dom到同级
+    decodeAppendDom(h, node, dom, props = {}){
+      props.config = node
+      dom.unshift(h(node.type.toLowerCase(), {
+        props: props,
+        ref: node.id,
+        key: node.id,
+        //定义事件，插入节点，删除节点，选中节点，复制/移动
+        on:{
+          insertNode: type => this.insertNode(type, node),
+          delNode: () => this.delNode(node),
+          selected: () => this.selectNode(node),
+          copy:() => this.copyBranch(node),
+          leftMove: () => this.branchMove(node, -1),
+          rightMove: () => this.branchMove(node, 1)
+        }
+      }, []))
+    },
+    //id映射到map，用来向上遍历
+    toMapping(node){
+      if (node && node.id){
+        //console.log("node=> " + node.id + " name:" + node.name + " type:" + node.type)
+        let newNode = {
+          ...node
+        }
+        newNode.children = []
+        this.nodeMap.set(newNode.id, newNode)
+      }
+      console.log(this.nodeMap)
+    },
+    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-right': true}}, []))
+        doms.unshift(h('div', {'class':{'line-bot-right': true}}, []))
+      }
+    },
+    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 )
+        node.id = id
+        node.parentId = parent.id
+      })
+      parentNode.branchs.splice(parentNode.branchs.indexOf(node), 0, branchNode)
+      this.$forceUpdate()
+    },
+    branchMove(node, offset){
+      let parentNode = this.nodeMap.get(node.parentId)
+      let index = parentNode.branchs.indexOf(node)
+      let branch = parentNode.branchs[index + offset]
+      parentNode.branchs[index + offset] = parentNode.branchs[index]
+      parentNode.branchs[index] = branch
+      this.$forceUpdate()
+    },
+    //判断是否为主要业务节点
+    isPrimaryNode(node){
+      return node &&
+          (node.type === 'ROOT' || node.type === 'APPROVAL'
+          || node.type === 'CC' || node.type === 'DELAY'
+              || node.type === 'TRIGGER');
+    },
+    isBranchNode(node){
+      return node && (node.type === 'CONDITIONS' || node.type === 'CONCURRENTS');
+    },
+    isEmptyNode(node){
+      return node && (node.type === 'EMPTY')
+    },
+    //是分支节点
+    isConditionNode(node){
+      return node.type === 'CONDITIONS';
+    },
+    //是分支节点
+    isBranchSubNode(node){
+      return node && (node.type === 'CONDITION' || node.type === 'CONCURRENT');
+    },
+    isConcurrentNode(node){
+      return node.type === 'CONCURRENTS'
+    },
+    getRandomId(){
+      return `node_${new Date().getTime().toString().substring(5)}${Math.round(Math.random()*9000+1000)}`
+    },
+    //选中一个节点
+    selectNode(node){
+      this.$store.commit('selectedNode', node)
+      this.$emit('selectedNode', node)
+    },
+    //处理节点插入逻辑
+    insertNode(type, parentNode){
+      this.$refs['_root'].click()
+      //缓存一下后面的节点
+      let afterNode = parentNode.children
+      //插入新节点
+      parentNode.children = {
+        id: this.getRandomId(),
+        parentId: parentNode.id,
+        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;
+      }
+      //拼接后续节点
+      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){
+          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))
+    },
+    insertCcNode(parentNode){
+      this.$set(parentNode.children, "name", "抄送人")
+      this.$set(parentNode.children, "props", this.$deepCopy(DefaultProps.CC_PROPS))
+    },
+    insertDelayNode(parentNode){
+      this.$set(parentNode.children, "name", "延时处理")
+      this.$set(parentNode.children, "props", this.$deepCopy(DefaultProps.DELAY_PROPS))
+    },
+    insertTriggerNode(parentNode){
+      this.$set(parentNode.children, "name", "触发器")
+      this.$set(parentNode.children, "props", this.$deepCopy(DefaultProps.TRIGGER_PROPS))
+    },
+    insertConditionsNode(parentNode){
+      this.$set(parentNode.children, "name", "条件分支")
+      this.$set(parentNode.children, 'children', {
+        id: this.getRandomId(),
+        parentId: parentNode.children.id,
+        type: "EMPTY"
+      })
+      this.$set(parentNode.children, "branchs", [
+        {
+          id: this.getRandomId(),
+          parentId: parentNode.children.id,
+          type: "CONDITION",
+          props: this.$deepCopy(DefaultProps.CONDITION_PROPS),
+          name: "条件1",
+          children:{}
+        },{
+          id: this.getRandomId(),
+          parentId: parentNode.children.id,
+          type: "CONDITION",
+          props: this.$deepCopy(DefaultProps.CONDITION_PROPS),
+          name: "条件2",
+          children:{}
+        }
+      ])
+    },
+    insertConcurrentsNode(parentNode){
+      this.$set(parentNode.children, "name", "并行分支")
+      this.$set(parentNode.children, 'children',{
+        id: this.getRandomId(),
+        parentId: parentNode.children.id,
+        type: "EMPTY"
+      })
+      this.$set(parentNode.children, "branchs", [
+        {
+          id: this.getRandomId(),
+          name: "分支1",
+          parentId: parentNode.children.id,
+          type: "CONCURRENT",
+          props: {},
+          children:{}
+        },{
+          id: this.getRandomId(),
+          name: "分支2",
+          parentId: parentNode.children.id,
+          type: "CONCURRENT",
+          props: {},
+          children:{}
+        }
+      ])
+    },
+    getBranchEndNode(conditionNode){
+      if (!conditionNode.children || !conditionNode.children.id){
+        return conditionNode;
+      }
+      return this.getBranchEndNode(conditionNode.children);
+    },
+    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:{}
+        })
+      }else {
+        this.$message.warning("最多只能添加 8 项😥")
+      }
+    },
+    //删除当前节点
+    delNode(node){
+      console.log("删除节点", node)
+      //获取该节点的父节点
+      let parentNode = this.nodeMap.get(node.parentId)
+      if (parentNode){
+        //判断该节点的父节点是不是分支节点
+        if (this.isBranchNode(parentNode)){
+          //移除该分支
+          parentNode.branchs.splice(parentNode.branchs.indexOf(node), 1)
+          //处理只剩1个分支的情况
+          if (parentNode.branchs.length < 2){
+            //获取条件组的父节点
+            let ppNode = this.nodeMap.get(parentNode.parentId)
+            //判断唯一分支是否存在业务节点
+            if (parentNode.branchs[0].children && parentNode.branchs[0].children.id){
+              //将剩下的唯一分支头部合并到主干
+              ppNode.children = parentNode.branchs[0].children
+              ppNode.children.parentId = ppNode.id
+              //搜索唯一分支末端最后一个节点
+              let endNode = this.getBranchEndNode(parentNode.branchs[0])
+              //后续节点进行拼接, 这里要取EMPTY后的节点
+              endNode.children = parentNode.children.children
+              if (endNode.children && endNode.children.id){
+                endNode.children.parentId = endNode.id
+              }
+            }else {
+              //直接合并分支后面的节点，这里要取EMPTY后的节点
+              ppNode.children = parentNode.children.children
+              if (ppNode.children && ppNode.children.id){
+                ppNode.children.parentId = ppNode.id
+              }
+            }
+          }
+        }else {
+          //不是的话就直接删除
+          if (node.children && node.children.id) {
+            node.children.parentId = parentNode.id
+          }
+          parentNode.children = node.children
+        }
+        this.$forceUpdate()
+      }else {
+        this.$message.warning("出现错误，找不到上级节点😥")
+      }
+    },
+    validateProcess(){
+      this.valid = true
+      let err = []
+      this.validate(err, this.dom)
+      return err
+    },
+    validateNode(err, node){
+      if (this.$refs[node.id].validate){
+        this.valid = this.$refs[node.id].validate(err)
+      }
+    },
+    //更新指定节点的dom
+    nodeDomUpdate(node){
+      this.$refs[node.id].$forceUpdate()
+    },
+    //给定一个起始节点，遍历内部所有节点
+    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)){
+        callback(parent, node)
+        this.forEachNode(node, node.children, callback)
+      }
+    },
+    //校验所有节点设置
+    validate(err, node){
+      if (this.isPrimaryNode(node)){
+        this.validateNode(err, node)
+        this.validate(err, node.children)
+      }else if (this.isBranchNode(node)){
+        //校验每个分支
+        node.branchs.map(branchNode => {
+          //校验条件节点
+          this.validateNode(err, branchNode)
+          //校验条件节点后面的节点
+          this.validate(err, branchNode.children)
+        })
+        this.validate(err, node.children)
+      }else if (this.isEmptyNode(node)){
+        this.validate(err, node.children)
+      }
+
+    }
+  },
+  watch:{
+
+  }
+}
+</script>
+
+<style lang="less" scoped>
+._root{
+ margin: 0 auto;
+}
+.process-end{
+  width: 60px;
+  margin: 0 auto;
+  margin-bottom: 20px;
+  border-radius: 15px;
+  padding: 5px 10px;
+  font-size: small;
+  color: #747474;
+  background-color: #f2f2f2;
+  box-shadow: 0 0 10px 0 #bcbcbc;
+}
+.primary-node{
+  display: flex;
+  align-items: center;
+  flex-direction: column;
+}
+.branch-node{
+  display: flex;
+  justify-content: center;
+  /*border-top: 2px solid #cccccc;
+  border-bottom: 2px solid #cccccc;*/
+}
+.branch-node-item{
+  position: relative;
+  display: flex;
+  background: #f5f6f6;
+  flex-direction: column;
+  align-items: center;
+  border-top: 2px solid #cccccc;
+  border-bottom: 2px solid #cccccc;
+  &:before{
+    content: "";
+    position: absolute;
+    top: 0;
+    left: calc(50% - 1px);
+    margin: auto;
+    width: 2px;
+    height: 100%;
+    background-color: #CACACA;
+  }
+  .line-top-left, .line-top-right, .line-bot-left, .line-bot-right{
+    position: absolute;
+    width: 50%;
+    height: 4px;
+    background-color: #f5f6f6;
+  }
+  .line-top-left{
+    top: -2px;
+    left: -1px;
+  }
+  .line-top-right{
+    top: -2px;
+    right: -1px;
+  }
+  .line-bot-left{
+    bottom: -2px;
+    left: -1px;
+  }
+  .line-bot-right{
+    bottom: -2px;
+    right: -1px;
+  }
+}
+.add-branch-btn{
+  position: absolute;
+  width: 80px;
+  .add-branch-btn-el{
+    z-index: 999;
+    position: absolute;
+    top: -15px;
+  }
+}
+
+.empty-node{
+  display: flex;
+  justify-content: center;
+  flex-direction: column;
+  align-items: center;
+}
+</style>