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

页面样式调整

This commit is contained in:
大石头 2024-06-25 09:54:47 +08:00
parent ce4a60ee9c
commit bb43fd17b4
4 changed files with 52 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AntJob.Web/AntJob.Web.csproj
View File

@ -47,8 +47,8 @@
<Content Include="favicon.ico" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="NewLife.Cube.Core" Version="6.1.2024.419-beta0700" />
<PackageReference Include="NewLife.Stardust.Extensions" Version="2.9.2024.422-beta0942" />
<PackageReference Include="NewLife.Cube.Core" Version="6.1.2024.625-beta0006" />
<PackageReference Include="NewLife.Stardust.Extensions" Version="3.0.2024.624-beta0629" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\AntJob.Data\AntJob.Data.csproj" />

30
AntJob.Web/Areas/Ant/Controllers/JobController.cs
View File

@ -28,17 +28,23 @@ public class JobController : AntEntityController<Job>
ListFields.AddListField("UpdateTime");
{
var df = ListFields.AddListField("Task", "Enable");
df.DisplayName = "任务";
var df = ListFields.GetField("Name") as ListField;
df.Url = "/Ant/JobTask?appid={AppID}&jobId={ID}";
}
//{
// var df = ListFields.AddListField("Task", "Enable");
// df.DisplayName = "任务";
// df.Url = "/Ant/JobTask?appid={AppID}&jobId={ID}";
//}
{
var df = ListFields.AddListField("Title", null, "Mode");
df.Header = "下一次/Cron/主题";
df.HeaderTitle = "Cron格式，秒+分+时+天+月+星期+年";
df.AddService(new MyTextField());
}
{
var df = ListFields.GetField("DataTime");
var df = ListFields.GetField("DataTime") as ListField;
//df.GetClass = e => "text-center text-primary font-weight-bold";
df.AddService(new ColorField { Color = "Magenta", GetValue = e => ((DateTime)e).ToFullString("") });
}
{
@ -61,6 +67,24 @@ public class JobController : AntEntityController<Job>
var df = ListFields.GetField("Error");
df.AddService(new ColorNumberField { Color = "red" });
}
{
var df = ListFields.GetField("LastStatus") as ListField;
df.GetClass = e =>
{
var job = e as Job;
return job.LastStatus switch
{
JobStatus.就绪 => "text-center",
JobStatus.抽取中 => "text-center info",
JobStatus.处理中 => "text-center warning",
JobStatus.错误 => "text-center danger",
JobStatus.完成 => "text-center success",
JobStatus.取消 => "text-center active",
JobStatus.延迟 => "text-center active",
_ => "",
};
};
}
}
class MyTextField : ILinkExtend

25
AntJob.Web/Areas/Ant/Controllers/JobTaskController.cs
View File

@ -5,6 +5,7 @@ using AntJob.Server.Services;
using Microsoft.AspNetCore.Mvc;
using NewLife;
using NewLife.Cube;
using NewLife.Cube.Entity;
using NewLife.Cube.Extensions;
using NewLife.Cube.ViewModels;
using NewLife.Data;
@ -39,8 +40,23 @@ public class JobTaskController : AntEntityController<JobTask>
df.AddService(new ColorNumberField { Color = "red" });
}
{
var df = ListFields.GetField("Status");
df.AddService(new MyStatusField());
var df = ListFields.GetField("Status") as ListField;
//df.AddService(new MyStatusField());
df.GetClass = e =>
{
var job = e as JobTask;
return job.Status switch
{
JobStatus.就绪 => "text-center",
JobStatus.抽取中 => "text-center info",
JobStatus.处理中 => "text-center warning",
JobStatus.错误 => "text-center danger",
JobStatus.完成 => "text-center success",
JobStatus.取消 => "text-center active",
JobStatus.延迟 => "text-center active",
_ => "",
};
};
}
ListFields.TraceUrl();
@ -97,8 +113,11 @@ public class JobTaskController : AntEntityController<JobTask>
var fs = base.OnGetFields(kind, model);
if (kind == ViewKinds.List)
{
var appId = GetRequest("appId").ToInt();
if (appId > 0) fs.RemoveField("AppID", "AppName");
var jobId = GetRequest("jobId").ToInt();
if (jobId > 0) fs.RemoveField("JobID");
if (jobId > 0) fs.RemoveField("JobID", "JobName");
}
return fs;

2
Samples/HisWeb/HisWeb.csproj
View File

@ -9,7 +9,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NewLife.Cube.Core" Version="6.1.2024.419-beta0700" />
<PackageReference Include="NewLife.Cube.Core" Version="6.1.2024.625-beta0006" />
</ItemGroup>
<ItemGroup>