workflow-editor 0.9.66 → 0.9.67-boe1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "workflow-editor",
-  "version": "0.9.66",
+  "version": "0.9.67-boe1",
   "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.8.21",
+    "imatrix-ui": "2.8.22-boe3",
     "node-sass": "4.12.0",
     "nprogress": "^0.2.0",
     "sass-loader": "^7.1.0",

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

@@ -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/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: '流程变量',
@@ -413,7 +417,7 @@ const cn = {
       attributesOfManualJudgment: '人工判断的属性',
       linkAttribute: '环节属性',
       autoFillInFieldSettings: '自动填写字段设置',
-      reminderSettings: '催办设置',
+      reminderSettings: '通知与催办',
       eventProcessing: '事件处理',
       linkVariable: '环节变量',
       convergedProperties: '汇聚的属性',
@@ -421,7 +425,7 @@ const cn = {
       conditionJudgment: '条件判断',
       cCtask: '抄送任务',
       canItBeRejected: '是否可驳回',
-      selectMailTemplate: '选择邮件模板',
+      selectMailTemplate: '选择通知模板',
       selectTemplate: '选择模板'
     },
     // 流向属性

package/src/i18n/langs/en.js

@@ -29,7 +29,8 @@ const en = {
     i18nZh: 'Chinese',
     i18nEn: 'English',
     i18nKey: 'I18n Key',
-    subprocessTitle: 'Subprocess History'
+    subprocessTitle: 'Subprocess History',
+    custom: 'Custom'
   },
   workflowEditorMessage: {
     requiredAndMustBeADate: 'Required And Must Be A Date',
@@ -137,7 +138,10 @@ const en = {
       formField: 'Form Field',
       variableName: 'Variable Name',
       variableValue: 'Variable Value',
-      selectField: 'Select Field'
+      selectField: 'Select Field',
+      taskNotice: 'Task Notice',
+      reminderNotice: 'Reminder Notice',
+      customMsg: 'Custom Notice Message'
     },
     // 流程属性
     process: {
@@ -291,7 +295,7 @@ const en = {
       permissionSettings: 'Permission Settings',
       notificationSettings: 'Notification Settings',
       sendNotificationAfterProcessEnds: 'Send Notification After Process Ends',
-      reminderSettings: 'Reminder Settings',
+      reminderSettings: 'Notice And Reminder Settings',
       parameterSsetting: 'Parameter Setting',
       event: 'Event',
       processVariables: 'Process Variables',
@@ -413,7 +417,7 @@ const en = {
       attributesOfManualJudgment: 'Attributes of manual Judgment',
       linkAttribute: 'Link Attribute',
       autoFillInFieldSettings: 'Auto Fill In Field Settings',
-      reminderSettings: 'Reminder Settings',
+      reminderSettings: 'Notice And Reminder Settings',
       eventProcessing: 'Event Processing',
       linkVariable: 'Link Variable',
       convergedProperties: 'Converged Properties',
@@ -421,7 +425,7 @@ const en = {
       conditionJudgment: 'Condition Judgment',
       cCtask: 'CC Task',
       canItBeRejected: 'Can It Be Rejected',
-      selectMailTemplate: 'Select Mail Template',
+      selectMailTemplate: 'Select Notice Template',
       selectTemplate: 'Select Template'
     },
     // 流向属性