Merge branch 'develop'

Author: fengli0208

README.md

@@ -25,10 +25,15 @@ this.modeler.on("element.click", e => {
 })
 ```
 ## 安装运行
-```
-npm install
+```shell
+# npm用户
+npm i # 或 npm install
 npm run serve
 npm run build
+# yarn用户
+yarn install
+yarn serve
+yarn build
 ```
 ## 调整后的截图
 ![UI布局](http://47.108.140.13/images/pic11.jpg?raw=true)

package.json

@@ -21,12 +21,12 @@
  "vuex": "^3.5.1"
  },
  "devDependencies": {
- "@vue/cli-plugin-babel": "^4.5.13",
- "@vue/cli-plugin-eslint": "^4.5.13",
- "@vue/cli-service": "^4.5.13",
+ "@vue/cli-plugin-babel": "^4.5.0",
+ "@vue/cli-plugin-eslint": "^4.5.0",
+ "@vue/cli-service": "^4.5.0",
  "babel-eslint": "^10.1.0",
- "eslint": "^7.26.0",
- "eslint-plugin-vue": "^7.9.0",
+ "eslint": "^6.7.2",
+ "eslint-plugin-vue": "^7.0.0-0",
  "vue-template-compiler": "^2.6.12"
  },
  "eslintConfig": {

src/components/bpmn/panel/NodePropertyPanel.vue

@@ -5,26 +5,26 @@
  size="small"
  label-position="right">
  <el-form-item label="节点类型">
- <el-input v-model="formData.type" disabled></el-input>
+ <el-input v-model="localFormData.type" disabled></el-input>
  </el-form-item>
  <el-form-item label="节点ID">
- <el-input v-model="formData.id" @input="updateId"></el-input>
+ <el-input v-model="localFormData.id" @input="updateId"></el-input>
  </el-form-item>
  <el-form-item label="节点名称">
- <el-input v-model="formData.name" @input="updateName"></el-input>
+ <el-input v-model="localFormData.name" @input="updateName"></el-input>
  </el-form-item>
 
  <!--usertask-->
- <el-form-item v-if="formData.type=='bpmn:UserTask'" label="节点人员">
- <el-select v-model="formData.userType" placeholder="请选择" @change="changeUserType">
+ <el-form-item v-if="localFormData.type=='bpmn:UserTask'" label="节点人员">
+ <el-select v-model="localFormData.userType" placeholder="请选择" @change="changeUserType">
  <el-option value="assignee" label="指定人员"></el-option>
  <el-option value="candidateUsers" label="候选人员"></el-option>
  <el-option value="candidateGroups" label="角色/岗位"></el-option>
  </el-select>
  </el-form-item>
- <el-form-item label="指定人员" v-if="formData.type=='bpmn:UserTask' && formData.userType === 'assignee'">
+ <el-form-item label="指定人员" v-if="localFormData.type=='bpmn:UserTask' && localFormData.userType === 'assignee'">
  <el-select
- v-model="formData.assignee"
+ v-model="localFormData.assignee"
  placeholder="请选择"
  key="1"
  @change="(value) => addUser({assignee: value})"
@@ -37,9 +37,9 @@
  ></el-option>
  </el-select>
  </el-form-item>
- <el-form-item label="候选人员" v-else-if="formData.type=='bpmn:UserTask' && formData.userType === 'candidateUsers'">
+ <el-form-item label="候选人员" v-else-if="localFormData.type=='bpmn:UserTask' && localFormData.userType === 'candidateUsers'">
  <el-select
- v-model="formData.candidateUsers"
+ v-model="localFormData.candidateUsers"
  placeholder="请选择"
  key="2"
  multiple
@@ -53,9 +53,9 @@
  ></el-option>
  </el-select>
  </el-form-item>
- <el-form-item label="角色/岗位" v-else-if="formData.type=='bpmn:UserTask' && formData.userType === 'candidateGroups'">
+ <el-form-item label="角色/岗位" v-else-if="localFormData.type=='bpmn:UserTask' && localFormData.userType === 'candidateGroups'">
  <el-select
- v-model="formData.candidateGroups"
+ v-model="localFormData.candidateGroups"
  placeholder="请选择"
  @change="(value) => addUser({candidateGroups: value})"
  >
@@ -68,8 +68,8 @@
  </el-select>
  </el-form-item>
  <!--sequenceFlow-->
- <el-form-item v-if="formData.type=='bpmn:SequenceFlow'" label="分支条件">
- <el-input v-model="formData.sequenceFlow" @input="updateSequenceFlow"></el-input>
+ <el-form-item v-if="localFormData.type=='bpmn:SequenceFlow'" label="分支条件">
+ <el-input v-model="localFormData.sequenceFlow" @input="updateSequenceFlow"></el-input>
  </el-form-item>
  </el-form>
  </div>
@@ -118,7 +118,8 @@
  label: "主管"
  }
  ]
- }
+ },
+ localFormData:this.formData
  }
  },
  props: {

src/components/bpmn/panel/ProcessPropertyPanel.vue

@@ -1,18 +1,18 @@
 <template>
  <div>
  <el-form :inline="false"
- :model="processData"
+ :model="localProcessData"
  label-width="100px"
  size="small"
  label-position="left">
  <el-form-item label="流程ID">
- <el-input v-model="processData.key" @input="updateId"></el-input>
+ <el-input v-model="localProcessData.key" @input="updateId"></el-input>
  </el-form-item>
  <el-form-item label="流程名称">
- <el-input v-model="processData.name" @input="updateName"></el-input>
+ <el-input v-model="localProcessData.name" @input="updateName"></el-input>
  </el-form-item>
  <el-form-item label="流程描述">
- <el-input v-model="processData.description" @input="updateDesc"></el-input>
+ <el-input v-model="localProcessData.description" @input="updateDesc"></el-input>
  </el-form-item>
  </el-form>
  </div>
@@ -22,7 +22,9 @@
  export default {
  name: "ProcessProperty",
  data() {
- return {}
+ return {
+ localProcessData:this.processData
+ }
  },
  props: {
  processData: {