workflow-editor 0.9.67 → 0.9.68-boe1

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,7 +22,7 @@
         <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' "
         prop="selectedField"
         required
         :label="$t('workflowEditor.process.fieldName')"
@@ -28,7 +31,7 @@
         <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-model="formModel.additionalCondition.generateForParttimeDept">
+            {{ $t('workflowEditor.process.generateForParttimeDept') }}
+          </el-checkbox> -->
         </el-form-item>
         <div v-if="formModel.additionalCondition.selectOneFromMultiple">
           <el-form-item :label="$t('workflowEditor.process.selectionMethod')">
@@ -150,9 +156,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 +218,9 @@ export default {
       } else {
         this.model.url = ''
       }
+      // if (val === 'byDeptField') {
+      //   this.model.userCondition = this.formModel.selectedField
+      // }
 
       // 不是按条件筛选的时候，需要清空xml中additionalCondition
       if (val === 'byCondition') {
@@ -223,8 +235,13 @@ 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
     }

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

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

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

@@ -1,5 +1,18 @@
 
 import { getLanguageWithLocale } from 'imatrix-ui/src/utils/util'
+import i18n from '../../../src/i18n/i18n'
+import newAutoTask from './json-object-templates/auto-task'
+import newCopyTask from './json-object-templates/copy-task'
+import newDecision from './json-object-templates/decision'
+import newEnd from './json-object-templates/end'
+import newFork from './json-object-templates/fork'
+import newHumanDecision from './json-object-templates/human-decision'
+import newHumanTask from './json-object-templates/human-task'
+import newJoin from './json-object-templates/join'
+import newProcess from './json-object-templates/process'
+import newStart from './json-object-templates/start'
+import newSubprocess from './json-object-templates/subprocess'
+import newTransition from './json-object-templates/transition'
 function getStore() {
   return window.$store
 }
@@ -92,6 +105,16 @@ export function getComponentList() {
       height: 40,
       color: '#0777D4'
     },
+    {
+      name: 'AutoTask',
+      label: getI18n().t('workflowEditor.task.autoTask'),
+      icon: 'human-task',
+      type: '',
+      round: false,
+      width: 80,
+      height: 40,
+      color: '#0777D4'
+    },
     {
       name: 'End',
       label: getI18n().t('workflowEditor.task.end'),
@@ -269,7 +292,7 @@ function clearAllSelectedComponents() {
  */
 function removeTextProperty(obj) {
   const keys = Object.getOwnPropertyNames(obj)
-  keys.forEach(function(key) {
+  keys.forEach(function (key) {
     if (typeof obj[key] === 'object') {
       if (obj[key]._text !== undefined) {
         obj[key] = obj[key]._text
@@ -290,7 +313,7 @@ function removeTextProperty(obj) {
   })
 }
 function generateTaches(type, arr) {
-  if (!arr)arr = []
+  if (!arr) arr = []
   if (!Array.isArray(arr)) {
     arr = [arr]
   }
@@ -312,7 +335,7 @@ function generateTaches(type, arr) {
   }
 }
 function generateTransitions(type, arr) {
-  if (!arr)arr = []
+  if (!arr) arr = []
   if (!Array.isArray(arr)) {
     arr = [arr]
   }
@@ -361,6 +384,7 @@ function initializeProcessData(process) {
   generateTaches('Subprocess', process.subprocess)
   generateTaches('HumanDecision', process.humanDecision)
   generateTaches('CopyTask', process.copyTask)
+  generateTaches('AutoTask', process.autoTask)
   generateTaches('Start', process.start)
   generateTaches('End', process.end)
   generateTransitions('Transition', process.transition)
@@ -442,39 +466,9 @@ function watchShowName(vm, newVal) {
   return showName
 }
 export {
-  getComponentInfo,
-  getJoint,
-  getMousePosition,
-  getClientMousePosition,
-  getMouseOffset,
-  getVirtualRegion,
-  getRealRegion,
-  startDragTache,
-  endDragTache,
-  clearAllSelectedComponents,
-  removeTextProperty,
-  initializeProcessData,
-  findOutgoingTransitionsByTacheId,
-  findIncomingTransitionsByTacheId,
-  findTacheById,
-  deepCopy,
-  updateTransitionsWhenTacheIdChanged,
-  validateTacheCode,
-  getI18n,
-  watchShowName
+  clearAllSelectedComponents, deepCopy, endDragTache, findIncomingTransitionsByTacheId, findOutgoingTransitionsByTacheId, findTacheById, getClientMousePosition, getComponentInfo, getI18n, getJoint, getMouseOffset, getMousePosition, getRealRegion, getVirtualRegion, initializeProcessData, removeTextProperty, startDragTache, updateTransitionsWhenTacheIdChanged,
+  validateTacheCode, watchShowName
 }
-import newProcess from './json-object-templates/process'
-import newHumanTask from './json-object-templates/human-task'
-import newDecision from './json-object-templates/decision'
-import newStart from './json-object-templates/start'
-import newEnd from './json-object-templates/end'
-import newTransition from './json-object-templates/transition'
-import newSubprocess from './json-object-templates/subprocess'
-import newFork from './json-object-templates/fork'
-import newJoin from './json-object-templates/join'
-import newHumanDecision from './json-object-templates/human-decision'
-import i18n from '../../../src/i18n/i18n'
-import newCopyTask from './json-object-templates/copy-task'
 
 const processTemplate = {
   newProcess,
@@ -487,7 +481,9 @@ const processTemplate = {
   newFork,
   newJoin,
   newHumanDecision,
-  newCopyTask
+  newCopyTask,
+  newAutoTask
 }
 
 export { processTemplate }
+

package/packages/workflow-editor/src/workflow-editor.vue

@@ -246,6 +246,7 @@ export default {
         subprocess: [],
         humanDecision: [],
         copyTask: [],
+        autoTask: [],
         end: []
       }
       process.attr = this.process.attr

package/src/i18n/langs/cn.js

@@ -29,7 +29,8 @@ const cn = {
     i18nZh: '中文',
     i18nEn: '英文',
     i18nKey: '国际化key',
-    subprocessTitle: '子流程流转历史'
+    subprocessTitle: '子流程流转历史',
+    custom: '自定义'
   },
   workflowEditorMessage: {
     requiredAndMustBeADate: '必填且必须为日期',
@@ -137,7 +138,10 @@ const cn = {
       formField: '表单字段',
       variableName: '变量名',
       variableValue: '变量值',
-      selectField: '选择字段'
+      selectField: '选择字段',
+      taskNotice: '待办通知',
+      reminderNotice: '催办通知',
+      customMsg: '自定义消息内容'
     },
     // 流程属性
     process: {
@@ -291,7 +295,7 @@ const cn = {
       permissionSettings: '权限设置',
       notificationSettings: '通知设置',
       sendNotificationAfterProcessEnds: '流程结束后发送通知',
-      reminderSettings: '催办设置',
+      reminderSettings: '通知与催办',
       parameterSsetting: '参数设置',
       event: '事件',
       processVariables: '流程变量',
@@ -316,7 +320,9 @@ const cn = {
       isNotNull: '不等于Null',
       defaultMailTemplate: '默认邮件模板',
       trustTask: '委托任务',
-      subprocessIsSharedForm: '主子流程共用表单'
+      subprocessIsSharedForm: '主子流程共用表单',
+      generateForParttimeDept: '为兼职部门人员生成任务',
+      deptSpecifiedInFormField: '表单字段中指定的部门'
     },
     // 环节属性
     task: {
@@ -413,7 +419,7 @@ const cn = {
       attributesOfManualJudgment: '人工判断的属性',
       linkAttribute: '环节属性',
       autoFillInFieldSettings: '自动填写字段设置',
-      reminderSettings: '催办设置',
+      reminderSettings: '通知与催办',
       eventProcessing: '事件处理',
       linkVariable: '环节变量',
       convergedProperties: '汇聚的属性',
@@ -421,8 +427,12 @@ const cn = {
       conditionJudgment: '条件判断',
       cCtask: '抄送任务',
       canItBeRejected: '是否可驳回',
-      selectMailTemplate: '选择邮件模板',
-      selectTemplate: '选择模板'
+      selectMailTemplate: '选择通知模板',
+      selectTemplate: '选择模板',
+      autoTask: '自动任务',
+      newAutoTask: '新自动任务',
+      propertiesOfAutoTask: '自动任务的属性',
+      custombeanName: '自定义bean'
     },
     // 流向属性
     transition: {