ddy-process-pc-vue3 1.0.1-rc.2.35 → 1.0.1-rc.2.41

package/v2.7/ddy-process-pc-vue3.js

@@ -6030,8 +6030,8 @@ const ij = {
           ...D.multiNodeParticipant
         }, a.vars = { ...a.vars, ...D.vars };
       }
-      let s = this.param.nextTaskNode && this.param.nextTaskNode.nodeType != "endEvent", c = this.param.nextTaskNode && this.param.nextTaskNode.branches && this.param.nextTaskNode.branches.length == 1 && this.param.nextTaskNode.branches[0].nodeInfoDTO && this.param.nextTaskNode.branches[0].nodeInfoDTO.nodeType != "endEvent", p = this.param.nextTaskNode && this.param.nextTaskNode.branches && this.param.nextTaskNode.branches.length == 1 && this.param.nextTaskNode.branches[0].nodeType != "endEvent";
-      if (s && c && p) {
+      let s = this.param.nextTaskNode && this.param.nextTaskNode.nodeType != "endEvent" && (!this.param.nextTaskNode.branches || this.param.nextTaskNode.branches.length <= 0), c = this.param.nextTaskNode && this.param.nextTaskNode.nodeType != "endEvent" && this.param.nextTaskNode.branches && this.param.nextTaskNode.branches.length == 1 && this.param.nextTaskNode.branches[0].nodeInfoDTO && this.param.nextTaskNode.branches[0].nodeInfoDTO.nodeType != "endEvent", p = this.param.nextTaskNode && this.param.nextTaskNode.nodeType != "endEvent" && this.param.nextTaskNode.branches && this.param.nextTaskNode.branches.length == 1 && !this.param.nextTaskNode.branches[0].nodeInfoDTO && this.param.nextTaskNode.branches[0].nodeType != "endEvent";
+      if (s || c || p) {
         if (this.param.nextTaskNode.nodeType == "exclusiveGateway" && this.param.nextTaskNode.branches && this.param.nextTaskNode.branches.length == 1 && this.param.nextTaskNode.branches[0].nodeInfoDTO && this.param.nextTaskNode.branches[0].nodeInfoDTO.setPersonnel == !0 && this.param.nextTaskNode.branches[0].nodeInfoDTO.assignees && this.param.nextTaskNode.branches[0].nodeInfoDTO.assignees.length > 0)
           a.multiNodeParticipant = {
             ...a.multiNodeParticipant,
@@ -6077,44 +6077,45 @@ const ij = {
         },
         attachment: this.param.attachment
       };
-      for (let i in this.userTaskListData) {
-        let r = this.userTaskListData[i], a = this.$refs[r].$el ? this.$refs[r] : this.$refs[r][0];
-        a.getValue;
-        let s = a.getValue();
-        if (!s)
+      for (let c in this.userTaskListData) {
+        let p = this.userTaskListData[c], m = this.$refs[p].$el ? this.$refs[p] : this.$refs[p][0];
+        m.getValue;
+        let g = m.getValue();
+        if (!g)
           return !1;
         e.multiNodeParticipant = {
           ...e.multiNodeParticipant,
-          ...s.multiNodeParticipant
-        }, e.vars = { ...e.vars, ...s.vars };
+          ...g.multiNodeParticipant
+        }, e.vars = { ...e.vars, ...g.vars };
       }
-      if (this.param.nextTaskNode && this.param.nextTaskNode.nodeType != "endEvent") {
+      let i = this.param.nextTaskNode && this.param.nextTaskNode.nodeType != "endEvent" && (!this.param.nextTaskNode.branches || this.param.nextTaskNode.branches.length <= 0), r = this.param.nextTaskNode && this.param.nextTaskNode.nodeType != "endEvent" && this.param.nextTaskNode.branches && this.param.nextTaskNode.branches.length == 1 && this.param.nextTaskNode.branches[0].nodeInfoDTO && this.param.nextTaskNode.branches[0].nodeInfoDTO.nodeType != "endEvent", a = this.param.nextTaskNode && this.param.nextTaskNode.nodeType != "endEvent" && this.param.nextTaskNode.branches && this.param.nextTaskNode.branches.length == 1 && !this.param.nextTaskNode.branches[0].nodeInfoDTO && this.param.nextTaskNode.branches[0].nodeType != "endEvent";
+      if (i || r || a) {
         if (this.param.nextTaskNode.nodeType == "exclusiveGateway" && this.param.nextTaskNode.branches && this.param.nextTaskNode.branches.length == 1 && this.param.nextTaskNode.branches[0].nodeInfoDTO && this.param.nextTaskNode.branches[0].nodeInfoDTO.setPersonnel == !0 && this.param.nextTaskNode.branches[0].nodeInfoDTO.assignees && this.param.nextTaskNode.branches[0].nodeInfoDTO.assignees.length > 0)
           e.multiNodeParticipant = {
             ...e.multiNodeParticipant,
-            [this.param.nextTaskNode.branches[0].nodeInfoDTO.id]: this.param.nextTaskNode.branches[0].nodeInfoDTO.assignees.map((i) => i.id)
+            [this.param.nextTaskNode.branches[0].nodeInfoDTO.id]: this.param.nextTaskNode.branches[0].nodeInfoDTO.assignees.map((c) => c.id)
           };
         else if (!Object.keys(e.multiNodeParticipant).length)
           return bu.warning("\u8BF7\u9009\u62E9\u4E0B\u4E00\u8282\u70B9"), !1;
       }
       if (this.param.getVars) {
-        let i = this.param.getVars();
-        if (i === !1)
+        let c = this.param.getVars();
+        if (c === !1)
           return !1;
-        e.vars = { ...e.vars, ...i };
+        e.vars = { ...e.vars, ...c };
       }
-      e.pass = !0, this.confirmLoading(), this.confirmPreposition ? this.confirmPreposition().then((i) => {
-        et.tis.complete(e).then((r) => {
-          r.code == wt.success ? (i && i(), this.$emit("success")) : this.$emit("fail", r.msg);
+      e.pass = !0, this.confirmLoading(), this.confirmPreposition ? this.confirmPreposition().then((c) => {
+        et.tis.complete(e).then((p) => {
+          p.code == wt.success ? (c && c(), this.$emit("success")) : this.$emit("fail", p.msg);
         }).catch(() => {
           this.$emit("fail", "");
         });
       }).catch(() => {
         this.$emit("fail", "");
-      }) : et.tis.complete(e).then((i) => {
-        i.code == wt.success ? this.$emit("success") : this.$emit("fail", i.msg);
-      }).catch((i) => {
-        this.$emit("fail", i.response ? i.response.data ? i.response.data.msg || i.response.data.message : "" : i.message || i.msg || "");
+      }) : et.tis.complete(e).then((c) => {
+        c.code == wt.success ? this.$emit("success") : this.$emit("fail", c.msg);
+      }).catch((c) => {
+        this.$emit("fail", c.response ? c.response.data ? c.response.data.msg || c.response.data.message : "" : c.message || c.msg || "");
       });
     },
     handleSignature(e, i) {
@@ -6134,7 +6135,7 @@ var nj = /* @__PURE__ */ Bi(
   tj,
   !1,
   rj,
-  "12657106",
+  "6a329a02",
   null,
   null
 );