sasp-flow-render 1.1.32-decoupling → 1.1.35-decoupling

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sasp-flow-render",
-  "version": "1.1.32-decoupling",
+  "version": "1.1.35-decoupling",
   "description": "业务应用支撑平台-智慧流程渲染组件",
   "scripts": {
     "build": "vue-cli-service build"

package/src/components/flowInst/js/workflow.js

@@ -930,6 +930,7 @@ class WorkflowEngine {
                             this.chooseNextUserId = "";
                             this.chooseNextUserName = "";
                             this.$flowDialog.fillFlowDialogParams({
+                                mulitiChooseUser: this.mulitiChooseUser,
                                 chooseNextUserId: this.chooseNextUserId,
                                 chooseNextUserName: this.chooseNextUserName
                             });

package/src/components/flowInst/popup/flowDialog.vue

@@ -9,7 +9,7 @@
             </span>
       <template v-if="flowInstDataDialog">
 <!--        <slot name="formInfo"></slot>-->
-        <render-form :flowComponet="workFlowUtil.$this"
+        <render-form :flowComponent="workFlowUtil.$this"
                      v-if="workFlowUtil.$this.$slots.formInfo && flowInstDataDialog">
 
         </render-form>
@@ -739,7 +739,7 @@ export default {
         }
         let userIds = "";
         checkedUserArr.forEach(item => {
-          userIds += "," + item.dataKey.startsWith("user_") ? item.dataKey.replace("user_", "") : item.dataKey;
+          userIds += "," + (item.dataKey.startsWith("user_") ? item.dataKey.replace("user_", "") : item.dataKey);
         });
         this.disableSign = true;
         this.saspFlowAxios.post(this.api.plFlowInst.completeSign, {

package/src/components/flowInst/popup/renderForm.vue

@@ -2,12 +2,12 @@
   export default {
     name: "renderForm",
     props:{
-      flowComponet:{
+      flowComponent:{
         type: Object,
         required: true},
     },
     render(h){
-      return this.flowComponet.$scopedSlots.formInfo({index:this.flowComponet.indexForm});
+      return this.flowComponent.$scopedSlots.formInfo({index:this.flowComponent.indexForm});
     },
     mounted() {
       // console.log(this);

package/src/views/popup/event/js/loadFlowEventPlugin.js

@@ -167,23 +167,22 @@ let eventObj = {}; //事件对象
 export default {
     name: "loadEventPlugin",
     installAll(Vue,opts){
+        let eventPlugin = Vue.prototype.EVENT_PLUGIN || {};
+        Object.keys(diyEventObjs).forEach(key =>{
+            //加载列格式化
+            diyEventObjs[key].forEach(item =>{
+                eventPlugin.preActiveEventRule(item);
+            })
+        });
+        //加载系统事件规则
+        Object.keys(sysEventObjs).forEach(key =>{
+            //加载列格式化
+            sysEventObjs[key].forEach(item =>{
+                eventPlugin.installEventRule(item);
+            })
+        });
         opts.saspFlowAxios.post(apiFlow.apis.eventRule.findByVersion,{"eventTypes":"flow"}).then(res =>{ //查询流程相关事件规则
-            let eventPlugin = Vue.prototype.EVENT_PLUGIN || {};
             if(res){
-                Object.keys(diyEventObjs).forEach(key =>{
-                    //加载列格式化
-                    diyEventObjs[key].forEach(item =>{
-                        eventPlugin.preActiveEventRule(item);
-                    })
-                });
-                //加载系统事件规则
-                Object.keys(sysEventObjs).forEach(key =>{
-                    //加载列格式化
-                    sysEventObjs[key].forEach(item =>{
-                        eventPlugin.installEventRule(item);
-                    })
-                });
-
                 if(!Array.isArray(res.data)){
                     res.data = [];
                 }