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

package/v3/ddy-process-pc-vue3.js

@@ -3914,8 +3914,8 @@ const nR = {
           ...d.multiNodeParticipant
         }, n.vars = { ...n.vars, ...d.vars };
       }
-      let r = this.param.nextTaskNode && this.param.nextTaskNode.nodeType != "endEvent", l = 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", a = this.param.nextTaskNode && this.param.nextTaskNode.branches && this.param.nextTaskNode.branches.length == 1 && this.param.nextTaskNode.branches[0].nodeType != "endEvent";
-      if (r && l && a) {
+      let r = this.param.nextTaskNode && this.param.nextTaskNode.nodeType != "endEvent" && (!this.param.nextTaskNode.branches || this.param.nextTaskNode.branches.length <= 0), l = 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 (r || l || 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)
           n.multiNodeParticipant = {
             ...n.multiNodeParticipant,
@@ -3961,44 +3961,45 @@ const nR = {
         },
         attachment: this.param.attachment
       };
-      for (let t in this.userTaskListData) {
-        let o = this.userTaskListData[t], n = this.$refs[o].$el ? this.$refs[o] : this.$refs[o][0];
-        n.getValue;
-        let r = n.getValue();
-        if (!r)
+      for (let l in this.userTaskListData) {
+        let a = this.userTaskListData[l], s = this.$refs[a].$el ? this.$refs[a] : this.$refs[a][0];
+        s.getValue;
+        let c = s.getValue();
+        if (!c)
           return !1;
         e.multiNodeParticipant = {
           ...e.multiNodeParticipant,
-          ...r.multiNodeParticipant
-        }, e.vars = { ...e.vars, ...r.vars };
+          ...c.multiNodeParticipant
+        }, e.vars = { ...e.vars, ...c.vars };
       }
-      if (this.param.nextTaskNode && this.param.nextTaskNode.nodeType != "endEvent") {
+      let t = this.param.nextTaskNode && this.param.nextTaskNode.nodeType != "endEvent" && (!this.param.nextTaskNode.branches || this.param.nextTaskNode.branches.length <= 0), o = 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", n = 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 (t || o || n) {
         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((t) => t.id)
+            [this.param.nextTaskNode.branches[0].nodeInfoDTO.id]: this.param.nextTaskNode.branches[0].nodeInfoDTO.assignees.map((l) => l.id)
           };
         else if (!Object.keys(e.multiNodeParticipant).length)
           return _i.warning("\u8BF7\u9009\u62E9\u4E0B\u4E00\u8282\u70B9"), !1;
       }
       if (this.param.getVars) {
-        let t = this.param.getVars();
-        if (t === !1)
+        let l = this.param.getVars();
+        if (l === !1)
           return !1;
-        e.vars = { ...e.vars, ...t };
+        e.vars = { ...e.vars, ...l };
       }
-      e.pass = !0, this.confirmLoading(), this.confirmPreposition ? this.confirmPreposition().then((t) => {
-        _t.tis.complete(e).then((o) => {
-          o.code == Wt.success ? (t && t(), this.$emit("success")) : this.$emit("fail", o.msg);
+      e.pass = !0, this.confirmLoading(), this.confirmPreposition ? this.confirmPreposition().then((l) => {
+        _t.tis.complete(e).then((a) => {
+          a.code == Wt.success ? (l && l(), this.$emit("success")) : this.$emit("fail", a.msg);
         }).catch(() => {
           this.$emit("fail", "");
         });
       }).catch(() => {
         this.$emit("fail", "");
-      }) : _t.tis.complete(e).then((t) => {
-        t.code == Wt.success ? this.$emit("success") : this.$emit("fail", t.msg);
-      }).catch((t) => {
-        this.$emit("fail", t.response ? t.response.data ? t.response.data.msg || t.response.data.message : "" : t.message || t.msg || "");
+      }) : _t.tis.complete(e).then((l) => {
+        l.code == Wt.success ? this.$emit("success") : this.$emit("fail", l.msg);
+      }).catch((l) => {
+        this.$emit("fail", l.response ? l.response.data ? l.response.data.msg || l.response.data.message : "" : l.message || l.msg || "");
       });
     },
     handleSignature(e, t) {
@@ -4260,7 +4261,7 @@ function aR(e, t, o, n, r, l) {
     _: 3
   });
 }
-const gh = /* @__PURE__ */ Ro(nR, [["render", aR], ["__scopeId", "data-v-3aa970bc"]]);
+const gh = /* @__PURE__ */ Ro(nR, [["render", aR], ["__scopeId", "data-v-6f1bcca5"]]);
 var $1 = null;
 Promise.resolve().then(() => kr).then(({ ElMessage: e }) => {
   $1 = e;
@@ -58715,10 +58716,10 @@ const eae = {
         if (e.code == 200) {
           const t = {};
           if (t.currentProcessOriginData = e.data || [], t.currentProcessOriginData.length > 0) {
-            let o = t.currentProcessOriginData[0], n = (o.currentName || "").split(",");
-            n = n.map((r) => ({
-              realName: r,
-              avatar: "",
+            let o = t.currentProcessOriginData[0], n = (o.currentName || "").split(","), r = (o.avatar || "").split(",");
+            n = n.map((l, a) => ({
+              realName: l,
+              avatar: r[a] || "",
               phone: "",
               ancestorNames: []
             })), t.currentMan = n, t.currentFirstNode = o, this.currentProcess = t;
@@ -59558,7 +59559,7 @@ function cae(e, t, o, n, r, l) {
     [k, r.boxLoading && !o.isButton]
   ]);
 }
-const uae = /* @__PURE__ */ Ro(eae, [["render", cae], ["__scopeId", "data-v-64fb3965"]]), dae = async (e, t) => {
+const uae = /* @__PURE__ */ Ro(eae, [["render", cae], ["__scopeId", "data-v-e1fc5e8a"]]), dae = async (e, t) => {
   const o = t || {}, n = o.dragElement || (o.targetClassName ? sO(e, o.targetClassName) : e.querySelector(".el-dialog"));
   let r;
   new IntersectionObserver((y) => {