workflow-editor 0.0.84-up → 0.0.86-up

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "workflow-editor",
   "private": false,
-  "version": "0.0.84-up",
+  "version": "0.0.86-up",
   "type": "module",
   "main": "./lib/workflow-editor.js",
   "scripts": {
@@ -16,7 +16,7 @@
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^4.2.3",
-    "agilebuilder-ui": "1.1.78",
+    "agilebuilder-ui": "1.1.83",
     "axios": "^1.5.1",
     "element-plus": "^2.4.1",
     "font-awesome": "^4.7.0",

package/packages/plugins/formValidatorUtil.js

@@ -676,38 +676,47 @@ function formValidator(
   subTablePageInfo,
   isNeedField
 ) {
-  const validateRulesKeys = Object.keys(validateRules)
-  if (
-    validateRulesKeys.indexOf('rules') >= 0 &&
-    validateRulesKeys.indexOf('subRules') >= 0 &&
-    validateRulesKeys.indexOf('totalSubRules') >= 0
-  ) {
-    // 表示是带有子表验证规则的
-    const rules = validateRules.rules
-    const subRules = validateRules.subRules
-    const totalSubRules = validateRules.totalSubRules
-    const dataTypeMap = validateRules.dataTypeMap
-    let validateResult = validator(entity, rules, null, isSql, null, null, isNeedField)
-    if ((!isNeedField && validateResult === true) || (isNeedField && validateResult.msg === true)) {
-      if (subRules || totalSubRules) {
-        validateResult = validateSub(
-          entity,
-          subRules,
-          totalSubRules,
-          isSql,
-          dataTypeMap,
-          additionalParamMap,
-          taskParamMap,
-          contextParameter,
-          subTablePageInfo,
-          isNeedField
-        )
+  // 兼容 workflowRules= { CODE:[{xxxxx}], rules:{},subRules:{}}格式的验证
+  let validateResult = validator(entity, validateRules, null, isSql, null, null, isNeedField)
+  if ((!isNeedField && validateResult === true) || (isNeedField && validateResult.msg === true)) {
+    // 先验证流程编辑器配置的字段必填验证
+    const validateRulesKeys = Object.keys(validateRules)
+    // 脚本控制的验证会走下面的验证代码
+    if (
+      validateRulesKeys.indexOf('rules') >= 0 &&
+      validateRulesKeys.indexOf('subRules') >= 0 &&
+      validateRulesKeys.indexOf('totalSubRules') >= 0
+    ) {
+      // 表示是带有子表验证规则的
+      const rules = validateRules.rules
+      const subRules = validateRules.subRules
+      const totalSubRules = validateRules.totalSubRules
+      const dataTypeMap = validateRules.dataTypeMap
+      validateResult = validator(entity, rules, null, isSql, null, null, isNeedField)
+      if ((!isNeedField && validateResult === true) || (isNeedField && validateResult.msg === true)) {
+        if (subRules || totalSubRules) {
+          validateResult = validateSub(
+            entity,
+            subRules,
+            totalSubRules,
+            isSql,
+            dataTypeMap,
+            additionalParamMap,
+            taskParamMap,
+            contextParameter,
+            subTablePageInfo,
+            isNeedField
+          )
+        }
       }
+      return validateResult
+    } else if(validateRulesKeys.indexOf('rules') >= 0) {
+      // 表示没有子表验证规则
+      const rules = validateRules.rules
+      return validator(entity, rules, null, isSql, null, null, isNeedField)
     }
+  } else{
     return validateResult
-  } else {
-    // 表示没有子表验证规则
-    return validator(entity, validateRules, null, isSql, null, null, isNeedField)
   }
 }
 

package/packages/workflow-editor/src/properties-editors/common/auto-filled-fields.vue

@@ -70,8 +70,8 @@
       </el-table>
     </el-card>
     <el-card class="box-card" style="margin-top: 10px">
-      <template #header> 办理意见 </template>
-      <el-form-item :label="'意见来源字段'" label-width="100">
+      <template #header> {{ $t('workflowEditorMessage.handlingOpinion') }} </template>
+      <el-form-item :label="$t('workflowEditorMessage.opinionSourceField')" label-width="100">
         <el-input
           :value="getFieldLabel(opinionAutoSetting.opinionSourceField)"
           :placeholder="$t('workflowEditorMessage.pleaseSelect')"

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

@@ -9,12 +9,12 @@
     class="properties-editor-noTab"
     @close="$emit('close')"
   >
-    <div style="padding-bottom:10px">
-      <span style="float:left;width:70%">
+    <div style="padding-bottom: 10px">
+      <span style="float: left; width: 70%">
         <el-input v-model="searchFormCode" :placeholder="$t('workflowEditorMessage.pleaseEnterTheNameOrCode')" />
       </span>
       <span>
-        <el-button style="margin-left:10px" type="primary" @click="searchForm">
+        <el-button style="margin-left: 10px" type="primary" @click="searchForm">
           {{ $t('workflowEditorPublicModel.search') }}
         </el-button>
       </span>
@@ -62,9 +62,7 @@ export default {
     }
   },
   computed: {
-    ...mapGetters('wfEditor', [
-      'formFields'
-    ]),
+    ...mapGetters('wfEditor', ['formFields']),
     allFields() {
       // 显示传递进来的字段或者取vuex中缓存的表单字段
       if (this.fields) {
@@ -84,7 +82,7 @@ export default {
     },
     searchForm() {
       if (this.searchFormCode && this.searchFormCode !== '') {
-        this.showFields = this.copyAllFields.filter(item => {
+        this.showFields = this.copyAllFields.filter((item) => {
           return item.name.indexOf(this.searchFormCode) > -1 || item.label.indexOf(this.searchFormCode) > -1
         })
       } else {
@@ -96,22 +94,21 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-  .group {
-    font-size: 14px;
-    width:100%;
-  }
-
-  .item {
-    float: left;
-    list-style-type:none;
-    width: 33.33%;
-    margin-bottom: 18px
-  }
+.group {
+  font-size: 14px;
+  width: 100%;
+}
 
-  .item-content {
-    height: calc(100vh - 300px);;
-    padding-left: 20px;
-    overflow: auto
-  }
+.item {
+  float: left;
+  list-style-type: none;
+  width: 33.33%;
+  margin-bottom: 18px;
+}
 
+.item-content {
+  height: calc(100vh - 300px);
+  padding-left: 20px;
+  overflow: auto;
+}
 </style>

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

@@ -1,13 +1,13 @@
 <template>
   <span>
-    <div style="float: left;padding-right: 5px;">
+    <div style="float: left; padding-right: 5px">
       <el-input v-model="zh">
         <template #append>
           <i class="fa fa-cog" @click="i18nSet"></i>
         </template>
       </el-input>
     </div>
-    <i18n-set v-if="isShowI18n" :value="{values:{zh_CN: zh}, key: myI18nKey}" @close="closeI18nSet" />
+    <i18n-set v-if="isShowI18n" :value="{ values: { zh_CN: zh }, key: myI18nKey }" @close="closeI18nSet" />
   </span>
 </template>
 <script>
@@ -44,24 +44,21 @@ export default {
     }
   },
   computed: {
-    ...mapGetters('wfEditor', [
-      'processCode',
-      'isHandleCreate'
-    ])
+    ...mapGetters('wfEditor', ['processCode', 'isHandleCreate'])
   },
   mounted() {
-    this.$watch('zh', function(newVal) {
+    this.$watch('zh', function (newVal) {
       // this.$emit('input', newVal)
       this.$emit('update:modelValue', newVal)
     })
   },
   created() {
-    if(this.isHandleCreate && this.isHandleCreate==='true') {
+    if (this.isHandleCreate && this.isHandleCreate === 'true') {
       this.isNewI18n = false
     } else {
       this.isNewI18n = true
     }
-    if(this.isNewI18n){
+    if (this.isNewI18n) {
       this.myI18nKey = this.modelValue
     }
   },

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

@@ -4,17 +4,17 @@
       <template #header>
         <div class="clearfix">
           <span>{{ $t('workflowEditor.common.taskNotice') }}</span>
-          
-        <el-tooltip>
-          <template #content>
-            <ul>
-              <li>{{$t('workflowEditor.task.reminderTipTemplateMsg')}}</li>
-              <li class="sub-li">{{$t('workflowEditor.task.reminderTipTemplateNotice')}}</li>
-              <li class="sub-li">{{$t('workflowEditor.task.reminderTipTemplateEmail')}}</li>
-            </ul>
-          </template>
-          <el-icon><Warning /></el-icon>
-        </el-tooltip>
+
+          <el-tooltip>
+            <template #content>
+              <ul>
+                <li>{{ $t('workflowEditor.task.reminderTipTemplateMsg') }}</li>
+                <li class="sub-li">{{ $t('workflowEditor.task.reminderTipTemplateNotice') }}</li>
+                <li class="sub-li">{{ $t('workflowEditor.task.reminderTipTemplateEmail') }}</li>
+              </ul>
+            </template>
+            <el-icon><Warning /></el-icon>
+          </el-tooltip>
         </div>
       </template>
       <el-form :model="noticeObj" label-width="80px">
@@ -24,17 +24,19 @@
           :custom-msg="noticeObj.customMsg"
           @input-msg="setCustomMsg"
         />
-        <el-form-item v-if="noticeObj.informType && noticeObj.informType.length > 0" label-width="100" :label="$t('workflowEditor.task.selectNoticeTemplate')">
-          <select-mail-templates
-            v-model="noticeObj.mailTemplateCode"
-            @set-value="setNoticeCommonTemplateCode"
-          />
+        <el-form-item
+          v-if="noticeObj.informType && noticeObj.informType.length > 0"
+          label-width="100"
+          :label="$t('workflowEditor.task.selectNoticeTemplate')"
+        >
+          <select-mail-templates v-model="noticeObj.mailTemplateCode" @set-value="setNoticeCommonTemplateCode" />
         </el-form-item>
-        <el-form-item v-if="noticeObj.informType && noticeObj.informType.length > 0 && noticeObj.informType.indexOf('mail')>=0" label-width="100" :label="$t('workflowEditor.task.selectMailTemplate')">
-          <select-mail-templates
-            v-model="noticeObj.mailPointTemplateCode"
-            @set-value="setMailTemplateCode"
-          />
+        <el-form-item
+          v-if="noticeObj.informType && noticeObj.informType.length > 0 && noticeObj.informType.indexOf('mail') >= 0"
+          label-width="100"
+          :label="$t('workflowEditor.task.selectMailTemplate')"
+        >
+          <select-mail-templates v-model="noticeObj.mailPointTemplateCode" @set-value="setMailTemplateCode" />
         </el-form-item>
       </el-form>
     </el-card>
@@ -43,21 +45,21 @@
         <div class="clearfix">
           <span>{{ $t('workflowEditor.common.reminderNotice') }}</span>
           <el-tooltip>
-          <template #content>
+            <template #content>
               <ul>
-                <li>{{$t('workflowEditor.task.reminderTipTemplateMsg')}}</li>
-                <li class="sub-li">{{$t('workflowEditor.task.reminderTipTemplateNotice')}}</li>
-                <li class="sub-li">{{$t('workflowEditor.task.reminderTipTemplateEmail')}}</li>
-                <li>{{$t('workflowEditor.task.reminderTipRemindMsg')}}</li>
-                <li class="sub-li">{{$t('workflowEditor.task.reminderTipRemindImmediately')}}</li>
-                <li class="sub-li">{{$t('workflowEditor.task.reminderTipRemindHistory')}}</li>
+                <li>{{ $t('workflowEditor.task.reminderTipTemplateMsg') }}</li>
+                <li class="sub-li">{{ $t('workflowEditor.task.reminderTipTemplateNotice') }}</li>
+                <li class="sub-li">{{ $t('workflowEditor.task.reminderTipTemplateEmail') }}</li>
+                <li>{{ $t('workflowEditor.task.reminderTipRemindMsg') }}</li>
+                <li class="sub-li">{{ $t('workflowEditor.task.reminderTipRemindImmediately') }}</li>
+                <li class="sub-li">{{ $t('workflowEditor.task.reminderTipRemindHistory') }}</li>
               </ul>
             </template>
             <el-icon><Warning /></el-icon>
           </el-tooltip>
         </div>
       </template>
-      <reminder v-model:modelValue="reminderObj" :isProcess="isProcess"/>
+      <reminder v-model:modelValue="reminderObj" :isProcess="isProcess" />
     </el-card>
   </div>
 </template>
@@ -83,26 +85,18 @@ export default {
       default: null
     },
     // 是否是流程的催办设置。流程催办不需要转办配置。
-    isProcess:{
+    isProcess: {
       type: Boolean,
       default: false
     }
   },
   data() {
     let reminderObj = null
-    if (
-      this.reminderValue !== null &&
-      this.reminderValue !== undefined &&
-      this.reminderValue !== ''
-    ) {
+    if (this.reminderValue !== null && this.reminderValue !== undefined && this.reminderValue !== '') {
       reminderObj = this.reminderValue
     }
     let noticeObj = {}
-    if (
-      this.taskNoticeValue !== null &&
-      this.taskNoticeValue !== undefined &&
-      this.taskNoticeValue !== ''
-    ) {
+    if (this.taskNoticeValue !== null && this.taskNoticeValue !== undefined && this.taskNoticeValue !== '') {
       noticeObj = this.taskNoticeValue
     }
     return {
@@ -144,6 +138,7 @@ ul {
 ul li {
   list-style: none;
 }
-.sub-li{
+.sub-li {
   padding-left: 10px;
-}</style>
+}
+</style>

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

@@ -13,49 +13,71 @@
       />
       <el-form-item
         label-width="100"
-        v-if="
-          model.remindType && model.remindType.length > 0
-        "
+        v-if="model.remindType && model.remindType.length > 0"
         :label="$t('workflowEditor.task.selectNoticeTemplate')"
       >
-        <select-mail-templates
-          v-model="model.mailTemplateCode"
-          @set-value="setMailTemplateCode"
-        />
+        <select-mail-templates v-model="model.mailTemplateCode" @set-value="setMailTemplateCode" />
       </el-form-item>
       <el-form-item
         label-width="100"
-        v-if="
-          model.remindType && model.remindType.length > 0 && model.remindType.indexOf('mail') !== -1
-        "
+        v-if="model.remindType && model.remindType.length > 0 && model.remindType.indexOf('mail') !== -1"
         :label="$t('workflowEditor.task.selectMailTemplate')"
       >
-        <select-mail-templates
-          v-model="model.mailPointTemplateCode"
-          @set-value="setMailPointTemplateCode"
-        />
+        <select-mail-templates v-model="model.mailPointTemplateCode" @set-value="setMailPointTemplateCode" />
+      </el-form-item>
+      <el-form-item :label="$t('workflowEditor.task.timeLimitForHandling')">
+        <el-radio-group
+          v-model="model.timeLimitType"
+          aria-label="size control"
+          size="small"
+          @click="clearDueDateSourceField"
+        >
+          <el-radio-button value="DEFAULT">{{ $t('workflowEditor.task.timeLimitTypeDefault') }}</el-radio-button>
+          <el-radio-button value="FORM_FIELD">{{ $t('workflowEditor.task.timeLimitTypeFormField') }}</el-radio-button>
+          <el-radio-button value="CUSTOM">{{ $t('workflowEditor.task.timeLimitTypeCustom') }}</el-radio-button>
+        </el-radio-group>
       </el-form-item>
-      <el-form-item :label="$t('workflowEditor.task.timeLimitForHandling')" size="small">
+      <el-form-item>
+        <template v-if="!model.timeLimitType || model.timeLimitType === 'DEFAULT'">
+          <el-input-number
+            v-model="model.dueDate"
+            controls-position="right"
+            :min="1"
+            :max="30"
+            style="width: 90px"
+            size="small"
+          />
+          <el-select v-model="model.dueTimeUnit" style="width: 70px" size="small">
+            <el-option :label="$t('workflowEditor.task.day')" value="day" />
+            <el-option :label="$t('workflowEditor.task.hour')" value="hour" />
+          </el-select>
+        </template>
+        <template v-else-if="model.timeLimitType === 'FORM_FIELD'">
+          <el-input
+            :value="getFieldLabel(model.dueDateSourceField)"
+            :placeholder="$t('workflowEditorMessage.pleaseSelect')"
+            readonly
+            style="width: 200px"
+            :clearable="true"
+            size="small"
+            @click="selectDueDateSourceField"
+          >
+            <template #append>
+              <el-button icon="Delete" @click="clearDueDateSourceField" />
+            </template>
+          </el-input>
+          <form-fields v-if="showFormFields" @close="setField" />
+        </template>
+        <span>{{ $t('workflowEditor.task.urgingInterval') }}</span>
         <el-input-number
-          v-model="model.dueDate"
-          controls-position="right"
-          :min="1"
-          :max="30"
-          style="width: 90px"
-        />
-        <el-select v-model="model.dueTimeUnit" style="width: 70px">
-          <el-option :label="$t('workflowEditor.task.day')" value="day" />
-          <el-option :label="$t('workflowEditor.task.hour')" value="hour" />
-        </el-select>
-        <span>{{ $t('workflowEditor.task.urgingInterval') }}</span
-        ><el-input-number
           v-model="model.repeat"
           controls-position="right"
           :min="1"
           :max="30"
           style="width: 90px"
+          size="small"
         />
-        <el-select v-model="model.timeUnit" style="width: 70px">
+        <el-select v-model="model.timeUnit" style="width: 70px" size="small">
           <el-option :label="$t('workflowEditor.task.day')" value="day" />
           <el-option :label="$t('workflowEditor.task.hour')" value="hour" />
         </el-select>
@@ -84,11 +106,7 @@
           :custom-msg="model.noticeCustomMsg"
           @input-msg="setNoticeCustomMsg"
         />
-        <el-form-item
-          v-if="!isProcess"
-          :label="$t('workflowEditor.common.notifyPersonnel')"
-          style="margin-bottom: 5px"
-        >
+        <el-form-item v-if="!isProcess" :label="$t('workflowEditor.common.notifyPersonnel')" style="margin-bottom: 5px">
           <el-checkbox v-model="model.containTransferUser">
             {{ $t('workflowEditor.task.includingHandoverPersonnel') }}
           </el-checkbox>
@@ -96,11 +114,7 @@
         <el-form-item label-width="0">
           <common-user-condition v-model="model.noticeUserCondition" />
         </el-form-item>
-        <el-form-item
-          v-if="!isProcess"
-          :label="$t('workflowEditor.task.handoverPersonnel')"
-          style="margin-bottom: 5px"
-        >
+        <el-form-item v-if="!isProcess" :label="$t('workflowEditor.task.handoverPersonnel')" style="margin-bottom: 5px">
           <el-checkbox v-model="model.containNoticeUser">
             {{ $t('workflowEditor.task.includeNotifyPeople') }}
           </el-checkbox>
@@ -116,13 +130,16 @@
 import CommonNoticeTool from './common-notice-tool'
 import CommonUserCondition from './common-user-condition'
 import SelectMailTemplates from '../common/select-mail-template.vue'
+import FormFields from '../common/form-fields.vue'
+import { getFormFieldLabel } from '../common/form-fields-utils'
 import * as Vue from 'vue'
 export default {
   name: 'Reminder',
   components: {
     CommonNoticeTool,
     CommonUserCondition,
-    SelectMailTemplates
+    SelectMailTemplates,
+    FormFields
   },
   props: {
     modelValue: {
@@ -130,7 +147,7 @@ export default {
       default: null
     },
     // 是否是流程的催办设置。流程催办不需要转办配置。
-    isProcess:{
+    isProcess: {
       type: Boolean,
       default: false
     }
@@ -171,7 +188,8 @@ export default {
       multiSelectData: [],
       options: {
         showColumns: 'code,name'
-      }
+      },
+      showFormFields: false
     }
   },
   watch: {
@@ -184,6 +202,10 @@ export default {
         this.$emit('update:modelValue', null)
       }
     },
+    setField(name) {
+      this.model.dueDateSourceField = name
+      this.isSelectOpinionField = false
+    },
     showNotice(val) {
       if (val) {
         // this.$emit('input', this.model)
@@ -261,6 +283,19 @@ export default {
     },
     setNoticeCustomMsg(msg) {
       this.model.noticeCustomMsg = msg
+    },
+    selectDueDateSourceField() {
+      this.showFormFields = true
+    },
+    getFieldLabel(name) {
+      return getFormFieldLabel(name)
+    },
+    clearDueDateSourceField() {
+      delete this.model.dueDateSourceField
+    },
+    setField(name) {
+      this.model.dueDateSourceField = name
+      this.showFormFields = false
     }
   }
 }