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/lexOutboundorderImport.json | 126 +++++++++++++++++++++++++----------------
1 files changed, 76 insertions(+), 50 deletions(-)
diff --git a/force-app/main/default/experiences/Consumable1/views/lexOutboundorderImport.json b/force-app/main/default/experiences/Consumable1/views/lexOutboundorderImport.json
index 514a9da..177a5b9 100644
--- a/force-app/main/default/experiences/Consumable1/views/lexOutboundorderImport.json
+++ b/force-app/main/default/experiences/Consumable1/views/lexOutboundorderImport.json
@@ -1,55 +1,81 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "f8b18a5a-4f37-46d3-946e-3c5307c081e6",
- "label": "LexOutboundorderImport",
- "regions": [
- {
- "components": [
+ "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName": "siteforce:dynamicLayout",
+ "dataProviders": [],
+ "id": "e8224149-f1b9-4c44-8839-4d9737739c72",
+ "label": "LexOutboundorderImport",
+ "regions": [
{
- "componentAttributes": {},
- "componentName": "c:lexOutboundorderImport",
- "id": "3a2da04d-2fb3-4dc7-aadc-40c9a0fb049e",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
- }
- ],
- "id": "280aa141-39f4-4ce6-8d22-f8c7132cc3bf",
- "regionName": "header",
- "type": "region"
- },
- {
- "id": "396f0d91-64bb-48dd-a3c8-428458d7b4d1",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "a2a09aa1-691c-44b4-b20a-6450cfe54c0b",
- "regionName": "footer",
- "type": "region"
- },
- {
- "components": [
+ "components": [
+ {
+ "componentAttributes": {
+ "background": "background: rgba(0,0,0,0)",
+ "backgroundOverlay": "rgba(0,0,0,0.5)",
+ "contentAreaWidth": 100,
+ "sectionConfig": {
+ "UUID": "83050955-aa3b-4e32-80a6-da5359b8362a",
+ "columns": [
+ {
+ "UUID": "fbfcccd6-3c29-49b4-9a8b-ce0fadccab60",
+ "columnKey": "1",
+ "columnName": "Column 1",
+ "columnWidth": "12",
+ "seedComponents": []
+ }
+ ]
+ },
+ "sectionHeight": 300
+ },
+ "componentName": "forceCommunity:section",
+ "id": "83050955-aa3b-4e32-80a6-da5359b8362a",
+ "regions": [
+ {
+ "components": [
+ {
+ "componentAttributes": {},
+ "componentName": "c:lexOutboundorderImport",
+ "id": "68e59073-ba5b-46d7-b8cd-552587a748a2",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "fbfcccd6-3c29-49b4-9a8b-ce0fadccab60",
+ "regionLabel": "Column 1",
+ "regionName": "1",
+ "renditionMap": {},
+ "type": "region"
+ }
+ ],
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "f58362fc-b12d-41ba-bb99-fce2e6dba3fb",
+ "regionName": "content",
+ "type": "region"
+ },
{
- "componentAttributes": {
- "customHeadTags": "",
- "description": "",
- "title": "娑堣�楀搧绠＄悊绯荤粺"
- },
- "componentName": "forceCommunity:seoAssistant",
- "id": "20aa6845-e7bd-4cec-814f-c8a4422f0dd6",
- "renditionMap": {},
- "type": "component"
+ "components": [
+ {
+ "componentAttributes": {
+ "customHeadTags": "",
+ "description": "",
+ "title": "鍑哄簱 ~ 娑堣�楀搧绠＄悊绯荤粺"
+ },
+ "componentName": "forceCommunity:seoAssistant",
+ "id": "e562ea3b-ac29-4271-9010-481f74d59780",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "ddc00cfb-8eb3-49b7-8d9a-44ac4fe1979b",
+ "regionName": "sfdcHiddenRegion",
+ "type": "region"
}
- ],
- "id": "bb3f92d2-e08e-411c-9a7b-196a86da29d6",
- "regionName": "sfdcHiddenRegion",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "custom-lexoutboundorderimport"
+ ],
+ "themeLayoutType": "Inner",
+ "type": "view",
+ "viewType": "custom-lexoutboundorderimport"
}
--
Gitblit v1.9.1