Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@SeriaWei
SeriaWei committed Oct 6, 2022
2 parents 929c4cb + da029be commit ce15a37
Show file tree
Hide file tree
Showing 72 changed files with 1,713 additions and 1,327 deletions.
158 changes: 87 additions & 71 deletions Database/MySql/Dump.sql
View file
Expand Up @@ -1339,7 +1339,7 @@ CREATE TABLE `DBVersion` (

/*!40000 ALTER TABLE `DBVersion` DISABLE KEYS */;
INSERT INTO `DBVersion` VALUES
(1,3,5,5,0);
(1,3,6,0,0);
/*!40000 ALTER TABLE `DBVersion` ENABLE KEYS */;

DROP TABLE IF EXISTS `ExtendField`;
Expand Down Expand Up @@ -5021,107 +5021,107 @@ INSERT INTO `Language` VALUES
('ZoneEntity@Title','zh-CN','标题','ZoneEntity','EntityProperty'),
('ZoneEntity@ZoneName','zh-CN','ZoneName','ZoneEntity','EntityProperty'),
('ZoneID','zh-CN','区域',NULL,NULL),
('中等屏幕','zh-CN','MD Screen',NULL,NULL),
('主题管理','en-GB','Theme',NULL,NULL),
('主题管理','en-US','Theme',NULL,NULL),
('安全退出','en-GB','Sign out',NULL,NULL),
('安全退出','en-US','Sign out',NULL,NULL),
('保存修改','en-GB','Save',NULL,NULL),
('保存修改','en-US','Save',NULL,NULL),
('产品展示','en-GB','Product',NULL,NULL),
('产品展示','en-US','Product',NULL,NULL),
('登录','en-GB','Sign In',NULL,NULL),
('登录','en-US','Sign In',NULL,NULL),
('登录邮箱不能为空','en-GB','Please input your email address',NULL,NULL),
('登录邮箱不能为空','en-US','Please input your email address',NULL,NULL),
('分隔符','en-GB','Separator',NULL,NULL),
('分隔符','en-US','Separator',NULL,NULL),
('工具栏','en-GB','Toolbar',NULL,NULL),
('工具栏','en-US','Toolbar',NULL,NULL),
('间距','en-GB','Gap',NULL,NULL),
('间距','en-US','Gap',NULL,NULL),
('巨幕','en-GB','Jumbotron',NULL,NULL),
('巨幕','en-US','Jumbotron',NULL,NULL),
('密码不能为空','en-GB','Please input your password',NULL,NULL),
('密码不能为空','en-US','Please input your password',NULL,NULL),
('密码的长度应小于20','en-GB','The length of the password should be less than 20',NULL,NULL),
('密码的长度应小于20','en-US','The length of the password should be less than 20',NULL,NULL),
('模板代码','en-GB','Code',NULL,NULL),
('模板代码','en-US','Code',NULL,NULL),
('配置保存成功，但清空缓存时发生异常，请重试！','zh-CN','配置保存成功，但清空缓存时发生异常，请重试！',NULL,NULL),
('配置通知邮箱','en-GB','Notification',NULL,NULL),
('配置通知邮箱','en-US','Notification',NULL,NULL),
('请确认密码','en-GB','Please confirm your password',NULL,NULL),
('请确认密码','en-US','Please confirm your password',NULL,NULL),
('全局内容','en-GB','Layer',NULL,NULL),
('全局内容','en-US','Layer',NULL,NULL),
('商业授权','en-GB','Commercial',NULL,NULL),
('商业授权','en-US','Commercial',NULL,NULL),
('使用QQ登录','en-GB','Sign in with QQ',NULL,NULL),
('使用QQ登录','en-US','Sign in with QQ',NULL,NULL),
('使用帮助','en-GB','Help',NULL,NULL),
('使用帮助','en-US','Help',NULL,NULL),
('使用微博登录','en-GB','Sign in with weibo',NULL,NULL),
('使用微博登录','en-US','Sign in with weibo',NULL,NULL),
('保存修改','en-GB','Save',NULL,NULL),
('保存修改','en-US','Save',NULL,NULL),
('全局内容','en-GB','Layer',NULL,NULL),
('全局内容','en-US','Layer',NULL,NULL),
('分隔符','en-GB','Separator',NULL,NULL),
('分隔符','en-US','Separator',NULL,NULL),
('商业授权','en-GB','Commercial',NULL,NULL),
('商业授权','en-US','Commercial',NULL,NULL),
('图例三','en-GB','Image Caption',NULL,NULL),
('图例三','en-US','Image Caption',NULL,NULL),
('图例三（圆）','en-GB','Image Caption',NULL,NULL),
('图例三（圆）','en-US','Image Caption',NULL,NULL),
('输入的邮件格式不正确','en-GB','The email you entered is not formatted correctly',NULL,NULL),
('输入的邮件格式不正确','en-US','The email you entered is not formatted correctly',NULL,NULL),
('输入的邮箱格式不正确','en-GB','The email you entered is not formatted correctly',NULL,NULL),
('输入的邮箱格式不正确','en-US','The email you entered is not formatted correctly',NULL,NULL),
('输入您的密码','en-GB','Enter your password',NULL,NULL),
('输入您的密码','en-US','Enter your password',NULL,NULL),
('输入您注册时使用的邮箱地址','en-GB','Enter your email address',NULL,NULL),
('输入您注册时使用的邮箱地址','en-US','Enter your email address',NULL,NULL),
('说明文档','en-GB','Document',NULL,NULL),
('说明文档','en-US','Document',NULL,NULL),
('图例二','en-GB','Image Caption',NULL,NULL),
('图例二','en-US','Image Caption',NULL,NULL),
('图例二（圆）','en-GB','Image Caption',NULL,NULL),
('图例二（圆）','en-US','Image Caption',NULL,NULL),
('图例三','en-GB','Image Caption',NULL,NULL),
('图例三','en-US','Image Caption',NULL,NULL),
('图例三（圆）','en-GB','Image Caption',NULL,NULL),
('图例三（圆）','en-US','Image Caption',NULL,NULL),
('图片右','en-GB','Image Right',NULL,NULL),
('图片右','en-US','Image Right',NULL,NULL),
('图片右（圆）','en-GB','Image Right',NULL,NULL),
('图片右（圆）','en-US','Image Right',NULL,NULL),
('图片左','en-GB','Image Left',NULL,NULL),
('图片左','en-US','Image Left',NULL,NULL),
('图片左（圆）','en-GB','Image Left',NULL,NULL),
('图片左（圆）','en-US','Image Left',NULL,NULL),
('图片左（平分）','en-GB','Image Left',NULL,NULL),
('图片左（平分）','en-US','Image Left',NULL,NULL),
('图片左（圆）','en-GB','Image Left',NULL,NULL),
('图片左（圆）','en-US','Image Left',NULL,NULL),
('退出登录','en-GB','Sign Out',NULL,NULL),
('退出登录','en-US','Sign Out',NULL,NULL),
('文字二列','en-GB','Tow Column Text',NULL,NULL),
('文字二列','en-US','Tow Column Text',NULL,NULL),
('文字三列','en-GB','Three Column Text',NULL,NULL),
('文字三列','en-US','Three Column Text',NULL,NULL),
('姓名不能为空','en-GB','Username is required',NULL,NULL),
('姓名不能为空','en-US','Username is required',NULL,NULL),
('姓名的长度应小于50','en-GB','The length of the name should be less than 50',NULL,NULL),
('姓名的长度应小于50','en-US','The length of the name should be less than 50',NULL,NULL),
('字段名','en-GB','Display Name',NULL,NULL),
('字段名','en-US','Display Name',NULL,NULL),
('安全退出','en-GB','Sign out',NULL,NULL),
('安全退出','en-US','Sign out',NULL,NULL),
('密码不能为空','en-GB','Please input your password',NULL,NULL),
('密码不能为空','en-US','Please input your password',NULL,NULL),
('密码的长度应小于20','en-GB','The length of the password should be less than 20',NULL,NULL),
('密码的长度应小于20','en-US','The length of the password should be less than 20',NULL,NULL),
('须要处理','zh-CN','须要处理',NULL,NULL),
('选择类别，进行手动排序','en-GB','Click category to sort the products',NULL,NULL),
('选择类别，进行手动排序','en-US','Click category to sort the products',NULL,NULL),
('选中产品类别，创建标签','en-GB','Click product category then add tag',NULL,NULL),
('选中产品类别，创建标签','en-US','Click product category then add tag',NULL,NULL),
('页头','en-GB','Header',NULL,NULL),
('页头','en-US','Header',NULL,NULL),
('用户名','en-GB','User Name',NULL,NULL),
('用户名','en-US','User Name',NULL,NULL),
('邮箱的长度应小于200','en-GB','The length of the email should be less than 200',NULL,NULL),
('邮箱的长度应小于200','en-US','The length of the email should be less than 200',NULL,NULL),
('中等屏幕','zh-CN','MD Screen',NULL,NULL),
('主题管理','en-GB','Theme',NULL,NULL),
('主题管理','en-US','Theme',NULL,NULL),
('属性','en-GB','Property',NULL,NULL),
('属性','en-US','Property',NULL,NULL),
('属性','zh-CN','属性',NULL,NULL),
('工具栏','en-GB','Toolbar',NULL,NULL),
('工具栏','en-US','Toolbar',NULL,NULL),
('巨幕','en-GB','Jumbotron',NULL,NULL),
('巨幕','en-US','Jumbotron',NULL,NULL),
('文字三列','en-GB','Three Column Text',NULL,NULL),
('文字三列','en-US','Three Column Text',NULL,NULL),
('文字二列','en-GB','Tow Column Text',NULL,NULL),
('文字二列','en-US','Tow Column Text',NULL,NULL),
('模板代码','en-GB','Code',NULL,NULL),
('模板代码','en-US','Code',NULL,NULL),
('用户名','en-GB','User Name',NULL,NULL),
('用户名','en-US','User Name',NULL,NULL),
('登录','en-GB','Sign In',NULL,NULL),
('登录','en-US','Sign In',NULL,NULL),
('登录邮箱不能为空','en-GB','Please input your email address',NULL,NULL),
('登录邮箱不能为空','en-US','Please input your email address',NULL,NULL),
('组件不能正确地显示在页面中，可能是因为您删除了原先的区域','zh-CN','组件不能正确地显示在页面中，可能是因为您删除了原先的区域',NULL,NULL),
('字段名','en-GB','Display Name',NULL,NULL),
('字段名','en-US','Display Name',NULL,NULL),
('自定义样式','en-GB','Style',NULL,NULL),
('自定义样式','en-US','Style',NULL,NULL),
('自适应','en-GB','Fluid',NULL,NULL),
('自适应','en-US','Fluid',NULL,NULL),
('说明文档','en-GB','Document',NULL,NULL),
('说明文档','en-US','Document',NULL,NULL),
('请确认密码','en-GB','Please confirm your password',NULL,NULL),
('请确认密码','en-US','Please confirm your password',NULL,NULL),
('输入您注册时使用的邮箱地址','en-GB','Enter your email address',NULL,NULL),
('输入您注册时使用的邮箱地址','en-US','Enter your email address',NULL,NULL),
('输入您的密码','en-GB','Enter your password',NULL,NULL),
('输入您的密码','en-US','Enter your password',NULL,NULL),
('输入的邮件格式不正确','en-GB','The email you entered is not formatted correctly',NULL,NULL),
('输入的邮件格式不正确','en-US','The email you entered is not formatted correctly',NULL,NULL),
('输入的邮箱格式不正确','en-GB','The email you entered is not formatted correctly',NULL,NULL),
('输入的邮箱格式不正确','en-US','The email you entered is not formatted correctly',NULL,NULL),
('退出登录','en-GB','Sign Out',NULL,NULL),
('退出登录','en-US','Sign Out',NULL,NULL),
('选中产品类别，创建标签','en-GB','Click product category then add tag',NULL,NULL),
('选中产品类别，创建标签','en-US','Click product category then add tag',NULL,NULL),
('选择类别，进行手动排序','en-GB','Click category to sort the products',NULL,NULL),
('选择类别，进行手动排序','en-US','Click category to sort the products',NULL,NULL),
('邮箱的长度应小于200','en-GB','The length of the email should be less than 200',NULL,NULL),
('邮箱的长度应小于200','en-US','The length of the email should be less than 200',NULL,NULL),
('配置保存成功，但清空缓存时发生异常，请重试！','zh-CN','配置保存成功，但清空缓存时发生异常，请重试！',NULL,NULL),
('配置通知邮箱','en-GB','Notification',NULL,NULL),
('配置通知邮箱','en-US','Notification',NULL,NULL),
('间距','en-GB','Gap',NULL,NULL),
('间距','en-US','Gap',NULL,NULL),
('页头','en-GB','Header',NULL,NULL),
('页头','en-US','Header',NULL,NULL),
('须要处理','zh-CN','须要处理',NULL,NULL);
('组件不能正确地显示在页面中，可能是因为您删除了原先的区域','zh-CN','组件不能正确地显示在页面中，可能是因为您删除了原先的区域',NULL,NULL);
/*!40000 ALTER TABLE `Language` ENABLE KEYS */;

DROP TABLE IF EXISTS `Navigation`;
Expand Down Expand Up @@ -5921,12 +5921,28 @@ CREATE TABLE `SectionTemplate` (

/*!40000 ALTER TABLE `SectionTemplate` DISABLE KEYS */;
INSERT INTO `SectionTemplate` VALUES
('SectionTemplate.Banner','横幅广告','Thumbnail\SectionTemplate.Banner.png','Thumbnail\SectionTemplate.Banner.xml',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
('SectionTemplate.Brand','品牌','Thumbnail\SectionTemplate.Brand.png','Thumbnail\SectionTemplate.Brand.xml',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
('SectionTemplate.CalendarEvent','日历事件','Thumbnail\SectionTemplate.CalendarEvent.png','Thumbnail\SectionTemplate.CalendarEvent.xml',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
('SectionTemplate.Column','左右','Thumbnail\SectionTemplate.Column.png','Thumbnail\SectionTemplate.Column.xml',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
('SectionTemplate.Default','默认','Thumbnail\SectionTemplate.Default.png','Thumbnail\SectionTemplate.Default.xml',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
('SectionTemplate.GreyBox','背景灰','Thumbnail\SectionTemplate.GreyBox.png','Thumbnail\SectionTemplate.GreyBox.xml',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
('SectionTemplate.ImageBox','图片框','Thumbnail\SectionTemplate.ImageBox.png','Thumbnail\SectionTemplate.ImageBox.xml',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
('SectionTemplate.ImageGreyBox','图片框','Thumbnail\SectionTemplate.ImageGreyBox.png','Thumbnail\SectionTemplate.ImageGreyBox.xml',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
('SectionTemplate.ImageRight','图片右','Thumbnail\SectionTemplate.ImageRight.png','Thumbnail\SectionTemplate.ImageRight.xml',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
('SectionTemplate.JCarousel','滚动图','Thumbnail\SectionTemplate.JCarousel.png','Thumbnail\SectionTemplate.JCarousel.xml',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
('SectionTemplate.LeftThreeIcon','左三图标','Thumbnail\SectionTemplate.LeftThreeIcon.png','Thumbnail\SectionTemplate.LeftThreeIcon.xml',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
('SectionTemplate.LifeStyle','生活格调','Thumbnail\SectionTemplate.LifeStyle.png','Thumbnail\SectionTemplate.LifeStyle.xml',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
('SectionTemplate.LinkGroup','链接组','Thumbnail\SectionTemplate.LinkGroup.png','Thumbnail\SectionTemplate.LinkGroup.xml',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
('SectionTemplate.ListGroup','列表组','Thumbnail\SectionTemplate.ListGroup.png','Thumbnail\SectionTemplate.ListGroup.xml',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
('SectionTemplate.ListView','媒体列表','Thumbnail\SectionTemplate.ListView.png','Thumbnail\SectionTemplate.ListView.xml',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
('SectionTemplate.Portfolio','品牌案例','Thumbnail\SectionTemplate.Portfolio.png','Thumbnail\SectionTemplate.Portfolio.xml',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
('SectionTemplate.ProductHero','产品页头','Thumbnail\SectionTemplate.ProductHero.png','Thumbnail\SectionTemplate.ProductHero.xml',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
('SectionTemplate.Quote','引用','Thumbnail\SectionTemplate.Quote.png','Thumbnail\SectionTemplate.Quote.xml',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
('SectionTemplate.RightThreeIcon','右三图标','Thumbnail\SectionTemplate.RightThreeIcon.png','Thumbnail\SectionTemplate.RightThreeIcon.xml',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
('SectionTemplate.SalePrice','销售报价','Thumbnail\SectionTemplate.SalePrice.png','Thumbnail\SectionTemplate.SalePrice.xml',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
('SectionTemplate.ShortcutNav','快捷导航','Thumbnail\SectionTemplate.ShortcutNav.png','Thumbnail\SectionTemplate.ShortcutNav.xml',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
('SectionTemplate.Tab','标签页','Thumbnail\SectionTemplate.Tab.png','Thumbnail\SectionTemplate.Tab.xml',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
('SectionTemplate.Thumbnail','缩略图','Thumbnail\SectionTemplate.Thumbnail.png','Thumbnail\SectionTemplate.Thumbnail.xml',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
/*!40000 ALTER TABLE `SectionTemplate` ENABLE KEYS */;

Expand Down
2 changes: 1 addition & 1 deletion Database/SQLite/.config/dotnet-tools.json
View file
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"sqlite-exec": {
"version": "0.0.5",
"version": "0.0.6",
"commands": [
"sqlite-exec"
]
Expand Down

0 comments on commit ce15a37

Please sign in to comment.