From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte
---
force-app/main/default/pages/AttachmentPreview.page | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/force-app/main/default/pages/AttachmentPreview.page b/force-app/main/default/pages/AttachmentPreview.page
index 9d63aae..ebb7737 100644
--- a/force-app/main/default/pages/AttachmentPreview.page
+++ b/force-app/main/default/pages/AttachmentPreview.page
@@ -1,14 +1,12 @@
-<apex:page action="{!init}" controller="AttachmentPreviewController" id="allPage" showheader="false" sidebar="false">
+<apex:page action="{!init}" controller="AttachmentPreviewController" id="allPage" showheader="false" sidebar="false" lightningStylesheets="true">
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}">
</apex:stylesheet>
<apex:includescript value="{!URLFOR($Resource.jquery183minjs)}">
</apex:includescript>
<apex:includescript value="{!URLFOR($Resource.PleaseWaitDialog)}">
</apex:includescript>
- <apex:includescript value="/soap/ajax/29.0/connection.js">
- </apex:includescript>
- <apex:includescript value="/soap/ajax/29.0/apex.js">
- </apex:includescript>
+ <apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
+ <apex:includeScript value="{!URLFOR($Resource.apex20)}"/>
<style type="text/css">
body {
margin: 0;
@@ -81,12 +79,12 @@
alert("IE娴忚鍣ㄤ笉鑳芥墦寮�鍚庣紑鏄痓mp鐨勬枃浠讹紝璇蜂娇鐢ㄥ叾浠栨祻瑙堝櫒锛�");
}
else{
- window.location.href=' https://ocsm--stagefull--c.visualforce.com/apex/eSignFormAttachment?id='+id;
- // window.location.href=' https://ocsm--c.ap0.visual.force.com/apex/eSignFormAttachment?id='+id;
+ // window.location.href=' https://ocsm--stagefull--c.visualforce.com/apex/eSignFormAttachment?id='+id;
+ window.location.href=' https://ocsm--c.ap0.visual.force.com/apex/eSignFormAttachment?id='+id;
}
}else{
- window.location.href='https://ocsm--stagefull--c.documentforce.com/servlet/servlet.FileDownload?file='+id;
- // window.location.href='https://ocsm--c.ap0.content.force.com/servlet/servlet.FileDownload?file='+id;
+ // window.location.href='https://ocsm--stagefull--c.documentforce.com/servlet/servlet.FileDownload?file='+id;
+ window.location.href='https://ocsm--c.ap0.content.force.com/servlet/servlet.FileDownload?file='+id;
}
}
@@ -96,8 +94,8 @@
// 杩斿洖鎸夐挳鏍规嵁浼爄d杩斿洖涓婁竴绾ф搷浣�
function test(){
var queryVal=GetQueryValue('parentId');
- var url='https://ocsm--stagefull.my.salesforce.com/'+queryVal;
- // var url='https://ocsm.my.salesforce.com/'+queryVal;
+ // var url='https://ocsm--stagefull.my.salesforce.com/'+queryVal;
+ var url='https://ocsm.my.salesforce.com/'+queryVal;
window.location.href=url;
}
// 20201224 liying end
--
Gitblit v1.9.1