From 27f9935fd0043e86e8b6cc18db0fc300181d7230 Mon Sep 17 00:00:00 2001
From: qin <a@163.com>
Date: 星期四, 15 八月 2024 17:10:23 +0800
Subject: [PATCH] 冲突解决
---
HStation.RevitDev/RevitDataExport/Utility/ExportModelHelper.cs | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/HStation.RevitDev/RevitDataExport/Utility/ExportModelHelper.cs b/HStation.RevitDev/RevitDataExport/Utility/ExportModelHelper.cs
index 024699a..f8f1c62 100644
--- a/HStation.RevitDev/RevitDataExport/Utility/ExportModelHelper.cs
+++ b/HStation.RevitDev/RevitDataExport/Utility/ExportModelHelper.cs
@@ -21,11 +21,13 @@
public string Export()
{
- var modelMap = GlobalResource.RevitModels;
JArray retArray = new JArray();
- foreach (var modelPair in modelMap)
+ var dict = GlobalResource.RevitModels.Find(x => x.Item1 == m_doc.Title);
+ if (dict == null) { retArray.ToString(); }
+
+ foreach (var pair in dict.Item2)
{
- var revitType = modelPair.Key;
+ var revitType = pair.Key;
var jArray = ExportRevitModel(revitType);
retArray.Merge(jArray);
}
@@ -52,13 +54,17 @@
}
private JArray ExportRevitModel(RevitType revitType)
- {
- var revitModels = GlobalResource.RevitModels[revitType];
- var outElems = new JArray();
+ {
+ var outElems = new JArray();
+
+ var dict = GlobalResource.RevitModels.Find(x => x.Item1 == m_doc.Title)?.Item2;
+ if (dict == null) { return outElems; }
+ var revitModels = dict[revitType];
- foreach (var elemId in revitModels)
+ foreach (var modelId in revitModels)
{
ElementId id = null;
+ var elemId = modelId;
if (int.TryParse(elemId, out int elementId))
{
id = new ElementId(elementId);
--
Gitblit v1.9.3