ddy-process-h5 1.0.1-rc.3.97 → 1.0.1-rc.3.99

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ddy-process-h5",
-  "version": "1.0.1-rc.3.97",
+  "version": "1.0.1-rc.3.99",
   "description": "> app端 流程插件",
   "main": "./ddy-process-h5.umd.cjs",
   "style": "./style.css",

package/v2/ddy-process-h5.js

@@ -17672,9 +17672,13 @@ var ox = function() {
         timestamp: s.endTime || s.createTime,
         placement: "top"
       }
-    }, [i("p", [i("span", {
+    }, [s.historyActivityType == "endEvent" ? i("p", [i("b", [e._v("\u6D41\u7A0B\u5DF2\u7ED3\u675F")])]) : s.historyActivityType == "startEvent" ? i("p", [i("span", {
       staticClass: "flow-name"
-    }, [e._v(e._s(s.assigneeName || (s.comments && s.comments.length > 0 ? s.comments[s.comments.length - 1].userId : "")))]), e._v(" \u5728 "), i("span", {
+    }, [e._v(e._s(s.assigneeName || (s.comments && s.comments.length > 0 ? e.my(s) : "")))]), e._v(" \u5728 "), i("span", {
+      staticClass: "flow-time"
+    }, [e._v(e._s(s.createTime))]), e._v(" \u53D1\u8D77\u4E86\u6D41\u7A0B ")]) : i("p", [i("span", {
+      staticClass: "flow-name"
+    }, [e._v(e._s(s.assigneeName || (s.comments && s.comments.length > 0 ? e.my(s) : "")))]), e._v(" \u5728 "), i("span", {
       staticClass: "flow-time"
     }, [e._v(e._s(s.createTime))]), e._v(" \u5F00\u59CB\u5904\u7406 "), i("span", {
       staticClass: "flow-node"
@@ -17714,7 +17718,7 @@ var ox = function() {
           "font-size": "12px"
         }
       }, [e._v(e._s(r.time))]) : e._e()] : e._e()];
-    })] : e._e(), s.endTime ? i("p", {
+    })] : e._e(), s.endTime && s.historyActivityType != "startEvent" ? i("p", {
       staticClass: "flow-time"
     }, [e._v("\u7ED3\u675F\u65F6\u95F4: " + e._s(s.endTime))]) : e._e(), i("div", {
       staticClass: "p-file"
@@ -17775,6 +17779,15 @@ const cx = {
     };
   },
   methods: {
+    my(e) {
+      let t = "->", i = "\u2192", s = e.comments[0].fullMessage;
+      if (s.includes(t))
+        return s.split(t)[1];
+      if (s.includes(i)) {
+        let n = s.split(i)[1];
+        return n = n.split("\uFF1A")[0], n;
+      }
+    },
     handleClick() {
       this.isFlag = !this.isFlag, this.toggleText = this.isFlag ? "\u6536\u8D77" : "\u5C55\u5F00";
     }
@@ -17786,7 +17799,7 @@ var ux = /* @__PURE__ */ ve(
   lx,
   !1,
   px,
-  "35b01ec6",
+  "75a69229",
   null,
   null
 );
@@ -24444,7 +24457,8 @@ const uT = /* @__PURE__ */ function() {
       userIdData: "",
       TopPopup1: !1,
       cctaskTopPopup: !1,
-      cctaskTopPopupTitle: "\u6284\u9001"
+      cctaskTopPopupTitle: "\u6284\u9001",
+      user: ""
     };
   },
   watch: {
@@ -24459,11 +24473,17 @@ const uT = /* @__PURE__ */ function() {
               this.ProcessInsObj = {
                 ...this.ProcessInsObj,
                 ...i.data
-              }, this.taskObj.buttons = this.ProcessInsObj.button || [], this.trackList = (((s = i.data) == null ? void 0 : s.flow) || []).filter((a) => ["userTask", "candidate"].includes(a.historyActivityType));
-              const n = ((this.ProcessInsObj.process || {}).variables || {}).deptId;
-              this.deptId = n;
-              const r = (this.ProcessInsObj.process || {}).taskId;
-              this.absoluteTaskId = r, this.approvalData = (i.data || {}).flow || [], this.processXml = ((i.data || {}).process || {}).xml || "", this.handleGetProcessStatus(), this.$emit("get-process-data", this.ProcessInsObj);
+              };
+              let n = (this.ProcessInsObj.flow || []).filter((l) => ["userTask"].includes(l.historyActivityType) && l.createTime), r = n[n.length - 1].assigneeName;
+              if (!r) {
+                let l = n[n.length - 1], p = "->", h = "\u2192", d = l.comments[0].fullMessage;
+                d.includes(p) ? r = d.split(p)[1] : d.includes(h) && (r = d.split(h)[1].split("\uFF1A")[0]);
+              }
+              this.user = r, this.taskObj.buttons = this.ProcessInsObj.button || [], this.trackList = (((s = i.data) == null ? void 0 : s.flow) || []).filter((l) => ["userTask", "candidate"].includes(l.historyActivityType));
+              const a = ((this.ProcessInsObj.process || {}).variables || {}).deptId;
+              this.deptId = a;
+              const o = (this.ProcessInsObj.process || {}).taskId;
+              this.absoluteTaskId = o, this.approvalData = (i.data || {}).flow || [], this.processXml = ((i.data || {}).process || {}).xml || "", this.handleGetProcessStatus(), this.$emit("get-process-data", this.ProcessInsObj);
             }
           }), this.getCurrentProcess(), this.getUserInfo());
         });
@@ -25003,7 +25023,7 @@ var dT = function() {
     }
   }, [i("span", {
     staticClass: "process-mliv-jd"
-  }, [e._v(e._s(`${e.processStatus.taskState == 4 ? e.processStatus.currUserName : e.processStatus.allUserNames.toString()}\u5BA1\u6279\u4E2D`))])])]) : e._e()]) : e._e(), i("div", {
+  }, [e._v(e._s(`${e.user}\u5BA1\u6279\u4E2D`))])])]) : e._e()]) : e._e(), i("div", {
     staticClass: "process-card",
     style: {
       height: e.processCardHeight
@@ -25238,7 +25258,7 @@ var fT = /* @__PURE__ */ ve(
   hT,
   !1,
   mT,
-  "a4fed71a",
+  "24df7d3f",
   null,
   null
 );
@@ -25248,7 +25268,7 @@ function mT(e) {
 }
 const ST = /* @__PURE__ */ function() {
   return fT.exports;
-}(), gT = "ddy-process-h5", yT = "1.0.1-rc.3.97", vT = "> app\u7AEF \u6D41\u7A0B\u63D2\u4EF6", AT = "./ddy-process-h5.umd.cjs", bT = "./style.css", CT = "module", wT = {
+}(), gT = "ddy-process-h5", yT = "1.0.1-rc.3.99", vT = "> app\u7AEF \u6D41\u7A0B\u63D2\u4EF6", AT = "./ddy-process-h5.umd.cjs", bT = "./style.css", CT = "module", wT = {
   ".": {
     import: "./ddy-process-h5.js",
     require: "./ddy-process-h5.umd.cjs"