workflow-editor 0.9.68-boe1 → 0.9.68-boe4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "workflow-editor",
-  "version": "0.9.68-boe1",
+  "version": "0.9.68-boe4",
   "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.9.11-boe9",
+    "imatrix-ui": "2.8.24",
     "node-sass": "4.12.0",
     "nprogress": "^0.2.0",
     "sass-loader": "^7.1.0",

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

@@ -124,52 +124,62 @@ export const standardFields = [
   {
     name: '${countersignatureDisagreeCount}',
     label: getI18n().t('workflowEditor.process.totalNnumberOfPersonsWhoDisagreeWithTheCountersignature'),
-    orgType: 'other'
+    orgType: 'other',
+    dataType: 'INTEGER'
   },
   {
     name: '${countersignatureAgreeCount}',
     label: getI18n().t('workflowEditor.process.totalNumberOfCountersignedAndAgreedPersonnel'),
-    orgType: 'other'
+    orgType: 'other',
+    dataType: 'INTEGER'
   },
   {
     name: '${countersignatureDisagreePercentage}',
     label: getI18n().t('workflowEditor.process.percentageOfPersonsWhoDisagreeWithTheCountersignature'),
-    orgType: 'other'
+    orgType: 'other',
+    dataType: 'INTEGER'
   },
   {
     name: '${countersignatureAgreePercentage}',
     label: getI18n().t('workflowEditor.process.percentageOfCountersignedAndAgreedPersonnel'),
-    orgType: 'other'
+    orgType: 'other',
+    dataType: 'INTEGER'
   },
   {
     name: '${abstentionPercentage}',
     label: getI18n().t('workflowEditor.process.percentageOfAbstentions'),
-    orgType: 'other'
+    orgType: 'other',
+    dataType: 'INTEGER'
   },
   {
     name: '${againstPercentage}',
     label: getI18n().t('workflowEditor.process.percentageOfVotesAgainst'),
-    orgType: 'other'
+    orgType: 'other',
+    dataType: 'INTEGER'
   },
   {
     name: '${favorPercentage}',
     label: getI18n().t('workflowEditor.process.percentageOfAffirmativeVotes'),
-    orgType: 'other'
+    orgType: 'other',
+    dataType: 'INTEGER'
   },
   {
     name: '${abstentionCount}',
     label: getI18n().t('workflowEditor.process.totalNumberOfAbstentions'),
-    orgType: 'other'
+    orgType: 'other',
+    dataType: 'INTEGER'
   },
   {
     name: '${againstCount}',
     label: getI18n().t('workflowEditor.process.totalVotesAgainst'),
-    orgType: 'other'
+    orgType: 'other',
+    dataType: 'INTEGER'
   },
   {
     name: '${favorCount}',
     label: getI18n().t('workflowEditor.process.totalNumberOfAffirmativeVotes'),
-    orgType: 'other'
+    orgType: 'other',
+    dataType: 'INTEGER'
   }
 
 ]

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

@@ -23,9 +23,9 @@
       </div>
       <el-form-item
         v-if="formModel.transactor==='byField' || formModel.transactor==='byDeptField' "
+        :label="$t('workflowEditor.process.fieldName')"
         prop="selectedField"
         required
-        :label="$t('workflowEditor.process.fieldName')"
         label-width="80px"
       >
         <el-input :value="formatLabel(formModel.selectedField)" @focus="showFormFields=true" />
@@ -48,9 +48,9 @@
           <el-checkbox v-if="isSubprocess" v-model="formModel.additionalCondition.generateOneInstanceFromDept">
             {{ $t('workflowEditor.process.generateOneInstanceFromDept') }}
           </el-checkbox>
-          <!-- <el-checkbox v-model="formModel.additionalCondition.generateForParttimeDept">
-            {{ $t('workflowEditor.process.generateForParttimeDept') }}
-          </el-checkbox> -->
+          <el-checkbox v-if="isCountersign" v-model="formModel.additionalCondition.activateOneVoteVeto">
+            {{ $t('workflowEditor.process.activateOneVoteVeto') }}
+          </el-checkbox>
         </el-form-item>
         <div v-if="formModel.additionalCondition.selectOneFromMultiple">
           <el-form-item :label="$t('workflowEditor.process.selectionMethod')">
@@ -65,9 +65,9 @@
           </el-form-item>
           <el-form-item
             v-show="formModel.additionalCondition.selectType==='autoType'"
-            prop="additionalCondition.selectUrl"
             :label="$t('workflowEditor.process.callbackURL')"
             :rules="[{ required: true, message: this.$t('workflowEditor.process.cannotBeEmpty'), trigger: 'blur' }]"
+            prop="additionalCondition.selectUrl"
           >
             <el-input v-model="formModel.additionalCondition.selectUrl" />
           </el-form-item>
@@ -76,9 +76,9 @@
     </el-form-item>
     <el-form-item
       v-if="usedIn==='HumanTask' && formModel.transactor==='${previousTransactorAssignment}'"
-      prop="url"
       :rules="[{ required: true, message: this.$t('workflowEditor.process.cannotBeEmpty'), trigger: 'blur' }]"
       :label="$t('workflowEditor.process.selectURL')"
+      prop="url"
       label-width="80px"
     >
       <el-input v-model.trim="formModel.url" @change="handleUrlChange" />
@@ -108,6 +108,11 @@ export default {
     isSubprocess: {
       type: Boolean,
       default: false
+    },
+    // basicProperties
+    basicProperties: {
+      type: Object,
+      default: null
     }
   },
   data() {
@@ -121,7 +126,8 @@ export default {
     this.initFormModel(formModel)
     return {
       showFormFields: false,
-      formModel
+      formModel,
+      isCountersign: false
     }
   },
   mounted() {
@@ -141,6 +147,12 @@ export default {
     }, {
       deep: true
     })
+    this.$watch('basicProperties', function() {
+      this.showActivateOneVoteVeto()
+    }, {
+      deep: true
+    })
+    this.showActivateOneVoteVeto()
   },
   methods: {
     formatLabel(name) {
@@ -244,6 +256,19 @@ export default {
         }
       }
       this.showFormFields = false
+    },
+    /**
+		 * 会签时显示一票否决配置
+		 */
+    showActivateOneVoteVeto() {
+      if (this.basicProperties && this.basicProperties.processingMode) {
+        if (this.basicProperties.processingMode.type === 'COUNTERSIGN') {
+          this.isCountersign = true
+        } else {
+          this.isCountersign = false
+          this.formModel.additionalCondition.activateOneVoteVeto = false
+        }
+      }
     }
   }
 }

package/packages/workflow-editor/src/properties-editors/human-task.vue

@@ -20,7 +20,7 @@
         />
       </el-tab-pane>
       <el-tab-pane :label="$t('workflowEditor.task.settingOfHandler')" name="transactors">
-        <transactor-settings :model="model.ref.transactorSettings" />
+        <transactor-settings :model="model.ref.transactorSettings" :basic-properties="model.ref.basicProperties" />
       </el-tab-pane>
       <el-tab-pane :label="$t('workflowEditor.task.permissionSettings')" name="permissions">
         <permission-settings v-model="model.ref.permissionSettings" />

package/packages/workflow-editor/src/workflow-editor.vue

@@ -576,7 +576,7 @@ section{
 // 在scss中需要使用/deep/这个别名来代替 '>>>'
 .tabs /deep/ .el-tabs__content{
   height: calc(100% - #{$tabsHeaderHeight});
-  padding:10px;
+  padding:0px;
   width:100%;
 }
 

package/src/i18n/langs/cn.js

@@ -322,7 +322,8 @@ const cn = {
       trustTask: '委托任务',
       subprocessIsSharedForm: '主子流程共用表单',
       generateForParttimeDept: '为兼职部门人员生成任务',
-      deptSpecifiedInFormField: '表单字段中指定的部门'
+      deptSpecifiedInFormField: '表单字段中指定的部门',
+      activateOneVoteVeto: '一票否决'
     },
     // 环节属性
     task: {

package/src/i18n/langs/en.js

@@ -322,7 +322,8 @@ const en = {
       trustTask: 'Trust Task',
       subprocessIsSharedForm: 'Main process and subprocess shared form',
       generateForParttimeDept: 'Generate tasks for part-time department personnel',
-      deptSpecifiedInFormField: 'Dept Specified In Form Field'
+      deptSpecifiedInFormField: 'Dept Specified In Form Field',
+      activateOneVoteVeto: 'Activate one vote veto'
     },
     // 环节属性
     task: {