提交 edd4165c 编写于 作者: NoSubject's avatar NoSubject

Merge branch 'cherry-pick-7fbe9c65' into 'master'

Merge branch 'fix/form_copy' into 'develop'

See merge request o2oa/o2oa!1015
...@@ -92,9 +92,9 @@ MWF.xApplication.cms.FormDesigner.Main = new Class({ ...@@ -92,9 +92,9 @@ MWF.xApplication.cms.FormDesigner.Main = new Class({
if (this.shortcut) { if (this.shortcut) {
if (this.form) { if (this.form) {
// if (this.form.isFocus){ // if (this.form.isFocus){
if (!this.form.node.contains(document.activeElement)){ // if (!this.form.node.contains(document.activeElement)){
return false; // return false;
} // }
if (this.form.currentSelectedModule) { if (this.form.currentSelectedModule) {
var module = this.form.currentSelectedModule; var module = this.form.currentSelectedModule;
if (module.moduleType != "form" && module.moduleName.indexOf("$") == -1) { if (module.moduleType != "form" && module.moduleName.indexOf("$") == -1) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册