workflow-editor 0.9.68-pv → 0.9.68

package/packages/workflow-editor/src/properties-editors/common/transactor-settings.vue

@@ -11,6 +11,9 @@
         <el-radio label="byField">
           {{ $t('workflowEditor.process.personSpecifiedInFormField') }}
         </el-radio>
+        <el-radio label="byDeptField">
+          {{ $t('workflowEditor.process.deptSpecifiedInFormField') }}
+        </el-radio>
         <el-radio label="byCondition">
           {{ $t('workflowEditor.process.filterByCriteria') }}
         </el-radio>
@@ -19,16 +22,16 @@
         <common-user-condition v-model="formModel.userCondition" used-in="transactor" />
       </div>
       <el-form-item
-        v-if="formModel.transactor==='byField'"
+        v-if="formModel.transactor==='byField' || formModel.transactor==='byDeptField' "
+        :label="$t('workflowEditor.process.fieldName')"
         prop="selectedField"
         required
-        :label="$t('workflowEditor.process.fieldName')"
         label-width="80px"
       >
         <el-input :value="formatLabel(formModel.selectedField)" @focus="showFormFields=true" />
         <form-fields v-if="showFormFields" @close="setField" />
       </el-form-item>
-      <div v-if="formModel.transactor==='byCondition' || formModel.transactor==='byField'">
+      <div v-if="formModel.transactor==='byCondition' || formModel.transactor==='byField' || formModel.transactor==='byDeptField'">
         <el-form-item :label="$t('workflowEditor.process.additionalConditions')">
           <el-checkbox v-model="formModel.additionalCondition.onlyInCreatorDepartment">
             {{ $t('workflowEditor.process.handlingYyThePersonnelOfTheDepartmentOfTheInitiator') }}
@@ -45,6 +48,9 @@
           <el-checkbox v-if="isSubprocess" v-model="formModel.additionalCondition.generateOneInstanceFromDept">
             {{ $t('workflowEditor.process.generateOneInstanceFromDept') }}
           </el-checkbox>
+          <el-checkbox v-if="isCountersign" v-model="formModel.additionalCondition.activateOneVoteVeto">
+            {{ $t('workflowEditor.process.activateOneVoteVeto') }}
+          </el-checkbox>
         </el-form-item>
         <div v-if="formModel.additionalCondition.selectOneFromMultiple">
           <el-form-item :label="$t('workflowEditor.process.selectionMethod')">
@@ -59,9 +65,9 @@
           </el-form-item>
           <el-form-item
             v-show="formModel.additionalCondition.selectType==='autoType'"
-            prop="additionalCondition.selectUrl"
             :label="$t('workflowEditor.process.callbackURL')"
             :rules="[{ required: true, message: this.$t('workflowEditor.process.cannotBeEmpty'), trigger: 'blur' }]"
+            prop="additionalCondition.selectUrl"
           >
             <el-input v-model="formModel.additionalCondition.selectUrl" />
           </el-form-item>
@@ -70,9 +76,9 @@
     </el-form-item>
     <el-form-item
       v-if="usedIn==='HumanTask' && formModel.transactor==='${previousTransactorAssignment}'"
-      prop="url"
       :rules="[{ required: true, message: this.$t('workflowEditor.process.cannotBeEmpty'), trigger: 'blur' }]"
       :label="$t('workflowEditor.process.selectURL')"
+      prop="url"
       label-width="80px"
     >
       <el-input v-model.trim="formModel.url" @change="handleUrlChange" />
@@ -102,6 +108,11 @@ export default {
     isSubprocess: {
       type: Boolean,
       default: false
+    },
+    // basicProperties
+    basicProperties: {
+      type: Object,
+      default: null
     }
   },
   data() {
@@ -115,7 +126,8 @@ export default {
     this.initFormModel(formModel)
     return {
       showFormFields: false,
-      formModel
+      formModel,
+      isCountersign: false
     }
   },
   mounted() {
@@ -135,6 +147,12 @@ export default {
     }, {
       deep: true
     })
+    this.$watch('basicProperties', function() {
+      this.showActivateOneVoteVeto()
+    }, {
+      deep: true
+    })
+    this.showActivateOneVoteVeto()
   },
   methods: {
     formatLabel(name) {
@@ -150,9 +168,12 @@ export default {
       } else {
         if (userCondition === '${instanceCreator}' || userCondition === '${previousTransactorAssignment}') {
           formModel.transactor = userCondition
-        } else if (userCondition.indexOf('${field[') >= 0) {
+        } else if (userCondition.startsWith('${field[') && userCondition.indexOf('${field[') >= 0 && userCondition.indexOf('"selectedField": "${field[') < 2) {
           formModel.transactor = 'byField'
           formModel.selectedField = userCondition
+        } else if (userCondition.startsWith('${deptField[')) {
+          formModel.transactor = 'byDeptField'
+          formModel.selectedField = userCondition
         } else {
           formModel.transactor = 'byCondition'
           formModel.userCondition = userCondition
@@ -209,6 +230,9 @@ export default {
       } else {
         this.model.url = ''
       }
+      // if (val === 'byDeptField') {
+      //   this.model.userCondition = this.formModel.selectedField
+      // }
 
       // 不是按条件筛选的时候，需要清空xml中additionalCondition
       if (val === 'byCondition') {
@@ -223,10 +247,28 @@ export default {
     },
     setField(name) {
       if (name !== undefined) {
-        this.formModel.selectedField = '${field[' + name + ']}'
-        this.model.userCondition = this.formModel.selectedField
+        if (this.formModel.transactor === 'byDeptField') {
+          this.formModel.selectedField = '${deptField[' + name + ']}'
+          this.model.userCondition = this.formModel.selectedField
+        } else {
+          this.formModel.selectedField = '${field[' + name + ']}'
+          this.model.userCondition = this.formModel.selectedField
+        }
       }
       this.showFormFields = false
+    },
+    /**
+		 * 会签时显示一票否决配置
+		 */
+    showActivateOneVoteVeto() {
+      if (this.basicProperties && this.basicProperties.processingMode) {
+        if (this.basicProperties.processingMode.type === 'COUNTERSIGN') {
+          this.isCountersign = true
+        } else {
+          this.isCountersign = false
+          this.formModel.additionalCondition.activateOneVoteVeto = false
+        }
+      }
     }
   }
 }

package/packages/workflow-editor/src/properties-editors/copy-task.vue

@@ -22,6 +22,13 @@
       <el-tab-pane :label="$t('workflowEditor.task.settingOfHandler')" name="transactors">
         <transactor-settings :model="model.ref.transactorSettings" used-in="CopyTask" />
       </el-tab-pane>
+      <el-tab-pane :label="$t('workflowEditor.task.reminderSettings')" name="reminders">
+        <!-- <reminder v-model="model.ref.reminder" /> -->
+        <notice-reminder :reminder-value="model.ref.reminder" :task-notice-value="model.ref.taskNotice" />
+      </el-tab-pane>
+      <el-tab-pane :label="$t('workflowEditor.task.eventProcessing')" name="events">
+        <events v-model="model.ref.events" />
+      </el-tab-pane>
       <el-tab-pane :label="$t('workflowEditor.task.permissionSettings')" name="permissions">
         <permission-settings v-model="model.ref.permissionSettings" />
       </el-tab-pane>
@@ -32,12 +39,16 @@
 import BasicProperties from './copy-task/basic-properties'
 import PermissionSettings from './copy-task/permission-settings'
 import TransactorSettings from './common/transactor-settings'
+import NoticeReminder from './common/notice-reminder.vue'
+import Events from './human-task/events.vue'
 export default {
   name: 'HumanTaskPropertiesEditor',
   components: {
     BasicProperties,
     TransactorSettings,
-    PermissionSettings
+    PermissionSettings,
+    NoticeReminder,
+    Events
   },
   props: {
     model: {
@@ -47,6 +58,9 @@ export default {
   },
   data() {
     console.log(this.model)
+    if (!this.model.ref.taskNotice) {
+      this.model.ref.taskNotice = {}
+    }
     return {
       activeTab: 'basicProperties'
     }

package/packages/workflow-editor/src/properties-editors/human-task/basic-properties.vue

@@ -4,7 +4,11 @@
       <el-col :span="12">
         <el-form-item :label="$t('workflowEditor.task.name')">
           <!-- <el-input v-model="formModel.name" /> -->
-          <i18n-input v-model="formModel.name" :i18n-key="tache.i18nKey?tache.i18nKey:'name.'+formModel.id" @setI18n="setI18nValue" />
+          <i18n-input
+            v-model="formModel.name"
+            :i18n-key="tache.i18nKey?tache.i18nKey:'name.'+formModel.id"
+            @setI18n="setI18nValue"
+          />
         </el-form-item>
       </el-col>
       <el-col :span="12">

package/packages/workflow-editor/src/properties-editors/human-task.vue

@@ -20,7 +20,7 @@
         />
       </el-tab-pane>
       <el-tab-pane :label="$t('workflowEditor.task.settingOfHandler')" name="transactors">
-        <transactor-settings :model="model.ref.transactorSettings" />
+        <transactor-settings :model="model.ref.transactorSettings" :basic-properties="model.ref.basicProperties" />
       </el-tab-pane>
       <el-tab-pane :label="$t('workflowEditor.task.permissionSettings')" name="permissions">
         <permission-settings v-model="model.ref.permissionSettings" />
@@ -72,7 +72,7 @@ export default {
   },
   data() {
     console.log(this.model)
-    if (this.model.ref.taskNotice === undefined) {
+    if (!this.model.ref.taskNotice) {
       this.model.ref.taskNotice = {}
     }
     return {

package/packages/workflow-editor/src/properties-editors/process/basic-properties.vue

@@ -53,7 +53,7 @@
     <el-row>
       <el-col :span="12">
         <el-form-item :label="$t('workflowEditor.process.system')" prop="model.systemCode" :rules="[requiredRule]">
-          <el-select v-model="model.systemCode" :placeholder="$t('workflowEditorMessage.pleaseSelect')" @change="changeSystem(model.systemCode, null)">
+          <el-select v-model="model.systemCode" :placeholder="$t('workflowEditorMessage.pleaseSelect')">
             <el-option
               v-for="item in allSystems"
               :key="item.code"
@@ -63,20 +63,6 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span="12">
-        <el-form-item :label="$t('workflowEditor.process.systemVersion')" :rules="[requiredRule]">
-          <el-select v-model="systemPublishVersion" :placeholder="$t('workflowEditorMessage.pleaseSelect')" @change="changeVersion">
-            <el-option
-              v-for="item in systems"
-              :key="item.publishVersion"
-              :label="item.publishVersion"
-              :value="item.publishVersion"
-            />
-          </el-select>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row>
       <el-col :span="12">
         <el-form-item :label="$t('workflowEditor.process.affiliatedBranch')">
           <el-select v-model="model.branchCode" clearable :placeholder="$t('workflowEditorMessage.pleaseSelect')">
@@ -96,12 +82,11 @@
   </el-form>
 </template>
 <script>
-import { mapGetters, mapMutations } from 'vuex'
+import { mapMutations } from 'vuex'
 import processService from '../../process-service'
 import { getI18n } from '../../../../workflow-editor/src/util'
 import i18nInput from '../common/i18n-input'
 import { getUsername } from 'imatrix-ui/src/utils/auth'
-import authApi from 'imatrix-ui/src/utils/auth-api'
 export default {
   name: 'BasicProperties',
   components: {
@@ -143,40 +128,22 @@ export default {
         trigger: 'blur'
       },
       isSelectAdmin: false,
-      selectedForm: [],
-      systemPublishVersion: null,
-      sysCode: null,
-      systems: []
-
+      selectedForm: []
     }
   },
-  computed: {
-    ...mapGetters('wfEditor', [
-      'systemVersion', 'systemCode'
-    ])
-  },
   created() {
     this.getAdminNameWhenUpdate()
-    // this.listAllForms()
+    this.listAllForms()
     this.listAllProcessTypes()
     this.listAllSystems()
     this.listAllBranches()
     // TODO 流程创建人先写死，现在的资源路径都是匿名的无法获得当前用户
     // this.model.creator = 'admin'
-    if (!this.model.creator) {
+    if(!this.model.creator){
       this.model.creator = getUsername()
     }
     this.setProcessCode(this.formModel.code)
-    if (this.model.systemCode) {
-      // 编辑修改流程
-      this.setSystemCode(this.model.systemCode)
-    } else {
-      // 新建流程, model systemCode为空
-      this.model.systemCode = this.systemCode
-    }
-    this.systemPublishVersion = parseInt(authApi.getSessionCache('wf_editor_systemVersion'))
-    this.changeSystem(this.systemCode, this.systemPublishVersion)
-    this.listAllForms(this.systemCode, this.systemPublishVersion)
+    this.setSystemCode(this.model.systemCode)
   },
   mounted() {
     // 支持.snyc修饰符的写法
@@ -190,15 +157,11 @@ export default {
     this.$watch('model.systemCode', function(newVal, oldVal) {
       this.setSystemCode(newVal)
     })
-    this.$watch('systemPublishVersion', function(newVal, oldVal) {
-      this.setSystemVersion(newVal)
-    })
   },
   methods: {
     ...mapMutations('wfEditor', [
       'setFormFields',
       'setSystemCode',
-      'setSystemVersion',
       'setProcessCode'
     ]),
     handleChange(values) {
@@ -208,7 +171,7 @@ export default {
       this.model.formCode = formInfo.substring(formInfo.indexOf('/') + 1, formInfo.lastIndexOf('/'))
       this.model.formVersion = formInfo.substring(formInfo.lastIndexOf('/') + 1)
       // 表单改变时，重新获取表单字段并放到vuex中
-      processService.fetchFormFields(this.model.formCode, this.model.formVersion, this.systemPublishVersion)
+      processService.fetchFormFields(this.model.formCode, this.model.formVersion)
     },
     // 弹出人员树
     selectAdmin() {
@@ -233,8 +196,8 @@ export default {
       this.isSelectAdmin = false
     },
     // 获得对应表单列表
-    listAllForms(systemCode, publishVersion) {
-      this.$http.get(this.baseAPI + '/wf-editor/workflow-editors/forms?systemCode=' + systemCode + '&publishVersion=' + publishVersion).then(systemAndForms => {
+    listAllForms() {
+      this.$http.get(this.baseAPI + '/wf-editor/workflow-editors/forms').then(systemAndForms => {
         // 设置表单信息
         const selectedFormInfo = this.model.formCode + '/' + this.model.formVersion
         // 修改时，获得默认选中的表单项
@@ -303,22 +266,6 @@ export default {
     },
     setI18nValue(i18nKey) {
       this.model.i18nKey = i18nKey
-    },
-    changeSystem(systemCode, systemPublishVersion) {
-      this.systemPublishVersion = systemPublishVersion
-      this.allForms = []
-      if (systemCode) {
-        this.$http.get(this.baseAPI + '/wf-editor/systems/getPublishVersionsByCode/' + systemCode).then(result => {
-          if (result) {
-            this.systems = result
-          } else {
-            this.systems = []
-          }
-        })
-      }
-    },
-    changeVersion() {
-      this.listAllForms(this.model.systemCode, this.systemPublishVersion)
     }
   }
 }

package/packages/workflow-editor/src/properties-editors/process/selectPage.vue

@@ -28,8 +28,6 @@
 
 // import modulePageService from '@/subsystems/mms/api/module-page'
 import Vue from 'vue'
-import { mapGetters } from 'vuex'
-import authApi from 'imatrix-ui/src/utils/auth-api'
 
 export default {
   props: {
@@ -45,11 +43,6 @@ export default {
       selection: []
     }
   },
-  computed: {
-    ...mapGetters('wfEditor', [
-      'systemVersion'
-    ])
-  },
   watch: {
     conditionList: {
       handler(newValue, oldValue) {
@@ -60,7 +53,7 @@ export default {
   created() {
     this.baseURL = Vue.prototype.baseURL
     if (this.pageFormCode) {
-      this.listURL = '/wf-editor/workflow-editors/modulePages/' + this.pageFormCode + '/' + parseInt(authApi.getSessionCache('wf_editor_systemVersion'))
+      this.listURL = '/wf-editor/workflow-editors/modulePages/' + this.pageFormCode
     }
   },
   methods: {

package/packages/workflow-editor/src/properties-editors/subprocess/basic-properties.vue

@@ -4,7 +4,11 @@
       <el-col :span="12">
         <el-form-item :label="$t('workflowEditor.process.name')" label-width="50px">
           <!-- <el-input v-model="formModel.name" /> -->
-          <i18n-input v-model="formModel.name" :i18n-key="formModel.tache.i18nKey?formModel.tache.i18nKey:'name.'+formModel.id" @setI18n="setI18nValue" />
+          <i18n-input
+            v-model="formModel.name"
+            :i18n-key="formModel.tache.i18nKey?formModel.tache.i18nKey:'name.'+formModel.id"
+            @setI18n="setI18nValue"
+          />
         </el-form-item>
       </el-col>
       <el-col :span="12">
@@ -13,6 +17,9 @@
         </el-form-item>
       </el-col>
     </el-row>
+    <el-form-item :label="$t('workflowEditor.task.taskTitle')">
+      <task-title v-model="tache.taskTitle" />
+    </el-form-item>
     <el-form-item :label="$t('workflowEditor.process.subprocess')" label-width="60px">
       <el-cascader
         v-model="selectedProcess"
@@ -56,11 +63,13 @@ import FieldMappings from './field-mappings'
 import processService from '../../process-service.js'
 import { validateTacheCode } from '../../util'
 import i18nInput from '../common/i18n-input'
+import TaskTitle from '../common/task-title'
 export default {
   name: 'BasicProperties',
   components: {
     FieldMappings,
-    i18nInput
+    i18nInput,
+    TaskTitle
   },
   props: {
     model: {
@@ -89,6 +98,9 @@ export default {
     }
   },
   computed: {
+    tache() {
+      return this.model
+    }
   },
   created() {
     this.listAllProcesses().then(() => {
@@ -103,10 +115,10 @@ export default {
     }
   },
   mounted() {
-    // this.$watch('model.attr.id', function(newVal, oldVal) {
-    //   // updateTransitionsWhenTacheIdChanged(newVal, oldVal)
-    //   this.$emit('update:id', newVal)
-    // })
+    // 支持.snyc修饰符的写法
+    this.$watch('formModel.name', function(newVal, oldVal) {
+      this.$emit('update:name', newVal)
+    })
   },
   methods: {
     fetchSubprocessFormFields() {

package/packages/workflow-editor/src/properties-editors/user-condition.js

@@ -2,6 +2,9 @@ import {getI18n} from '../../../workflow-editor/src/util'
 export const userStandardFieldsForReminder = {
   '${instanceCreatorName}': getI18n().t('workflowEditor.process.processInitiator'),
   '${instanceCreatorDirectSuperiorName}': getI18n().t('workflowEditor.process.sponsorsImmediateSuperior'),
+  '${instanceCreatorDeptApprover}': getI18n().t('workflowEditor.process.deptApprover'),
+  '${instanceCreatorDirectSuperiorDeptApprover}': getI18n().t('workflowEditor.process.superiorDeptApprover'),
+  '${instanceCreatorDirectSuperiorDeptLeader}': getI18n().t('workflowEditor.process.superiorDeptLeader'),
   '${currentTransactorName}': getI18n().t('workflowEditor.process.nameOfCurrentHandler'),
   '${currentTransactorDirectSuperiorName}': getI18n().t('workflowEditor.process.nameOfTheImmediateSuperiorOfTheCurrentHandler')
 }
@@ -44,7 +47,10 @@ const allStandardFieldsForReminder = {
 
 export const userStandardFieldsForTransactor = {
   '${instanceCreatorName}': getI18n().t('workflowEditor.process.processInitiator'),
-  '${instanceCreatorDirectSuperiorName}': getI18n().t('workflowEditor.process.sponsorsImmediateSuperior')
+  '${instanceCreatorDirectSuperiorName}': getI18n().t('workflowEditor.process.sponsorsImmediateSuperior'),
+  '${instanceCreatorDeptApprover}': getI18n().t('workflowEditor.process.deptApprover'),
+  '${instanceCreatorDirectSuperiorDeptApprover}': getI18n().t('workflowEditor.process.superiorDeptApprover'),
+  '${instanceCreatorDirectSuperiorDeptLeader}': getI18n().t('workflowEditor.process.superiorDeptLeader')
 }
 export const departmentStandardFieldsForTransactor = {
   '${upstageDepartment}': getI18n().t('workflowEditor.process.topDepartments'),

package/packages/workflow-editor/src/store/getters.js

@@ -22,7 +22,6 @@ const getters = {
   processCode: state => state.processCode,
   processI18n: state => state.processI18n,
   subtableConditionMap: state => state.subtableConditionMap,
-  propSettingKeyList: state => state.propSettingKeyList,
-  systemVersion: state => state.systemVersion
+  propSettingKeyList: state => state.propSettingKeyList
 }
 export default getters

package/packages/workflow-editor/src/store/workflow-editor.js

@@ -118,9 +118,6 @@ const wfEditor = {
     },
     setPropSettingKeyList(state, propSettingKeyList) {
       state.propSettingKeyList = propSettingKeyList
-    },
-    setSystemVersion(state, systemVersion) {
-      state.systemVersion = systemVersion
     }
   }
 }

package/packages/workflow-editor/src/taches/auto-task.vue

@@ -0,0 +1,99 @@
+<template>
+  <g
+    @mousedown.stop="startDrag"
+    @mouseup="endDrag"
+    @mouseenter="showJoints"
+    @mouseleave="hideJoints"
+    @dblclick.stop="setPropertiesEditorFor('AutoTask')"
+  >
+    <rect
+      ref="tache"
+      :width="model.width"
+      :height="model.height"
+      :class="{'draggable':true,'task-tache':true, 'selected':model.isSelected}"
+      :x="model.x"
+      :y="model.y"
+      rx="6"
+      ry="6"
+    />
+    <text
+      :x="text.x"
+      :y="text.y"
+      text-anchor="middle"
+      class="draggable"
+    >
+      {{ name }}
+    </text>
+    <joint
+      v-for="position in jointPoints"
+      :key="position"
+      :parent="model"
+      :position="position"
+    />
+    <tache-resizer
+      v-for="position in resizers"
+      :key="position"
+      :owner="model"
+      :position="position"
+    />
+  </g>
+</template>
+<script>
+import { mapGetters, mapMutations } from 'vuex'
+import Joint from './joint'
+import TacheResizer from './tache-resizer'
+import tacheMethods from './common-methods'
+import { watchShowName } from '../util'
+export default {
+  name: 'AutoTask',
+  components: {
+    Joint,
+    TacheResizer
+  },
+  props: {
+    model: {
+      type: Object,
+      default: null
+    }
+  },
+  data() {
+    return {
+      // 一个tache有上右下左四个连接点，这四个连接点的坐标根据tache的位置和大小计算出来
+      jointPoints: [],
+      resizers: ['NW', 'NE', 'SW', 'SE'],
+      name: this.model.name
+    }
+  },
+  computed: {
+    ...mapGetters('wfEditor', [
+      'selectedTaches',
+      'processI18n'
+    ]),
+    text() {
+      return {
+        x: this.model.x + this.model.width / 2,
+        y: this.model.y + this.model.height / 2
+      }
+    }
+  },
+  created() {
+    this.name = watchShowName(this, this.name)
+  },
+  mounted() {
+    this.$watch('model.name', function(newVal) {
+      this.name = watchShowName(this, newVal)
+    })
+  },
+  methods: {
+    ...mapMutations('wfEditor', [
+      'setPropertiesEditorFor',
+      'setContextMenuVisible'
+    ]),
+    ...tacheMethods
+  }
+}
+</script>
+<style>
+
+</style>
+