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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ddy-process-pc-vue3",
-  "version": "1.0.1-rc.3.109",
+  "version": "1.0.1-rc.3.130",
   "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.109", 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.130", 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"
@@ -5854,7 +5854,28 @@ var uR = function() {
   var e = this, i = e.$createElement, n = e._self._c || i;
   return n("div", {
     staticClass: "user-task"
-  }, [e.processNodeObj.nodeType == "exclusiveGateway" && e.processNodeObj.branches && e.processNodeObj.branches.length >= 1 ? [e.processNodeObj.branches.length > 1 ? n("el-form-item", {
+  }, [e.processNodeObj.type == "endEvent" ? [n("el-form-item", {
+    staticStyle: {
+      "margin-bottom": "10px"
+    },
+    attrs: {
+      label: e.lv1label || "\u8282\u70B9\u540D\u79F0"
+    },
+    scopedSlots: e._u([{
+      key: "label",
+      fn: function(a) {
+        return a.label, [n("div", {
+          staticStyle: {
+            "font-size": "16px"
+          }
+        }, [e._v(e._s(e.lv1label || "\u8282\u70B9\u540D\u79F0"))])];
+      }
+    }], null, !1, 51654731)
+  }, [n("b", {
+    staticStyle: {
+      "font-size": "16px"
+    }
+  }, [e._v(e._s(e.processNodeObj.name))])])] : e.processNodeObj.nodeType == "exclusiveGateway" && e.processNodeObj.branches && e.processNodeObj.branches.length >= 1 ? [e.processNodeObj.branches.length > 1 ? n("el-form-item", {
     attrs: {
       label: e.processNodeObj.name || "\u4E0B\u4E00\u8282\u70B9"
     }
@@ -6128,7 +6149,7 @@ const fR = {
   watch: {
     processNode: {
       handler(e, i) {
-        e.nodeType == "userTask" && e.setPersonnel && e.assignees && e.assignees.length > 0 && (this.targetUserId = e.assignees.map((n) => n.id)), e.userList && e.userList.length == 1 && (this.targetUserId = e.userList[0].userId), this.processNodeObj = e || {};
+        e.nodeType == "userTask" && e.setPersonnel && e.assignees && e.assignees.length > 0 && (this.targetUserId = e.assignees.map((n) => n.id)), e.userList && e.userList.length == 1 && (this.targetUserId = e.userList[0].userId), this.processNodeObj = e || {}, this.processNodeObj.type == "endEvent" && this.$emit("complete", this.processNodeObj);
       },
       deep: !0,
       immediate: !0
@@ -6558,6 +6579,9 @@ var xR = function() {
         required: !0,
         message: "\u8BF7\u9009\u62E9\u5904\u7406\u4EBA"
       }]
+    },
+    on: {
+      complete: e.complete
     }
   })] : [n("el-form-item", {
     attrs: {
@@ -6579,6 +6603,9 @@ var xR = function() {
           pType: e.param.nextTaskNode.nodeType,
           REQUIRED: !(a.setPersonnel == !0 && a.assignees && a.assignees.length > 0)
         })
+      },
+      on: {
+        complete: e.complete
       }
     });
   }) : e.param.outGatewayUserTaskModel && e.param.outGatewayUserTaskModel.length > 0 ? e._l(e.param.outGatewayUserTaskModel, function(a) {
@@ -6592,6 +6619,9 @@ var xR = function() {
         processNode: Object.assign({}, a, {
           REQUIRED: !(a.setPersonnel == !0 && a.assignees && a.assignees.length > 0)
         })
+      },
+      on: {
+        complete: e.complete
       }
     });
   }) : e.param.nextTaskNode.nodeType == "exclusiveGateway" && e.param.nextTaskNode.branches && e.param.nextTaskNode.branches.length == 1 ? [e.param.nextTaskNode.nodeType != "endEvent" ? [e.param.nextTaskNode.branches[0].nodeInfoDTO && e.param.nextTaskNode.branches[0].nodeInfoDTO.nodeType != "endEvent" ? n("userTask", {
@@ -6608,6 +6638,9 @@ var xR = function() {
         required: !0,
         message: "\u8BF7\u9009\u62E9\u5904\u7406\u4EBA"
       }]
+    },
+    on: {
+      complete: e.complete
     }
   }) : !e.param.nextTaskNode.branches[0].nodeInfoDTO && e.param.nextTaskNode.branches[0].nodeType != "endEvent" ? n("userTask", {
     key: e.param.nextTaskNode.branches[0].id,
@@ -6623,6 +6656,9 @@ var xR = function() {
         required: !0,
         message: "\u8BF7\u9009\u62E9\u5904\u7406\u4EBA"
       }]
+    },
+    on: {
+      complete: e.complete
     }
   }) : [n("el-form-item", {
     attrs: {
@@ -6654,6 +6690,9 @@ var xR = function() {
         required: !0,
         message: "\u8BF7\u9009\u62E9\u5904\u7406\u4EBA"
       }]
+    },
+    on: {
+      complete: e.complete
     }
   })] : [n("el-form-item", {
     attrs: {
@@ -6679,6 +6718,9 @@ var xR = function() {
           required: !0,
           message: "\u8BF7\u9009\u62E9\u5904\u7406\u4EBA"
         }]
+      },
+      on: {
+        complete: e.complete
       }
     });
   }) : e._e()], e._t("form"), n("el-dialog", {
@@ -6724,6 +6766,7 @@ const ER = {
   },
   data() {
     return {
+      nextTaskObj: {},
       commentMsg: "",
       targetUser: [],
       userTaskListData: {},
@@ -6745,6 +6788,9 @@ const ER = {
     }
   },
   methods: {
+    complete(e) {
+      this.nextTaskObj = e;
+    },
     setItemRef(e) {
       return this.userTaskListData[e] = "userTask" + e, this.userTaskListData[e];
     },
@@ -6794,7 +6840,7 @@ const ER = {
           let w = B.getValue();
           if (w && w.vars && this.param.incomingConditionItemList && this.param.incomingConditionItemList.length > 0 && this.param.incomingConditionItemList.forEach((k) => {
             w.vars[k.itemName] || (w.vars[k.itemName] = "");
-          }), !w)
+          }), !w && this.nextTaskObj.type != "endEvent")
             return !1;
           let T = [];
           const _ = this.param.nextTaskNode;
@@ -6813,13 +6859,13 @@ const ER = {
               ...a.multiNodeParticipant,
               [this.param.nextTaskNode.branches[0].nodeInfoDTO.id]: this.param.nextTaskNode.branches[0].nodeInfoDTO.assignees.map((g) => g.id)
             };
-          else if (!Object.keys(a.multiNodeParticipant).length)
+          else if (!Object.keys(a.multiNodeParticipant).length && this.nextTaskObj.type != "endEvent")
             return Iu.warning("\u8BF7\u9009\u62E9\u4E0B\u4E00\u8282\u70B9"), !1;
         }
       }
       if (a.pass = !0, Date.now() && this.param, this.param.getVars) {
         let s = this.param.getVars();
-        if (s === !1)
+        if (s === !1 && this.nextTaskObj.type != "endEvent")
           return !1;
         a.vars = { ...a.vars, ...s };
       }
@@ -6859,7 +6905,7 @@ const ER = {
           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)
+          if (!g && this.nextTaskObj.type != "endEvent")
             return !1;
           e.multiNodeParticipant = {
             ...e.multiNodeParticipant,
@@ -6873,12 +6919,12 @@ const ER = {
               ...e.multiNodeParticipant,
               [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)
+          else if (!Object.keys(e.multiNodeParticipant).length && this.nextTaskObj.type != "endEvent")
             return Iu.warning("\u8BF7\u9009\u62E9\u4E0B\u4E00\u8282\u70B9"), !1;
         }
         if (this.param.getVars) {
           let c = this.param.getVars();
-          if (c === !1)
+          if (c === !1 && this.nextTaskObj.type != "endEvent")
             return !1;
           e.vars = { ...e.vars, ...c };
         }
@@ -6914,7 +6960,7 @@ var CR = /* @__PURE__ */ li(
   wR,
   !1,
   kR,
-  "0dd5ddd2",
+  "7f9f1489",
   null,
   null
 );