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/消耗品订单列表.json | 96 ++++++++++++++++++++++++------------------------
1 files changed, 48 insertions(+), 48 deletions(-)
diff --git "a/force-app/main/default/experiences/Consumable1/views/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\345\210\227\350\241\250.json" "b/force-app/main/default/experiences/Consumable1/views/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\345\210\227\350\241\250.json"
index 0774402..7c1e1f2 100644
--- "a/force-app/main/default/experiences/Consumable1/views/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\345\210\227\350\241\250.json"
+++ "b/force-app/main/default/experiences/Consumable1/views/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\345\210\227\350\241\250.json"
@@ -1,52 +1,52 @@
{
- "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
- "componentName": "siteforce:sldsOneColLayout",
- "dataProviders": [],
- "id": "c331401c-5c71-4d88-9350-c5e8a79202c5",
- "label": "娑堣�楀搧璁㈠崟 鍒楄〃",
- "regions": [
- {
- "id": "9c56ed8b-747d-4b08-8651-5fc2f53ea168",
- "regionName": "header",
- "type": "region"
- },
- {
- "components": [
+ "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+ "componentName": "siteforce:sldsOneColLayout",
+ "dataProviders": [],
+ "id": "293921b6-1a37-49a3-a225-be2f3471a41c",
+ "label": "娑堣�楀搧璁㈠崟 鍒楄〃",
+ "regions": [
{
- "componentAttributes": {
- "enableInlineEdit": false,
- "filterName": "Overdue",
- "layout": "FULL",
- "pageSize": 25,
- "scope": "Consumable_order__c",
- "showActionBar": true,
- "showChartsPanel": true,
- "showDisplay": "showall",
- "showFilterPanel": true,
- "showImageIcon": true,
- "showManualRefreshButton": true,
- "showObjectName": true,
- "showPinnedList": true,
- "showSearchBar": true
- },
- "componentName": "forceCommunity:objectHome",
- "id": "e91f7d10-dc6c-4a2e-af8c-706f73f7a8cc",
- "renderPriority": "NEUTRAL",
- "renditionMap": {},
- "type": "component"
+ "id": "c1c91ef1-d313-4e66-b600-3b5ece7f6488",
+ "regionName": "header",
+ "type": "region"
+ },
+ {
+ "components": [
+ {
+ "componentAttributes": {
+ "enableInlineEdit": false,
+ "filterName": "D00_approved_view",
+ "layout": "FULL",
+ "pageSize": 25,
+ "scope": "Consumable_order__c",
+ "showActionBar": false,
+ "showChartsPanel": false,
+ "showDisplay": "grid",
+ "showFilterPanel": false,
+ "showImageIcon": true,
+ "showManualRefreshButton": true,
+ "showObjectName": true,
+ "showPinnedList": false,
+ "showSearchBar": true
+ },
+ "componentName": "forceCommunity:objectHome",
+ "id": "5a679d55-a414-4a30-9e45-410f58926560",
+ "renderPriority": "NEUTRAL",
+ "renditionMap": {},
+ "type": "component"
+ }
+ ],
+ "id": "5b054b02-44fa-4d1a-a233-bc406c227ab1",
+ "regionName": "content",
+ "type": "region"
+ },
+ {
+ "id": "93caa3c5-152b-4c37-a27c-6711bafd7493",
+ "regionName": "footer",
+ "type": "region"
}
- ],
- "id": "f603c8cc-3519-4e8c-a262-eef3a9fe442a",
- "regionName": "content",
- "type": "region"
- },
- {
- "id": "4efaa155-2075-4409-82e7-71e9abc62284",
- "regionName": "footer",
- "type": "region"
- }
- ],
- "themeLayoutType": "Inner",
- "type": "view",
- "viewType": "list-a2K"
+ ],
+ "themeLayoutType": "Inner",
+ "type": "view",
+ "viewType": "list-a2K"
}
--
Gitblit v1.9.1