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/search.json | 108 +++++++++++++++++++++++++++---------------------------
1 files changed, 54 insertions(+), 54 deletions(-)
diff --git a/force-app/main/default/experiences/Site3/views/search.json b/force-app/main/default/experiences/Site3/views/search.json
index a943f5a..9207596 100644
--- a/force-app/main/default/experiences/Site3/views/search.json
+++ b/force-app/main/default/experiences/Site3/views/search.json
@@ -1,59 +1,59 @@
{
- "appPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "1b73e50d-9811-4744-8c07-ffc097aa102a",
- "label": "Search",
- "regions": [
- {
- "id": "5a6cc49b-d707-4df0-a634-7c716a793f2a",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
+ "appPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
+ "componentName": "siteforce:sldsOneColLayout",
+ "dataProviders": [],
+ "id": "1b73e50d-9811-4744-8c07-ffc097aa102a",
+ "label": "Search",
+ "regions": [
{
- "componentAttributes": {
- "scopes": [
- {
- "isPublic": true,
- "name": "FeedPost"
- },
- {
- "isPublic": true,
- "name": "KnowledgeArticleVersion"
- },
- {
- "isPublic": false,
- "name": "Case"
- },
- {
- "isPublic": true,
- "name": "CollaborationGroup"
- }
+ "id": "5a6cc49b-d707-4df0-a634-7c716a793f2a",
+ "regionName": "header",
+ "type": "region"
+ },
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "scopes": [
+ {
+ "isPublic": true,
+ "name": "FeedPost"
+ },
+ {
+ "isPublic": true,
+ "name": "KnowledgeArticleVersion"
+ },
+ {
+ "isPublic": false,
+ "name": "Case"
+ },
+ {
+ "isPublic": true,
+ "name": "CollaborationGroup"
+ }
+ ],
+ "searchResultFiltering": true,
+ "searchTerm": "{!term}",
+ "showTopResults": true
+ },
+ "componentName": "forceCommunity:search",
+ "id": "822bf1c5-6d8a-493f-aa12-4265f394c257",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
],
- "searchResultFiltering": true,
- "searchTerm": "{!term}",
- "showTopResults": true
- },
- "componentName": "forceCommunity:search",
- "id": "822bf1c5-6d8a-493f-aa12-4265f394c257",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
+ "id": "72128e90-ca44-4078-be1e-37490d727222",
+ "regionName": "content",
+ "type": "region"
+ },
+ {
+ "id": "cdba3ee9-b011-4e7c-a760-0b9c5401d719",
+ "regionName": "footer",
+ "type": "region"
}
- ],
- "id": "72128e90-ca44-4078-be1e-37490d727222",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "cdba3ee9-b011-4e7c-a760-0b9c5401d719",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "global-search"
+ ],
+ "themeLayoutType": "Inner",
+ "type": "view",
+ "viewType": "global-search"
}
--
Gitblit v1.9.1