Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

7c52a88c · dragondean@qq.com · 79999e6c · 35583ecb · 7c52a88c · 7c52a88c
Commit 7c52a88c authored Dec 11, 2022 by dragondean@qq.com
18 changed files
--- a/build/index.js
+++ b/build/index.js
@@ -19,7 +19,7 @@ if (process.env.npm_config_preview || rawArgv.includes('--preview')) {
  app.use(
    publicPath,
    serveStatic('./dist', {
-      index: ['index.html', '/']
+      index: ['', '/']
    })
  )

--- a/package.json
+++ b/package.json
@@ -5,6 +5,7 @@
  "author": "捷道",
  "license": "MIT",
  "scripts": {
+    "local": "vue-cli-service serve --mode local",
    "dev": "vue-cli-service serve",
    "build:dev": "vue-cli-service build --mode dev",
    "build:prod": "vue-cli-service build",

--- a/src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue
+++ b/src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue
@@ -72,7 +72,7 @@
            <el-button :size="headerButtonSize" icon="el-icon-refresh" @click="processRestart" />
          </el-tooltip>
        </el-button-group>
-        <el-button :size="headerButtonSize" :type="headerButtonType" icon="el-icon-plus" @click="processSave">保存模型</el-button>
+        <el-button :size="headerButtonSize" :type="headerButtonType" icon="el-icon-plus" @click="processSave" :disabled = "simulationStatus">保存模型</el-button>
      </template>
      <!-- 用于打开本地文件-->
      <input type="file" id="files" ref="refFile" style="display: none" accept=".xml, .bpmn" @change="importLocalFile" />
@@ -118,6 +118,7 @@ export default {
  componentName: "MyProcessDesigner",
  props: {
    value: String, // xml 字符串
+    valueWatch: true, // xml 字符串的 watch 状态
    processId: String, // 流程 key 标识
    processName: String, // 流程 name 名字
    formId: Number, // 流程 form 表单编号
@@ -252,11 +253,6 @@ export default {
      this.bpmnModeler = null;
    });
  },
-  watch: {
-    value: function (newValue) { // 在 xmlString 发生变化时，重新创建，从而绘制流程图
-      this.createNewDiagram(newValue);
-    }
-  },
  methods: {
    initBpmnModeler() {
      if (this.bpmnModeler) return;
@@ -307,7 +303,7 @@ export default {
      let newName = this.processName || `业务流程_${new Date().getTime()}`;
      let xmlString = xml || DefaultEmptyXML(newId, newName, this.prefix);
      try {
-        console.log(this.bpmnModeler.importXML);
+        // console.log(this.bpmnModeler.importXML);
        let { warnings } = await this.bpmnModeler.importXML(xmlString);
        if (warnings && warnings.length) {
          warnings.forEach(warn => console.warn(warn));
@@ -459,7 +455,7 @@ export default {
        this.previewModelVisible = true;
      });
    },
-    /* ------------------------------------------------ 捷道源码 methods ------------------------------------------------------ */
+    /* ------------------------------------------------ 芋道源码 methods ------------------------------------------------------ */
    async processSave() {
      const { err, xml } = await this.bpmnModeler.saveXML();
      // 读取异常时抛出异常
@@ -478,8 +474,3 @@ export default {
  }
 };
 </script>
-<style scoped>
-.my-process-designer{
-  height: calc(100vh - 84px - 40px);
-}
-</style>
--- a/src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue
+++ b/src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue
@@ -90,15 +90,14 @@ export default {
      let xmlString = xml || DefaultEmptyXML(newId, newName, this.prefix);
      try {
        // console.log(this.bpmnModeler.importXML);
-        let { warnings } = await this.bpmnModeler.importXML(xmlString)
+        let { warnings } = await this.bpmnModeler.importXML(xmlString);
-        // 220906 增加一个缩放，自动适应尺寸
-        this.bpmnModeler.get('canvas').zoom('fit-viewport');
        if (warnings && warnings.length) {
          warnings.forEach(warn => console.warn(warn));
        }
        // 高亮流程图
        await this.highlightDiagram();
+        const canvas = this.bpmnModeler.get('canvas');
+        canvas.zoom("fit-viewport", "auto");
      } catch (e) {
        console.error(e);
        // console.error(`[Process Designer Warn]: ${e?.message || e}`);
@@ -117,23 +116,25 @@ export default {
      let todoActivity = activityList.find(m => !m.endTime) // 找到待办的任务
      let endActivity = activityList[activityList.length - 1] // 获得最后一个任务
      // debugger
-      console.log(this.bpmnModeler.getDefinitions().rootElements[0].flowElements);
+      // console.log(this.bpmnModeler.getDefinitions().rootElements[0].flowElements);
      this.bpmnModeler.getDefinitions().rootElements[0].flowElements?.forEach(n => {
        let activity = activityList.find(m => m.key === n.id) // 找到对应的活动
+        if (!activity) {
+          return;
+        }
        if (n.$type === 'bpmn:UserTask') { // 用户任务
-          if (!activity) {
-            return;
-          }
          // 处理用户任务的高亮
          const task = this.taskList.find(m => m.id === activity.taskId); // 找到活动对应的 taskId
-          if (task) {
+          if (!task) {
-            canvas.addMarker(n.id, this.getResultCss(task.result));
+            return;
-            // 如果非通过，就不走后面的线条了
-            if (task.result !== 2) {
-              return;
-            }
          }
+          // 高亮任务
+          canvas.addMarker(n.id, this.getResultCss(task.result));
+          // 如果非通过，就不走后面的线条了
+          if (task.result !== 2) {
+            return;
+          }
          // 处理 outgoing 出线
          const outgoing = this.getActivityOutgoing(activity);
          outgoing?.forEach(nn => {
@@ -157,9 +158,6 @@ export default {
            }
          });
        } else if (n.$type === 'bpmn:ExclusiveGateway') { // 排它网关
-          if (!activity) {
-            return
-          }
          // 设置【bpmn:ExclusiveGateway】排它网关的高亮
          canvas.addMarker(n.id, this.getActivityHighlightCss(activity));
          // 查找需要高亮的连线
@@ -184,9 +182,6 @@ export default {
            canvas.addMarker(matchNN.id, this.getActivityHighlightCss(matchActivity));
          }
        } else if (n.$type === 'bpmn:ParallelGateway') { // 并行网关
-          if (!activity) {
-            return
-          }
          // 设置【bpmn:ParallelGateway】并行网关的高亮
          canvas.addMarker(n.id, this.getActivityHighlightCss(activity));
          n.outgoing?.forEach(nn => {
@@ -212,6 +207,17 @@ export default {
            return;
          }
          canvas.addMarker(n.id, this.getResultCss(this.processInstance.result));
+        } else if (n.$type === 'bpmn:ServiceTask'){ //服务任务
+          if(activity.startTime>0 && activity.endTime===0){//进入执行，标识进行色
+            canvas.addMarker(n.id, this.getResultCss(1));
+          }
+          if(activity.endTime>0){// 执行完成，节点标识完成色, 所有outgoing标识完成色。
+            canvas.addMarker(n.id, this.getResultCss(2));
+            const outgoing = this.getActivityOutgoing(activity)
+            outgoing?.forEach(out=>{
+              canvas.addMarker(out.id,this.getResultCss(2))
+            })
+          }
        }
      })
    },
@@ -219,13 +225,13 @@ export default {
      return activity.endTime ? 'highlight' : 'highlight-todo';
    },
    getResultCss(result) {
-      if (result === 1) {
+      if (result === 1) { // 审批中
        return 'highlight-todo';
-      } else if (result === 2) {
+      } else if (result === 2) { // 已通过
        return 'highlight';
-      } else if (result === 3) {
+      } else if (result === 3) { // 不通过
        return 'highlight-reject';
-      } else if (result === 4) {
+      } else if (result === 4) { // 已取消
        return 'highlight-cancel';
      }
      return '';
@@ -267,6 +273,10 @@ export default {
      !this.elementOverlayIds && (this.elementOverlayIds = {});
      !this.overlays && (this.overlays = this.bpmnModeler.get("overlays"));
      // 展示信息
+      const activity = this.activityList.find(m => m.key === element.id);
+      if (!activity) {
+        return;
+      }
      if (!this.elementOverlayIds[element.id] && element.type !== "bpmn:Process") {
        let html = `<div class="element-overlays">
            <p>Elemet id: ${element.id}</p>
@@ -278,10 +288,6 @@ export default {
                  <p>创建时间：${this.parseTime(this.processInstance.createTime)}`;
        } else if (element.type === 'bpmn:UserTask') {
          // debugger
-          const activity = this.activityList.find(m => m.key === element.id);
-          if (!activity) {
-            return;
-          }
          let task = this.taskList.find(m => m.id === activity.taskId); // 找到活动对应的 taskId
          if (!task) {
            return;
@@ -293,9 +299,17 @@ export default {
          if (task.endTime) {
            html += `<p>结束时间：${this.parseTime(task.endTime)}</p>`
          }
-          if (task.comment) {
+          if (task.reason) {
-            html += `<p>审批建议：${task.comment}</p>`
+            html += `<p>审批建议：${task.reason}</p>`
+          }
+        } else if (element.type === 'bpmn:ServiceTask' && this.processInstance) {
+          if(activity.startTime>0){
+            html = `<p>创建时间：${this.parseTime(activity.startTime)}</p>`;
          }
+          if(activity.endTime>0){
+            html += `<p>结束时间：${this.parseTime(activity.endTime)}</p>`
+          }
+          console.log(html)
        } else if (element.type === 'bpmn:EndEvent' && this.processInstance) {
          html = `<p>结果：${this.getDictDataLabel(this.DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT, this.processInstance.result)}</p>`;
          if (this.processInstance.endTime) {
@@ -317,7 +331,8 @@ export default {
 };
 </script>
-<style scoped>
+<style>
 /** 处理中 */
 .highlight-todo.djs-connection > .djs-visual > path {
  stroke: #1890ff !important;
@@ -331,13 +346,13 @@ export default {
  fill-opacity: 0.2 !important;
 }
-/deep/.highlight-todo.djs-connection > .djs-visual > path {
+:deep(.highlight-todo.djs-connection > .djs-visual > path) {
  stroke: #1890ff !important;
  stroke-dasharray: 4px !important;
  fill-opacity: 0.2 !important;
  marker-end: url(#sequenceflow-end-_E7DFDF-_E7DFDF-803g1kf6zwzmcig1y2ulm5egr);
 }
-/deep/.highlight-todo.djs-shape .djs-visual > :nth-child(1) {
+:deep(.highlight-todo.djs-shape .djs-visual > :nth-child(1)) {
  fill: #1890ff !important;
  stroke: #1890ff !important;
  stroke-dasharray: 4px !important;
@@ -366,20 +381,20 @@ export default {
  fill: green !important; /* color elements as green */
 }
-/deep/.highlight.djs-shape .djs-visual > :nth-child(1) {
+:deep(.highlight.djs-shape .djs-visual > :nth-child(1)) {
  fill: green !important;
  stroke: green !important;
  fill-opacity: 0.2 !important;
 }
-/deep/.highlight.djs-shape .djs-visual > :nth-child(2) {
+:deep(.highlight.djs-shape .djs-visual > :nth-child(2)) {
  fill: green !important;
 }
-/deep/.highlight.djs-shape .djs-visual > path {
+:deep(.highlight.djs-shape .djs-visual > path) {
  fill: green !important;
  fill-opacity: 0.2 !important;
  stroke: green !important;
 }
-/deep/.highlight.djs-connection > .djs-visual > path {
+:deep(.highlight.djs-connection > .djs-visual > path) {
  stroke: green !important;
 }
@@ -405,20 +420,20 @@ export default {
  fill: red !important; /* color elements as green */
 }
-/deep/.highlight-reject.djs-shape .djs-visual > :nth-child(1) {
+:deep(.highlight-reject.djs-shape .djs-visual > :nth-child(1)) {
  fill: red !important;
  stroke: red !important;
  fill-opacity: 0.2 !important;
 }
-/deep/.highlight-reject.djs-shape .djs-visual > :nth-child(2) {
+:deep(.highlight-reject.djs-shape .djs-visual > :nth-child(2)) {
  fill: red !important;
 }
-/deep/.highlight-reject.djs-shape .djs-visual > path {
+:deep(.highlight-reject.djs-shape .djs-visual > path) {
  fill: red !important;
  fill-opacity: 0.2 !important;
  stroke: red !important;
 }
-/deep/.highlight-reject.djs-connection > .djs-visual > path {
+:deep(.highlight-reject.djs-connection > .djs-visual > path) {
  stroke: red !important;
 }
@@ -444,20 +459,20 @@ export default {
  fill: grey !important; /* color elements as green */
 }
-/deep/.highlight-cancel.djs-shape .djs-visual > :nth-child(1) {
+:deep(.highlight-cancel.djs-shape .djs-visual > :nth-child(1)) {
  fill: grey !important;
  stroke: grey !important;
  fill-opacity: 0.2 !important;
 }
-/deep/.highlight-cancel.djs-shape .djs-visual > :nth-child(2) {
+:deep(.highlight-cancel.djs-shape .djs-visual > :nth-child(2)) {
  fill: grey !important;
 }
-/deep/.highlight-cancel.djs-shape .djs-visual > path {
+:deep(.highlight-cancel.djs-shape .djs-visual > path) {
  fill: grey !important;
  fill-opacity: 0.2 !important;
  stroke: grey !important;
 }
-/deep/.highlight-cancel.djs-connection > .djs-visual > path {
+:deep(.highlight-cancel.djs-connection > .djs-visual > path) {
  stroke: grey !important;
 }

--- a/src/components/bpmnProcessDesigner/package/designer/plugins/content-pad/contentPadProvider.js
+++ b/src/components/bpmnProcessDesigner/package/designer/plugins/content-pad/contentPadProvider.js
@@ -49,14 +49,14 @@ export default function ContextPadProvider(
  }
  eventBus.on("create.end", 250, function(event) {
-    var context = event.context,
+    const context = event.context,
-      shape = context.shape;
+      shape = context.shape
    if (!hasPrimaryModifier(event) || !contextPad.isOpen(shape)) {
      return;
    }
-    var entries = contextPad.getEntries(shape);
+    const entries = contextPad.getEntries(shape)
    if (entries.replace) {
      entries.replace.action.click(event, shape);
@@ -81,7 +81,7 @@ ContextPadProvider.$inject = [
 ];
 ContextPadProvider.prototype.getContextPadEntries = function(element) {
-  var contextPad = this._contextPad,
+  const contextPad = this._contextPad,
    modeling = this._modeling,
    elementFactory = this._elementFactory,
    connect = this._connect,
@@ -90,15 +90,15 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
    canvas = this._canvas,
    rules = this._rules,
    autoPlace = this._autoPlace,
-    translate = this._translate;
+    translate = this._translate
-  var actions = {};
+  const actions = {}
  if (element.type === "label") {
    return actions;
  }
-  var businessObject = element.businessObject;
+  const businessObject = element.businessObject
  function startConnect(event, element) {
    connect.start(event, element);
@@ -109,21 +109,21 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
  }
  function getReplaceMenuPosition(element) {
-    var Y_OFFSET = 5;
+    const Y_OFFSET = 5
-    var diagramContainer = canvas.getContainer(),
+    const diagramContainer = canvas.getContainer(),
-      pad = contextPad.getPad(element).html;
+      pad = contextPad.getPad(element).html
-    var diagramRect = diagramContainer.getBoundingClientRect(),
+    const diagramRect = diagramContainer.getBoundingClientRect(),
-      padRect = pad.getBoundingClientRect();
+      padRect = pad.getBoundingClientRect()
-    var top = padRect.top - diagramRect.top;
+    const top = padRect.top - diagramRect.top
-    var left = padRect.left - diagramRect.left;
+    const left = padRect.left - diagramRect.left
-    var pos = {
+    const pos = {
      x: left,
      y: top + padRect.height + Y_OFFSET
-    };
+    }
    return pos;
  }
@@ -145,19 +145,19 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
    }
    function appendStart(event, element) {
-      var shape = elementFactory.createShape(assign({ type: type }, options));
+      const shape = elementFactory.createShape(assign({ type: type }, options))
      create.start(event, shape, {
        source: element
      });
    }
-    var append = autoPlace
+    const append = autoPlace
      ? function(event, element) {
-          var shape = elementFactory.createShape(assign({ type: type }, options));
+        const shape = elementFactory.createShape(assign({ type: type }, options))
-          autoPlace.append(element, shape);
+        autoPlace.append(element, shape)
-        }
+      }
-      : appendStart;
+      : appendStart
    return {
      group: "model",
@@ -182,7 +182,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
  }
  if (isAny(businessObject, ["bpmn:Lane", "bpmn:Participant"]) && isExpanded(businessObject)) {
-    var childLanes = getChildLanes(element);
+    const childLanes = getChildLanes(element)
    assign(actions, {
      "lane-insert-above": {
@@ -302,9 +302,9 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
        title: translate("Change type"),
        action: {
          click: function(event, element) {
-            var position = assign(getReplaceMenuPosition(element), {
+            const position = assign(getReplaceMenuPosition(element), {
              cursor: { x: event.x, y: event.y }
-            });
+            })
            popupMenu.open(element, "bpmn-replace", position);
          }
@@ -350,7 +350,7 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
  }
  // delete element entry, only show if allowed by rules
-  var deleteAllowed = rules.allowed("elements.delete", { elements: [element] });
+  let deleteAllowed = rules.allowed('elements.delete', { elements: [element] })
  if (isArray(deleteAllowed)) {
    // was the element returned as a deletion candidate?
@@ -376,10 +376,10 @@ ContextPadProvider.prototype.getContextPadEntries = function(element) {
 // helpers /////////
 function isEventType(eventBo, type, definition) {
-  var isType = eventBo.$instanceOf(type);
+  const isType = eventBo.$instanceOf(type)
-  var isDefinition = false;
+  let isDefinition = false
-  var definitions = eventBo.eventDefinitions || [];
+  const definitions = eventBo.eventDefinitions || []
  forEach(definitions, function(def) {
    if (def.$type === definition) {
      isDefinition = true;

--- a/src/components/bpmnProcessDesigner/package/designer/plugins/extension-moddle/activiti/activitiExtension.js
+++ b/src/components/bpmnProcessDesigner/package/designer/plugins/extension-moddle/activiti/activitiExtension.js
 "use strict";
-var some = require("min-dash").some;
+const some = require('min-dash').some
-var ALLOWED_TYPES = {
+const ALLOWED_TYPES = {
-  FailedJobRetryTimeCycle: ["bpmn:StartEvent", "bpmn:BoundaryEvent", "bpmn:IntermediateCatchEvent", "bpmn:Activity"],
+  FailedJobRetryTimeCycle: ['bpmn:StartEvent', 'bpmn:BoundaryEvent', 'bpmn:IntermediateCatchEvent', 'bpmn:Activity'],
-  Connector: ["bpmn:EndEvent", "bpmn:IntermediateThrowEvent"],
+  Connector: ['bpmn:EndEvent', 'bpmn:IntermediateThrowEvent'],
-  Field: ["bpmn:EndEvent", "bpmn:IntermediateThrowEvent"]
+  Field: ['bpmn:EndEvent', 'bpmn:IntermediateThrowEvent']
-};
+}
 function is(element, type) {
  return element && typeof element.$instanceOf === "function" && element.$instanceOf(type);
@@ -32,8 +32,8 @@ function anyType(element, types) {
 }
 function isAllowed(propName, propDescriptor, newElement) {
-  var name = propDescriptor.name,
+  const name = propDescriptor.name,
-    types = ALLOWED_TYPES[name.replace(/activiti:/, "")];
+    types = ALLOWED_TYPES[name.replace(/activiti:/, '')]
  return name === propName && anyType(newElement, types);
 }
@@ -42,8 +42,8 @@ function ActivitiModdleExtension(eventBus) {
  eventBus.on(
    "property.clone",
    function(context) {
-      var newElement = context.newElement,
+      const newElement = context.newElement,
-        propDescriptor = context.propertyDescriptor;
+        propDescriptor = context.propertyDescriptor
      this.canCloneProperty(newElement, propDescriptor);
    },

--- a/src/components/bpmnProcessDesigner/package/designer/plugins/extension-moddle/camunda/extension.js
+++ b/src/components/bpmnProcessDesigner/package/designer/plugins/extension-moddle/camunda/extension.js
 "use strict";
-var isFunction = require("min-dash").isFunction,
+const isFunction = require('min-dash').isFunction,
-  isObject = require("min-dash").isObject,
+  isObject = require('min-dash').isObject,
-  some = require("min-dash").some;
+  some = require('min-dash').some
-var WILDCARD = "*";
+const WILDCARD = '*'
 function CamundaModdleExtension(eventBus) {
-  var self = this;
+  const self = this
  eventBus.on("moddleCopy.canCopyProperty", function(context) {
-    var property = context.property,
+    const property = context.property,
-      parent = context.parent;
+      parent = context.parent
    return self.canCopyProperty(property, parent);
  });
@@ -45,14 +45,14 @@ CamundaModdleExtension.prototype.canCopyProperty = function(property, parent) {
 CamundaModdleExtension.prototype.canHostInputOutput = function(parent) {
  // allowed in camunda:Connector
-  var connector = getParent(parent, "camunda:Connector");
+  const connector = getParent(parent, 'camunda:Connector')
  if (connector) {
    return true;
  }
  // special rules inside bpmn:FlowNode
-  var flowNode = getParent(parent, "bpmn:FlowNode");
+  const flowNode = getParent(parent, 'bpmn:FlowNode')
  if (!flowNode) {
    return false;
@@ -62,15 +62,13 @@ CamundaModdleExtension.prototype.canHostInputOutput = function(parent) {
    return false;
  }
-  if (is(flowNode, "bpmn:SubProcess") && flowNode.get("triggeredByEvent")) {
+  return !(is(flowNode, "bpmn:SubProcess") && flowNode.get("triggeredByEvent"));
-    return false;
-  }
-  return true;
 };
 CamundaModdleExtension.prototype.canHostConnector = function(parent) {
-  var serviceTaskLike = getParent(parent, "camunda:ServiceTaskLike");
+  const serviceTaskLike = getParent(parent, 'camunda:ServiceTaskLike')
  if (is(serviceTaskLike, "bpmn:MessageEventDefinition")) {
    // only allow on throw and end events
@@ -81,13 +79,13 @@ CamundaModdleExtension.prototype.canHostConnector = function(parent) {
 };
 CamundaModdleExtension.prototype.canHostIn = function(parent) {
-  var callActivity = getParent(parent, "bpmn:CallActivity");
+  const callActivity = getParent(parent, 'bpmn:CallActivity')
  if (callActivity) {
    return true;
  }
-  var signalEventDefinition = getParent(parent, "bpmn:SignalEventDefinition");
+  const signalEventDefinition = getParent(parent, 'bpmn:SignalEventDefinition')
  if (signalEventDefinition) {
    // only allow on throw and end events
@@ -129,9 +127,9 @@ function getParent(element, type) {
 function isAllowedInParent(property, parent) {
  // (1) find property descriptor
-  var descriptor = property.$type && property.$model.getTypeDescriptor(property.$type);
+  const descriptor = property.$type && property.$model.getTypeDescriptor(property.$type)
-  var allowedIn = descriptor && descriptor.meta && descriptor.meta.allowedIn;
+  const allowedIn = descriptor && descriptor.meta && descriptor.meta.allowedIn
  if (!allowedIn || isWildcard(allowedIn)) {
    return true;

--- a/src/components/bpmnProcessDesigner/package/designer/plugins/extension-moddle/flowable/flowableExtension.js
+++ b/src/components/bpmnProcessDesigner/package/designer/plugins/extension-moddle/flowable/flowableExtension.js
 "use strict";
-var some = require("min-dash").some;
+const some = require('min-dash').some
-var ALLOWED_TYPES = {
+const ALLOWED_TYPES = {
-  FailedJobRetryTimeCycle: ["bpmn:StartEvent", "bpmn:BoundaryEvent", "bpmn:IntermediateCatchEvent", "bpmn:Activity"],
+  FailedJobRetryTimeCycle: ['bpmn:StartEvent', 'bpmn:BoundaryEvent', 'bpmn:IntermediateCatchEvent', 'bpmn:Activity'],
-  Connector: ["bpmn:EndEvent", "bpmn:IntermediateThrowEvent"],
+  Connector: ['bpmn:EndEvent', 'bpmn:IntermediateThrowEvent'],
-  Field: ["bpmn:EndEvent", "bpmn:IntermediateThrowEvent"]
+  Field: ['bpmn:EndEvent', 'bpmn:IntermediateThrowEvent']
-};
+}
 function is(element, type) {
  return element && typeof element.$instanceOf === "function" && element.$instanceOf(type);
@@ -32,8 +32,8 @@ function anyType(element, types) {
 }
 function isAllowed(propName, propDescriptor, newElement) {
-  var name = propDescriptor.name,
+  const name = propDescriptor.name,
-    types = ALLOWED_TYPES[name.replace(/flowable:/, "")];
+    types = ALLOWED_TYPES[name.replace(/flowable:/, '')]
  return name === propName && anyType(newElement, types);
 }
@@ -42,8 +42,8 @@ function FlowableModdleExtension(eventBus) {
  eventBus.on(
    "property.clone",
    function(context) {
-      var newElement = context.newElement,
+      const newElement = context.newElement,
-        propDescriptor = context.propertyDescriptor;
+        propDescriptor = context.propertyDescriptor
      this.canCloneProperty(newElement, propDescriptor);
    },

--- a/src/components/bpmnProcessDesigner/package/designer/plugins/palette/CustomPalette.js
+++ b/src/components/bpmnProcessDesigner/package/designer/plugins/palette/CustomPalette.js
@@ -10,18 +10,18 @@ F.prototype = PaletteProvider.prototype; // 核心，将父类的原型赋值给
 // 利用中介函数重写原型链方法
 F.prototype.getPaletteEntries = function() {
-  var actions = {},
+  const actions = {},
    create = this._create,
    elementFactory = this._elementFactory,
    spaceTool = this._spaceTool,
    lassoTool = this._lassoTool,
    handTool = this._handTool,
    globalConnect = this._globalConnect,
-    translate = this._translate;
+    translate = this._translate
  function createAction(type, group, className, title, options) {
    function createListener(event) {
-      var shape = elementFactory.createShape(assign({ type: type }, options));
+      const shape = elementFactory.createShape(assign({ type: type }, options))
      if (options) {
        shape.businessObject.di.isExpanded = options.isExpanded;
@@ -30,7 +30,7 @@ F.prototype.getPaletteEntries = function() {
      create.start(event, shape);
    }
-    var shortType = type.replace(/^bpmn:/, "");
+    const shortType = type.replace(/^bpmn:/, '')
    return {
      group: group,
@@ -44,19 +44,19 @@ F.prototype.getPaletteEntries = function() {
  }
  function createSubprocess(event) {
-    var subProcess = elementFactory.createShape({
+    const subProcess = elementFactory.createShape({
-      type: "bpmn:SubProcess",
+      type: 'bpmn:SubProcess',
      x: 0,
      y: 0,
      isExpanded: true
-    });
+    })
-    var startEvent = elementFactory.createShape({
+    const startEvent = elementFactory.createShape({
-      type: "bpmn:StartEvent",
+      type: 'bpmn:StartEvent',
      x: 40,
      y: 82,
      parent: subProcess
-    });
+    })
    create.start(event, [subProcess, startEvent], {
      hints: {

--- a/src/components/bpmnProcessDesigner/package/designer/plugins/palette/paletteProvider.js
+++ b/src/components/bpmnProcessDesigner/package/designer/plugins/palette/paletteProvider.js
@@ -19,18 +19,18 @@ export default function PaletteProvider(palette, create, elementFactory, spaceTo
 PaletteProvider.$inject = ["palette", "create", "elementFactory", "spaceTool", "lassoTool", "handTool", "globalConnect", "translate"];
 PaletteProvider.prototype.getPaletteEntries = function() {
-  var actions = {},
+  const actions = {},
    create = this._create,
    elementFactory = this._elementFactory,
    spaceTool = this._spaceTool,
    lassoTool = this._lassoTool,
    handTool = this._handTool,
    globalConnect = this._globalConnect,
-    translate = this._translate;
+    translate = this._translate
  function createAction(type, group, className, title, options) {
    function createListener(event) {
-      var shape = elementFactory.createShape(assign({ type: type }, options));
+      const shape = elementFactory.createShape(assign({ type: type }, options))
      if (options) {
        shape.businessObject.di.isExpanded = options.isExpanded;
@@ -39,7 +39,7 @@ PaletteProvider.prototype.getPaletteEntries = function() {
      create.start(event, shape);
    }
-    var shortType = type.replace(/^bpmn:/, "");
+    const shortType = type.replace(/^bpmn:/, '')
    return {
      group: group,
@@ -53,19 +53,19 @@ PaletteProvider.prototype.getPaletteEntries = function() {
  }
  function createSubprocess(event) {
-    var subProcess = elementFactory.createShape({
+    const subProcess = elementFactory.createShape({
-      type: "bpmn:SubProcess",
+      type: 'bpmn:SubProcess',
      x: 0,
      y: 0,
      isExpanded: true
-    });
+    })
-    var startEvent = elementFactory.createShape({
+    const startEvent = elementFactory.createShape({
-      type: "bpmn:StartEvent",
+      type: 'bpmn:StartEvent',
      x: 40,
      y: 82,
      parent: subProcess
-    });
+    })
    create.start(event, [subProcess, startEvent], {
      hints: {

--- a/src/components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue
@@ -163,7 +163,6 @@ export default {
    // 初始化数据
    initFormOnChanged(element) {
      let activatedElement = element;
-      // debugger
      if (!activatedElement) {
        activatedElement =
          window.bpmnInstances.elementRegistry.find(el => el.type === "bpmn:Process") ??

--- a/src/components/bpmnProcessDesigner/package/penal/base/ElementBaseInfo.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/base/ElementBaseInfo.vue
@@ -2,6 +2,7 @@
  <div class="panel-tab__content">
    <el-form size="mini" label-width="90px" :model="model" :rules="rules" @submit.native.prevent>
      <div v-if="elementBaseInfo.$type === 'bpmn:Process'"> <!-- 如果是 Process 信息的时候，使用自定义表单 -->
        <el-form-item label="流程标识" prop="key">
          <el-input v-model="model.key" placeholder="请输入流标标识"
                    :disabled="model.id !== undefined && model.id.length > 0" @change="handleKeyUpdate" />
@@ -66,6 +67,7 @@ export default {
  },
  methods: {
    resetBaseInfo() {
+      debugger;
      this.bpmnElement = window?.bpmnInstances?.bpmnElement;
      this.elementBaseInfo = JSON.parse(JSON.stringify(this.bpmnElement.businessObject));
    },
@@ -74,7 +76,7 @@ export default {
      if (!value) {
        return;
      }
-      if (!value.match(/[a-zA-Z_][\-_.0-9_a-zA-Z$]*/)) {
+      if (!value.match(/[a-zA-Z_][\-_.0-9a-zA-Z$]*/)) {
        console.log('key 不满足 XML NCName 规则，所以不进行赋值');
        return;
      }
@@ -101,6 +103,7 @@ export default {
      const attrObj = Object.create(null);
      attrObj[key] = this.elementBaseInfo[key];
      if (key === "id") {
+        debugger;
        window.bpmnInstances.modeling.updateProperties(this.bpmnElement, {
          id: this.elementBaseInfo[key],
          di: { id: `${this.elementBaseInfo[key]}_di` }

--- a/src/components/bpmnProcessDesigner/package/penal/flow-condition/FlowCondition.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/flow-condition/FlowCondition.vue
@@ -15,7 +15,7 @@
        </el-select>
      </el-form-item>
      <el-form-item label="表达式" v-if="flowConditionForm.conditionType && flowConditionForm.conditionType === 'expression'" key="express">
-        <el-input v-model="flowConditionForm.body" clearable @change="updateFlowCondition" />
+        <el-input v-model="flowConditionForm.body" style="width:192px;"  clearable @change="updateFlowCondition" />
      </el-form-item>
      <template v-if="flowConditionForm.conditionType && flowConditionForm.conditionType === 'script'">
        <el-form-item label="脚本语言" key="language">

--- a/src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue
@@ -15,7 +15,7 @@
        <el-form-item label="循环基数" key="loopCardinality">
          <el-input v-model="loopInstanceForm.loopCardinality" clearable @change="updateLoopCardinality" />
        </el-form-item>
-        <el-form-item label="集合" key="collection">
+        <el-form-item label="集合" key="collection" v-show="false">
          <el-input v-model="loopInstanceForm.collection" clearable @change="updateLoopBase" />
        </el-form-item>
        <el-form-item label="元素变量" key="elementVariable">
@@ -131,7 +131,7 @@ export default {
      if (type === "SequentialMultiInstance") {
        this.multiLoopInstance = window.bpmnInstances.moddle.create("bpmn:MultiInstanceLoopCharacteristics", { isSequential: true });
      } else {
-        this.multiLoopInstance = window.bpmnInstances.moddle.create("bpmn:MultiInstanceLoopCharacteristics");
+        this.multiLoopInstance = window.bpmnInstances.moddle.create("bpmn:MultiInstanceLoopCharacteristics", { collection: "${coll_userList}" });
      }
      window.bpmnInstances.modeling.updateProperties(this.bpmnElement, {
        loopCharacteristics: this.multiLoopInstance

--- a/src/components/bpmnProcessDesigner/package/theme/process-designer.scss
+++ b/src/components/bpmnProcessDesigner/package/theme/process-designer.scss
@@ -13,7 +13,7 @@
  display: flex;
  flex-direction: column;
  width: 100%;
-  height: 100%;
+  height: 500px;
  box-sizing: border-box;
  .my-process-designer__header {
    width: 100%;
@@ -141,11 +141,11 @@
  }
 }
 pre {
-  /* margin: 0;
+  margin: 0;
  height: 100%;
  overflow: hidden;
  max-height: calc(80vh - 32px);
-  overflow-y: auto; */
+  overflow-y: auto;
 }
 .hljs {
  word-break: break-word;

--- a/src/views/bpm/model/modelEditor.vue
+++ b/src/views/bpm/model/modelEditor.vue
 <template>
  <div class="app-container">
    <!-- 流程设计器，负责绘制流程等 -->
-    <my-process-designer :key="`designer-${reloadIndex}`" v-model="xmlString" v-bind="controlForm"
+    <my-process-designer v-if="xmlString !== undefined" :key="`designer-${reloadIndex}`" v-model="xmlString" v-bind="controlForm"
      keyboard ref="processDesigner" @init-finished="initModeler"
      @save="save"/>
@@ -29,7 +30,7 @@ export default {
  components: { MyProcessPalette },
  data() {
    return {
-      xmlString: "", // BPMN XML
+      xmlString: undefined, // BPMN XML
      modeler: null,
      reloadIndex: 0,
      controlDrawerVisible: false,
@@ -38,7 +39,7 @@ export default {
        simulation: true,
        labelEditing: false,
        labelVisible: false,
-        prefix: "activiti",
+        prefix: "flowable",
        headerButtonSize: "mini",
        additionalModel: [CustomContentPadProvider, CustomPaletteProvider]
      },
@@ -53,6 +54,7 @@ export default {
  created() {
    // 如果 modelId 非空，说明是修改流程模型
    const modelId = this.$route.query && this.$route.query.modelId
    if (modelId) {
      getModel(modelId).then(response => {
        this.xmlString = response.data.bpmnXml
@@ -68,24 +70,8 @@ export default {
    initModeler(modeler) {
      setTimeout(() => {
        this.modeler = modeler;
-        console.log(modeler);
      }, 10);
    },
-    reloadProcessDesigner(deep) {
-      this.controlForm.additionalModel = [];
-      for (let key in this.addis) {
-        if (this.addis[key]) {
-          this.controlForm.additionalModel.push(this.addis[key]);
-        }
-      }
-      deep && (this.xmlString = undefined);
-      this.reloadIndex += 1;
-      this.modeler = null; // 避免 panel 异常
-      // if (deep) {
-      //   this.xmlString = undefined;
-      //   this.$refs.processDesigner.processRestart();
-      // }
-    },
    save(bpmnXml) {
      const data = {
        ...this.model,
@@ -129,9 +115,6 @@ export default {
 //  display: inline-grid;
 //  grid-template-columns: 100px auto max-content;
 //}
-.app-container{
-  min-height: calc(100vh - 84px);
-}
 .demo-control-bar {
  position: fixed;
  right: 8px;
@@ -174,9 +157,9 @@ export default {
  color: #fafafa;
 }
-/* .my-process-designer {
+.my-process-designer {
  height: calc(100vh - 84px);
-} */
+}
 .process-panel__container {
  position: absolute;
  right: 0;

--- a/src/views/bpm/processInstance/index.vue
+++ b/src/views/bpm/processInstance/index.vue
@@ -38,10 +38,10 @@
    <!-- 操作工具栏 -->
    <el-row :gutter="10" class="mb8">
-      <!-- <el-col :span="1.5">
+       <el-col :span="1.5">
        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
                   v-hasPermi="['bpm:process-instance:query']">{{$t('发起流程')}}</el-button>
-      </el-col> -->
+      </el-col>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>

--- a/yarn.lock
+++ b/yarn.lock
@@ -1038,6 +1038,42 @@
    "@jridgewell/resolve-uri" "^3.0.3"
    "@jridgewell/sourcemap-codec" "^1.4.10"
+"@messageformat/core@^3.0.0":
+  version "3.0.1"
+  resolved "https://registry.npmmirror.com/@messageformat/core/-/core-3.0.1.tgz#191e12cf9643704d1fd32e592a3fbdc194dd588e"
+  integrity sha512-yxj2+0e46hcZqJfNf0ZYbC2q6WlcGoh4g11mCyRtTueR0AD8F9z4JMYAS1aOiFG8Vl1LZg/h5hZHKmWTAyZq8g==
+  dependencies:
+    "@messageformat/date-skeleton" "^1.0.0"
+    "@messageformat/number-skeleton" "^1.0.0"
+    "@messageformat/parser" "^5.0.0"
+    "@messageformat/runtime" "^3.0.1"
+    make-plural "^7.0.0"
+    safe-identifier "^0.4.1"
+"@messageformat/date-skeleton@^1.0.0":
+  version "1.0.1"
+  resolved "https://registry.npmmirror.com/@messageformat/date-skeleton/-/date-skeleton-1.0.1.tgz#980b8babe21a11433b6e1e8f6dc8c4cae4f5f56b"
+  integrity sha512-jPXy8fg+WMPIgmGjxSlnGJn68h/2InfT0TNSkVx0IGXgp4ynnvYkbZ51dGWmGySEK+pBiYUttbQdu5XEqX5CRg==
+"@messageformat/number-skeleton@^1.0.0":
+  version "1.1.0"
+  resolved "https://registry.npmmirror.com/@messageformat/number-skeleton/-/number-skeleton-1.1.0.tgz#eb636738da8abbd35ccbeb84f7d84d63302aeb61"
+  integrity sha512-F0Io+GOSvFFxvp9Ze3L5kAoZ2NnOAT0Mr/jpGNd3fqo8A0t4NxNIAcCdggtl2B/gN2ErkIKSBVPrF7xcW1IGvA==
+"@messageformat/parser@^5.0.0":
+  version "5.0.0"
+  resolved "https://registry.npmmirror.com/@messageformat/parser/-/parser-5.0.0.tgz#5737e69d7d4a469998b527710f1891174fc1b262"
+  integrity sha512-WiDKhi8F0zQaFU8cXgqq69eYFarCnTVxKcvhAONufKf0oUxbqLMW6JX6rV4Hqh+BEQWGyKKKHY4g1XA6bCLylA==
+  dependencies:
+    moo "^0.5.1"
+"@messageformat/runtime@^3.0.1":
+  version "3.0.1"
+  resolved "https://registry.npmmirror.com/@messageformat/runtime/-/runtime-3.0.1.tgz#94d1f6c43265c28ef7aed98ecfcc0968c6c849ac"
+  integrity sha512-6RU5ol2lDtO8bD9Yxe6CZkl0DArdv0qkuoZC+ZwowU+cdRlVE1157wjCmlA5Rsf1Xc/brACnsZa5PZpEDfTFFg==
+  dependencies:
+    make-plural "^7.0.0"
 "@mrmlnc/readdir-enhanced@^2.2.1":
  version "2.2.1"
  resolved "https://registry.npmmirror.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz"
@@ -1469,11 +1505,40 @@
    estree-walker "^2.0.2"
    magic-string "^0.25.7"
+"@vue/reactivity@3.2.45":
+  version "3.2.45"
+  resolved "https://registry.npmmirror.com/@vue/reactivity/-/reactivity-3.2.45.tgz#412a45b574de601be5a4a5d9a8cbd4dee4662ff0"
+  integrity sha512-PRvhCcQcyEVohW0P8iQ7HDcIOXRjZfAsOds3N99X/Dzewy8TVhTCT4uXpAHfoKjVTJRA0O0K+6QNkDIZAxNi3A==
+  dependencies:
+    "@vue/shared" "3.2.45"
+"@vue/runtime-core@3.2.45":
+  version "3.2.45"
+  resolved "https://registry.npmmirror.com/@vue/runtime-core/-/runtime-core-3.2.45.tgz#7ad7ef9b2519d41062a30c6fa001ec43ac549c7f"
+  integrity sha512-gzJiTA3f74cgARptqzYswmoQx0fIA+gGYBfokYVhF8YSXjWTUA2SngRzZRku2HbGbjzB6LBYSbKGIaK8IW+s0A==
+  dependencies:
+    "@vue/reactivity" "3.2.45"
+    "@vue/shared" "3.2.45"
+"@vue/runtime-dom@latest":
+  version "3.2.45"
+  resolved "https://registry.npmmirror.com/@vue/runtime-dom/-/runtime-dom-3.2.45.tgz#1a2ef6ee2ad876206fbbe2a884554bba2d0faf59"
+  integrity sha512-cy88YpfP5Ue2bDBbj75Cb4bIEZUMM/mAkDMfqDTpUYVgTf/kuQ2VQ8LebuZ8k6EudgH8pYhsGWHlY0lcxlvTwA==
+  dependencies:
+    "@vue/runtime-core" "3.2.45"
+    "@vue/shared" "3.2.45"
+    csstype "^2.6.8"
 "@vue/shared@3.2.31":
  version "3.2.31"
  resolved "https://registry.npmmirror.com/@vue/shared/-/shared-3.2.31.tgz"
  integrity sha512-ymN2pj6zEjiKJZbrf98UM2pfDd6F2H7ksKw7NDt/ZZ1fh5Ei39X5tABugtT03ZRlWd9imccoK0hE8hpjpU7irQ==
+"@vue/shared@3.2.45":
+  version "3.2.45"
+  resolved "https://registry.npmmirror.com/@vue/shared/-/shared-3.2.45.tgz#a3fffa7489eafff38d984e23d0236e230c818bc2"
+  integrity sha512-Ewzq5Yhimg7pSztDV+RH1UDKBzmtqieXQlpTVm2AwraoRL/Rks96mvd8Vgi7Lj+h+TH8dv7mXD3FRZR3TUvbSg==
 "@vue/web-component-wrapper@^1.2.0":
  version "1.3.0"
  resolved "https://registry.npmmirror.com/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz"
@@ -1677,6 +1742,11 @@ address@^1.1.2:
  resolved "https://registry.npmmirror.com/address/-/address-1.1.2.tgz"
  integrity sha512-aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA==
+adler-32@~1.3.0:
+  version "1.3.1"
+  resolved "https://registry.npmmirror.com/adler-32/-/adler-32-1.3.1.tgz#1dbf0b36dda0012189a32b3679061932df1821e2"
+  integrity sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==
 aggregate-error@^3.0.0:
  version "3.1.0"
  resolved "https://registry.npmmirror.com/aggregate-error/-/aggregate-error-3.1.0.tgz"
@@ -2046,6 +2116,11 @@ balanced-match@^1.0.0:
  resolved "https://registry.npmmirror.com/balanced-match/-/balanced-match-1.0.2.tgz"
  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
+base64-arraybuffer@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz#1c37589a7c4b0746e34bd1feb951da2df01c1bdc"
+  integrity sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ==
 base64-js@^1.0.2:
  version "1.5.1"
  resolved "https://registry.npmmirror.com/base64-js/-/base64-js-1.5.1.tgz"
@@ -2161,6 +2236,11 @@ boolbase@^1.0.0, boolbase@~1.0.0:
  resolved "https://registry.npmmirror.com/boolbase/-/boolbase-1.0.0.tgz"
  integrity "sha1-aN/1++YMUes3cl6p4+0xDcwed24= sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="
+boolean@^3.1.4:
+  version "3.2.0"
+  resolved "https://registry.npmmirror.com/boolean/-/boolean-3.2.0.tgz#9e5294af4e98314494cbb17979fa54ca159f116b"
+  integrity sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==
 bpmn-js-properties-panel@0.46.0:
  version "0.46.0"
  resolved "https://registry.npmmirror.com/bpmn-js-properties-panel/-/bpmn-js-properties-panel-0.46.0.tgz"
@@ -2543,6 +2623,14 @@ caseless@~0.12.0:
  resolved "https://registry.npmmirror.com/caseless/-/caseless-0.12.0.tgz"
  integrity "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw=="
+cfb@~1.2.1:
+  version "1.2.2"
+  resolved "https://registry.npmmirror.com/cfb/-/cfb-1.2.2.tgz#94e687628c700e5155436dac05f74e08df23bc44"
+  integrity sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==
+  dependencies:
+    adler-32 "~1.3.0"
+    crc-32 "~1.2.0"
 chalk@2.3.0:
  version "2.3.0"
  resolved "https://registry.npmmirror.com/chalk/-/chalk-2.3.0.tgz"
@@ -2795,6 +2883,11 @@ coa@^2.0.2:
    chalk "^2.4.1"
    q "^1.1.2"
+codepage@~1.15.0:
+  version "1.15.0"
+  resolved "https://registry.npmmirror.com/codepage/-/codepage-1.15.0.tgz#2e00519024b39424ec66eeb3ec07227e692618ab"
+  integrity sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA==
 collection-visit@^1.0.0:
  version "1.0.0"
  resolved "https://registry.npmmirror.com/collection-visit/-/collection-visit-1.0.0.tgz"
@@ -3129,6 +3222,11 @@ cosmiconfig@^7.0.0:
    path-type "^4.0.0"
    yaml "^1.10.0"
+crc-32@~1.2.0, crc-32@~1.2.1:
+  version "1.2.2"
+  resolved "https://registry.npmmirror.com/crc-32/-/crc-32-1.2.2.tgz#3cad35a934b8bf71f25ca524b6da51fb7eace2ff"
+  integrity sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==
 create-ecdh@^4.0.0:
  version "4.0.4"
  resolved "https://registry.npmmirror.com/create-ecdh/-/create-ecdh-4.0.4.tgz"
@@ -3219,6 +3317,13 @@ css-declaration-sorter@^4.0.1:
    postcss "^7.0.1"
    timsort "^0.3.0"
+css-line-break@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npmmirror.com/css-line-break/-/css-line-break-2.1.0.tgz#bfef660dfa6f5397ea54116bb3cb4873edbc4fa0"
+  integrity sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w==
+  dependencies:
+    utrie "^1.0.2"
 css-loader@^3.5.3:
  version "3.6.0"
  resolved "https://registry.npmmirror.com/css-loader/-/css-loader-3.6.0.tgz"
@@ -3375,6 +3480,11 @@ csso@^4.0.2:
  dependencies:
    css-tree "^1.1.2"
+csstype@^2.6.8:
+  version "2.6.21"
+  resolved "https://registry.npmmirror.com/csstype/-/csstype-2.6.21.tgz#2efb85b7cc55c80017c66a5ad7cbd931fda3a90e"
+  integrity sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==
 csstype@^3.1.0:
  version "3.1.0"
  resolved "https://registry.npmmirror.com/csstype/-/csstype-3.1.0.tgz#4ddcac3718d787cf9df0d1b7d15033925c8f29f2"
@@ -3423,11 +3533,23 @@ debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0:
  dependencies:
    ms "2.1.2"
+debug@^4.3.3:
+  version "4.3.4"
+  resolved "https://registry.npmmirror.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
+  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+  dependencies:
+    ms "2.1.2"
 decamelize@^1.2.0:
  version "1.2.0"
  resolved "https://registry.npmmirror.com/decamelize/-/decamelize-1.2.0.tgz"
  integrity "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA=="
+decimal.js@^10.4.1:
+  version "10.4.2"
+  resolved "https://registry.npmmirror.com/decimal.js/-/decimal.js-10.4.2.tgz#0341651d1d997d86065a2ce3a441fbd0d8e8b98e"
+  integrity sha512-ic1yEvwT6GuvaYwBLLY6/aFFgjZdySKTE8en/fkU3QICTmRtgtSlFn0u0BXN06InZwtfCelR7j8LRiDI/02iGA==
 decode-uri-component@^0.2.0:
  version "0.2.0"
  resolved "https://registry.npmmirror.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz"
@@ -4414,6 +4536,13 @@ fast-levenshtein@^2.0.6:
  resolved "https://registry.npmmirror.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"
  integrity "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
+fast-printf@^1.6.9:
+  version "1.6.9"
+  resolved "https://registry.npmmirror.com/fast-printf/-/fast-printf-1.6.9.tgz#212f56570d2dc8ccdd057ee93d50dd414d07d676"
+  integrity sha512-FChq8hbz65WMj4rstcQsFB0O7Cy++nmbNfLYnD9cYv2cRn8EG6k/MGn9kO/tjO66t09DLDugj3yL+V2o6Qftrg==
+  dependencies:
+    boolean "^3.1.4"
 faye-websocket@^0.11.3:
  version "0.11.4"
  resolved "https://registry.npmmirror.com/faye-websocket/-/faye-websocket-0.11.4.tgz"
@@ -4613,6 +4742,11 @@ forwarded@0.2.0:
  resolved "https://registry.npmmirror.com/forwarded/-/forwarded-0.2.0.tgz"
  integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==
+frac@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.npmmirror.com/frac/-/frac-1.1.2.tgz#3d74f7f6478c88a1b5020306d747dc6313c74d0b"
+  integrity sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA==
 fragment-cache@^0.2.1:
  version "0.2.1"
  resolved "https://registry.npmmirror.com/fragment-cache/-/fragment-cache-0.2.1.tgz"
@@ -5112,6 +5246,14 @@ html-webpack-plugin@^3.2.0:
    toposort "^1.0.0"
    util.promisify "1.0.0"
+html2canvas@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.npmmirror.com/html2canvas/-/html2canvas-1.4.1.tgz#7cef1888311b5011d507794a066041b14669a543"
+  integrity sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==
+  dependencies:
+    css-line-break "^2.1.0"
+    text-segmentation "^1.0.3"
 htmlparser2@^3.8.3:
  version "3.10.1"
  resolved "https://registry.npmmirror.com/htmlparser2/-/htmlparser2-3.10.1.tgz"
@@ -5203,6 +5345,18 @@ human-signals@^1.1.1:
  resolved "https://registry.npmmirror.com/human-signals/-/human-signals-1.1.1.tgz"
  integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
+i18n@^0.15.0:
+  version "0.15.1"
+  resolved "https://registry.npmmirror.com/i18n/-/i18n-0.15.1.tgz#68fb8993c461cc440bc2485d82f72019f2b92de8"
+  integrity sha512-yue187t8MqUPMHdKjiZGrX+L+xcUsDClGO0Cz4loaKUOK9WrGw5pgan4bv130utOwX7fHE9w2iUeHFalVQWkXA==
+  dependencies:
+    "@messageformat/core" "^3.0.0"
+    debug "^4.3.3"
+    fast-printf "^1.6.9"
+    make-plural "^7.0.0"
+    math-interval-parser "^2.0.1"
+    mustache "^4.2.0"
 iconv-lite@0.4.24, iconv-lite@^0.4.24:
  version "0.4.24"
  resolved "https://registry.npmmirror.com/iconv-lite/-/iconv-lite-0.4.24.tgz"
@@ -6218,6 +6372,11 @@ make-dir@^3.0.2, make-dir@^3.1.0:
  dependencies:
    semver "^6.0.0"
+make-plural@^7.0.0:
+  version "7.2.0"
+  resolved "https://registry.npmmirror.com/make-plural/-/make-plural-7.2.0.tgz#93174b1419672a48a2340db6c1d3fb217530c684"
+  integrity sha512-WkdI+iaWaBCFM2wUXwos8Z7spg5Dt64Xe/VI6NpRaly21cDtD76N6S97K//UtzV0dHOiXX+E90TnszdXHG0aMg==
 map-cache@^0.2.2:
  version "0.2.2"
  resolved "https://registry.npmmirror.com/map-cache/-/map-cache-0.2.2.tgz"
@@ -6240,6 +6399,11 @@ material-colors@^1.2.6:
  resolved "https://registry.npmmirror.com/material-colors/-/material-colors-1.2.6.tgz"
  integrity sha512-6qE4B9deFBIa9YSpOc9O0Sgc43zTeVYbgDT5veRKSlB2+ZuHNoVVxA1L/ckMUayV9Ay9y7Z/SZCLcGteW9i7bg==
+math-interval-parser@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.npmmirror.com/math-interval-parser/-/math-interval-parser-2.0.1.tgz#e22cd6d15a0a7f4c03aec560db76513da615bed4"
+  integrity sha512-VmlAmb0UJwlvMyx8iPhXUDnVW1F9IrGEd9CIOmv+XL8AErCUUuozoDMrgImvnYt2A+53qVX/tPW6YJurMKYsvA==
 md5.js@^1.3.4:
  version "1.3.5"
  resolved "https://registry.npmmirror.com/md5.js/-/md5.js-1.3.5.tgz"
@@ -6571,6 +6735,11 @@ moddle@^5.0.2:
  dependencies:
    min-dash "^3.0.0"
+moo@^0.5.1:
+  version "0.5.2"
+  resolved "https://registry.npmmirror.com/moo/-/moo-0.5.2.tgz#f9fe82473bc7c184b0d32e2215d3f6e67278733c"
+  integrity sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q==
 move-concurrently@^1.0.1:
  version "1.0.1"
  resolved "https://registry.npmmirror.com/move-concurrently/-/move-concurrently-1.0.1.tgz"
@@ -6611,6 +6780,11 @@ multicast-dns@^6.0.1:
    dns-packet "^1.3.1"
    thunky "^1.0.2"
+mustache@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.npmmirror.com/mustache/-/mustache-4.2.0.tgz#e5892324d60a12ec9c2a73359edca52972bf6f64"
+  integrity sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==
 mute-stream@0.0.8:
  version "0.0.8"
  resolved "https://registry.npmmirror.com/mute-stream/-/mute-stream-0.0.8.tgz"
@@ -6829,6 +7003,11 @@ num2fraction@^1.2.2:
  resolved "https://registry.npmmirror.com/num2fraction/-/num2fraction-1.2.2.tgz"
  integrity "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4= sha512-Y1wZESM7VUThYY+4W+X4ySH2maqcA+p7UR+w8VWNWVAd6lwuXXWz/w/Cz43J/dI2I+PS6wD5N+bJUF+gjWvIqg=="
+number-precision@^1.5.2:
+  version "1.6.0"
+  resolved "https://registry.npmmirror.com/number-precision/-/number-precision-1.6.0.tgz#e309d28f80871d36ac9f6ecd974e13afb1ec0de0"
+  integrity sha512-05OLPgbgmnixJw+VvEh18yNPUo3iyp4BEWJcrLu4X9W05KmMifN7Mu5exYvQXqxxeNWhvIF+j3Rij+HmddM/hQ==
 oauth-sign@~0.9.0:
  version "0.9.0"
  resolved "https://registry.npmmirror.com/oauth-sign/-/oauth-sign-0.9.0.tgz"
@@ -8364,6 +8543,11 @@ safe-buffer@5.2.1, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
  resolved "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.2.1.tgz"
  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
+safe-identifier@^0.4.1:
+  version "0.4.2"
+  resolved "https://registry.npmmirror.com/safe-identifier/-/safe-identifier-0.4.2.tgz#cf6bfca31c2897c588092d1750d30ef501d59fcb"
+  integrity sha512-6pNbSMW6OhAi9j+N8V+U715yBQsaWJ7eyEUaOrawX+isg5ZxhUlV1NipNtgaKHmFGiABwt+ZF04Ii+3Xjkg+8w==
 safe-regex@^1.1.0:
  version "1.1.0"
  resolved "https://registry.npmmirror.com/safe-regex/-/safe-regex-1.1.0.tgz"
@@ -8865,6 +9049,13 @@ sprintf-js@~1.0.2:
  resolved "https://registry.npmmirror.com/sprintf-js/-/sprintf-js-1.0.3.tgz"
  integrity "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
+ssf@~0.11.2:
+  version "0.11.2"
+  resolved "https://registry.npmmirror.com/ssf/-/ssf-0.11.2.tgz#0b99698b237548d088fc43cdf2b70c1a7512c06c"
+  integrity sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==
+  dependencies:
+    frac "~1.1.2"
 sshpk@^1.7.0:
  version "1.17.0"
  resolved "https://registry.npmmirror.com/sshpk/-/sshpk-1.17.0.tgz"
@@ -9292,6 +9483,13 @@ terser@^5.3.4:
    source-map "~0.7.2"
    source-map-support "~0.5.20"
+text-segmentation@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.npmmirror.com/text-segmentation/-/text-segmentation-1.0.3.tgz#52a388159efffe746b24a63ba311b6ac9f2d7943"
+  integrity sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==
+  dependencies:
+    utrie "^1.0.2"
 text-table@^0.2.0:
  version "0.2.0"
  resolved "https://registry.npmmirror.com/text-table/-/text-table-0.2.0.tgz"
@@ -9723,6 +9921,13 @@ utils-merge@1.0.1:
  resolved "https://registry.npmmirror.com/utils-merge/-/utils-merge-1.0.1.tgz"
  integrity "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="
+utrie@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/utrie/-/utrie-1.0.2.tgz#d42fe44de9bc0119c25de7f564a6ed1b2c87a645"
+  integrity sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw==
+  dependencies:
+    base64-arraybuffer "^1.0.2"
 uuid@^3.3.2:
  version "3.4.0"
  resolved "https://registry.npmmirror.com/uuid/-/uuid-3.4.0.tgz"
@@ -9798,6 +10003,11 @@ vue-hot-reload-api@^2.3.0:
  resolved "https://registry.npmmirror.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz"
  integrity sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==
+vue-i18n@^8.27.2:
+  version "8.28.2"
+  resolved "https://registry.npmmirror.com/vue-i18n/-/vue-i18n-8.28.2.tgz#913558066e274395c0a9f40b2f3393d5c2636840"
+  integrity sha512-C5GZjs1tYlAqjwymaaCPDjCyGo10ajUphiwA922jKt9n7KPpqR7oM1PCwYzhB/E7+nT3wfdG3oRre5raIT1rKA==
 vue-loader@^15.9.2:
  version "15.9.8"
  resolved "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.9.8.tgz"
@@ -10096,11 +10306,21 @@ which@^2.0.1:
  dependencies:
    isexe "^2.0.0"
+wmf@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/wmf/-/wmf-1.0.2.tgz#7d19d621071a08c2bdc6b7e688a9c435298cc2da"
+  integrity sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==
 word-wrap@^1.2.3:
  version "1.2.3"
  resolved "https://registry.npmmirror.com/word-wrap/-/word-wrap-1.2.3.tgz"
  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+word@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.npmmirror.com/word/-/word-0.3.0.tgz#8542157e4f8e849f4a363a288992d47612db9961"
+  integrity sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA==
 worker-farm@^1.7.0:
  version "1.7.0"
  resolved "https://registry.npmmirror.com/worker-farm/-/worker-farm-1.7.0.tgz"
@@ -10147,6 +10367,19 @@ ws@^6.0.0, ws@^6.2.1:
  dependencies:
    async-limiter "~1.0.0"
+xlsx@^0.18.5:
+  version "0.18.5"
+  resolved "https://registry.npmmirror.com/xlsx/-/xlsx-0.18.5.tgz#16711b9113c848076b8a177022799ad356eba7d0"
+  integrity sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==
+  dependencies:
+    adler-32 "~1.3.0"
+    cfb "~1.2.1"
+    codepage "~1.15.0"
+    crc-32 "~1.2.1"
+    ssf "~0.11.2"
+    wmf "~1.0.1"
+    word "~0.3.0"
 xml-js@^1.6.11:
  version "1.6.11"
  resolved "https://registry.npmmirror.com/xml-js/-/xml-js-1.6.11.tgz"