ddy-process-pc-vue3 1.0.1-rc.3.3 → 1.0.1-rc.3.33

package/package.json

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

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

@@ -16,7 +16,7 @@ function iR(e, i) {
   }
   return Object.freeze(Object.defineProperty(e, Symbol.toStringTag, { value: "Module" }));
 }
-const nR = "ddy-process-pc-vue3", rR = "1.0.1-rc.3.3", aR = "> pc\u7AEF\u6D41\u7A0B\u7EC4\u4EF6", oR = "./ddy-process-pc-vue3.umd.cjs", sR = "./style.css", lR = "module", cR = {
+const nR = "ddy-process-pc-vue3", rR = "1.0.1-rc.3.33", aR = "> pc\u7AEF\u6D41\u7A0B\u7EC4\u4EF6", oR = "./ddy-process-pc-vue3.umd.cjs", sR = "./style.css", lR = "module", cR = {
   ".": {
     import: "./ddy-process-pc-vue3.js",
     require: "./ddy-process-pc-vue3.umd.cjs"
@@ -161,7 +161,7 @@ const ai = "/aws", pi = "/bladex/blade-workflow", FD = "/auth", et = {
       return Ze(i);
     },
     addMultiInstance(e) {
-      let i = { url: pi + "/tis/addMultiInstance", param: e, type: "post" };
+      let i = { url: pi + "/tis/addSignTask", param: e, type: "post" };
       return Ze(i);
     },
     reject(e, i) {
@@ -5549,10 +5549,10 @@ const WL = {
         return rb.warning("\u8BF7\u586B\u5199\u52A0\u7B7E\u539F\u56E0"), !1;
       if (this.reason.length > 200)
         return rb.warning("\u52A0\u7B7E\u539F\u56E0\u4E0D\u80FD\u8D85\u8FC7200\u4E2A\u5B57"), !1;
-      let r = this.targetUser.join(",") || "";
+      let r = this.targetUser || [];
       e && e(), i(), et.tis.addMultiInstance({
         taskId: this.param.taskInstId,
-        assignee: r,
+        signPersoneds: r,
         comment: this.reason
       }).then((a) => {
         a.code == wt.success ? this.$emit("success") : this.$emit("fail", a.msg);
@@ -5566,7 +5566,7 @@ var GL = /* @__PURE__ */ Di(
   VL,
   !1,
   JL,
-  "72ff885e",
+  "79bc4843",
   null,
   null
 );
@@ -6533,7 +6533,7 @@ var vQ = function() {
         return e.$refs.commIdea.addIdea(e.commentMsg);
       }
     }
-  }, [e._v("\u8BBE\u7F6E\u4E3A\u5E38\u7528\u610F\u89C1")])]) : e._e()], 1)] : e._e(), e._t("file"), e.param.nodeLoading ? [r("el-form-item", {
+  }, [e._v("\u8BBE\u7F6E\u4E3A\u5E38\u7528\u610F\u89C1")])]) : e._e()], 1)] : e._e(), e._t("file"), e.param.nodeLoading && !e.param.ProcessInsObj.taskParentId ? [r("el-form-item", {
     attrs: {
       label: "\u4E0B\u4E00\u8282\u70B9",
       size: "normal"
@@ -6542,7 +6542,7 @@ var vQ = function() {
     staticStyle: {
       "font-size": "16px"
     }
-  }, [e._v("\u8282\u70B9\u52A0\u8F7D\u4E2D\uFF0C\u8BF7\u7A0D\u540E......")])])] : [e.param.nextTaskNode && e.param.nextTaskNode.id && e.param.nextTaskNode.nodeType != "parallelGateway" && e.param.nextTaskNode.nodeType != "exclusiveGateway" ? [e.param.nextTaskNode.nodeType != "endEvent" ? [r("userTask", {
+  }, [e._v("\u8282\u70B9\u52A0\u8F7D\u4E2D\uFF0C\u8BF7\u7A0D\u540E......")])])] : e.param.ProcessInsObj.taskParentId ? e._e() : [e.param.nextTaskNode && e.param.nextTaskNode.id && e.param.nextTaskNode.nodeType != "parallelGateway" && e.param.nextTaskNode.nodeType != "exclusiveGateway" ? [e.param.nextTaskNode.nodeType != "endEvent" ? [r("userTask", {
     key: e.param.nextTaskNode.id,
     ref: e.setItemRef(e.param.nextTaskNode.id),
     attrs: {
@@ -6908,7 +6908,7 @@ var yQ = /* @__PURE__ */ Di(
   bQ,
   !1,
   xQ,
-  "6a329a02",
+  "10621162",
   null,
   null
 );
@@ -11775,12 +11775,16 @@ var z7 = function() {
       attrs: {
         shadow: "never"
       }
-    }, [r("p", [e._v(" " + e._s(a.assigneeName) + " \u5728 [" + e._s(a.createTime) + "] \u5F00\u59CB\u5904\u7406 [" + e._s(a.historyActivityType == "endEvent" ? "\u7ED3\u675F" : a.historyActivityName || "\u672A\u547D\u540D") + "] \u73AF\u8282 ")]), a.historyActivityDurationTime ? r("p", [e._v(" \u4EFB\u52A1\u5386\u65F6 [" + e._s(a.historyActivityDurationTime) + "] ")]) : e._e(), a.comments && a.comments.length > 0 ? [e._l(a.comments.filter(function(c) {
+    }, [r("p", [r("span", {
+      staticClass: "flow-name"
+    }, [e._v(e._s(a.assigneeName))]), e._v(" \u5728 [" + e._s(a.createTime) + "] \u5F00\u59CB\u5904\u7406 "), r("span", {
+      staticClass: "flow-node"
+    }, [e._v("[" + e._s(a.historyActivityType == "endEvent" ? "\u7ED3\u675F" : a.historyActivityName || "\u672A\u547D\u540D") + "]")]), e._v(" \u73AF\u8282 ")]), a.historyActivityDurationTime ? r("p", [e._v(" \u4EFB\u52A1\u5386\u65F6 [" + e._s(a.historyActivityDurationTime) + "] ")]) : e._e(), a.comments && a.comments.length > 0 ? [e._l(a.comments.filter(function(c) {
       return c.action === "AddComment";
     }), function(c, p) {
       return r("p", {
         key: p
-      }, [p < 1 ? [e.commentMap[c.type] ? r("span", [e._v(" " + e._s(e.commentMap[c.type]) + ": [" + e._s(c.fullMessage) + "] ")]) : e._e(), a.comments.filter(function(m) {
+      }, [p < 1 ? [e.commentMap[c.type] ? r("span", [e._v(" " + e._s(e.commentMap[c.type]) + ": [" + e._s(c.fullMessage) + "] ")]) : c.fullMessage ? r("span", [e._v(" " + e._s(c.type) + ": [" + e._s(c.fullMessage) + "] ")]) : e._e(), a.comments.filter(function(m) {
         return m.action === "AddComment";
       }).length > 1 ? r("span", {
         staticStyle: {
@@ -11792,12 +11796,12 @@ var z7 = function() {
         }
       }, [e._v(" " + e._s(e.toggleText) + " "), r("i", {
         class: [e.isFlag ? "el-icon-arrow-up" : "el-icon-arrow-down"]
-      }), r("el-icon", [e.isFlag ? r("el-icon-arrow-up") : r("el-icon-arrow-down")], 1)], 1) : e._e(), c.time ? r("p", {
+      }), r("el-icon", [e.isFlag ? r("el-icon-arrow-up") : r("el-icon-arrow-down")], 1)], 1) : e._e(), c.time && e.isFlag ? r("p", {
         staticStyle: {
           color: "gray",
           "font-size": "12px"
         }
-      }, [e._v(e._s(c.time))]) : e._e()] : e._e(), p > 0 && e.isFlag ? [e.commentMap[c.type] ? r("span", [e._v(" " + e._s(e.commentMap[c.type]) + ": [" + e._s(c.fullMessage) + "] ")]) : e._e(), c.time ? r("p", {
+      }, [e._v(e._s(c.time))]) : e._e()] : e._e(), p > 0 && e.isFlag ? [e.commentMap[c.type] ? r("span", [e._v(" " + e._s(e.commentMap[c.type]) + ": [" + e._s(c.fullMessage) + "] ")]) : c.fullMessage ? r("span", [e._v(" " + e._s(c.type) + ": [" + e._s(c.fullMessage) + "] ")]) : e._e(), c.time ? r("p", {
         staticStyle: {
           color: "gray",
           "font-size": "12px"
@@ -11898,7 +11902,7 @@ var U7 = /* @__PURE__ */ Di(
   $7,
   !1,
   Y7,
-  null,
+  "c5f2f37a",
   null,
   null
 );
@@ -22686,7 +22690,7 @@ function RW(e) {
         "YYYY-MM-DD HH:mm"
       )}</span><br>`), m && m.length > 0) {
         let E, { type: T, fullMessage: _ } = m.find((C) => C.action == "AddComment") || {};
-        T == "assigneeComment" && (E = "\u53D8\u66F4\u5BA1\u6838\u4EBA\uFF1A" + _, g.class = "nodeWarn"), T == "dispatchComment" && (E = "\u8C03\u5EA6\uFF1A" + _, g.class = "nodeWarn"), T == "transferComment" && (E = "\u8F6C\u529E\uFF1A" + _, g.class = "nodeWarn"), T == "delegateComment" && (E = "\u59D4\u6258\uFF1A" + _, g.class = "nodeWarn"), T == "rollbackComment" && (E = "\u6307\u5B9A\u56DE\u9000\uFF1A" + _, g.class = "nodeError"), T == "terminateComment" && (E = "\u7EC8\u6B62\uFF1A" + _, g.class = "nodeError"), T == "addMultiInstanceComment" && (E = "\u52A0\u7B7E\uFF1A" + _, g.class = "nodeWarn"), T == "deleteMultiInstanceComment" && (E = "\u51CF\u7B7E\uFF1A" + _, g.class = "nodeError"), T == "withdrawComment" && (E = "\u64A4\u9500\uFF1A" + _, g.class = "nodeWarn"), T == "deleteProcessComment" && (E = "\u5220\u9664\u6D41\u7A0B\uFF1A" + _, g.class = "nodeError"), T == "cancelProcessComment" && (E = "\u62D2\u7EDD\uFF1A" + _, g.class = "nodeError"), T == "comment" && (E = "\u5BA1\u6279\uFF1A" + _, g.class = "nodeSuccess"), E && (y += `<span title='${E}'>${E}</span>`);
+        T == "assigneeComment" && (E = "\u53D8\u66F4\u5BA1\u6838\u4EBA\uFF1A" + _, g.class = "nodeWarn"), T == "dispatchComment" && (E = "\u8C03\u5EA6\uFF1A" + _, g.class = "nodeWarn"), T == "transferComment" && (E = "\u8F6C\u529E\uFF1A" + _, g.class = "nodeWarn"), T == "delegateComment" && (E = "\u59D4\u6258\uFF1A" + _, g.class = "nodeWarn"), T == "rollbackComment" && (E = "\u6307\u5B9A\u56DE\u9000\uFF1A" + _, g.class = "nodeError"), T == "terminateComment" && (E = "\u7EC8\u6B62\uFF1A" + _, g.class = "nodeError"), (T == "addMultiInstanceComment" || (T || "").includes("\u52A0\u7B7E")) && (E = "\u52A0\u7B7E\uFF1A" + _, g.class = "nodeWarn"), T == "deleteMultiInstanceComment" && (E = "\u51CF\u7B7E\uFF1A" + _, g.class = "nodeError"), T == "withdrawComment" && (E = "\u64A4\u9500\uFF1A" + _, g.class = "nodeWarn"), T == "deleteProcessComment" && (E = "\u5220\u9664\u6D41\u7A0B\uFF1A" + _, g.class = "nodeError"), T == "cancelProcessComment" && (E = "\u62D2\u7EDD\uFF1A" + _, g.class = "nodeError"), T == "comment" && (E = "\u5BA1\u6279\uFF1A" + _, g.class = "nodeSuccess"), E && (y += `<span title='${E}'>${E}</span>`);
       }
       g.tooltip = y;
     }
@@ -22830,7 +22834,7 @@ var zW = /* @__PURE__ */ Di(
   LW,
   !1,
   $W,
-  "ee16a17a",
+  "55039cbe",
   null,
   null
 );
@@ -22958,7 +22962,7 @@ var HW = function() {
     style: {
       width: e.mainWidth + "px"
     }
-  }, [(e.processData.process.status == "todo" || e.customBtns.length > 0) && e.absoluteBtns.outside.length > 0 ? [e.absoluteBtns.inside.length > 0 ? r("el-dropdown", {
+  }, [(e.processData.process.isReturnable || e.processData.process.status == "todo" || e.customBtns.length > 0) && e.absoluteBtns.outside.length > 0 ? [e.absoluteBtns.inside.length > 0 ? r("el-dropdown", {
     attrs: {
       placement: "top-start",
       trigger: "click"
@@ -23534,11 +23538,12 @@ const YW = {
   },
   methods: {
     formatFlow(e) {
-      return (e || []).map((r) => ({
+      let i = (e || []).map((r) => ({
         ...r,
         attachmentsFujian: (r.attachments || []).filter((a) => a.type != "signature"),
         attachmentsQianzi: (r.attachments || []).filter((a) => a.type == "signature")
       }));
+      return i = i.reverse(), i;
     },
     cancelHandlerFn() {
       this.dialogVisibleOperation = !1, this.submitLoading = !1;
@@ -23584,7 +23589,7 @@ const YW = {
           const i = ((this.processData.process || {}).variables || {}).deptId;
           this.deptId = i;
           const r = (this.processData.process || {}).taskId;
-          this.taskObj.buttons = this.processData.button, this.absoluteTaskId = r, this.straightenBtns(), this.$nextTick(() => {
+          this.taskObj.buttons = this.processData.button, this.absoluteTaskId = r, this.ProcessInsObj = this.processData.process, this.straightenBtns(), this.$nextTick(() => {
             this.calculateHeight();
           }), this.processData.flow, this.flowChartVisible = !0, this.submitLoading = !1, this.boxLoading = !1;
         }
@@ -23714,6 +23719,8 @@ const YW = {
       });
     },
     async getNextNode(e) {
+      if (this.ProcessInsObj && this.ProcessInsObj.taskParentId)
+        return !0;
       let i;
       try {
         i = await et.tis.simulation(
@@ -23727,6 +23734,9 @@ const YW = {
       i.code == 200 && !i.data.evaluation && (this.incomingConditionItemList = [], r.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 = [], r.branches = await this.getOutgoingProcessNode(
+        this.absoluteTaskId,
+        i.data.branches[0].id
       )), r = await this.getSelectFixData(r, e), this.nextTaskNode = r;
     },
     async getNodeUser({ deptId: e, intersection: i, userIds: r, postIds: a, deptIds: s }) {
@@ -23871,7 +23881,7 @@ const YW = {
       const i = this.processData.process;
       if (!i)
         return e;
-      if (i.status == "todo" && i.isMultiInstance && this.getButton("wf_add_instance")) {
+      if (i.status == "todo" && this.getButton("wf_add_instance")) {
         let a = {};
         a.name = this.getButton("wf_add_instance").name, a.btnProps = { type: "primary" }, a.key = "sign", a.click = () => {
           this.handleUserSelect({
@@ -23913,7 +23923,7 @@ const YW = {
           this.handleCirculate(this.getButton("wf_cctask").name);
         }, e.push(a);
       }
-      if (i.pass == !1 && i.isOwner) {
+      if (i.isReturnable && i.isOwner) {
         let a = {};
         a.name = "\u50AC\u529E", a.key = "self", a.click = () => {
           this.handleReminders();
@@ -24031,7 +24041,7 @@ var VW = /* @__PURE__ */ Di(
   UW,
   !1,
   WW,
-  "47fc9541",
+  "73b198a4",
   null,
   null
 );