NewLife
/
Cube
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

优化个人信息页

This commit is contained in:
大石头 2022-03-24 12:33:02 +08:00
parent 9561137060
commit b6c0ccb0cd
7 changed files with 76 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
NewLife.Cube/Web/OAuthClient.cs
View File

@ -601,6 +601,13 @@ namespace NewLife.Web
if (dic.TryGetValue("city", out str)) city += "/" + str.Trim();
if (!city.IsNullOrEmpty() && city != "/") AreaName = city.Trim('/');
// 生日
if (dic.TryGetValue("birthday", out str))
{
var dt = str.ToDateTime();
if (dt.Year > 1000) Birthday = dt;
}
// 字段映射
var maps = FieldMap;
if (maps != null && maps.Count > 0)

1
NewLife.Cube/Web/SsoProvider.cs
View File

@ -809,6 +809,7 @@ namespace NewLife.Cube.Web
departmentName = user2.Department?.Name,
areaid = user2.AreaId,
avatar = "/Cube/Avatar?id=" + user2.ID,
birthday = user2.Birthday.ToString("yyyy-MM-dd", ""),
detail = user2.Remark,
resources = dic,
};

86
NewLife.CubeNC/Areas/Admin/Views/User/Info.cshtml
View File

@ -12,7 +12,8 @@
@await Html.PartialAsync("_User_Nav")
</div>
<div class="row">
<div class="col-md-12">
<label class="control-label hiddex-xs col-sm-2"></label>
<div class="col-xs-12 col-sm-8">
<div class="form-horizontal">
@if (ViewBag.StatusMessage != null)
{
@ -27,85 +28,114 @@
if (!user.Avatar.IsNullOrEmpty())
{
<div class="form-group">
<label class="control-label col-md-2"></label>
<div class="input-group col-md-6">
<label class="control-label col-xs-3 col-sm-3"></label>
<div class="input-group col-xs-9 col-sm-5">
<img src="@user.GetAvatarUrl()" style="max-width: 400px; max-height: 400px" />
</div>
</div>
}
<div class="form-group">
<label class="control-label col-md-2">名称</label>
<div class="input-group col-md-6">
<input value="@user.Name" class="col-xs-12 col-sm-8 col-md-6 col-lg-4" disabled="disabled" />
<label class="control-label col-xs-3 col-sm-3">名称</label>
<div class="input-group col-xs-9 col-sm-5">
<input value="@user.Name" class="col-xs-12 col-sm-8 col-sm-6 col-lg-4" disabled="disabled" />
</div>
</div>
<div class="form-group">
<label class="control-label col-md-2">显示名</label>
<div class="input-group col-md-6">
<label class="control-label col-xs-3 col-sm-3">显示名</label>
<div class="input-group col-xs-9 col-sm-5">
@Html.ForEditor("DisplayName")
@Html.ForDescription("DisplayName")
</div>
</div>
<div class="form-group">
<label class="control-label col-md-2">性别</label>
<div class="input-group col-md-6">
<label class="control-label col-xs-3 col-sm-3">性别</label>
<div class="input-group col-xs-9 col-sm-5">
@Html.ForEditor("Sex", user.Sex)
@Html.ForDescription("Sex")
</div>
</div>
<div class="form-group">
<label class="control-label col-md-2">邮件</label>
<div class="input-group col-md-6">
<label class="control-label col-xs-3 col-sm-3">邮件</label>
<div class="input-group col-xs-9 col-sm-5">
@Html.ForEditor("Mail")
</div>
</div>
<div class="form-group">
<label class="control-label col-md-2">手机</label>
<div class="input-group col-md-6">
<label class="control-label col-xs-3 col-sm-3">手机</label>
<div class="input-group col-xs-9 col-sm-5">
@Html.ForEditor("Mobile")
</div>
</div>
<div class="form-group">
<label class="control-label col-md-2">代码</label>
<div class="input-group col-md-6">
<label class="control-label col-xs-3 col-sm-3">代码</label>
<div class="input-group col-xs-9 col-sm-5">
@Html.ForEditor("Code")
@Html.ForDescription("Code")
</div>
<span class="hidden-xs col-sm-4">
<span class="middle">@Html.ForDescription("Code")</span>
</span>
</div>
<div class="form-group">
<label class="control-label col-md-2">角色</label>
<div class="input-group col-md-2">
<label class="control-label col-xs-3 col-sm-3">生日</label>
<div class="input-group col-xs-9 col-sm-5">
@Html.ForEditor("Birthday")
</div>
<span class="hidden-xs col-sm-4">
<span class="middle">@Html.ForDescription("Birthday")</span>
</span>
</div>
<div class="form-group">
<label class="control-label col-xs-3 col-sm-3">角色</label>
<div class="input-group col-xs-9 col-sm-5">
@(user.Roles.Join(",", r => r + ""))
</div>
<span class="hidden-xs col-sm-4">
<span class="middle">主要角色与次要角色</span>
</span>
</div>
<div class="form-group">
<label class="control-label col-md-2">头像</label>
<div class="input-group col-md-2">
<label class="control-label col-xs-3 col-sm-3">部门</label>
<div class="input-group col-xs-9 col-sm-5">
@((user as User).DepartmentName)
</div>
<span class="hidden-xs col-sm-4">
<span class="middle">@Html.ForDescription("Department")</span>
</span>
</div>
<div class="form-group">
<label class="control-label col-xs-3 col-sm-3">头像</label>
<div class="input-group col-sm-2">
<label class="">@user.Avatar</label> &nbsp;
<input accept="image/*" id="Avatar" name="Avatar" type="file" />
</div>
</div>
<div class="form-group">
<label class="control-label col-md-2">登录次数</label>
<div class="input-group col-md-2">
<label class="control-label col-xs-3 col-sm-3">登录次数</label>
<div class="input-group col-sm-2">
@user.Logins
</div>
</div>
<div class="form-group">
<label class="control-label col-md-2">最后登录</label>
<div class="input-group col-md-2">
<label class="control-label col-xs-3 col-sm-3">最后登录</label>
<div class="input-group col-sm-2">
@user.LastLogin.ToFullString("")
</div>
</div>
<div class="form-group">
<label class="control-label col-md-2">最后登录IP</label>
<div class="input-group col-md-6">
<label class="control-label col-xs-3 col-sm-3">最后登录IP</label>
<div class="input-group col-xs-9 col-sm-5">
@user.LastLoginIP
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-3 col-sm-3">备注</label>
<div class="input-group col-xs-9 col-sm-5">
@Html.ForEditor("Remark")
</div>
</div>
<div class="clearfix form-actions">
<label class="control-label col-md-4"></label>
<label class="control-label col-sm-4"></label>
<button type="submit" class="btn btn-success btn-sm"><i class="glyphicon glyphicon-save"></i><strong>保存</strong></button>
<button type="button" class="btn btn-danger btn-sm" onclick="history.go(-1);"><i class="glyphicon glyphicon-remove"></i><strong>取消</strong></button>
</div>

2
NewLife.CubeNC/Common/HtmlExtensions.cs
View File

@ -310,7 +310,7 @@ namespace NewLife.Cube
//if (format.IsNullOrWhiteSpace()) format = "yyyy-MM-dd HH:mm:ss";
// 日期
if (name.EndsWithIgnoreCase("Date"))
if (name.EndsWithIgnoreCase("Date", "Day"))
{
if (value > DateTime.MinValue) obj = value.ToString("yyyy-MM-dd");
//format = "yyyy-mm-dd";

3
NewLife.CubeNC/ViewModels/ItemModel.cs
View File

@ -21,6 +21,9 @@ namespace NewLife.Cube.ViewModels
/// <summary>格式化字符串</summary>
public String Format { get; set; }
/// <summary>元素类型</summary>
public String ItemType { get; set; }
/// <summary>Html特性</summary>
public Object HtmlAttributes { get; set; }
#endregion

2
NewLife.CubeNC/Views/Shared/_Form_DateTime.cshtml
View File

@ -20,7 +20,7 @@
//if (format.IsNullOrWhiteSpace()) format = "yyyy-MM-dd HH:mm:ss";
// 日期
if (name.EndsWithIgnoreCase("Date"))
if (Model.ItemType.EqualIgnoreCase("date") || name.EndsWithIgnoreCase("Date", "day"))
{
if (value > DateTime.MinValue) obj = value.ToString("yyyy-MM-dd");
//format = "yyyy-mm-dd";

6
NewLife.CubeNC/Views/Shared/_Form_Item.cshtml
View File

@ -63,7 +63,11 @@
}
else
{
var itemModel = new ItemModel(item.Name, entity[item.Name], item.Type) { Length = item.Length };
var itemModel = new ItemModel(item.Name, entity[item.Name], item.Type)
{
ItemType = item.ItemType,
Length = item.Length
};
@*@Html.ForEditor(item, entity)*@
if (!item.MapField.IsNullOrEmpty())
{