workflow-editor 0.9.68-pv → 0.9.68

package/package.json

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

package/packages/plugins/formValidatorUtil.js

@@ -24,6 +24,11 @@ function getLeafPropRule(editField, dataTypeMap) {
   } else if (dataType === 'BOOLEAN') {
     rule.message = editField.label + ' ' + getI18n().t('workflowEditorMessage.mustFill')
   } else {
+    // if (entity[editField.name] || entity[editField.name] === 0) {
+    //   if (typeof entity[editField.name] === 'number' && dataType === 'TEXT') {
+    //     rule.type = 'number'
+    //   }
+    // }
     rule.message = editField.label + ' ' + getI18n().t('workflowEditorMessage.mustFill')
   }
   if (editField.canEdit) {
@@ -191,7 +196,7 @@ function getValidator(editFieldInfos, entity, isSql, additionalParamMap, taskPar
               }
             } else {
             // 表示是主表的直接属性
-              rule = getLeafPropRule(editField, dataTypeMap)
+              rule = getLeafPropRule(editField, dataTypeMap, entity)
               rules[prop] = rule
             }
           }

package/packages/workflow-editor/src/json-object-templates/auto-task.js

@@ -0,0 +1,70 @@
+import i18n from '../../../../src/i18n/i18n'
+export default function newAutoTask() {
+  return {
+    attr: {
+      id: '',
+      name: i18n.t('workflowEditor.task.newAutoTask')
+    },
+    g: {},
+    taskNotice: {
+
+    },
+    basicProperties: {
+      beanName: ''
+    },
+    transactorSettings: {
+      userCondition: '',
+      moreTransactor: false,
+      additionalCondition: {
+        onlyInCreatorDepartment: false,
+        withCreatorDepartment: false,
+        selectOneFromMultiple: false
+      }
+    },
+    events: {
+    },
+    permissionSettings: {
+      editForm: {
+        permission: false,
+        field: []
+      },
+      viewOpinion: {
+        permission: false,
+        condition: ''
+      },
+      editOpinion: {
+        permission: false,
+        condition: ''
+      },
+      requireOpinion: {
+        permission: false,
+        condition: ''
+      },
+      viewMeetingResult: {
+        permission: false,
+        condition: ''
+      },
+      viewVoteResult: {
+        permission: false,
+        condition: ''
+      },
+      viewFlowHistory: {
+        permission: false,
+        condition: ''
+      },
+      printForm: {
+        permission: false,
+        condition: ''
+      },
+      officialText: {
+        permission: false // 控制是否设置正文权限，false时就没有后续的create，edit等权限设置了
+      },
+      attachment: {
+        permission: false // 控制是否设置附件权限，false时就没有后面的add，delete等权限设置了
+      },
+      deleteInstance: {
+        userCondition: ''
+      }
+    }
+  }
+}

package/packages/workflow-editor/src/json-object-templates/copy-task.js

@@ -6,6 +6,9 @@ export default function newCopyTask() {
       name: i18n.t('workflowEditor.task.newCc')
     },
     g: {},
+    taskNotice: {
+
+    },
     basicProperties: {
       taskTitle: '',
       remark: '',
@@ -20,6 +23,8 @@ export default function newCopyTask() {
         selectOneFromMultiple: false
       }
     },
+    events: {
+    },
     permissionSettings: {
       editForm: {
         permission: false,

package/packages/workflow-editor/src/json-object-templates/subprocess.js

@@ -3,7 +3,8 @@ export default function newSubprocess() {
   return {
     attr: {
       id: '',
-      name: i18n.t('workflowEditor.task.subprocess')
+      name: i18n.t('workflowEditor.task.subprocess'),
+      taskTitle: ''
     },
     g: {},
     processCode: '',

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

@@ -53,6 +53,7 @@ import Fork from '../taches/fork'
 import Join from '../taches/join'
 import HumanDecision from '../taches/human-decision'
 import CopyTask from '../taches/copy-task'
+import AutoTask from '../taches/auto-task'
 import Transition from '../transitions/transition'
 import VirtualTransition from '../transitions/virtual-transition'
 import SelectionRegion from './selection-region'
@@ -64,6 +65,7 @@ import ForkPropertiesEditor from '../properties-editors/fork'
 import JoinPropertiesEditor from '../properties-editors/join'
 import HumanDecisionPropertiesEditor from '../properties-editors/human-decision'
 import CopyTaskPropertiesEditor from '../properties-editors/copy-task'
+import AutoTaskPropertiesEditor from '../properties-editors/auto-task'
 import SubprocessPropertiesEditor from '../properties-editors/subprocess'
 import TacheHistoryTooltip from './tache-history-tooltip'
 import { mapGetters, mapMutations } from 'vuex'
@@ -94,7 +96,9 @@ export default {
     HumanDecisionPropertiesEditor,
     CopyTaskPropertiesEditor,
     SubprocessPropertiesEditor,
-    TacheHistoryTooltip
+    TacheHistoryTooltip,
+    AutoTask,
+    AutoTaskPropertiesEditor
   },
   props: {
     process: {

package/packages/workflow-editor/src/main/wf-history-canvas.vue

@@ -48,6 +48,7 @@ import Fork from '../taches/fork'
 import Join from '../taches/join'
 import HumanDecision from '../taches/human-decision'
 import CopyTask from '../taches/copy-task'
+import AutoTask from '../taches/auto-task'
 import Transition from '../transitions/transition'
 import TacheHistoryTooltip from './tache-history-tooltip'
 import { mapGetters } from 'vuex'
@@ -71,7 +72,8 @@ export default {
     CopyTask,
     Transition,
     TacheHistoryTooltip,
-    TacheSubprocessHistoryDialog
+    TacheSubprocessHistoryDialog,
+    AutoTask
   },
   props: {
     process: {

package/packages/workflow-editor/src/process-json.js

@@ -292,7 +292,8 @@ const process = {
     subprocess: {
       attr: {
         id: 't2',
-        name: '子流程'
+        name: '子流程',
+        taskTitle: ''
       },
       g: {
         x: 250,

package/packages/workflow-editor/src/process-service.js

@@ -6,8 +6,8 @@ function getHttp() {
   return window.$http
 }
 const processService = {
-  fetchFormFields(formCode, formVersion, publishVersion) {
-    getHttp().get(Vue.prototype.baseAPI + '/wf-editor/workflow-editors/form-fields?formCode=' + formCode + '&formVersion=' + formVersion + '&publishVersion=' + publishVersion).then(resultFields => {
+  fetchFormFields(formCode, formVersion) {
+    getHttp().get(Vue.prototype.baseAPI + '/wf-editor/workflow-editors/form-fields?formCode=' + formCode + '&formVersion=' + formVersion).then(resultFields => {
       const formFields = resultFields.formFields
       const subFormFields = resultFields.subFormFields
       getStore().commit('wfEditor/setFormCode', formCode)

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

@@ -0,0 +1,81 @@
+<template>
+  <el-form :model="formModel" label-width="110px">
+    <el-row>
+      <el-col :span="12">
+        <el-form-item :label="$t('workflowEditor.task.name')">
+          <!-- <el-input v-model="formModel.name" /> -->
+          <i18n-input v-model="formModel.name" :i18n-key="tache.i18nKey?tache.i18nKey:'name.'+formModel.id" @setI18n="setI18nValue" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item :label="$t('workflowEditor.task.code')">
+          <el-input v-model="formModel.id" @blur="validateId" />
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-form-item :label="$t('workflowEditor.task.custombeanName')">
+      <el-input v-model="tache.beanName" />
+    </el-form-item>
+  </el-form>
+</template>
+<script>
+import TaskTitle from '../common/task-title'
+import { validateTacheCode } from '../../util'
+import i18nInput from '../common/i18n-input'
+export default {
+  name: 'BasicProperties',
+  components: {
+    TaskTitle,
+    i18nInput
+  },
+  props: {
+    model: {
+      type: Object,
+      default: null
+    },
+    id: {
+      type: String,
+      default: null
+    },
+    name: {
+      type: String,
+      default: null
+    }
+  },
+  data() {
+    return {
+      formModel: {
+        name: this.name,
+        id: this.id,
+        tache: this.model
+      }
+    }
+  },
+  computed: {
+    tache() {
+      return this.model
+    }
+  },
+  mounted() {
+    // 支持.snyc修饰符的写法
+    this.$watch('formModel.name', function(newVal, oldVal) {
+      this.$emit('update:name', newVal)
+    })
+  },
+  methods: {
+    validateId() {
+      validateTacheCode(this)
+    },
+    setI18nValue(i18nKey) {
+      this.tache.i18nKey = i18nKey
+    }
+  }
+}
+</script>
+<style scoped>
+.percent{
+  margin-left: 10px;
+  color:red;
+  font-size:1.2em;
+}
+</style>

package/packages/workflow-editor/src/properties-editors/auto-task/permission-settings.vue

@@ -0,0 +1,155 @@
+<template>
+  <el-form :model="formModel">
+    <el-form-item :label="$t('workflowEditor.task.allowViews')">
+      <el-switch v-model="formModel.viewOpinion.permission" />
+      <el-checkbox v-if="formModel.viewOpinion.permission" v-model="formModel.viewOpinionCheckbox">
+        {{ $t('workflowEditor.task.additionalConditions') }}
+      </el-checkbox>
+      <additional-condition v-if="formModel.viewOpinion.permission&&formModel.viewOpinionCheckbox" v-model="formModel.viewOpinion.condition" />
+    </el-form-item>
+    <el-form-item :label="$t('workflowEditor.task.allowToViewCountersignatureResults')">
+      <el-switch v-model="formModel.viewMeetingResult.permission" />
+      <el-checkbox v-if="formModel.viewMeetingResult.permission" v-model="formModel.viewMeetingResultCheckbox">
+        {{ $t('workflowEditor.task.additionalConditions') }}
+      </el-checkbox>
+      <additional-condition v-if="formModel.viewMeetingResult.permission&&formModel.viewMeetingResultCheckbox" v-model="formModel.viewMeetingResult.condition" />
+    </el-form-item>
+    <el-form-item :label="$t('workflowEditor.task.allowToViewVotingResults')">
+      <el-switch v-model="formModel.viewVoteResult.permission" />
+      <el-checkbox v-if="formModel.viewVoteResult.permission" v-model="formModel.viewVoteResultCheckbox">
+        {{ $t('workflowEditor.task.additionalConditions') }}
+      </el-checkbox>
+      <additional-condition v-if="formModel.viewVoteResult.permission&&formModel.viewVoteResultCheckbox" v-model="formModel.viewVoteResult.condition" />
+    </el-form-item>
+    <el-form-item :label="$t('workflowEditor.task.allowToViewFlowHistory')">
+      <el-switch v-model="formModel.viewFlowHistory.permission" />
+      <el-checkbox v-if="formModel.viewFlowHistory.permission" v-model="formModel.viewFlowHistoryCheckbox">
+        {{ $t('workflowEditor.task.additionalConditions') }}
+      </el-checkbox>
+      <additional-condition v-if="formModel.viewFlowHistory.permission&&formModel.viewFlowHistoryCheckbox" v-model="formModel.viewFlowHistory.condition" />
+    </el-form-item>
+    <el-form-item :label="$t('workflowEditor.task.allowFormsToPrint')">
+      <el-switch v-model="formModel.printForm.permission" />
+      <el-checkbox v-if="formModel.printForm.permission" v-model="formModel.printFormCheckbox">
+        {{ $t('workflowEditor.task.additionalConditions') }}
+      </el-checkbox>
+      <additional-condition v-if="formModel.printForm.permission&&formModel.printFormCheckbox" v-model="formModel.printForm.condition" />
+    </el-form-item>
+    <el-form-item :label="$t('workflowEditor.task.attachmentAuthority')">
+      <el-switch v-model="formModel.attachment.permission" />
+    </el-form-item>
+    <el-card v-if="formModel.attachment.permission" class="box-card">
+      <el-form-item :label="$t('workflowEditor.task.downloadAttachment')">
+        <el-switch v-model="formModel.attachment.download.permission" />
+        <el-checkbox v-if="formModel.attachment.download.permission" v-model="formModel.attachment.downloadCheckbox">
+          {{ $t('workflowEditor.task.additionalConditions') }}
+        </el-checkbox>
+        <additional-condition v-if="formModel.attachment.download.permission&&formModel.attachment.downloadCheckbox" v-model="formModel.attachment.download.condition" />
+      </el-form-item>
+    </el-card>
+    <el-form-item :label="$t('workflowEditor.task.bodyPermission')">
+      <el-switch v-model="formModel.officialText.permission" />
+    </el-form-item>
+  </el-form>
+</template>
+<script>
+import AdditionalCondition from '../common/additional-condition'
+import { deepCopy } from '../../util'
+export default {
+  name: 'PermissionSettings',
+  components: {
+    AdditionalCondition
+  },
+  props: {
+    value: {
+      type: Object,
+      default: null
+    }
+  },
+  data() {
+    const formModel = deepCopy(this.value)
+    // 控制附加条件的属性名
+    const attrNames = [
+      'viewOpinion', 'viewMeetingResult', 'viewVoteResult',
+      'viewFlowHistory', 'printForm'
+    ]
+    attrNames.forEach(name => {
+      // 如果是''或者undefined,那么两次!后就是false
+      formModel[name + 'Checkbox'] = !!this.value[name].condition
+    })
+    // 控制附件各个权限的附加条件的属性名
+    const attachmentAttrNames = [
+      'download'
+    ]
+    attachmentAttrNames.forEach(item => {
+      // 如果是''或者undefined,那么两次!后就是false
+      formModel.attachment[name + 'Checkbox'] = !!this.value.attachment[name] && !!this.value.attachment[name].condition
+      if (!formModel.attachment.permission) {
+        formModel.attachment[name] = {
+          permission: false,
+          condition: ''
+        }
+      }
+    })
+
+    return {
+      formModel,
+      attrNames,
+      attachmentAttrNames
+    }
+  },
+  mounted() {
+    this.$watch('formModel', function(formModel) {
+      const result = {
+        viewOpinion: { },
+        viewMeetingResult: { },
+        viewVoteResult: { },
+        viewFlowHistory: { },
+        printForm: { },
+        officialText: { },
+        attachment: { }
+      }
+      this.attrNames.map(name => {
+        // permission为true且附件条件的checkbox也选中了，condition才有效
+        result[name].permission = formModel[name].permission
+        if (formModel[name].permission && formModel[name + 'Checkbox']) {
+          result[name].condition = formModel[name].condition
+        } else {
+          result[name].condition = ''
+        }
+      })
+
+      result.attachment.permission = formModel.attachment.permission
+      // 允许设置附件权限时，add，delete等的权限设置才有效，否则根本不生成add，delete等对应的json
+      if (formModel.attachment.permission) {
+        this.attachmentAttrNames.map(name => {
+        // 需要避免result的add,delete等属性为undefined
+          if (!result.attachment[name])result.attachment[name] = {}
+          // attachment不是undefined并且对应的add，delete等属性的permission为true
+          result.attachment[name].permission = formModel.attachment[name].permission
+          // permission为true且附件条件的checkbox也选中了，condition才有效
+          if (formModel.attachment[name].permission && formModel.attachment[name + 'Checkbox']) {
+            result.attachment[name].condition = formModel.attachment[name].condition
+          } else {
+            result.attachment[name].condition = ''
+          }
+        })
+      }
+
+      // 正文权限暂不处理
+
+      this.$emit('input', result)
+    }, {
+      deep: true
+    })
+  },
+  methods: {
+
+  }
+}
+</script>
+<style scoped>
+  .el-checkbox{
+    margin-left: 20px;
+  }
+</style>

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

@@ -0,0 +1,73 @@
+<template>
+  <el-dialog
+    visible
+    :title="$t('workflowEditor.task.propertiesOfAutoTask')"
+    :center="true"
+    top="10vh"
+    append-to-body
+    custom-class="properties-editor"
+    @open="$emit('open')"
+    @opend="$emit('opend')"
+    @close="$emit('close')"
+    @closed="$emit('closed')"
+  >
+    <el-tabs v-model="activeTab" type="border-card" @tab-click="handleClick">
+      <el-tab-pane :label="$t('workflowEditor.task.basicProperties')" name="basicProperties">
+        <basic-properties
+          :id.sync="model.ref.attr.id"
+          :name.sync="model.ref.attr.name"
+          :model="model.ref.basicProperties"
+        />
+      </el-tab-pane>
+    </el-tabs>
+  </el-dialog>
+</template>
+<script>
+import BasicProperties from './auto-task/basic-properties'
+export default {
+  name: 'HumanTaskPropertiesEditor',
+  components: {
+    BasicProperties
+  },
+  props: {
+    model: {
+      type: Object,
+      default: null
+    }
+  },
+  data() {
+    console.log(this.model)
+    if (!this.model.ref.taskNotice) {
+      this.model.ref.taskNotice = {}
+    }
+    return {
+      activeTab: 'basicProperties'
+    }
+  },
+  computed: {
+    formModel() {
+      return this.model.ref
+    }
+  },
+  mounted() {
+    this.$watch('model.ref.attr.id', function(newVal, oldVal) {
+      this.model.id = newVal
+    })
+    this.$watch('model.ref.attr.name', function(newVal, oldVal) {
+      this.model.name = newVal
+    })
+  },
+  methods: {
+    handleClick(tab, event) {
+      // console.log(tab, event)
+    }
+  }
+}
+</script>
+<style scoped>
+/* 使用深度作用选择器（vue-loader的功能）">>>"符号重新定义了.el-dialog__body，不影响其他页面的同名样式*/
+.properties-editor >>> .el-dialog__body{
+  padding-top: 0
+}
+</style>
+

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

@@ -41,7 +41,22 @@ export const standardFields = [
   },
   {
     name: '${instanceCreatorDirectSuperiorName}',
-    label: getI18n().t('workflowEditor.process.nameOfTheDirectSuperiorOfTheProcessInitiator'),
+    label: getI18n().t('workflowEditor.process.sponsorsImmediateSuperior'),
+    orgType: 'user'
+  },
+  {
+    name: '${instanceCreatorDeptApprover}',
+    label: getI18n().t('workflowEditor.process.deptApprover'),
+    orgType: 'user'
+  },
+  {
+    name: '${instanceCreatorDirectSuperiorDeptApprover}',
+    label: getI18n().t('workflowEditor.process.superiorDeptApprover'),
+    orgType: 'user'
+  },
+  {
+    name: '${instanceCreatorDirectSuperiorDeptLeader}',
+    label: getI18n().t('workflowEditor.process.superiorDeptLeader'),
     orgType: 'user'
   },
   {
@@ -124,52 +139,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/form-fields-utils.js

@@ -6,7 +6,7 @@ export function getFormFieldLabel(name) {
 export function getFormField(name) {
   const fields = window.$store.getters['wfEditor/formFields']
   // name可以是code或者${field[code]}两种形式
-  if (name && name.indexOf('${field[') >= 0) {
+  if (name && (name.indexOf('${field[') >= 0 || name.indexOf('${deptField[') >= 0)) {
     name = name.substring(name.indexOf('[') + 1, name.lastIndexOf(']'))
   }
   const field = fields.filter(item => {

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

@@ -4,7 +4,7 @@
       <div slot="header" class="clearfix">
         <span>{{ $t('workflowEditor.common.taskNotice') }}</span>
       </div>
-      <el-form :model="model" label-width="80px">
+      <el-form :model="noticeObj" label-width="80px">
         <common-notice-tool v-model="noticeObj.informType" :label="$t('workflowEditor.common.notificationMethod')" :custom-msg="noticeObj.customMsg" @input-msg="setCustomMsg" />
         <el-form-item :label="$t('workflowEditor.task.selectMailTemplate')">
           <select-mail-templates v-model="noticeObj.mailTemplateCode" @set-value="setMailTemplateCode" />