From 36d15f189de2e83ce2576715dac30c3c260388dd Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:47:50 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/experiences/Consumable1/views/文件関連リスト.json | 82 ++++++++++++++++++++++-------------------
1 files changed, 44 insertions(+), 38 deletions(-)
diff --git "a/force-app/main/default/experiences/Consumable1/views/\346\226\207\344\273\266\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Consumable1/views/\346\226\207\344\273\266\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
index 980c3cc..89ca2ae 100644
--- "a/force-app/main/default/experiences/Consumable1/views/\346\226\207\344\273\266\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
+++ "b/force-app/main/default/experiences/Consumable1/views/\346\226\207\344\273\266\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
@@ -1,39 +1,45 @@
{
- "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
- "componentName" : "siteforce:sldsOneColLayout",
- "dataProviders" : [ ],
- "id" : "3d5f9dc6-9374-4d60-8e41-d9ae76e732e3",
- "label" : "鏂囦欢 闁㈤�ｃ儶銈广儓",
- "regions" : [ {
- "id" : "746cff4c-6e69-4feb-a676-a5a1d40dda0b",
- "regionName" : "header",
- "type" : "region"
- }, {
- "components" : [ {
- "componentAttributes" : {
- "customTitle" : "",
- "parentRecordId" : "{!recordId}",
- "relatedListName" : "{!relationshipApiName}",
- "showBreadCrumbs" : true,
- "showCustomTitle" : false,
- "showManualRefreshButton" : true,
- "showRowNumbers" : true
- },
- "componentName" : "forceCommunity:relatedList",
- "id" : "966621e8-a647-4bdb-9a9e-63d9f46132d4",
- "renderPriority" : "NEUTRAL",
- "renditionMap" : { },
- "type" : "component"
- } ],
- "id" : "5f5b300a-ff22-4632-8889-d9ed5bc3399d",
- "regionName" : "content",
- "type" : "region"
- }, {
- "id" : "2ce507fd-d529-4d11-a2cc-e0c9cd56c0f1",
- "regionName" : "footer",
- "type" : "region"
- } ],
- "themeLayoutType" : "Inner",
- "type" : "view",
- "viewType" : "relatedlist-069"
-}
\ No newline at end of file
+ "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName": "siteforce:sldsOneColLayout",
+ "dataProviders": [],
+ "id": "3d5f9dc6-9374-4d60-8e41-d9ae76e732e3",
+ "label": "鏂囦欢 闁㈤�ｃ儶銈广儓",
+ "regions": [
+ {
+ "id": "746cff4c-6e69-4feb-a676-a5a1d40dda0b",
+ "regionName": "header",
+ "type": "region"
+ },
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "customTitle": "",
+ "parentRecordId": "{!recordId}",
+ "relatedListName": "{!relationshipApiName}",
+ "showBreadCrumbs": true,
+ "showCustomTitle": false,
+ "showManualRefreshButton": true,
+ "showRowNumbers": true
+ },
+ "componentName": "forceCommunity:relatedList",
+ "id": "966621e8-a647-4bdb-9a9e-63d9f46132d4",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "5f5b300a-ff22-4632-8889-d9ed5bc3399d",
+ "regionName": "content",
+ "type": "region"
+ },
+ {
+ "id": "2ce507fd-d529-4d11-a2cc-e0c9cd56c0f1",
+ "regionName": "footer",
+ "type": "region"
+ }
+ ],
+ "themeLayoutType": "Inner",
+ "type": "view",
+ "viewType": "relatedlist-069"
+}
--
Gitblit v1.9.1