diff --git a/CLEditor/viewmodel/MainViewModel.cs b/CLEditor/viewmodel/MainViewModel.cs
index 46c79bca472a3e115b5a55ff58f10bb86a0b3c84..0c47662ce2651311c13d39b32c88eb5df4bdce3e 100644
--- a/CLEditor/viewmodel/MainViewModel.cs
+++ b/CLEditor/viewmodel/MainViewModel.cs
@@ -83,7 +83,7 @@ namespace CLEngine.Editor.ViewModel
 
         private bool CanDataBaseAction()
         {
-            return false;
+            return true;
         }
 
         private void ClearTextureBuffAction()
diff --git a/CLEditor/windows/DataBaseWindow.xaml b/CLEditor/windows/DataBaseWindow.xaml
index 4ec111a5a340cfb95df0c4ac87caadd00be80b6e..a4a8a4dae8bf8ccd31c303874a063dcaede27716 100644
--- a/CLEditor/windows/DataBaseWindow.xaml
+++ b/CLEditor/windows/DataBaseWindow.xaml
@@ -1,15 +1,110 @@
-<Window x:Class="CLEngine.Editor.windows.DataBaseWindow"
+<Window
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:CLEngine.Editor.windows"
+        xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" xmlns:Options="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
+        xmlns:controls="clr-namespace:CLEngine.Editor.controls" x:Class="CLEngine.Editor.windows.DataBaseWindow"
         mc:Ignorable="d"
-        Title="游戏数据库" Height="450" Width="800" Background="{DynamicResource PanelBackground}">
-    <TabControl Background="{DynamicResource PanelBackground}">
-        <TabItem Header="物品数据库">
+        Title="游戏数据库" Height="768" Width="1366" Background="{DynamicResource PanelBackground}">
+    <TabControl Background="{DynamicResource BackgroundBrush}">
+        <TabItem Header="物品数据库" >
+            <Grid>
+                <Label Content="物品列表" HorizontalAlignment="Left" Margin="5,5,0,39" Width="189" HorizontalContentAlignment="Center" BorderThickness="1"  Foreground="{DynamicResource ForegroundGray}" BorderBrush="{DynamicResource BorderDark}" FontWeight="Bold" Background="{DynamicResource BorderSimple}" FontSize="14"/>
+                <ListBox HorizontalAlignment="Left" Margin="5,30,0,39" Width="189" BorderBrush="{x:Null}" Foreground="{DynamicResource CheckedBorderBrush}" Background="{x:Null}"/>
+                <controls:RoundedButton x:Name="AddBtn"  Margin="12,0,0,10" Style="{DynamicResource RoundedButtonStyle}" Content="添加" BorderThickness="1,1,1,1" Foreground="{DynamicResource ForegroundGray}" Width="35" Cursor="Hand" FontSize="11" CornerRadius="4" HorizontalAlignment="Left" Height="24" VerticalAlignment="Bottom" />
+                <controls:RoundedButton x:Name="RemoveBtn"  Margin="47,0,0,10" Style="{DynamicResource RoundedButtonStyle}" Content="删除" BorderThickness="1,1,1,1" Foreground="{DynamicResource ForegroundGray}" Width="35" Cursor="Hand" CornerRadius="4" HorizontalAlignment="Left" Height="24" VerticalAlignment="Bottom" FontSize="11" />
+                <controls:RoundedButton x:Name="ImportBtn"  Margin="82,0,0,10" Style="{DynamicResource RoundedButtonStyle}" Content="导入" BorderThickness="1,1,1,1" Foreground="{DynamicResource ForegroundGray}" Width="35" Cursor="Hand" FontSize="11" CornerRadius="4" HorizontalAlignment="Left" Height="24" VerticalAlignment="Bottom" />
+                <controls:RoundedButton x:Name="OutputBtn"  Margin="117,0,0,10" Style="{DynamicResource RoundedButtonStyle}" Content="导出" BorderThickness="1,1,1,1" Foreground="{DynamicResource ForegroundGray}" Width="35" Cursor="Hand" FontSize="11" CornerRadius="4" HorizontalAlignment="Left" Height="24" VerticalAlignment="Bottom" />
+                <controls:RoundedButton x:Name="SearchBtn"  Margin="152,0,0,10" Style="{DynamicResource RoundedButtonStyle}" Content="搜索" BorderThickness="1,1,1,1" Foreground="{DynamicResource ForegroundGray}" Width="35" Cursor="Hand" FontSize="11" CornerRadius="4" HorizontalAlignment="Left" Height="24" VerticalAlignment="Bottom" />
+
+                <Label Content="物品设置" Margin="199,5,0,39" HorizontalContentAlignment="Center" BorderThickness="1"  Foreground="{DynamicResource ForegroundGray}" BorderBrush="{DynamicResource BorderDark}" FontWeight="Bold" Background="{DynamicResource BorderSimple}" FontSize="14" HorizontalAlignment="Left" Width="341"/>
+                <Border BorderBrush="{DynamicResource CheckBoxStroke}" BorderThickness="1" HorizontalAlignment="Left" Height="52" Margin="210,34,0,0" VerticalAlignment="Top" Width="52"/>
+                <Image x:Name="PackageiconImage" HorizontalAlignment="Left" Height="50" Margin="211,35,0,0" VerticalAlignment="Top" Width="50" Source="/CLEngine/CLEditor/content/windows_phone.png"/>
+                <TextBlock HorizontalAlignment="Left" Margin="274,39,0,0" TextWrapping="Wrap" Text="物品图标" VerticalAlignment="Top" Foreground="{DynamicResource ForegroundGray}"/>
+                <controls:RoundedButton x:Name="PackageiconBtn"  Margin="274,62,0,0" Style="{DynamicResource RoundedButtonStyle}" Content="选择" BorderThickness="1,1,1,1" Foreground="{DynamicResource ForegroundGray}" Width="48" Cursor="Hand" FontSize="11" CornerRadius="4" HorizontalAlignment="Left" Height="24" VerticalAlignment="Top" />
+                <TextBlock HorizontalAlignment="Left" Margin="210,92,0,0" TextWrapping="Wrap" Text="ID：" VerticalAlignment="Top" Foreground="{DynamicResource ForegroundGray}" />
+                <TextBlock HorizontalAlignment="Left" Margin="211,117,0,0" TextWrapping="Wrap" Text="名称：" VerticalAlignment="Top" Foreground="{DynamicResource ForegroundGray}" />
+                <TextBlock HorizontalAlignment="Left" Margin="211,142,0,0" TextWrapping="Wrap" Text="等级：" VerticalAlignment="Top" Foreground="{DynamicResource ForegroundGray}" />
+                <TextBlock HorizontalAlignment="Left" Margin="211,167,0,0" TextWrapping="Wrap" Text="价格：" VerticalAlignment="Top" Foreground="{DynamicResource ForegroundGray}" />
+                <TextBlock HorizontalAlignment="Left" Margin="337,39,0,0" TextWrapping="Wrap" Text="分类：" VerticalAlignment="Top" Foreground="{DynamicResource ForegroundGray}" />
+                <TextBlock HorizontalAlignment="Left" Margin="337,64,0,0" TextWrapping="Wrap" Text="子类：" VerticalAlignment="Top" Foreground="{DynamicResource ForegroundGray}" />
+                <TextBlock HorizontalAlignment="Left" Margin="337,92,0,0" TextWrapping="Wrap" Text="类型：" VerticalAlignment="Top" Foreground="{DynamicResource ForegroundGray}" />
+                <TextBlock HorizontalAlignment="Left" Margin="337,117,0,0" TextWrapping="Wrap" Text="职业：" VerticalAlignment="Top" Foreground="{DynamicResource ForegroundGray}" />
+                <TextBlock HorizontalAlignment="Left" Margin="337,142,0,0" TextWrapping="Wrap" Text="性别：" VerticalAlignment="Top" Foreground="{DynamicResource ForegroundGray}" />
+                <TextBlock HorizontalAlignment="Left" Margin="337,167,0,0" TextWrapping="Wrap" Text="脚本：" VerticalAlignment="Top" Foreground="{DynamicResource ForegroundGray}" />
+                <TextBox HorizontalAlignment="Left" Height="15" Margin="245,93,0,0" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="87" BorderBrush="{DynamicResource CheckBoxStroke}" Foreground="{DynamicResource PressedBorderBrush}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Background="{x:Null}" FontSize="10"/>
+                <TextBox HorizontalAlignment="Left" Height="15" Margin="245,117,0,0" TextWrapping="Wrap" Text="CLEngine" VerticalAlignment="Top" Width="87" BorderBrush="{DynamicResource CheckBoxStroke}" Foreground="{DynamicResource PressedBorderBrush}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Background="{x:Null}" FontSize="10"/>
+                <TextBox HorizontalAlignment="Left" Height="15" Margin="245,142,0,0" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="87" BorderBrush="{DynamicResource CheckBoxStroke}" Foreground="{DynamicResource PressedBorderBrush}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Background="{x:Null}" FontSize="10"/>
+                <TextBox HorizontalAlignment="Left" Height="15" Margin="245,167,0,0" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="87" BorderBrush="{DynamicResource CheckBoxStroke}" Foreground="{DynamicResource PressedBorderBrush}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Background="{x:Null}" FontSize="10"/>
+                <ComboBox HorizontalAlignment="Left" Margin="373,33,0,0" VerticalAlignment="Top"/>
+                <ComboBox HorizontalAlignment="Left" Margin="373,58,0,0" VerticalAlignment="Top"/>
+                <ComboBox HorizontalAlignment="Left" Margin="373,84,0,0" VerticalAlignment="Top"/>
+                <ComboBox HorizontalAlignment="Left" Margin="373,110,0,0" VerticalAlignment="Top"/>
+                <ComboBox HorizontalAlignment="Left" Margin="373,136,0,0" VerticalAlignment="Top"/>
+                <ComboBox HorizontalAlignment="Left" Margin="373,161,0,0" VerticalAlignment="Top"/>
+                <controls:RoundedButton x:Name="PackageiconBtn_Copy"  Margin="498,35,0,0" Style="{DynamicResource RoundedButtonStyle}" Content="编辑" BorderThickness="1,1,1,1" Foreground="{DynamicResource ForegroundGray}" Width="35" Cursor="Hand" FontSize="10" CornerRadius="4" HorizontalAlignment="Left" Height="20" VerticalAlignment="Top" />
+                <controls:RoundedButton x:Name="PackageiconBtn_Copy1"  Margin="498,110,0,0" Style="{DynamicResource RoundedButtonStyle}" Content="编辑" BorderThickness="1,1,1,1" Foreground="{DynamicResource ForegroundGray}" Width="35" Cursor="Hand" FontSize="10" CornerRadius="4" HorizontalAlignment="Left" Height="20" VerticalAlignment="Top" />
+                <controls:RoundedButton x:Name="PackageiconBtn_Copy2"  Margin="498,162,0,0" Style="{DynamicResource RoundedButtonStyle}" Content="创建" BorderThickness="1,1,1,1" Foreground="{DynamicResource ForegroundGray}" Width="35" Cursor="Hand" FontSize="10" CornerRadius="4" HorizontalAlignment="Left" Height="20" VerticalAlignment="Top" />
+                <TextBlock HorizontalAlignment="Left" Margin="210,229,0,0" TextWrapping="Wrap" Text="力量+：" VerticalAlignment="Top" Foreground="{DynamicResource ForegroundGray}" Height="25" />
+                <TextBlock HorizontalAlignment="Left" Margin="210,254,0,0" TextWrapping="Wrap" Text="敏捷+：" VerticalAlignment="Top" Foreground="{DynamicResource ForegroundGray}" Height="25" />
+                <TextBlock HorizontalAlignment="Left" Margin="210,279,0,0" TextWrapping="Wrap" Text="智力+：" VerticalAlignment="Top" Foreground="{DynamicResource ForegroundGray}" Height="25" />
+                <TextBlock HorizontalAlignment="Left" Margin="210,304,0,0" TextWrapping="Wrap" Text="运气+：" VerticalAlignment="Top" Foreground="{DynamicResource ForegroundGray}" Height="25" />
+                <TextBlock HorizontalAlignment="Left" Margin="210,329,0,0" TextWrapping="Wrap" Text="精神+：" VerticalAlignment="Top" Foreground="{DynamicResource ForegroundGray}" Height="26" />
+                <TextBlock HorizontalAlignment="Left" Margin="210,355,0,0" TextWrapping="Wrap" Text="体力+：" VerticalAlignment="Top" Foreground="{DynamicResource ForegroundGray}" Height="25" />
+                <TextBlock HorizontalAlignment="Left" Margin="370,229,0,0" TextWrapping="Wrap" Text="物理攻击+：" VerticalAlignment="Top" Foreground="{DynamicResource ForegroundGray}" Height="25" />
+                <TextBlock HorizontalAlignment="Left" Margin="370,254,0,0" TextWrapping="Wrap" Text="魔法攻击+：" VerticalAlignment="Top" Foreground="{DynamicResource ForegroundGray}" Height="25" />
+                <TextBlock HorizontalAlignment="Left" Margin="370,279,0,0" TextWrapping="Wrap" Text="物理防御+：" VerticalAlignment="Top" Foreground="{DynamicResource ForegroundGray}" Height="25" />
+                <TextBlock HorizontalAlignment="Left" Margin="370,304,0,0" TextWrapping="Wrap" Text="魔法防御+：" VerticalAlignment="Top" Foreground="{DynamicResource ForegroundGray}" Height="25" />
+                <TextBlock HorizontalAlignment="Left" Margin="370,329,0,0" TextWrapping="Wrap" Text="HP+：" VerticalAlignment="Top" Foreground="{DynamicResource ForegroundGray}" Height="25" />
+                <TextBlock HorizontalAlignment="Left" Margin="370,353,0,0" TextWrapping="Wrap" Text="MP+：" VerticalAlignment="Top" Foreground="{DynamicResource ForegroundGray}" Height="25" />
+                <TextBox HorizontalAlignment="Left" Height="15" Margin="260,229,0,0" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="87" BorderBrush="{DynamicResource CheckBoxStroke}" Foreground="{DynamicResource PressedBorderBrush}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Background="{x:Null}" FontSize="10"/>
+                <TextBox HorizontalAlignment="Left" Height="15" Margin="260,254,0,0" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="87" BorderBrush="{DynamicResource CheckBoxStroke}" Foreground="{DynamicResource PressedBorderBrush}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Background="{x:Null}" FontSize="10"/>
+                <TextBox HorizontalAlignment="Left" Height="15" Margin="260,279,0,0" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="87" BorderBrush="{DynamicResource CheckBoxStroke}" Foreground="{DynamicResource PressedBorderBrush}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Background="{x:Null}" FontSize="10"/>
+                <TextBox HorizontalAlignment="Left" Height="15" Margin="260,305,0,0" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="87" BorderBrush="{DynamicResource CheckBoxStroke}" Foreground="{DynamicResource PressedBorderBrush}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Background="{x:Null}" FontSize="10"/>
+                <TextBox HorizontalAlignment="Left" Height="15" Margin="260,329,0,0" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="87" BorderBrush="{DynamicResource CheckBoxStroke}" Foreground="{DynamicResource PressedBorderBrush}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Background="{x:Null}" FontSize="10"/>
+                <TextBox HorizontalAlignment="Left" Height="15" Margin="260,355,0,0" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="87" BorderBrush="{DynamicResource CheckBoxStroke}" Foreground="{DynamicResource PressedBorderBrush}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Background="{x:Null}" FontSize="10"/>
+                <TextBox HorizontalAlignment="Left" Height="15" Margin="439,229,0,0" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="87" BorderBrush="{DynamicResource CheckBoxStroke}" Foreground="{DynamicResource PressedBorderBrush}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Background="{x:Null}" FontSize="10"/>
+                <TextBox HorizontalAlignment="Left" Height="15" Margin="439,254,0,0" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="87" BorderBrush="{DynamicResource CheckBoxStroke}" Foreground="{DynamicResource PressedBorderBrush}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Background="{x:Null}" FontSize="10"/>
+                <TextBox HorizontalAlignment="Left" Height="15" Margin="439,279,0,0" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="87" BorderBrush="{DynamicResource CheckBoxStroke}" Foreground="{DynamicResource PressedBorderBrush}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Background="{x:Null}" FontSize="10"/>
+                <TextBox HorizontalAlignment="Left" Height="15" Margin="439,304,0,0" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="87" BorderBrush="{DynamicResource CheckBoxStroke}" Foreground="{DynamicResource PressedBorderBrush}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Background="{x:Null}" FontSize="10"/>
+                <TextBox HorizontalAlignment="Left" Height="15" Margin="439,329,0,0" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="87" BorderBrush="{DynamicResource CheckBoxStroke}" Foreground="{DynamicResource PressedBorderBrush}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Background="{x:Null}" FontSize="10"/>
+                <TextBox HorizontalAlignment="Left" Height="15" Margin="439,354,0,0" TextWrapping="Wrap" Text="0" VerticalAlignment="Top" Width="87" BorderBrush="{DynamicResource CheckBoxStroke}" Foreground="{DynamicResource PressedBorderBrush}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Background="{x:Null}" FontSize="10"/>
+                <CheckBox Content="禁止出售" HorizontalAlignment="Left" Margin="211,194,0,0" VerticalAlignment="Top" Foreground="{DynamicResource ForegroundGray}"/>
+                <CheckBox Content="禁止交易" HorizontalAlignment="Left" Margin="297,194,0,0" VerticalAlignment="Top" Foreground="{DynamicResource ForegroundGray}"/>
+                <CheckBox Content="禁止丢弃" HorizontalAlignment="Left" Margin="382,194,0,0" VerticalAlignment="Top" Foreground="{DynamicResource ForegroundGray}"/>
+                <CheckBox Content="禁止叠加" HorizontalAlignment="Left" Margin="466,194,0,0" VerticalAlignment="Top" Foreground="{DynamicResource ForegroundGray}"/>
+                <TextBlock HorizontalAlignment="Left" Margin="204,383,0,0" TextWrapping="Wrap" Text="物品描述：" VerticalAlignment="Top" Foreground="{DynamicResource ForegroundGray}" Height="25" />
+                <TextBox HorizontalAlignment="Left" Margin="204,402,0,196" TextWrapping="Wrap" Text="TextBox" Width="327" Background="{x:Null}" BorderBrush="{DynamicResource CheckBoxStroke}" Foreground="{DynamicResource {x:Static SystemColors.InactiveCaptionBrushKey}}"/>
+                <TextBlock HorizontalAlignment="Left" Margin="204,0,0,161" TextWrapping="Wrap" Text="物品装备动画：" Foreground="{DynamicResource ForegroundGray}" Height="25" VerticalAlignment="Bottom" />
+                <TextBlock HorizontalAlignment="Left" Margin="204,0,0,136" TextWrapping="Wrap" Text="物品动画音效：" Foreground="{DynamicResource ForegroundGray}" Height="25" VerticalAlignment="Bottom" />
+                <TextBlock HorizontalAlignment="Left" Margin="204,0,0,111" TextWrapping="Wrap" Text="物品掉落动画：" Foreground="{DynamicResource ForegroundGray}" Height="25" VerticalAlignment="Bottom" />
+                <TextBlock HorizontalAlignment="Left" Margin="204,0,0,86" TextWrapping="Wrap" Text="物品掉落音效：" Foreground="{DynamicResource ForegroundGray}" Height="25" VerticalAlignment="Bottom" />
+                <TextBlock HorizontalAlignment="Left" Margin="204,0,0,61" TextWrapping="Wrap" Text="物品使用动画：" Foreground="{DynamicResource ForegroundGray}" Height="25" VerticalAlignment="Bottom" />
+                <TextBlock HorizontalAlignment="Left" Margin="204,0,0,36" TextWrapping="Wrap" Text="物品使用音效：" Foreground="{DynamicResource ForegroundGray}" Height="25" VerticalAlignment="Bottom" />
+                <TextBox HorizontalAlignment="Left" Margin="286,0,0,171" TextWrapping="Wrap" Text="" Width="207" BorderBrush="{DynamicResource CheckBoxStroke}" Foreground="{DynamicResource ButtonNormalBackground}" Background="{x:Null}" FontSize="10" VerticalContentAlignment="Center" Height="15" VerticalAlignment="Bottom"/>
+                <TextBox HorizontalAlignment="Left" Margin="286,0,0,146" TextWrapping="Wrap" Text="" Width="207" BorderBrush="{DynamicResource CheckBoxStroke}" Foreground="{DynamicResource ButtonNormalBackground}" VerticalContentAlignment="Center" Background="{x:Null}" FontSize="10" Height="15" VerticalAlignment="Bottom"/>
+                <TextBox HorizontalAlignment="Left" Margin="286,0,0,121" TextWrapping="Wrap" Text="" Width="207" BorderBrush="{DynamicResource CheckBoxStroke}" Foreground="{DynamicResource ButtonNormalBackground}" VerticalContentAlignment="Center" Background="{x:Null}" FontSize="10" Height="15" VerticalAlignment="Bottom"/>
+                <TextBox HorizontalAlignment="Left" Margin="286,0,0,96" TextWrapping="Wrap" Text="" Width="207" BorderBrush="{DynamicResource CheckBoxStroke}" Foreground="{DynamicResource ButtonNormalBackground}" VerticalContentAlignment="Center" Background="{x:Null}" FontSize="10" Height="15" VerticalAlignment="Bottom"/>
+                <TextBox HorizontalAlignment="Left" Margin="286,0,0,70" TextWrapping="Wrap" Text="" Width="207" BorderBrush="{DynamicResource CheckBoxStroke}" Foreground="{DynamicResource ButtonNormalBackground}" VerticalContentAlignment="Center" Background="{x:Null}" FontSize="10" Height="15" VerticalAlignment="Bottom"/>
+                <TextBox HorizontalAlignment="Left" Margin="286,0,0,46" TextWrapping="Wrap" Text="" Width="207" BorderBrush="{DynamicResource CheckBoxStroke}" Foreground="{DynamicResource ButtonNormalBackground}" VerticalContentAlignment="Center" Background="{x:Null}" FontSize="10" Height="15" VerticalAlignment="Bottom"/>
+                <controls:RoundedButton x:Name="PackageiconBtn_Copy3"  Margin="504,0,0,168" Style="{DynamicResource RoundedButtonStyle}" Content="..." BorderThickness="1,1,1,1" Foreground="{DynamicResource ForegroundGray}" Width="27" Cursor="Hand" FontSize="10" CornerRadius="4" HorizontalAlignment="Left" Height="20" VerticalAlignment="Bottom" />
+                <controls:RoundedButton x:Name="PackageiconBtn_Copy4"  Margin="504,0,0,143" Style="{DynamicResource RoundedButtonStyle}" Content="..." BorderThickness="1,1,1,1" Foreground="{DynamicResource ForegroundGray}" Width="27" Cursor="Hand" FontSize="10" CornerRadius="4" HorizontalAlignment="Left" Height="20" VerticalAlignment="Bottom" />
+                <controls:RoundedButton x:Name="PackageiconBtn_Copy5"  Margin="504,0,0,118" Style="{DynamicResource RoundedButtonStyle}" Content="..." BorderThickness="1,1,1,1" Foreground="{DynamicResource ForegroundGray}" Width="27" Cursor="Hand" FontSize="10" CornerRadius="4" HorizontalAlignment="Left" Height="20" VerticalAlignment="Bottom" />
+                <controls:RoundedButton x:Name="PackageiconBtn_Copy6"  Margin="504,0,0,93" Style="{DynamicResource RoundedButtonStyle}" Content="..." BorderThickness="1,1,1,1" Foreground="{DynamicResource ForegroundGray}" Width="27" Cursor="Hand" FontSize="10" CornerRadius="4" HorizontalAlignment="Left" Height="20" VerticalAlignment="Bottom" />
+                <controls:RoundedButton x:Name="PackageiconBtn_Copy7"  Margin="504,0,0,68" Style="{DynamicResource RoundedButtonStyle}" Content="..." BorderThickness="1,1,1,1" Foreground="{DynamicResource ForegroundGray}" Width="27" Cursor="Hand" FontSize="10" CornerRadius="4" HorizontalAlignment="Left" Height="20" VerticalAlignment="Bottom" />
+                <controls:RoundedButton x:Name="PackageiconBtn_Copy8"  Margin="504,0,0,43" Style="{DynamicResource RoundedButtonStyle}" Content="..." BorderThickness="1,1,1,1" Foreground="{DynamicResource ForegroundGray}" Width="27" Cursor="Hand" FontSize="10" CornerRadius="4" HorizontalAlignment="Left" Height="20" VerticalAlignment="Bottom" />
+                <controls:RoundedButton x:Name="PackageiconBtn_Copy9"  Margin="483,0,0,10" Style="{DynamicResource RoundedButtonStyle}" Content="修改" BorderThickness="1,1,1,1" Foreground="{DynamicResource ForegroundGray}" Width="48" Cursor="Hand" FontSize="11" CornerRadius="4" HorizontalAlignment="Left" Height="24" VerticalAlignment="Bottom" />
+
+                <Label Content="物品技能属性" Margin="545,5,0,0" HorizontalContentAlignment="Center" BorderThickness="1"  Foreground="{DynamicResource ForegroundGray}" BorderBrush="{DynamicResource BorderDark}" FontWeight="Bold" Background="{DynamicResource BorderSimple}" FontSize="14" HorizontalAlignment="Left" Width="342" Height="213" VerticalAlignment="Top"/>
+                <Label Content="状态变化" Margin="545,223,0,5" HorizontalContentAlignment="Center" BorderThickness="1"  Foreground="{DynamicResource ForegroundGray}" BorderBrush="{DynamicResource BorderDark}" FontWeight="Bold" Background="{DynamicResource BorderSimple}" FontSize="14" HorizontalAlignment="Left" Width="342"/>
+                <Label Content="资源表" Margin="892,5,5,5" HorizontalContentAlignment="Center" BorderThickness="1"  Foreground="{DynamicResource ForegroundGray}" BorderBrush="{DynamicResource BorderDark}" FontWeight="Bold" Background="{DynamicResource BorderSimple}" FontSize="14"/>
+            </Grid>
         </TabItem>
-        <TabItem Header="事件数据库"></TabItem>
-        <TabItem Header="任务数据库"></TabItem>
+        <TabItem Header="事件数据库"/>
+        <TabItem Header="任务数据库"/>
+
+
     </TabControl>
 </Window>
diff --git a/CLEditor/windows/ManageTagsWindow.xaml.cs b/CLEditor/windows/ManageTagsWindow.xaml.cs
index 5d9766ea0dd089343e36f0cea4b4616b1cea5e57..e3b254dfd911012bdafe91bd4d8da854039141b7 100644
--- a/CLEditor/windows/ManageTagsWindow.xaml.cs
+++ b/CLEditor/windows/ManageTagsWindow.xaml.cs
@@ -24,7 +24,7 @@ namespace CLEngine.Editor.windows
         {
             if (e.Key == Key.Enter)
             {
-                string text = this.addBtn.Text.Trim();
+                string text = this.AddTextBox.Text.Trim();
                 if (text.Equals(string.Empty)) return;
 
                 if (!SceneManager.ActiveScene.CommonTags.Contains(text))