Merge branch 'fix/url_mapping' into 'develop'

Merge of fix/url_mapping to develop 修正根据路径转发的一些bug

See merge request o2oa/o2oa!638

o2web/source/x_component_AppCenter/Main.js

@@ -1570,7 +1570,7 @@ MWF.xApplication.AppCenter.Module.SetupLocal = new Class({
     loadCompare: function(){
         var formData = new FormData();
         formData.append('file', this.file);
-
+debugger;
         this.app.actions.compareUpload(formData, this.file, function(json){
             this.clearLoading();
             this.setupData.flag = json.data.flag;

o2web/source/x_component_AppMarket/Main.js

@@ -432,7 +432,7 @@ MWF.xApplication.AppMarket.Module.SetupLocal = new Class({
     loadCompare: function(){
         var formData = new FormData();
         formData.append('file', this.file);
-
+        debugger;
         this.app.actions.compareUpload(formData, this.file, function(json){
             this.clearLoading();
             this.setupData.flag = json.data.flag;

o2web/source/x_component_Org/Main.js

@@ -180,7 +180,7 @@ MWF.xApplication.Org.Main = new Class({
 	},
     loadPersonImport: function(){
     	var action = o2.Actions.get("x_organization_assemble_control");
-        var url = action.action.address + action.action.actions.getImportPersonTemplate.uri;
+        var url = o2.filterUrl(action.action.address + action.action.actions.getImportPersonTemplate.uri);
         var infor = this.lp.importPersonInfor.replace("{url}", url);
 
         this.importPersonTitleNode.set("text", this.lp.importPersonTitle);
@@ -196,7 +196,7 @@ MWF.xApplication.Org.Main = new Class({
                     "method": "importPerson",
                     "multiple": false,
                     "onCompleted": function(json){
-                        var url = action.action.address + action.action.actions.getImportPersonResault.uri;
+                        var url = o2.filterUrl(action.action.address + action.action.actions.getImportPersonResault.uri);
                         url = url.replace("{flag}", json.data.flag);
                         var result = this.lp.importPersonResult.replace("{url}", url);
                         this.importPersonResultNode.set("html", result);

o2web/source/x_component_cms_ColumnManager/FileExplorer.js

@@ -242,7 +242,7 @@ MWF.xApplication.cms.ColumnManager.FileExplorer.File = new Class({
         url = url.replace(/{flag}/, this.data.id);
         url = url.replace(/{applicationFlag}/, this.data.application || this.data.appId);
         url = "/x_cms_assemble_control"+url;
-        return MWF.Actions.getHost("x_cms_assemble_control")+url;
+        return o2.filterUrl(MWF.Actions.getHost("x_cms_assemble_control")+url);
     },
     _getLnkPar: function(){
         return {
@@ -348,7 +348,7 @@ MWF.xApplication.cms.ColumnManager.FileDesigner = new Class({
 
             var a = new Element("div", {
                 "styles": {"height": "30px"},
-                "html": "<a target='_blank' href='"+href+"'>open</a>"
+                "html": "<a target='_blank' href='"+o2.filterUrl(href)+"'>open</a>"
             }).inject(this.fileUrlNode, "bottom");
         }
     },
@@ -367,7 +367,7 @@ MWF.xApplication.cms.ColumnManager.FileDesigner = new Class({
             this.fileUrlNode.set("text", url);
             var a = new Element("div", {
                 "styles": {"height": "30px"},
-                "html": "<a target='_blank' href='"+href+"'>open</a>"
+                "html": "<a target='_blank' href='"+o2.filterUrl(href)+"'>open</a>"
             }).inject(this.fileUrlNode, "bottom");
         }
 

o2web/source/x_component_portal_PortalManager/FileExplorer.js

@@ -90,7 +90,7 @@ MWF.xApplication.portal.PortalManager.FileExplorer.File = new Class({
         url = url.replace(/{flag}/, this.data.id);
         url = url.replace(/{applicationFlag}/, this.data.portal);
         url = "/x_portal_assemble_surface"+url;
-        return MWF.Actions.getHost("x_portal_assemble_surface")+url;
+        return o2.filterUrl(MWF.Actions.getHost("x_portal_assemble_surface")+url);
     },
     _getIcon: function(){
         return "file.png";
@@ -100,7 +100,7 @@ MWF.xApplication.portal.PortalManager.FileExplorer.File = new Class({
         url = url.replace(/{flag}/, this.data.id);
         url = url.replace(/{applicationFlag}/, this.data.portal);
         url = "/x_portal_assemble_surface"+url;
-        var href = MWF.Actions.getHost("x_portal_assemble_surface")+url;
+        var href = o2.filterUrl(MWF.Actions.getHost("x_portal_assemble_surface")+url);
 
 		return {
 			"icon": this.data.iconUrl,
@@ -147,7 +147,7 @@ MWF.xApplication.portal.PortalManager.FileDesigner = new Class({
 
             var a = new Element("div", {
                 "styles": {"height": "30px"},
-                "html": "<a target='_blank' href='"+href+"'>open</a>"
+                "html": "<a target='_blank' href='"+o2.filterUrl(href)+"'>open</a>"
             }).inject(this.fileUrlNode, "bottom");
 
         }
@@ -167,7 +167,7 @@ MWF.xApplication.portal.PortalManager.FileDesigner = new Class({
             this.fileUrlNode.set("text", url);
             var a = new Element("div", {
                 "styles": {"height": "30px"},
-                "html": "<a target='_blank' href='"+href+"'>open</a>"
+                "html": "<a target='_blank' href='"+o2.filterUrl(href)+"'>open</a>"
             }).inject(this.fileUrlNode, "bottom")
         }
 

o2web/source/x_component_process_ProcessManager/FileExplorer.js

@@ -253,7 +253,7 @@ MWF.xApplication.process.ProcessManager.FileExplorer.File = new Class({
         url = url.replace(/{flag}/, this.data.id);
         url = url.replace(/{applicationFlag}/, this.data.application);
         url = "/x_processplatform_assemble_surface"+url;
-        return MWF.Actions.getHost("x_processplatform_assemble_surface")+url;
+        return  o2.filterUrl(MWF.Actions.getHost("x_processplatform_assemble_surface")+url);
     },
 	_getLnkPar: function(){
 		return {
@@ -374,7 +374,7 @@ MWF.xApplication.process.ProcessManager.FileDesigner = new Class({
 
             var a = new Element("div", {
                 "styles": {"height": "30px"},
-                "html": "<a target='_blank' href='"+href+"'>open</a>"
+                "html": "<a target='_blank' href='"+o2.filterUrl(href)+"'>open</a>"
             }).inject(this.fileUrlNode, "bottom");
         }
     },
@@ -393,7 +393,7 @@ MWF.xApplication.process.ProcessManager.FileDesigner = new Class({
             this.fileUrlNode.set("text", url);
             var a = new Element("div", {
                 "styles": {"height": "30px"},
-                "html": "<a target='_blank' href='"+href+"'>open</a>"
+                "html": "<a target='_blank' href='"+o2.filterUrl(href)+"'>open</a>"
             }).inject(this.fileUrlNode, "bottom");
         }