下班 还有一些小问题 1.0版本就可以发布了

This commit is contained in:
liufei
2021-06-17 17:28:04 +08:00
parent 7246687de0
commit 2ed8bd8148
40 changed files with 1265 additions and 184 deletions

View File

@@ -12,13 +12,55 @@ namespace GeekDesk.ViewModel
[Serializable]
public class AppData : INotifyPropertyChanged
{
private ObservableCollection<MenuInfo> menuList = new ObservableCollection<MenuInfo>();
private AppConfig appConfig = new AppConfig();
private ObservableCollection<MenuInfo> menuList; //菜单信息及菜单对应icon信息
private AppConfig appConfig = new AppConfig(); //程序设置信息
private ObservableCollection<BacklogInfo> hiBacklogList; //历史待办
private ObservableCollection<BacklogInfo> exeBacklogList; //未处理待办 为了提高任务效率 分开处理
public ObservableCollection<BacklogInfo> HiBacklogList
{
get
{
if (hiBacklogList == null)
{
hiBacklogList = new ObservableCollection<BacklogInfo>();
}
return hiBacklogList;
}
set
{
hiBacklogList = value;
OnPropertyChanged("HiBacklogList");
}
}
public ObservableCollection<BacklogInfo> ExeBacklogList
{
get
{
if (exeBacklogList == null)
{
exeBacklogList = new ObservableCollection<BacklogInfo>();
}
return exeBacklogList;
}
set
{
exeBacklogList = value;
OnPropertyChanged("ExeBacklogList");
}
}
public ObservableCollection<MenuInfo> MenuList
{
get
{
if (menuList == null)
{
menuList = new ObservableCollection<MenuInfo>();
}
return menuList;
}
set

112
ViewModel/BacklogInfo.cs Normal file
View File

@@ -0,0 +1,112 @@
using GeekDesk.Util;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace GeekDesk.ViewModel
{
[Serializable]
public class BacklogInfo : INotifyPropertyChanged
{
//private string id; //任务唯一id
private string title; //待办事项
private string msg; //事项详情
private string exeTime; //待办时间
private string doneTime; //完成时间
//private int status; //状态 0 未处理 1 已处理
public string DoneTime
{
get
{
return doneTime;
}
set
{
doneTime = value;
OnPropertyChanged("DoneTime");
}
}
//public string Id
//{
// get
// {
// return id;
// }
// set
// {
// id = value;
// OnPropertyChanged("Id");
// }
//}
public string Title
{
get
{
return title;
}
set
{
title = value;
OnPropertyChanged("Title");
}
}
public string Msg
{
get
{
return msg;
}
set
{
msg = value;
OnPropertyChanged("Msg");
}
}
public string ExeTime
{
get
{
return exeTime;
}
set
{
exeTime = value;
OnPropertyChanged("ExeTime");
}
}
//public int Status
//{
// get
// {
// return status;
// }
// set
// {
// status = value;
// OnPropertyChanged("status");
// }
//}
[field: NonSerializedAttribute()]
public event PropertyChangedEventHandler PropertyChanged;
private void OnPropertyChanged(string propertyName)
{
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
CommonCode.SaveAppData(MainWindow.appData);
}
}
}

View File

@@ -16,8 +16,37 @@ namespace GeekDesk.ViewModel
private string menuId;
private Visibility menuEdit = Visibility.Collapsed;
private Visibility notMenuEdit = Visibility.Visible;
private string menuGeometry; //菜单几何图标
private string geometryColor; //几何图标颜色
private ObservableCollection<IconInfo> iconList = new ObservableCollection<IconInfo>();
public string MenuGeometry
{
get
{
return menuGeometry;
}
set
{
menuGeometry = value;
OnPropertyChanged("MenuGeometry");
}
}
public string GeometryColor
{
get
{
return geometryColor;
}
set
{
geometryColor = value;
OnPropertyChanged("GeometryColor");
}
}
public string MenuName
{
get