ddy-process-pc-vue3 1.0.1-rc.3.130 → 1.0.1-rc.3.159

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ddy-process-pc-vue3",
-  "version": "1.0.1-rc.3.130",
+  "version": "1.0.1-rc.3.159",
   "description": "> pc端流程组件",
   "main": "./ddy-process-pc-vue3.umd.cjs",
   "style": "./style.css",

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

@@ -16,7 +16,7 @@ function oN(e, i) {
   }
   return Object.freeze(Object.defineProperty(e, Symbol.toStringTag, { value: "Module" }));
 }
-const sN = "ddy-process-pc-vue3", lN = "1.0.1-rc.3.130", cN = "> pc\u7AEF\u6D41\u7A0B\u7EC4\u4EF6", uN = "./ddy-process-pc-vue3.umd.cjs", dN = "./style.css", fN = "module", pN = {
+const sN = "ddy-process-pc-vue3", lN = "1.0.1-rc.3.159", cN = "> pc\u7AEF\u6D41\u7A0B\u7EC4\u4EF6", uN = "./ddy-process-pc-vue3.umd.cjs", dN = "./style.css", fN = "module", pN = {
   ".": {
     import: "./ddy-process-pc-vue3.js",
     require: "./ddy-process-pc-vue3.umd.cjs"
@@ -6043,7 +6043,9 @@ var uR = function() {
       label: e.label || "\u5904\u7406\u4EBA",
       rules: e.rules || {}
     }
-  }, [e.processNodeObj.userList && e.processNodeObj.userList.length >= 2 ? n("el-select", {
+  }, [e.processNodeObj.flowName ? n("div", {
+    staticClass: "setVal"
+  }, [e._v(" " + e._s(e.processNodeObj.flowName) + " ")]) : e.processNodeObj.userList && e.processNodeObj.userList.length >= 2 ? n("el-select", {
     attrs: {
       filterable: "",
       multiple: e.processNodeObj.loopCardinality == -1,
@@ -6234,6 +6236,8 @@ const fR = {
         else if (!this.processNodeObj.assignee || !Array.isArray(this.processNodeObj.assignee) || !this.processNodeObj.setPersonnel || this.isOption(this.processNodeObj.humanPerformerName) || this.processNodeObj.nodeInfoDTO && (!this.processNodeObj.nodeInfoDTO.assignee || !Array.isArray(this.processNodeObj.nodeInfoDTO.assignee) || !this.processNodeObj.nodeInfoDTO.setPersonnel || this.isOption(this.processNodeObj.nodeInfoDTO.humanPerformerName))) {
           if (this.targetUserId && this.targetUserId.length > 0)
             i.multiNodeParticipant = {}, i.multiNodeParticipant[this.processNode.nodeInfoDTO ? this.processNodeObj.nodeInfoDTO.id : this.processNodeObj.id] = Array.isArray(this.targetUserId) ? this.targetUserId : [this.targetUserId];
+          else if (this.processNodeObj.flowName)
+            i.multiNodeParticipant || (i.multiNodeParticipant = {}), i.multiNodeParticipant[this.processNodeObj.id] = this.processNodeObj.flowIds || [];
           else if (this.processNodeObj.REQUIRED !== !1 || this.processNodeObj.nodeInfoDTO && this.processNodeObj.nodeInfoDTO.REQUIRED !== !1)
             return this.processNodeObj.nodeInfoDTO ? this.processNodeObj.nodeInfoDTO.name && al.warning(`\u8BF7\u9009\u62E9 ${this.processNodeObj.nodeInfoDTO.name} \u5904\u7406\u4EBA`) : this.processNodeObj.name && al.warning(`\u8BF7\u9009\u62E9 ${this.processNodeObj.name} \u5904\u7406\u4EBA`), !1;
         } else
@@ -11876,7 +11880,7 @@ function V$(e) {
     }
     a.historyActivityType == "sequenceFlow" ? g.class = "lineWarn" : !g.class && a.historyActivityType != "candidate" && (g.class = "nodeSuccess");
     const B = n.findIndex((w) => w.id == a.historyActivityId);
-    B != -1 ? n.splice(B, 1, g) : n.push(g);
+    B != -1 ? n.splice(B, 1, g) : a.createTime && n.push(g);
   }), n;
 }
 function k2(e) {
@@ -23702,7 +23706,13 @@ var rG = function() {
       prop: "assigneeName",
       label: "\u5BA1\u6279\u4EBA",
       "min-width": "80"
-    }
+    },
+    scopedSlots: e._u([{
+      key: "default",
+      fn: function(a) {
+        return [e._v(" " + e._s(a.row.createTime ? a.row.assigneeName : "") + " ")];
+      }
+    }])
   })], 1)], 1)], 1)], 2);
 }, aG = [];
 const oG = {
@@ -24191,6 +24201,53 @@ const oG = {
         }
       });
     },
+    getItemV(e) {
+      let i = e;
+      if (i.nodeType == "userTask") {
+        const n = (i.routeTxt || []).find((a) => a.type == "custom");
+        if (n) {
+          let a = "", s = [];
+          (n.ids || []).includes("currentUser") ? (a = localStorage.getItem("realName") || n.name, s = [localStorage.getItem("userId")]) : (n.ids || []).includes("applyUser") && (a = this.ProcessInsObj.variables.applyUserName || n.name, s = [this.ProcessInsObj.variables.applyUserId]), i = {
+            ...i,
+            flowType: "custom",
+            flowName: a,
+            flowIds: s
+          };
+        } else
+          i = {
+            ...i,
+            flowType: "",
+            flowName: "",
+            flowIds: ""
+          };
+      } else
+        i.branches = (i.branches || []).map((n) => {
+          let a = n.nodeInfoDTO ? n.nodeInfoDTO : n;
+          const s = (a.routeTxt || []).find((c) => c.type == "custom");
+          if (s) {
+            let c = "", p = [];
+            (s.ids || []).includes("currentUser") ? (c = localStorage.getItem("realName") || s.name, p = [localStorage.getItem("userId")]) : (s.ids || []).includes("applyUser") && (c = this.ProcessInsObj.variables.applyUserName || s.name, p = [this.ProcessInsObj.variables.applyUserId]), a = {
+              ...a,
+              flowType: "custom",
+              flowName: c,
+              flowIds: p
+            };
+          } else
+            a = {
+              ...a,
+              flowType: "",
+              flowName: "",
+              flowIds: ""
+            };
+          return n.nodeInfoDTO ? {
+            ...n,
+            nodeInfoDTO: a
+          } : {
+            ...n
+          };
+        });
+      return i;
+    },
     async getNextNode(e) {
       if (this.ProcessInsObj && this.ProcessInsObj.taskParentId)
         return !0;
@@ -24200,11 +24257,11 @@ const oG = {
           this.absoluteTaskId,
           this.processId
         );
-      } catch (a) {
-        console.error(a), i = {};
+      } catch (s) {
+        console.error(s), i = {};
       }
       let n = i.data || {};
-      i.code == 200 && !i.data.evaluation && (this.incomingConditionItemList = [], n.branches = await this.getOutgoingProcessNode(
+      (n.nodeInfoDTO ? n.nodeInfoDTO : n).nodeType == "userTask" && (n = this.getItemV(n)), i.code == 200 && !i.data.evaluation && (this.incomingConditionItemList = [], n.branches = await this.getOutgoingProcessNode(
         this.absoluteTaskId,
         i.data.id
       )), i.code == 200 && i.data.evaluation && i.data.branches && i.data.branches.length > 0 && i.data.branches[0].nodeType != "userTask" && (this.incomingConditionItemList = [], n.branches = await this.getOutgoingProcessNode(
@@ -24298,7 +24355,7 @@ const oG = {
         if (n.data) {
           for (let a = 0; a < n.data.length; a++) {
             let s = n.data[a];
-            s.incomingConditionItemList && s.incomingConditionItemList.length !== 0 && (s.nodeInfoDTO.incomingConditionItemList = s.incomingConditionItemList, s.incomingConditionItemList, this.incomingConditionItemList.push(...s.incomingConditionItemList)), s.nodeInfoDTO.nodeType != "userTask" && (s.nodeInfoDTO.branches = await this.getOutgoingProcessNode(e, s.nodeInfoDTO.id)), n.data[a].type != "endEvent" && (n.data[a].humanPerformerName == "\u56FA\u5B9A\u8D26\u6237" || n.data[a].humanPerformerName == "\u4E0E\u6D41\u7A0B\u7533\u8BF7\u4EBA\u76F8\u5173") && await et.repository.getParticipantsOfPerformerNames(e, [n.data[a].id]).then((c) => {
+            s.incomingConditionItemList && s.incomingConditionItemList.length !== 0 && (s.nodeInfoDTO.incomingConditionItemList = s.incomingConditionItemList, s.incomingConditionItemList, this.incomingConditionItemList.push(...s.incomingConditionItemList)), s.nodeInfoDTO.nodeType != "userTask" ? s.nodeInfoDTO.branches = await this.getOutgoingProcessNode(e, s.nodeInfoDTO.id) : s.nodeInfoDTO && (s.nodeInfoDTO = this.getItemV(s.nodeInfoDTO)), n.data[a].type != "endEvent" && (n.data[a].humanPerformerName == "\u56FA\u5B9A\u8D26\u6237" || n.data[a].humanPerformerName == "\u4E0E\u6D41\u7A0B\u7533\u8BF7\u4EBA\u76F8\u5173") && await et.repository.getParticipantsOfPerformerNames(e, [n.data[a].id]).then((c) => {
               n.data[a].routeTxt.userNames = c.data[n.data[a].id];
             });
           }
@@ -24514,7 +24571,7 @@ var sG = /* @__PURE__ */ li(
   aG,
   !1,
   lG,
-  "7448d8a2",
+  "cc812b62",
   null,
   null
 );
@@ -25163,10 +25220,25 @@ const bG = {
         processBudgetModelList: []
       });
     },
+    getListV(e) {
+      return (e || []).map((i) => {
+        const n = (i.routeTxt || []).find((a) => a.type == "custom");
+        if (n) {
+          let a = "", s = [];
+          return (n.ids || []).includes("currentUser") ? (a = localStorage.getItem("realName") || n.name, s = [localStorage.getItem("userId")]) : (n.ids || []).includes("applyUser") && (a = localStorage.getItem("realName") || n.name, s = [localStorage.getItem("userId")]), {
+            ...i,
+            flowType: "custom",
+            flowName: a,
+            flowIds: s
+          };
+        }
+        return i;
+      });
+    },
     processDefChange(e) {
       this.processDefId = e, et.repository.getFirstProcessNode(this.processDefId).then(async (i) => {
         if (i.code == wt.success) {
-          if (this.processList = i.data, this.flag = !0, await this.getNodeUserDept(), !this.deptId)
+          if (this.processList = this.getListV(i.data), this.flag = !0, await this.getNodeUserDept(), !this.deptId)
             return;
           this.getUserDataByDeptId();
         }
@@ -25246,7 +25318,7 @@ const bG = {
       }), new Promise((a, s) => {
         this.cancelCallBack = s, et.repository.getFirstProcessNode(e).then(async (c) => {
           if (c.code == wt.success) {
-            if (this.processList = c.data, this.flag = !0, await this.getNodeUserDept(), !this.deptId)
+            if (this.processList = this.getListV(c.data), this.flag = !0, await this.getNodeUserDept(), !this.deptId)
               return;
             this.getUserDataByDeptId(), this.callback = a;
           }
@@ -25266,7 +25338,7 @@ const bG = {
         this.cancelCallBack = n, et.repository.getProcessDefListNew(e).then((a) => {
           a.code == wt.success && (a.data.length == 1 ? (this.processDefList = a.data, this.processDefId = a.data[0].id, this.processDefName = a.data[0].name, et.repository.getFirstProcessNode(this.processDefId).then(async (s) => {
             if (s.code == wt.success) {
-              if (this.processList = s.data, this.flag = !0, this.callback = i, await this.getNodeUserDept(), !this.deptId)
+              if (this.processList = this.getListV(s.data), this.flag = !0, this.callback = i, await this.getNodeUserDept(), !this.deptId)
                 return;
               this.getUserDataByDeptId();
             }
@@ -25316,7 +25388,7 @@ const bG = {
     listShow(e) {
       return this.processList = [], this.otherProcessList = [], this.processDefId = "", this.processDefName = "", this.revival = !1, new Promise((i, n) => {
         e.length == 1 ? (this.processDefId = e[0].id, this.processDefName = e[0].name, this.cancelCallBack = n, et.repository.getFirstProcessNode(this.processDefId).then((a) => {
-          a.code == wt.success && (this.processList = a.data, this.flag = !0, this.callback = i, et.repository.getAfferentParticipantNodeList(this.processDefId).then((s) => {
+          a.code == wt.success && (this.processList = this.getListV(a.data), this.flag = !0, this.callback = i, et.repository.getAfferentParticipantNodeList(this.processDefId).then((s) => {
             this.otherProcessList = s.data.filter((c) => c.id != this.processList[0].id), this.otherProcessList.map((c) => {
               c.REQUIRED = !1;
             });
@@ -25378,7 +25450,7 @@ var _G = /* @__PURE__ */ li(
   vG,
   !1,
   yG,
-  "b3f62330",
+  "20ef8f3f",
   null,
   null
 );