Skip to content

F
FTT_Board
Commit ee9256ef authored by 徐盼盼's avatar 徐盼盼
Browse files
Options

1.字段添加 

IsWrap bit -- 是否换行
parent 1990a40c
Hide whitespace changes
Inline Side-by-side
Showing with 117 additions and 80 deletions
FTT.Board/Ftt.Board.EF/BoardModel.Designer.cs
View file @ ee9256ef
// 为模型“D:\git\FTT_Board\FTT.Board\Ftt.Board.EF\BoardModel.edmx”启用了 T4 代码生成。 // 为模型“C:\Pan\FTT_Board\FTT.Board\Ftt.Board.EF\BoardModel.edmx”启用了 T4 代码生成。
// 要启用旧代码生成功能，请将“代码生成策略”设计器属性的值 // 要启用旧代码生成功能，请将“代码生成策略”设计器属性的值
// 更改为“旧的 ObjectContext”。当在设计器中打开该模型时，此属性会出现在 // 更改为“旧的 ObjectContext”。当在设计器中打开该模型时，此属性会出现在
// “属性”窗口中。 // “属性”窗口中。
......
FTT.Board/Ftt.Board.EF/BoardModel.edmx
View file @ ee9256ef
...@@ -4,69 +4,73 @@ ...@@ -4,69 +4,73 @@
<edmx:Runtime> <edmx:Runtime>
<!-- SSDL content --> <!-- SSDL content -->
<edmx:StorageModels> <edmx:StorageModels>
<Schema Namespace="BoardModel.Store" Alias="Self" Provider="System.Data.SqlClient" ProviderManifestToken="2012" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" xmlns="http://schemas.microsoft.com/ado/2009/11/edm/ssdl"> <Schema Namespace="BoardModel.Store" Provider="System.Data.SqlClient" ProviderManifestToken="2012" Alias="Self" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" xmlns:customannotation="http://schemas.microsoft.com/ado/2013/11/edm/customannotation" xmlns="http://schemas.microsoft.com/ado/2009/11/edm/ssdl">
<EntityContainer Name="BoardModelStoreContainer"> <EntityType Name="CFG_Board">
<EntitySet Name="CFG_Board" EntityType="BoardModel.Store.CFG_Board" store:Type="Tables" Schema="dbo" /> <Key>
<EntitySet Name="CFG_BoardDetail" EntityType="BoardModel.Store.CFG_BoardDetail" store:Type="Tables" Schema="dbo" /> <PropertyRef Name="ID" />
<AssociationSet Name="CFG_BoardCFG_BoardDetail" Association="BoardModel.Store.CFG_BoardCFG_BoardDetail"> </Key>
<End Role="CFG_Board" EntitySet="CFG_Board" /> <Property Name="ID" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
<End Role="CFG_BoardDetail" EntitySet="CFG_BoardDetail" /> <Property Name="BackgroundColor" Type="nvarchar(max)" Nullable="false" />
</AssociationSet> <Property Name="BoardCode" Type="nvarchar(max)" Nullable="false" />
</EntityContainer> <Property Name="BoardName" Type="nvarchar(max)" Nullable="false" />
<EntityType Name="CFG_Board"> <Property Name="ProcName" Type="nvarchar(max)" Nullable="false" />
<Key> <Property Name="ConnectionString" Type="nvarchar(max)" />
<PropertyRef Name="ID" /> <Property Name="RefreshTime" Type="int" Nullable="false" />
</Key> <Property Name="PageRefreshTime" Type="int" />
<Property Name="ID" Type="int" StoreGeneratedPattern="Identity" Nullable="false" /> <Property Name="LayoutID" Type="int" Nullable="false" />
<Property Name="BackgroundColor" Type="nvarchar(max)" Nullable="false" /> <Property Name="BorderColor" Type="nvarchar(max)" />
<Property Name="BoardCode" Type="nvarchar(max)" Nullable="false" /> </EntityType>
<Property Name="BoardName" Type="nvarchar(max)" Nullable="false" /> <EntityType Name="CFG_BoardDetail">
<Property Name="ProcName" Type="nvarchar(max)" Nullable="false" /> <Key>
<Property Name="ConnectionString" Type="nvarchar(max)" Nullable="true" /> <PropertyRef Name="ID" />
<Property Name="RefreshTime" Type="int" Nullable="false" /> </Key>
<Property Name="PageRefreshTime" Type="int" Nullable="true" /> <Property Name="ID" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
<Property Name="LayoutID" Type="int" Nullable="false" /> <Property Name="BoardID" Type="int" Nullable="false" />
<Property Name="BorderColor" Type="nvarchar(max)" Nullable="true" /> <Property Name="Height" Type="decimal" Precision="18" Scale="0" Nullable="false" />
</EntityType> <Property Name="Width" Type="decimal" Precision="18" Scale="0" Nullable="false" />
<EntityType Name="CFG_BoardDetail"> <Property Name="BackgroundColor" Type="nvarchar(max)" />
<Key> <Property Name="FontColor1" Type="nvarchar(max)" />
<PropertyRef Name="ID" /> <Property Name="FontSize1" Type="int" />
</Key> <Property Name="FontColor2" Type="nvarchar(max)" />
<Property Name="ID" Type="int" StoreGeneratedPattern="Identity" Nullable="false" /> <Property Name="FontSize2" Type="int" />
<Property Name="BoardID" Type="int" Nullable="false" /> <Property Name="IsShow" Type="bit" />
<Property Name="Height" Type="decimal" Nullable="false" /> <Property Name="IsTimeShow" Type="bit" />
<Property Name="Width" Type="decimal" Nullable="false" /> <Property Name="ChartType" Type="int" Nullable="false" />
<Property Name="BackgroundColor" Type="nvarchar(max)" Nullable="true" /> <Property Name="RefreshTime" Type="int" Nullable="false" />
<Property Name="FontColor1" Type="nvarchar(max)" Nullable="true" /> <Property Name="RefreshType" Type="int" />
<Property Name="FontSize1" Type="int" Nullable="true" /> <Property Name="WorkTeamID" Type="int" Nullable="false" />
<Property Name="FontColor2" Type="nvarchar(max)" Nullable="true" /> <Property Name="Flag" Type="int" Nullable="false" />
<Property Name="FontSize2" Type="int" Nullable="true" /> <Property Name="PageSize" Type="int" Nullable="false" />
<Property Name="IsShow" Type="bit" Nullable="false" /> <Property Name="PageIndex" Type="int" Nullable="false" />
<Property Name="IsTimeShow" Type="bit" Nullable="true" /> <Property Name="PositionIndex" Type="int" Nullable="false" />
<Property Name="ChartType" Type="int" Nullable="false" /> <Property Name="BorderColor" Type="nvarchar" MaxLength="50" />
<Property Name="RefreshTime" Type="int" Nullable="false" /> <Property Name="Horizontal" Type="int" />
<Property Name="RefreshType" Type="int" Nullable="true" /> <Property Name="Vertical" Type="int" />
<Property Name="WorkTeamID" Type="int" Nullable="false" /> <Property Name="IsWrap" Type="bit" />
<Property Name="Flag" Type="int" Nullable="false" /> </EntityType>
<Property Name="PageSize" Type="int" Nullable="false" /> <Association Name="FK_CFG_BoardCFG_BoardDetail">
<Property Name="PageIndex" Type="int" Nullable="false" /> <End Role="CFG_Board" Type="Self.CFG_Board" Multiplicity="1">
<Property Name="PositionIndex" Type="int" Nullable="false" /> <OnDelete Action="Cascade" />
</EntityType> </End>
<Association Name="CFG_BoardCFG_BoardDetail"> <End Role="CFG_BoardDetail" Type="Self.CFG_BoardDetail" Multiplicity="*" />
<End Role="CFG_Board" Type="BoardModel.Store.CFG_Board" Multiplicity="1"> <ReferentialConstraint>
<OnDelete Action="Cascade" /> <Principal Role="CFG_Board">
</End> <PropertyRef Name="ID" />
<End Role="CFG_BoardDetail" Type="BoardModel.Store.CFG_BoardDetail" Multiplicity="*" /> </Principal>
<ReferentialConstraint> <Dependent Role="CFG_BoardDetail">
<Principal Role="CFG_Board"> <PropertyRef Name="BoardID" />
<PropertyRef Name="ID" /> </Dependent>
</Principal> </ReferentialConstraint>
<Dependent Role="CFG_BoardDetail"> </Association>
<PropertyRef Name="BoardID" /> <EntityContainer Name="BoardModelStoreContainer">
</Dependent> <EntitySet Name="CFG_Board" EntityType="Self.CFG_Board" Schema="dbo" store:Type="Tables" />
</ReferentialConstraint> <EntitySet Name="CFG_BoardDetail" EntityType="Self.CFG_BoardDetail" Schema="dbo" store:Type="Tables" />
</Association> <AssociationSet Name="FK_CFG_BoardCFG_BoardDetail" Association="Self.FK_CFG_BoardCFG_BoardDetail">
</Schema></edmx:StorageModels> <End Role="CFG_Board" EntitySet="CFG_Board" />
<End Role="CFG_BoardDetail" EntitySet="CFG_BoardDetail" />
</AssociationSet>
</EntityContainer>
</Schema></edmx:StorageModels>
<!-- CSDL content --> <!-- CSDL content -->
<edmx:ConceptualModels> <edmx:ConceptualModels>
<Schema xmlns="http://schemas.microsoft.com/ado/2009/11/edm" xmlns:cg="http://schemas.microsoft.com/ado/2006/04/codegeneration" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" Namespace="BoardModel" Alias="Self" xmlns:annotation="http://schemas.microsoft.com/ado/2009/02/edm/annotation" annotation:UseStrongSpatialTypes="false"> <Schema xmlns="http://schemas.microsoft.com/ado/2009/11/edm" xmlns:cg="http://schemas.microsoft.com/ado/2006/04/codegeneration" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" Namespace="BoardModel" Alias="Self" xmlns:annotation="http://schemas.microsoft.com/ado/2009/02/edm/annotation" annotation:UseStrongSpatialTypes="false">
...@@ -83,27 +87,27 @@ ...@@ -83,27 +87,27 @@
<PropertyRef Name="ID" /> <PropertyRef Name="ID" />
</Key> </Key>
<Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" /> <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
<Property Name="BackgroundColor" Type="String" Nullable="false" > <Property Name="BackgroundColor" Type="String" Nullable="false" MaxLength="Max" Unicode="true" FixedLength="false" >
<Documentation> <Documentation>
<Summary>看板背景色</Summary> <Summary>看板背景色</Summary>
</Documentation> </Documentation>
</Property> </Property>
<Property Name="BoardCode" Type="String" Nullable="false" annotation:StoreGeneratedPattern="None" > <Property Name="BoardCode" Type="String" Nullable="false" annotation:StoreGeneratedPattern="None" MaxLength="Max" Unicode="true" FixedLength="false" >
<Documentation> <Documentation>
<Summary>看板编码</Summary> <Summary>看板编码</Summary>
</Documentation> </Documentation>
</Property> </Property>
<Property Name="BoardName" Type="String" Nullable="false" > <Property Name="BoardName" Type="String" Nullable="false" MaxLength="Max" Unicode="true" FixedLength="false" >
<Documentation> <Documentation>
<Summary>看板名称</Summary> <Summary>看板名称</Summary>
</Documentation> </Documentation>
</Property> </Property>
<Property Name="ProcName" Type="String" Nullable="false" > <Property Name="ProcName" Type="String" Nullable="false" MaxLength="Max" Unicode="true" FixedLength="false" >
<Documentation> <Documentation>
<Summary>存储过程名称</Summary> <Summary>存储过程名称</Summary>
</Documentation> </Documentation>
</Property> </Property>
<Property Name="ConnectionString" Type="String" Nullable="true" > <Property Name="ConnectionString" Type="String" Nullable="true" MaxLength="Max" Unicode="true" FixedLength="false" >
<Documentation> <Documentation>
<Summary>数据库连接字符串</Summary> <Summary>数据库连接字符串</Summary>
</Documentation> </Documentation>
...@@ -120,7 +124,7 @@ ...@@ -120,7 +124,7 @@
</Property> </Property>
<Property Name="LayoutID" Type="Int32" Nullable="false" /> <Property Name="LayoutID" Type="Int32" Nullable="false" />
<NavigationProperty Name="CFG_BoardDetail" Relationship="BoardModel.CFG_BoardCFG_BoardDetail" FromRole="CFG_Board" ToRole="CFG_BoardDetail" /> <NavigationProperty Name="CFG_BoardDetail" Relationship="BoardModel.CFG_BoardCFG_BoardDetail" FromRole="CFG_Board" ToRole="CFG_BoardDetail" />
<Property Name="BorderColor" Type="String" Nullable="true" > <Property Name="BorderColor" Type="String" Nullable="true" MaxLength="Max" Unicode="true" FixedLength="false" >
<Documentation> <Documentation>
<Summary>边框颜色</Summary> <Summary>边框颜色</Summary>
</Documentation> </Documentation>
...@@ -133,22 +137,22 @@ ...@@ -133,22 +137,22 @@
</Key> </Key>
<Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" /> <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
<Property Name="BoardID" Type="Int32" Nullable="false" /> <Property Name="BoardID" Type="Int32" Nullable="false" />
<Property Name="Height" Type="Decimal" Nullable="false" > <Property Name="Height" Type="Decimal" Nullable="false" Precision="18" Scale="0" >
<Documentation> <Documentation>
<Summary>高度（百分比）</Summary> <Summary>高度（百分比）</Summary>
</Documentation> </Documentation>
</Property> </Property>
<Property Name="Width" Type="Decimal" Nullable="false" > <Property Name="Width" Type="Decimal" Nullable="false" Precision="18" Scale="0" >
<Documentation> <Documentation>
<Summary>宽度（百分比）</Summary> <Summary>宽度（百分比）</Summary>
</Documentation> </Documentation>
</Property> </Property>
<Property Name="BackgroundColor" Type="String" Nullable="true" > <Property Name="BackgroundColor" Type="String" Nullable="true" MaxLength="Max" Unicode="true" FixedLength="false" >
<Documentation> <Documentation>
<Summary>背景色</Summary> <Summary>背景色</Summary>
</Documentation> </Documentation>
</Property> </Property>
<Property Name="FontColor1" Type="String" Nullable="true" > <Property Name="FontColor1" Type="String" Nullable="true" MaxLength="Max" Unicode="true" FixedLength="false" >
<Documentation> <Documentation>
<Summary>字体1颜色</Summary> <Summary>字体1颜色</Summary>
</Documentation> </Documentation>
...@@ -158,7 +162,7 @@ ...@@ -158,7 +162,7 @@
<Summary>字体1大小</Summary> <Summary>字体1大小</Summary>
</Documentation> </Documentation>
</Property> </Property>
<Property Name="FontColor2" Type="String" Nullable="true" > <Property Name="FontColor2" Type="String" Nullable="true" MaxLength="Max" Unicode="true" FixedLength="false" >
<Documentation> <Documentation>
<Summary>字体二颜色</Summary> <Summary>字体二颜色</Summary>
</Documentation> </Documentation>
...@@ -168,7 +172,7 @@ ...@@ -168,7 +172,7 @@
<Summary>字体2大小</Summary> <Summary>字体2大小</Summary>
</Documentation> </Documentation>
</Property> </Property>
<Property Name="IsShow" Type="Boolean" Nullable="false" > <Property Name="IsShow" Type="Boolean" >
<Documentation> <Documentation>
<Summary>是否显示</Summary> <Summary>是否显示</Summary>
</Documentation> </Documentation>
...@@ -202,6 +206,10 @@ ...@@ -202,6 +206,10 @@
<Summary>看板位置</Summary> <Summary>看板位置</Summary>
</Documentation> </Documentation>
</Property> </Property>
<Property Name="BorderColor" Type="String" MaxLength="50" FixedLength="false" Unicode="true" />
<Property Name="Horizontal" Type="Int32" />
<Property Name="Vertical" Type="Int32" />
<Property Name="IsWrap" Type="Boolean" />
</EntityType> </EntityType>
<EnumType Name="ChartTypeEnums" cg:ExternalTypeName="FTT.Board.EF.Enums.ChartTypeEnums" /> <EnumType Name="ChartTypeEnums" cg:ExternalTypeName="FTT.Board.EF.Enums.ChartTypeEnums" />
<EnumType Name="RefreshTypeEnums" cg:ExternalTypeName="FTT.Board.EF.Enums.RefreshTypeEnums" /> <EnumType Name="RefreshTypeEnums" cg:ExternalTypeName="FTT.Board.EF.Enums.RefreshTypeEnums" />
...@@ -244,7 +252,11 @@ ...@@ -244,7 +252,11 @@
<EntitySetMapping Name="CFG_BoardDetail"> <EntitySetMapping Name="CFG_BoardDetail">
<EntityTypeMapping TypeName="IsTypeOf(BoardModel.CFG_BoardDetail)"> <EntityTypeMapping TypeName="IsTypeOf(BoardModel.CFG_BoardDetail)">
<MappingFragment StoreEntitySet="CFG_BoardDetail"> <MappingFragment StoreEntitySet="CFG_BoardDetail">
<ScalarProperty Name="ID" ColumnName="ID" /> <ScalarProperty Name="IsWrap" ColumnName="IsWrap" />
<ScalarProperty Name="Vertical" ColumnName="Vertical" />
<ScalarProperty Name="Horizontal" ColumnName="Horizontal" />
<ScalarProperty Name="BorderColor" ColumnName="BorderColor" />
<ScalarProperty Name="ID" ColumnName="ID" />
<ScalarProperty Name="BoardID" ColumnName="BoardID" /> <ScalarProperty Name="BoardID" ColumnName="BoardID" />
<ScalarProperty Name="Height" ColumnName="Height" /> <ScalarProperty Name="Height" ColumnName="Height" />
<ScalarProperty Name="Width" ColumnName="Width" /> <ScalarProperty Name="Width" ColumnName="Width" />
...@@ -263,7 +275,7 @@ ...@@ -263,7 +275,7 @@
<ScalarProperty Name="PageSize" ColumnName="PageSize" /> <ScalarProperty Name="PageSize" ColumnName="PageSize" />
<ScalarProperty Name="PageIndex" ColumnName="PageIndex" /> <ScalarProperty Name="PageIndex" ColumnName="PageIndex" />
<ScalarProperty Name="PositionIndex" ColumnName="PositionIndex" /> <ScalarProperty Name="PositionIndex" ColumnName="PositionIndex" />
</MappingFragment> </MappingFragment>
</EntityTypeMapping> </EntityTypeMapping>
</EntitySetMapping> </EntitySetMapping>
</EntityContainerMapping> </EntityContainerMapping>
...@@ -282,6 +294,7 @@ ...@@ -282,6 +294,7 @@
<DesignerProperty Name="EnablePluralization" Value="False" /> <DesignerProperty Name="EnablePluralization" Value="False" />
<DesignerProperty Name="CodeGenerationStrategy" Value="无" /> <DesignerProperty Name="CodeGenerationStrategy" Value="无" />
<DesignerProperty Name="UseLegacyProvider" Value="False" /> <DesignerProperty Name="UseLegacyProvider" Value="False" />
<DesignerProperty Name="IncludeForeignKeysInModel" Value="True" />
</DesignerInfoPropertySet> </DesignerInfoPropertySet>
</edmx:Options> </edmx:Options>
<!-- Diagram content (shape and connector positions) --> <!-- Diagram content (shape and connector positions) -->
......
FTT.Board/Ftt.Board.EF/BoardModel.edmx.sql
View file @ ee9256ef
...@@ -71,7 +71,11 @@ CREATE TABLE [dbo].[CFG_BoardDetail] ( ...@@ -71,7 +71,11 @@ CREATE TABLE [dbo].[CFG_BoardDetail] (
[Flag] int NOT NULL, [Flag] int NOT NULL,
[PageSize] int NOT NULL, [PageSize] int NOT NULL,
[PageIndex] int NOT NULL, [PageIndex] int NOT NULL,
[PositionIndex] int NOT NULL [PositionIndex] int NOT NULL,
[BorderColor] nvarchar(50) NULL,
[Horizontal] int NULL,
[Vertical] int NULL,
[IsWrap] bit NULL,
); );
GO GO
......
FTT.Board/Ftt.Board.EF/CFG_BoardDetail.cs
View file @ ee9256ef
...@@ -69,7 +69,7 @@ namespace FTT.Board.EF ...@@ -69,7 +69,7 @@ namespace FTT.Board.EF
/// 是否显示 /// 是否显示
/// </summary> /// </summary>
[DataMember] [DataMember]
public bool IsShow { get; set; } public Nullable<bool> IsShow { get; set; }
/// <summary> /// <summary>
/// 是否显示时间 /// 是否显示时间
/// </summary> /// </summary>
...@@ -115,5 +115,25 @@ namespace FTT.Board.EF ...@@ -115,5 +115,25 @@ namespace FTT.Board.EF
/// </summary> /// </summary>
[DataMember] [DataMember]
public int PositionIndex { get; set; } public int PositionIndex { get; set; }
/// <summary>
///
/// </summary>
[DataMember]
public string BorderColor { get; set; }
/// <summary>
///
/// </summary>
[DataMember]
public Nullable<int> Horizontal { get; set; }
/// <summary>
///
/// </summary>
[DataMember]
public Nullable<int> Vertical { get; set; }
/// <summary>
///
/// </summary>
[DataMember]
public Nullable<bool> IsWrap { get; set; }
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment