From dd1c643be561ebfbb521431b49d6e1e65bfcbd81 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:49:07 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/experiences/Consumable1/views/学会・培训詳細.json | 140 +++++++++++++++++++++++++---------------------
1 files changed, 75 insertions(+), 65 deletions(-)
diff --git "a/force-app/main/default/experiences/Consumable1/views/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255\350\251\263\347\264\260.json" "b/force-app/main/default/experiences/Consumable1/views/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255\350\251\263\347\264\260.json"
index e68449d..b2a90ea 100644
--- "a/force-app/main/default/experiences/Consumable1/views/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255\350\251\263\347\264\260.json"
+++ "b/force-app/main/default/experiences/Consumable1/views/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255\350\251\263\347\264\260.json"
@@ -1,66 +1,76 @@
{
- "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
- "componentName" : "siteforce:sldsOneColLayout",
- "dataProviders" : [ ],
- "id" : "0ad6b8ab-53a5-4a50-a8e4-2cb763631aab",
- "label" : "瀛︿細銉诲煿璁� 瑭崇窗",
- "regions" : [ {
- "id" : "a8e33a85-eba0-4b3c-972d-7829e6b042b4",
- "regionName" : "header",
- "type" : "region"
- }, {
- "components" : [ {
- "componentAttributes" : {
- "recordId" : "{!recordId}"
- },
- "componentName" : "forceCommunity:recordHeadline",
- "id" : "592d5f10-3298-4046-9188-b6d553c00d61",
- "renderPriority" : "NEUTRAL",
- "renditionMap" : { },
- "type" : "component"
- }, {
- "componentAttributes" : {
- "detailsTabLabel" : "Details",
- "discussionsTabLabel" : "Feed",
- "recordId" : "{!recordId}",
- "relatedTabLabel" : "Related",
- "showLegacyActivityComposer" : false,
- "tab1Type" : "details",
- "tab2Type" : "related",
- "tab3Type" : "chatter",
- "tab4Type" : "none",
- "timelineTabLabel" : "Activity"
- },
- "componentName" : "forceCommunity:recordHomeTabs",
- "id" : "d832effc-9f0a-4aca-bc93-87384e150066",
- "renderPriority" : "NEUTRAL",
- "renditionMap" : { },
- "type" : "component"
- } ],
- "id" : "898fe2f9-0d89-483a-b133-91df0a115989",
- "regionName" : "content",
- "type" : "region"
- }, {
- "id" : "3c9b71ac-95f1-4237-b65e-45a8dbcbf70e",
- "regionName" : "footer",
- "type" : "region"
- }, {
- "components" : [ {
- "componentAttributes" : {
- "customHeadTags" : "",
- "description" : "",
- "title" : "{!Record._Object}: {!Record._Title}"
- },
- "componentName" : "forceCommunity:seoAssistant",
- "id" : "f68810fc-4086-4193-a0d7-a8e8d181c7e2",
- "renditionMap" : { },
- "type" : "component"
- } ],
- "id" : "b9a30282-520a-436a-9688-5153df33ee48",
- "regionName" : "sfdcHiddenRegion",
- "type" : "region"
- } ],
- "themeLayoutType" : "Inner",
- "type" : "view",
- "viewType" : "detail-701"
-}
\ No newline at end of file
+ "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName": "siteforce:sldsOneColLayout",
+ "dataProviders": [],
+ "id": "0ad6b8ab-53a5-4a50-a8e4-2cb763631aab",
+ "label": "瀛︿細銉诲煿璁� 瑭崇窗",
+ "regions": [
+ {
+ "id": "a8e33a85-eba0-4b3c-972d-7829e6b042b4",
+ "regionName": "header",
+ "type": "region"
+ },
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "recordId": "{!recordId}"
+ },
+ "componentName": "forceCommunity:recordHeadline",
+ "id": "592d5f10-3298-4046-9188-b6d553c00d61",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ },
+ {
+ "componentAttributes": {
+ "detailsTabLabel": "Details",
+ "discussionsTabLabel": "Feed",
+ "recordId": "{!recordId}",
+ "relatedTabLabel": "Related",
+ "showLegacyActivityComposer": false,
+ "tab1Type": "details",
+ "tab2Type": "related",
+ "tab3Type": "chatter",
+ "tab4Type": "none",
+ "timelineTabLabel": "Activity"
+ },
+ "componentName": "forceCommunity:recordHomeTabs",
+ "id": "d832effc-9f0a-4aca-bc93-87384e150066",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "898fe2f9-0d89-483a-b133-91df0a115989",
+ "regionName": "content",
+ "type": "region"
+ },
+ {
+ "id": "3c9b71ac-95f1-4237-b65e-45a8dbcbf70e",
+ "regionName": "footer",
+ "type": "region"
+ },
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "customHeadTags": "",
+ "description": "",
+ "title": "{!Record._Object}: {!Record._Title}"
+ },
+ "componentName": "forceCommunity:seoAssistant",
+ "id": "f68810fc-4086-4193-a0d7-a8e8d181c7e2",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "b9a30282-520a-436a-9688-5153df33ee48",
+ "regionName": "sfdcHiddenRegion",
+ "type": "region"
+ }
+ ],
+ "themeLayoutType": "Inner",
+ "type": "view",
+ "viewType": "detail-701"
+}
--
Gitblit v1.9.1