chenwei
/
FieldWorkClient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: chenwei:35fbd4b3600ba038441f86376a3bc86cd3111ad9
Branches Tags
chenwei:dev
chenwei:dev2.0
chenwei:master
..
compare: chenwei:420e4d90f778b729684d2e94675f4f9009f521c8
Branches Tags
chenwei:dev
chenwei:dev2.0
chenwei:master

No commits in common. "35fbd4b3600ba038441f86376a3bc86cd3111ad9" and "420e4d90f778b729684d2e94675f4f9009f521c8" have entirely different histories.
35fbd4b360 ... 420e4d90f7

2 changed files with 8 additions and 30 deletions
Show Stats Expand all files Collapse all files

16
View/Send/WaitUploadControl.xaml
View File

@ -37,16 +37,12 @@
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<!--<TextBlock Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center"
FontWeight="Bold" Text="选择" />-->
<!-- 全选复选框 -->
<CheckBox Grid.Column="0"
HorizontalAlignment="Left" VerticalAlignment="Center"
IsChecked="{Binding IsAllSelected, Mode=TwoWay}"/>
<TextBlock Grid.Column="1" HorizontalAlignment="left" VerticalAlignment="Center" FontWeight="Bold" Text="文件名称" />
<TextBlock Grid.Column="2" HorizontalAlignment="left" VerticalAlignment="Center" FontWeight="Bold" Text="文件大小" />
<TextBlock Grid.Column="3" HorizontalAlignment="left" VerticalAlignment="Center" FontWeight="Bold" Text="文件路径" />
<TextBlock Grid.Column="4" HorizontalAlignment="left" VerticalAlignment="Center" FontWeight="Bold" Text="上次上传时间" />
<TextBlock Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center"
FontWeight="Bold" Text="选择" />
<TextBlock Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center" FontWeight="Bold" Text="文件名称" />
<TextBlock Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontWeight="Bold" Text="文件大小" />
<TextBlock Grid.Column="3" HorizontalAlignment="Center" VerticalAlignment="Center" FontWeight="Bold" Text="文件路径" />
<TextBlock Grid.Column="4" HorizontalAlignment="Center" VerticalAlignment="Center" FontWeight="Bold" Text="上次上传时间" />
</Grid>
<ListBox h:Cattach.ItemHeight="Auto" Style="{DynamicResource {x:Static h:ListBoxKeys.Single}}"

22
ViewModel/Send/SendViewModel.cs
View File

@ -138,6 +138,7 @@ namespace HeBianGu.App.Disk
//待上传文件
private ObservableCollection<UpLoadItems> _waitUpLoadItems = new ObservableCollection<UpLoadItems>();
/// <summary> 说明 </summary>
public ObservableCollection<UpLoadItems> WaitUpLoadItems
{
@ -149,24 +150,6 @@ namespace HeBianGu.App.Disk
}
}
private bool? _isAllSelected;
public bool? IsAllSelected
{
get => _isAllSelected;
set
{
_isAllSelected = value;
// 全选/取消全选逻辑
if (value.HasValue)
{
foreach (var item in WaitUpLoadItems)
{
item.Bool1 = value.Value;
}
}
}
}
// 只读属性，返回过滤后的集合（动态计算）
private ObservableCollection<UpLoadItems> _uploadingItems = new ObservableCollection<UpLoadItems>();
@ -309,7 +292,6 @@ namespace HeBianGu.App.Disk
if (flag == true)
{
MessageBox.Show($"已成功删除 {items.Count} 个项目");
IsAllSelected = false;
}
else
{
@ -356,7 +338,6 @@ namespace HeBianGu.App.Disk
CompleteCount = CompleteItems.Count;
MessageBox.Show("正在上传列表中可查看进度");
WaitUpLoadItems.RemoveAll(r => r.Bool1 == true);
IsAllSelected = false;
WaitCount = WaitUpLoadItems.Count;
// 如果没有上传任务在运行，则启动上传
if (!_isUploading)
@ -666,6 +647,7 @@ namespace HeBianGu.App.Disk
.WithObject(ut.Value6)
.WithFileName(ut.Value5)
.WithProgress(progress)
.WithObjectSize(5 * 1024 * 1024);
var uploadTask = client.PutObjectAsync(putObjectArgs);