Home Explore Help
Sign In
coder
/
CloudMusic
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

use floating form label; begin search UI;

HOME 2 years ago
parent
97917342f1
commit
f6afac7beb
7 changed files with 58 additions and 17 deletions
Unified View Show Diff Stats
  1. 3 3
      FNZCM/FNZCM.BlazorWasm/UI/Components/PlaylistAddDialog.razor
  2. 5 4
      FNZCM/FNZCM.BlazorWasm/UI/Views/Default/Browse/LibSelector.razor
  3. 4 4
      FNZCM/FNZCM.BlazorWasm/UI/Views/Default/Playlist/PlaylistView.razor
  4. 42 1
      FNZCM/FNZCM.BlazorWasm/UI/Views/Default/Search/SearchView.razor
  5. 2 1
      FNZCM/FNZCM.BlazorWasm/UI/Views/Default/SettingDialog.razor
  6. 2 1
      FNZCM/FNZCM.ConHost/HostProgram.cs
  7. 0 3
      FNZCM/FNZCM.Core/ConfigFile.cs

+ 3 - 3
FNZCM/FNZCM.BlazorWasm/UI/Components/PlaylistAddDialog.razor
View File 

@@ -7,7 +7,7 @@
 
     private bool CreatingNewList { get; set; }
 
     private bool CreatingNewList { get; set; }
 
     private string NewListName { get; set; }
 
     private string NewListName { get; set; }
 
 
 
-    private string NewListNameClass => string.IsNullOrWhiteSpace(NewListName) ? "border-warning border-4 w-100" : "w-100";
 
+    private string NewListNameClass => string.IsNullOrWhiteSpace(NewListName) ? "border-warning border-4 form-control" : "form-control";
 
 }
 
 }
 
 
 
 <FnzBoostrapModal @ref="dlgMain" CssClass="modal-md">
 
 <FnzBoostrapModal @ref="dlgMain" CssClass="modal-md">
 
@@ -69,9 +69,9 @@
 
     <Footer>
 
     <Footer>
 
         @if (CreatingNewList)
 
         @if (CreatingNewList)
 
         {
 
         {
 
-            <div class="form-group row w-100">
 
-                <label>Name</label>
 
+            <div class="form-floating row w-100">
 
                 <InputText class="@NewListNameClass" placeholder="Input new playlist name" @oninput="NewPlaylistNameChanged" Value="@NewListName" ValueExpression="()=>NewListName"></InputText>
 
                 <InputText class="@NewListNameClass" placeholder="Input new playlist name" @oninput="NewPlaylistNameChanged" Value="@NewListName" ValueExpression="()=>NewListName"></InputText>
 
+                <label>New playlist Name</label>
 
                 @if (string.IsNullOrEmpty(NewListName))
 
                 @if (string.IsNullOrEmpty(NewListName))
 
                 {
 
                 {
 
                     <small class="text-warning">Required</small>
 
                     <small class="text-warning">Required</small>

+ 5 - 4
FNZCM/FNZCM.BlazorWasm/UI/Views/Default/Browse/LibSelector.razor
View File 

@@ -5,7 +5,7 @@
 
 
 
     private FnzBoostrapCollapse SmallUi;
 
     private FnzBoostrapCollapse SmallUi;
 
     private FnzBoostrapCollapse BigUi;
 
     private FnzBoostrapCollapse BigUi;
 
-    private InputText Filter;
 
+    private InputText FilterTextBox;
 
 }
 
 }
 
 
 
 <FnzBoostrapCollapse @ref="SmallUi" CssClass="row show" OnHidden="()=>BigUi.Show()" OnShown="@(()=>{ JSRuntime.InvokeVoidAsync("fnz.scrollIntoViewById","MainNavBar"); })">
 
 <FnzBoostrapCollapse @ref="SmallUi" CssClass="row show" OnHidden="()=>BigUi.Show()" OnShown="@(()=>{ JSRuntime.InvokeVoidAsync("fnz.scrollIntoViewById","MainNavBar"); })">
 
@@ -17,15 +17,16 @@
 
     </div>
 
     </div>
 
 </FnzBoostrapCollapse>
 
 </FnzBoostrapCollapse>
 
 
 
-<FnzBoostrapCollapse @ref="BigUi" CssClass="row" OnHidden="()=>SmallUi.Show()" OnShown="()=>Filter.Element.Value.FocusAsync()">
 
+<FnzBoostrapCollapse @ref="BigUi" CssClass="row" OnHidden="()=>SmallUi.Show()" OnShown="()=>FilterTextBox.Element.Value.FocusAsync()">
 
     <div class="col">
 
     <div class="col">
 
         <fieldset class="border rounded-3 p-2">
 
         <fieldset class="border rounded-3 p-2">
 
             <legend class="float-none w-auto px-2 d-flex flex-row align-items-center">
 
             <legend class="float-none w-auto px-2 d-flex flex-row align-items-center">
 
                 <span>Library (@DataSet.AllLibrary.Length):&nbsp;</span>
 
                 <span>Library (@DataSet.AllLibrary.Length):&nbsp;</span>
 
                 <button class="btn btn-primary p-1" type="button" @onclick="()=>BigUi.Hide()">@($"{CurrentLibrary?.Name} ({CurrentLibrary?.Discs.Length})")</button>
 
                 <button class="btn btn-primary p-1" type="button" @onclick="()=>BigUi.Hide()">@($"{CurrentLibrary?.Name} ({CurrentLibrary?.Discs.Length})")</button>
 
             </legend>
 
             </legend>
 
-            <div class="mt-0">
 
-                <InputText @ref="Filter" type="search" placeholder="Filter" class="w-100" Value="@SearchValue" ValueExpression="@(()=>SearchValue)" @oninput="SearchChanged" onsearch="@SearchDone"></InputText>
 
+            <div class="form-floating">
 
+                <InputText @ref="FilterTextBox" type="search" placeholder="Filter" class="form-control" Value="@SearchValue" ValueExpression="@(()=>SearchValue)" @oninput="SearchChanged" onsearch="@SearchDone"></InputText>
 
+                <label>Filter</label>
 
             </div>
 
             </div>
 
             @foreach (var lib in (ListDataSource).KeepNoEmpty())
 
             @foreach (var lib in (ListDataSource).KeepNoEmpty())
 
             {
 
             {

+ 4 - 4
FNZCM/FNZCM.BlazorWasm/UI/Views/Default/Playlist/PlaylistView.razor
View File 

@@ -7,7 +7,7 @@
 
     private FnzBoostrapModal EditPlaylistDialog;
 
     private FnzBoostrapModal EditPlaylistDialog;
 
     private FnzBoostrapModal DeletePlaylistDialog;
 
     private FnzBoostrapModal DeletePlaylistDialog;
 
 
 
-    private string EditListNameClass => string.IsNullOrWhiteSpace(CurrentEditPlaylistName) ? "border-warning border-4 w-100" : "w-100";
 
+    private string EditListNameClass => string.IsNullOrWhiteSpace(CurrentEditPlaylistName) ? "border-warning border-4 form-control" : "form-control";
 
 }
 
 }
 
 
 
 <div class="container mt-3">
 
 <div class="container mt-3">
 
@@ -88,9 +88,9 @@
 
 <FnzBoostrapModal @ref="EditPlaylistDialog" CssClass="modal-sm">
 
 <FnzBoostrapModal @ref="EditPlaylistDialog" CssClass="modal-sm">
 
     <Title>Modify playlist</Title>
 
     <Title>Modify playlist</Title>
 
     <Body>
 
     <Body>
 
-        <div class="form-group row w-100">
 
-            <label>Name</label>
 
-            <InputText class="@EditListNameClass" placeholder="Input new playlist name" @oninput="EditPlaylistNameChanged" Value="@CurrentEditPlaylistName" ValueExpression="()=>CurrentEditPlaylistName"></InputText>
 
+        <div class="form-floating row w-100">
 
+            <InputText class="@EditListNameClass" placeholder="Playlist Name" @oninput="EditPlaylistNameChanged" Value="@CurrentEditPlaylistName" ValueExpression="()=>CurrentEditPlaylistName"></InputText>
 
+            <label>Playlist Name</label>
 
             @if (string.IsNullOrEmpty(CurrentEditPlaylistName))
 
             @if (string.IsNullOrEmpty(CurrentEditPlaylistName))
 
             {
 
             {
 
                 <small class="text-warning">Required</small>
 
                 <small class="text-warning">Required</small>

+ 42 - 1
FNZCM/FNZCM.BlazorWasm/UI/Views/Default/Search/SearchView.razor
View File 

@@ -1,3 +1,44 @@
 
 @inherits ViewBase
 
 @inherits ViewBase
 
 
 
-<h3>此处应有搜索界面</h3>
 
+@code {
 
+    private string searchExpression;
 
+}
 
+
 
+<div class="row">
 
+    <div class="col">
 
+        <fieldset class="border rounded-3 p-2">
 
+            <legend class="float-none w-auto px-2 d-flex flex-row align-items-center">
 
+                <span>Filter</span>
 
+            </legend>
 
+            <div class="input-group">
 
+
 
+                <div class="form-floating">
 
+                    <InputText type="search" class="form-control" placeholder="Search expression"
 
+                        Value="@searchExpression"
 
+                        ValueExpression="@(()=>searchExpression)"
 
+                        @oninput="SearchChanged"
 
+                        onsearch="@SearchDone"></InputText>
 
+                    <label>Search expression</label>
 
+                </div>
 
+
 
+                <button @onclick="@SearchDone" class="btn btn-outline-secondary" type="button">Search</button>
 
+            </div>
 
+            <div class="row">
 
+
 
+            </div>
 
+        </fieldset>
 
+    </div>
 
+</div>
 
+
 
+@code {
 
+    private void SearchChanged(ChangeEventArgs e)
 
+    {
 
+        searchExpression = e.Value.ToString().Trim();
 
+        StateHasChanged();
 
+    }
 
+
 
+    private void SearchDone()
 
+    {
 
+
 
+    }
 
+}

+ 2 - 1
FNZCM/FNZCM.BlazorWasm/UI/Views/Default/SettingDialog.razor
View File 

@@ -40,8 +40,9 @@
 
         <div class="form-group row mt-2">
 
         <div class="form-group row mt-2">
 
             <label class="col-sm-2">Admin</label>
 
             <label class="col-sm-2">Admin</label>
 
             <div class="input-group">
 
             <div class="input-group">
 
-                <div class="col-12">
 
+                <div class="col-12 form-floating">
 
                     <InputText class="form-control" type="password" @bind-Value="@AdminPassword" placeholder="Password"></InputText>
 
                     <InputText class="form-control" type="password" @bind-Value="@AdminPassword" placeholder="Password"></InputText>
 
+                    <label>Password</label>
 
                 </div>
 
                 </div>
 
                 <div class="col-12 btn-group mt-2">
 
                 <div class="col-12 btn-group mt-2">
 
                     <button class="btn btn-outline-primary" type="button" @onclick="async ()=>{ await ApiClient.ReloadBackEnd(AdminPassword,false); AdminModal.Show(); }">
 
                     <button class="btn btn-outline-primary" type="button" @onclick="async ()=>{ await ApiClient.ReloadBackEnd(AdminPassword,false); AdminModal.Show(); }">

+ 2 - 1
FNZCM/FNZCM.ConHost/HostProgram.cs
View File 

@@ -260,6 +260,7 @@ namespace FNZCM.ConHost
 
 
 
                     if (modEnt.Value.IsDefault && _defaultModule == null) _defaultModule = module;
 
                     if (modEnt.Value.IsDefault && _defaultModule == null) _defaultModule = module;
 
                     Modules[modEnt.Key] = module;
 
                     Modules[modEnt.Key] = module;
 
+                    Console.WriteLine($"Module `{modEnt.Value.DisplayText}' loaded.");
 
                 }
 
                 }
 
             }
 
             }
 
         }
 
         }
 
@@ -373,7 +374,7 @@ namespace FNZCM.ConHost
 
                 {
 
                 {
 
                     var sb = new StringBuilder();
 
                     var sb = new StringBuilder();
 
                     sb.Append("<!DOCTYPE html><html lang=\"zh-cn\"><meta charset=\"UTF-8\">");
 
                     sb.Append("<!DOCTYPE html><html lang=\"zh-cn\"><meta charset=\"UTF-8\">");
 
-                    sb.Append($"<title> Libraries - {ConfigFile.Instance.Title} </title>");
 
+                    sb.Append($"<title> Admin - {ConfigFile.Instance.Title} </title>");
 
                     sb.Append("<body bgColor=skyBlue>");
 
                     sb.Append("<body bgColor=skyBlue>");
 
                     sb.Append($"<h3>Admin</h3>");
 
                     sb.Append($"<h3>Admin</h3>");
 
                     sb.Append("<div><a href=/>Back to home</a></div>");
 
                     sb.Append("<div><a href=/>Back to home</a></div>");

+ 0 - 3
FNZCM/FNZCM.Core/ConfigFile.cs
View File 

@@ -35,12 +35,9 @@ namespace FNZCM.Core
 
         public IReadOnlyCollection<string> AccessControlAllowOrigin { get; set; }
 
         public IReadOnlyCollection<string> AccessControlAllowOrigin { get; set; }
 
         public string M3uPrefix { get; set; }
 
         public string M3uPrefix { get; set; }
 
 
 
-
 
         public string Title { get; set; }
 
         public string Title { get; set; }
 
         public string AdminPassword { get; set; }
 
         public string AdminPassword { get; set; }
 
 
 
-
 
-
 
         public IReadOnlyDictionary<string, string> Libraries { get; set; }
 
         public IReadOnlyDictionary<string, string> Libraries { get; set; }
 
         public string[] MediaFilePattern { get; set; }
 
         public string[] MediaFilePattern { get; set; }
 
         public string[] BkFilePattern { get; set; }
 
         public string[] BkFilePattern { get; set; }