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/Site3/views/进口单证明细.json | 145 ++++++++++++++++++++++++++----------------------
1 files changed, 79 insertions(+), 66 deletions(-)
diff --git "a/force-app/main/default/experiences/Site3/views/\350\277\233\345\217\243\345\215\225\350\257\201\346\230\216\347\273\206.json" "b/force-app/main/default/experiences/Site3/views/\350\277\233\345\217\243\345\215\225\350\257\201\346\230\216\347\273\206.json"
index 51334c4..a950457 100644
--- "a/force-app/main/default/experiences/Site3/views/\350\277\233\345\217\243\345\215\225\350\257\201\346\230\216\347\273\206.json"
+++ "b/force-app/main/default/experiences/Site3/views/\350\277\233\345\217\243\345\215\225\350\257\201\346\230\216\347\273\206.json"
@@ -1,68 +1,81 @@
{
- "appPageId" : "7f290f39-4245-4612-9453-2b0c9f9e3701",
- "componentName" : "siteforce:dynamicLayout",
- "dataProviders" : [ ],
- "id" : "793767ac-c71a-49a2-ba5a-591a85646551",
- "label" : "杩涘彛鍗曡瘉鏄庣粏",
- "regions" : [ {
- "components" : [ {
- "componentAttributes" : {
- "background" : "background: rgba(0,0,0,0)",
- "backgroundOverlay" : "rgba(0,0,0,0.5)",
- "contentAreaWidth" : 100,
- "sectionConfig" : {
- "UUID" : "f248bb54-1de0-4045-a694-6878661820df",
- "columns" : [ {
- "UUID" : "73f32934-3d6d-4797-b1fd-7b87702e1e1e",
- "columnKey" : "1",
- "columnName" : "Column 1",
- "columnWidth" : "12",
- "seedComponents" : [ ]
- } ]
+ "appPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
+ "componentName": "siteforce:dynamicLayout",
+ "dataProviders": [],
+ "id": "793767ac-c71a-49a2-ba5a-591a85646551",
+ "label": "杩涘彛鍗曡瘉鏄庣粏",
+ "regions": [
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "background": "background: rgba(0,0,0,0)",
+ "backgroundOverlay": "rgba(0,0,0,0.5)",
+ "contentAreaWidth": 100,
+ "sectionConfig": {
+ "UUID": "f248bb54-1de0-4045-a694-6878661820df",
+ "columns": [
+ {
+ "UUID": "73f32934-3d6d-4797-b1fd-7b87702e1e1e",
+ "columnKey": "1",
+ "columnName": "Column 1",
+ "columnWidth": "12",
+ "seedComponents": []
+ }
+ ]
+ },
+ "sectionHeight": 300
+ },
+ "componentName": "forceCommunity:section",
+ "id": "f248bb54-1de0-4045-a694-6878661820df",
+ "regions": [
+ {
+ "components": [
+ {
+ "componentAttributes": {},
+ "componentName": "c:AttachmentDisplay",
+ "id": "e1758a66-b8a1-45af-ae6e-03125b843456",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "73f32934-3d6d-4797-b1fd-7b87702e1e1e",
+ "regionLabel": "Column 1",
+ "regionName": "1",
+ "renditionMap": {},
+ "type": "region"
+ }
+ ],
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "5ce20936-231e-48fd-8417-dba7d007a09f",
+ "regionName": "content",
+ "type": "region"
},
- "sectionHeight" : 300
- },
- "componentName" : "forceCommunity:section",
- "id" : "f248bb54-1de0-4045-a694-6878661820df",
- "regions" : [ {
- "components" : [ {
- "componentAttributes" : { },
- "componentName" : "c:AttachmentDisplay",
- "id" : "e1758a66-b8a1-45af-ae6e-03125b843456",
- "renderPriority" : "NEUTRAL",
- "renditionMap" : { },
- "type" : "component"
- } ],
- "id" : "73f32934-3d6d-4797-b1fd-7b87702e1e1e",
- "regionLabel" : "Column 1",
- "regionName" : "1",
- "renditionMap" : { },
- "type" : "region"
- } ],
- "renderPriority" : "NEUTRAL",
- "renditionMap" : { },
- "type" : "component"
- } ],
- "id" : "5ce20936-231e-48fd-8417-dba7d007a09f",
- "regionName" : "content",
- "type" : "region"
- }, {
- "components" : [ {
- "componentAttributes" : {
- "customHeadTags" : "",
- "description" : "",
- "title" : "杩涘彛鍗曡瘉鏄庣粏"
- },
- "componentName" : "forceCommunity:seoAssistant",
- "id" : "f149154f-4929-4eb1-b363-1c35f2c0a852",
- "renditionMap" : { },
- "type" : "component"
- } ],
- "id" : "f6d5daee-acfb-4753-8635-5d29ed2e46e9",
- "regionName" : "sfdcHiddenRegion",
- "type" : "region"
- } ],
- "themeLayoutType" : "Inner",
- "type" : "view",
- "viewType" : "custom-attachment-display"
-}
\ No newline at end of file
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "customHeadTags": "",
+ "description": "",
+ "title": "杩涘彛鍗曡瘉鏄庣粏"
+ },
+ "componentName": "forceCommunity:seoAssistant",
+ "id": "f149154f-4929-4eb1-b363-1c35f2c0a852",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "f6d5daee-acfb-4753-8635-5d29ed2e46e9",
+ "regionName": "sfdcHiddenRegion",
+ "type": "region"
+ }
+ ],
+ "themeLayoutType": "Inner",
+ "type": "view",
+ "viewType": "custom-attachment-display"
+}
--
Gitblit v1.9.1