ddy-process-h5 1.0.1-rc.3.29 → 1.0.1-rc.3.33

package/package.json

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

package/v2/ddy-process-h5.js

@@ -20601,7 +20601,7 @@ var mC = function() {
     }
   }, [e._v("\u8BBE\u7F6E\u4E3A\u5E38\u7528\u610F\u89C1")])]) : e._e()])]) : e._e(), t("div", {
     staticClass: "process-popup-content-person"
-  }, [e.nextNodeData.length == 1 && e.nextNodeData[0].nodeType == "endEvent" ? t("div", [e._v(" \u4E0B\u4E00\u8282\u70B9\uFF1A\u7ED3\u675F\u4E8B\u4EF6 ")]) : e.nextNodeData && e.nextNodeData.nodeType == "endEvent" ? t("div", [e._v(" \u4E0B\u4E00\u8282\u70B9\uFF1A\u7ED3\u675F\u4E8B\u4EF6 ")]) : t("TreePerson", {
+  }, [e.nextNodeData.length == 1 && e.nextNodeData[0].nodeType == "endEvent" ? t("div", [e._v(" \u4E0B\u4E00\u8282\u70B9\uFF1A\u7ED3\u675F\u4E8B\u4EF6 ")]) : e.nextNodeData && e.nextNodeData.nodeType == "endEvent" ? t("div", [e._v(" \u4E0B\u4E00\u8282\u70B9\uFF1A\u7ED3\u675F\u4E8B\u4EF6 ")]) : e.param.ProcessInsObj.taskParentId ? e._e() : t("TreePerson", {
     ref: "TreePersonRef",
     attrs: {
       items: e.nextNodeData,
@@ -21336,7 +21336,7 @@ var vC = /* @__PURE__ */ ve(
   gC,
   !1,
   AC,
-  "2b4d2ad8",
+  "5ea02048",
   null,
   null
 );
@@ -22830,6 +22830,8 @@ const GC = /* @__PURE__ */ function() {
       ), this.cctaskTopPopupTitle = e;
     },
     async getNextNode(e) {
+      if (this.ProcessInsObj.process && (this.ProcessInsObj.process || {}).taskParentId)
+        return !0;
       let i;
       try {
         i = await this.request.get("/bladex/blade-workflow/tis/simulation", {
@@ -22845,6 +22847,9 @@ const GC = /* @__PURE__ */ function() {
       i.code == 200 && !i.data.evaluation && (this.incomingConditionItemList = [], t.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 = [], t.branches = await this.getOutgoingProcessNode(
+        this.absoluteTaskId,
+        i.data.branches[0].id
       )), t = await this.getSelectFixData(t, e), this.nextTaskNode = t, this.operationParam = {
         ...this.operationParam,
         nextNodeData: (this.nextTaskNode || {}).id ? [this.nextTaskNode] : []
@@ -22984,7 +22989,7 @@ const GC = /* @__PURE__ */ function() {
       }) : this.$refs.topTips.handleClose();
     },
     async showOperation(e, i, t, s, n) {
-      switch (this.beforeFunction && (this.operationParam.beforeFunction = this.beforeFunction), this.operationParam.request = this.request, this.annexlabel = s || "fasdfsafdsa", this.titleText = i, this.operationCom = e, this.operationComKey = Date.now(), this.operationParam.selChildrenItems = {}, this.operationParam.annex = s || "fasdfsafdsa", this.operationParam.subjectId = this.formData.subjectId, this.operationParam.processInstId = this.processIntId, this.operationParam.taskInstId = (this.ProcessInsObj.process || {}).taskId || "", this.operationParam.variables = (this.ProcessInsObj.process || {}).variables || {}, this.operationParam.extendedProperties = (this.ProcessInsObj.form || {}).extendedProperties || [], this.operationParam.actionName = i, this.operationParam.formData = this.formData, this.operationParam.ProcessInsObj = this.ProcessInsObj, this.operationParam.userInfo = this.user, this.nextTaskNode, this.operationParam.nextNodeData = (this.nextTaskNode || {}).id ? [this.nextTaskNode] : [], this.operationParam.incomingConditionItemList = this.incomingConditionItemList, this.operationParam.outGatewayUserTaskModel = this.outGatewayUserTaskModel, this.operationParam.taskNode = this.taskNode, this.operationParam.appId = this.processStatus.appId, this.operationParam.endFunction = this.endFunction, this.operationParam.isDocument = this.isDocument, this.operationParam.isQuickReply = this.isQuickReply, this.operationParam.isMsg = this.isMsg, this.operationParam.isRequire = this.isRequire, this.operationParam.canCheck = this.canCheck, this.operationParam.isCheckType = this.isCheckType, this.operationParam.isOrgType = this.isOrgType, this.operationParam.isCodeType = this.isCodeType, n) {
+      switch (this.beforeFunction && (this.operationParam.beforeFunction = this.beforeFunction), this.operationParam.request = this.request, this.annexlabel = s || "fasdfsafdsa", this.titleText = i, this.operationCom = e, this.operationComKey = Date.now(), this.operationParam.selChildrenItems = {}, this.operationParam.annex = s || "fasdfsafdsa", this.operationParam.subjectId = this.formData.subjectId, this.operationParam.processInstId = this.processIntId, this.operationParam.taskInstId = (this.ProcessInsObj.process || {}).taskId || "", this.operationParam.variables = (this.ProcessInsObj.process || {}).variables || {}, this.operationParam.extendedProperties = (this.ProcessInsObj.form || {}).extendedProperties || [], this.operationParam.actionName = i, this.operationParam.formData = this.formData, this.operationParam.ProcessInsObj = this.ProcessInsObj.process || {}, this.operationParam.userInfo = this.user, this.nextTaskNode, this.operationParam.nextNodeData = (this.nextTaskNode || {}).id ? [this.nextTaskNode] : [], this.operationParam.incomingConditionItemList = this.incomingConditionItemList, this.operationParam.outGatewayUserTaskModel = this.outGatewayUserTaskModel, this.operationParam.taskNode = this.taskNode, this.operationParam.appId = this.processStatus.appId, this.operationParam.endFunction = this.endFunction, this.operationParam.isDocument = this.isDocument, this.operationParam.isQuickReply = this.isQuickReply, this.operationParam.isMsg = this.isMsg, this.operationParam.isRequire = this.isRequire, this.operationParam.canCheck = this.canCheck, this.operationParam.isCheckType = this.isCheckType, this.operationParam.isOrgType = this.isOrgType, this.operationParam.isCodeType = this.isCodeType, n) {
         case "\u6284\u9001":
           this.operationParam.visible = !0, this.cctaskTopPopup = !0;
           break;
@@ -23362,7 +23367,7 @@ function WC(e) {
 }
 const cw = /* @__PURE__ */ function() {
   return KC.exports;
-}(), YC = "ddy-process-h5", zC = "1.0.1-rc.3.29", XC = "> app\u7AEF \u6D41\u7A0B\u63D2\u4EF6", ZC = "./ddy-process-h5.umd.cjs", $C = "./style.css", ew = "module", tw = {
+}(), YC = "ddy-process-h5", zC = "1.0.1-rc.3.33", XC = "> app\u7AEF \u6D41\u7A0B\u63D2\u4EF6", ZC = "./ddy-process-h5.umd.cjs", $C = "./style.css", ew = "module", tw = {
   ".": {
     import: "./ddy-process-h5.js",
     require: "./ddy-process-h5.umd.cjs"