diff --git a/Bootstrap.DataAccess/Dict.cs b/Bootstrap.DataAccess/Dict.cs
index 8dc39a43..621c054a 100644
--- a/Bootstrap.DataAccess/Dict.cs
+++ b/Bootstrap.DataAccess/Dict.cs
@@ -27,9 +27,5 @@
/// 1表示系统使用，0表示用户自定义 默认为1
///
public int Define { get; set; }
- ///
- /// 获得/设置 字典定义类别名称
- ///
- public string DefineName { get; set; }
}
}
diff --git a/Bootstrap.DataAccess/DictHelper.cs b/Bootstrap.DataAccess/DictHelper.cs
index 6f076f9f..ab50bb02 100644
--- a/Bootstrap.DataAccess/DictHelper.cs
+++ b/Bootstrap.DataAccess/DictHelper.cs
@@ -25,7 +25,7 @@ namespace Bootstrap.DataAccess
{
return CacheManager.GetOrAdd(RetrieveDictsDataKey, CacheSection.RetrieveIntervalByKey(RetrieveDictsDataKey), key =>
{
- string sql = "select ID, Category, Name, Code, Define, case Define when 0 then '系统使用' else '自定义' end DefineName from Dicts";
+ string sql = "select ID, Category, Name, Code, Define from Dicts";
List
Dicts = new List();
DbCommand cmd = DBAccessManager.SqlDBAccess.CreateCommand(CommandType.Text, sql);
try
@@ -40,8 +40,7 @@ namespace Bootstrap.DataAccess
Category = (string)reader[1],
Name = (string)reader[2],
Code = (string)reader[3],
- Define = (int)reader[4],
- DefineName = (string)reader[5]
+ Define = (int)reader[4]
});
}
}
@@ -114,7 +113,7 @@ namespace Bootstrap.DataAccess
{
return CacheManager.GetOrAdd(RetrieveWebSettingsDataKey, CacheSection.RetrieveIntervalByKey(RetrieveWebSettingsDataKey), key =>
{
- string sql = "select ID, Category, Name, Code, Define, case Define when 0 then '系统使用' else '用户自定义' end DefineName from Dicts where Category = N'网站设置' and Define = 0";
+ string sql = "select ID, Category, Name, Code, Define from Dicts where Category = N'网站设置' and Define = 0";
List Dicts = new List();
DbCommand cmd = DBAccessManager.SqlDBAccess.CreateCommand(CommandType.Text, sql);
try
@@ -129,8 +128,7 @@ namespace Bootstrap.DataAccess
Category = (string)reader[1],
Name = (string)reader[2],
Code = (string)reader[3],
- Define = (int)reader[4],
- DefineName = (string)reader[5]
+ Define = (int)reader[4]
});
}
}
@@ -158,6 +156,24 @@ namespace Bootstrap.DataAccess
return (settings.FirstOrDefault(d => d.Name == "网站页脚") ?? new Dict() { Code = "2016 © 通用后台管理系统" }).Code;
}
///
+ ///
+ ///
+ ///
+ public static IEnumerable RetrieveWebCss()
+ {
+ var data = RetrieveDicts();
+ return data.Where(d => d.Category == "网站样式");
+ }
+ ///
+ ///
+ ///
+ ///
+ public static IEnumerable RetrieveActiveCss()
+ {
+ var data = RetrieveDicts();
+ return data.Where(d => d.Category == "当前样式");
+ }
+ ///
/// 保存网站个性化设置
///
///
@@ -177,7 +193,7 @@ namespace Bootstrap.DataAccess
cmd.Parameters.Add(DBAccessManager.SqlDBAccess.CreateParameter("@Category", category, ParameterDirection.Input));
DBAccessManager.SqlDBAccess.ExecuteNonQuery(cmd);
}
- CacheManager.Clear(key => key == RetrieveWebSettingsDataKey);
+ CacheManager.Clear(key => key.Contains(RetrieveDictsDataKey));
ret = true;
}
catch (DbException ex)
@@ -194,7 +210,7 @@ namespace Bootstrap.DataAccess
{
return CacheManager.GetOrAdd(RetrieveIconPathSettingsDataKey, CacheSection.RetrieveIntervalByKey(RetrieveIconPathSettingsDataKey), key =>
{
- string sql = "select ID, Category, Name, Code, Define, case Define when 0 then '系统使用' else '用户自定义' end DefineName from Dicts where Category = N'头像地址' and Name = N'头像路径' and Define = 0";
+ string sql = "select ID, Category, Name, Code, Define from Dicts where Category = N'头像地址' and Name = N'头像路径' and Define = 0";
var dict = new Dict() { Code = "~/Content/images/uploader/" };
DbCommand cmd = DBAccessManager.SqlDBAccess.CreateCommand(CommandType.Text, sql);
try
@@ -209,8 +225,7 @@ namespace Bootstrap.DataAccess
Category = (string)reader[1],
Name = (string)reader[2],
Code = (string)reader[3],
- Define = (int)reader[4],
- DefineName = (string)reader[5]
+ Define = (int)reader[4]
};
}
}
@@ -223,11 +238,11 @@ namespace Bootstrap.DataAccess
/// 获取字典分类名称
///
///
- public static IEnumerable RetrieveCategories()
+ public static IEnumerable RetrieveCategories()
{
return CacheManager.GetOrAdd(RetrieveCategoryDataKey, CacheSection.RetrieveIntervalByKey(RetrieveCategoryDataKey), key =>
{
- var ret = new List();
+ var ret = new List();
string sql = "select distinct Category from Dicts";
DbCommand cmd = DBAccessManager.SqlDBAccess.CreateCommand(CommandType.Text, sql);
try
@@ -236,7 +251,7 @@ namespace Bootstrap.DataAccess
{
while (reader.Read())
{
- ret.Add((string)reader[0]);
+ ret.Add(new Dict() { Category = (string)reader[0] });
}
}
}
diff --git a/DatabaseScripts/InitData.sql b/DatabaseScripts/InitData.sql
index cdd16bd7..4bf62726 100644
--- a/DatabaseScripts/InitData.sql
+++ b/DatabaseScripts/InitData.sql
@@ -24,6 +24,9 @@ INSERT [dbo].[Dicts] ([ID], [Category], [Name], [Code], [Define]) VALUES (13, N'
INSERT [dbo].[Dicts] ([ID], [Category], [Name], [Code], [Define]) VALUES (14, N'消息标签', N'一般', N'0', 0)
INSERT [dbo].[Dicts] ([ID], [Category], [Name], [Code], [Define]) VALUES (15, N'消息标签', N'紧要', N'1', 0)
INSERT [dbo].[Dicts] ([ID], [Category], [Name], [Code], [Define]) VALUES (16, N'头像地址', N'头像路径', N'~/Content/images/uploader/', 0)
+INSERT [dbo].[Dicts] ([ID], [Category], [Name], [Code], [Define]) VALUES (17, N'网站样式', N'默认样式', N'site.css', 0)
+INSERT [dbo].[Dicts] ([ID], [Category], [Name], [Code], [Define]) VALUES (18, N'网站样式', N'蓝色样式', N'blue.css', 0)
+INSERT [dbo].[Dicts] ([ID], [Category], [Name], [Code], [Define]) VALUES (19, N'当前样式', N'使用样式', N'site.css', 0)
SET IDENTITY_INSERT [dbo].[Dicts] OFF
DELETE FROM Navigations