diff --git a/Database/MySql/Dump.sql b/Database/MySql/Dump.sql
index aa77765b..6669c4ef 100644
--- a/Database/MySql/Dump.sql
+++ b/Database/MySql/Dump.sql
@@ -239,14 +239,15 @@ CREATE TABLE `ArticleType` (
`LastUpdateBy` VARCHAR(50) CHARACTER SET utf8mb4 NULL,
`LastUpdateByName` VARCHAR(100) CHARACTER SET utf8mb4 NULL,
`LastUpdateDate` DATETIME NULL,
+ `DisplayOrder` INT NULL,
PRIMARY KEY (`ID`)
);
/*!40000 ALTER TABLE `ArticleType` DISABLE KEYS */;
INSERT INTO `ArticleType` VALUES
-(1,'新闻',NULL,0,NULL,1,NULL,NULL,NULL,'admin','ZKEASOFT','2016-03-10 13:50:18.000','admin','ZKEASOFT','2017-10-15 18:18:33.430'),
-(2,'公司新闻',NULL,1,'company',1,NULL,NULL,NULL,'admin','ZKEASOFT','2016-03-10 13:50:24.000','admin','ZKEASOFT','2018-08-15 15:31:38.346'),
-(3,'行业新闻',NULL,1,'industry',1,NULL,NULL,NULL,'admin','ZKEASOFT','2016-03-10 13:50:29.000','admin','ZKEASOFT','2018-08-15 15:31:42.810');
+(1,'新闻',NULL,0,'news',1,NULL,NULL,NULL,'admin','ZKEASOFT','2016-03-10 13:50:18.000','admin','ZKEASOFT','2024-11-16 13:53:08.751',NULL),
+(2,'公司新闻',NULL,1,'company',1,NULL,NULL,NULL,'admin','ZKEASOFT','2016-03-10 13:50:24.000','admin','ZKEASOFT','2018-08-15 15:31:38.346',NULL),
+(3,'行业新闻',NULL,1,'industry',1,NULL,NULL,NULL,'admin','ZKEASOFT','2016-03-10 13:50:29.000','admin','ZKEASOFT','2018-08-15 15:31:42.810',NULL);
/*!40000 ALTER TABLE `ArticleType` ENABLE KEYS */;
DROP TABLE IF EXISTS `ArticleTypeWidget`;
@@ -1342,7 +1343,7 @@ CREATE TABLE `DBVersion` (
/*!40000 ALTER TABLE `DBVersion` DISABLE KEYS */;
INSERT INTO `DBVersion` VALUES
-(1,4,0,0,0);
+(1,4,2,0,0);
/*!40000 ALTER TABLE `DBVersion` ENABLE KEYS */;
DROP TABLE IF EXISTS `EA_ActionBody`;
@@ -2059,14 +2060,15 @@ CREATE TABLE `ProductCategory` (
`LastUpdateBy` VARCHAR(50) CHARACTER SET utf8mb4 NULL,
`LastUpdateByName` VARCHAR(100) CHARACTER SET utf8mb4 NULL,
`LastUpdateDate` DATETIME NULL,
+ `DisplayOrder` INT NULL,
PRIMARY KEY (`ID`)
);
/*!40000 ALTER TABLE `ProductCategory` DISABLE KEYS */;
INSERT INTO `ProductCategory` VALUES
-(1,'产品',NULL,0,NULL,1,NULL,NULL,NULL,'admin','ZKEASOFT','2016-03-10 13:49:32.000','admin','ZKEASOFT','2017-11-17 15:10:08.193'),
-(2,'耳机',NULL,1,'headset',1,NULL,NULL,NULL,'admin','ZKEASOFT','2016-03-10 13:49:50.000','admin','ZKEASOFT','2018-08-15 15:30:59.233'),
-(3,'键盘',NULL,1,'keyboard',1,NULL,NULL,NULL,'admin','ZKEASOFT','2016-03-10 13:50:07.000','admin','ZKEASOFT','2018-08-15 15:31:08.063');
+(1,'产品',NULL,0,'products',1,NULL,NULL,NULL,'admin','ZKEASOFT','2016-03-10 13:49:32.000','admin','ZKEASOFT','2024-11-16 13:53:22.181',NULL),
+(2,'耳机',NULL,1,'headset',1,NULL,NULL,NULL,'admin','ZKEASOFT','2016-03-10 13:49:50.000','admin','ZKEASOFT','2018-08-15 15:30:59.233',NULL),
+(3,'键盘',NULL,1,'keyboard',1,NULL,NULL,NULL,'admin','ZKEASOFT','2016-03-10 13:50:07.000','admin','ZKEASOFT','2018-08-15 15:31:08.063',NULL);
/*!40000 ALTER TABLE `ProductCategory` ENABLE KEYS */;
DROP TABLE IF EXISTS `ProductCategoryTag`;
@@ -2717,7 +2719,7 @@ CREATE TABLE `Users` (
/*!40000 ALTER TABLE `Users` DISABLE KEYS */;
INSERT INTO `Users` VALUES
-('admin','8c6976e5b5410415bde908bd4dee15dfb167a9c873fc4bb8a81f6f2ab448a918',NULL,'2020-11-10 21:40:58.163','::1','~/images/head.png',0,'ZKEASOFT',1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Admin',NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,'admin','Admin','2020-11-10 21:40:58.183',1,NULL,NULL,NULL);
+('admin','8c6976e5b5410415bde908bd4dee15dfb167a9c873fc4bb8a81f6f2ab448a918',NULL,'2024-11-16 13:52:55.285','::1','~/images/head.png',0,'ZKEASOFT',1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Admin',NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,'admin','Admin','2024-11-16 13:52:55.291',1,NULL,NULL,NULL);
/*!40000 ALTER TABLE `Users` ENABLE KEYS */;
DROP TABLE IF EXISTS `Video`;
@@ -2818,6 +2820,7 @@ CREATE TABLE `VideoType` (
`LastUpdateDate` DATETIME NULL,
`ContentID` VARCHAR(100) CHARACTER SET utf8mb4 NULL,
`CultureID` INT NULL,
+ `DisplayOrder` INT NULL,
PRIMARY KEY (`ID`)
);
diff --git a/Database/SQLite/ZKEACMS.sqlite.sql b/Database/SQLite/ZKEACMS.sqlite.sql
index f9602acd..67868e9c 100644
--- a/Database/SQLite/ZKEACMS.sqlite.sql
+++ b/Database/SQLite/ZKEACMS.sqlite.sql
@@ -1,4 +1,4 @@
--- Script Date: 2024/8/17 星期六 17:21 - ErikEJ.SqlCeScripting version 3.5.2.56
+-- Script Date: 2024/11/16 星期六 13:53 - ErikEJ.SqlCeScripting version 3.5.2.56
SELECT 1;
PRAGMA foreign_keys=OFF;
BEGIN TRANSACTION;
@@ -26,6 +26,7 @@ CREATE TABLE [VideoType] (
, [LastUpdateDate] datetime NULL
, [ContentID] nvarchar(100) NULL
, [CultureID] int NULL
+, [DisplayOrder] int NULL
, CONSTRAINT [PK_VideoType] PRIMARY KEY ([ID])
);
CREATE TABLE [VideoTopWidget] (
@@ -57,7 +58,7 @@ CREATE TABLE [VideoGallery] (
, [LastUpdateBy] nvarchar(50) NULL
, [LastUpdateByName] nvarchar(100) NULL
, [LastUpdateDate] datetime NULL
-, CONSTRAINT [PK__VideoGal__3214EC27721A38EA] PRIMARY KEY ([ID])
+, CONSTRAINT [PK__VideoGal__3214EC27BDAE3D83] PRIMARY KEY ([ID])
);
CREATE TABLE [VideoDetailWidget] (
[ID] nvarchar(100) NOT NULL
@@ -147,7 +148,7 @@ CREATE TABLE [Subscription] (
, [LastUpdateBy] nvarchar(50) NULL
, [LastUpdateByName] nvarchar(100) NULL
, [LastUpdateDate] datetime NULL
-, CONSTRAINT [PK__Subscrip__3214EC277FBFE5C9] PRIMARY KEY ([ID])
+, CONSTRAINT [PK__Subscrip__3214EC271AF0E6DE] PRIMARY KEY ([ID])
);
CREATE TABLE [ShippingOption] (
[ID] INTEGER NOT NULL
@@ -164,7 +165,7 @@ CREATE TABLE [ShippingOption] (
, [LastUpdateBy] nvarchar(50) NULL
, [LastUpdateByName] nvarchar(100) NULL
, [LastUpdateDate] datetime NULL
-, CONSTRAINT [PK__Shipping__3214EC272FED184E] PRIMARY KEY ([ID])
+, CONSTRAINT [PK__Shipping__3214EC2735B1FFB6] PRIMARY KEY ([ID])
);
CREATE TABLE [SectionTemplate] (
[TemplateName] nvarchar(100) NOT NULL
@@ -235,13 +236,13 @@ CREATE TABLE [Roles] (
, [LastUpdateBy] nvarchar(50) NULL
, [LastUpdateByName] nvarchar(100) NULL
, [LastUpdateDate] datetime NULL
-, CONSTRAINT [PK__Roles__3214EC27183D866A] PRIMARY KEY ([ID])
+, CONSTRAINT [PK__Roles__3214EC27F9B81D46] PRIMARY KEY ([ID])
);
CREATE TABLE [UserRoleRelation] (
[ID] INTEGER NOT NULL
, [RoleID] int NULL
, [UserID] nvarchar(50) NULL
-, CONSTRAINT [PK__UserRole__3214EC2755551558] PRIMARY KEY ([ID])
+, CONSTRAINT [PK__UserRole__3214EC27049D9156] PRIMARY KEY ([ID])
, FOREIGN KEY ([RoleID]) REFERENCES [Roles] ([ID]) ON DELETE NO ACTION ON UPDATE NO ACTION
, FOREIGN KEY ([UserID]) REFERENCES [Users] ([UserID]) ON DELETE NO ACTION ON UPDATE NO ACTION
);
@@ -279,7 +280,7 @@ CREATE TABLE [ProductGallery] (
, [LastUpdateBy] nvarchar(50) NULL
, [LastUpdateByName] nvarchar(100) NULL
, [LastUpdateDate] datetime NULL
-, CONSTRAINT [PK__ProductG__3214EC27F991FF32] PRIMARY KEY ([ID])
+, CONSTRAINT [PK__ProductG__3214EC2703C966CF] PRIMARY KEY ([ID])
);
CREATE TABLE [ProductCategoryTag] (
[ID] INTEGER NOT NULL
@@ -312,6 +313,7 @@ CREATE TABLE [ProductCategory] (
, [LastUpdateBy] nvarchar(50) NULL
, [LastUpdateByName] nvarchar(100) NULL
, [LastUpdateDate] datetime NULL
+, [DisplayOrder] int NULL
, CONSTRAINT [PK_ProductCategory] PRIMARY KEY ([ID])
);
CREATE TABLE [Product] (
@@ -356,7 +358,7 @@ CREATE TABLE [PersistKey] (
, [CreationDate] datetime NULL
, [ActivationDate] datetime NULL
, [ExpirationDate] datetime NULL
-, CONSTRAINT [PK__PersistK__3214EC275BDC9236] PRIMARY KEY ([ID])
+, CONSTRAINT [PK__PersistK__3214EC27D0934BE2] PRIMARY KEY ([ID])
);
CREATE TABLE [Permission] (
[PermissionKey] nvarchar(100) NOT NULL
@@ -573,7 +575,7 @@ CREATE TABLE [FluidContentGroup] (
, [LastUpdateBy] nvarchar(50) NULL
, [LastUpdateByName] nvarchar(100) NULL
, [LastUpdateDate] datetime NULL
-, CONSTRAINT [PK__FluidCon__3214EC27CE0DC312] PRIMARY KEY ([ID])
+, CONSTRAINT [PK__FluidCon__3214EC279A18D662] PRIMARY KEY ([ID])
);
CREATE TABLE [ExtendField] (
[ID] INTEGER NOT NULL
@@ -644,7 +646,7 @@ CREATE TABLE [DBVersion] (
, [Minor] int NULL
, [Revision] int NULL
, [Build] int NULL
-, CONSTRAINT [PK__DBVersio__3214EC270D5D6DB7] PRIMARY KEY ([ID])
+, CONSTRAINT [PK__DBVersio__3214EC272D2580C1] PRIMARY KEY ([ID])
);
CREATE TABLE [DataDictionary] (
[ID] INTEGER NOT NULL
@@ -693,7 +695,7 @@ CREATE TABLE [Currency] (
, [LastUpdateBy] nvarchar(50) NULL
, [LastUpdateByName] nvarchar(100) NULL
, [LastUpdateDate] datetime NULL
-, CONSTRAINT [PK__Currency__3214EC27EA5C9A67] PRIMARY KEY ([ID])
+, CONSTRAINT [PK__Currency__3214EC27C4A47AC8] PRIMARY KEY ([ID])
);
CREATE TABLE [Comments] (
[ID] INTEGER NOT NULL
@@ -1101,6 +1103,7 @@ CREATE TABLE [ArticleType] (
, [LastUpdateBy] nvarchar(50) NULL
, [LastUpdateByName] nvarchar(100) NULL
, [LastUpdateDate] datetime NULL
+, [DisplayOrder] int NULL
, CONSTRAINT [PK_ArticleType] PRIMARY KEY ([ID])
);
CREATE TABLE [ArticleTopWidget] (
@@ -1143,7 +1146,7 @@ CREATE TABLE [ArticleGallery] (
, [LastUpdateBy] nvarchar(50) NULL
, [LastUpdateByName] nvarchar(100) NULL
, [LastUpdateDate] datetime NULL
-, CONSTRAINT [PK__ArticleG__3214EC27CB6C8B44] PRIMARY KEY ([ID])
+, CONSTRAINT [PK__ArticleG__3214EC2779D3DDE2] PRIMARY KEY ([ID])
);
CREATE TABLE [ArticleDetailWidget] (
[ID] nvarchar(100) NOT NULL
@@ -1190,7 +1193,7 @@ CREATE TABLE [ApplicationSetting] (
, [LastUpdateDate] datetime NULL
, CONSTRAINT [PK_ApplicationSetting] PRIMARY KEY ([SettingKey])
);
-INSERT INTO [Users] ([UserID],[PassWord],[ApiLoginToken],[LastLoginDate],[LoginIP],[PhotoUrl],[Timestamp],[UserName],[UserTypeCD],[Address],[Age],[Birthday],[Birthplace],[Email],[EnglishName],[FirstName],[Hobby],[LastName],[MaritalStatus],[MobilePhone],[NickName],[Profession],[QQ],[School],[Sex],[Telephone],[ZipCode],[CreateBy],[CreatebyName],[CreateDate],[LastUpdateBy],[LastUpdateByName],[LastUpdateDate],[Status],[Description],[ResetToken],[ResetTokenDate]) VALUES ('admin','8c6976e5b5410415bde908bd4dee15dfb167a9c873fc4bb8a81f6f2ab448a918',NULL,'2020-11-10 21:40:58.163','::1','~/images/head.png',0,'ZKEASOFT',1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Admin',NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,'admin','Admin','2020-11-10 21:40:58.183',1,NULL,NULL,NULL);
+INSERT INTO [Users] ([UserID],[PassWord],[ApiLoginToken],[LastLoginDate],[LoginIP],[PhotoUrl],[Timestamp],[UserName],[UserTypeCD],[Address],[Age],[Birthday],[Birthplace],[Email],[EnglishName],[FirstName],[Hobby],[LastName],[MaritalStatus],[MobilePhone],[NickName],[Profession],[QQ],[School],[Sex],[Telephone],[ZipCode],[CreateBy],[CreatebyName],[CreateDate],[LastUpdateBy],[LastUpdateByName],[LastUpdateDate],[Status],[Description],[ResetToken],[ResetTokenDate]) VALUES ('admin','8c6976e5b5410415bde908bd4dee15dfb167a9c873fc4bb8a81f6f2ab448a918',NULL,'2024-11-16 13:52:55.285','::1','~/images/head.png',0,'ZKEASOFT',1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,'Admin',NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,'admin','Admin','2024-11-16 13:52:55.291',1,NULL,NULL,NULL);
INSERT INTO [SectionTemplate] ([TemplateName],[Title],[Thumbnail],[ExampleData],[Status],[Description],[CreateBy],[CreatebyName],[CreateDate],[LastUpdateBy],[LastUpdateByName],[LastUpdateDate]) VALUES ('SectionTemplate.Banner','横幅广告','Thumbnail\SectionTemplate.Banner.png','Thumbnail\SectionTemplate.Banner.xml',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
INSERT INTO [SectionTemplate] ([TemplateName],[Title],[Thumbnail],[ExampleData],[Status],[Description],[CreateBy],[CreatebyName],[CreateDate],[LastUpdateBy],[LastUpdateByName],[LastUpdateDate]) VALUES ('SectionTemplate.Brand','品牌','Thumbnail\SectionTemplate.Brand.png','Thumbnail\SectionTemplate.Brand.xml',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
INSERT INTO [SectionTemplate] ([TemplateName],[Title],[Thumbnail],[ExampleData],[Status],[Description],[CreateBy],[CreatebyName],[CreateDate],[LastUpdateBy],[LastUpdateByName],[LastUpdateDate]) VALUES ('SectionTemplate.CalendarEvent','日历事件','Thumbnail\SectionTemplate.CalendarEvent.png','Thumbnail\SectionTemplate.CalendarEvent.xml',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -1316,9 +1319,9 @@ INSERT INTO [ProductCategoryTag] ([ID],[ProductCategoryId],[Title],[Description]
INSERT INTO [ProductCategoryTag] ([ID],[ProductCategoryId],[Title],[Description],[Status],[ParentId],[CreateBy],[CreatebyName],[CreateDate],[LastUpdateBy],[LastUpdateByName],[LastUpdateDate]) VALUES (5,3,'点击',NULL,NULL,4,NULL,NULL,NULL,'admin','ZKEASOFT','2017-11-17 15:12:14.870');
INSERT INTO [ProductCategoryTag] ([ID],[ProductCategoryId],[Title],[Description],[Status],[ParentId],[CreateBy],[CreatebyName],[CreateDate],[LastUpdateBy],[LastUpdateByName],[LastUpdateDate]) VALUES (6,3,'触觉',NULL,NULL,4,NULL,NULL,NULL,'admin','ZKEASOFT','2017-11-17 15:12:20.713');
INSERT INTO [ProductCategoryTag] ([ID],[ProductCategoryId],[Title],[Description],[Status],[ParentId],[CreateBy],[CreatebyName],[CreateDate],[LastUpdateBy],[LastUpdateByName],[LastUpdateDate]) VALUES (7,3,'线性',NULL,NULL,4,NULL,NULL,NULL,'admin','ZKEASOFT','2017-11-17 15:12:28.660');
-INSERT INTO [ProductCategory] ([ID],[Title],[Description],[ParentID],[Url],[Status],[SEOTitle],[SEOKeyWord],[SEODescription],[CreateBy],[CreatebyName],[CreateDate],[LastUpdateBy],[LastUpdateByName],[LastUpdateDate]) VALUES (1,'产品',NULL,0,NULL,1,NULL,NULL,NULL,'admin','ZKEASOFT','2016-03-10 13:49:32.000','admin','ZKEASOFT','2017-11-17 15:10:08.193');
-INSERT INTO [ProductCategory] ([ID],[Title],[Description],[ParentID],[Url],[Status],[SEOTitle],[SEOKeyWord],[SEODescription],[CreateBy],[CreatebyName],[CreateDate],[LastUpdateBy],[LastUpdateByName],[LastUpdateDate]) VALUES (2,'耳机',NULL,1,'headset',1,NULL,NULL,NULL,'admin','ZKEASOFT','2016-03-10 13:49:50.000','admin','ZKEASOFT','2018-08-15 15:30:59.233');
-INSERT INTO [ProductCategory] ([ID],[Title],[Description],[ParentID],[Url],[Status],[SEOTitle],[SEOKeyWord],[SEODescription],[CreateBy],[CreatebyName],[CreateDate],[LastUpdateBy],[LastUpdateByName],[LastUpdateDate]) VALUES (3,'键盘',NULL,1,'keyboard',1,NULL,NULL,NULL,'admin','ZKEASOFT','2016-03-10 13:50:07.000','admin','ZKEASOFT','2018-08-15 15:31:08.063');
+INSERT INTO [ProductCategory] ([ID],[Title],[Description],[ParentID],[Url],[Status],[SEOTitle],[SEOKeyWord],[SEODescription],[CreateBy],[CreatebyName],[CreateDate],[LastUpdateBy],[LastUpdateByName],[LastUpdateDate],[DisplayOrder]) VALUES (1,'产品',NULL,0,'products',1,NULL,NULL,NULL,'admin','ZKEASOFT','2016-03-10 13:49:32.000','admin','ZKEASOFT','2024-11-16 13:53:22.181',NULL);
+INSERT INTO [ProductCategory] ([ID],[Title],[Description],[ParentID],[Url],[Status],[SEOTitle],[SEOKeyWord],[SEODescription],[CreateBy],[CreatebyName],[CreateDate],[LastUpdateBy],[LastUpdateByName],[LastUpdateDate],[DisplayOrder]) VALUES (2,'耳机',NULL,1,'headset',1,NULL,NULL,NULL,'admin','ZKEASOFT','2016-03-10 13:49:50.000','admin','ZKEASOFT','2018-08-15 15:30:59.233',NULL);
+INSERT INTO [ProductCategory] ([ID],[Title],[Description],[ParentID],[Url],[Status],[SEOTitle],[SEOKeyWord],[SEODescription],[CreateBy],[CreatebyName],[CreateDate],[LastUpdateBy],[LastUpdateByName],[LastUpdateDate],[DisplayOrder]) VALUES (3,'键盘',NULL,1,'keyboard',1,NULL,NULL,NULL,'admin','ZKEASOFT','2016-03-10 13:50:07.000','admin','ZKEASOFT','2018-08-15 15:31:08.063',NULL);
INSERT INTO [Product] ([ID],[Title],[ImageUrl],[ImageThumbUrl],[BrandCD],[ProductCategoryID],[Color],[Price],[RebatePrice],[PurchasePrice],[Norm],[ShelfLife],[ProductContent],[Description],[IsPublish],[PublishDate],[Status],[SEOTitle],[SEOKeyWord],[SEODescription],[OrderIndex],[SourceFrom],[Url],[TargetFrom],[TargetUrl],[PartNumber],[CreateBy],[CreatebyName],[CreateDate],[LastUpdateBy],[LastUpdateByName],[LastUpdateDate]) VALUES (1,'Cloud Revolver 游戏耳机','/images/6006218/56657656-33810b00-66cb-11e9-8acc-1f2f5da6c48a.png','/images/6006218/56657656-33810b00-66cb-11e9-8acc-1f2f5da6c48a.png',NULL,2,NULL,500.0000,399.0000,NULL,NULL,NULL,'HyperX Cloud Revolver
如果您热爱游戏，那么一款可为您带来极大优势的耳机就是必不可少的装备。HyperX Cloud Revolver™ 是一款优质耳机，工艺精湛，可充分满足高级OC或家用机游戏玩家的需求。新一代驱动器可将低音、中音和高音明确区分开来，形成精准定位的优质音效。Revolver 系列具备立体声和即插即用的 Dolby® 7.1 环绕立体声模式，可提供工作室级别的音场和新一代驱动器，在 FPS 和开放式环境下表现优异。两款耳机均采用结实耐用的实心钢质框架和标志性的 HyperX 记忆海绵，带来屡获殊荣的舒适度。如果您希望拥有无与伦比的舒适度、绝佳的音质和清晰顺畅的沟通，Cloud Revolver 耳机将是您的不二之选。
即插即用 Dolby® 环绕立体声 7.1
@@ -1519,7 +1522,7 @@ INSERT INTO [EA_ActionBody] ([ID],[Body],[Title],[Description],[Status],[CreateB
','自定义表单邮件模板',NULL,1,'admin','ZKEASOFT','2023-03-11 22:06:21.000','admin','ZKEASOFT','2023-03-16 22:03:40.576');
-INSERT INTO [DBVersion] ([ID],[Major],[Minor],[Revision],[Build]) VALUES (1,4,0,0,0);
+INSERT INTO [DBVersion] ([ID],[Major],[Minor],[Revision],[Build]) VALUES (1,4,2,0,0);
INSERT INTO [DataDictionary] ([ID],[DicName],[Title],[DicValue],[Order],[Pid],[IsSystem],[ImageUrl],[ImageThumbUrl],[Description],[Status],[CreateBy],[CreatebyName],[CreateDate],[LastUpdateBy],[LastUpdateByName],[LastUpdateDate]) VALUES (1,'RecordStatus','Active','1',1,0,1,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL);
INSERT INTO [DataDictionary] ([ID],[DicName],[Title],[DicValue],[Order],[Pid],[IsSystem],[ImageUrl],[ImageThumbUrl],[Description],[Status],[CreateBy],[CreatebyName],[CreateDate],[LastUpdateBy],[LastUpdateByName],[LastUpdateDate]) VALUES (2,'RecordStatus','Inactive','2',2,0,1,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL);
INSERT INTO [DataDictionary] ([ID],[DicName],[Title],[DicValue],[Order],[Pid],[IsSystem],[ImageUrl],[ImageThumbUrl],[Description],[Status],[CreateBy],[CreatebyName],[CreateDate],[LastUpdateBy],[LastUpdateByName],[LastUpdateDate]) VALUES (3,'ArticleCategory','News','1',1,0,1,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -2324,9 +2327,9 @@ INSERT INTO [CarouselItem] ([ID],[Title],[CarouselID],[CarouselWidgetID],[Target
INSERT INTO [CarouselItem] ([ID],[Title],[CarouselID],[CarouselWidgetID],[TargetLink],[ImageUrl],[Description],[Status],[CreateBy],[CreatebyName],[CreateDate],[LastUpdateBy],[LastUpdateByName],[LastUpdateDate]) VALUES (3,'图3',1,NULL,'http://www.zkea.net/zkeacms/donate','~/images/bg3.jpg',NULL,1,'admin','ZKEASOFT','2016-03-27 15:14:17.573','admin','ZKEASOFT','2016-03-27 15:17:54.433');
INSERT INTO [ArticleTypeWidget] ([ID],[ArticleTypeID],[TargetPage]) VALUES ('8df64186d2fd4d63a9f9bb3b6e34cd2a',1,NULL);
INSERT INTO [ArticleTypeWidget] ([ID],[ArticleTypeID],[TargetPage]) VALUES ('de8d94fd51cb4e73b00518dbb2f134d3',1,NULL);
-INSERT INTO [ArticleType] ([ID],[Title],[Description],[ParentID],[Url],[Status],[SEOTitle],[SEOKeyWord],[SEODescription],[CreateBy],[CreatebyName],[CreateDate],[LastUpdateBy],[LastUpdateByName],[LastUpdateDate]) VALUES (1,'新闻',NULL,0,NULL,1,NULL,NULL,NULL,'admin','ZKEASOFT','2016-03-10 13:50:18.000','admin','ZKEASOFT','2017-10-15 18:18:33.430');
-INSERT INTO [ArticleType] ([ID],[Title],[Description],[ParentID],[Url],[Status],[SEOTitle],[SEOKeyWord],[SEODescription],[CreateBy],[CreatebyName],[CreateDate],[LastUpdateBy],[LastUpdateByName],[LastUpdateDate]) VALUES (2,'公司新闻',NULL,1,'company',1,NULL,NULL,NULL,'admin','ZKEASOFT','2016-03-10 13:50:24.000','admin','ZKEASOFT','2018-08-15 15:31:38.346');
-INSERT INTO [ArticleType] ([ID],[Title],[Description],[ParentID],[Url],[Status],[SEOTitle],[SEOKeyWord],[SEODescription],[CreateBy],[CreatebyName],[CreateDate],[LastUpdateBy],[LastUpdateByName],[LastUpdateDate]) VALUES (3,'行业新闻',NULL,1,'industry',1,NULL,NULL,NULL,'admin','ZKEASOFT','2016-03-10 13:50:29.000','admin','ZKEASOFT','2018-08-15 15:31:42.810');
+INSERT INTO [ArticleType] ([ID],[Title],[Description],[ParentID],[Url],[Status],[SEOTitle],[SEOKeyWord],[SEODescription],[CreateBy],[CreatebyName],[CreateDate],[LastUpdateBy],[LastUpdateByName],[LastUpdateDate],[DisplayOrder]) VALUES (1,'新闻',NULL,0,'news',1,NULL,NULL,NULL,'admin','ZKEASOFT','2016-03-10 13:50:18.000','admin','ZKEASOFT','2024-11-16 13:53:08.751',NULL);
+INSERT INTO [ArticleType] ([ID],[Title],[Description],[ParentID],[Url],[Status],[SEOTitle],[SEOKeyWord],[SEODescription],[CreateBy],[CreatebyName],[CreateDate],[LastUpdateBy],[LastUpdateByName],[LastUpdateDate],[DisplayOrder]) VALUES (2,'公司新闻',NULL,1,'company',1,NULL,NULL,NULL,'admin','ZKEASOFT','2016-03-10 13:50:24.000','admin','ZKEASOFT','2018-08-15 15:31:38.346',NULL);
+INSERT INTO [ArticleType] ([ID],[Title],[Description],[ParentID],[Url],[Status],[SEOTitle],[SEOKeyWord],[SEODescription],[CreateBy],[CreatebyName],[CreateDate],[LastUpdateBy],[LastUpdateByName],[LastUpdateDate],[DisplayOrder]) VALUES (3,'行业新闻',NULL,1,'industry',1,NULL,NULL,NULL,'admin','ZKEASOFT','2016-03-10 13:50:29.000','admin','ZKEASOFT','2018-08-15 15:31:42.810',NULL);
INSERT INTO [ArticleSummaryWidget] ([ID],[SubTitle],[Style],[DetailLink],[Summary]) VALUES ('8c5b69f614b641c0a5f7a8e318de8df3','ZKEACMS 简介','bs-callout-default','https://github.com/SeriaWei/ZKEACMS.Core','ZKEACMS Core 是基于.Net Core开发的开源CMS，在您开始使用之前，为了保障您的权益，请先查看我们的开源协议http://www.zkea.net/licenses。
ZKEACMS是一个内容管理软件，ZKEACMS的主旨在于快速创建页面和自定义页面内容。无论您是专业的开发人员还是普通的用户，都可以快速上手使用ZKEACMS。
ZKEACMS使用可视化编辑设计，所见即所得，可直接在页面上设计你要的页面。
diff --git a/Database/script.sql b/Database/script.sql
index 1c4e816f..d3436fc3 100644
--- a/Database/script.sql
+++ b/Database/script.sql
@@ -127,7 +127,8 @@ CREATE TABLE [dbo].[ArticleType](
[CreateDate] [datetime2](7) NULL,
[LastUpdateBy] [nvarchar](50) NULL,
[LastUpdateByName] [nvarchar](100) NULL,
- [LastUpdateDate] [datetime2](7) NULL
+ [LastUpdateDate] [datetime2](7) NULL,
+ [DisplayOrder] [int] NULL
) ON [PRIMARY]
GO
SET ANSI_NULLS ON
@@ -989,7 +990,8 @@ CREATE TABLE [dbo].[ProductCategory](
[CreateDate] [datetime2](7) NULL,
[LastUpdateBy] [nvarchar](50) NULL,
[LastUpdateByName] [nvarchar](100) NULL,
- [LastUpdateDate] [datetime2](7) NULL
+ [LastUpdateDate] [datetime2](7) NULL,
+ [DisplayOrder] [int] NULL
) ON [PRIMARY]
GO
SET ANSI_NULLS ON
@@ -1456,7 +1458,8 @@ CREATE TABLE [dbo].[VideoType](
[LastUpdateByName] [nvarchar](100) NULL,
[LastUpdateDate] [datetime2](7) NULL,
[ContentID] [nvarchar](100) NULL,
- [CultureID] [int] NULL
+ [CultureID] [int] NULL,
+ [DisplayOrder] [int] NULL
) ON [PRIMARY]
GO
SET ANSI_NULLS ON
@@ -2065,9 +2068,9 @@ INSERT [dbo].[ArticleSummaryWidget] ([ID], [SubTitle], [Style], [DetailLink], [S
')
SET IDENTITY_INSERT [dbo].[ArticleType] ON
-INSERT [dbo].[ArticleType] ([ID], [Title], [Description], [ParentID], [Url], [Status], [SEOTitle], [SEOKeyWord], [SEODescription], [CreateBy], [CreatebyName], [CreateDate], [LastUpdateBy], [LastUpdateByName], [LastUpdateDate]) VALUES (1, N'新闻', NULL, 0, NULL, 1, NULL, NULL, NULL, N'admin', N'ZKEASOFT', CAST(N'2016-03-10T13:50:18.0000000' AS DateTime2), N'admin', N'ZKEASOFT', CAST(N'2017-10-15T18:18:33.4300000' AS DateTime2))
-INSERT [dbo].[ArticleType] ([ID], [Title], [Description], [ParentID], [Url], [Status], [SEOTitle], [SEOKeyWord], [SEODescription], [CreateBy], [CreatebyName], [CreateDate], [LastUpdateBy], [LastUpdateByName], [LastUpdateDate]) VALUES (2, N'公司新闻', NULL, 1, N'company', 1, NULL, NULL, NULL, N'admin', N'ZKEASOFT', CAST(N'2016-03-10T13:50:24.0000000' AS DateTime2), N'admin', N'ZKEASOFT', CAST(N'2018-08-15T15:31:38.3466667' AS DateTime2))
-INSERT [dbo].[ArticleType] ([ID], [Title], [Description], [ParentID], [Url], [Status], [SEOTitle], [SEOKeyWord], [SEODescription], [CreateBy], [CreatebyName], [CreateDate], [LastUpdateBy], [LastUpdateByName], [LastUpdateDate]) VALUES (3, N'行业新闻', NULL, 1, N'industry', 1, NULL, NULL, NULL, N'admin', N'ZKEASOFT', CAST(N'2016-03-10T13:50:29.0000000' AS DateTime2), N'admin', N'ZKEASOFT', CAST(N'2018-08-15T15:31:42.8100000' AS DateTime2))
+INSERT [dbo].[ArticleType] ([ID], [Title], [Description], [ParentID], [Url], [Status], [SEOTitle], [SEOKeyWord], [SEODescription], [CreateBy], [CreatebyName], [CreateDate], [LastUpdateBy], [LastUpdateByName], [LastUpdateDate], [DisplayOrder]) VALUES (1, N'新闻', NULL, 0, N'news', 1, NULL, NULL, NULL, N'admin', N'ZKEASOFT', CAST(N'2016-03-10T13:50:18.0000000' AS DateTime2), N'admin', N'ZKEASOFT', CAST(N'2024-11-16T13:53:08.7514733' AS DateTime2), NULL)
+INSERT [dbo].[ArticleType] ([ID], [Title], [Description], [ParentID], [Url], [Status], [SEOTitle], [SEOKeyWord], [SEODescription], [CreateBy], [CreatebyName], [CreateDate], [LastUpdateBy], [LastUpdateByName], [LastUpdateDate], [DisplayOrder]) VALUES (2, N'公司新闻', NULL, 1, N'company', 1, NULL, NULL, NULL, N'admin', N'ZKEASOFT', CAST(N'2016-03-10T13:50:24.0000000' AS DateTime2), N'admin', N'ZKEASOFT', CAST(N'2018-08-15T15:31:38.3466667' AS DateTime2), NULL)
+INSERT [dbo].[ArticleType] ([ID], [Title], [Description], [ParentID], [Url], [Status], [SEOTitle], [SEOKeyWord], [SEODescription], [CreateBy], [CreatebyName], [CreateDate], [LastUpdateBy], [LastUpdateByName], [LastUpdateDate], [DisplayOrder]) VALUES (3, N'行业新闻', NULL, 1, N'industry', 1, NULL, NULL, NULL, N'admin', N'ZKEASOFT', CAST(N'2016-03-10T13:50:29.0000000' AS DateTime2), N'admin', N'ZKEASOFT', CAST(N'2018-08-15T15:31:42.8100000' AS DateTime2), NULL)
SET IDENTITY_INSERT [dbo].[ArticleType] OFF
INSERT [dbo].[ArticleTypeWidget] ([ID], [ArticleTypeID], [TargetPage]) VALUES (N'8df64186d2fd4d63a9f9bb3b6e34cd2a', 1, NULL)
INSERT [dbo].[ArticleTypeWidget] ([ID], [ArticleTypeID], [TargetPage]) VALUES (N'de8d94fd51cb4e73b00518dbb2f134d3', 1, NULL)
@@ -2738,7 +2741,7 @@ INSERT [dbo].[DataDictionary] ([ID], [DicName], [Title], [DicValue], [Order], [P
SET IDENTITY_INSERT [dbo].[DataDictionary] OFF
SET IDENTITY_INSERT [dbo].[DBVersion] ON
-INSERT [dbo].[DBVersion] ([ID], [Major], [Minor], [Revision], [Build]) VALUES (1, 4, 0, 0, 0)
+INSERT [dbo].[DBVersion] ([ID], [Major], [Minor], [Revision], [Build]) VALUES (1, 4, 2, 0, 0)
SET IDENTITY_INSERT [dbo].[DBVersion] OFF
SET IDENTITY_INSERT [dbo].[EA_ActionBody] ON
@@ -2999,9 +3002,9 @@ INSERT [dbo].[Product] ([ID], [Title], [ImageUrl], [ImageThumbUrl], [BrandCD], [
SET IDENTITY_INSERT [dbo].[Product] OFF
SET IDENTITY_INSERT [dbo].[ProductCategory] ON
-INSERT [dbo].[ProductCategory] ([ID], [Title], [Description], [ParentID], [Url], [Status], [SEOTitle], [SEOKeyWord], [SEODescription], [CreateBy], [CreatebyName], [CreateDate], [LastUpdateBy], [LastUpdateByName], [LastUpdateDate]) VALUES (1, N'产品', NULL, 0, NULL, 1, NULL, NULL, NULL, N'admin', N'ZKEASOFT', CAST(N'2016-03-10T13:49:32.0000000' AS DateTime2), N'admin', N'ZKEASOFT', CAST(N'2017-11-17T15:10:08.1933333' AS DateTime2))
-INSERT [dbo].[ProductCategory] ([ID], [Title], [Description], [ParentID], [Url], [Status], [SEOTitle], [SEOKeyWord], [SEODescription], [CreateBy], [CreatebyName], [CreateDate], [LastUpdateBy], [LastUpdateByName], [LastUpdateDate]) VALUES (2, N'耳机', NULL, 1, N'headset', 1, NULL, NULL, NULL, N'admin', N'ZKEASOFT', CAST(N'2016-03-10T13:49:50.0000000' AS DateTime2), N'admin', N'ZKEASOFT', CAST(N'2018-08-15T15:30:59.2333333' AS DateTime2))
-INSERT [dbo].[ProductCategory] ([ID], [Title], [Description], [ParentID], [Url], [Status], [SEOTitle], [SEOKeyWord], [SEODescription], [CreateBy], [CreatebyName], [CreateDate], [LastUpdateBy], [LastUpdateByName], [LastUpdateDate]) VALUES (3, N'键盘', NULL, 1, N'keyboard', 1, NULL, NULL, NULL, N'admin', N'ZKEASOFT', CAST(N'2016-03-10T13:50:07.0000000' AS DateTime2), N'admin', N'ZKEASOFT', CAST(N'2018-08-15T15:31:08.0633333' AS DateTime2))
+INSERT [dbo].[ProductCategory] ([ID], [Title], [Description], [ParentID], [Url], [Status], [SEOTitle], [SEOKeyWord], [SEODescription], [CreateBy], [CreatebyName], [CreateDate], [LastUpdateBy], [LastUpdateByName], [LastUpdateDate], [DisplayOrder]) VALUES (1, N'产品', NULL, 0, N'products', 1, NULL, NULL, NULL, N'admin', N'ZKEASOFT', CAST(N'2016-03-10T13:49:32.0000000' AS DateTime2), N'admin', N'ZKEASOFT', CAST(N'2024-11-16T13:53:22.1816480' AS DateTime2), NULL)
+INSERT [dbo].[ProductCategory] ([ID], [Title], [Description], [ParentID], [Url], [Status], [SEOTitle], [SEOKeyWord], [SEODescription], [CreateBy], [CreatebyName], [CreateDate], [LastUpdateBy], [LastUpdateByName], [LastUpdateDate], [DisplayOrder]) VALUES (2, N'耳机', NULL, 1, N'headset', 1, NULL, NULL, NULL, N'admin', N'ZKEASOFT', CAST(N'2016-03-10T13:49:50.0000000' AS DateTime2), N'admin', N'ZKEASOFT', CAST(N'2018-08-15T15:30:59.2333333' AS DateTime2), NULL)
+INSERT [dbo].[ProductCategory] ([ID], [Title], [Description], [ParentID], [Url], [Status], [SEOTitle], [SEOKeyWord], [SEODescription], [CreateBy], [CreatebyName], [CreateDate], [LastUpdateBy], [LastUpdateByName], [LastUpdateDate], [DisplayOrder]) VALUES (3, N'键盘', NULL, 1, N'keyboard', 1, NULL, NULL, NULL, N'admin', N'ZKEASOFT', CAST(N'2016-03-10T13:50:07.0000000' AS DateTime2), N'admin', N'ZKEASOFT', CAST(N'2018-08-15T15:31:08.0633333' AS DateTime2), NULL)
SET IDENTITY_INSERT [dbo].[ProductCategory] OFF
SET IDENTITY_INSERT [dbo].[ProductCategoryTag] ON
@@ -3259,7 +3262,7 @@ SET IDENTITY_INSERT [dbo].[UserRoleRelation] ON
INSERT [dbo].[UserRoleRelation] ([ID], [RoleID], [UserID]) VALUES (5, 1, N'admin')
SET IDENTITY_INSERT [dbo].[UserRoleRelation] OFF
-INSERT [dbo].[Users] ([UserID], [PassWord], [ApiLoginToken], [LastLoginDate], [LoginIP], [PhotoUrl], [Timestamp], [UserName], [UserTypeCD], [Address], [Age], [Birthday], [Birthplace], [Email], [EnglishName], [FirstName], [Hobby], [LastName], [MaritalStatus], [MobilePhone], [NickName], [Profession], [QQ], [School], [Sex], [Telephone], [ZipCode], [CreateBy], [CreatebyName], [CreateDate], [LastUpdateBy], [LastUpdateByName], [LastUpdateDate], [Status], [Description], [ResetToken], [ResetTokenDate]) VALUES (N'admin', N'8c6976e5b5410415bde908bd4dee15dfb167a9c873fc4bb8a81f6f2ab448a918', NULL, CAST(N'2020-11-10T21:40:58.1633333' AS DateTime2), N'::1', N'~/images/head.png', 0, N'ZKEASOFT', 1, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, N'Admin', NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, N'admin', N'Admin', CAST(N'2020-11-10T21:40:58.1833333' AS DateTime2), 1, NULL, NULL, NULL)
+INSERT [dbo].[Users] ([UserID], [PassWord], [ApiLoginToken], [LastLoginDate], [LoginIP], [PhotoUrl], [Timestamp], [UserName], [UserTypeCD], [Address], [Age], [Birthday], [Birthplace], [Email], [EnglishName], [FirstName], [Hobby], [LastName], [MaritalStatus], [MobilePhone], [NickName], [Profession], [QQ], [School], [Sex], [Telephone], [ZipCode], [CreateBy], [CreatebyName], [CreateDate], [LastUpdateBy], [LastUpdateByName], [LastUpdateDate], [Status], [Description], [ResetToken], [ResetTokenDate]) VALUES (N'admin', N'8c6976e5b5410415bde908bd4dee15dfb167a9c873fc4bb8a81f6f2ab448a918', NULL, CAST(N'2024-11-16T13:52:55.2852196' AS DateTime2), N'::1', N'~/images/head.png', 0, N'ZKEASOFT', 1, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, N'Admin', NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, N'admin', N'Admin', CAST(N'2024-11-16T13:52:55.2913529' AS DateTime2), 1, NULL, NULL, NULL)
ALTER TABLE [dbo].[CMS_WidgetBase] ADD CONSTRAINT [DF_CMS_WidgetBase_IsTemplate] DEFAULT ((0)) FOR [IsTemplate]
GO
ALTER TABLE [dbo].[CMS_WidgetBase] ADD CONSTRAINT [DF_CMS_WidgetBase_IsSystem] DEFAULT ((0)) FOR [IsSystem]
diff --git a/src/ZKEACMS.Article/Service/ArticleTypeWidgetService.cs b/src/ZKEACMS.Article/Service/ArticleTypeWidgetService.cs
index ba7e594e..ff93c844 100644
--- a/src/ZKEACMS.Article/Service/ArticleTypeWidgetService.cs
+++ b/src/ZKEACMS.Article/Service/ArticleTypeWidgetService.cs
@@ -15,6 +15,7 @@
using System.Collections.Concurrent;
using Easy.Cache;
using Microsoft.Extensions.Caching.Memory;
+using Easy.Constant;
namespace ZKEACMS.Article.Service
{
@@ -55,7 +56,7 @@ public override void DeleteWidget(string widgetId)
public override object Display(WidgetDisplayContext widgetDisplayContext)
{
ArticleTypeWidget currentWidget = widgetDisplayContext.Widget as ArticleTypeWidget;
- var types = _articleTypeService.Get(m => m.ParentID == currentWidget.ArticleTypeID);
+ var types = _articleTypeService.Get().Where(m => m.Status==(int)RecordStatus.Active && m.ParentID == currentWidget.ArticleTypeID).OrderBy(m => m.DisplayOrder ?? m.ID).ToList();
var actionContext = widgetDisplayContext.ActionContext;
int ac = actionContext.RouteData.GetCategory();
ArticleType articleType = null;
diff --git a/src/ZKEACMS.Product/Service/ProductCategoryWidgetService.cs b/src/ZKEACMS.Product/Service/ProductCategoryWidgetService.cs
index 66cafbea..39b33792 100644
--- a/src/ZKEACMS.Product/Service/ProductCategoryWidgetService.cs
+++ b/src/ZKEACMS.Product/Service/ProductCategoryWidgetService.cs
@@ -76,7 +76,7 @@ public override object Display(WidgetDisplayContext widgetDisplayContext)
return new ProductCategoryWidgetViewModel
{
Widget = currentWidget,
- Categorys = _productCategoryService.Get(m => m.Status == (int)RecordStatus.Active && m.ParentID == currentWidget.ProductCategoryID),
+ Categorys = _productCategoryService.Get().Where(m => m.Status == (int)RecordStatus.Active && m.ParentID == currentWidget.ProductCategoryID).OrderBy(m => m.DisplayOrder ?? m.ID).ToList(),
CurrentCategory = cate
};
}
diff --git a/src/ZKEACMS/ZKEACMS.csproj b/src/ZKEACMS/ZKEACMS.csproj
index bcadc9f6..b21c1ec4 100644
--- a/src/ZKEACMS/ZKEACMS.csproj
+++ b/src/ZKEACMS/ZKEACMS.csproj
@@ -10,8 +10,8 @@
git
CMS
深圳市纸壳软件有限公司 ZKEASOFT
- 4.1
- 4.1
+ 4.2
+ 4.2
DEBUG;TRACE