workflow-editor 0.9.68-pv → 0.9.68

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

@@ -99,7 +99,6 @@ import processService from './process-service'
 import FileSaver from 'file-saver'
 import Prism from 'prismjs'
 import AdminSaveDialog from './main/admin-save-dialog'
-import authApi from 'imatrix-ui/src/utils/auth-api'
 export default {
   name: 'WorkflowEditor',
   components: {
@@ -128,16 +127,6 @@ export default {
     readonly: {
       type: Boolean,
       default: false
-    },
-    // 系统编码，新增时选中的系统编码，或修改时流程定义所属的系统编码
-    systemCode: {
-      type: String,
-      default: null
-    },
-    // 系统版本号，修改时流程定义中的系统版本号，例如：v1.0.0，新增不会使用该属性
-    systemPublishVersion: {
-      type: Number,
-      default: null
     }
   },
   data: function() {
@@ -154,7 +143,7 @@ export default {
   },
   computed: {
     ...mapGetters(
-      'wfEditor', ['componentToDraw', 'taches', 'transitions', 'contextMenuVisible', 'systemVersion']
+      'wfEditor', ['componentToDraw', 'taches', 'transitions', 'contextMenuVisible']
     ),
     ...mapGetters([
       'sidebar'
@@ -174,10 +163,6 @@ export default {
     }
   },
   created: function() {
-    authApi.setSessionCache('wf_editor_systemVersion', this.systemPublishVersion)
-    if (this.systemCode) {
-      this.setSystemCode(this.systemCode)
-    }
     // 打开或新建流程图时先清空画布，开发过程中代码热更新的时候可以避免节点重复
     this.clearCanvas()
     if (this.id) {
@@ -196,6 +181,7 @@ export default {
     }
   },
   mounted: function() {
+
   },
   methods: {
     ...mapMutations('wfEditor', [
@@ -203,7 +189,6 @@ export default {
       'clearCanvas',
       'setContextMenuVisible',
       'setSystemCode',
-      'setSystemVersion',
       'setProcessCode'
     ]),
     showContextMenu(event) {
@@ -223,9 +208,6 @@ export default {
       this.process = processObj.process
       if (this.process && this.process.properties && this.process.properties.basicProperties) {
         this.setSystemCode(this.process.properties.basicProperties.systemCode)
-      } else {
-        // 新增时，将传过来的系统编码缓存起来
-        this.setSystemCode(this.systemCode)
       }
       if (this.process && this.process.attr) {
         this.setProcessCode(this.process.attr.code)
@@ -241,7 +223,7 @@ export default {
       const formVersion = processProperties.formVersion
       if (formCode && formCode !== '' && formVersion) {
       // 取出formFields放到vuex中
-        processService.fetchFormFields(processProperties.formCode, processProperties.formVersion, this.systemPublishVersion)
+        processService.fetchFormFields(processProperties.formCode, processProperties.formVersion)
       }
     },
     packageUrlParam(url) {
@@ -264,6 +246,7 @@ export default {
         subprocess: [],
         humanDecision: [],
         copyTask: [],
+        autoTask: [],
         end: []
       }
       process.attr = this.process.attr
@@ -319,8 +302,7 @@ export default {
       } else {
         // 表示新建
         const param = {
-          xml: xml,
-          publishVersion: this.systemPublishVersion
+          xml: xml
         }
         this.$http.post(this.baseAPI + '/wf-editor/workflow-definitions', param).then(definition => {
           this.definitionId = definition.id
@@ -342,8 +324,7 @@ export default {
     },
     packageSaveXmlParam(xml) {
       const param = {
-        xml: xml,
-        publishVersion: this.systemPublishVersion
+        xml: xml
       }
       if (this.definitionId) {
         // 表示已保存过，新流程定义的id
@@ -392,8 +373,7 @@ export default {
       } else {
         // 表示新建
         const param = {
-          xml: xml,
-          publishVersion: this.systemPublishVersion
+          xml: xml
         }
         this.$http.post(this.baseAPI + '/wf-editor/workflow-definitions', param).then(definition => {
           this.definitionId = definition.id
@@ -598,6 +578,7 @@ section{
   height: calc(100% - #{$tabsHeaderHeight});
   padding:10px;
   width:100%;
+	box-sizing: border-box;
 }
 
 .canvas,.xml{

package/src/i18n/langs/cn.js

@@ -30,7 +30,7 @@ const cn = {
     i18nEn: '英文',
     i18nKey: '国际化key',
     subprocessTitle: '子流程流转历史',
-    custom:'自定义'
+    custom: '自定义'
   },
   workflowEditorMessage: {
     requiredAndMustBeADate: '必填且必须为日期',
@@ -139,22 +139,22 @@ const cn = {
       variableName: '变量名',
       variableValue: '变量值',
       selectField: '选择字段',
-      taskNotice:'待办通知',
-      reminderNotice:'催办通知',
-      customMsg:'自定义消息内容'
+      taskNotice: '待办通知',
+      reminderNotice: '催办通知',
+      customMsg: '自定义消息内容'
     },
     // 流程属性
     process: {
-      processInitiator: '流程发起人',
-      processInitiatorRole: '流程发起人角色',
-      processInitiatorDepartment: '流程发起人部门',
-      processInitiatorSuperiorDepartment: '流程发起人上级部门',
-      processInitiatorTopDepartment: '流程发起人顶级部门',
-      processInitiatorWorkingGroup: '流程发起人工作组',
-      nameOfTheDirectSuperiorOfTheProcessInitiator: '流程发起人直属上级姓名',
-      processInitiatorsDirectSuperiorDepartment: '流程发起人直属上级部门',
-      directSuperiorRoleOfProcessInitiator: '流程发起人直属上级角色',
-      ProcessInitiatorsImmediateSuperiorWorkingGroup: '流程发起人直属上级工作组',
+      processInitiator: '起草人',
+      processInitiatorRole: '起草人角色',
+      processInitiatorDepartment: '起草人部门',
+      processInitiatorSuperiorDepartment: '起草人上级部门',
+      processInitiatorTopDepartment: '起草人顶级部门',
+      processInitiatorWorkingGroup: '起草人工作组',
+      nameOfTheDirectSuperiorOfTheProcessInitiator: '起草人直属上级姓名',
+      processInitiatorsDirectSuperiorDepartment: '起草人直属上级部门',
+      directSuperiorRoleOfProcessInitiator: '起草人直属上级角色',
+      ProcessInitiatorsImmediateSuperiorWorkingGroup: '起草人直属上级工作组',
       nameOfCurrentHandler: '当前办理人姓名',
       currentHandlerRole: '当前办理人角色',
       currentHandlerDepartment: '当前办理人部门',
@@ -225,8 +225,8 @@ const cn = {
       personSpecifiedInFormField: '表单字段中指定的人员',
       filterByCriteria: '按条件筛选',
       additionalConditions: '附加条件',
-      handlingYyThePersonnelOfTheDepartmentOfTheInitiator: '发起人所在部门人员办理',
-      personnelOfTheDepartmentWhereTheInitiatorWorksParticipateInTheHandling: '发起人所在部门人员参与办理',
+      handlingYyThePersonnelOfTheDepartmentOfTheInitiator: '起草人所在部门人员办理',
+      personnelOfTheDepartmentWhereTheInitiatorWorksParticipateInTheHandling: '起草人所在部门人员参与办理',
       selectSpecificHandler: '选择具体办理人',
       selectOneFromDept: '同一部门仅需一人办理',
       generateOneInstanceFromDept: '同一部门生成一个实例',
@@ -302,11 +302,11 @@ const cn = {
       propertiesOfSubprocesses: '子流程的属性',
       settingOfHandler: '办理人设置',
       eventProcessing: '事件处理',
-      sponsorsImmediateSuperior: '发起人直属上级',
-      sponsorsSuperiorDepartment: '发起人上级部门',
-      sponsorTopDepartment: '发起人顶级部门',
-      superiorDepartmentDirectlyUnderTheInitiator: '发起人直属上级部门',
-      sponsorsImmediateSuperiorWorkingGroup: '发起人直属上级工作组',
+      sponsorsImmediateSuperior: '起草人部门负责人',// 发起人直属上级
+      sponsorsSuperiorDepartment: '起草人上级部门',
+      sponsorTopDepartment: '起草人顶级部门',
+      superiorDepartmentDirectlyUnderTheInitiator: '起草人直属上级部门',
+      sponsorsImmediateSuperiorWorkingGroup: '起草人直属上级工作组',
       lastLinkHandlerDepartment: '上一环节办理人部门',
       previousLinkHandlerSuperiorDepartment: '上一环节办理人上级部门',
       topDepartmentOfHandlerInThePreviousLink: '上一环节办理人顶级部门',
@@ -321,7 +321,12 @@ const cn = {
       defaultMailTemplate: '默认邮件模板',
       trustTask: '委托任务',
       subprocessIsSharedForm: '主子流程共用表单',
-      systemVersion: '系统版本'
+      generateForParttimeDept: '为兼职部门人员生成任务',
+      deptSpecifiedInFormField: '表单字段中指定的部门',
+      activateOneVoteVeto: '一票否决',
+      deptApprover: '起草人部门授权审批人',
+      superiorDeptApprover: '起草人上级部门授权审批人',
+      superiorDeptLeader: '起草人上级部门负责人'
     },
     // 环节属性
     task: {
@@ -427,7 +432,11 @@ const cn = {
       cCtask: '抄送任务',
       canItBeRejected: '是否可驳回',
       selectMailTemplate: '选择通知模板',
-      selectTemplate: '选择模板'
+      selectTemplate: '选择模板',
+      autoTask: '自动任务',
+      newAutoTask: '新自动任务',
+      propertiesOfAutoTask: '自动任务的属性',
+      custombeanName: '自定义bean'
     },
     // 流向属性
     transition: {

package/src/i18n/langs/en.js

@@ -321,7 +321,9 @@ const en = {
       defaultMailTemplate: 'Default Mail Template',
       trustTask: 'Trust Task',
       subprocessIsSharedForm: 'Main process and subprocess shared form',
-      systemVersion: 'System Version'
+      generateForParttimeDept: 'Generate tasks for part-time department personnel',
+      deptSpecifiedInFormField: 'Dept Specified In Form Field',
+      activateOneVoteVeto: 'Activate one vote veto'
     },
     // 环节属性
     task: {
@@ -427,7 +429,11 @@ const en = {
       cCtask: 'CC Task',
       canItBeRejected: 'Can It Be Rejected',
       selectMailTemplate: 'Select Notice Template',
-      selectTemplate: 'Select Template'
+      selectTemplate: 'Select Template',
+      autoTask: 'Auto Task',
+      newAutoTask: 'New Auto Task',
+      propertiesOfAutoTask: 'Properties Of Auto Task',
+      custombeanName: 'Custom Bean Name'
     },
     // 流向属性
     transition: {