自定义字段

VIZ.Package.Domain/Model/ControlObject/ControlFieldNodeModel.cs

@@ -125,19 +125,5 @@ namespace VIZ.Package.Domain
         }
         }
 
 
         #endregion
         #endregion
-
-        #region IsCustom -- 是否是自定义字段
-
-        private bool isCustom;
-        /// <summary>
-        /// 是否是自定义字段
-        /// </summary>
-        public bool IsCustom
-        {
-            get { return isCustom; }
-            set { isCustom = value; this.RaisePropertyChanged(nameof(IsCustom)); }
-        }
-
-        #endregion
     }
     }
 }
 }

VIZ.Package.Module.Resource/VIZ.Package.Module.Resource.csproj

@@ -270,8 +270,5 @@
     <Resource Include="Icons\icon_field_edit_32x32.png" />
     <Resource Include="Icons\icon_field_edit_32x32.png" />
     <Resource Include="Icons\icon_play_list_32x32.png" />
     <Resource Include="Icons\icon_play_list_32x32.png" />
   </ItemGroup>
   </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Icons\icon_custom_32x32.png" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
 </Project>
\ No newline at end of file

VIZ.Package.Module/ControlObject/FieldTree/View/FieldTreeView.xaml

@@ -16,23 +16,10 @@
              d:DataContext="{d:DesignInstance Type=local:FieldTreeViewModel}" 
              d:DataContext="{d:DesignInstance Type=local:FieldTreeViewModel}" 
              mc:Ignorable="d" 
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
              d:DesignHeight="450" d:DesignWidth="800">
-    <UserControl.Resources>
-        <fcore:Bool2VisibilityConverter x:Key="Bool2VisibilityConverter" TrueVisibility="Visible" FalseVisibility="Visible"></fcore:Bool2VisibilityConverter>
-    </UserControl.Resources>
-
     <Grid>
     <Grid>
         <dxg:GridControl ItemsSource="{Binding Path=ControlObject.FieldNodes}" ShowBorder="False"
         <dxg:GridControl ItemsSource="{Binding Path=ControlObject.FieldNodes}" ShowBorder="False"
                          SelectedItem="{Binding Path=SelectedControlField,Mode=TwoWay}">
                          SelectedItem="{Binding Path=SelectedControlField,Mode=TwoWay}">
             <dxg:GridControl.Columns>
             <dxg:GridControl.Columns>
-                <dxg:GridColumn FieldName="IsCustom" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False" Width="50" AllowResizing="False">
-                    <dxg:GridColumn.CellTemplate>
-                        <DataTemplate>
-                            <Image Width="20" Height="20" VerticalAlignment="Center" HorizontalAlignment="Center"
-                                   Visibility="{Binding Path=Row.IsCustom,Converter={StaticResource Bool2VisibilityConverter}}"
-                                   Source="/VIZ.Package.Module.Resource;component/Icons/icon_custom_32x32.png"></Image>
-                        </DataTemplate>
-                    </dxg:GridColumn.CellTemplate>
-                </dxg:GridColumn>
                 <dxg:GridColumn Header="字段" FieldName="FieldIdentifier" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False" Width="150" AllowResizing="True"></dxg:GridColumn>
                 <dxg:GridColumn Header="字段" FieldName="FieldIdentifier" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False" Width="150" AllowResizing="True"></dxg:GridColumn>
                 <dxg:GridColumn Header="类型" FieldName="Type" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False" Width="100" AllowResizing="True"></dxg:GridColumn>
                 <dxg:GridColumn Header="类型" FieldName="Type" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False" Width="100" AllowResizing="True"></dxg:GridColumn>
                 <dxg:GridColumn Header="描述" FieldName="Description" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False" Width="*" AllowResizing="True"></dxg:GridColumn>
                 <dxg:GridColumn Header="描述" FieldName="Description" ReadOnly="True" AllowSorting="False" AllowColumnFiltering="False" Width="*" AllowResizing="True"></dxg:GridColumn>

VIZ.Package.Module/Preview/VizPreview/View/VizPreviewView.xaml

@@ -95,7 +95,7 @@
             </StackPanel>
             </StackPanel>
         </Grid>
         </Grid>
         <!-- VIZ引擎 -->
         <!-- VIZ引擎 -->
-        <fcommon:WindowHost x:Name="host" Grid.Row="1" Background="#FF222222" BackColor="#FF222222">
+        <fcommon:WindowHost x:Name="host" Grid.Row="1" Background="Black" BackColor="Black">
             <dxmvvm:Interaction.Behaviors>
             <dxmvvm:Interaction.Behaviors>
                 <dxmvvm:EventToCommand PassEventArgsToCommand="True" EventName="SizeChanged" 
                 <dxmvvm:EventToCommand PassEventArgsToCommand="True" EventName="SizeChanged" 
                                        Command="{Binding Path=WindowHostSizeChangedCommand}"></dxmvvm:EventToCommand>
                                        Command="{Binding Path=WindowHostSizeChangedCommand}"></dxmvvm:EventToCommand>

VIZ.Package.Storage/Entity/ControlObject/ControlFieldEntity.cs

@@ -37,10 +37,5 @@ namespace VIZ.Package.Storage
         /// 字段类型
         /// 字段类型
         /// </summary>
         /// </summary>
         public VizControlFieldType Type { get; set; }
         public VizControlFieldType Type { get; set; }
-
-        /// <summary>
-        /// 是否是自定义字段
-        /// </summary>
-        public bool IsCustom { get; set; }
     }
     }
 }
 }