workflow-editor 0.9.68-boe3 → 0.9.68-pv

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

@@ -4,11 +4,7 @@
       <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">
@@ -17,9 +13,6 @@
         </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"
@@ -63,13 +56,11 @@ 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,
-    TaskTitle
+    i18nInput
   },
   props: {
     model: {
@@ -98,9 +89,6 @@ export default {
     }
   },
   computed: {
-    tache() {
-      return this.model
-    }
   },
   created() {
     this.listAllProcesses().then(() => {
@@ -115,10 +103,10 @@ export default {
     }
   },
   mounted() {
-    // 支持.snyc修饰符的写法
-    this.$watch('formModel.name', function(newVal, oldVal) {
-      this.$emit('update:name', newVal)
-    })
+    // this.$watch('model.attr.id', function(newVal, oldVal) {
+    //   // updateTransitionsWhenTacheIdChanged(newVal, oldVal)
+    //   this.$emit('update:id', newVal)
+    // })
   },
   methods: {
     fetchSubprocessFormFields() {

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

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

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

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

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

@@ -1,18 +1,5 @@
 
 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
 }
@@ -105,16 +92,6 @@ 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'),
@@ -292,7 +269,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
@@ -313,7 +290,7 @@ function removeTextProperty(obj) {
   })
 }
 function generateTaches(type, arr) {
-  if (!arr) arr = []
+  if (!arr)arr = []
   if (!Array.isArray(arr)) {
     arr = [arr]
   }
@@ -335,7 +312,7 @@ function generateTaches(type, arr) {
   }
 }
 function generateTransitions(type, arr) {
-  if (!arr) arr = []
+  if (!arr)arr = []
   if (!Array.isArray(arr)) {
     arr = [arr]
   }
@@ -384,7 +361,6 @@ 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)
@@ -466,9 +442,39 @@ function watchShowName(vm, newVal) {
   return showName
 }
 export {
-  clearAllSelectedComponents, deepCopy, endDragTache, findIncomingTransitionsByTacheId, findOutgoingTransitionsByTacheId, findTacheById, getClientMousePosition, getComponentInfo, getI18n, getJoint, getMouseOffset, getMousePosition, getRealRegion, getVirtualRegion, initializeProcessData, removeTextProperty, startDragTache, updateTransitionsWhenTacheIdChanged,
-  validateTacheCode, watchShowName
+  getComponentInfo,
+  getJoint,
+  getMousePosition,
+  getClientMousePosition,
+  getMouseOffset,
+  getVirtualRegion,
+  getRealRegion,
+  startDragTache,
+  endDragTache,
+  clearAllSelectedComponents,
+  removeTextProperty,
+  initializeProcessData,
+  findOutgoingTransitionsByTacheId,
+  findIncomingTransitionsByTacheId,
+  findTacheById,
+  deepCopy,
+  updateTransitionsWhenTacheIdChanged,
+  validateTacheCode,
+  getI18n,
+  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,
@@ -481,9 +487,7 @@ const processTemplate = {
   newFork,
   newJoin,
   newHumanDecision,
-  newCopyTask,
-  newAutoTask
+  newCopyTask
 }
 
 export { processTemplate }
-

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

@@ -99,6 +99,7 @@ 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: {
@@ -127,6 +128,16 @@ export default {
     readonly: {
       type: Boolean,
       default: false
+    },
+    // 系统编码，新增时选中的系统编码，或修改时流程定义所属的系统编码
+    systemCode: {
+      type: String,
+      default: null
+    },
+    // 系统版本号，修改时流程定义中的系统版本号，例如：v1.0.0，新增不会使用该属性
+    systemPublishVersion: {
+      type: Number,
+      default: null
     }
   },
   data: function() {
@@ -143,7 +154,7 @@ export default {
   },
   computed: {
     ...mapGetters(
-      'wfEditor', ['componentToDraw', 'taches', 'transitions', 'contextMenuVisible']
+      'wfEditor', ['componentToDraw', 'taches', 'transitions', 'contextMenuVisible', 'systemVersion']
     ),
     ...mapGetters([
       'sidebar'
@@ -163,6 +174,10 @@ export default {
     }
   },
   created: function() {
+    authApi.setSessionCache('wf_editor_systemVersion', this.systemPublishVersion)
+    if (this.systemCode) {
+      this.setSystemCode(this.systemCode)
+    }
     // 打开或新建流程图时先清空画布，开发过程中代码热更新的时候可以避免节点重复
     this.clearCanvas()
     if (this.id) {
@@ -181,7 +196,6 @@ export default {
     }
   },
   mounted: function() {
-
   },
   methods: {
     ...mapMutations('wfEditor', [
@@ -189,6 +203,7 @@ export default {
       'clearCanvas',
       'setContextMenuVisible',
       'setSystemCode',
+      'setSystemVersion',
       'setProcessCode'
     ]),
     showContextMenu(event) {
@@ -208,6 +223,9 @@ 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)
@@ -223,7 +241,7 @@ export default {
       const formVersion = processProperties.formVersion
       if (formCode && formCode !== '' && formVersion) {
       // 取出formFields放到vuex中
-        processService.fetchFormFields(processProperties.formCode, processProperties.formVersion)
+        processService.fetchFormFields(processProperties.formCode, processProperties.formVersion, this.systemPublishVersion)
       }
     },
     packageUrlParam(url) {
@@ -246,7 +264,6 @@ export default {
         subprocess: [],
         humanDecision: [],
         copyTask: [],
-        autoTask: [],
         end: []
       }
       process.attr = this.process.attr
@@ -302,7 +319,8 @@ export default {
       } else {
         // 表示新建
         const param = {
-          xml: xml
+          xml: xml,
+          publishVersion: this.systemPublishVersion
         }
         this.$http.post(this.baseAPI + '/wf-editor/workflow-definitions', param).then(definition => {
           this.definitionId = definition.id
@@ -324,7 +342,8 @@ export default {
     },
     packageSaveXmlParam(xml) {
       const param = {
-        xml: xml
+        xml: xml,
+        publishVersion: this.systemPublishVersion
       }
       if (this.definitionId) {
         // 表示已保存过，新流程定义的id
@@ -373,7 +392,8 @@ export default {
       } else {
         // 表示新建
         const param = {
-          xml: xml
+          xml: xml,
+          publishVersion: this.systemPublishVersion
         }
         this.$http.post(this.baseAPI + '/wf-editor/workflow-definitions', param).then(definition => {
           this.definitionId = definition.id

package/src/i18n/langs/cn.js

@@ -30,7 +30,7 @@ const cn = {
     i18nEn: '英文',
     i18nKey: '国际化key',
     subprocessTitle: '子流程流转历史',
-    custom: '自定义'
+    custom:'自定义'
   },
   workflowEditorMessage: {
     requiredAndMustBeADate: '必填且必须为日期',
@@ -139,9 +139,9 @@ const cn = {
       variableName: '变量名',
       variableValue: '变量值',
       selectField: '选择字段',
-      taskNotice: '待办通知',
-      reminderNotice: '催办通知',
-      customMsg: '自定义消息内容'
+      taskNotice:'待办通知',
+      reminderNotice:'催办通知',
+      customMsg:'自定义消息内容'
     },
     // 流程属性
     process: {
@@ -321,9 +321,7 @@ const cn = {
       defaultMailTemplate: '默认邮件模板',
       trustTask: '委托任务',
       subprocessIsSharedForm: '主子流程共用表单',
-      generateForParttimeDept: '为兼职部门人员生成任务',
-      deptSpecifiedInFormField: '表单字段中指定的部门',
-      activateOneVoteVeto: '一票否决'
+      systemVersion: '系统版本'
     },
     // 环节属性
     task: {
@@ -429,11 +427,7 @@ const cn = {
       cCtask: '抄送任务',
       canItBeRejected: '是否可驳回',
       selectMailTemplate: '选择通知模板',
-      selectTemplate: '选择模板',
-      autoTask: '自动任务',
-      newAutoTask: '新自动任务',
-      propertiesOfAutoTask: '自动任务的属性',
-      custombeanName: '自定义bean'
+      selectTemplate: '选择模板'
     },
     // 流向属性
     transition: {

package/src/i18n/langs/en.js

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

package/packages/workflow-editor/src/json-object-templates/auto-task.js

@@ -1,70 +0,0 @@
-import i18n from '../../../../src/i18n/i18n'
-export default function newAutoTask() {
-  return {
-    attr: {
-      id: '',
-      name: i18n.t('workflowEditor.task.newAutoTask')
-    },
-    g: {},
-    taskNotice: {
-
-    },
-    basicProperties: {
-      beanName: ''
-    },
-    transactorSettings: {
-      userCondition: '',
-      moreTransactor: false,
-      additionalCondition: {
-        onlyInCreatorDepartment: false,
-        withCreatorDepartment: false,
-        selectOneFromMultiple: false
-      }
-    },
-    events: {
-    },
-    permissionSettings: {
-      editForm: {
-        permission: false,
-        field: []
-      },
-      viewOpinion: {
-        permission: false,
-        condition: ''
-      },
-      editOpinion: {
-        permission: false,
-        condition: ''
-      },
-      requireOpinion: {
-        permission: false,
-        condition: ''
-      },
-      viewMeetingResult: {
-        permission: false,
-        condition: ''
-      },
-      viewVoteResult: {
-        permission: false,
-        condition: ''
-      },
-      viewFlowHistory: {
-        permission: false,
-        condition: ''
-      },
-      printForm: {
-        permission: false,
-        condition: ''
-      },
-      officialText: {
-        permission: false // 控制是否设置正文权限，false时就没有后续的create，edit等权限设置了
-      },
-      attachment: {
-        permission: false // 控制是否设置附件权限，false时就没有后面的add，delete等权限设置了
-      },
-      deleteInstance: {
-        userCondition: ''
-      }
-    }
-  }
-}

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

@@ -1,81 +0,0 @@
-<template>
-  <el-form :model="formModel" label-width="110px">
-    <el-row>
-      <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" />
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item :label="$t('workflowEditor.task.code')">
-          <el-input v-model="formModel.id" @blur="validateId" />
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-form-item :label="$t('workflowEditor.task.custombeanName')">
-      <el-input v-model="tache.beanName" />
-    </el-form-item>
-  </el-form>
-</template>
-<script>
-import TaskTitle from '../common/task-title'
-import { validateTacheCode } from '../../util'
-import i18nInput from '../common/i18n-input'
-export default {
-  name: 'BasicProperties',
-  components: {
-    TaskTitle,
-    i18nInput
-  },
-  props: {
-    model: {
-      type: Object,
-      default: null
-    },
-    id: {
-      type: String,
-      default: null
-    },
-    name: {
-      type: String,
-      default: null
-    }
-  },
-  data() {
-    return {
-      formModel: {
-        name: this.name,
-        id: this.id,
-        tache: this.model
-      }
-    }
-  },
-  computed: {
-    tache() {
-      return this.model
-    }
-  },
-  mounted() {
-    // 支持.snyc修饰符的写法
-    this.$watch('formModel.name', function(newVal, oldVal) {
-      this.$emit('update:name', newVal)
-    })
-  },
-  methods: {
-    validateId() {
-      validateTacheCode(this)
-    },
-    setI18nValue(i18nKey) {
-      this.tache.i18nKey = i18nKey
-    }
-  }
-}
-</script>
-<style scoped>
-.percent{
-  margin-left: 10px;
-  color:red;
-  font-size:1.2em;
-}
-</style>