kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3181 from sbwalker/dev

Browse Source 
reverse InputList Dictionary usage
This commit is contained in:
Shaun Walker 2023-08-24 08:50:45 -04:00 committed by GitHub
commit ee21536742
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Oqtane.Client/Modules/Controls/InputList.razor
View File

@ -1,12 +1,18 @@
@namespace Oqtane.Modules.Controls @namespace Oqtane.Modules.Controls
@using System.Linq.Expressions;
@inherits LocalizableComponent @inherits LocalizableComponent
<input type="text" value="@Value" list="@_id" class="form-select" @onchange="(e => OnChange(e))" /> <input type="text" value="@Value" list="@_id" class="form-control" @onchange="(e => OnChange(e))" />
<datalist id="@_id" value="@Value"> <datalist id="@_id" value="@Value">
@foreach(var kvp in DataList) @foreach(var kvp in DataList)
{ {
<option value="@kvp.Value">@Localize(kvp.Key, kvp.Key)</option> if (!string.IsNullOrEmpty(kvp.Value))
{
<option value="@kvp.Key">@Localize(kvp.Value, kvp.Value)</option>
}
else
{
<option value="@kvp.Key">@Localize(kvp.Key, kvp.Key)</option>
}
} }
</datalist> </datalist>
@ -32,11 +38,13 @@
protected void OnChange(ChangeEventArgs e) protected void OnChange(ChangeEventArgs e)
{ {
if (string.IsNullOrWhiteSpace(e.Value.ToString())) { return; } if (!string.IsNullOrEmpty(e.Value.ToString()))
Value = e.Value.ToString();
if (ValueChanged.HasDelegate)
{ {
ValueChanged.InvokeAsync(Value); Value = e.Value.ToString();
if (ValueChanged.HasDelegate)
{
ValueChanged.InvokeAsync(Value);
}
} }
} }
} }

3
Oqtane.Client/Resources/IconResources.resx
View File

@ -117,6 +117,9 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<data name="Icon.AccountLogin" xml:space="preserve">
<value>Account Login</value>
</data>
<data name="Icon.Home" xml:space="preserve"> <data name="Icon.Home" xml:space="preserve">
<value>Home</value> <value>Home</value>
</data> </data>

12
Oqtane.Server/Controllers/SystemController.cs
View File

@ -106,17 +106,7 @@ namespace Oqtane.Controllers
{ {
if (field.FieldType == typeof(string)) if (field.FieldType == typeof(string))
{ {
// add spacing between words based on capitalization icons.Add((string)field.GetValue(null), field.Name); // ie. ("oi oi-home", "Home")
var name = "";
for (int index = 0; index < field.Name.Length; index++)
{
name += ((index > 0 && field.Name[index] == Char.ToUpper(field.Name[index])) ? " " : "") + field.Name[index];
}
string fieldName = name;
string fieldValue = (string)field.GetValue(null);
icons.Add(fieldName, fieldValue);
} }
} }