Merge branch 'develop' of https://github.com/dotnetcore/WTM into develop

dotnetcore · Nov 9, 2020 · e6674fe · e6674fe
2 parents 78e7bcc + a4d030a
commit e6674fe
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/demo/WalkingTec.Mvvm.Demo/ViewModels/CityVMs/CityVM.cs b/demo/WalkingTec.Mvvm.Demo/ViewModels/CityVMs/CityVM.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -12,7 +12,7 @@ namespace WalkingTec.Mvvm.Demo.ViewModels.CityVMs
 {
     public partial class CityVM : BaseCRUDVM<City>
     {
-        public List<ComboSelectListItem> AllParents { get; set; }
+        public List<TreeSelectListItem> AllParents { get; set; }
 
         public CityVM()
         {
@@ -21,7 +21,7 @@ public CityVM()
 
         protected override void InitVM()
         {
-            AllParents = DC.Set<City>().GetSelectListItems(LoginUserInfo?.DataPrivileges, null, y => y.Name);
+            AllParents = DC.Set<City>().GetTreeSelectListItems(LoginUserInfo?.DataPrivileges, null, y => y.Name);
         }
 
         public override void DoAdd()

diff --git a/demo/WalkingTec.Mvvm.Demo/Views/City/Create.cshtml b/demo/WalkingTec.Mvvm.Demo/Views/City/Create.cshtml
@@ -2,8 +2,8 @@
 
 <wt:form vm="@Model">
 <wt:row items-per-row="ItemsPerRowEnum.Two">
-<wt:combobox field="Entity.ParentId" items="AllParents"/>
-  <wt:colorpicker field="Entity.Name"  predefined-colors=""/>
+<wt:tree field="Entity.ParentId" items="AllParents"/>
+  <wt:textbox field="Entity.Name"  />
 </wt:row>
     <wt:row align="AlignEnum.Right">
         <wt:submitbutton />

diff --git a/demo/WalkingTec.Mvvm.VueDemo/appsettings.json b/demo/WalkingTec.Mvvm.VueDemo/appsettings.json
@@ -3,7 +3,7 @@
     {
       "Key": "default",
       // "Value": "Server=47.93.23.242;Database=wtm_demoapi;port=3306;uid=lengyx;password=q299qSmwP9wYsw2deEp4%36UtDXKtvFJ"
-      "Value": "Server=(localdb)\\mssqllocaldb;Database=wtmdemo;Trusted_Connection=True;MultipleActiveResultSets=true"
+      "Value": "Server=(localdb)\\mssqllocaldb;Database=wtmdemo43;Trusted_Connection=True;MultipleActiveResultSets=true"
     }
   ],
   "DBType": "sqlserver", //使用的数据库，可选mysql,sqlserver,pgsql

diff --git a/src/WalkingTec.Mvvm.Mvc.Admin/ApiControllers/FrameworkMenuController.cs b/src/WalkingTec.Mvvm.Mvc.Admin/ApiControllers/FrameworkMenuController.cs
@@ -142,8 +142,8 @@ public string UnsetPages()
         public async Task<ActionResult> RefreshMenu()
         {
             Cache.Delete("FFMenus");
-            var userids = DC.Set<FrameworkUserBase>().Select(x => x.ID.ToString().ToLower()).ToArray();
-            await LoginUserInfo.RemoveUserCache(userids);
+            //var userids = DC.Set<FrameworkUserBase>().Select(x => x.ID.ToString().ToLower()).ToArray();
+            //await LoginUserInfo.RemoveUserCache(userids);
             return Ok(Mvc.Admin.Program._localizer["OprationSuccess"]);
         }
         #endregion

diff --git a/src/WalkingTec.Mvvm.Mvc.Admin/Areas/_Admin/Controllers/FrameworkMenuController.cs b/src/WalkingTec.Mvvm.Mvc.Admin/Areas/_Admin/Controllers/FrameworkMenuController.cs
@@ -152,8 +152,8 @@ public ActionResult UnsetPages()
         public async Task<ActionResult> RefreshMenu()
         {
             Cache.Delete("FFMenus");
-            var userids = DC.Set<FrameworkUserBase>().Select(x => x.ID.ToString().ToLower()).ToArray();
-            await LoginUserInfo.RemoveUserCache(userids);
+            //var userids = DC.Set<FrameworkUserBase>().Select(x => x.ID.ToString().ToLower()).ToArray();
+            //await LoginUserInfo.RemoveUserCache(userids);
             return FFResult().Alert(Program._localizer["OprationSuccess"]);
         }
         #endregion