diff --git a/src/views/dashboard/ProcessPortal/components/MyWork.vue b/src/views/dashboard/ProcessPortal/components/MyWork.vue index 50a17ae..1d122d3 100644 --- a/src/views/dashboard/ProcessPortal/components/MyWork.vue +++ b/src/views/dashboard/ProcessPortal/components/MyWork.vue @@ -147,12 +147,46 @@ vars: result.records, }; let tempFormUrl = result.formUrl; - if (tempFormUrl && tempFormUrl.indexOf('?') != -1 && !/^http[s]?:\/\/.*/.test(tempFormUrl) && tempFormUrl.indexOf('{{DOMAIN_URL}}') == -1) { + //节点配置表单URL,VUE组件类型对应的拓展参数 + if (tempFormUrl && tempFormUrl.indexOf('?') != -1 && !isURL(tempFormUrl) && tempFormUrl.indexOf('{{DOMAIN_URL}}') == -1) { tempFormUrl = result.formUrl.split('?')[0]; + let qv: any = getQueryVariable(result.formUrl); + if (qv.edit == 1) { + formData['disabled'] = false; + } + formData.extendUrlParams = qv; + } + //如果没有taskId参数,程序自动追加,用于设计器表单节点权限 + if (tempFormUrl != null && tempFormUrl.indexOf('{{DOMAIN_URL}}/desform/') != -1 && tempFormUrl.indexOf('taskId') == -1) { + tempFormUrl = tempFormUrl.trim(); + if (tempFormUrl.endsWith('?')) { + tempFormUrl = tempFormUrl + 'taskId=' + result.taskDefKey; + } else { + tempFormUrl = tempFormUrl + '&taskId=' + result.taskDefKey; + } } return { formData, formUrl: tempFormUrl }; } + function isURL(s) { + return /^http[s]?:\/\/.*/.test(s); + } + + function getQueryVariable(url) { + if (!url) return; + let t, + n, + r, + i = url.split('?')[1], + s = {}; + (t = i.split('&')), (r = null), (n = null); + for (let o in t) { + let u = t[o].indexOf('='); + u !== -1 && ((r = t[o].substr(0, u)), (n = t[o].substr(u + 1)), (s[r] = n)); + } + return s; + } + async function handleClaim(record) { await taskClaim({ taskId: record.id }); await reloadTodo(); diff --git a/src/views/dashboard/ProcessPortal/components/WelcomeBanner.vue b/src/views/dashboard/ProcessPortal/components/WelcomeBanner.vue index a989b58..c619da3 100644 --- a/src/views/dashboard/ProcessPortal/components/WelcomeBanner.vue +++ b/src/views/dashboard/ProcessPortal/components/WelcomeBanner.vue @@ -4,7 +4,7 @@