Merge branch 'develop'

Author: fengli0208

src/App.vue

@@ -11,7 +11,8 @@
  name: 'App',
  data(){
  return {
- product:"flowable"
+ // product:"flowable"
+ product:"activiti"
  }
  },
  components: {

src/components/bpmn/Header.vue

@@ -74,7 +74,6 @@
  }
  _svg = svg;
  })
- console.log(this.Apis)
  that.post(this.Apis.deployProcess, {
  processKey: "s1111",
  processName: "阿达达",

src/components/bpmn/panel/NodePropertyPanel.vue

@@ -166,11 +166,11 @@
  this.updateProperties({conditionExpression:newCondition});
  },
  addUser(properties){
- this.updateProperties(
-  Object.assign(properties, {
-  // userType: Object.keys(properties)[0]
-  })
- );
+ this.updateProperties(properties);
+ Object.assign(properties, {
+ userType: Object.keys(properties)[0]
+ })
+ this.$emit('modifyFormData',properties);
  }
  }
  }

src/components/bpmn/panel/index.vue

@@ -8,7 +8,7 @@
  </el-header>
  <el-main>
  <node-property-panel v-if="configTab=='node'" :modeler="modeler" @modifyConfigTab="modifyConfigTab"
- :nodeElement="nodeElement" :formData="formData"></node-property-panel>
+ :nodeElement="nodeElement" :formData="formData" @modifyFormData="modifyFormData"></node-property-panel>
  <process-property-panel v-if="configTab=='process'" :modeler="modeler" :process-data="process"
  :element="element"></process-property-panel>
  </el-main>
@@ -265,6 +265,10 @@
  sequenceFlow: businessObject.conditionExpression ? businessObject.conditionExpression.body : ''
  }
  this.nodeElement = element;
+ },
+ modifyFormData(data){
+ this.formData.assignee = data.assignee;
+ console.log(data)
  }
  },
  components: {

src/libs/api.js

@@ -1,3 +1,4 @@
 export default {
- deployProcess: "flow/deploy"
+ // deployProcess: "flow/deploy" flowable
+ deployProcess: "act/deploy" // activiti
 }

vue.config.js

@@ -3,7 +3,8 @@ module.exports = {
  devServer: {
  proxy: {
  '/api': {
- target: 'http://127.0.0.1:8088',
+ // target: 'http://127.0.0.1:8088', flowable
+ target: 'http://127.0.0.1:8089', // activiti
  changeOrigin: true,
  pathRewrite: {
  '^/api': '/'