From 3a3d0cb2ea61f4cca91854e47fcd4e1ae86f0b28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E8=B5=B7?= Date: Thu, 2 Jul 2020 06:41:21 +0000 Subject: [PATCH] Merge branch 'fix/form_copy' into 'develop' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Merge of fix/form_copy to develop 修复脚本拷贝粘贴时，和设计元素的拷贝粘贴冲突 See merge request o2oa/o2oa!1014 (cherry picked from commit 7fbe9c6544be77f0e7f534a0c622a29616d6efdd) 28b0f156 修复脚本拷贝粘贴时，和设计元素的拷贝粘贴冲突 --- o2web/source/x_component_cms_FormDesigner/Main.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/o2web/source/x_component_cms_FormDesigner/Main.js b/o2web/source/x_component_cms_FormDesigner/Main.js index 85ee572c9b..cd0522549f 100644 --- a/o2web/source/x_component_cms_FormDesigner/Main.js +++ b/o2web/source/x_component_cms_FormDesigner/Main.js @@ -92,9 +92,9 @@ MWF.xApplication.cms.FormDesigner.Main = new Class({ if (this.shortcut) { if (this.form) { // if (this.form.isFocus){ - if (!this.form.node.contains(document.activeElement)){ - return false; - } + // if (!this.form.node.contains(document.activeElement)){ + // return false; + // } if (this.form.currentSelectedModule) { var module = this.form.currentSelectedModule; if (module.moduleType != "form" && module.moduleName.indexOf("$") == -1) { -- GitLab