workflow-editor 0.0.89-up → 0.0.90-up

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "workflow-editor",
   "private": false,
-  "version": "0.0.89-up",
+  "version": "0.0.90-up",
   "type": "module",
   "main": "./lib/workflow-editor.js",
   "scripts": {

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

@@ -1,16 +1,27 @@
 <template>
   <el-form :model="model" label-width="80px">
     <el-form-item :label="switchLabel" label-width="150">
-      <el-switch
-        v-model="showNotice"
-      />
+      <el-switch v-model="model.showNotice" />
     </el-form-item>
-    <div v-if="showNotice">
-      <common-notice-tool v-model="model.informType" :label="$t('workflowEditor.common.notificationMethod')" :custom-msg="model.customMsg" @input-msg="setCustomMsg" />
-      <el-form-item label-width="100" v-if="model.informType && model.informType.length > 0" :label="$t('workflowEditor.task.selectNoticeTemplate')">
+    <div v-if="model.showNotice">
+      <common-notice-tool
+        v-model="model.informType"
+        :label="$t('workflowEditor.common.notificationMethod')"
+        :custom-msg="model.customMsg"
+        @input-msg="setCustomMsg"
+      />
+      <el-form-item
+        label-width="100"
+        v-if="model.informType && model.informType.length > 0"
+        :label="$t('workflowEditor.task.selectNoticeTemplate')"
+      >
         <select-mail-templates v-model="model.mailTemplateCode" @set-value="setMailTemplateCode" />
       </el-form-item>
-      <el-form-item label-width="100" v-if="model.informType && model.informType.length > 0 && model.informType.indexOf('mail') !== -1" :label="$t('workflowEditor.task.selectMailTemplate')">
+      <el-form-item
+        label-width="100"
+        v-if="model.informType && model.informType.length > 0 && model.informType.indexOf('mail') !== -1"
+        :label="$t('workflowEditor.task.selectMailTemplate')"
+      >
         <select-mail-templates v-model="model.mailPointTemplateCode" @set-value="setMailPointTemplateCode" />
       </el-form-item>
       <user-selection v-model="model.userCondition" :label="$t('workflowEditor.common.addressee')" />
@@ -21,7 +32,7 @@
         <el-input
           v-model="model.content"
           type="textarea"
-          :autosize="{ minRows: 4, maxRows: 10}"
+          :autosize="{ minRows: 4, maxRows: 10 }"
           :placeholder="$t('workflowEditorMessage.pleaseEnterContent')"
         />
       </el-form-item>
@@ -57,6 +68,7 @@ export default {
       subject: null,
       content: null
     }
+    debugger
     if (this.modelValue !== null && this.modelValue !== undefined && this.modelValue !== '') {
       model = this.modelValue
       if (model.informType && model.informType !== '') {
@@ -80,11 +92,15 @@ export default {
   created() {
     // inform在xml中可能是没有的，所以不能直接使用inform作为model
     // 通过deep监听model把设置的值返回给流程的inform属性
-    this.$watch('model', function(newVal, oldVal) {
-      this.getValue()
-    }, {
-      deep: true
-    })
+    this.$watch(
+      'model',
+      function (newVal, oldVal) {
+        this.getValue()
+      },
+      {
+        deep: true
+      }
+    )
   },
   methods: {
     getValue() {
@@ -96,7 +112,7 @@ export default {
     setMailTemplateCode(mailTemplateCode) {
       this.model.mailTemplateCode = mailTemplateCode
     },
-    setMailPointTemplateCode(mailTemplateCode){
+    setMailPointTemplateCode(mailTemplateCode) {
       this.model.mailPointTemplateCode = mailTemplateCode
     },
     setCustomMsg(msg) {
@@ -105,4 +121,3 @@ export default {
   }
 }
 </script>
-

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

@@ -110,6 +110,26 @@
           <el-checkbox v-model="model.containTransferUser">
             {{ $t('workflowEditor.task.includingHandoverPersonnel') }}
           </el-checkbox>
+          <el-checkbox v-model="model.noticeUserCustom">
+            {{ $t('workflowEditor.task.custombeanName') }}
+          </el-checkbox>
+          <el-input
+            v-if="model.noticeUserCustom"
+            v-model="model.noticeUserCustombeanName"
+            style="width: 240px"
+            :placeholder="$t('workflowEditor.task.custombeanName')"
+          >
+            <template #append>
+              <el-tooltip
+                class="box-item"
+                effect="dark"
+                :content="$t('workflowEditor.task.reminderCustombeanNameTip')"
+                placement="top-start"
+              >
+                <el-icon><InfoFilled /></el-icon>
+              </el-tooltip>
+            </template>
+          </el-input>
         </el-form-item>
         <el-form-item label-width="0">
           <common-user-condition v-model="model.noticeUserCondition" />
@@ -118,6 +138,26 @@
           <el-checkbox v-model="model.containNoticeUser">
             {{ $t('workflowEditor.task.includeNotifyPeople') }}
           </el-checkbox>
+          <el-checkbox v-model="model.noticeHandoverPersonnelCustom">
+            {{ $t('workflowEditor.task.custombeanName') }}
+          </el-checkbox>
+          <el-input
+            v-if="model.noticeHandoverPersonnelCustom"
+            v-model="model.noticeHandoverPersonnelCustombeanName"
+            style="width: 240px"
+            :placeholder="$t('workflowEditor.task.custombeanName')"
+          >
+            <template #append>
+              <el-tooltip
+                class="box-item"
+                effect="dark"
+                :content="$t('workflowEditor.task.reminderHandoverCustombeanNameTip')"
+                placement="top-start"
+              >
+                <el-icon><InfoFilled /></el-icon>
+              </el-tooltip>
+            </template>
+          </el-input>
         </el-form-item>
         <el-form-item v-if="!isProcess" label-width="0">
           <common-user-condition v-model="model.transferUserCondition" />

package/src/i18n/langs/cn.js

@@ -463,7 +463,11 @@ const cn = {
         '办理时限、办理时限的时间粒度(天/小时)、催办间隔、催办间隔的时间粒度(天/小时)仅对新发起的流程生效，如历史数据也需要应用最新配置，请联系运维人员调整',
       timeLimitTypeDefault: '默认',
       timeLimitTypeFormField: '表单字段',
-      timeLimitTypeCustom: '自定义'
+      timeLimitTypeCustom: '自定义',
+      reminderCustombeanNameTip:
+        '自定义bean需要实现cn.ambitionq.api.service.WorkflowCustomReminderService接口，重写getNoticeUser',
+      reminderHandoverCustombeanNameTip:
+        '自定义bean需要实现cn.ambitionq.api.service.WorkflowCustomHandoverService接口，重写getNoticeHandoverPersonnel'
     },
     // 流向属性
     transition: {

package/src/i18n/langs/en.js

@@ -471,7 +471,11 @@ const en = {
         'The processing time limit, processing time granularity (days/hours), reminder interval, reminder interval time granularity (days/hours) are only effective for newly initiated processes. If historical data also requires the latest configuration, please contact the operation and maintenance personnel to adjust',
       timeLimitTypeDefault: 'Default',
       timeLimitTypeFormField: 'Form Field',
-      timeLimitTypeCustom: 'Custom'
+      timeLimitTypeCustom: 'Custom',
+      reminderCustombeanNameTip:
+        'Custom bean needs to implement the cn.ambitionq.api.service.WorkflowCustomReminderService interface and override getNoticeUser',
+      reminderHandoverCustombeanNameTip:
+        'Custom bean needs to implement the cn.ambitionq.api.service.WorkflowCustomHandoverService interface and override getNoticeHandoverPersonnel'
     },
     // 流向属性
     transition: {