From 97a956c1d004bf7375251147c89b3a4e8777f5e6 Mon Sep 17 00:00:00 2001 From: huqi Date: Fri, 5 Jun 2020 15:04:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=B7=AF=E5=BE=84=E8=BD=AC?= =?UTF-8?q?=E5=8F=91=E7=9A=84=E4=B8=80=E4=BA=9B=E5=9C=B0=E5=9D=80=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xAction/services/x_attendance_assemble_control.js | 6 +++--- .../o2/xAction/services/x_bbs_assemble_control.js | 6 +++--- .../o2/xAction/services/x_file_assemble_control.js | 5 ++--- .../o2/xAction/services/x_meeting_assemble_control.js | 8 ++++---- .../o2/xAction/services/x_okr_assemble_control.js | 10 +++++----- .../services/x_processplatform_assemble_surface.js | 2 +- .../o2/xAction/services/x_report_assemble_control.js | 4 ++-- .../services/x_strategydeploy_assemble_control.js | 4 ++-- .../o2/xAction/services/x_teamwork_assemble_control.js | 6 +++--- 9 files changed, 25 insertions(+), 26 deletions(-) diff --git a/o2web/source/o2_core/o2/xAction/services/x_attendance_assemble_control.js b/o2web/source/o2_core/o2/xAction/services/x_attendance_assemble_control.js index 3f4c30bd21..5bccb51278 100644 --- a/o2web/source/o2_core/o2/xAction/services/x_attendance_assemble_control.js +++ b/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}); }, diff --git a/o2web/source/o2_core/o2/xAction/services/x_bbs_assemble_control.js b/o2web/source/o2_core/o2/xAction/services/x_bbs_assemble_control.js index 03c5ec4322..3c461d0151 100644 --- a/o2web/source/o2_core/o2/xAction/services/x_bbs_assemble_control.js +++ b/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){ diff --git a/o2web/source/o2_core/o2/xAction/services/x_file_assemble_control.js b/o2web/source/o2_core/o2/xAction/services/x_file_assemble_control.js index ae15bd4b1f..ea44e34f28 100644 --- a/o2web/source/o2_core/o2/xAction/services/x_file_assemble_control.js +++ b/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; diff --git a/o2web/source/o2_core/o2/xAction/services/x_meeting_assemble_control.js b/o2web/source/o2_core/o2/xAction/services/x_meeting_assemble_control.js index 0fd6577e3c..081e808ad1 100644 --- a/o2web/source/o2_core/o2/xAction/services/x_meeting_assemble_control.js +++ b/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)); }, diff --git a/o2web/source/o2_core/o2/xAction/services/x_okr_assemble_control.js b/o2web/source/o2_core/o2/xAction/services/x_okr_assemble_control.js index 6fcbd917e4..f57f4307dc 100644 --- a/o2web/source/o2_core/o2/xAction/services/x_okr_assemble_control.js +++ b/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){ diff --git a/o2web/source/o2_core/o2/xAction/services/x_processplatform_assemble_surface.js b/o2web/source/o2_core/o2/xAction/services/x_processplatform_assemble_surface.js index a04b563dc4..8ac3d8e4f6 100644 --- a/o2web/source/o2_core/o2/xAction/services/x_processplatform_assemble_surface.js +++ b/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){ diff --git a/o2web/source/o2_core/o2/xAction/services/x_report_assemble_control.js b/o2web/source/o2_core/o2/xAction/services/x_report_assemble_control.js index 4d8c34d017..329a553c8d 100644 --- a/o2web/source/o2_core/o2/xAction/services/x_report_assemble_control.js +++ b/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){ diff --git a/o2web/source/o2_core/o2/xAction/services/x_strategydeploy_assemble_control.js b/o2web/source/o2_core/o2/xAction/services/x_strategydeploy_assemble_control.js index 17a1c47f2a..5d06167fc6 100644 --- a/o2web/source/o2_core/o2/xAction/services/x_strategydeploy_assemble_control.js +++ b/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)); }, ///////////////////////////五项/////////////////////////////// diff --git a/o2web/source/o2_core/o2/xAction/services/x_teamwork_assemble_control.js b/o2web/source/o2_core/o2/xAction/services/x_teamwork_assemble_control.js index 76fb046885..e5de70b16e 100644 --- a/o2web/source/o2_core/o2/xAction/services/x_teamwork_assemble_control.js +++ b/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)); }, -- GitLab