Переглянути джерело

修正路径转发的一些地址错误

huqi 5 роки тому
батько
коміт
97a956c1d0

+ 3 - 3
o2web/source/o2_core/o2/xAction/services/x_attendance_assemble_control.js

@@ -13,7 +13,7 @@ MWF.xAction.RestActions.Action["x_attendance_assemble_control"] = new Class({
             var url = this.action.actions.exportSelfHoliday.uri;
             url = url.replace("{startdate}", startdate);
             url = url.replace("{enddate}", enddate);
-            window.open(this.action.address+url , "_blank");
+            window.open(o2.filterUrl(this.action.address+url , "_blank"));
         }.bind(this));
     },
     uploadAttachment: function(success, failure, formData, file){
@@ -23,7 +23,7 @@ MWF.xAction.RestActions.Action["x_attendance_assemble_control"] = new Class({
         this.action.getActions(function(){
             var url = this.action.actions.getAttachmentStream.uri;
             url = url.replace("{id}", encodeURIComponent(id));
-            window.open(this.action.address+url);
+            window.open(o2.filterUrl(this.action.address+url));
         }.bind(this));
     },
     exportAbnormalAttachment: function(year, month, success, failure){
@@ -31,7 +31,7 @@ MWF.xAction.RestActions.Action["x_attendance_assemble_control"] = new Class({
             var url = this.action.actions.exportAbnormalAttachment.uri;
             url = url.replace("{year}", year);
             url = url.replace("{month}", month);
-            window.open(this.action.address+url , "_blank");
+            window.open(o2.filterUrl(this.action.address+url , "_blank"));
         }.bind(this));
         //this.action.invoke({"name": "exportAbnormalAttachment", "parameter": {"year": year, "month": month },"success": success,"failure": failure});
     },

+ 3 - 3
o2web/source/o2_core/o2/xAction/services/x_bbs_assemble_control.js

@@ -25,7 +25,7 @@ MWF.xAction.RestActions.Action["x_bbs_assemble_control"] = new Class({
             var url = this.action.actions.getAttachmentData.uri;
             url = url.replace("{id}", encodeURIComponent(id));
             url = url.replace("{documentid}", encodeURIComponent(documentid));
-            window.open(this.action.address+url);
+            window.open(o2.filterUrl(this.action.address+url));
         }.bind(this));
     },
     getAttachmentStream: function(id, documentid){
@@ -33,7 +33,7 @@ MWF.xAction.RestActions.Action["x_bbs_assemble_control"] = new Class({
             var url = this.action.actions.getAttachmentStream.uri;
             url = url.replace("{id}", encodeURIComponent(id));
             url = url.replace("{documentid}", encodeURIComponent(documentid));
-            window.open(this.action.address+url);
+            window.open(o2.filterUrl(this.action.address+url));
         }.bind(this));
     },
 
@@ -42,7 +42,7 @@ MWF.xAction.RestActions.Action["x_bbs_assemble_control"] = new Class({
             var url = this.action.actions.getAttachmentData.uri;
             url = url.replace("{id}", encodeURIComponent(id));
             url = url.replace("{documentid}", encodeURIComponent(documentid));
-            if (callback) callback(this.action.address+url);
+            if (callback) callback(o2.filterUrl(this.action.address+url));
         }.bind(this));
     },
     convertLocalImageToBase64: function(size, success, failure, formData, file){

+ 2 - 3
o2web/source/o2_core/o2/xAction/services/x_file_assemble_control.js

@@ -16,17 +16,16 @@ MWF.xAction.RestActions.Action["x_file_assemble_control"] = new Class({
         this.action.getActions(function(){
             var url = this.action.actions.getAttachmentStream.uri;
             url = url.replace("{id}", encodeURIComponent(id));
-            if (callback) callback(this.action.address+url);
+            if (callback) callback(o2.filterUrl(this.action.address+url));
         }.bind(this));
     },
     getFileDownloadUrl: function(id, callback){
         this.action.getActions(function(){
             var url = this.action.actions.getAttachmentData.uri;
             url = url.replace("{id}", encodeURIComponent(id));
-            if (callback) callback(this.action.address+url);
+            if (callback) callback(o2.filterUrl(this.action.address+url));
         }.bind(this));
     },
-
     getBase64Code: function(success, failure, id, width, height, async){
         width = width || 0;
         height = height ||0;

+ 4 - 4
o2web/source/o2_core/o2/xAction/services/x_meeting_assemble_control.js

@@ -33,28 +33,28 @@ MWF.xAction.RestActions.Action["x_meeting_assemble_control"] = new Class({
         this.action.getActions(function(){
             var url = this.action.actions.getAttachmentData.uri;
             url = url.replace("{id}", encodeURIComponent(id));
-            if (callback) callback(this.action.address+url);
+            if (callback) callback(o2.filterUrl(this.action.address+url));
         }.bind(this));
     },
     getFileDownloadUrl: function(id, callback){
         this.action.getActions(function(){
             var url = this.action.actions.getAttachmentStream.uri;
             url = url.replace("{id}", encodeURIComponent(id));
-            if (callback) callback(this.action.address+url);
+            if (callback) callback(o2.filterUrl(this.action.address+url));
         }.bind(this));
     },
     getFile: function(id, callback){
         this.action.getActions(function(){
             var url = this.action.actions.getAttachmentData.uri;
             url = url.replace("{id}", encodeURIComponent(id));
-            window.open(this.action.address+url);
+            window.open(o2.filterUrl(this.action.address+url));
         }.bind(this));
     },
     getFileDownload: function(id, callback){
         this.action.getActions(function(){
             var url = this.action.actions.getAttachmentStream.uri;
             url = url.replace("{id}", encodeURIComponent(id));
-            window.open(this.action.address+url);
+            window.open(o2.filterUrl(this.action.address+url));
         }.bind(this));
     },
 

+ 5 - 5
o2web/source/o2_core/o2/xAction/services/x_okr_assemble_control.js

@@ -15,7 +15,7 @@ MWF.xAction.RestActions.Action["x_okr_assemble_control"] = new Class({
             var url = this.action.actions.getAttachmentData.uri;
             url = url.replace("{id}", encodeURIComponent(id));
             url = url.replace("{documentid}", encodeURIComponent(documentid));
-            window.open(this.actionAttachment.address+url);
+            window.open(o2.filterUrl(this.actionAttachment.address+url));
         }.bind(this));
     },
     getAttachmentStream: function(id, documentid){
@@ -23,7 +23,7 @@ MWF.xAction.RestActions.Action["x_okr_assemble_control"] = new Class({
             var url = this.action.actions.getAttachmentStream.uri;
             url = url.replace("{id}", encodeURIComponent(id));
             url = url.replace("{documentid}", encodeURIComponent(documentid));
-            window.open(this.action.address+url);
+            window.open(o2.filterUrl(this.action.address+url));
         }.bind(this));
     },
 
@@ -32,7 +32,7 @@ MWF.xAction.RestActions.Action["x_okr_assemble_control"] = new Class({
             var url = this.action.actions.getAttachmentData.uri;
             url = url.replace("{id}", encodeURIComponent(id));
             url = url.replace("{documentid}", encodeURIComponent(documentid));
-            if (callback) callback(this.action.address+url);
+            if (callback) callback(o2.filterUrl(this.action.address+url));
         }.bind(this));
     },
 
@@ -44,7 +44,7 @@ MWF.xAction.RestActions.Action["x_okr_assemble_control"] = new Class({
             var url = this.action.actions.getReportAttachmentData.uri;
             url = url.replace("{id}", encodeURIComponent(id));
             url = url.replace("{documentid}", encodeURIComponent(documentid));
-            window.open(this.actionAttachment.address+url);
+            window.open(o2.filterUrl(this.actionAttachment.address+url));
         }.bind(this));
     },
     getReportAttachmentStream: function(id, documentid){
@@ -52,7 +52,7 @@ MWF.xAction.RestActions.Action["x_okr_assemble_control"] = new Class({
             var url = this.action.actions.getReportAttachmentStream.uri;
             url = url.replace("{id}", encodeURIComponent(id));
             url = url.replace("{documentid}", encodeURIComponent(documentid));
-            window.open(this.action.address+url);
+            window.open(o2.filterUrl(this.action.address+url));
         }.bind(this));
     },
     deleteReportAttachment: function(id, documentid, success, failure, async){

+ 1 - 1
o2web/source/o2_core/o2/xAction/services/x_processplatform_assemble_surface.js

@@ -6,7 +6,7 @@ MWF.xAction.RestActions.Action["x_processplatform_assemble_surface"] = new Class
             var url = this.action.actions["exportViewResult"].uri;
             //url = url.replace("{applicationFlag}", app);
             url = url.replace("{flag}", json.data.id);
-            window.open(this.action.address+url, "_blank");
+            window.open(o2.filterUrl(this.action.address+url, "_blank"));
         }.bind(this)});
     },
     saveDictionary: function(data, success, failure){

+ 2 - 2
o2web/source/o2_core/o2/xAction/services/x_report_assemble_control.js

@@ -7,14 +7,14 @@ MWF.xAction.RestActions.Action["x_report_assemble_control"] = new Class({
         this.action.getActions(function(){
             var url = this.action.actions.statByKeyWork.uri;
             url = url.replace("{year}", encodeURIComponent(year));
-            window.open(this.action.address+url);
+            window.open(o2.filterUrl(this.action.address+url));
         }.bind(this));
     },
     getExportFileStream: function(id){
         this.action.getActions(function(){
             var url = this.action.actions.exportStatResult.uri;
             url = url.replace("{id}", encodeURIComponent(id));
-            window.open(this.action.address+url, "_blank");
+            window.open(o2.filterUrl(this.action.address+url), "_blank");
         }.bind(this));
     }
     //statByUnit : function( year, success,failure, async){

+ 2 - 2
o2web/source/o2_core/o2/xAction/services/x_strategydeploy_assemble_control.js

@@ -154,7 +154,7 @@ MWF.xAction.RestActions.Action["x_strategydeploy_assemble_control"] = new Class(
             var url = this.action.actions.getPriorityAttachmentData.uri;
             url = url.replace("{id}", encodeURIComponent(id));
             url = url.replace("{workId}", encodeURIComponent(workId));
-            window.open(this.actionAttachment.address+url);
+            window.open(o2.filterUrl(this.actionAttachment.address+url));
         }.bind(this));
     },
     getPriorityAttachmentStream: function(id, workId){
@@ -162,7 +162,7 @@ MWF.xAction.RestActions.Action["x_strategydeploy_assemble_control"] = new Class(
             var url = this.action.actions.getPriorityAttachmentStream.uri;
             url = url.replace("{id}", encodeURIComponent(id));
             url = url.replace("{workId}", encodeURIComponent(workId));
-            window.open(this.action.address+url);
+            window.open(o2.filterUrl(this.action.address+url));
         }.bind(this));
     },
     ///////////////////////////五项///////////////////////////////

+ 3 - 3
o2web/source/o2_core/o2/xAction/services/x_teamwork_assemble_control.js

@@ -18,7 +18,7 @@ MWF.xAction.RestActions.Action["x_teamwork_assemble_control"] = new Class({
             var url = this.action.actions.attachmentDownload.uri;
             url = url.replace("{id}", encodeURIComponent(id));
             url = url.replace("{documentid}", encodeURIComponent(documentid));
-            window.open(this.actionAttachment.address+url);
+            window.open(o2.filterUrl(this.actionAttachment.address+url));
         }.bind(this));
     },
     attachmentDownloadStream: function(id,documentid,callback){
@@ -26,7 +26,7 @@ MWF.xAction.RestActions.Action["x_teamwork_assemble_control"] = new Class({
             var url = this.action.actions.attachmentDownloadStream.uri;
             url = url.replace("{id}", encodeURIComponent(id));
             url = url.replace("{documentid}", encodeURIComponent(documentid));
-            window.open(this.action.address+url);
+            window.open(o2.filterUrl(this.action.address+url));
 
         }.bind(this));
     },
@@ -36,7 +36,7 @@ MWF.xAction.RestActions.Action["x_teamwork_assemble_control"] = new Class({
             var url = this.action.actions.attachmentDownload.uri;
             url = url.replace("{id}", encodeURIComponent(id));
             url = url.replace("{documentid}", encodeURIComponent(documentid));
-            if (callback) callback(this.action.address+url);
+            if (callback) callback(o2.filterUrl(this.action.address+url));
         }.bind(this));
     },