bugfix:2092,1992,2035,2095

starlying · starlying · commit 32a479348276 · 2019-09-03T17:34:11.000+08:00
diff --git a/README.md b/README.md
@@ -15,6 +15,8 @@ SiteServer CMS 基于.NET 平台，能够以最低的成本、最少的人力投
 
 ## 迭代计划
 
+[2019 年 7 月/8 月迭代计划](https://mp.weixin.qq.com/s/c-khP44sahCG1phjl8ZHeg)
+
 [2019 年 5 月/6 月迭代计划](https://github.com/siteserver/cms/issues/1879)
 
 [2019 年 3 月/4 月迭代计划](https://github.com/siteserver/cms/issues/1790)
diff --git a/SS.CMS.nuspec b/SS.CMS.nuspec
@@ -12,7 +12,7 @@
     <copyright>Copyright © SiteServer CMS</copyright>
     <tags>SiteServer CMS</tags>
     <releaseNotes>
-      SiteServer CMS V6.10正式版
+      SiteServer CMS V6.12正式版
     </releaseNotes>
   </metadata>
 </package>
diff --git a/SiteServer.BackgroundPages/Cms/PageContentSearch.cs b/SiteServer.BackgroundPages/Cms/PageContentSearch.cs
@@ -14,7 +14,6 @@
 using SiteServer.CMS.Model.Enumerations;
 using SiteServer.CMS.Plugin;
 using SiteServer.Plugin;
-using SiteServer.Utils.Enumerations;
 
 namespace SiteServer.BackgroundPages.Cms
 {
diff --git a/SiteServer.CMS/Core/ContentUtility.cs b/SiteServer.CMS/Core/ContentUtility.cs
@@ -68,8 +68,8 @@ public static string TextEditorContentDecode(SiteInfo siteInfo, string content,
                 assetsUrl = siteInfo.Additional.AssetsUrl;
             }
             StringUtils.ReplaceHrefOrSrc(builder, virtualAssetsUrl, assetsUrl);
-            StringUtils.ReplaceHrefOrSrc(builder, "@/", siteInfo.Additional.WebUrl);
-            StringUtils.ReplaceHrefOrSrc(builder, "@", siteInfo.Additional.WebUrl);
+            StringUtils.ReplaceHrefOrSrc(builder, "@/", siteInfo.Additional.WebUrl + "/");
+            StringUtils.ReplaceHrefOrSrc(builder, "@", siteInfo.Additional.WebUrl + "/");
 
             builder.Replace("&#xa0;", "&nbsp;");
 
diff --git a/SiteServer.CMS/ImportExport/Components/ContentIe.cs b/SiteServer.CMS/ImportExport/Components/ContentIe.cs
@@ -24,29 +24,29 @@ public ContentIe(SiteInfo siteInfo, string siteContentDirectoryPath)
             _siteInfo = siteInfo;
         }
 
-        public void ImportContents(string filePath, bool isOverride, ChannelInfo nodeInfo, int taxis, int importStart, int importCount, bool isChecked, int checkedLevel, string adminName)
+        public void ImportContents(string filePath, bool isOverride, ChannelInfo channelInfo, int taxis, int importStart, int importCount, bool isChecked, int checkedLevel, string adminName)
         {
             if (!FileUtils.IsFileExists(filePath)) return;
             var feed = AtomFeed.Load(FileUtils.GetFileStreamReadOnly(filePath));
 
-            ImportContents(feed.Entries, nodeInfo, taxis, importStart, importCount, false, isChecked, checkedLevel, isOverride, adminName);
+            ImportContents(feed.Entries, channelInfo, taxis, importStart, importCount, false, isChecked, checkedLevel, isOverride, adminName);
         }
 
-        public void ImportContents(string filePath, bool isOverride, ChannelInfo nodeInfo, int taxis, bool isChecked, int checkedLevel, int adminId, int userId, int sourceId)
+        public List<int> ImportContents(string filePath, bool isOverride, ChannelInfo channelInfo, int taxis, bool isChecked, int checkedLevel, int adminId, int userId, int sourceId)
         {
-            if (!FileUtils.IsFileExists(filePath)) return;
+            if (!FileUtils.IsFileExists(filePath)) return null;
             var feed = AtomFeed.Load(FileUtils.GetFileStreamReadOnly(filePath));
 
-            ImportContents(feed.Entries, nodeInfo, taxis, false, isChecked, checkedLevel, isOverride, adminId, userId, sourceId);
+            return ImportContents(feed.Entries, channelInfo, taxis, false, isChecked, checkedLevel, isOverride, adminId, userId, sourceId);
         }
 
-        public void ImportContents(AtomEntryCollection entries, ChannelInfo channelInfo, int taxis, bool isOverride, string adminName)
+        public List<int> ImportContents(AtomEntryCollection entries, ChannelInfo channelInfo, int taxis, bool isOverride, string adminName)
         {
-            ImportContents(entries, channelInfo, taxis, 0, 0, true, true, 0, isOverride, adminName);
+            return ImportContents(entries, channelInfo, taxis, 0, 0, true, true, 0, isOverride, adminName);
         }
 
         // 内部消化掉错误
-        private void ImportContents(AtomEntryCollection entries, ChannelInfo channelInfo, int taxis, int importStart, int importCount, bool isCheckedBySettings, bool isChecked, int checkedLevel, bool isOverride, string adminName)
+        private List<int> ImportContents(AtomEntryCollection entries, ChannelInfo channelInfo, int taxis, int importStart, int importCount, bool isCheckedBySettings, bool isChecked, int checkedLevel, bool isOverride, string adminName)
         {
             if (importStart > 1 || importCount > 0)
             {
@@ -82,6 +82,7 @@ private void ImportContents(AtomEntryCollection entries, ChannelInfo channelInfo
             }
 
             var tableName = ChannelManager.GetTableName(_siteInfo, channelInfo);
+            var contentIdList = new List<int>();
 
             foreach (AtomEntry entry in entries)
             {
@@ -179,6 +180,7 @@ private void ImportContents(AtomEntryCollection entries, ChannelInfo channelInfo
                     if (isInsert)
                     {
                         var contentId = DataProvider.ContentDao.InsertWithTaxis(tableName, _siteInfo, channelInfo, contentInfo, taxis);
+                        contentIdList.Add(contentId);
 
                         TagUtils.UpdateTags(string.Empty, tags, _siteInfo.Id, contentId);
                     }
@@ -193,11 +195,14 @@ private void ImportContents(AtomEntryCollection entries, ChannelInfo channelInfo
                     // ignored
                 }
             }
+
+            return contentIdList;
         }
 
-        private void ImportContents(AtomEntryCollection entries, ChannelInfo channelInfo, int taxis, bool isCheckedBySettings, bool isChecked, int checkedLevel, bool isOverride, int adminId, int userId, int sourceId)
+        private List<int> ImportContents(AtomEntryCollection entries, ChannelInfo channelInfo, int taxis, bool isCheckedBySettings, bool isChecked, int checkedLevel, bool isOverride, int adminId, int userId, int sourceId)
         {
             var tableName = ChannelManager.GetTableName(_siteInfo, channelInfo);
+            var contentIdList = new List<int>();
 
             foreach (AtomEntry entry in entries)
             {
@@ -298,6 +303,8 @@ private void ImportContents(AtomEntryCollection entries, ChannelInfo channelInfo
                     {
                         var contentId = DataProvider.ContentDao.InsertWithTaxis(tableName, _siteInfo, channelInfo, contentInfo, taxis);
 
+                        contentIdList.Add(contentId);
+
                         TagUtils.UpdateTags(string.Empty, tags, _siteInfo.Id, contentId);
                     }
 
@@ -311,6 +318,8 @@ private void ImportContents(AtomEntryCollection entries, ChannelInfo channelInfo
                     // ignored
                 }
             }
+
+            return contentIdList;
         }
 
         public bool ExportContents(SiteInfo siteInfo, int channelId, List<int> contentIdList, bool isPeriods, string dateFrom, string dateTo, ETriState checkedState)
diff --git a/SiteServer.CMS/ImportExport/ImportObject.cs b/SiteServer.CMS/ImportExport/ImportObject.cs
@@ -2,16 +2,17 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Specialized;
+using System.Linq;
 using System.Text;
 using Atom.Core;
 using SiteServer.Utils;
 using SiteServer.CMS.Core;
+using SiteServer.CMS.Core.Create;
 using SiteServer.CMS.Core.Office;
 using SiteServer.CMS.DataCache;
 using SiteServer.CMS.ImportExport.Components;
 using SiteServer.CMS.Model;
 using SiteServer.CMS.Model.Enumerations;
-using SiteServer.CMS.Model.Attributes;
 
 namespace SiteServer.CMS.ImportExport
 {
@@ -245,34 +246,34 @@ public void ImportChannelsAndContents(int parentId, string siteContentDirectoryP
             }
         }
 
-        public void ImportContentsByZipFile(ChannelInfo nodeInfo, string zipFilePath, bool isOverride, int importStart, int importCount, bool isChecked, int checkedLevel)
+        public void ImportContentsByZipFile(ChannelInfo channelInfo, string zipFilePath, bool isOverride, int importStart, int importCount, bool isChecked, int checkedLevel)
         {
             var siteContentDirectoryPath = PathUtils.GetTemporaryFilesPath("contents");
             DirectoryUtils.DeleteDirectoryIfExists(siteContentDirectoryPath);
             DirectoryUtils.CreateDirectoryIfNotExists(siteContentDirectoryPath);
 
             ZipUtils.ExtractZip(zipFilePath, siteContentDirectoryPath);
 
-            var tableName = ChannelManager.GetTableName(_siteInfo, nodeInfo);
+            var tableName = ChannelManager.GetTableName(_siteInfo, channelInfo);
 
-            var taxis = DataProvider.ContentDao.GetMaxTaxis(tableName, nodeInfo.Id, false);
+            var taxis = DataProvider.ContentDao.GetMaxTaxis(tableName, channelInfo.Id, false);
 
-            ImportContents(nodeInfo, siteContentDirectoryPath, isOverride, taxis, importStart, importCount, isChecked, checkedLevel);
+            ImportContents(channelInfo, siteContentDirectoryPath, isOverride, taxis, importStart, importCount, isChecked, checkedLevel);
         }
 
-        public void ImportContentsByZipFile(ChannelInfo nodeInfo, string zipFilePath, bool isOverride, bool isChecked, int checkedLevel, int adminId, int userId, int sourceId)
+        public List<int> ImportContentsByZipFile(ChannelInfo channelInfo, string zipFilePath, bool isOverride, bool isChecked, int checkedLevel, int adminId, int userId, int sourceId)
         {
             var siteContentDirectoryPath = PathUtils.GetTemporaryFilesPath("contents");
             DirectoryUtils.DeleteDirectoryIfExists(siteContentDirectoryPath);
             DirectoryUtils.CreateDirectoryIfNotExists(siteContentDirectoryPath);
 
             ZipUtils.ExtractZip(zipFilePath, siteContentDirectoryPath);
 
-            var tableName = ChannelManager.GetTableName(_siteInfo, nodeInfo);
+            var tableName = ChannelManager.GetTableName(_siteInfo, channelInfo);
 
-            var taxis = DataProvider.ContentDao.GetMaxTaxis(tableName, nodeInfo.Id, false);
+            var taxis = DataProvider.ContentDao.GetMaxTaxis(tableName, channelInfo.Id, false);
 
-            ImportContents(nodeInfo, siteContentDirectoryPath, isOverride, taxis, isChecked, checkedLevel, adminId, userId, sourceId);
+            return ImportContents(channelInfo, siteContentDirectoryPath, isOverride, taxis, isChecked, checkedLevel, adminId, userId, sourceId);
         }
 
         public void ImportContentsByAccessFile(int channelId, string excelFilePath, bool isOverride, int importStart, int importCount, bool isChecked, int checkedLevel)
@@ -413,7 +414,7 @@ public void ImportContentsByCsvFile(int channelId, string csvFilePath, bool isOv
             }
         }
 
-        public void ImportContentsByCsvFile(ChannelInfo channelInfo, string csvFilePath, bool isOverride, bool isChecked, int checkedLevel, int adminId, int userId, int sourceId)
+        public List<int> ImportContentsByCsvFile(ChannelInfo channelInfo, string csvFilePath, bool isOverride, bool isChecked, int checkedLevel, int adminId, int userId, int sourceId)
         {
             var contentInfoList = ExcelObject.GetContentsByCsvFile(csvFilePath, _siteInfo, channelInfo);
             contentInfoList.Reverse();
@@ -454,6 +455,8 @@ public void ImportContentsByCsvFile(ChannelInfo channelInfo, string csvFilePath,
                     contentInfo.Id = DataProvider.ContentDao.Insert(tableName, _siteInfo, channelInfo, contentInfo);
                 }
             }
+
+            return contentInfoList.Select(x => x.Id).ToList();
         }
 
         public void ImportContentsByTxtZipFile(int channelId, string zipFilePath, bool isOverride, int importStart, int importCount, bool isChecked, int checkedLevel)
@@ -535,7 +538,7 @@ public void ImportContentsByTxtZipFile(int channelId, string zipFilePath, bool i
             }
         }
 
-        public void ImportContentsByTxtFile(ChannelInfo channelInfo, string txtFilePath, bool isOverride, bool isChecked, int checkedLevel, int adminId, int userId, int sourceId)
+        public List<int> ImportContentsByTxtFile(ChannelInfo channelInfo, string txtFilePath, bool isOverride, bool isChecked, int checkedLevel, int adminId, int userId, int sourceId)
         {
             var tableName = ChannelManager.GetTableName(_siteInfo, channelInfo);
 
@@ -574,32 +577,39 @@ public void ImportContentsByTxtFile(ChannelInfo channelInfo, string txtFilePath,
             {
                 contentInfo.Id = DataProvider.ContentDao.Insert(tableName, _siteInfo, channelInfo, contentInfo);
             }
+
+            return new List<int>
+            {
+                contentInfo.Id
+            };
         }
 
-        public void ImportContents(ChannelInfo nodeInfo, string siteContentDirectoryPath, bool isOverride, int taxis, int importStart, int importCount, bool isChecked, int checkedLevel)
+        public void ImportContents(ChannelInfo channelInfo, string siteContentDirectoryPath, bool isOverride, int taxis, int importStart, int importCount, bool isChecked, int checkedLevel)
         {
             var filePath = PathUtils.Combine(siteContentDirectoryPath, "contents.xml");
 
             var contentIe = new ContentIe(_siteInfo, siteContentDirectoryPath);
 
-            contentIe.ImportContents(filePath, isOverride, nodeInfo, taxis, importStart, importCount, isChecked, checkedLevel, _adminName);
+            contentIe.ImportContents(filePath, isOverride, channelInfo, taxis, importStart, importCount, isChecked, checkedLevel, _adminName);
 
             FileUtils.DeleteFileIfExists(filePath);
 
             DirectoryUtils.MoveDirectory(siteContentDirectoryPath, _sitePath, isOverride);
         }
 
-        public void ImportContents(ChannelInfo nodeInfo, string siteContentDirectoryPath, bool isOverride, int taxis, bool isChecked, int checkedLevel, int adminId, int userId, int sourceId)
+        public List<int> ImportContents(ChannelInfo channelInfo, string siteContentDirectoryPath, bool isOverride, int taxis, bool isChecked, int checkedLevel, int adminId, int userId, int sourceId)
         {
             var filePath = PathUtils.Combine(siteContentDirectoryPath, "contents.xml");
 
             var contentIe = new ContentIe(_siteInfo, siteContentDirectoryPath);
 
-            contentIe.ImportContents(filePath, isOverride, nodeInfo, taxis, isChecked, checkedLevel, adminId, userId, sourceId);
+            var contentIdList = contentIe.ImportContents(filePath, isOverride, channelInfo, taxis, isChecked, checkedLevel, adminId, userId, sourceId);
 
             FileUtils.DeleteFileIfExists(filePath);
 
             DirectoryUtils.MoveDirectory(siteContentDirectoryPath, _sitePath, isOverride);
+
+            return contentIdList;
         }
 
         //public void ImportInputContentsByCsvFile(InputInfo inputInfo, string excelFilePath, int importStart, int importCount, bool isChecked)
diff --git a/SiteServer.CMS/Provider/ContentDao.cs b/SiteServer.CMS/Provider/ContentDao.cs
@@ -2501,7 +2501,9 @@ public string GetPagerWhereSqlString(SiteInfo siteInfo, ChannelInfo channelInfo,
             }
             else if (searchChannelIdList.Count == 1)
             {
-                whereList.Add($"{nameof(ContentAttribute.ChannelId)} = {channelInfo.Id}");
+                whereList.Add(isTrashOnly
+                    ? $"{nameof(ContentAttribute.ChannelId)} = -{channelInfo.Id}"
+                    : $"{nameof(ContentAttribute.ChannelId)} = {channelInfo.Id}");
             }
             else
             {
diff --git a/SiteServer.CMS/Provider/DatabaseDao.cs b/SiteServer.CMS/Provider/DatabaseDao.cs
@@ -929,7 +929,7 @@ public bool DropTable(string tableName)
                 TableColumnManager.ClearCache();
                 return true;
             }
-            catch (Exception e)
+            catch
             {
                 return false;
             }
diff --git a/SiteServer.Web/.gitignore b/SiteServer.Web/.gitignore
@@ -67,4 +67,5 @@ test39/
 upload
 T_*.html
 index.html
-index.shtml
+index.shtml
+version.txt
diff --git a/SiteServer.Web/Controllers/Pages/Cms/PagesContentsLayerExportController.cs b/SiteServer.Web/Controllers/Pages/Cms/PagesContentsLayerExportController.cs
@@ -99,6 +99,8 @@ public IHttpActionResult Submit()
                 var pluginColumns = PluginContentManager.GetContentColumns(pluginIds);
 
                 var contentInfoList = new List<ContentInfo>();
+                var calculatedContentInfoList = new List<ContentInfo>();
+
                 if (contentIds.Count == 0)
                 {
                     var count = ContentManager.GetCount(siteInfo, channelInfo, onlyAdminId);
@@ -142,7 +144,8 @@ public IHttpActionResult Submit()
                                     }
                                 }
 
-                                contentInfoList.Add(ContentManager.Calculate(sequence++, contentInfo, columns, pluginColumns));
+                                contentInfoList.Add(contentInfo);
+                                calculatedContentInfoList.Add(ContentManager.Calculate(sequence++, contentInfo, columns, pluginColumns));
                             }
                         }
                     }
@@ -176,7 +179,8 @@ public IHttpActionResult Submit()
                             }
                         }
 
-                        contentInfoList.Add(ContentManager.Calculate(sequence++, contentInfo, columns, pluginColumns));
+                        contentInfoList.Add(contentInfo);
+                        calculatedContentInfoList.Add(ContentManager.Calculate(sequence++, contentInfo, columns, pluginColumns));
                     }
                 }
 
@@ -197,7 +201,7 @@ public IHttpActionResult Submit()
                     {
                         var fileName = $"{channelInfo.ChannelName}.csv";
                         var filePath = PathUtils.GetTemporaryFilesPath(fileName);
-                        ExcelObject.CreateExcelFileForContents(filePath, siteInfo, channelInfo, contentInfoList, columnNames);
+                        ExcelObject.CreateExcelFileForContents(filePath, siteInfo, channelInfo, calculatedContentInfoList, columnNames);
                         downloadUrl = PageUtils.GetTemporaryFilesUrl(fileName);
                     }
                 }
diff --git a/SiteServer.Web/Controllers/Pages/Cms/PagesContentsLayerImportController.cs b/SiteServer.Web/Controllers/Pages/Cms/PagesContentsLayerImportController.cs
diff --git a/appveyor.yml b/appveyor.yml

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@`
`14`	`14`	`using SiteServer.CMS.Model.Enumerations;`
`15`	`15`	`using SiteServer.CMS.Plugin;`
`16`	`16`	`using SiteServer.Plugin;`
`17`		`-using SiteServer.Utils.Enumerations;`
`18`	`17`
`19`	`18`	`namespace SiteServer.BackgroundPages.Cms`
`20`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -68,8 +68,8 @@ public static string TextEditorContentDecode(SiteInfo siteInfo, string content,`
`68`	`68`	`assetsUrl = siteInfo.Additional.AssetsUrl;`
`69`	`69`	`}`
`70`	`70`	`StringUtils.ReplaceHrefOrSrc(builder, virtualAssetsUrl, assetsUrl);`
`71`		`- StringUtils.ReplaceHrefOrSrc(builder, "@/", siteInfo.Additional.WebUrl);`
`72`		`- StringUtils.ReplaceHrefOrSrc(builder, "@", siteInfo.Additional.WebUrl);`
	`71`	`+ StringUtils.ReplaceHrefOrSrc(builder, "@/", siteInfo.Additional.WebUrl + "/");`
	`72`	`+ StringUtils.ReplaceHrefOrSrc(builder, "@", siteInfo.Additional.WebUrl + "/");`
`73`	`73`
`74`	`74`	`builder.Replace(" ", " ");`
`75`	`75`
Original file line number	Diff line number	Diff line change
`@@ -24,29 +24,29 @@ public ContentIe(SiteInfo siteInfo, string siteContentDirectoryPath)`
`24`	`24`	`_siteInfo = siteInfo;`
`25`	`25`	`}`
`26`	`26`
`27`		`- public void ImportContents(string filePath, bool isOverride, ChannelInfo nodeInfo, int taxis, int importStart, int importCount, bool isChecked, int checkedLevel, string adminName)`
	`27`	`+ public void ImportContents(string filePath, bool isOverride, ChannelInfo channelInfo, int taxis, int importStart, int importCount, bool isChecked, int checkedLevel, string adminName)`
`28`	`28`	`{`
`29`	`29`	`if (!FileUtils.IsFileExists(filePath)) return;`
`30`	`30`	`var feed = AtomFeed.Load(FileUtils.GetFileStreamReadOnly(filePath));`
`31`	`31`
`32`		`- ImportContents(feed.Entries, nodeInfo, taxis, importStart, importCount, false, isChecked, checkedLevel, isOverride, adminName);`
	`32`	`+ ImportContents(feed.Entries, channelInfo, taxis, importStart, importCount, false, isChecked, checkedLevel, isOverride, adminName);`
`33`	`33`	`}`
`34`	`34`
`35`		`- public void ImportContents(string filePath, bool isOverride, ChannelInfo nodeInfo, int taxis, bool isChecked, int checkedLevel, int adminId, int userId, int sourceId)`
	`35`	`+ public List<int> ImportContents(string filePath, bool isOverride, ChannelInfo channelInfo, int taxis, bool isChecked, int checkedLevel, int adminId, int userId, int sourceId)`
`36`	`36`	`{`
`37`		`- if (!FileUtils.IsFileExists(filePath)) return;`
	`37`	`+ if (!FileUtils.IsFileExists(filePath)) return null;`
`38`	`38`	`var feed = AtomFeed.Load(FileUtils.GetFileStreamReadOnly(filePath));`
`39`	`39`
`40`		`- ImportContents(feed.Entries, nodeInfo, taxis, false, isChecked, checkedLevel, isOverride, adminId, userId, sourceId);`
	`40`	`+ return ImportContents(feed.Entries, channelInfo, taxis, false, isChecked, checkedLevel, isOverride, adminId, userId, sourceId);`
`41`	`41`	`}`
`42`	`42`
`43`		`- public void ImportContents(AtomEntryCollection entries, ChannelInfo channelInfo, int taxis, bool isOverride, string adminName)`
	`43`	`+ public List<int> ImportContents(AtomEntryCollection entries, ChannelInfo channelInfo, int taxis, bool isOverride, string adminName)`
`44`	`44`	`{`
`45`		`- ImportContents(entries, channelInfo, taxis, 0, 0, true, true, 0, isOverride, adminName);`
	`45`	`+ return ImportContents(entries, channelInfo, taxis, 0, 0, true, true, 0, isOverride, adminName);`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`// 内部消化掉错误`
`49`		`- private void ImportContents(AtomEntryCollection entries, ChannelInfo channelInfo, int taxis, int importStart, int importCount, bool isCheckedBySettings, bool isChecked, int checkedLevel, bool isOverride, string adminName)`
	`49`	`+ private List<int> ImportContents(AtomEntryCollection entries, ChannelInfo channelInfo, int taxis, int importStart, int importCount, bool isCheckedBySettings, bool isChecked, int checkedLevel, bool isOverride, string adminName)`
`50`	`50`	`{`
`51`	`51`	`if (importStart > 1 \|\| importCount > 0)`
`52`	`52`	`{`
`@@ -82,6 +82,7 @@ private void ImportContents(AtomEntryCollection entries, ChannelInfo channelInfo`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`var tableName = ChannelManager.GetTableName(_siteInfo, channelInfo);`
	`85`	`+ var contentIdList = new List<int>();`
`85`	`86`
`86`	`87`	`foreach (AtomEntry entry in entries)`
`87`	`88`	`{`
`@@ -179,6 +180,7 @@ private void ImportContents(AtomEntryCollection entries, ChannelInfo channelInfo`
`179`	`180`	`if (isInsert)`
`180`	`181`	`{`
`181`	`182`	`var contentId = DataProvider.ContentDao.InsertWithTaxis(tableName, _siteInfo, channelInfo, contentInfo, taxis);`
	`183`	`+ contentIdList.Add(contentId);`
`182`	`184`
`183`	`185`	`TagUtils.UpdateTags(string.Empty, tags, _siteInfo.Id, contentId);`
`184`	`186`	`}`
`@@ -193,11 +195,14 @@ private void ImportContents(AtomEntryCollection entries, ChannelInfo channelInfo`
`193`	`195`	`// ignored`
`194`	`196`	`}`
`195`	`197`	`}`
	`198`	`+`
	`199`	`+ return contentIdList;`
`196`	`200`	`}`
`197`	`201`
`198`		`- private void ImportContents(AtomEntryCollection entries, ChannelInfo channelInfo, int taxis, bool isCheckedBySettings, bool isChecked, int checkedLevel, bool isOverride, int adminId, int userId, int sourceId)`
	`202`	`+ private List<int> ImportContents(AtomEntryCollection entries, ChannelInfo channelInfo, int taxis, bool isCheckedBySettings, bool isChecked, int checkedLevel, bool isOverride, int adminId, int userId, int sourceId)`
`199`	`203`	`{`
`200`	`204`	`var tableName = ChannelManager.GetTableName(_siteInfo, channelInfo);`
	`205`	`+ var contentIdList = new List<int>();`
`201`	`206`
`202`	`207`	`foreach (AtomEntry entry in entries)`
`203`	`208`	`{`
`@@ -298,6 +303,8 @@ private void ImportContents(AtomEntryCollection entries, ChannelInfo channelInfo`
`298`	`303`	`{`
`299`	`304`	`var contentId = DataProvider.ContentDao.InsertWithTaxis(tableName, _siteInfo, channelInfo, contentInfo, taxis);`
`300`	`305`
	`306`	`+ contentIdList.Add(contentId);`
	`307`	`+`
`301`	`308`	`TagUtils.UpdateTags(string.Empty, tags, _siteInfo.Id, contentId);`
`302`	`309`	`}`
`303`	`310`
`@@ -311,6 +318,8 @@ private void ImportContents(AtomEntryCollection entries, ChannelInfo channelInfo`
`311`	`318`	`// ignored`
`312`	`319`	`}`
`313`	`320`	`}`
	`321`	`+`
	`322`	`+ return contentIdList;`
`314`	`323`	`}`
`315`	`324`
`316`	`325`	`public bool ExportContents(SiteInfo siteInfo, int channelId, List<int> contentIdList, bool isPeriods, string dateFrom, string dateTo, ETriState checkedState)`
Original file line number	Diff line number	Diff line change
`@@ -2,16 +2,17 @@`
`2`	`2`	`using System.Collections;`
`3`	`3`	`using System.Collections.Generic;`
`4`	`4`	`using System.Collections.Specialized;`
	`5`	`+using System.Linq;`
`5`	`6`	`using System.Text;`
`6`	`7`	`using Atom.Core;`
`7`	`8`	`using SiteServer.Utils;`
`8`	`9`	`using SiteServer.CMS.Core;`
	`10`	`+using SiteServer.CMS.Core.Create;`
`9`	`11`	`using SiteServer.CMS.Core.Office;`
`10`	`12`	`using SiteServer.CMS.DataCache;`
`11`	`13`	`using SiteServer.CMS.ImportExport.Components;`
`12`	`14`	`using SiteServer.CMS.Model;`
`13`	`15`	`using SiteServer.CMS.Model.Enumerations;`
`14`		`-using SiteServer.CMS.Model.Attributes;`
`15`	`16`
`16`	`17`	`namespace SiteServer.CMS.ImportExport`
`17`	`18`	`{`
`@@ -245,34 +246,34 @@ public void ImportChannelsAndContents(int parentId, string siteContentDirectoryP`
`245`	`246`	`}`
`246`	`247`	`}`
`247`	`248`
`248`		`- public void ImportContentsByZipFile(ChannelInfo nodeInfo, string zipFilePath, bool isOverride, int importStart, int importCount, bool isChecked, int checkedLevel)`
	`249`	`+ public void ImportContentsByZipFile(ChannelInfo channelInfo, string zipFilePath, bool isOverride, int importStart, int importCount, bool isChecked, int checkedLevel)`
`249`	`250`	`{`
`250`	`251`	`var siteContentDirectoryPath = PathUtils.GetTemporaryFilesPath("contents");`
`251`	`252`	`DirectoryUtils.DeleteDirectoryIfExists(siteContentDirectoryPath);`
`252`	`253`	`DirectoryUtils.CreateDirectoryIfNotExists(siteContentDirectoryPath);`
`253`	`254`
`254`	`255`	`ZipUtils.ExtractZip(zipFilePath, siteContentDirectoryPath);`
`255`	`256`
`256`		`- var tableName = ChannelManager.GetTableName(_siteInfo, nodeInfo);`
	`257`	`+ var tableName = ChannelManager.GetTableName(_siteInfo, channelInfo);`
`257`	`258`
`258`		`- var taxis = DataProvider.ContentDao.GetMaxTaxis(tableName, nodeInfo.Id, false);`
	`259`	`+ var taxis = DataProvider.ContentDao.GetMaxTaxis(tableName, channelInfo.Id, false);`
`259`	`260`
`260`		`- ImportContents(nodeInfo, siteContentDirectoryPath, isOverride, taxis, importStart, importCount, isChecked, checkedLevel);`
	`261`	`+ ImportContents(channelInfo, siteContentDirectoryPath, isOverride, taxis, importStart, importCount, isChecked, checkedLevel);`
`261`	`262`	`}`
`262`	`263`
`263`		`- public void ImportContentsByZipFile(ChannelInfo nodeInfo, string zipFilePath, bool isOverride, bool isChecked, int checkedLevel, int adminId, int userId, int sourceId)`
	`264`	`+ public List<int> ImportContentsByZipFile(ChannelInfo channelInfo, string zipFilePath, bool isOverride, bool isChecked, int checkedLevel, int adminId, int userId, int sourceId)`
`264`	`265`	`{`
`265`	`266`	`var siteContentDirectoryPath = PathUtils.GetTemporaryFilesPath("contents");`
`266`	`267`	`DirectoryUtils.DeleteDirectoryIfExists(siteContentDirectoryPath);`
`267`	`268`	`DirectoryUtils.CreateDirectoryIfNotExists(siteContentDirectoryPath);`
`268`	`269`
`269`	`270`	`ZipUtils.ExtractZip(zipFilePath, siteContentDirectoryPath);`
`270`	`271`
`271`		`- var tableName = ChannelManager.GetTableName(_siteInfo, nodeInfo);`
	`272`	`+ var tableName = ChannelManager.GetTableName(_siteInfo, channelInfo);`
`272`	`273`
`273`		`- var taxis = DataProvider.ContentDao.GetMaxTaxis(tableName, nodeInfo.Id, false);`
	`274`	`+ var taxis = DataProvider.ContentDao.GetMaxTaxis(tableName, channelInfo.Id, false);`
`274`	`275`
`275`		`- ImportContents(nodeInfo, siteContentDirectoryPath, isOverride, taxis, isChecked, checkedLevel, adminId, userId, sourceId);`
	`276`	`+ return ImportContents(channelInfo, siteContentDirectoryPath, isOverride, taxis, isChecked, checkedLevel, adminId, userId, sourceId);`
`276`	`277`	`}`
`277`	`278`
`278`	`279`	`public void ImportContentsByAccessFile(int channelId, string excelFilePath, bool isOverride, int importStart, int importCount, bool isChecked, int checkedLevel)`
`@@ -413,7 +414,7 @@ public void ImportContentsByCsvFile(int channelId, string csvFilePath, bool isOv`
`413`	`414`	`}`
`414`	`415`	`}`
`415`	`416`
`416`		`- public void ImportContentsByCsvFile(ChannelInfo channelInfo, string csvFilePath, bool isOverride, bool isChecked, int checkedLevel, int adminId, int userId, int sourceId)`
	`417`	`+ public List<int> ImportContentsByCsvFile(ChannelInfo channelInfo, string csvFilePath, bool isOverride, bool isChecked, int checkedLevel, int adminId, int userId, int sourceId)`
`417`	`418`	`{`
`418`	`419`	`var contentInfoList = ExcelObject.GetContentsByCsvFile(csvFilePath, _siteInfo, channelInfo);`
`419`	`420`	`contentInfoList.Reverse();`
`@@ -454,6 +455,8 @@ public void ImportContentsByCsvFile(ChannelInfo channelInfo, string csvFilePath,`
`454`	`455`	`contentInfo.Id = DataProvider.ContentDao.Insert(tableName, _siteInfo, channelInfo, contentInfo);`
`455`	`456`	`}`
`456`	`457`	`}`
	`458`	`+`
	`459`	`+ return contentInfoList.Select(x => x.Id).ToList();`
`457`	`460`	`}`
`458`	`461`
`459`	`462`	`public void ImportContentsByTxtZipFile(int channelId, string zipFilePath, bool isOverride, int importStart, int importCount, bool isChecked, int checkedLevel)`
`@@ -535,7 +538,7 @@ public void ImportContentsByTxtZipFile(int channelId, string zipFilePath, bool i`
`535`	`538`	`}`
`536`	`539`	`}`
`537`	`540`
`538`		`- public void ImportContentsByTxtFile(ChannelInfo channelInfo, string txtFilePath, bool isOverride, bool isChecked, int checkedLevel, int adminId, int userId, int sourceId)`
	`541`	`+ public List<int> ImportContentsByTxtFile(ChannelInfo channelInfo, string txtFilePath, bool isOverride, bool isChecked, int checkedLevel, int adminId, int userId, int sourceId)`
`539`	`542`	`{`
`540`	`543`	`var tableName = ChannelManager.GetTableName(_siteInfo, channelInfo);`
`541`	`544`
`@@ -574,32 +577,39 @@ public void ImportContentsByTxtFile(ChannelInfo channelInfo, string txtFilePath,`
`574`	`577`	`{`
`575`	`578`	`contentInfo.Id = DataProvider.ContentDao.Insert(tableName, _siteInfo, channelInfo, contentInfo);`
`576`	`579`	`}`
	`580`	`+`
	`581`	`+ return new List<int>`
	`582`	`+ {`
	`583`	`+ contentInfo.Id`
	`584`	`+ };`
`577`	`585`	`}`
`578`	`586`
`579`		`- public void ImportContents(ChannelInfo nodeInfo, string siteContentDirectoryPath, bool isOverride, int taxis, int importStart, int importCount, bool isChecked, int checkedLevel)`
	`587`	`+ public void ImportContents(ChannelInfo channelInfo, string siteContentDirectoryPath, bool isOverride, int taxis, int importStart, int importCount, bool isChecked, int checkedLevel)`
`580`	`588`	`{`
`581`	`589`	`var filePath = PathUtils.Combine(siteContentDirectoryPath, "contents.xml");`
`582`	`590`
`583`	`591`	`var contentIe = new ContentIe(_siteInfo, siteContentDirectoryPath);`
`584`	`592`
`585`		`- contentIe.ImportContents(filePath, isOverride, nodeInfo, taxis, importStart, importCount, isChecked, checkedLevel, _adminName);`
	`593`	`+ contentIe.ImportContents(filePath, isOverride, channelInfo, taxis, importStart, importCount, isChecked, checkedLevel, _adminName);`
`586`	`594`
`587`	`595`	`FileUtils.DeleteFileIfExists(filePath);`
`588`	`596`
`589`	`597`	`DirectoryUtils.MoveDirectory(siteContentDirectoryPath, _sitePath, isOverride);`
`590`	`598`	`}`
`591`	`599`
`592`		`- public void ImportContents(ChannelInfo nodeInfo, string siteContentDirectoryPath, bool isOverride, int taxis, bool isChecked, int checkedLevel, int adminId, int userId, int sourceId)`
	`600`	`+ public List<int> ImportContents(ChannelInfo channelInfo, string siteContentDirectoryPath, bool isOverride, int taxis, bool isChecked, int checkedLevel, int adminId, int userId, int sourceId)`
`593`	`601`	`{`
`594`	`602`	`var filePath = PathUtils.Combine(siteContentDirectoryPath, "contents.xml");`
`595`	`603`
`596`	`604`	`var contentIe = new ContentIe(_siteInfo, siteContentDirectoryPath);`
`597`	`605`
`598`		`- contentIe.ImportContents(filePath, isOverride, nodeInfo, taxis, isChecked, checkedLevel, adminId, userId, sourceId);`
	`606`	`+ var contentIdList = contentIe.ImportContents(filePath, isOverride, channelInfo, taxis, isChecked, checkedLevel, adminId, userId, sourceId);`
`599`	`607`
`600`	`608`	`FileUtils.DeleteFileIfExists(filePath);`
`601`	`609`
`602`	`610`	`DirectoryUtils.MoveDirectory(siteContentDirectoryPath, _sitePath, isOverride);`
	`611`	`+`
	`612`	`+ return contentIdList;`
`603`	`613`	`}`
`604`	`614`
`605`	`615`	`//public void ImportInputContentsByCsvFile(InputInfo inputInfo, string excelFilePath, int importStart, int importCount, bool isChecked)`
Original file line number	Diff line number	Diff line change
`@@ -2501,7 +2501,9 @@ public string GetPagerWhereSqlString(SiteInfo siteInfo, ChannelInfo channelInfo,`
`2501`	`2501`	`}`
`2502`	`2502`	`else if (searchChannelIdList.Count == 1)`
`2503`	`2503`	`{`
`2504`		`- whereList.Add($"{nameof(ContentAttribute.ChannelId)} = {channelInfo.Id}");`
	`2504`	`+ whereList.Add(isTrashOnly`
	`2505`	`+ ? $"{nameof(ContentAttribute.ChannelId)} = -{channelInfo.Id}"`
	`2506`	`+ : $"{nameof(ContentAttribute.ChannelId)} = {channelInfo.Id}");`
`2505`	`2507`	`}`
`2506`	`2508`	`else`
`2507`	`2509`	`{`
Original file line number	Diff line number	Diff line change
`@@ -929,7 +929,7 @@ public bool DropTable(string tableName)`
`929`	`929`	`TableColumnManager.ClearCache();`
`930`	`930`	`return true;`
`931`	`931`	`}`
`932`		`- catch (Exception e)`
	`932`	`+ catch`
`933`	`933`	`{`
`934`	`934`	`return false;`
`935`	`935`	`}`
Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,8 @@ public IHttpActionResult Submit()`
`99`	`99`	`var pluginColumns = PluginContentManager.GetContentColumns(pluginIds);`
`100`	`100`
`101`	`101`	`var contentInfoList = new List<ContentInfo>();`
	`102`	`+ var calculatedContentInfoList = new List<ContentInfo>();`
	`103`	`+`
`102`	`104`	`if (contentIds.Count == 0)`
`103`	`105`	`{`
`104`	`106`	`var count = ContentManager.GetCount(siteInfo, channelInfo, onlyAdminId);`
`@@ -142,7 +144,8 @@ public IHttpActionResult Submit()`
`142`	`144`	`}`
`143`	`145`	`}`
`144`	`146`
`145`		`- contentInfoList.Add(ContentManager.Calculate(sequence++, contentInfo, columns, pluginColumns));`
	`147`	`+ contentInfoList.Add(contentInfo);`
	`148`	`+ calculatedContentInfoList.Add(ContentManager.Calculate(sequence++, contentInfo, columns, pluginColumns));`
`146`	`149`	`}`
`147`	`150`	`}`
`148`	`151`	`}`
`@@ -176,7 +179,8 @@ public IHttpActionResult Submit()`
`176`	`179`	`}`
`177`	`180`	`}`
`178`	`181`
`179`		`- contentInfoList.Add(ContentManager.Calculate(sequence++, contentInfo, columns, pluginColumns));`
	`182`	`+ contentInfoList.Add(contentInfo);`
	`183`	`+ calculatedContentInfoList.Add(ContentManager.Calculate(sequence++, contentInfo, columns, pluginColumns));`
`180`	`184`	`}`
`181`	`185`	`}`
`182`	`186`
`@@ -197,7 +201,7 @@ public IHttpActionResult Submit()`
`197`	`201`	`{`
`198`	`202`	`var fileName = $"{channelInfo.ChannelName}.csv";`
`199`	`203`	`var filePath = PathUtils.GetTemporaryFilesPath(fileName);`
`200`		`- ExcelObject.CreateExcelFileForContents(filePath, siteInfo, channelInfo, contentInfoList, columnNames);`
	`204`	`+ ExcelObject.CreateExcelFileForContents(filePath, siteInfo, channelInfo, calculatedContentInfoList, columnNames);`
`201`	`205`	`downloadUrl = PageUtils.GetTemporaryFilesUrl(fileName);`
`202`	`206`	`}`
`203`	`207`	`}`