lu
2025-02-18 235ea34c744925b33bc88982bea5c41a4566d382
板面设置
已添加1个文件
已修改6个文件
271 ■■■■■ 文件已修改
DevApp/Gs.DevApp/Gs.DevApp.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Properties/Resources.Designer.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Properties/Resources.resx 129 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Resources/convert_16x161.png 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/showLayOut.Designer.cs 103 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/showLayOut.cs 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -1446,6 +1446,7 @@
    <None Include="Resources\publicfix_32x321.png" />
    <None Include="Resources\globalcolorscheme_32x32.png" />
    <None Include="Resources\globalcolorscheme_16x16.png" />
    <None Include="Resources\convert_16x161.png" />
    <Content Include="Resources\user_16x16.png" />
  </ItemGroup>
  <ItemGroup />
DevApp/Gs.DevApp/Properties/Resources.Designer.cs
@@ -463,6 +463,16 @@
        /// <summary>
        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap convert_16x161 {
            get {
                object obj = ResourceManager.GetObject("convert_16x161", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        /// <summary>
        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap convert_32x32 {
            get {
                object obj = ResourceManager.GetObject("convert_32x32", resourceCulture);
DevApp/Gs.DevApp/Properties/Resources.resx
@@ -124,11 +124,6 @@
  <data name="refresh_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\refresh_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="logo_png_black" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\logo_png_black.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="usergroup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\usergroup_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -140,18 +135,13 @@
  <data name="checkbuttons_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbuttons_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbox2_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox2_32x321.png;System.Drawing.Bitmap,
  <data name="apply_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\apply_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="updatetableofcontents_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\updatetableofcontents_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbox_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="sortbyinvoice_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortbyinvoice_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -216,6 +206,9 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="reset_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\reset_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="employee_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\employee_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -246,9 +239,6 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="viewmergeddata_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\viewmergeddata_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbox2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox2_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -257,8 +247,8 @@
  <data name="checkbox2_32x323" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox2_32x323.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="sortandfilter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortandfilter_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="drilldownonarguments_chart_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\drilldownonarguments_chart_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="trackingchanges_previous_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_previous_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -287,13 +277,11 @@
    <value>..\Resources\logo_png.png;System.Drawing.Bitmap, System.Drawing,
            Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="bodepartment_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bodepartment_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="spellcheck_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\spellcheck_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="fill_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\fill_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="ico_noCheck" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\ico_noCheck.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="encryptdocument_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\encryptdocument_32x32.png;System.Drawing.Bitmap,
@@ -303,6 +291,11 @@
  <data name="up2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\up2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="show_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\show_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbox2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox2_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -311,21 +304,11 @@
  <data name="sortasc_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortasc_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="newitem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\newitem_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbox2_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox2_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="deletelist2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\deletelist2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="show_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\show_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="globalcolorscheme_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\globalcolorscheme_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -353,10 +336,8 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="show_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\show_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="sortandfilter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortandfilter_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="fill_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\fill_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -509,8 +490,8 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="reset_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\reset_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="fill_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\fill_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="trackingchanges_next_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_next_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -520,6 +501,9 @@
  </data>
  <data name="updatetableofcontents_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\updatetableofcontents_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="globalcolorscheme_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\globalcolorscheme_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="printlayoutview_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\printlayoutview_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -582,6 +566,11 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="converttorange_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\converttorange_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="removegroupfooter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\removegroupfooter_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -622,11 +611,6 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="alignmiddlecenter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\alignmiddlecenter_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="trackingchanges_next_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_next_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -647,6 +631,9 @@
  </data>
  <data name="sortasc_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortasc_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="fill_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\fill_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="meeting_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\meeting_32x32.png;System.Drawing.Bitmap,
@@ -731,13 +718,20 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="bodepartment_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bodepartment_16x161.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="renamedatasource_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\renamedatasource_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="fill_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\fill_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="alignmiddlecenter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\alignmiddlecenter_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="addcalculatedfield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\addcalculatedfield_16x16.png;System.Drawing.Bitmap,
@@ -758,8 +752,10 @@
    <value>..\Resources\login_bg6.png;System.Drawing.Bitmap, System.Drawing,
            Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="spellcheck_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\spellcheck_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="checkbox2_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox2_32x321.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="convert_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\convert_32x32.png;System.Drawing.Bitmap,
@@ -771,22 +767,29 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="area3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\area3d_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="printlayoutview_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\printlayoutview_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbuttons_32x322" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbuttons_32x322.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="area3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\area3d_32x32.png;System.Drawing.Bitmap,
  <data name="checkbox_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="loadfrom_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\loadfrom_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="drilldownonarguments_chart_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\drilldownonarguments_chart_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="show_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\show_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="changedatasourcepivottable_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\changedatasourcepivottable_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -810,13 +813,13 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="bodepartment_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bodepartment_16x161.png;System.Drawing.Bitmap,
  <data name="viewmergeddata_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\viewmergeddata_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="logo_png_black" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\logo_png_black.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="ico_noCheck" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\ico_noCheck.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="insertdatafield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\insertdatafield_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -837,8 +840,8 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="apply_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\apply_32x32.png;System.Drawing.Bitmap,
  <data name="bodepartment_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bodepartment_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -853,8 +856,8 @@
  <data name="add_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\add_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="converttorange_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\converttorange_32x32.png;System.Drawing.Bitmap,
  <data name="newitem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\newitem_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -871,7 +874,7 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="globalcolorscheme_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\globalcolorscheme_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="convert_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\convert_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
</root>
DevApp/Gs.DevApp/Resources/convert_16x161.png
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -1922,6 +1922,9 @@
        private static void getGridViewConfig(GridView gridView1, string namespaceFullName)
        {
            gridView1.OptionsView.ShowGroupPanel = false;
           // gridView1.OptionsMenu.EnableColumnMenu = false;
            gridView1.OptionsCustomization.AllowGroup = false;
            if (string.IsNullOrEmpty(namespaceFullName)) return;
            var _obj = new
            {
DevApp/Gs.DevApp/UserControl/showLayOut.Designer.cs
@@ -30,10 +30,12 @@
        {
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(showLayOut));
            this.panel1 = new System.Windows.Forms.Panel();
            this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
            this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
            this.btnHf = new DevExpress.XtraEditors.SimpleButton();
            this.txt_layOut = new DevExpress.XtraEditors.ComboBoxEdit();
            this.btnCancel = new DevExpress.XtraEditors.SimpleButton();
            this.btnSave = new DevExpress.XtraEditors.SimpleButton();
            this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
            this.txt_layOut = new DevExpress.XtraEditors.ComboBoxEdit();
            this.panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_layOut.Properties)).BeginInit();
            this.SuspendLayout();
@@ -41,43 +43,17 @@
            // panel1
            // 
            this.panel1.BackColor = System.Drawing.Color.White;
            this.panel1.Controls.Add(this.btnHf);
            this.panel1.Controls.Add(this.labelControl2);
            this.panel1.Controls.Add(this.txt_layOut);
            this.panel1.Controls.Add(this.btnCancel);
            this.panel1.Controls.Add(this.btnSave);
            this.panel1.Controls.Add(this.labelControl1);
            this.panel1.Font = new System.Drawing.Font("Tahoma", 12F);
            this.panel1.Location = new System.Drawing.Point(35, 12);
            this.panel1.Location = new System.Drawing.Point(11, 12);
            this.panel1.Name = "panel1";
            this.panel1.Size = new System.Drawing.Size(282, 228);
            this.panel1.Size = new System.Drawing.Size(374, 215);
            this.panel1.TabIndex = 2;
            //
            // btnCancel
            //
            this.btnCancel.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.btnCancel.Appearance.Options.UseFont = true;
            this.btnCancel.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
            this.btnCancel.Cursor = System.Windows.Forms.Cursors.Hand;
            this.btnCancel.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnCancel.ImageOptions.Image")));
            this.btnCancel.Location = new System.Drawing.Point(148, 126);
            this.btnCancel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.btnCancel.Name = "btnCancel";
            this.btnCancel.Size = new System.Drawing.Size(98, 37);
            this.btnCancel.TabIndex = 238;
            this.btnCancel.Text = "取消 (&C)";
            //
            // btnSave
            //
            this.btnSave.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.btnSave.Appearance.Options.UseFont = true;
            this.btnSave.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
            this.btnSave.Cursor = System.Windows.Forms.Cursors.Hand;
            this.btnSave.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnSave.ImageOptions.Image")));
            this.btnSave.Location = new System.Drawing.Point(28, 126);
            this.btnSave.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.btnSave.Name = "btnSave";
            this.btnSave.Size = new System.Drawing.Size(98, 37);
            this.btnSave.TabIndex = 237;
            this.btnSave.Text = "确定 (&L)";
            // 
            // labelControl1
            // 
@@ -88,33 +64,83 @@
            this.labelControl1.Appearance.Options.UseTextOptions = true;
            this.labelControl1.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
            this.labelControl1.AutoSizeMode = DevExpress.XtraEditors.LabelAutoSizeMode.None;
            this.labelControl1.Location = new System.Drawing.Point(19, 48);
            this.labelControl1.Location = new System.Drawing.Point(23, 97);
            this.labelControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.labelControl1.Name = "labelControl1";
            this.labelControl1.Size = new System.Drawing.Size(93, 18);
            this.labelControl1.TabIndex = 236;
            this.labelControl1.Text = "适用范围:";
            // 
            // labelControl2
            //
            this.labelControl2.Location = new System.Drawing.Point(34, 15);
            this.labelControl2.Name = "labelControl2";
            this.labelControl2.Size = new System.Drawing.Size(165, 54);
            this.labelControl2.TabIndex = 240;
            this.labelControl2.Text = "适用范围友情提示:\r\n公有将会影响到所有用户\r\n私有只会影响自己";
            //
            // btnHf
            //
            this.btnHf.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.btnHf.Appearance.Options.UseFont = true;
            this.btnHf.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
            this.btnHf.Cursor = System.Windows.Forms.Cursors.Hand;
            this.btnHf.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.convert_16x161;
            this.btnHf.Location = new System.Drawing.Point(137, 141);
            this.btnHf.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.btnHf.Name = "btnHf";
            this.btnHf.Size = new System.Drawing.Size(98, 37);
            this.btnHf.TabIndex = 241;
            this.btnHf.Text = "恢复默认";
            //
            // txt_layOut
            // 
            this.txt_layOut.EditValue = "-请选择-";
            this.txt_layOut.Location = new System.Drawing.Point(118, 46);
            this.txt_layOut.Location = new System.Drawing.Point(122, 95);
            this.txt_layOut.Name = "txt_layOut";
            this.txt_layOut.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.txt_layOut.Properties.Items.AddRange(new object[] {
            "-请选择-",
            "保存为公有",
            "保存为私有"});
            "公有",
            "私有"});
            this.txt_layOut.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            this.txt_layOut.Size = new System.Drawing.Size(128, 24);
            this.txt_layOut.TabIndex = 239;
            //
            // btnCancel
            //
            this.btnCancel.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.btnCancel.Appearance.Options.UseFont = true;
            this.btnCancel.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
            this.btnCancel.Cursor = System.Windows.Forms.Cursors.Hand;
            this.btnCancel.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnCancel.ImageOptions.Image")));
            this.btnCancel.Location = new System.Drawing.Point(260, 141);
            this.btnCancel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.btnCancel.Name = "btnCancel";
            this.btnCancel.Size = new System.Drawing.Size(98, 37);
            this.btnCancel.TabIndex = 238;
            this.btnCancel.Text = "取消";
            //
            // btnSave
            //
            this.btnSave.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.btnSave.Appearance.Options.UseFont = true;
            this.btnSave.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
            this.btnSave.Cursor = System.Windows.Forms.Cursors.Hand;
            this.btnSave.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnSave.ImageOptions.Image")));
            this.btnSave.Location = new System.Drawing.Point(16, 141);
            this.btnSave.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.btnSave.Name = "btnSave";
            this.btnSave.Size = new System.Drawing.Size(98, 37);
            this.btnSave.TabIndex = 237;
            this.btnSave.Text = "保存设置";
            // 
            // showLayOut
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(355, 274);
            this.ClientSize = new System.Drawing.Size(397, 250);
            this.Controls.Add(this.panel1);
            this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
            this.MaximizeBox = false;
@@ -123,6 +149,7 @@
            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
            this.Text = "保存板面";
            this.panel1.ResumeLayout(false);
            this.panel1.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_layOut.Properties)).EndInit();
            this.ResumeLayout(false);
@@ -135,5 +162,7 @@
        private DevExpress.XtraEditors.SimpleButton btnCancel;
        private DevExpress.XtraEditors.SimpleButton btnSave;
        private DevExpress.XtraEditors.LabelControl labelControl1;
        private DevExpress.XtraEditors.LabelControl labelControl2;
        private DevExpress.XtraEditors.SimpleButton btnHf;
    }
}
DevApp/Gs.DevApp/UserControl/showLayOut.cs
@@ -19,9 +19,26 @@
            InitializeComponent();
            this.btnCancel.Click += BtnCancel_Click;
            this.btnSave.Click += BtnSave_Click;
            this.btnHf.Click += BtnHf_Click;
        }
        private void BtnHf_Click(object sender, EventArgs e)
        {
            _setLyout(0);
        }
        private void BtnSave_Click(object sender, EventArgs e)
        {
            _setLyout(1);
        }
        private void BtnCancel_Click(object sender, EventArgs e)
        {
            Close();
        }
        private void _setLyout(int type)
        {
            //  --col1,100,101,102,103,104,105,1,title&col2,100,101,102,103,104,105,1,title
            if (txt_layOut.SelectedIndex <= 0)
@@ -69,7 +86,8 @@
            {
                applyUserGuid = txt_layOut.SelectedIndex,
                layoutLst = sb.ToString(),
                formPath = formNamespace
                formPath = formNamespace,
                intType= type
            };
            try
            {
@@ -92,11 +110,6 @@
                DialogResult = DialogResult.Cancel;
                MsgHelper.Warning("提示:" + ex.Message);
            }
        }
        private void BtnCancel_Click(object sender, EventArgs e)
        {
            Close();
        }
    }
}