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/aura/NewAgencyContact/NewAgencyContactController.js |   34 +++++++++++++++++++++++++++++-----
 1 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/force-app/main/default/aura/NewAgencyContact/NewAgencyContactController.js b/force-app/main/default/aura/NewAgencyContact/NewAgencyContactController.js
index 08b932a..49f4c47 100644
--- a/force-app/main/default/aura/NewAgencyContact/NewAgencyContactController.js
+++ b/force-app/main/default/aura/NewAgencyContact/NewAgencyContactController.js
@@ -5,13 +5,24 @@
         if(!rid){
             pid = window.location.href.replace("https://","").split("/")[4];
         }
+        let isClone = component.get('v.isClone');
+        if(!rid || isClone){
+            component.set('v.title',$A.get("$Label.c.New")+'.瀹㈡埛浜哄憳');
+        }else{
+            component.set('v.title',$A.get("$Label.c.Edit")+'.瀹㈡埛浜哄憳');
+        }
         
+        let record_type_id = null;
+        let pageref = component.get("v.pageReference")
+        if(!record_type_id && pageref){
+           record_type_id = pageref.state.recordTypeId
+        }
         component.set("v.showSpinner", true);
         helper.CallBackAction(component,'Init',{
             rid : rid,
             pid : pid,
             //rid : component.get('v.recordId'),
-            record_type_id : component.get("v.pageReference").state.recordTypeId,
+            record_type_id : record_type_id,
         },function(data){
             component.set("v.showSpinner", false);
             
@@ -106,9 +117,12 @@
         
         let staticResource = component.get('v.staticResource');
         let record_id = component.get('v.recordId');
+        let record_type_id = component.get('v.recordTypeId');
+        
+        let isClone = component.get('v.isClone');
         let url = staticResource.newUrl;
         let payloadPi = {};
-        if (record_id) {
+        if (record_id && !isClone) {
             url = staticResource.updateUrl
             payloadPi['dataId'] = component.get('v.record_data').AWS_Data_Id__c;
         }
@@ -125,6 +139,13 @@
                     }
 
                     if (item.behavior == "Required" && !item.value ) {
+                        let fs = component.find("field");
+                        for(let fi in fs){
+                            let f = fs[fi];
+                            if(!f.get('v.value')){
+                                f.reset();
+                            }
+                        }
                         return;
                     }
                 }
@@ -136,7 +157,7 @@
             
             let obj = result.object[0];
             let data = {};
-            if(record_id){
+            if(record_id && !isClone){
                 data.Id = record_id;
             }else{
                 data.AWS_Data_Id__c = obj.dataId;
@@ -167,7 +188,10 @@
                     if(data.getState() == "SUCCESS"){
                         var rv = data.getReturnValue();
                         console.log(rv);
-                        var sfId = rv.Data.recordId;
+                        var sfId = null;
+                        if(rv.IsSuccess){
+                            sfId = rv.Data.recordId;
+                        }
                         
                         helper.AwsPost(staticResource.transactionUrl,{
                             txId: result.txId,
@@ -180,7 +204,7 @@
                                     "type" : "success"
                                 });
                                 
-                                if (record_id){
+                                if (record_id && !isClone){
                                     
                                     $A.get("e.force:closeQuickAction").fire();
                                     $A.get('e.force:refreshView').fire();

--
Gitblit v1.9.1