feat(CardUpload): support webp format image (#3722)

* Revert "fix(CardUpload): support image for preview (#3717)" This reverts commit 14994c6. * test: 更新单元测试 * feat(Table): add rowspan function (#3627) * add rowspan * update span * update des * fomart * fix the not continue row * 去除空行 --------- Signed-off-by: Argo Zhang <[email protected]> Co-authored-by: Argo Zhang <[email protected]> * Revert "feat(Table): add rowspan function (#3627)" This reverts commit f1670aa. * refactor: 增加 webp 格式支持 * Revert "feat(Table): add rowspan function (#3627)" This reverts commit 497917a. --------- Signed-off-by: Argo Zhang <[email protected]> Co-authored-by: startewho <[email protected]>
dotnetcore · Jun 25, 2024 · 77a7dbf · 77a7dbf
1 parent 497917a
commit 77a7dbf
Show file tree

Hide file tree

Showing 14 changed files with 504 additions and 1,220 deletions.
diff --git a/exclusion.dic b/exclusion.dic
@@ -89,3 +89,4 @@ onerror
 dockview
 Wwads
 zindex
+webp
diff --git a/src/BootstrapBlazor.Server/Components/Samples/Table/TablesCell.razor b/src/BootstrapBlazor.Server/Components/Samples/Table/TablesCell.razor
@@ -34,18 +34,6 @@
  </Table>
 </DemoBlock>
 
-<DemoBlock Title="@Localizer["TableMergeRowTitle"]"
- Introduction="@Localizer["TableCellMergeRowIntro"]"
- Name="MergeRow">
- <Table TItem="Foo" Items="@SameNameItems.Take(6)" IsBordered="true">
- <TableColumns>
- <TableColumn @bind-Field="@context.DateTime" Width="140" />
- <TableColumn @bind-Field="@context.Name" MergeRow="true" />
- <TableColumn @bind-Field="@context.Address" />
- </TableColumns>
- </Table>
-</DemoBlock>
-
 <DemoBlock Title="@Localizer["TableCellOnDoubleClickCellTitle"]"
  Introduction="@Localizer["TableCellOnDoubleClickCellIntro"]"
  Name="OnDoubleClickCell">

diff --git a/src/BootstrapBlazor.Server/Components/Samples/Table/TablesCell.razor.cs b/src/BootstrapBlazor.Server/Components/Samples/Table/TablesCell.razor.cs
@@ -17,9 +17,6 @@ public partial class TablesCell
  [NotNull]
  private List<Foo>? Items { get; set; }
 
- [NotNull]
- private List<Foo>? SameNameItems { get; set; }
-
  /// <summary>
  /// <inheritdoc/>
  /// </summary>
@@ -30,13 +27,6 @@ protected override void OnInitialized()
  //获取随机数据
  //Get random data
  Items = Foo.GenerateFoo(FooLocalizer);
- SameNameItems = Foo.GenerateFoo(FooLocalizer);
- //为了竖向合并
- SameNameItems[1].Name = SameNameItems[0].Name;
- SameNameItems[2].Name = SameNameItems[0].Name;
- SameNameItems[3].Name = SameNameItems[3].Name;
- SameNameItems[4].Name = SameNameItems[0].Name;
- SameNameItems[5].Name = SameNameItems[0].Name;
  }
 
  private static void OnCellRenderHandler(TableCellArgs args)

diff --git a/src/BootstrapBlazor.Server/Locales/en-US.json b/src/BootstrapBlazor.Server/Locales/en-US.json
@@ -5359,9 +5359,7 @@
  "ValueAttr": "Current cell display content",
  "TableCellOnDoubleClickCellToastTitle": "Double-click cell callback",
  "TableCellOnDoubleClickCellCurrentCellName": "Current cell name:",
- "TableCellOnDoubleClickCellCurrentValue": "Current Value:",
- "TableMergeRowTitle": "Merge the same row",
- "TableCellMergeRowIntro": "In this example, by setting the <code>MergeRow</code> property,the property is used to merge vertically through the <code>Name</code> of the same row, the cell style is vertically centered"
+ "TableCellOnDoubleClickCellCurrentValue": "Current Value:"
  },
  "BootstrapBlazor.Server.Components.Samples.Table.TablesLookup": {
  "TablesLookupTitle": "Table Lookup",

diff --git a/src/BootstrapBlazor.Server/Locales/zh-CN.json b/src/BootstrapBlazor.Server/Locales/zh-CN.json
@@ -5359,9 +5359,7 @@
  "ValueAttr": "当前单元格显示内容",
  "TableCellOnDoubleClickCellToastTitle": "双击单元格回调",
  "TableCellOnDoubleClickCellCurrentCellName": "当前单元格名称：",
- "TableCellOnDoubleClickCellCurrentValue": "当前值：",
- "TableMergeRowTitle": "合并相同行",
- "TableCellMergeRowIntro": "本例中通过设置 <code>MergeRow</code> 属性，通过相同行的 <code>Name</code> 进行竖向合并操作，同时设置合并单元竖向居中"
+ "TableCellOnDoubleClickCellCurrentValue": "当前值："
  },
  "BootstrapBlazor.Server.Components.Samples.Table.TablesLookup": {
  "TablesLookupTitle": "Table 表格",

diff --git a/src/BootstrapBlazor/Attributes/AutoGenerateColumnAttribute.cs b/src/BootstrapBlazor/Attributes/AutoGenerateColumnAttribute.cs
@@ -114,11 +114,6 @@ public class AutoGenerateColumnAttribute : AutoGenerateBaseAttribute, ITableColu
  /// </summary>
  public bool Fixed { get; set; }
 
- /// <summary>
- /// 是否合并相同行
- /// </summary>
- public bool MergeRow { get; set; }
-
  /// <summary>
  /// 获得/设置 列 td 自定义样式 默认为 null 未设置
  /// </summary>

diff --git a/src/BootstrapBlazor/Components/Table/ITableColumn.cs b/src/BootstrapBlazor/Components/Table/ITableColumn.cs
@@ -44,13 +44,6 @@ public interface ITableColumn : IEditorItem
  /// </summary>
  bool Fixed { get; set; }
 
-
- /// <summary>
- /// 是否合并相同行
- /// </summary>
- public bool MergeRow { get; set; }
-
-
  /// <summary>
  /// 获得/设置 本列是否允许换行 默认为 false
  /// </summary>

diff --git a/src/BootstrapBlazor/Components/Table/InternalTableColumn.cs b/src/BootstrapBlazor/Components/Table/InternalTableColumn.cs
@@ -28,8 +28,6 @@ class InternalTableColumn(string fieldName, Type fieldType, string? fieldText =
 
  public bool Fixed { get; set; }
 
- public bool MergeRow { get; set; }
-
  public bool TextWrap { get; set; }
 
  public bool TextEllipsis { get; set; }