workflow-editor 0.0.46-up-tmp1 → 0.0.47-temp1

package/package.json

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

package/packages/plugins/formValidatorUtil.js

@@ -10,10 +10,12 @@ function getLeafPropRule(editField, dataTypeMap) {
   const dataType = editField.dataType
   if (dataType === 'DATE' || dataType === 'TIME') {
     // 对象的值需要是毫秒值数字
-    if (editField.valueType && editField.valueType === 'number') {
-      // 表示值是毫秒值
-      rule.type = 'number'
-    }
+    // if (editField.valueType && editField.valueType === 'number') {
+    //   // 表示值是毫秒值
+    //   rule.type = 'number'
+    // }
+    rule.type = 'date'
+    packageCustomValidator(rule)
     rule.message = editField.label + ' ' + getI18n().t('workflowEditorMessage.requiredAndMustBeADate')
   } else if (dataType === 'INTEGER' || dataType === 'LONG') {
 		// rule.type = 'number'
@@ -26,7 +28,7 @@ function getLeafPropRule(editField, dataTypeMap) {
     rule.type = 'boolean'
     rule.message = editField.label + ' ' + getI18n().t('workflowEditorMessage.mustFill')
     // 布尔型校验需要自定义，为了兼容oracle和mysql数据
-    packageBooleanRule(rule)
+    packageCustomValidator(rule)
   } else {
     // if (entity[editField.name] || entity[editField.name] === 0) {
     //   if (typeof entity[editField.name] === 'number' && dataType === 'TEXT') {
@@ -53,11 +55,11 @@ function getLeafPropRule(editField, dataTypeMap) {
 }
 
 /**
- * 布尔型校验需要自定义，为了兼容oracle和mysql数据库
+ * 布尔型和日期校验需要自定义，为了兼容oracle和mysql数据库
  * @param fieldRule 
  */
- function packageBooleanRule(fieldRule) {
-  if (fieldRule.type && fieldRule.type === 'boolean') {
+ function packageCustomValidator(fieldRule) {
+  if (fieldRule && fieldRule.type && fieldRule.type === 'boolean') {
     fieldRule.validator = function (rule, value, callback) {
       if (value === undefined || value === null) {
         if (rule.required) {
@@ -72,6 +74,20 @@ function getLeafPropRule(editField, dataTypeMap) {
       }
       return false
     }
+  } else if (fieldRule && fieldRule.type && fieldRule.type === 'date') {
+    fieldRule.validator = function (rule, value, callback) {
+      if (value === undefined || value === null) {
+        if (rule.required) {
+          return false
+        } else {
+          return true
+        }
+      } else {
+        // 验证是否是合法日期
+        const date = new Date(value)
+        return !isNaN(date.getTime())
+      }
+    }
   }
 }
 

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

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="overflow: auto">
     <el-row>
       <el-button type="primary" size="small" plain icon="CirclePlus" @click="add">
         {{ $t('workflowEditorPublicModel.add') }}
@@ -22,7 +22,7 @@
       :data="tableData"
       row-key="id"
       border
-      style="width: 100%;padding-top:10px"
+      style="width: 100%; padding-top: 10px"
       highlight-current-row
       @current-change="handleCurrentChange"
     >
@@ -44,18 +44,34 @@
       <el-table-column :label="$t('workflowEditor.common.operator')" width="110">
         <template v-slot="scope">
           <el-select v-model="scope.row.operator" placeholder="" @focus="selectRow(scope.row)">
-            <el-option v-for="option in getOperatorOptions(scope.row.key)" :key="option.name" :label="option.label" :value="option.name" />
+            <el-option
+              v-for="option in getOperatorOptions(scope.row.key)"
+              :key="option.name"
+              :label="option.label"
+              :value="option.name"
+            />
           </el-select>
         </template>
       </el-table-column>
       <el-table-column :label="$t('workflowEditor.common.value')">
         <template v-slot="scope">
-          <el-input v-if="scope.row.key.indexOf('${field[')>=0 || isTransitionOtherField(scope.row.key)" v-model.trim="scope.row.value" />
-          <el-select v-else-if="scope.row.key === '${approvalResult}'" v-model.trim="scope.row.value">
+          <el-input
+            v-if="scope.row.key.indexOf('${field[') >= 0 || isTransitionOtherField(scope.row.key)"
+            v-model.trim="scope.row.value"
+          />
+          <el-select
+            v-else-if="scope.row.key === '${approvalResult}'"
+            v-model.trim="scope.row.value"
+          >
             <el-option value="同意" :label="$t('workflowEditorPublicModel.agree')" />
             <el-option value="不同意" :label="$t('workflowEditorPublicModel.disagree')" />
           </el-select>
-          <el-input v-else :value="format(scope.row.value,scope.row)" readonly @click="selectValue" />
+          <el-input
+            v-else
+            :value="format(scope.row.value, scope.row)"
+            readonly
+            @click="selectValue"
+          />
         </template>
       </el-table-column>
       <el-table-column prop="rightBracket" label=")" width="90" @focus="selectRow(scope.row)">
@@ -68,10 +84,21 @@
           </el-select>
         </template>
       </el-table-column>
-      <el-table-column prop="logicOperator" :label="$t('workflowEditorPublicModel.andOr')" width="110">
+      <el-table-column
+        prop="logicOperator"
+        :label="$t('workflowEditorPublicModel.andOr')"
+        width="110"
+      >
         <template v-slot="scope">
-          <el-select v-model="scope.row.logicOperator" :placeholder="$t('workflowEditorMessage.pleaseSelect')" @focus="selectRow(scope.row)">
-            <el-option :label="$t('workflowEditor.process.perhaps')" value="condition.operator.or" />
+          <el-select
+            v-model="scope.row.logicOperator"
+            :placeholder="$t('workflowEditorMessage.pleaseSelect')"
+            @focus="selectRow(scope.row)"
+          >
+            <el-option
+              :label="$t('workflowEditor.process.perhaps')"
+              value="condition.operator.or"
+            />
             <el-option :label="$t('workflowEditor.process.also')" value="condition.operator.and" />
           </el-select>
         </template>
@@ -88,7 +115,16 @@
   </div>
 </template>
 <script>
-import { getFieldLabel, parseCondition, generateCondition, displayCondition, getRelatedStandardFields, getOperators, getStandardFieldsByTacheType, isTransitionOtherField } from './additional-condition-utils'
+import {
+  getFieldLabel,
+  parseCondition,
+  generateCondition,
+  displayCondition,
+  getRelatedStandardFields,
+  getOperators,
+  getStandardFieldsByTacheType,
+  isTransitionOtherField
+} from './additional-condition-utils'
 import { standardFields } from './additional-condition-utils'
 import ValueSelectionDialog from '../common/value-selection-dialog'
 import { mapGetters } from 'vuex'
@@ -124,9 +160,7 @@ export default {
     }
   },
   computed: {
-    ...mapGetters('wfEditor', [
-      'formFields'
-    ]),
+    ...mapGetters('wfEditor', ['formFields']),
     availableStandardFields() {
       if (this.currentInput === 'key') {
         return getStandardFieldsByTacheType(this.isTransition)
@@ -139,12 +173,16 @@ export default {
     if (this.tableData.length > 0) {
       this.$refs.table.setCurrentRow(this.tableData[this.tableData.length - 1])
     }
-    this.$watch('tableData', function(newVal, oldVal) {
-      // this.$emit('input', generateCondition(this.tableData))
-      this.$emit('update:modelValue', generateCondition(this.tableData))
-    }, {
-      deep: true
-    })
+    this.$watch(
+      'tableData',
+      function (newVal, oldVal) {
+        // this.$emit('input', generateCondition(this.tableData))
+        this.$emit('update:modelValue', generateCondition(this.tableData))
+      },
+      {
+        deep: true
+      }
+    )
   },
   methods: {
     format(value, row) {
@@ -190,7 +228,12 @@ export default {
       return -1
     },
     add() {
-      if (this.count === null || this.count === undefined || this.count.isNaN || this.count === 'NaN') {
+      if (
+        this.count === null ||
+        this.count === undefined ||
+        this.count.isNaN ||
+        this.count === 'NaN'
+      ) {
         this.count = 0
       }
       const newRow = {
@@ -232,7 +275,7 @@ export default {
       let index = this.getRowIndex(this.currentRow)
       this.tableData.splice(index, 1)
       if (this.tableData.length > 0) {
-        index = (index <= (this.tableData.length - 1) ? index : (this.tableData.length - 1))
+        index = index <= this.tableData.length - 1 ? index : this.tableData.length - 1
         this.$refs.table.setCurrentRow(this.tableData[index])
       }
     },
@@ -245,7 +288,7 @@ export default {
         showConfirmButton: false,
         showCancelButton: false,
         // 增加这个空的回退函数防止报错
-        callback: function() {}
+        callback: function () {}
       })
     },
     selectField(row) {
@@ -261,7 +304,7 @@ export default {
       this.orgType = this.getStandardFieldOrgType()
     },
     getStandardFieldOrgType() {
-      const fields = this.standardFields.filter(standardField => {
+      const fields = this.standardFields.filter((standardField) => {
         return standardField.name === this.currentRow.key
       })
       if (fields.length > 0) {

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

@@ -19,13 +19,13 @@
         </el-checkbox>
       </el-checkbox-group>
     </el-col>
-    <div style="width: 100%;vertical-align: middle" v-if="showUserList">
+    <div style="width: 100%; vertical-align: middle" v-if="showUserList">
       <el-col>
         <el-row>
           <el-col :span="4">
             {{ $t('workflowEditor.process.listOfDesignatedPersons') }}
           </el-col>
-          <el-col style="display: flex;justify-content: center;align-items: center;" :span="5">
+          <el-col style="display: flex; justify-content: center; align-items: center" :span="5">
             <el-dropdown size="small" split-button type="primary" plain @command="handleCommand">
               <span class="el-dropdown-link">
                 <i class="fa fa-search" /> {{ $t('workflowEditorPublicModel.choice') }}
@@ -68,9 +68,24 @@
           </el-col>
         </el-row>
       </el-col>
-      <department-user-tree v-if="showSelectUser" width="60%" :multiple="true" @close="addPointUsers" />
-      <department-tree v-if="showSelectDepartment" width="30%" :multiple="true" @close="addPointDepartments" />
-      <workgroup-tree v-if="showSelectWorkgroup" width="30%" :multiple="true" @close="addPointWorkgroups" />
+      <department-user-tree
+        v-if="showSelectUser"
+        width="60%"
+        :multiple="true"
+        @close="addPointUsers"
+      />
+      <department-tree
+        v-if="showSelectDepartment"
+        width="30%"
+        :multiple="true"
+        @close="addPointDepartments"
+      />
+      <workgroup-tree
+        v-if="showSelectWorkgroup"
+        width="30%"
+        :multiple="true"
+        @close="addPointWorkgroups"
+      />
       <system-role-tree v-if="showSelectRole" :multiple="true" @close="addPointRoles" />
       <form-fields v-if="showSelectField" @close="setField" />
     </div>
@@ -146,7 +161,7 @@ export default {
       return getFormFieldLabel(name)
     },
     getValue() {
-      const checkList = this.checkList.filter(item => {
+      const checkList = this.checkList.filter((item) => {
         return item !== '' && item !== 'assignUser'
       })
       let value = checkList.join(' condition.operator.or ')
@@ -219,7 +234,7 @@ export default {
       // 用户姓名和分支名称的分隔符
       const userNameAndBranchSeparator = '/'
       const fixCondition = '${user} operator.text.eq '
-      selectedUsers.forEach(user => {
+      selectedUsers.forEach((user) => {
         let loginName = user.loginName
         let userName = user.name
         if (user.subCompanyId && user.subCompanyId !== null) {
@@ -248,7 +263,10 @@ export default {
     // 如果不包含分支机构，直接封装为用户条件
     packageSelectedUserConditionsWithOutBranch(selectedUsers) {
       const fixCondition = '${user} operator.text.eq '
-      selectedUsers.forEach(user => {
+      selectedUsers.forEach((user) => {
+        if (!this.selectedUsers) {
+          this.selectedUsers = []
+        }
         const condition = fixCondition + user.name + '[' + user.loginName + ']'
         const selectedUserCondition = this.selectedUsers.filter(this.filterCondition(condition))
         if (selectedUserCondition.length === 0) {
@@ -260,11 +278,15 @@ export default {
     getSelectedUsersShowValue() {
       if (this.selectedUsers) {
         const selectedUsersCondition = this.selectedUsers.join(' condition.operator.or ')
-        this.selectedUsersShowValue = selectedUsersCondition.replace(/\$\{user\}/g, '用户')
-          .replace(/\$\{department\}/g, '部门').replace(/\$\{workGroup\}/g, '工作组')
+        this.selectedUsersShowValue = selectedUsersCondition
+          .replace(/\$\{user\}/g, '用户')
+          .replace(/\$\{department\}/g, '部门')
+          .replace(/\$\{workGroup\}/g, '工作组')
           .replace(/\$\{role\}/g, '角色')
-          .replace(/operator\.text\.eq/g, '等于').replace(/condition\.operator\.or/g, '或者')
-          .replace(/\$\{field/g, '字段').replace(/]\}/g, ']')
+          .replace(/operator\.text\.eq/g, '等于')
+          .replace(/condition\.operator\.or/g, '或者')
+          .replace(/\$\{field/g, '字段')
+          .replace(/]\}/g, ']')
       }
     },
     // 过滤已选条件中是否包含condition条件
@@ -279,10 +301,16 @@ export default {
         const isContainBranch = selectNodeInfo.containBranch
         if (isContainBranch) {
           // 如果包含分支机构，需要拼接显示的分支名称,格式为：部门名称/分支名称，并封装为部门条件
-          this.packageSelectedDepartmentOrWorkgroupConditionsWithBranch(selectNodeInfo.departments, '${department}')
+          this.packageSelectedDepartmentOrWorkgroupConditionsWithBranch(
+            selectNodeInfo.departments,
+            '${department}'
+          )
         } else {
           // 如果不包含分支机构，直接封装为部门条件
-          this.packageSelectedDepartmentOrWorkgroupConditionsWithOutBranch(selectNodeInfo.departments, '${department}')
+          this.packageSelectedDepartmentOrWorkgroupConditionsWithOutBranch(
+            selectNodeInfo.departments,
+            '${department}'
+          )
         }
         // 获得显示时的条件值
         this.getSelectedUsersShowValue()
@@ -294,7 +322,7 @@ export default {
       // 部门姓名和分支名称的分隔符
       const departmentNameAndBranchSeparator = '/'
       const fixCondition = type + ' operator.text.eq '
-      selectedDepartments.forEach(department => {
+      selectedDepartments.forEach((department) => {
         const departmentCode = department.code
         let departmentName = department.name
         if (department.subCompanyId && department.subCompanyId !== null) {
@@ -322,7 +350,7 @@ export default {
     // 如果不包含分支机构，直接封装为部门条件 或 工作组条件
     packageSelectedDepartmentOrWorkgroupConditionsWithOutBranch(selectedDepartments, type) {
       const fixCondition = type + ' operator.text.eq '
-      selectedDepartments.forEach(department => {
+      selectedDepartments.forEach((department) => {
         const condition = fixCondition + department.name + '[' + department.code + ']'
         if (this.selectedUsers) {
           const selectedCondition = this.selectedUsers.filter(this.filterCondition(condition))
@@ -341,10 +369,16 @@ export default {
         const isContainBranch = selectNodeInfo.containBranch
         if (isContainBranch) {
           // 如果包含分支机构，需要拼接分支名称,格式为：工作组名称/分支名称，并封装为工作组条件
-          this.packageSelectedDepartmentOrWorkgroupConditionsWithBranch(selectNodeInfo.workgroups, '${workGroup}')
+          this.packageSelectedDepartmentOrWorkgroupConditionsWithBranch(
+            selectNodeInfo.workgroups,
+            '${workGroup}'
+          )
         } else {
           // 如果不包含分支机构，直接封装为工作组条件
-          this.packageSelectedDepartmentOrWorkgroupConditionsWithOutBranch(selectNodeInfo.workgroups, '${workGroup}')
+          this.packageSelectedDepartmentOrWorkgroupConditionsWithOutBranch(
+            selectNodeInfo.workgroups,
+            '${workGroup}'
+          )
         }
         // 获得显示时的条件值
         this.getSelectedUsersShowValue()
@@ -355,7 +389,10 @@ export default {
     addPointRoles(selectNodeInfo) {
       if (selectNodeInfo) {
         // 角色不需要考虑分支机构
-        this.packageSelectedDepartmentOrWorkgroupConditionsWithOutBranch(selectNodeInfo.roles, '${role}')
+        this.packageSelectedDepartmentOrWorkgroupConditionsWithOutBranch(
+          selectNodeInfo.roles,
+          '${role}'
+        )
         // 获得显示时的条件值
         this.getSelectedUsersShowValue()
       }
@@ -387,4 +424,3 @@ export default {
   }
 }
 </script>
-