Commit 38ae3542 authored by DailyShana's avatar DailyShana

2.3.1.3

parent 6fa567a1
...@@ -1090,7 +1090,7 @@ public void SaveCards(Card[] cards) ...@@ -1090,7 +1090,7 @@ public void SaveCards(Card[] cards)
return; return;
if (cards == null || cards.Length == 0) if (cards == null || cards.Length == 0)
return; return;
bool replace = MyMsg.Question(LMSG.IfReplaceExistingCard); bool replace = false;
Card[] oldcards = DataBase.Read(nowCdbFile, true, ""); Card[] oldcards = DataBase.Read(nowCdbFile, true, "");
string undo = ""; string undo = "";
foreach (Card c in cards) foreach (Card c in cards)
...@@ -1099,9 +1099,19 @@ public void SaveCards(Card[] cards) ...@@ -1099,9 +1099,19 @@ public void SaveCards(Card[] cards)
} }
if (oldcards != null && oldcards.Length != 0) if (oldcards != null && oldcards.Length != 0)
{ {
foreach (Card c in oldcards) int i = 0;
foreach (Card oc in oldcards)
{
foreach (Card c in cards)
{
if (c.id == oc.id)
{ {
undo += DataBase.GetInsertSQL(c, !replace); i += 1;
if (i == 1)
replace = MyMsg.Question(LMSG.IfReplaceExistingCard);
undo += DataBase.GetInsertSQL(oc, !replace);
}
}
} }
} }
cardedit.undoSQL.Add(undo); cardedit.undoSQL.Add(undo);
......
...@@ -28,4 +28,4 @@ ...@@ -28,4 +28,4 @@
// //
// You can specify all the values or you can use the default the Revision and // You can specify all the values or you can use the default the Revision and
// Build Numbers by using the '*' as shown below: // Build Numbers by using the '*' as shown below:
[assembly: AssemblyVersion("2.3.1.2")] [assembly: AssemblyVersion("2.3.1.3")]
★更新历史 ★更新历史
2.3.1.3
优化复制卡片的撤销
2.3.1.2 2.3.1.2
修复bug:向空数据库复制卡片报错 修复bug:向空数据库复制卡片报错
2.3.1.1 2.3.1.1
......
[DataEditorX]2.3.1.2[DataEditorX] [DataEditorX]2.3.1.3[DataEditorX]
[URL]https://github.com/247321453/DataEditorX/raw/master/win32/win32.zip[URL] [URL]https://github.com/247321453/DataEditorX/raw/master/win32/win32.zip[URL]
★运行环境(Environment) ★运行环境(Environment)
......
No preview for this file type
...@@ -15,9 +15,9 @@ ...@@ -15,9 +15,9 @@
<!-- MSE language data/mse_xxx.txt --> <!-- MSE language data/mse_xxx.txt -->
<add key="mse" value="Chinese-Simplified" /> <add key="mse" value="Chinese-Simplified" />
<!-- Language data/cardinfo_xxxx.txt data/language_xxx.txt --> <!-- Language data/cardinfo_xxxx.txt data/language_xxx.txt -->
<add key="language" value="Chinese" /> <add key="language" value="english" />
<!-- Check system language when running program first time --> <!-- Check system language when running program first time -->
<add key="check_system_language" value="false" /> <add key="check_system_language" value="true" />
<!-- async load data --> <!-- async load data -->
<add key="async" value="false" /> <add key="async" value="false" />
<!-- DataEditorX source code --> <!-- DataEditorX source code -->
......
★更新历史 ★更新历史
2.3.1.3
优化复制卡片的撤销
2.3.1.2 2.3.1.2
修复bug:向空数据库复制卡片报错 修复bug:向空数据库复制卡片报错
2.3.1.1 2.3.1.1
......
[DataEditorX]2.3.1.2[DataEditorX] [DataEditorX]2.3.1.3[DataEditorX]
[URL]https://github.com/247321453/DataEditorX/raw/master/win32/win32.zip[URL] [URL]https://github.com/247321453/DataEditorX/raw/master/win32/win32.zip[URL]
★运行环境(Environment) ★运行环境(Environment)
......
No preview for this file type
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment