From 9c8743941f556a486ba2cc5bcb8a7a6ec1079d0a Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 26 九月 2024 11:55:07 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/00-viewModel/SysPropViewModel.cs | 88 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 83 insertions(+), 5 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/00-viewModel/SysPropViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/00-viewModel/SysPropViewModel.cs
index 67bb3ba..bd654a0 100644
--- a/WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/00-viewModel/SysPropViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/00-viewModel/SysPropViewModel.cs
@@ -2,16 +2,43 @@
namespace HStation.WinFrmUI.Basic
{
- public class SysPropViewModel : Yw.Dto.SysPropDto
+ public class SysPropViewModel
{
- public SysPropViewModel(SysPropDto rhs)
+ public SysPropViewModel(Yw.Vmo.SysPropVmo rhs)
{
ID = rhs.ID;
GroupID = rhs.GroupID;
TypeID = rhs.TypeID;
Name = rhs.Name;
Code = rhs.Code;
- Format = rhs.Format;
+ if (rhs.Format == Yw.Basic.ePropFormat.Bigint)
+ {
+ this.FormatDisPlayName = "闀挎暣鏁�";
+ }
+ else if (rhs.Format == Yw.Basic.ePropFormat.Integer)
+ {
+ this.FormatDisPlayName = "鏁存暟";
+ }
+ else if (rhs.Format == Yw.Basic.ePropFormat.MultiText)
+ {
+ this.FormatDisPlayName = "澶氭枃鏈�";
+ }
+ else if (rhs.Format == Yw.Basic.ePropFormat.Time)
+ {
+ this.FormatDisPlayName = "鏃堕棿";
+ }
+ else if (rhs.Format == Yw.Basic.ePropFormat.Numeric)
+ {
+ this.FormatDisPlayName = "鏁板��";
+ }
+ else if (rhs.Format == Yw.Basic.ePropFormat.Text)
+ {
+ this.FormatDisPlayName = "鏂囨湰";
+ }
+ else
+ {
+ this.FormatDisPlayName = "甯冨皵";
+ }
UnitName = rhs.UnitName;
IsNull = rhs.IsNull;
DefaultValue = rhs.DefaultValue;
@@ -19,12 +46,39 @@
Description = rhs.Description;
}
- public void Reset(UpdateSysPropInput rhs)
+ public void Reset(Yw.Vmo.SysPropVmo rhs)
{
ID = rhs.ID;
Name = rhs.Name;
Code = rhs.Code;
- Format = rhs.Format;
+ if (rhs.Format == Yw.Basic.ePropFormat.Bigint)
+ {
+ this.FormatDisPlayName = "闀挎暣鏁�";
+ }
+ else if (rhs.Format == Yw.Basic.ePropFormat.Integer)
+ {
+ this.FormatDisPlayName = "鏁存暟";
+ }
+ else if (rhs.Format == Yw.Basic.ePropFormat.MultiText)
+ {
+ this.FormatDisPlayName = "澶氭枃鏈�";
+ }
+ else if (rhs.Format == Yw.Basic.ePropFormat.Time)
+ {
+ this.FormatDisPlayName = "鏃堕棿";
+ }
+ else if (rhs.Format == Yw.Basic.ePropFormat.Numeric)
+ {
+ this.FormatDisPlayName = "鏁板��";
+ }
+ else if (rhs.Format == Yw.Basic.ePropFormat.Text)
+ {
+ this.FormatDisPlayName = "鏂囨湰";
+ }
+ else
+ {
+ this.FormatDisPlayName = "甯冨皵";
+ }
UnitName = rhs.UnitName;
IsNull = rhs.IsNull;
DefaultValue = rhs.DefaultValue;
@@ -32,5 +86,29 @@
}
public string ExtendTypeDisPlayName { get; set; }
+
+ public string FormatDisPlayName { get; set; }
+
+ public long ID { get; set; }
+
+ public long GroupID { get; set; }
+
+ public long TypeID { get; set; }
+
+ public string Name { get; set; }
+
+ public string Code { get; set; }
+
+ public Yw.Basic.ePropFormat Format { get; set; }
+
+ public string UnitName { get; set; }
+
+ public bool IsNull { get; set; }
+
+ public string DefaultValue { get; set; }
+
+ public int SortCode { get; set; }
+
+ public string Description { get; set; }
}
}
\ No newline at end of file
--
Gitblit v1.9.3