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/lexConsumableAccount.json | 145 ++++++++++++++++++++++++++----------------------
1 files changed, 79 insertions(+), 66 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable1/views/lexConsumableAccount.json b/force-app/main/default/experiences/Consumable1/views/lexConsumableAccount.json
index 77619fe..551fe2d 100644
--- a/force-app/main/default/experiences/Consumable1/views/lexConsumableAccount.json
+++ b/force-app/main/default/experiences/Consumable1/views/lexConsumableAccount.json
@@ -1,68 +1,81 @@
{
- "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
- "componentName" : "siteforce:dynamicLayout",
- "dataProviders" : [ ],
- "id" : "65a5c9a4-0cc9-4b00-872b-b90bc1e47411",
- "label" : "LexConsumableAccount",
- "regions" : [ {
- "components" : [ {
- "componentAttributes" : {
- "background" : "background: rgba(0,0,0,0)",
- "backgroundOverlay" : "rgba(0,0,0,0.5)",
- "contentAreaWidth" : 100,
- "sectionConfig" : {
- "UUID" : "21aff1b6-3fc5-4eaa-9c90-3909310f21fa",
- "columns" : [ {
- "UUID" : "600f91f5-1068-4b1f-8a86-d0a193bce882",
- "columnKey" : "1",
- "columnName" : "Column 1",
- "columnWidth" : "12",
- "seedComponents" : [ ]
- } ]
+ "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName": "siteforce:dynamicLayout",
+ "dataProviders": [],
+ "id": "65a5c9a4-0cc9-4b00-872b-b90bc1e47411",
+ "label": "LexConsumableAccount",
+ "regions": [
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "background": "background: rgba(0,0,0,0)",
+ "backgroundOverlay": "rgba(0,0,0,0.5)",
+ "contentAreaWidth": 100,
+ "sectionConfig": {
+ "UUID": "21aff1b6-3fc5-4eaa-9c90-3909310f21fa",
+ "columns": [
+ {
+ "UUID": "600f91f5-1068-4b1f-8a86-d0a193bce882",
+ "columnKey": "1",
+ "columnName": "Column 1",
+ "columnWidth": "12",
+ "seedComponents": []
+ }
+ ]
+ },
+ "sectionHeight": 300
+ },
+ "componentName": "forceCommunity:section",
+ "id": "21aff1b6-3fc5-4eaa-9c90-3909310f21fa",
+ "regions": [
+ {
+ "components": [
+ {
+ "componentAttributes": {},
+ "componentName": "c:lexConsumableAccount",
+ "id": "5ad65eac-4ab2-4e31-823f-241cd8a31b77",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "600f91f5-1068-4b1f-8a86-d0a193bce882",
+ "regionLabel": "Column 1",
+ "regionName": "1",
+ "renditionMap": {},
+ "type": "region"
+ }
+ ],
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "da25695d-f912-48f0-a829-ff77681dea16",
+ "regionName": "content",
+ "type": "region"
},
- "sectionHeight" : 300
- },
- "componentName" : "forceCommunity:section",
- "id" : "21aff1b6-3fc5-4eaa-9c90-3909310f21fa",
- "regions" : [ {
- "components" : [ {
- "componentAttributes" : { },
- "componentName" : "c:lexConsumableAccount",
- "id" : "5ad65eac-4ab2-4e31-823f-241cd8a31b77",
- "renderPriority" : "NEUTRAL",
- "renditionMap" : { },
- "type" : "component"
- } ],
- "id" : "600f91f5-1068-4b1f-8a86-d0a193bce882",
- "regionLabel" : "Column 1",
- "regionName" : "1",
- "renditionMap" : { },
- "type" : "region"
- } ],
- "renderPriority" : "NEUTRAL",
- "renditionMap" : { },
- "type" : "component"
- } ],
- "id" : "da25695d-f912-48f0-a829-ff77681dea16",
- "regionName" : "content",
- "type" : "region"
- }, {
- "components" : [ {
- "componentAttributes" : {
- "customHeadTags" : "",
- "description" : "",
- "title" : "瀹㈡埛 ~ 娑堣�楀搧绠＄悊绯荤粺"
- },
- "componentName" : "forceCommunity:seoAssistant",
- "id" : "34026022-6682-46cb-920f-4c24fbf656f8",
- "renditionMap" : { },
- "type" : "component"
- } ],
- "id" : "149173b3-ab4a-47d1-824b-c73e4cee068d",
- "regionName" : "sfdcHiddenRegion",
- "type" : "region"
- } ],
- "themeLayoutType" : "Inner",
- "type" : "view",
- "viewType" : "custom-lexconsumableaccount"
-}
\ No newline at end of file
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "customHeadTags": "",
+ "description": "",
+ "title": "瀹㈡埛 ~ 娑堣�楀搧绠＄悊绯荤粺"
+ },
+ "componentName": "forceCommunity:seoAssistant",
+ "id": "34026022-6682-46cb-920f-4c24fbf656f8",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "149173b3-ab4a-47d1-824b-c73e4cee068d",
+ "regionName": "sfdcHiddenRegion",
+ "type": "region"
+ }
+ ],
+ "themeLayoutType": "Inner",
+ "type": "view",
+ "viewType": "custom-lexconsumableaccount"
+}
--
Gitblit v1.9.1