workflow-editor 0.9.65 → 0.9.66-dw-pv1

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

@@ -0,0 +1,153 @@
+<template>
+  <div
+    ref="wfEditor"
+    style="position:relative;height:100%;"
+  >
+    <div
+      class="main"
+    >
+      <section>
+        <wf-history-canvas
+          onselectstart="return false"
+          :process="process"
+          :histories="histories"
+          :current-tasks="currentTasks"
+          :all-process-i18n="allProcessI18n"
+          :show-history="true"
+          class="canvas"
+          @contextmenu.native.prevent="showContextMenu"
+        />
+      </section>
+    </div>
+  </div>
+</template>
+<script>
+import './assets/wf-editor-icons.js'
+import { mapGetters, mapMutations } from 'vuex'
+import { removeTextProperty, initializeProcessData, processTemplate } from './util'
+import WfHistoryCanvas from './main/wf-history-canvas'
+import convert from 'xml-js'
+import ApiJs from './api'
+export default {
+  name: 'WorkflowHistory',
+  components: {
+    WfHistoryCanvas
+  },
+  props: {
+    // 实例id
+    id: {
+      type: Number,
+      default: null
+    }
+  },
+  data: function() {
+    return {
+      process: null,
+      histories: [],
+      currentTasks: [],
+      allProcessI18n: null
+    }
+  },
+  computed: {
+    ...mapGetters(
+      'wfEditor', ['componentToDraw', 'taches', 'transitions', 'contextMenuVisible']
+    ),
+    ...mapGetters([
+      'sidebar'
+    ])
+
+  },
+  watch: {
+
+  },
+  created: function() {
+    this.showHistory()
+  },
+  mounted: function() {
+
+  },
+  methods: {
+    ...ApiJs,
+    ...mapMutations('wfEditor', [
+      'setComponentToDraw',
+      'clearCanvas',
+      'setContextMenuVisible',
+      'setProcessI18n'
+    ]),
+    showHistory() {
+      // 打开或新建流程图时先清空画布，开发过程中代码热更新的时候可以避免节点重复
+      this.clearCanvas()
+      if (this.id) {
+        this.$http.get(this.baseAPI + '/wf-editor/i18n-settings/get-bundle-info?workflowId=' + this.id).then(processI18n => {
+          this.allProcessI18n = processI18n
+          const url = this.baseAPI + '/wf-editor/instance-histories/' + this.id
+          this.$http.get(url).then(data => {
+            this.initProcessByXml(data.xml)
+            let mainBundleCode
+            if (data.histories && data.histories.length > 0) {
+              mainBundleCode = data.histories[0].bundleCode
+            }
+            if (!mainBundleCode && data.currentTasks && data.currentTasks.length > 0) {
+              mainBundleCode = data.currentTasks[0].bundleCode
+            }
+            if (mainBundleCode) {
+              this.setProcessI18n(processI18n[mainBundleCode])
+            }
+            this.histories = data.histories
+            this.currentTasks = data.currentTasks
+          })
+        })
+      } else {
+        this.process = processTemplate.newProcess()
+        initializeProcessData(this.process)
+      }
+    },
+    showContextMenu(event) {
+
+    },
+    initProcessByXml(xml) {
+      const options = { nativeType: true, attributesKey: 'attr', compact: true, ignoreComment: true, spaces: 4 }
+      const processObj = convert.xml2js(xml, options)
+      removeTextProperty(processObj.process)
+      this.process = processObj.process
+
+      initializeProcessData(this.process)
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.main{
+  position: relative;
+  display:flex;
+  height: 100%;
+  width:100%;
+}
+.canvas-container{
+  position: relative;
+  // display:flex;
+  height: 100%;
+  width:100%;
+}
+
+section{
+  overflow: hidden;
+  width:100%;
+  height:100%;
+  padding: 0;
+  // min-height: 500px;
+}
+.canvas{
+  overflow: auto;
+  height:100%;
+  // border:1px solid red;
+  // background: #ffffff;
+  padding: 0;
+  min-height: 500px;
+
+}
+.canvas /deep/ .draggable{
+    cursor: default;
+}
+</style>
+

package/src/i18n/langs/cn.js

@@ -29,7 +29,8 @@ const cn = {
     i18nZh: '中文',
     i18nEn: '英文',
     i18nKey: '国际化key',
-    subprocessTitle: '子流程流转历史'
+    subprocessTitle: '子流程流转历史',
+    custom:'自定义'
   },
   workflowEditorMessage: {
     requiredAndMustBeADate: '必填且必须为日期',
@@ -137,7 +138,10 @@ const cn = {
       formField: '表单字段',
       variableName: '变量名',
       variableValue: '变量值',
-      selectField: '选择字段'
+      selectField: '选择字段',
+      taskNotice:'待办通知',
+      reminderNotice:'催办通知',
+      customMsg:'自定义消息内容'
     },
     // 流程属性
     process: {
@@ -224,6 +228,8 @@ const cn = {
       handlingYyThePersonnelOfTheDepartmentOfTheInitiator: '发起人所在部门人员办理',
       personnelOfTheDepartmentWhereTheInitiatorWorksParticipateInTheHandling: '发起人所在部门人员参与办理',
       selectSpecificHandler: '选择具体办理人',
+      selectOneFromDept: '同一部门仅需一人办理',
+      generateOneInstanceFromDept: '同一部门生成一个实例',
       selectionMethod: '选择方式',
       manualSelection: '人工选择',
       autoSelect: '自动选择',
@@ -289,7 +295,7 @@ const cn = {
       permissionSettings: '权限设置',
       notificationSettings: '通知设置',
       sendNotificationAfterProcessEnds: '流程结束后发送通知',
-      reminderSettings: '催办设置',
+      reminderSettings: '通知与催办',
       parameterSsetting: '参数设置',
       event: '事件',
       processVariables: '流程变量',
@@ -313,7 +319,9 @@ const cn = {
       isNull: '等于Null',
       isNotNull: '不等于Null',
       defaultMailTemplate: '默认邮件模板',
-      trustTask: '委托任务'
+      trustTask: '委托任务',
+      subprocessIsSharedForm: '主子流程共用表单',
+      systemVersion: '系统版本'
     },
     // 环节属性
     task: {
@@ -410,7 +418,7 @@ const cn = {
       attributesOfManualJudgment: '人工判断的属性',
       linkAttribute: '环节属性',
       autoFillInFieldSettings: '自动填写字段设置',
-      reminderSettings: '催办设置',
+      reminderSettings: '通知与催办',
       eventProcessing: '事件处理',
       linkVariable: '环节变量',
       convergedProperties: '汇聚的属性',
@@ -418,7 +426,7 @@ const cn = {
       conditionJudgment: '条件判断',
       cCtask: '抄送任务',
       canItBeRejected: '是否可驳回',
-      selectMailTemplate: '选择邮件模板',
+      selectMailTemplate: '选择通知模板',
       selectTemplate: '选择模板'
     },
     // 流向属性

package/src/i18n/langs/en.js

@@ -29,7 +29,8 @@ const en = {
     i18nZh: 'Chinese',
     i18nEn: 'English',
     i18nKey: 'I18n Key',
-    subprocessTitle: 'Subprocess History'
+    subprocessTitle: 'Subprocess History',
+    custom: 'Custom'
   },
   workflowEditorMessage: {
     requiredAndMustBeADate: 'Required And Must Be A Date',
@@ -137,7 +138,10 @@ const en = {
       formField: 'Form Field',
       variableName: 'Variable Name',
       variableValue: 'Variable Value',
-      selectField: 'Select Field'
+      selectField: 'Select Field',
+      taskNotice: 'Task Notice',
+      reminderNotice: 'Reminder Notice',
+      customMsg: 'Custom Notice Message'
     },
     // 流程属性
     process: {
@@ -224,6 +228,8 @@ const en = {
       handlingYyThePersonnelOfTheDepartmentOfTheInitiator: 'Handling By The Personnel Of The Department Of The Initiator',
       personnelOfTheDepartmentWhereTheInitiatorWorksParticipateInTheHandling: 'Personnel Of The Department Where The Initiator Works Participate In The Handling',
       selectSpecificHandler: 'Select Specific Handler',
+      selectOneFromDept: 'Only one person is required to handle the same department',
+      generateOneInstanceFromDept: 'Generate an instance from the same department',
       selectionMethod: 'Selection Method',
       manualSelection: 'Manual Selection',
       autoSelect: 'Auto Select',
@@ -289,7 +295,7 @@ const en = {
       permissionSettings: 'Permission Settings',
       notificationSettings: 'Notification Settings',
       sendNotificationAfterProcessEnds: 'Send Notification After Process Ends',
-      reminderSettings: 'Reminder Settings',
+      reminderSettings: 'Notice And Reminder Settings',
       parameterSsetting: 'Parameter Setting',
       event: 'Event',
       processVariables: 'Process Variables',
@@ -313,7 +319,9 @@ const en = {
       isNull: 'Is Null',
       isNotNull: 'Is Not Null',
       defaultMailTemplate: 'Default Mail Template',
-      trustTask: 'Trust Task'
+      trustTask: 'Trust Task',
+      subprocessIsSharedForm: 'Main process and subprocess shared form',
+      systemVersion: 'System Version'
     },
     // 环节属性
     task: {
@@ -410,7 +418,7 @@ const en = {
       attributesOfManualJudgment: 'Attributes of manual Judgment',
       linkAttribute: 'Link Attribute',
       autoFillInFieldSettings: 'Auto Fill In Field Settings',
-      reminderSettings: 'Reminder Settings',
+      reminderSettings: 'Notice And Reminder Settings',
       eventProcessing: 'Event Processing',
       linkVariable: 'Link Variable',
       convergedProperties: 'Converged Properties',
@@ -418,7 +426,7 @@ const en = {
       conditionJudgment: 'Condition Judgment',
       cCtask: 'CC Task',
       canItBeRejected: 'Can It Be Rejected',
-      selectMailTemplate: 'Select Mail Template',
+      selectMailTemplate: 'Select Notice Template',
       selectTemplate: 'Select Template'
     },
     // 流向属性