workflow-editor 0.0.63-up → 0.0.64-up-rc1

package/package.json

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

package/packages/plugins/formValidatorUtil.js

@@ -472,8 +472,10 @@ function validateSub(
         return validateResult
       }
       let pageSize
+      let hasAuthFields = []
       if (subTablePageInfo && subTablePageInfo[prop]) {
         pageSize = subTablePageInfo[prop].pageSize
+        hasAuthFields = subTablePageInfo[prop].fields || []
       }
       for (let j = 0; j < subTableData.length; j++) {
         const rowData = subTableData[j]
@@ -485,7 +487,8 @@ function validateSub(
           entity,
           additionalParamMap,
           taskParamMap,
-          contextParameter
+          contextParameter,
+          hasAuthFields
         )
         console.log('formValidator666--rowRule=', rowRule)
         let pageNum
@@ -559,12 +562,17 @@ function packageRowRule(
   parentFormData,
   additionalParamMap,
   taskParamMap,
-  contextParameter
+  contextParameter,
+  hasAuthFields
 ) {
   const rowId = getEntityId(row)
   const rowRule = {}
   for (let n = 0; n < subProps.length; n++) {
     const field = subProps[n]
+    if (hasAuthFields.indexOf(field) < 0) {
+      // 如果没有权限编辑该字段，则不需要验证
+      continue
+    }
     const fieldRule = subFieldRule[field]
     const condition = fieldRule.condition
     const result = parseSubTablePermissionCondition(

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

@@ -4,6 +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>
         </div>
       </template>
       <el-form :model="noticeObj" label-width="80px">
@@ -31,6 +42,19 @@
       <template #header>
         <div class="clearfix">
           <span>{{ $t('workflowEditor.common.reminderNotice') }}</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>
+                <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"/>
@@ -112,4 +136,14 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+ul {
+  margin: 0;
+  padding: 0;
+}
+ul li {
+  list-style: none;
+}
+.sub-li{
+  padding-left: 10px;
+}</style>

package/src/i18n/langs/cn.js

@@ -450,7 +450,13 @@ const cn = {
       newAutoTask: '新自动任务',
       propertiesOfAutoTask: '自动任务的属性',
       custombeanName: '自定义bean',
-      baseField: '基础字段'
+      baseField: '基础字段',
+      reminderTipTemplateMsg: '模板说明:',
+      reminderTipRemindMsg: '催办说明:',
+      reminderTipTemplateNotice: '通知模板：钉钉、企微、飞书、自定义都使用通知模板。邮件方式时，如果没有选“邮件模板”，则使用通知模板',
+      reminderTipTemplateEmail: '邮件模板：邮件方式特制模板',
+      reminderTipRemindImmediately: '催办方式、通知模板、邮件模板、催办次数、通知方式、通知人员、移交人员 修改后立即生效',
+      reminderTipRemindHistory: '办理时限、办理时限的时间粒度(天/小时)、催办间隔、催办间隔的时间粒度(天/小时)仅对新发起的流程生效，如历史数据也需要应用最新配置，请联系运维人员调整'
     },
     // 流向属性
     transition: {

package/src/i18n/langs/en.js

@@ -473,7 +473,13 @@ const en = {
       newAutoTask: 'New Auto Task',
       propertiesOfAutoTask: 'Properties Of Auto Task',
       custombeanName: 'Custom Bean Name',
-      baseField: 'Base Field'
+      baseField: 'Base Field',
+      reminderTipTemplateMsg: 'Template Description:',
+      reminderTipRemindMsg: 'Reminder Description:',
+      reminderTipTemplateNotice: 'Notification templates: DingTalk, Enterprise WeChat, Feishu, and Customization all use notification templates. When using email, if "email template" is not selected, use notification template',
+      reminderTipTemplateEmail: 'Email Template: Customized Email Template',
+      reminderTipRemindImmediately: 'The reminder method, notification template, email template, maximum number of reminders, notification method, notification personnel, and transfer personnel will take effect immediately after modification',
+      reminderTipRemindHistory: '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'
     },
     // 流向属性
     transition: {