workflow-editor 0.9.67 → 0.9.68-boe3

package/packages/workflow-editor/src/properties-editors/common/notice-reminder.vue

@@ -0,0 +1,72 @@
+<template>
+  <div>
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <span>{{ $t('workflowEditor.common.taskNotice') }}</span>
+      </div>
+      <el-form :model="noticeObj" label-width="80px">
+        <common-notice-tool v-model="noticeObj.informType" :label="$t('workflowEditor.common.notificationMethod')" :custom-msg="noticeObj.customMsg" @input-msg="setCustomMsg" />
+        <el-form-item :label="$t('workflowEditor.task.selectMailTemplate')">
+          <select-mail-templates v-model="noticeObj.mailTemplateCode" @set-value="setMailTemplateCode" />
+        </el-form-item>
+      </el-form>
+    </el-card>
+    <el-card class="box-card" style="margin-top: 10px">
+      <div slot="header" class="clearfix">
+        <span>{{ $t('workflowEditor.common.reminderNotice') }}</span>
+      </div>
+      <reminder v-model="reminderObj" />
+    </el-card>
+  </div>
+</template>
+
+<script>
+import Reminder from './reminder.vue'
+import CommonNoticeTool from './common-notice-tool'
+import SelectMailTemplates from './select-mail-template.vue'
+export default {
+  name: 'NoticeReminder',
+  components: {
+    Reminder,
+    CommonNoticeTool,
+    SelectMailTemplates
+  },
+  props: {
+    reminderValue: {
+      type: [Object, String],
+      default: null
+    },
+    taskNoticeValue: {
+      type: Object,
+      default: null
+    }
+  },
+  data() {
+    let reminderObj = {}
+    if (this.reminderValue !== null && this.reminderValue !== undefined && this.reminderValue !== '') {
+      reminderObj = this.reminderValue
+    }
+    let noticeObj = {}
+    if (this.taskNoticeValue !== null && this.taskNoticeValue !== undefined && this.taskNoticeValue !== '') {
+      noticeObj = this.taskNoticeValue
+    }
+    return {
+      reminderObj: reminderObj,
+      noticeObj: noticeObj
+    }
+  },
+  methods: {
+    // 关闭选择邮件模板弹框
+    setMailTemplateCode(mailTemplateCode) {
+      this.noticeObj.mailTemplateCode = mailTemplateCode
+    },
+    setCustomMsg(msg) {
+      this.noticeObj.customMsg = msg
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>

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

@@ -6,7 +6,7 @@
       />
     </el-form-item>
     <div v-if="showNotice">
-      <common-notice-tool v-model="model.informType" :label="$t('workflowEditor.common.notificationMethod')" />
+      <common-notice-tool v-model="model.informType" :label="$t('workflowEditor.common.notificationMethod')" :custom-msg="model.customMsg" @input-msg="setCustomMsg" />
       <el-form-item v-if="model.informType && model.informType.length > 0 && model.informType.indexOf('mail') !== -1" :label="$t('workflowEditor.task.selectMailTemplate')">
         <select-mail-templates v-model="model.noticeMailTemplateCode" @set-value="setMailTemplateCode" />
       </el-form-item>
@@ -91,6 +91,9 @@ export default {
     // 关闭选择邮件模板弹框
     setMailTemplateCode(mailTemplateCode) {
       this.model.noticeMailTemplateCode = mailTemplateCode
+    },
+    setCustomMsg(msg) {
+      this.model.customMsg = msg
     }
   }
 }

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

@@ -6,7 +6,7 @@
       />
     </el-form-item>
     <div v-if="showReminder">
-      <common-notice-tool v-model="model.remindType" :label="$t('workflowEditor.task.urgingMethod')" />
+      <common-notice-tool v-model="model.remindType" :label="$t('workflowEditor.task.urgingMethod')" :custom-msg="model.reminderCustomMsg" @input-msg="setReminderCustomMsg" />
       <el-form-item v-if="model.remindType && model.remindType.length > 0 && model.remindType.indexOf('mail') !== -1" :label="$t('workflowEditor.task.selectMailTemplate')">
         <select-mail-templates v-model="model.noticeMailTemplateCode" @set-value="setMailTemplateCode" />
       </el-form-item>
@@ -34,7 +34,7 @@
         <el-form-item :label="$t('workflowEditor.task.timesOfUrging')" size="mini">
           <el-input-number v-model="model.remindTimes" controls-position="right" :min="1" :max="99" style="width:90px" />
         </el-form-item>
-        <common-notice-tool v-model="model.noticeType" :label="$t('workflowEditor.common.notificationMethod')" />
+        <common-notice-tool v-model="model.noticeType" :label="$t('workflowEditor.common.notificationMethod')" :custom-msg="model.noticeCustomMsg" @input-msg="setNoticeCustomMsg" />
         <el-form-item :label="$t('workflowEditor.common.notifyPersonnel')" style="margin-bottom:5px">
           <el-checkbox v-model="model.containTransferUser">
             {{ $t('workflowEditor.task.includingHandoverPersonnel') }}
@@ -168,6 +168,12 @@ export default {
     },
     selectData(selection, row) {
       this.multiSelectData = selection
+    },
+    setReminderCustomMsg(msg) {
+      this.model.reminderCustomMsg = msg
+    },
+    setNoticeCustomMsg(msg) {
+      this.model.noticeCustomMsg = msg
     }
   }
 }

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" />
@@ -29,7 +29,8 @@
         <auto-filled-fields v-model="model.ref.autoFilledFields" />
       </el-tab-pane>
       <el-tab-pane :label="$t('workflowEditor.task.reminderSettings')" name="reminders">
-        <reminder v-model="model.ref.reminder" />
+        <!-- <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" />
@@ -46,9 +47,10 @@ import BasicProperties from './human-task/basic-properties'
 import PermissionSettings from './human-task/permission-settings'
 import TransactorSettings from './common/transactor-settings'
 import AutoFilledFields from './common/auto-filled-fields'
-import Reminder from './common/reminder'
+// import Reminder from './common/reminder'
 import Variables from './common/variables'
 import Events from './human-task/events'
+import NoticeReminder from './common/notice-reminder.vue'
 export default {
   name: 'HumanTaskPropertiesEditor',
   components: {
@@ -56,9 +58,10 @@ export default {
     TransactorSettings,
     PermissionSettings,
     AutoFilledFields,
-    Reminder,
+    // Reminder,
     Events,
-    Variables
+    Variables,
+    NoticeReminder
 
   },
   props: {
@@ -69,6 +72,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/process/basic-properties.vue

@@ -67,8 +67,8 @@
         <el-form-item :label="$t('workflowEditor.process.affiliatedBranch')">
           <el-select v-model="model.branchCode" clearable :placeholder="$t('workflowEditorMessage.pleaseSelect')">
             <el-option
-              v-for="item in allBranches"
-              :key="item.code"
+              v-for="(item, index) in allBranches"
+              :key="item.code+'-'+index"
               :label="item.name"
               :value="item.code"
             />

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

@@ -26,7 +26,8 @@
         <notice-settings v-model="model.properties.inform" />
       </el-tab-pane>
       <el-tab-pane :label="$t('workflowEditor.process.reminderSettings')" name="reminders">
-        <reminder v-model="model.properties.reminder" />
+        <!-- <reminder v-model="model.properties.reminder" /> -->
+        <notice-reminder :reminder-value="model.properties.reminder" :task-notice-value="model.properties.taskNotice" />
       </el-tab-pane>
       <el-tab-pane :label="$t('workflowEditor.process.parameterSsetting')" name="parameterSettings">
         <parameter-settings :model="model.properties.parameterSettings" />
@@ -44,21 +45,23 @@
 import convert from 'xml-js'
 import BasicProperties from './process/basic-properties'
 import PermissionSettings from './process/permission-settings'
-import Reminder from './common/reminder'
+// import Reminder from './common/reminder'
 import ParameterSettings from './process/parameter-settings'
 import Events from './process/events'
 import Variables from './common/variables'
 import NoticeSettings from './process/notice-settings.vue'
+import NoticeReminder from './common/notice-reminder.vue'
 export default {
   name: 'ProcessPropertiesEditor',
   components: {
     BasicProperties,
     PermissionSettings,
-    Reminder,
+    // Reminder,
     ParameterSettings,
     Events,
     Variables,
-    NoticeSettings
+    NoticeSettings,
+    NoticeReminder
   },
   props: {
     model: {
@@ -70,6 +73,9 @@ export default {
     // if (this.model.properties.inform === undefined) {
     //   this.model.properties.inform = {}
     // }
+    if (this.model.properties.taskNotice === undefined) {
+      this.model.properties.taskNotice = {}
+    }
     return {
       activeTab: 'basicProperties'
     }

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/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>
+