Merge pull request #236 from SeriaWei/develop

Develop
SeriaWei · Oct 24, 2018 · 3eb984e · 3eb984e
2 parents 16ac87f + e465154
commit 3eb984e
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/DataBase/InitialData/dbo.Language.Table.sql b/DataBase/InitialData/dbo.Language.Table.sql
diff --git a/DataBase/MySql/Dump3.1.1.sql b/DataBase/MySql/Dump3.1.1.sql
diff --git a/DataBase/MySql/Dump3.1.2.sql b/DataBase/MySql/Dump3.1.2.sql
diff --git a/src/EasyFrameWork/ViewPort/Validator/RegularValidator.cs b/src/EasyFrameWork/ViewPort/Validator/RegularValidator.cs
@@ -9,7 +9,7 @@ public class RegularValidator : ValidatorBase
         public RegularValidator(string expression)
         {
             this.Expression = expression;
-            BaseErrorMessage = "{0}的输入的值不舒合要求";
+            BaseErrorMessage = "{0}的输入的值不符合要求";
         }
         public string Expression { get; set; }
 

diff --git a/src/ZKEACMS/Filter/WidgetAttribute.cs b/src/ZKEACMS/Filter/WidgetAttribute.cs
@@ -22,7 +22,7 @@ namespace ZKEACMS.Filter
 {
     public class WidgetAttribute : ActionFilterAttribute, IActionFilter
     {
-
+        private const string UnknownZone = "UnknownZone";
         public virtual PageEntity GetPage(ActionExecutedContext filterContext)
         {
             string path = filterContext.RouteData.GetPath();
@@ -103,13 +103,13 @@ public override void OnActionExecuted(ActionExecutedContext filterContext)
                             WidgetViewModelPart part = partDriver.Display(widget, filterContext);
                             if (part != null)
                             {
-                                if (layout.ZoneWidgets.ContainsKey(part.Widget.ZoneID))
+                                if (layout.ZoneWidgets.ContainsKey(part.Widget.ZoneID ?? UnknownZone))
                                 {
-                                    layout.ZoneWidgets[part.Widget.ZoneID].TryAdd(part);
+                                    layout.ZoneWidgets[part.Widget.ZoneID ?? UnknownZone].TryAdd(part);
                                 }
                                 else
                                 {
-                                    layout.ZoneWidgets.Add(part.Widget.ZoneID, new WidgetCollection { part });
+                                    layout.ZoneWidgets.Add(part.Widget.ZoneID ?? UnknownZone, new WidgetCollection { part });
                                 }
                             }
                             partDriver.Dispose();
@@ -135,13 +135,13 @@ public override void OnActionExecuted(ActionExecutedContext filterContext)
                             if (part != null && zone != null)
                             {
                                 part.Widget.ZoneID = zone.HeadingCode;
-                                if (layout.ZoneWidgets.ContainsKey(part.Widget.ZoneID))
+                                if (layout.ZoneWidgets.ContainsKey(part.Widget.ZoneID ?? UnknownZone))
                                 {
-                                    layout.ZoneWidgets[part.Widget.ZoneID].TryAdd(part);
+                                    layout.ZoneWidgets[part.Widget.ZoneID ?? UnknownZone].TryAdd(part);
                                 }
                                 else
                                 {
-                                    layout.ZoneWidgets.Add(part.Widget.ZoneID, new WidgetCollection { part });
+                                    layout.ZoneWidgets.Add(part.Widget.ZoneID ?? UnknownZone, new WidgetCollection { part });
                                 }
 
                             }