wenyongda/ZrAdminNetCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

✨ 1、代码生成时间查询支持uniapp 2、新增date范围选择组件

Browse Source
This commit is contained in:
不做码农 2023-05-23 18:36:35 +08:00
parent 253d21cb54
commit 21ac0f666d
4 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ZR.Admin.WebApi/Controllers/CommonController.cs
View File

@ -60,7 +60,6 @@ namespace ZR.Admin.WebApi.Controllers
[Log(Title = "企业消息测试")]
public IActionResult SendMsg(string msg, string toUser = "")
{
throw new Exception("ddddd");
WxNoticeHelper.SendMsg("消息测试", msg, toUser, WxNoticeHelper.MsgType.markdown);
return SUCCESS(msg);
}

2
ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplDto.txt
View File

@ -18,7 +18,7 @@ namespace ${options.DtosNamespace}
{
$foreach(item in genTable.Columns)
$if(item.IsQuery)
$if(item.htmlType == "datetime")
$if(item.htmlType.StartsWith("date"))
public DateTime? Begin$item.CsharpField { get; set; }
public DateTime? End$item.CsharpField { get; set; }
$elseif(item.htmlType == "selectMulti")

5
ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt
View File

@ -39,8 +39,9 @@ $if(column.HtmlType == "month")
DateTime monthEnd = Convert.ToDateTime(parm.${column.CsharpField}).AddMonths(1);
predicate = predicate.AndIF(parm.${column.CsharpField} != null, it => it.${column.CsharpField} >= parm.${column.CsharpField} && it.${column.CsharpField} < monthEnd);
$else
predicate = predicate.AndIF(parm.Begin${column.CsharpField} == null, it => it.${column.CsharpField} >= DateTime.Now.AddDays(-1));
predicate = predicate.AndIF(parm.Begin${column.CsharpField} != null, it => it.${column.CsharpField} >= parm.Begin${column.CsharpField} && it.${column.CsharpField} <= parm.End${column.CsharpField});
predicate = predicate.AndIF(parm.Begin${column.CsharpField} == null, it => it.${column.CsharpField} >= DateTime.Now.ToShortDateString().ParseToDateTime());
predicate = predicate.AndIF(parm.Begin${column.CsharpField} != null, it => it.${column.CsharpField} >= parm.Begin${column.CsharpField});
predicate = predicate.AndIF(parm.End${column.CsharpField} != null, it => it.${column.CsharpField} <= parm.End${column.CsharpField});
$end
$elseif(column.CsharpType == "int" || column.CsharpType == "long")
predicate = predicate.AndIF(parm.${column.CsharpField} != null, ${codeTool.QueryExp(column.CsharpField, column.QueryType)};

22
ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
View File

@ -34,15 +34,25 @@ $elseif(column.HtmlType == "datetime")
<el-date-picker
v-model="dateRange${column.CsharpField}"
type="datetimerange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
placeholder="请选择$labelName"
value-format="YYYY-MM-DD HH:mm:ss"
:default-time="defaultTime"
:shortcuts="dateOptions">
</el-date-picker>
</el-form-item>
$elseif(column.HtmlType == "datePicker")
<el-form-item label="$labelName">
<el-date-picker
style="width: 200px"
v-model="dateRange${column.CsharpField}"
type="daterange"
start-placeholder="Start date"
end-placeholder="End date"
value-format="YYYY-MM-DD HH:mm:ss"
:default-time="defaultTime">
</el-date-picker>
</el-form-item>
$elseif(column.HtmlType.Contains("select") || column.HtmlType == "radio")
<el-form-item label="${labelName}" prop="${columnName}">
<el-select clearable $if(column.HtmlType == "selectMulti")multiple$end v-model="queryParams.${columnName}" placeholder="请选择${labelName}">
@ -376,12 +386,12 @@ $end
const total = ref(0)
const dataList = ref([])
const queryRef = ref()
const defaultTime = ref([new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)])
$foreach(item in genTable.Columns)
$if(item.HtmlType == "datetime" && item.IsQuery == true)
$if((item.HtmlType == "datetime" || item.HtmlType == "datePicker") && item.IsQuery == true)
// ${item.ColumnComment}时间范围
const dateRange${item.CsharpField} = ref([])
const defaultTime = ref([new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)])
$elseif(item.HtmlType == "customInput")
/******************自定义编辑 start **********************/
@ -438,7 +448,7 @@ $end
function getList(){
$foreach(item in genTable.Columns)
$if(item.HtmlType == "datetime" && item.IsQuery == true)
$if((item.HtmlType == "datetime" || item.HtmlType == "datePicker") && item.IsQuery == true)
proxy.addDateRange(queryParams, dateRange${item.CsharpField}.value, '${item.CsharpField}');
$end
$end
@ -462,7 +472,7 @@ function handleQuery() {
// 重置查询操作
function resetQuery(){
$foreach(item in genTable.Columns)
$if(item.HtmlType == "datetime" && item.IsQuery == true)
$if((item.HtmlType == "datetime" || item.HtmlType == "datePicker") && item.IsQuery == true)
// ${item.ColumnComment}时间范围
dateRange${item.CsharpField}.value = []
$end