修复表单组件拖动ctrl定位失效的问题

o2web/source/x_component_portal_PageDesigner/Module/Page.js

@@ -514,7 +514,7 @@ MWF.xApplication.portal.PageDesigner.Module.Page = MWF.PCPage = new Class({
 		copyNode.setStyle("display", "none");
 	},
 	_dragDrop: function(module, flag){
-	    var f = flag || !(new Event(event)).control;
+	    var f = flag || !(window.event || {}).ctrlKey;
 	    if( f ){
             this.node.setStyles(this.css.pageNode);
             this.node.setStyles(this.json.styles);
@@ -623,11 +623,11 @@ MWF.xApplication.portal.PageDesigner.Module.Page = MWF.PCPage = new Class({
 		});
 	},
 	_setInjectActionAreaPosition: function(){
-		var e = new Event(event);
+		var e = window.event || {};
 		var formOffset = this.node.getOffsetParent().getPosition();
 		//var p = this.node.getPosition(this.form.node.getOffsetParent());
-		var y = e.page.y - formOffset.y - 60;
-		var x = e.page.x - formOffset.x - 60;
+		var y = e.pageY - formOffset.y - 60;
+		var x = e.pageX - formOffset.x - 60;
 		this.injectActionArea.setPosition({"x": x, "y": y});
 	},
 	injectBefore : function( e ){

o2web/source/x_component_process_FormDesigner/Module/$Component.js

@@ -121,7 +121,7 @@ MWF.xApplication.process.FormDesigner.Module.$Component = MWF.FC$Component = new
 		copyNode.setStyle("display", "none");
 	},
 	_dragDrop: function(module, flag){
-        var f = flag || !(new Event(event)).control;
+        var f = flag || !(window.event || {}).ctrlKey;
         if( f ){
             this.node.setStyles(this.css.moduleNode);
             this.setCustomStyles();

o2web/source/x_component_process_FormDesigner/Module/$Container.js

@@ -89,7 +89,7 @@ MWF.xApplication.process.FormDesigner.Module.$Container = MWF.FC$Container = new
 		copyNode.setStyle("display", "none");
 	},
 	_dragDrop: function(module, flag){
-		var f = flag || !(new Event(event)).control;
+		var f = flag || !(window.event || {}).ctrlKey;
 		if( f ){
 			this.node.setStyles(this.css.moduleNode);
 			this.setCustomStyles();

o2web/source/x_component_process_FormDesigner/Module/$Element.js

@@ -77,7 +77,7 @@ MWF.xApplication.process.FormDesigner.Module.$Element = MWF.FC$Element = new Cla
 
 	},
 	_dragDrop: function(module, flag){
-		var f = flag || !(new Event(event)).control;
+		var f = flag || !(window.event || {}).ctrlKey;
 		if( f ){
 			this.node.setStyles(this.css.moduleNode);
 			this.setCustomStyles();

o2web/source/x_component_process_FormDesigner/Module/$Module.js

@@ -739,11 +739,11 @@ MWF.xApplication.process.FormDesigner.Module.$Module = MWF.FC$Module = new Class
 		});
 	},
 	_setInjectActionAreaPosition: function(){
-		var e = new Event(event);
+		var e = window.event || {};
 		var formOffset = this.form.node.getOffsetParent().getPosition();
 		//var p = this.node.getPosition(this.form.node.getOffsetParent());
-		var y = e.page.y - formOffset.y;
-		var x = e.page.x - formOffset.x;
+		var y = e.pageY - formOffset.y;
+		var x = e.pageX - formOffset.x;
 		this.injectActionArea.setPosition({"x": x, "y": y});
 
 		y = y-60;
@@ -777,6 +777,7 @@ MWF.xApplication.process.FormDesigner.Module.$Module = MWF.FC$Module = new Class
 			window.clearTimeout( this.dragTimeout );
 			this.dragTimeout = null;
 		}
+		debugger;
 		if (this.parentContainer){
 			var available = true;
 			if( !this.options.injectActions )available = false;
@@ -787,8 +788,8 @@ MWF.xApplication.process.FormDesigner.Module.$Module = MWF.FC$Module = new Class
 			if( module.moduleName === "datatable$Data" && !module.options.allowModules.contains( this.moduleName ) )available = false;
 			if( module.parentContainer && module.parentContainer.moduleName === "datatable$Data" &&
 				!module.parentContainer.options.allowModules.contains( this.moduleName ) )available = false;
-			var e = new Event(event);
-			if( available && e.control ){
+			var e = window.event || {};
+			if( available && e.ctrlKey ){
 				if( this.copyNode )this.copyNode.setStyle("display","none");
 				module._showInjectAction( this );
 			}else{

o2web/source/x_component_process_FormDesigner/Module/Datagrid.js

@@ -320,7 +320,7 @@ MWF.xApplication.process.FormDesigner.Module.Datagrid = MWF.FCDatagrid = new Cla
 	},
 	_setEditStyle_custom: function(name, obj, oldValue){
 		if (name=="id"){
-			if (name!=oldValue){
+			if (oldValue && this.json.id!=oldValue){
 				var reg = new RegExp("^"+oldValue, "i");
 				this.containers.each(function(container){
 					var id = container.json.id;

o2web/source/x_component_process_FormDesigner/Module/Datatable.js

@@ -337,7 +337,7 @@ MWF.xApplication.process.FormDesigner.Module.Datatable = MWF.FCDatatable = new C
 	},
 	_setEditStyle_custom: function(name, obj, oldValue){
 		if (name=="id"){
-			if (name!=oldValue){
+			if (oldValue && this.json.id!=oldValue){
 				var reg = new RegExp("^"+oldValue, "i");
 				this.containers.each(function(container){
 					var id = container.json.id;

o2web/source/x_component_process_FormDesigner/Module/Form.js

@@ -701,7 +701,7 @@ MWF.xApplication.process.FormDesigner.Module.Form = MWF.FCForm = new Class({
 		copyNode.setStyle("display", "none");
 	},
 	_dragDrop: function(module, flag){
-		var f = flag || !(new Event(event)).control;
+		var f = flag || !(window.event || {}).ctrlKey;
 		if( f ){
 			this.node.setStyles((this.options.mode==="Mobile") ? this.css.formMobileNode : this.css.formNode);
 			this.node.setStyles(this.json.styles);
@@ -812,11 +812,11 @@ MWF.xApplication.process.FormDesigner.Module.Form = MWF.FCForm = new Class({
 		});
 	},
 	_setInjectActionAreaPosition: function(){
-		var e = new Event(event);
+		var e = window.event || {};
 		var formOffset = this.node.getOffsetParent().getPosition();
 		//var p = this.node.getPosition(this.form.node.getOffsetParent());
-		var y = e.page.y - formOffset.y - 60;
-		var x = e.page.x - formOffset.x - 60;
+		var y = e.pageY - formOffset.y - 60;
+		var x = e.pageX - formOffset.x - 60;
 		this.injectActionArea.setPosition({"x": x, "y": y});
 	},
 	injectBefore : function( e ){

o2web/source/x_component_process_FormDesigner/Module/Table.js

@@ -463,7 +463,7 @@ MWF.xApplication.process.FormDesigner.Module.Table = MWF.FCTable = new Class({
 	},
 	_setEditStyle_custom: function(name, obj, oldValue){
 		if (name=="id"){
-			if (name!=oldValue){
+			if (oldValue && this.json.id!=oldValue){
 				var reg = new RegExp("^"+oldValue, "i");
 				this.containers.each(function(container){
 					var id = container.json.id;