更新wtm

This commit is contained in:
zgf committed 2023-08-11 15:55:50 +08:00
1 parent f119665d29
commit 3467d4aa9d
60 files changed
+1932 -397

No files matched your search

@@ -70,7 +70,7 @@ namespace WalkingTec.Mvvm.TagHelpers.LayUI.Common
public string MakeCombo(string name = null, List<ComboSelectListItem> value = null, string selectedValue = null, string emptyText = null, bool isReadOnly = false)
{
var disable = isReadOnly ? " disabled='' class='layui-disabled'" : " ";
string rv = $"<select name='{name}' id='{(name == null ? "" : Utils.GetIdByName(name))}' class='layui-input' style='height:28px' lay-ignore>";
string rv = $"<select name='{name}' id='{(name == null ? "" : Utils.GetIdByName(name))}' class='layui-input' style='height:28px' {disable} lay-ignore>";
if (string.IsNullOrEmpty(emptyText) == false)
{
rv += $@"
@@ -105,7 +105,7 @@ namespace WalkingTec.Mvvm.TagHelpers.LayUI.Common
return $@"<input class='layui-input' style='height:28px' name='{name ?? ""}' id='{(name == null ? "" : Utils.GetIdByName(name))}' value='{value ?? ""}' {disable} />";
}
public string MakeDateTime(string name = null, string value = null, string emptyText = null, bool isReadOnly = false)
public string MakeDateTime(string name = null, string value = null, string emptyText = null, bool isReadOnly = false, DateTimeTypeEnum? dateType = DateTimeTypeEnum.DateTime)
{
var id = (name == null ? "" : Utils.GetIdByName(name));
var disable = isReadOnly ? " disabled='' class='layui-disabled'" : " ";
@@ -118,7 +118,7 @@ namespace WalkingTec.Mvvm.TagHelpers.LayUI.Common
value = "";
}
}
return $@"<input class='layui-input' style='height:28px' name='{name ?? ""}' id='{id}' value='{value ?? ""}' {disable} onclick='ff.SetGridCellDate(""{id}"")'/>";
return $@"<input class='layui-input' style='height:28px' name='{name ?? ""}' id='{id}' value='{value ?? ""}' {disable} onclick='ff.SetGridCellDate(""{id}"",""{dateType.ToString().ToLower()}"")'/>";
}
@@ -82,6 +82,16 @@ namespace WalkingTec.Mvvm.TagHelpers.LayUI
if (string.IsNullOrEmpty(ItemUrl) == false)
{
foreach (var item in values)
{
listItems.Add(new ComboSelectListItem
{
Text = "",
Value = item?.ToString(),
Selected = true
});
}
output.PostElement.AppendHtml($"<script>ff.LoadComboItems('checkbox','{ItemUrl}','{Id}','{Field.Name}',{JsonSerializer.Serialize(values)})</script>");
}
else
@@ -127,29 +137,6 @@ namespace WalkingTec.Mvvm.TagHelpers.LayUI
});
}
}
try
{
List<string> checkvalue = null;
//如果是Entity.xxList[0].xxxid的格式,使用GetPropertySiblingValues方法获取Entity.xxxList.Select(x=>x.xxxid).ToList()的结果
if (Field.Name.Contains("["))
{
//默认多对多不必填
if (Required == null)
{
Required = false;
}
}
else if (Field.Model is IList == false && Field.Model != null)
{
checkvalue = new List<string> { Field.Model.ToString() };
}
else
{
}
}
catch
{
}
}
SetSelected(listItems, values);
}
@@ -171,7 +158,12 @@ namespace WalkingTec.Mvvm.TagHelpers.LayUI
output.PostContent.AppendHtml($@"
<input type=""checkbox"" name=""{Field.Name}"" value=""{item.Value}"" title=""{item.Text}"" {selected} {(Disabled ? "disabled=\"\"" : string.Empty)}/>");
}
output.PostElement.AppendHtml($@"<input type=""hidden"" name=""_DONOTUSE_{Field.Name}"" value=""1"" />");
output.PostElement.AppendHtml($@"
<input type=""hidden"" name=""_DONOTUSE_{Field.Name}"" value=""1"" />
<script>
{Id}defaultvalues = {JsonSerializer.Serialize(values)};
</script>
");
base.Process(context, output);
}
@@ -165,6 +165,16 @@ namespace WalkingTec.Mvvm.TagHelpers.LayUI
//{
// ItemUrl = _wtm.HttpContext.Request.IsHttps ? "https://" : "http://" + _wtm.HttpContext?.Request?.Host.ToString() + ItemUrl;
//}
foreach (var item in selectVal)
{
listItems.Add(new ComboSelectListItem
{
Text = "",
Value = item?.ToString(),
Selected = true
});
}
output.PostElement.AppendHtml($"<script>ff.LoadComboItems('combo','{ItemUrl}','{Id}','{Field.Name}',{JsonSerializer.Serialize(selectVal)})</script>");
}
@@ -302,7 +312,21 @@ var {Id} = xmSelect.render({{
}}" : FormatFuncName(ChangeFunc))}
}},
data: {JsonSerializer.Serialize(GetLayuiTree(listItems,selectVal))}
}})
}});
{Id}defaultvalues = {JsonSerializer.Serialize(selectVal)};
{(selectVal?.Count>0 && (LinkField != null || string.IsNullOrEmpty(LinkId) == false) ? @$"
var {Id}u = ""{(TriggerUrl ?? "")}"";
if ({Id}u.indexOf(""?"") == -1) {{
{Id}u += ""?t="" + new Date().getTime();
}}
var {Id}data = {JsonSerializer.Serialize(selectVal)};
for (var i = 0; i < {Id}data.length; i++) {{
{Id}u += ""&id="" + {Id}data[i];
}};
setTimeout(function(){{
ff.ChainChange({Id}u, $('#{Id}')[0], true);
}},100);
" : "")}
</script>
";
output.PostElement.AppendHtml(script);
@@ -4,6 +4,7 @@ using System.Text.Json;
using Microsoft.AspNetCore.Razor.TagHelpers;
using Microsoft.Extensions.Options;
using WalkingTec.Mvvm.Core;
using WalkingTec.Mvvm.Core.Extensions;
namespace WalkingTec.Mvvm.TagHelpers.LayUI
{
@@ -18,34 +19,6 @@ namespace WalkingTec.Mvvm.TagHelpers.LayUI
/// </summary>
EN
}
public enum DateTimeTypeEnum
{
/// <summary>
/// 日期选择器
/// 可选择:年、月、日
/// </summary>
Date,
/// <summary>
/// 日期时间选择器
/// 可选择:年、月、日、时、分、秒
/// </summary>
DateTime,
/// <summary>
/// 年选择器
/// 只提供年列表选择
/// </summary>
Year,
/// <summary>
/// 年月选择器
/// 只提供年、月选择
/// </summary>
Month,
/// <summary>
/// 时间选择器
/// 只提供时、分、秒选择
/// </summary>
Time
}
[HtmlTargetElement("wt:datetime", Attributes = REQUIRED_ATTR_NAME, TagStructure = TagStructure.WithoutEndTag)]
public class DateTimeTagHelper : BaseFieldTag
@@ -187,7 +160,7 @@ namespace WalkingTec.Mvvm.TagHelpers.LayUI
RangeSplit = "~";
}
if (Field.ModelExplorer.ModelType == typeof(string))
if (Field.ModelExplorer.ModelType == typeof(string) || Field.ModelExplorer.ModelType.IsNumber())
{
Value = Field.Model?.ToString() ?? Value;
}
@@ -177,6 +177,15 @@ layui.use(['form'],function(){{
//如果是 SearchPanel,并且指定了 OldPost,则提交整个表单,而不是只刷新 Grid 数据
if (OldPost == true && this is SearchPanelTagHelper search)
{
// string addhidden = $"var form = $('#{search.Id}');";
// foreach (var item in search.GridId.Split(','))
// {
// addhidden += $@"
// for(let f in {item}defaultfilter.where){{
// form.append(""<input type='hidden' name='Searcher.""+f+""' value='""+{item}defaultfilter.where[f]+""'/>"");
// }}
//";
// }
output.PostElement.AppendHtml($@"
$('#{search.SearchBtnId}').on('click', function () {{
if({BeforeSubmit ?? "true"} == false){{return false;}}
@@ -131,7 +131,11 @@ namespace WalkingTec.Mvvm.TagHelpers.LayUI
var item = listItems[i];
var selected = item.Selected ? " checked" : " ";
output.PostContent.AppendHtml($@"
<input type=""radio"" name=""{Field.Name}"" value=""{item.Value}"" title=""{item.Text}"" {selected} />");
<input type=""radio"" name=""{Field.Name}"" value=""{item.Value}"" title=""{item.Text}"" {selected} />
<script>
{Id}defaultvalues = {JsonSerializer.Serialize(values)};
</script>
");
}
base.Process(context, output);
@@ -63,7 +63,7 @@ namespace WalkingTec.Mvvm.TagHelpers.LayUI
{
if (string.IsNullOrEmpty(_gridId))
{
if (string.IsNullOrEmpty(_gridIdUserSet))
if (_gridIdUserSet==null)
{
if (ListVM != null)
{
@@ -112,7 +112,7 @@ namespace WalkingTec.Mvvm.TagHelpers.LayUI
/// <summary>
/// Reset button Id
/// </summary>
private string ResetBtnId => $"{RESET_BTN_ID_PREFIX}{SearcherVM.UniqueId}";
private string ResetBtnId => $"{RESET_BTN_ID_PREFIX}{SearcherVM?.UniqueId}";
/// <summary>
/// 重置按钮
@@ -17,15 +17,19 @@ namespace WalkingTec.Mvvm.TagHelpers.LayUI
/// <summary>
/// 改变选择时触发的js函数,func(data)格式;
/// 文本时触发的js函数,func(data)格式;
/// <para>
/// data.Text得到选中文本;
/// </para>
/// <para>
/// data.Value得到被选中的值;
/// data得到文本;
/// </para>
/// </summary>
public string ChangeFunc { get; set; }
/// <summary>
/// 文本修改后焦点离开时触发的js函数,func(data)格式;
/// <para>
/// data得到文本;
/// </para>
/// </summary>
public string DoneFunc { get; set; }
public bool IsPassword { get; set; }
@@ -38,6 +42,15 @@ namespace WalkingTec.Mvvm.TagHelpers.LayUI
output.Attributes.Add("type", type);
output.Attributes.Add("name", Field.Name);
output.Attributes.Add("wtm-name", Field.Name);
if(string.IsNullOrEmpty(ChangeFunc) == false)
{
output.Attributes.Add("oninput", $"{FormatFuncName(ChangeFunc, false)}(this.value)");
}
if (string.IsNullOrEmpty(DoneFunc) == false)
{
output.Attributes.Add("onchange", $"{FormatFuncName(DoneFunc, false)}(this.value)");
}
if (string.IsNullOrEmpty(Field?.Model?.ToString()) == false)
{
DefaultValue = null;
@@ -156,6 +156,29 @@ namespace WalkingTec.Mvvm.TagHelpers.LayUI
DefaultValue = $"[{string.Join(",", DefaultValue.Split(",").Select(x => "'" + x + "'"))}]";
}
}
if (string.IsNullOrEmpty(ItemUrl) == false)
{
foreach (var item in selectVal)
{
listItems.Add(new ComboSelectListItem
{
Text = "",
Value = item?.ToString(),
Selected = true
});
}
data = listItems.Select(x => new
{
x.Value,
Title = x.Text,
x.Disabled,
Checked = x.Selected
}).ToArray();
output.PostElement.AppendHtml($"<script>ff.LoadComboItems('transfer','{ItemUrl}','{Id}','{Field.Name}',{JsonSerializer.Serialize(selectVal)})</script>");
}
var title = $"['{(string.IsNullOrEmpty(LeftTitle) ? THProgram._localizer["Sys.ForSelect"] : LeftTitle)}','{(string.IsNullOrEmpty(RightTitle) ? THProgram._localizer["Sys.Selected"] : RightTitle)}']";
var content = $@"
<script>
@@ -210,10 +233,6 @@ layui.use(['transfer'],function(){{
output.PostElement.AppendHtml(content);
output.PostElement.AppendHtml($"<div id=\"{Id}div\"></div>");
output.PostElement.AppendHtml($@"<input type=""hidden"" name=""_DONOTUSE_{Field.Name}"" value=""1"" />");
if (string.IsNullOrEmpty(ItemUrl) == false)
{
output.PostElement.AppendHtml($"<script>ff.LoadComboItems('transfer','{ItemUrl}','{Id}','{Field.Name}',{JsonSerializer.Serialize(selectVal)})</script>");
}
base.Process(context, output);
}
@@ -68,6 +68,7 @@ namespace WalkingTec.Mvvm.TagHelpers.LayUI
output.TagMode = TagMode.StartTagAndEndTag;
Id = string.IsNullOrEmpty(Id) ? Guid.NewGuid().ToNoSplitString() : Id;
output.Attributes.Add("id", "top" + Id);
output.Attributes.Add("wtm-ctype", "tc");
output.Attributes.Add("class", "layui-row donotuse_fill");
if (Items.Model is List<TreeSelectListItem> mm)
{
@@ -77,32 +78,47 @@ namespace WalkingTec.Mvvm.TagHelpers.LayUI
}
var inside = await output.GetChildContentAsync();
var insideContent = inside.GetContent();
string cusmtomclick = "";
var idfieldname = IdField?.Name ?? "notsetid";
idfieldname = Regex.Replace(idfieldname, ".*?Searcher\\.", "");
var levelfieldname = LevelField?.Name ?? "notsetlevel";
levelfieldname = Regex.Replace(levelfieldname, ".*?Searcher\\.", "");
string cusmtomclick = $"top{Id}selected.{idfieldname}=data.data.id;top{Id}selected.{levelfieldname}=data.data.level;";
if (string.IsNullOrEmpty(ClickFunc))
{
Regex r = new Regex("(.*?)option = {");
var m = r.Match(insideContent);
if (m.Success)
Regex r3 = new Regex("id=\"(.*?)\" IsSearchButton");
var m3 = r3.Match(insideContent);
if (m3.Success)
{
var gridid = m.Groups[1].Value.Trim();
Regex r2 = new Regex($"(.*?) = table.render\\({gridid}option\\);");
var m2 = r2.Match(insideContent);
if (m2.Success)
cusmtomclick += $@"
$('#{m3.Groups[1].Value.Trim()}').click();
";
}
else
{
Regex r = new Regex("(.*?)option = {");
var m = r.Match(insideContent);
if (m.Success)
{
var gridvar = m2.Groups[1].Value.Trim();
var idfieldname = IdField?.Name ?? "notsetid";
idfieldname = Regex.Replace(idfieldname, ".*?Searcher\\.","");
var levelfieldname = LevelField?.Name ?? "notsetlevel";
levelfieldname = Regex.Replace(levelfieldname, ".*?Searcher\\.", "");
cusmtomclick = $@"
var gridid = m.Groups[1].Value.Trim();
Regex r2 = new Regex($"(.*?) = table.render\\({gridid}option\\);");
var m2 = r2.Match(insideContent);
if (m2.Success)
{
var gridvar = m2.Groups[1].Value.Trim();
cusmtomclick = $@"
$.extend({gridid}defaultfilter.where,{{'{idfieldname}':data.data.id, '{levelfieldname}':data.data.level }});
";
}
cusmtomclick += $@"
layui.table.reload('{gridid}',{{url:{gridid}url, where: {gridid}defaultfilter.where}});
";
}
else if (string.IsNullOrEmpty(insideContent))
{
cusmtomclick = $"if(data.data.href!=null && data.data.href!=''){{ff.LoadPage1(data.data.href,'div_{Id}');}}";
}
}
else if (string.IsNullOrEmpty(insideContent))
{
cusmtomclick = $"if(data.data.href!=null && data.data.href!=''){{ff.LoadPage1(data.data.href,'div_{Id}');}}";
}
}
else
@@ -132,6 +148,27 @@ namespace WalkingTec.Mvvm.TagHelpers.LayUI
last{Id} = ele;
}}
{cusmtomclick}
}}
,setSelected: function(data){{
var ele = null;
if(data.elem != undefined){{
ele = data.elem.find('.layui-tree-main:first');
}}
else{{
ele = $('#div{Id}').find(""div[data-id='""+data.data.id+""']"").find('.layui-tree-main:first');
}}
if(last{Id} != null){{
last{Id}.css('background-color','');
last{Id}.find('.layui-tree-txt').css('color','');
}}
if(last{Id} === ele){{
last{Id} = null;
}}
else{{
ele.css('background-color','#5fb878');
ele.find('.layui-tree-txt').css('color','#fff');
last{Id} = ele;
}}
}}";
var selecteditem = GetSelectedItem(treeitems);
@@ -144,6 +181,13 @@ namespace WalkingTec.Mvvm.TagHelpers.LayUI
</div>
<div id=""div_{Id}"" style=""box-sizing:border-box"" class=""layui-col-md10 donotuse_pdiv"">{insideContent}</div>
<script>
var top{Id}selected = {{}};
{
(selecteditem==null?"": @$"
top{Id}selected.{idfieldname} = '{selecteditem.Id}';
top{Id}selected.{levelfieldname} = {selecteditem.Level};
")
}
layui.use(['tree'],function(){{
var last{Id} = null;
var treecontainer{Id} = layui.tree.render({{
@@ -151,7 +195,7 @@ layui.use(['tree'],function(){{
{onclick}
,data: {JsonSerializer.Serialize(treeitems)}
}});
{(selecteditem == null ? string.Empty : $@"treecontainer{Id}.config.click({{
{(selecteditem == null ? string.Empty : $@"treecontainer{Id}.config.setSelected({{
data: {JsonSerializer.Serialize(selecteditem)}
}});")}
{(string.IsNullOrEmpty(AutoLoadUrl) || selecteditem != null ? string.Empty : $"ff.LoadPage1('{AutoLoadUrl}','div_{Id}');")}
@@ -199,7 +243,7 @@ layui.use(['tree'],function(){{
{
foreach (var item in tree)
{
if (item.Checked == true)
if (item.Id == IdField.Model?.ToString())
{
return item;
}
@@ -68,8 +68,21 @@ namespace WalkingTec.Mvvm.TagHelpers.LayUI
output.Attributes.Add("wtm-name", Field.Name);
output.Attributes.Add("wtm-multi", MultiSelect.ToString().ToLower());
Id = string.IsNullOrEmpty(Id) ? Guid.NewGuid().ToNoSplitString() : Id;
if (LinkField != null || string.IsNullOrEmpty(LinkId) == false)
{
var linkto = "";
if (string.IsNullOrEmpty(LinkId))
{
linkto = Core.Utils.GetIdByName(LinkField.ModelExplorer.Container.ModelType.Name + "." + LinkField.Name);
}
else
{
linkto = LinkId;
}
output.Attributes.Add("wtm-linkto", $"{linkto}");
}
List<object> vals = new List<object>();
List<object> vals = new List<object>();
if (Field?.Model != null)
{
if (MultiSelect == true)
@@ -84,13 +97,41 @@ namespace WalkingTec.Mvvm.TagHelpers.LayUI
vals.Add(Field.Model.ToString());
}
}
List<LayuiTreeItem> treeitems = new List<LayuiTreeItem>();
if (vals.Count == 0)
{
if (string.IsNullOrEmpty(DefaultValue) == false)
{
vals.AddRange(DefaultValue.Split(','));
}
}
List<LayuiTreeItem> treeitems = new List<LayuiTreeItem>();
if (string.IsNullOrEmpty(ItemUrl) == true && Items?.Model is List<TreeSelectListItem> mm)
{
treeitems = GetLayuiTree(mm, vals);
}
var script = $@"
if (string.IsNullOrEmpty(ItemUrl) == false)
{
foreach (var item in vals)
{
treeitems.Add(new LayuiTreeItem
{
Title = "",
Id = item?.ToString(),
Checked = true
});
}
output.PostElement.AppendHtml($@"<script>
ff.LoadComboItems('tree','{ItemUrl}','{Id}','{Field.Name}',{JsonSerializer.Serialize(vals)},function(){{
}})
</script>");
}
var script = $@"
<script>
var {Id} = xmSelect.render({{
el: '#{Id}',
@@ -143,8 +184,8 @@ var {Id} = xmSelect.render({{
}},
}},
}}
}},
")} tree: {{
}},")}
tree: {{
strict: false,
show: true,
showFolderIcon: true,
@@ -166,18 +207,25 @@ var {Id} = xmSelect.render({{
}}" : FormatFuncName(ChangeFunc))}
}},
data: {JsonSerializer.Serialize(treeitems)}
}})
}});
{Id}defaultvalues = {JsonSerializer.Serialize(vals)};
{(vals?.Count > 0 && (LinkField != null || string.IsNullOrEmpty(LinkId) == false) ? @$"
var {Id}u = ""{(TriggerUrl ?? "")}"";
if ({Id}u.indexOf(""?"") == -1) {{
{Id}u += ""?t="" + new Date().getTime();
}}
var {Id}data = {JsonSerializer.Serialize(vals)};
for (var i = 0; i < {Id}data.length; i++) {{
{Id}u += ""&id="" + {Id}data[i];
}};
setTimeout(function(){{
ff.ChainChange({Id}u, $('#{Id}')[0], true);
}},100);
" : "")}
</script>
";
output.PostElement.AppendHtml(script);
if (string.IsNullOrEmpty(ItemUrl) == false)
{
output.PostElement.AppendHtml($@"<script>
ff.LoadComboItems('tree','{ItemUrl}','{Id}','{Field.Name}',{JsonSerializer.Serialize(vals)},function(){{
}})
</script>");
}
string hidden = $"<p id='tree{Id}hidden'>";
if (Field?.Model != null)
{