workflow-editor 0.9.87-dw → 0.9.87-dw-pv1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "workflow-editor",
-  "version": "0.9.87-dw",
+  "version": "0.9.87-dw-pv1",
   "description": "流程编辑器",
   "main": "lib/workflow-editor.umd.min.js",
   "private": false,
@@ -33,7 +33,7 @@
     "element-ui": "2.15.3",
     "eslint": "5.16.0",
     "eslint-plugin-vue": "5.2.2",
-    "imatrix-ui": "2.9.8-dw",
+    "imatrix-ui": "2.9.14-dw-pv1",
     "node-sass": "4.12.0",
     "nprogress": "^0.2.0",
     "sass-loader": "^7.1.0",

package/packages/workflow-editor/src/process-service.js

@@ -6,8 +6,8 @@ function getHttp() {
   return window.$http
 }
 const processService = {
-  fetchFormFields(formCode, formVersion) {
-    getHttp().get(Vue.prototype.baseAPI + '/wf-editor/workflow-editors/form-fields?formCode=' + formCode + '&formVersion=' + formVersion).then(resultFields => {
+  fetchFormFields(formCode, formVersion, publishVersion) {
+    getHttp().get(Vue.prototype.baseAPI + '/wf-editor/workflow-editors/form-fields?formCode=' + formCode + '&formVersion=' + formVersion + '&publishVersion=' + publishVersion).then(resultFields => {
       const formFields = resultFields.formFields
       const subFormFields = resultFields.subFormFields
       getStore().commit('wfEditor/setFormCode', formCode)

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

@@ -1,10 +1,11 @@
 <template>
-  <el-form-item :label="label">
-    <el-checkbox-group v-model="tools">
-      <el-checkbox label="mail">
-        {{ $t('workflowEditorPublicModel.mail') }}
-      </el-checkbox>
-      <el-checkbox label="sms">
+  <div>
+    <el-form-item :label="label">
+      <el-checkbox-group v-model="tools">
+        <el-checkbox label="mail">
+          {{ $t('workflowEditorPublicModel.mail') }}
+        </el-checkbox>
+        <!-- <el-checkbox label="sms">
         {{ $t('workflowEditorPublicModel.message') }}
       </el-checkbox>
       <el-checkbox label="app">
@@ -12,9 +13,16 @@
       </el-checkbox>
       <el-checkbox label="dingding">
         {{ $t('workflowEditorPublicModel.dingding') }}
-      </el-checkbox>
-    </el-checkbox-group>
-  </el-form-item>
+      </el-checkbox> -->
+        <el-checkbox label="custom">
+          {{ $t('workflowEditorPublicModel.custom') }}
+        </el-checkbox>
+      </el-checkbox-group>
+    </el-form-item>
+    <el-form-item v-if="tools.indexOf('custom')>=0" :label="$t('workflowEditor.common.customMsg')">
+      <el-input v-model="myCustomMsg" />
+    </el-form-item>
+  </div>
 </template>
 <script>
 export default {
@@ -27,6 +35,10 @@ export default {
     value: {
       type: String,
       default: null
+    },
+    customMsg: {
+      type: String,
+      default: null
     }
   },
   data() {
@@ -34,13 +46,21 @@ export default {
     if (this.value && this.value !== '' && this.value !== null) {
       tools = this.value.split(',')
     }
+    let myCustomMsg = ''
+    if (this.customMsg && this.customMsg !== '' && this.customMsg !== null) {
+      myCustomMsg = this.customMsg
+    }
     return {
-      tools
+      tools,
+      myCustomMsg
     }
   },
   watch: {
     tools(val) {
       this.$emit('input', this.tools.join(','))
+    },
+    myCustomMsg(val) {
+      this.$emit('input-msg', this.myCustomMsg)
     }
   }
 }

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="model" 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/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 === undefined) {
+      this.model.ref.taskNotice = {}
+    }
     return {
       activeTab: 'basicProperties'
     }

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')">
+          <el-select v-model="model.systemCode" :placeholder="$t('workflowEditorMessage.pleaseSelect')" @change="changeSystem(model.systemCode, null)">
             <el-option
               v-for="item in allSystems"
               :key="item.code"
@@ -63,12 +63,26 @@
           </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')">
             <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"
             />
@@ -82,11 +96,12 @@
   </el-form>
 </template>
 <script>
-import { mapMutations } from 'vuex'
+import { mapGetters, 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: {
@@ -128,22 +143,40 @@ export default {
         trigger: 'blur'
       },
       isSelectAdmin: false,
-      selectedForm: []
+      selectedForm: [],
+      systemPublishVersion: null,
+      sysCode: null,
+      systems: []
+
     }
   },
+  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)
-    this.setSystemCode(this.model.systemCode)
+    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)
   },
   mounted() {
     // 支持.snyc修饰符的写法
@@ -157,11 +190,15 @@ 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) {
@@ -171,7 +208,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)
+      processService.fetchFormFields(this.model.formCode, this.model.formVersion, this.systemPublishVersion)
     },
     // 弹出人员树
     selectAdmin() {
@@ -196,8 +233,8 @@ export default {
       this.isSelectAdmin = false
     },
     // 获得对应表单列表
-    listAllForms() {
-      this.$http.get(this.baseAPI + '/wf-editor/workflow-editors/forms').then(systemAndForms => {
+    listAllForms(systemCode, publishVersion) {
+      this.$http.get(this.baseAPI + '/wf-editor/workflow-editors/forms?systemCode=' + systemCode + '&publishVersion=' + publishVersion).then(systemAndForms => {
         // 设置表单信息
         const selectedFormInfo = this.model.formCode + '/' + this.model.formVersion
         // 修改时，获得默认选中的表单项
@@ -266,6 +303,20 @@ export default {
     },
     setI18nValue(i18nKey) {
       this.model.i18nKey = i18nKey
+    },
+    changeSystem(systemCode, systemPublishVersion) {
+      this.systemPublishVersion = systemPublishVersion
+      this.allForms = []
+      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,6 +28,8 @@
 
 // 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: {
@@ -43,6 +45,11 @@ export default {
       selection: []
     }
   },
+  computed: {
+    ...mapGetters('wfEditor', [
+      'systemVersion'
+    ])
+  },
   watch: {
     conditionList: {
       handler(newValue, oldValue) {
@@ -53,7 +60,7 @@ export default {
   created() {
     this.baseURL = Vue.prototype.baseURL
     if (this.pageFormCode) {
-      this.listURL = '/wf-editor/workflow-editors/modulePages/' + this.pageFormCode
+      this.listURL = '/wf-editor/workflow-editors/modulePages/' + this.pageFormCode + '/' + parseInt(authApi.getSessionCache('wf_editor_systemVersion'))
     }
   },
   methods: {

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/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/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) {
@@ -301,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
@@ -323,7 +342,8 @@ export default {
     },
     packageSaveXmlParam(xml) {
       const param = {
-        xml: xml
+        xml: xml,
+        publishVersion: this.systemPublishVersion
       }
       if (this.definitionId) {
         // 表示已保存过，新流程定义的id

package/src/i18n/i18n.js

@@ -1,5 +1,5 @@
 import Vue from 'vue'
-import locale from '@gcommon/gcommon-ui/lib/locale'
+import locale from 'element-ui/lib/locale'
 import VueI18n from 'vue-i18n'
 import en from './langs/en'
 import cn from './langs/cn'