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

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

@@ -3894,57 +3894,58 @@ const nR = {
         businessData: this.param.businessData,
         attachment: this.param.attachment
       };
-      for (let r in this.userTaskListData) {
-        let l = this.userTaskListData[r];
-        this.$refs[l];
-        let a = this.$refs[l].$el ? this.$refs[l] : this.$refs[l][0];
-        a.getValue;
-        let s = a.getValue();
-        if (s && s.vars && this.param.incomingConditionItemList && this.param.incomingConditionItemList.length > 0 && this.param.incomingConditionItemList.forEach((p) => {
-          s.vars[p.itemName] || (s.vars[p.itemName] = "");
-        }), !s)
+      for (let c in this.userTaskListData) {
+        let u = this.userTaskListData[c];
+        this.$refs[u];
+        let p = this.$refs[u].$el ? this.$refs[u] : this.$refs[u][0];
+        p.getValue;
+        let d = p.getValue();
+        if (d && d.vars && this.param.incomingConditionItemList && this.param.incomingConditionItemList.length > 0 && this.param.incomingConditionItemList.forEach((g) => {
+          d.vars[g.itemName] || (d.vars[g.itemName] = "");
+        }), !d)
           return !1;
-        let c = [];
-        const u = this.param.nextTaskNode;
-        u.setPersonnel ? c = u.assignees || [] : c = (a.targetUserList || []).map((p) => ({
-          id: p.id,
-          name: p.name
-        })), n.assignees = c, n.multiNodeParticipant = {
+        let v = [];
+        const f = this.param.nextTaskNode;
+        f.setPersonnel ? v = f.assignees || [] : v = (p.targetUserList || []).map((g) => ({
+          id: g.id,
+          name: g.name
+        })), n.assignees = v, n.multiNodeParticipant = {
           ...n.multiNodeParticipant,
-          ...s.multiNodeParticipant
-        }, n.vars = { ...n.vars, ...s.vars };
+          ...d.multiNodeParticipant
+        }, n.vars = { ...n.vars, ...d.vars };
       }
-      if (this.param.nextTaskNode && this.param.nextTaskNode.nodeType != "endEvent") {
+      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) {
         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,
-            [this.param.nextTaskNode.branches[0].nodeInfoDTO.id]: this.param.nextTaskNode.branches[0].nodeInfoDTO.assignees.map((r) => r.id)
+            [this.param.nextTaskNode.branches[0].nodeInfoDTO.id]: this.param.nextTaskNode.branches[0].nodeInfoDTO.assignees.map((c) => c.id)
           };
         else if (!Object.keys(n.multiNodeParticipant).length)
           return _i.warning("\u8BF7\u9009\u62E9\u4E0B\u4E00\u8282\u70B9"), !1;
       }
       if (n.pass = !0, Date.now() && this.param, this.param.getVars) {
-        let r = this.param.getVars();
-        if (r === !1)
+        let c = this.param.getVars();
+        if (c === !1)
           return !1;
-        n.vars = { ...n.vars, ...r };
+        n.vars = { ...n.vars, ...c };
       }
       if (this.signRequired, this.signRequired) {
         this.confirmPreposition = e, this.confirmLoading = t, this.signVisible = !0;
         return;
       }
-      t(), e ? e().then((r) => {
-        _t.tis.complete(n).then((l) => {
-          l.code == Wt.success ? (r && r(), this.$emit("success")) : this.$emit("fail", l.msg);
+      t(), e ? e().then((c) => {
+        _t.tis.complete(n).then((u) => {
+          u.code == Wt.success ? (c && c(), this.$emit("success")) : this.$emit("fail", u.msg);
         }).catch(() => {
           this.$emit("fail", "");
         });
       }).catch(() => {
         this.$emit("fail", "");
-      }) : _t.tis.complete(n).then((r) => {
-        r.code == Wt.success ? this.$emit("success") : this.$emit("fail", r.msg);
-      }).catch((r) => {
-        this.$emit("fail", r.response ? r.response.data ? r.response.data.msg || r.response.data.message : "" : r.message || r.msg || "");
+      }) : _t.tis.complete(n).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 || "");
       });
     },
     confirmWithSign() {
@@ -4154,7 +4155,7 @@ function aR(e, t, o, n, r, l) {
           ref: l.setItemRef(h.id)
         }, null, 8, ["personType", "personEntity", "processNode"]))), 128)) : o.param.nextTaskNode.nodeType == "exclusiveGateway" && o.param.nextTaskNode.branches && o.param.nextTaskNode.branches.length == 1 ? (x(), L(we, { key: 3 }, [
           o.param.nextTaskNode.nodeType != "endEvent" ? (x(), L(we, { key: 0 }, [
-            o.param.nextTaskNode.branches[0].nodeInfoDTO ? (x(), ne(d, {
+            o.param.nextTaskNode.branches[0].nodeInfoDTO && o.param.nextTaskNode.branches[0].nodeInfoDTO.nodeType != "endEvent" ? (x(), ne(d, {
               key: o.param.nextTaskNode.branches[0].nodeInfoDTO.id,
               personType: o.param.nextTaskNode.branches[0].nodeInfoDTO.personType || "",
               personEntity: {},
@@ -4165,7 +4166,7 @@ function aR(e, t, o, n, r, l) {
               lv1label: "\u4E0B\u4E00\u8282\u70B9\u540D\u79F0",
               ref: l.setItemRef(o.param.nextTaskNode.branches[0].nodeInfoDTO.id),
               rules: [{ required: !0, message: "\u8BF7\u9009\u62E9\u5904\u7406\u4EBA" }]
-            }, null, 8, ["personType", "process-node"])) : (x(), ne(d, {
+            }, null, 8, ["personType", "process-node"])) : !o.param.nextTaskNode.branches[0].nodeInfoDTO && o.param.nextTaskNode.branches[0].nodeType != "endEvent" ? (x(), ne(d, {
               key: o.param.nextTaskNode.branches[0].id,
               personType: o.param.nextTaskNode.branches[0].personType || "",
               personEntity: {},
@@ -4176,16 +4177,25 @@ function aR(e, t, o, n, r, l) {
               lv1label: "\u4E0B\u4E00\u8282\u70B9\u540D\u79F0",
               ref: l.setItemRef(o.param.nextTaskNode.branches[0].id),
               rules: [{ required: !0, message: "\u8BF7\u9009\u62E9\u5904\u7406\u4EBA" }]
-            }, null, 8, ["personType", "process-node"]))
+            }, null, 8, ["personType", "process-node"])) : (x(), ne(c, {
+              key: 2,
+              label: "\u4E0B\u4E00\u8282\u70B9\u540D\u79F0"
+            }, {
+              default: U(() => t[11] || (t[11] = [
+                j("b", { style: { "font-size": "16px" } }, "\u7ED3\u675F\u4E8B\u4EF6", -1)
+              ])),
+              _: 1,
+              __: [11]
+            }))
           ], 64)) : (x(), ne(c, {
             key: 1,
             label: "\u4E0B\u4E00\u8282\u70B9\u540D\u79F0"
           }, {
-            default: U(() => t[11] || (t[11] = [
+            default: U(() => t[12] || (t[12] = [
               j("b", { style: { "font-size": "16px" } }, "\u7ED3\u675F\u4E8B\u4EF6", -1)
             ])),
             _: 1,
-            __: [11]
+            __: [12]
           }))
         ], 64)) : o.param.nextTaskNode.nodeType == "exclusiveGateway" && o.param.nextTaskNode.branches && o.param.nextTaskNode.branches.length > 1 ? (x(), L(we, { key: 4 }, [
           o.param.nextTaskNode.nodeType != "endEvent" ? (x(), ne(d, {
@@ -4203,11 +4213,11 @@ function aR(e, t, o, n, r, l) {
             key: 1,
             label: "\u4E0B\u4E00\u8282\u70B9\u540D\u79F0"
           }, {
-            default: U(() => t[12] || (t[12] = [
+            default: U(() => t[13] || (t[13] = [
               j("b", { style: { "font-size": "16px" } }, "\u7ED3\u675F\u4E8B\u4EF6", -1)
             ])),
             _: 1,
-            __: [12]
+            __: [13]
           }))
         ], 64)) : o.param.nextTaskNode.nodeType == "parallelGateway" ? (x(!0), L(we, { key: 5 }, Ge(o.param.nextTaskNode.branches, (h) => (x(), ne(d, {
           key: h.id,
@@ -4250,7 +4260,7 @@ function aR(e, t, o, n, r, l) {
     _: 3
   });
 }
-const gh = /* @__PURE__ */ Ro(nR, [["render", aR], ["__scopeId", "data-v-2f5eddf9"]]);
+const gh = /* @__PURE__ */ Ro(nR, [["render", aR], ["__scopeId", "data-v-3aa970bc"]]);
 var $1 = null;
 Promise.resolve().then(() => kr).then(({ ElMessage: e }) => {
   $1 = e;
@@ -58705,10 +58715,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;
@@ -59548,7 +59558,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) => {