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/lexArriveGsDetails.json | 145 ++++++++++++++++++++++++++----------------------
1 files changed, 79 insertions(+), 66 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable1/views/lexArriveGsDetails.json b/force-app/main/default/experiences/Consumable1/views/lexArriveGsDetails.json
index 578cd6c..e854949 100644
--- a/force-app/main/default/experiences/Consumable1/views/lexArriveGsDetails.json
+++ b/force-app/main/default/experiences/Consumable1/views/lexArriveGsDetails.json
@@ -1,68 +1,81 @@
{
- "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
- "componentName" : "siteforce:dynamicLayout",
- "dataProviders" : [ ],
- "id" : "91695311-fdcc-4e42-87ca-c97cfd56a2b0",
- "label" : "LexArriveGsDetails",
- "regions" : [ {
- "components" : [ {
- "componentAttributes" : {
- "background" : "background: rgba(0,0,0,0)",
- "backgroundOverlay" : "rgba(0,0,0,0.5)",
- "contentAreaWidth" : 100,
- "sectionConfig" : {
- "UUID" : "08f6ef6f-e105-4de7-9aaa-1f114864bdc7",
- "columns" : [ {
- "UUID" : "08d81f90-ef1a-4686-a0e9-cc3913ed0973",
- "columnKey" : "1",
- "columnName" : "Column 1",
- "columnWidth" : "12",
- "seedComponents" : [ ]
- } ]
+ "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName": "siteforce:dynamicLayout",
+ "dataProviders": [],
+ "id": "91695311-fdcc-4e42-87ca-c97cfd56a2b0",
+ "label": "LexArriveGsDetails",
+ "regions": [
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "background": "background: rgba(0,0,0,0)",
+ "backgroundOverlay": "rgba(0,0,0,0.5)",
+ "contentAreaWidth": 100,
+ "sectionConfig": {
+ "UUID": "08f6ef6f-e105-4de7-9aaa-1f114864bdc7",
+ "columns": [
+ {
+ "UUID": "08d81f90-ef1a-4686-a0e9-cc3913ed0973",
+ "columnKey": "1",
+ "columnName": "Column 1",
+ "columnWidth": "12",
+ "seedComponents": []
+ }
+ ]
+ },
+ "sectionHeight": 300
+ },
+ "componentName": "forceCommunity:section",
+ "id": "08f6ef6f-e105-4de7-9aaa-1f114864bdc7",
+ "regions": [
+ {
+ "components": [
+ {
+ "componentAttributes": {},
+ "componentName": "c:lexArriveGsDetails",
+ "id": "18ff9dd3-7039-4ffb-8d15-faa606335456",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "08d81f90-ef1a-4686-a0e9-cc3913ed0973",
+ "regionLabel": "Column 1",
+ "regionName": "1",
+ "renditionMap": {},
+ "type": "region"
+ }
+ ],
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "2ed898cb-77b1-437e-8eca-16a3a98927e0",
+ "regionName": "content",
+ "type": "region"
},
- "sectionHeight" : 300
- },
- "componentName" : "forceCommunity:section",
- "id" : "08f6ef6f-e105-4de7-9aaa-1f114864bdc7",
- "regions" : [ {
- "components" : [ {
- "componentAttributes" : { },
- "componentName" : "c:lexArriveGsDetails",
- "id" : "18ff9dd3-7039-4ffb-8d15-faa606335456",
- "renderPriority" : "NEUTRAL",
- "renditionMap" : { },
- "type" : "component"
- } ],
- "id" : "08d81f90-ef1a-4686-a0e9-cc3913ed0973",
- "regionLabel" : "Column 1",
- "regionName" : "1",
- "renditionMap" : { },
- "type" : "region"
- } ],
- "renderPriority" : "NEUTRAL",
- "renditionMap" : { },
- "type" : "component"
- } ],
- "id" : "2ed898cb-77b1-437e-8eca-16a3a98927e0",
- "regionName" : "content",
- "type" : "region"
- }, {
- "components" : [ {
- "componentAttributes" : {
- "customHeadTags" : "",
- "description" : "",
- "title" : "鍒拌揣 ~ 娑堣�楀搧绠＄悊绯荤粺"
- },
- "componentName" : "forceCommunity:seoAssistant",
- "id" : "961b31ea-175a-4e22-8256-be31f553c70c",
- "renditionMap" : { },
- "type" : "component"
- } ],
- "id" : "034871d6-1f2c-43f2-81d3-0e46a864ad33",
- "regionName" : "sfdcHiddenRegion",
- "type" : "region"
- } ],
- "themeLayoutType" : "Inner",
- "type" : "view",
- "viewType" : "custom-lexarrivegsdetails"
-}
\ No newline at end of file
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "customHeadTags": "",
+ "description": "",
+ "title": "鍒拌揣 ~ 娑堣�楀搧绠＄悊绯荤粺"
+ },
+ "componentName": "forceCommunity:seoAssistant",
+ "id": "961b31ea-175a-4e22-8256-be31f553c70c",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "034871d6-1f2c-43f2-81d3-0e46a864ad33",
+ "regionName": "sfdcHiddenRegion",
+ "type": "region"
+ }
+ ],
+ "themeLayoutType": "Inner",
+ "type": "view",
+ "viewType": "custom-lexarrivegsdetails"
+}
--
Gitblit v1.9.1