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/register.json | 179 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 95 insertions(+), 84 deletions(-)
diff --git a/force-app/main/default/experiences/Site3/views/register.json b/force-app/main/default/experiences/Site3/views/register.json
index 63524d8..62b0ef1 100644
--- a/force-app/main/default/experiences/Site3/views/register.json
+++ b/force-app/main/default/experiences/Site3/views/register.json
@@ -1,85 +1,96 @@
{
- "appPageId" : "2bcb651a-3bf1-4ba0-bf17-8f52e81c95c6",
- "componentName" : "siteforce:sldsOneColLayout",
- "dataProviders" : [ ],
- "id" : "f7082e1e-e1e4-4b79-a271-59037e25c845",
- "label" : "Register",
- "regions" : [ {
- "components" : [ {
- "componentAttributes" : { },
- "componentName" : "salesforceIdentity:communityLogo2",
- "id" : "e21ea511-10c6-4a67-82ef-ec485b7617bf",
- "renderPriority" : "NEUTRAL",
- "renditionMap" : { },
- "type" : "component"
- }, {
- "componentAttributes" : {
- "richTextValue" : "<div style=\"text-align: center;\" class=\"inverseTextColor\">Join the community to receive personalized information and customer support.</div>"
- },
- "componentName" : "forceCommunity:richTextInline",
- "id" : "e111c87b-bc77-4bb5-99e3-93e3cb872acb",
- "renderPriority" : "NEUTRAL",
- "renditionMap" : { },
- "type" : "component"
- }, {
- "componentAttributes" : {
- "confirmPasswordLabel" : "Confirm Password",
- "emailLabel" : "Email",
- "extraFieldsFieldSet" : "",
- "firstnameLabel" : "First Name",
- "includePasswordField" : false,
- "lastnameLabel" : "Last Name",
- "passwordLabel" : "Create Password",
- "regConfirmUrl" : "./CheckPasswordResetEmail",
- "startUrl" : "",
- "submitButtonLabel" : "Sign Up"
- },
- "componentName" : "salesforceIdentity:selfRegister2",
- "id" : "1708fe03-f5d1-40aa-8a0a-6eadddb49426",
- "renderPriority" : "NEUTRAL",
- "renditionMap" : { },
- "type" : "component"
- }, {
- "componentAttributes" : {
- "headerText" : "",
- "showHeader" : false,
- "useCommunityDomainSso" : false
- },
- "componentName" : "salesforceIdentity:socialLogin2",
- "id" : "6f29eeb7-b358-4b9b-abfd-69c860e4f50e",
- "renderPriority" : "NEUTRAL",
- "renditionMap" : { },
- "type" : "component"
- }, {
- "componentAttributes" : {
- "richTextValue" : "<div style=\"text-align: center;\"><a class=\"inverseTextColor\" href=\"./\">Already have an account?</a></div>"
- },
- "componentName" : "forceCommunity:richTextInline",
- "id" : "bf2597c2-b7f9-4dd9-830f-e350ee96b0d1",
- "renderPriority" : "NEUTRAL",
- "renditionMap" : { },
- "type" : "component"
- } ],
- "id" : "6b062d85-f6af-410f-bc27-1a1da6da32b8",
- "regionName" : "content",
- "type" : "region"
- }, {
- "components" : [ {
- "componentAttributes" : {
- "customHeadTags" : "",
- "description" : "",
- "title" : "Register"
- },
- "componentName" : "forceCommunity:seoAssistant",
- "id" : "4a889e5c-547a-48d9-bd3a-9e87166e7a82",
- "renditionMap" : { },
- "type" : "component"
- } ],
- "id" : "6e5174c2-5e4d-4e3e-a1a2-ec60126f3596",
- "regionName" : "sfdcHiddenRegion",
- "type" : "region"
- } ],
- "themeLayoutType" : "Login",
- "type" : "view",
- "viewType" : "self-register"
-}
\ No newline at end of file
+ "appPageId": "2bcb651a-3bf1-4ba0-bf17-8f52e81c95c6",
+ "componentName": "siteforce:sldsOneColLayout",
+ "dataProviders": [],
+ "id": "f7082e1e-e1e4-4b79-a271-59037e25c845",
+ "label": "Register",
+ "regions": [
+ {
+ "components": [
+ {
+ "componentAttributes": {},
+ "componentName": "salesforceIdentity:communityLogo2",
+ "id": "e21ea511-10c6-4a67-82ef-ec485b7617bf",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ },
+ {
+ "componentAttributes": {
+ "richTextValue": "<div style=\"text-align: center;\" class=\"inverseTextColor\">Join the community to receive personalized information and customer support.</div>"
+ },
+ "componentName": "forceCommunity:richTextInline",
+ "id": "e111c87b-bc77-4bb5-99e3-93e3cb872acb",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ },
+ {
+ "componentAttributes": {
+ "confirmPasswordLabel": "Confirm Password",
+ "emailLabel": "Email",
+ "extraFieldsFieldSet": "",
+ "firstnameLabel": "First Name",
+ "includePasswordField": false,
+ "lastnameLabel": "Last Name",
+ "passwordLabel": "Create Password",
+ "regConfirmUrl": "./CheckPasswordResetEmail",
+ "startUrl": "",
+ "submitButtonLabel": "Sign Up"
+ },
+ "componentName": "salesforceIdentity:selfRegister2",
+ "id": "1708fe03-f5d1-40aa-8a0a-6eadddb49426",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ },
+ {
+ "componentAttributes": {
+ "headerText": "",
+ "showHeader": false,
+ "useCommunityDomainSso": false
+ },
+ "componentName": "salesforceIdentity:socialLogin2",
+ "id": "6f29eeb7-b358-4b9b-abfd-69c860e4f50e",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ },
+ {
+ "componentAttributes": {
+ "richTextValue": "<div style=\"text-align: center;\"><a class=\"inverseTextColor\" href=\"./\">Already have an account?</a></div>"
+ },
+ "componentName": "forceCommunity:richTextInline",
+ "id": "bf2597c2-b7f9-4dd9-830f-e350ee96b0d1",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "6b062d85-f6af-410f-bc27-1a1da6da32b8",
+ "regionName": "content",
+ "type": "region"
+ },
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "customHeadTags": "",
+ "description": "",
+ "title": "Register"
+ },
+ "componentName": "forceCommunity:seoAssistant",
+ "id": "4a889e5c-547a-48d9-bd3a-9e87166e7a82",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "6e5174c2-5e4d-4e3e-a1a2-ec60126f3596",
+ "regionName": "sfdcHiddenRegion",
+ "type": "region"
+ }
+ ],
+ "themeLayoutType": "Login",
+ "type": "view",
+ "viewType": "self-register"
+}
--
Gitblit v1.9.1