From a4cf6cb36d1190263ede4b684b7f8b80a69a36e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=94=A1=E7=A5=A5=E7=86=A0?= Date: Thu, 13 Oct 2022 07:31:48 +0000 Subject: [PATCH] Merge branch 'hotfix/log_tooLong' into 'master' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Merge of hotfix/log_tooLong 修复流程记录组件意见可能截断显示的问题 to master See merge request o2oa/o2oa!1153 (cherry picked from commit 0c40fd30597b2e2db8caa296a788590a3c2233f6) 1b3f5a6c 修复流程记录组件意见可能截断显示的问题 --- o2web/source/x_component_process_Xform/Log.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/o2web/source/x_component_process_Xform/Log.js b/o2web/source/x_component_process_Xform/Log.js index 25e05533ab..4d793921b6 100644 --- a/o2web/source/x_component_process_Xform/Log.js +++ b/o2web/source/x_component_process_Xform/Log.js @@ -1456,7 +1456,8 @@ MWF.xApplication.process.Xform.Log = MWF.APPLog = new Class( td = tr.insertCell(4).setStyles(this.form.css[style]); td.set("text", (task.processingType=="empower") ? MWF.xApplication.process.Xform.LP.empower : task.routeName || ""); td = tr.insertCell(5).setStyles(this.form.css[style]); - opinion = (task.processingType=="empower") ? MWF.xApplication.process.Xform.LP.empowerTo + o2.name.cn(task.empowerToIdentity || "") : "
" + o2.txt(task.opinion || "")+"
"; + var op = (task.properties && task.properties.opinion) ? task.properties.opinion : task.opinion; + var opinion = (task.processingType=="empower") ? MWF.xApplication.process.Xform.LP.empowerTo + o2.name.cn(task.empowerToIdentity || "") : "
" + o2.txt(op || "")+"
"; td.set("html", opinion); @@ -1791,7 +1792,8 @@ MWF.xApplication.process.Xform.Log = MWF.APPLog = new Class( html = html.replace(/\{route\}/g, o2.txt(task.routeName)); html = html.replace(/\{time\}/g, task.completedTime); html = html.replace(/\{date\}/g, new Date().parse(task.completedTime).format("%Y-%m-%d")); - html = html.replace(/\{opinion\}/g, o2.txt(task.opinion || "")); + var op = (task.properties && task.properties.opinion) ? task.properties.opinion : task.opinion; + html = html.replace(/\{opinion\}/g, o2.txt(op || "")); html = html.replace(/\{company\}/g, company.substring(0, company.indexOf("@"))); html = html.replace(/\{startTime\}/g, task.startTime); html = html.replace(/\{startDate\}/g, new Date().parse(task.startTime).format("%Y-%m-%d")); -- GitLab