Просмотр исходного кода

Merge branch 'master' of https://git.dev.tencent.com/xuhuo1234/saga

mengxiangge 5 лет назад
Родитель
Сommit
d40acb4e84

BIN
MBI/Dlls/FirmLibDll/FWindSoft.Wpf.dll


BIN
MBI/Dlls/FirmLibDll/FWindSoft.Wpf.pdb


BIN
MBI/Dlls/FirmLibDll/FWindSoft.dll


BIN
MBI/Dlls/FirmLibDll/FWindSoft.pdb


+ 10 - 25
MBI/FirmLib/Com.FirmLib.UI/Manufacturer/VmProductType.cs

@@ -37,27 +37,6 @@ namespace Com.FirmLib.UI.Manufacturer
         {
             Product = new NameValueItem();
             Brand = new NameValueItem();
-            #region 测试数据
-            //List<PropertyDefinition> definitons = new List<PropertyDefinition>();
-            //definitons.Add(new PropertyDefinition() { Id = "1", Name = "信息点1", PropertyType = typeof(string) });
-            //definitons.Add(new PropertyDefinition() { Id = "2", Name = "信息点2", PropertyType = typeof(int) });
-            //definitons.Add(new PropertyDefinition() { Id = "3", Name = "信息点3", PropertyType = typeof(string) });
-            //RefDefinitions = definitons;
-            ////todo 根据参数加载项目信息
-            //TypeItems = new ObservableCollection<TypeShowItem>();
-            //for (int i = 0; i < 10; i++)
-            //{
-            //    var tempItem = new TypeShowItem();
-            //    tempItem.TypeName = "型号" + (i + 1);
-            //    tempItem.MaintenancePeriod = 35;
-            //    tempItem.SeriviceLife = 40;
-            //    tempItem.Parameters = PropertyCollection.CreateCollection(definitons);
-            //    tempItem.Parameters["2"].Value = "信息点2信息";
-            //    tempItem.Parameters["1"].Value = "200";
-            //    tempItem.Parameters["3"].Value = "信息点3信息";
-            //    TypeItems.Add(tempItem);
-            //}
-            #endregion
         }
 
 
@@ -181,7 +160,7 @@ namespace Com.FirmLib.UI.Manufacturer
             }
             catch (Exception e)
             {
-                MessageTip.Show(this.GetWindow(), "保存失败");
+                MessageTip.Show(this.GetWindow(), "删除失败");
             }
            
         }
@@ -289,6 +268,7 @@ namespace Com.FirmLib.UI.Manufacturer
                     resutMessage = "型号名称不能为空";
                     break;
                 }
+                #region 其他验证
                 //if (showItem.Parameters.Count > 1)
                 //{
                 //    if (showItem.Parameters[0].Value == null || string.IsNullOrEmpty(showItem.Parameters[0].Value.ToString()))
@@ -301,8 +281,9 @@ namespace Com.FirmLib.UI.Manufacturer
                 //        resutMessage = "使用寿命不能为空";
                 //        break;
                 //    }
-                //}
-              
+                //} 
+                #endregion
+
                 int count = TypeItems.Count;
                 bool haseError = false;
                 for (int i = 0; i < count; i++)
@@ -339,11 +320,15 @@ namespace Com.FirmLib.UI.Manufacturer
             {
                 bool flag = false;
                 ProductTypeItem dataItem = ConvertDataItem(item);
-                if (string.IsNullOrEmpty(item.ProductTypeId))
+                if (string.IsNullOrWhiteSpace(item.ProductTypeId))
                 {
                     //添加
                     dataItem.ProductId = Product.Value.ToString();
                     flag=BllFactory<ProductTypeBll>.Instance.Add(dataItem);
+                    if (flag)
+                    {
+                        item.ProductTypeId = dataItem.Id;
+                    }
                 }
                 else
                 {

+ 9 - 1
MBI/FirmLib/Com.FirmLib.UI/Manufacturer/WinProductType.xaml

@@ -11,6 +11,10 @@
                  Width="{Binding ActualWidth,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=ScrollContentPresenter}}">
     <fw:NChildWindow.Resources>
         <fw:BindingProxy x:Key="DATA" Data="{Binding}"></fw:BindingProxy>
+        <Style x:Key="CenterAlignmentStyle" TargetType="TextBlock">
+            <Setter Property="TextAlignment" Value="Center"/>
+            <Setter Property="VerticalAlignment" Value="Center"/>
+        </Style>
     </fw:NChildWindow.Resources>
     <fw:NChildWindow.AttachElement>
         <StackPanel HorizontalAlignment="Stretch" Orientation="Horizontal" VerticalAlignment="Center">
@@ -47,6 +51,7 @@
                   
                   AlternationCount="2"
                 >
+          
             <DataGrid.RowStyle>
                 <Style TargetType="DataGridRow">
                     <Setter Property="ContextMenu">
@@ -81,7 +86,10 @@
                     </DataGridTemplateColumn.CellTemplate>
 
                 </DataGridTemplateColumn>
-                <fw:TDataGridTextColumn Header="型号" fw:DataGridDragCopyOptions.CanColumnDragCopy="True" Width="100"   Binding="{Binding Path=TypeName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></fw:TDataGridTextColumn>
+                <!--<DataGridTextColumn Header="型号" fw:DataGridDragCopyOptions.CanColumnDragCopy="True" Width="100"   Binding="{Binding Path=TypeName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" ElementStyle="{StaticResource CenterAlignmentStyle}">
+
+                </DataGridTextColumn>-->
+                <fw:TDataGridTextColumn Header="型号" CanPaste="True" fw:DataGridDragCopyOptions.CanColumnDragCopy="True" Width="100"   Binding="{Binding Path=TypeName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></fw:TDataGridTextColumn>
                 <!--<i:Interaction.Behaviors>
                     <behaviors:GridCellSingleClickEditBehavior></behaviors:GridCellSingleClickEditBehavior>
                 </i:Interaction.Behaviors>-->

+ 14 - 7
MBI/FirmLib/Com.FirmLib.UI/Manufacturer/WinProductType.xaml.cs

@@ -38,15 +38,22 @@ namespace Com.FirmLib.UI.Manufacturer
         protected override void LoadData(LoadParameter parameter)
         {
             TryCatchWrapper.Handled(() => this.m_Vm.Init(parameter));
-            this.Title = string.Format("[{0}-{1}]{2}", this.m_Vm.Brand.Name, this.m_Vm.Product.Name, "型号");
+            try
+            {
+                this.Title = string.Format("[{0}-{1}]{2}", this.m_Vm.Brand.Name, this.m_Vm.Product.Name, "型号");
 
-            var columns = DataGrid.CreateColumns(this.m_Vm.RefDefinitions, "Parameters", InfoPointTemplateParse.CreateTemplateManager());
-            columns.ForEach(c =>
+                var columns = DataGrid.CreateColumns(this.m_Vm.RefDefinitions, "Parameters", InfoPointTemplateParse.CreateTemplateManager());
+                columns.ForEach(c =>
+                {
+                    DataGridDragCopyOptions.SetCanColumnDragCopy(c, true);
+                    c.Width = c.Header.ToString().Length * 16 + 40;
+                    c.MinWidth = 80;
+                });
+            }
+            catch (Exception ex)
             {
-                DataGridDragCopyOptions.SetCanColumnDragCopy(c, true);
-                c.Width = c.Header.ToString().Length * 16 +40;
-                c.MinWidth = 80;
-            });
+                MessageBox.Show(ex.StackTrace);
+            }
         }
         #region 界面关联事件
         private void btnOK_Click(object sender, RoutedEventArgs e)

+ 10 - 1
MBI/ToolCommand/RoomToSpaceUtils.cs

@@ -4,9 +4,11 @@ using Autodesk.Revit.DB.Mechanical;
 using SAGA.RevitUtils.Extends;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using SAGA.DotNetUtils;
 using SAGA.DotNetUtils.Extend;
 
 namespace ToolCommand
@@ -175,13 +177,20 @@ namespace ToolCommand
             ElementId phaseId = para.AsElementId();
             var phase = doc.GetElement(phaseId) as Phase;
             var points = GetSpacesPoints(view);
-            //doc.LoadFamilySymbolExt(MBIConst.SpaceTagFamilyFilePath);
+            try
+            {
+                //doc.LoadFamilySymbolExt(Path.Combine(AppBaseInfo.FamilyPath, "空间标记.rfa"));
+            }
+            catch (Exception ex)
+            {
+            }
             foreach (var point in points)
             {
                 var oldSpace = doc.GetSpaceAtPoint(point, phase);
                 if (oldSpace == null)
                 {
                     var tempSapce = doc.Create.NewSpace(level, phase, new UV(point.X, point.Y));
+                    //doc.Create.NewSpaceTag(tempSapce, new UV(point.X, point.Y), view);
                     spaces.Add(tempSapce);
                 }
             }