Rename

SeriaWei · Oct 12, 2024 · 35401e8 · 35401e8
1 parent fe88d39
commit 35401e8
Show file tree

Hide file tree

Showing 13 changed files with 40 additions and 42 deletions.
diff --git a/src/ZKEACMS.Article/Service/ArticleDetailWidgetService.cs b/src/ZKEACMS.Article/Service/ArticleDetailWidgetService.cs
@@ -96,7 +96,7 @@ public override object Display(WidgetDisplayContext widgetDisplayContext)
             else
             {
                 var latest = _articleService.GetLatestPublished();
-                if (ApplicationContext.CurrentAppContext().IsDesignMode || ApplicationContext.CurrentAppContext().IsPreViewMode)
+                if (ApplicationContext.Current().IsDesignMode || ApplicationContext.Current().IsPreViewMode)
                 {
                     viewModel.Current = latest;
                 }
@@ -113,7 +113,7 @@ public override object Display(WidgetDisplayContext widgetDisplayContext)
                 return null;
             }
 
-            ApplicationContext.As<CMSApplicationContext>().CurrentPage.ConfigSEO(viewModel.Current.Title, viewModel.Current.MetaKeyWords, viewModel.Current.MetaDescription);
+            ApplicationContext.Current().CurrentPage.ConfigSEO(viewModel.Current.Title, viewModel.Current.MetaKeyWords, viewModel.Current.MetaDescription);
             AddStructuredDataToPageHeader(viewModel.Current);
             return viewModel;
         }
@@ -127,7 +127,7 @@ private void AddStructuredDataToPageHeader(ArticleEntity article)
                 DateModified = article.LastUpdateDate,
                 Author = new Person[] { new Person { Name = article.CreatebyName } }
             };
-            ApplicationContext.CurrentAppContext().CurrentPage.HeaderScripts.Add(new Page.ScriptTag()
+            ApplicationContext.Current().CurrentPage.HeaderScripts.Add(new Page.ScriptTag()
             {
                 Type = "application/ld+json",
                 InnerScript = new HtmlString(JsonConverter.Serialize(structuredData))

diff --git a/src/ZKEACMS.Article/Service/ArticleSpecialDetailWidgetService.cs b/src/ZKEACMS.Article/Service/ArticleSpecialDetailWidgetService.cs
@@ -45,7 +45,7 @@ public override object Display(WidgetDisplayContext widgetDisplayContext)
             else
             {
                 _articleService.IncreaseCount(article);
-                ApplicationContext.As<CMSApplicationContext>().CurrentPage.ConfigSEO(article.Title, article.MetaKeyWords, article.MetaDescription);
+                ApplicationContext.Current().CurrentPage.ConfigSEO(article.Title, article.MetaKeyWords, article.MetaDescription);
             }
             viewModel.Current = article;
 

diff --git a/src/ZKEACMS.Article/Service/ArticleTypeWidgetService.cs b/src/ZKEACMS.Article/Service/ArticleTypeWidgetService.cs
@@ -72,7 +72,7 @@ public override object Display(WidgetDisplayContext widgetDisplayContext)
             }
             if (articleType != null && articleType.SEOTitle.IsNotNullAndWhiteSpace())
             {
-                _articleTypeService.ApplicationContext.As<CMSApplicationContext>().CurrentPage.ConfigSEO(articleType.SEOTitle, articleType.SEOKeyWord, articleType.SEODescription);
+                _articleTypeService.ApplicationContext.Current().CurrentPage.ConfigSEO(articleType.SEOTitle, articleType.SEOKeyWord, articleType.SEODescription);
             }
             return new ArticleTypeWidgetViewModel
             {

diff --git a/src/ZKEACMS.Product/Service/ProductCategoryWidgetService.cs b/src/ZKEACMS.Product/Service/ProductCategoryWidgetService.cs
@@ -71,7 +71,7 @@ public override object Display(WidgetDisplayContext widgetDisplayContext)
             }
             if (productCategory != null && productCategory.SEOTitle.IsNotNullAndWhiteSpace())
             {
-                ApplicationContext.As<CMSApplicationContext>().CurrentPage.ConfigSEO(productCategory.SEOTitle, productCategory.SEOKeyWord, productCategory.SEODescription);
+                ApplicationContext.Current().CurrentPage.ConfigSEO(productCategory.SEOTitle, productCategory.SEOKeyWord, productCategory.SEODescription);
             }
             return new ProductCategoryWidgetViewModel
             {

diff --git a/src/ZKEACMS.Product/Service/ProductDetailWidgetService.cs b/src/ZKEACMS.Product/Service/ProductDetailWidgetService.cs
@@ -81,7 +81,7 @@ public override object Display(WidgetDisplayContext widgetDisplayContext)
             }
             else
             {
-                if (ApplicationContext.CurrentAppContext().IsDesignMode || ApplicationContext.CurrentAppContext().IsPreViewMode)
+                if (ApplicationContext.Current().IsDesignMode || ApplicationContext.Current().IsPreViewMode)
                 {
                     product = _productService.GetLatestPublished();
                 }
@@ -97,7 +97,7 @@ public override object Display(WidgetDisplayContext widgetDisplayContext)
                 return null;
             }
 
-            ApplicationContext.As<CMSApplicationContext>().CurrentPage.ConfigSEO(product.SEOTitle ?? product.Title, product.SEOKeyWord, product.SEODescription);
+            ApplicationContext.Current().CurrentPage.ConfigSEO(product.SEOTitle ?? product.Title, product.SEOKeyWord, product.SEODescription);
             AddStructuredDataToPageHeader(product);
 
             return product;
@@ -112,7 +112,7 @@ private void AddStructuredDataToPageHeader(ProductEntity product)
                 Description = product.Description,
                 MPN = product.PartNumber
             };
-            ApplicationContext.CurrentAppContext().CurrentPage.HeaderScripts.Add(new Page.ScriptTag()
+            ApplicationContext.Current().CurrentPage.HeaderScripts.Add(new Page.ScriptTag()
             {
                 Type = "application/ld+json",
                 InnerScript = new HtmlString(JsonConverter.Serialize(structuredData))

diff --git a/src/ZKEACMS.WebHost/Views/Shared/Partial.PageHeader.cshtml b/src/ZKEACMS.WebHost/Views/Shared/Partial.PageHeader.cshtml
@@ -1,54 +1,53 @@
-@{
-    foreach (var item in this.WorkContext().CurrentPage.StyleSource)
+@inject IApplicationSettingService applicationSettingService
+@{
+    var currentPage = this.WorkContext().CurrentPage;
+    foreach (var item in currentPage.StyleNames)
     {
         Style.Reqiured(item).AtHead();
     }
-    foreach (var item in this.WorkContext().CurrentPage.ScriptSource)
+    foreach (var item in currentPage.ScriptNames)
     {
         Script.Reqiured(item).AtFoot();
     }
     var favicon = applicationSettingService.Get(SettingKeys.Favicon, "~/favicon.ico");
 }
-@inject IApplicationSettingService applicationSettingService
-<title>
-    @this.WorkContext().CurrentPage.Title
-</title>
-<meta name="keywords" content="@this.WorkContext().CurrentPage.MetaKeyWorlds" />
-<meta name="description" content="@this.WorkContext().CurrentPage.MetaDescription" />
+<title>@currentPage.Title</title>
+<meta name="keywords" content="@currentPage.MetaKeyWorlds" />
+<meta name="description" content="@currentPage.MetaDescription" />
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta charset="utf-8" />
 <meta name="author" content="ZKEASOFT" />
 <meta name="about" content="@ZKEACMS.Version.CurrentVersion" />
 <meta name="website" content="http://www.zkea.net" />
-<link rel="author" href="http://www.zkea.net" />
-<link href="@Url.Content(favicon)" rel="shortcut icon" type="image/x-icon" />
+@if (this.WorkContext().EnableResponsiveDesign)
+{
+    <meta name="viewport" content="width=device-width,initial-scale=1.0,user-scalable=no,maximum-scale=1.0" />
+}
 @if (this.WorkContext().OuterChainPicture)
 {
     <meta name="referrer" content="same-origin" />
 }
-@foreach (var item in this.WorkContext().CurrentPage.Meta)
+@foreach (var item in currentPage.Meta)
 {
     @item.Render()
 }
-@if (this.WorkContext().EnableResponsiveDesign)
-{
-    <meta name="viewport" content="width=device-width,initial-scale=1.0,user-scalable=no,maximum-scale=1.0" />
-}
+<link rel="author" href="http://www.zkea.net" />
+<link href="@Url.Content(favicon)" rel="shortcut icon" type="image/x-icon" />
 @StyleAtHead()
 @ScriptAtHead()
-@foreach (var item in this.WorkContext().CurrentPage.Header)
+@foreach (var item in currentPage.Header)
 {
     @item
 }
-@foreach (var item in this.WorkContext().CurrentPage.StyleSheets)
+@foreach (var item in currentPage.StyleSheets)
 {
     @item.Render()
 }
-@foreach (var item in this.WorkContext().CurrentPage.Style)
+@foreach (var item in currentPage.Style)
 {
     @item.Render()
 }
-@foreach (var item in this.WorkContext().CurrentPage.HeaderScripts)
+@foreach (var item in currentPage.HeaderScripts)
 {
     @item.Render()
 }
diff --git a/src/ZKEACMS/ApplicationContextAccessor.cs b/src/ZKEACMS/ApplicationContextAccessor.cs
@@ -22,7 +22,7 @@ public CMSApplicationContext Current
         {
             get
             {
-                return current ?? (current = _serviceProvider.GetService<IApplicationContext>().CurrentAppContext());
+                return current ?? (current = _serviceProvider.GetService<IApplicationContext>().Current());
             }
         }
     }

diff --git a/src/ZKEACMS/Common/Service/HeadWidgetService.cs b/src/ZKEACMS/Common/Service/HeadWidgetService.cs
@@ -26,7 +26,7 @@ public override object Display(WidgetDisplayContext widgetDisplayContext)
             htmlContentBuilder.AppendHtmlLine("<!-- head:{0} -->".FormatWith(widgetDisplayContext.Widget.ID));
             htmlContentBuilder.AppendHtmlLine((widgetDisplayContext.Widget as HeadWidget).Content);
             htmlContentBuilder.AppendHtmlLine("<!-- end -->");
-            ApplicationContext.CurrentAppContext().CurrentPage.Header.Add(htmlContentBuilder);
+            ApplicationContext.Current().CurrentPage.Header.Add(htmlContentBuilder);
             return base.Display(widgetDisplayContext);
         }
     }

diff --git a/src/ZKEACMS/Common/Service/NavigationWidgetService.cs b/src/ZKEACMS/Common/Service/NavigationWidgetService.cs
@@ -37,7 +37,7 @@ public override object Display(WidgetDisplayContext widgetDisplayContext)
 
             string path = null;
             IUrlHelper urlHelper = null;
-            if (ApplicationContext.CurrentAppContext().IsDesignMode)
+            if (ApplicationContext.Current().IsDesignMode)
             {
                 var layout = widgetDisplayContext.PageLayout;
                 if (layout != null && layout.Page != null)

diff --git a/src/ZKEACMS/Extend/ApplicationContextExtend.cs b/src/ZKEACMS/Extend/ApplicationContextExtend.cs
@@ -14,15 +14,15 @@ public static class ApplicationContextExtend
     {
         public static T GetService<T>(this IApplicationContext applicationContext)
         {
-            return applicationContext.CurrentAppContext().HttpContextAccessor.HttpContext.RequestServices.GetService<T>();
+            return applicationContext.Current().HttpContextAccessor.HttpContext.RequestServices.GetService<T>();
         }
         public static IEnumerable<T> GetServices<T>(this IApplicationContext applicationContext)
         {
-            return applicationContext.CurrentAppContext().HttpContextAccessor.HttpContext.RequestServices.GetServices<T>();
+            return applicationContext.Current().HttpContextAccessor.HttpContext.RequestServices.GetServices<T>();
         }
-        public static CMSApplicationContext CurrentAppContext(this IApplicationContext applicationContext)
+        public static CMSApplicationContext Current(this IApplicationContext applicationContext)
         {
             return applicationContext.As<CMSApplicationContext>();
         }
     }
-}
+}
diff --git a/src/ZKEACMS/Extend/RazorPageExtend.cs b/src/ZKEACMS/Extend/RazorPageExtend.cs
@@ -14,7 +14,7 @@ public static class RazorPageExtend
     {
         public static CMSApplicationContext WorkContext<T>(this Easy.Mvc.RazorPages.EasyRazorPage<T> page)
         {
-            return page.ApplicationContext.CurrentAppContext();
+            return page.ApplicationContext.Current();
         }
     }
 }
diff --git a/src/ZKEACMS/Page/IPageContext.cs b/src/ZKEACMS/Page/IPageContext.cs
@@ -23,11 +23,10 @@ public interface IPageContext
         List<StyleSheetTag> StyleSheets { get; }
         List<IHtmlContent> Header { get; }
         List<ScriptTag> HeaderScripts { get; }
-
         List<ScriptTag> FooterScripts { get; }
         List<IHtmlContent> BodyFooter { get; }
-        List<string> StyleSource { get; }
-        List<string> ScriptSource { get; }
+        List<string> StyleNames { get; }
+        List<string> ScriptNames { get; }
         void ConfigSEO(string title, string keywords, string description);
     }
 }
diff --git a/src/ZKEACMS/Page/PageContext.cs b/src/ZKEACMS/Page/PageContext.cs
@@ -29,8 +29,8 @@ public class PageContext : IPageContext
 
         public List<IHtmlContent> Header { get; } = new List<IHtmlContent>();
         public List<IHtmlContent> BodyFooter { get; } = new List<IHtmlContent>();
-        public List<string> StyleSource { get; }= new List<string>();
-        public List<string> ScriptSource { get; } = new List<string>();
+        public List<string> StyleNames { get; }= new List<string>();
+        public List<string> ScriptNames { get; } = new List<string>();
         public string MetaKeyWorlds { get; set; }
         public string MetaDescription { get; set; }