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/ReportExport.page |   61 +++++++-----------------------
 1 files changed, 14 insertions(+), 47 deletions(-)

diff --git a/force-app/main/default/pages/ReportExport.page b/force-app/main/default/pages/ReportExport.page
index 97f9728..ff74a69 100644
--- a/force-app/main/default/pages/ReportExport.page
+++ b/force-app/main/default/pages/ReportExport.page
@@ -1,4 +1,4 @@
-<apex:page id="page" controller="ReportExportClass">
+<apex:page id="page" controller="RentalReportExportController" lightningStylesheets="true">
     <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}" />
     <apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}" />
     <apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}" />
@@ -19,11 +19,14 @@
         <script>
             // sforce.connection.sessionId = '{!GETSESSIONID()}'; 
             var awsList = [];
-            var staticResources = JSON.parse('{!staticResource}');
-            var fieldSize = '{!fieldSize}';
+            var staticResources = JSON.parse('{!staticResourceContact}');
 
-            function remove() {
-                
+            window.onload = function isVisibility() {
+                var reportAll = document.getElementById('exportAllData');
+                var isContactAll = {!isContactAll};
+                if(isContactAll){
+                    reportAll.classList.remove("hideshow")
+                }
             }
 
             function getPIPayload() {
@@ -53,32 +56,12 @@
                         dict['value'] = valuesField.value;
                     }
                 }
-                console.log('size: ' + fieldSize);
                 console.log(dict);
                 awsList.push(dict);
-
-
-                // for (let index = 0; index < fieldsInputList.length; index++) {
-                //     let dict = {};
-                //     let namesField = document.getElementById("page:form:repeatBlock:repeat:"+index+":chooseField");
-                //     let optionsField = document.getElementById("page:form:repeatBlock:repeat:"+index+":chooseOperation");
-                //     let valuesField = document.getElementById("page:form:repeatBlock:repeat:"+index+":inputText");
-                //     if (namesField) {
-                //         dict['name'] = namesField.value.toLowerCase();
-                //     }
-                //     if (optionsField) {
-                //         dict['operator'] = optionsField.value;
-                //     }
-                //     if (valuesField) {
-                //         dict['value'] = valuesField.value;
-                //     }
-                //     console.log(dict);
-                // }
                 return JSON.stringify(awsList);
             }
 
             function exportsAllData(){
-                
                 let requestAllSearchPayload = [];
                 console.log('requestSearchPayload ' + requestAllSearchPayload);
                 let queryBackContactName = function queryBackContactName(result){
@@ -86,16 +69,11 @@
                     var blob = new Blob(["\ufeff", result]);
                     var link = document.createElement('a');
                     link.href = window.URL.createObjectURL(blob);
-                    // let csvContent = "data:text/csv;charset=utf-8,\ufeff" 
-                    //     +result;
-                    // let encodedUri = encodeURI(csvContent);
-                    // let link = document.createElement("a");
-                    // link.setAttribute("href", encodedUri);
                     link.setAttribute("download", "contactAll.csv");
-                    document.body.appendChild(link); // Required for FF
+                    document.body.appendChild(link);
                     unblockUI();
 
-                    link.click(); // This will download the data file named "my_data.csv".
+                    link.click(); 
                 };
                 blockme();
                 AWSService.search(staticResources.reportUrl,requestAllSearchPayload,queryBackContactName,staticResources.token);
@@ -110,16 +88,11 @@
                         var blob = new Blob(["\ufeff", result]);
                         var link = document.createElement('a');
                         link.href = window.URL.createObjectURL(blob);
-                        // let csvContent = "data:text/csv;charset=utf-8,\ufeff" 
-                        //     +result;
-                        // let encodedUri = encodeURI(csvContent);
-                        // let link = document.createElement("a");
-                        // link.setAttribute("href", encodedUri);
                         link.setAttribute("download", "contact.csv");
-                        document.body.appendChild(link); // Required for FF
+                        document.body.appendChild(link); 
                         unblockUI();
 
-                        link.click(); // This will download the data file named "my_data.csv".
+                        link.click(); 
                     };
                     blockme();
                     AWSService.search(staticResources.reportUrl,requestSearchPayload,queryBackContactName,staticResources.token);
@@ -133,28 +106,22 @@
             鎶ヨ〃瀵硅薄锛�
             <br/>
             <apex:selectList id="chooseObject" value="{!selectedObject}" size="1">
-                <apex:selectOptions value="{!objectOptions}"/>
+                <apex:selectOptions value="{!contactOptions}"/>
             </apex:selectList>            
             <apex:pageBlock id="repeatBlock">
                 <apex:repeat id="repeat" value="{!fieldInputList}" var="fieldInput">
-                    <!-- <apex:selectOption value = "{!filedOptions}"/> -->
                     <apex:selectList id="chooseField" value="{!fieldInput.fieldAPI}" size="1">
                         <apex:selectOptions value="{!filedOptions}"/>
                     </apex:selectList> 
-                    <!-- <apex:selectOption value = "{!operationSelectOptions}"/> -->
                     <apex:selectList id="chooseOperation" value="{!fieldInput.operation}" size="1">
-                        <!-- <apex:selectOptions value="{!operationSelectOptions}"/> -->
                         <apex:selectOptions value="{!operationSelectOptions}"/>
                     </apex:selectList> 
                     <apex:inputTextarea id="inputText" value="{!fieldInput.value}" rows="20" cols="35" />
-                    <!-- - &nbsp;&nbsp;+ -->
                     <br />
                 </apex:repeat>
-                <!-- <apex:commandButton id="addFilter" value="娣诲姞绛涢�夊櫒" action="{!addFilter}" reRender="repeatBlock" />
-                <apex:commandButton id="removeFilter" value="鍒犻櫎绛涢�夊櫒" action="{!removeFilter}" reRender="repeatBlock" /> -->
             </apex:pageBlock>
             <input class="btn" type="Button" id="exportData" value="瀵煎嚭" onclick="exportsData()" />    
-            <input class="btn" type="Button" id="exportData" value="瀵煎嚭鍏ㄩ儴鏁版嵁" onclick="exportsAllData()" />                             
+            <input class="btn  hideshow " type="Button" id="exportAllData" value="瀵煎嚭鍏ㄩ儴鏁版嵁" onclick="exportsAllData()" />                             
         </apex:form>
     </body>
 </apex:page>
\ No newline at end of file

--
Gitblit v1.9.1