diff --git a/Bin/Debug/VSoft/SysDb/Icons/任务计划程序.png b/Bin/Debug/VSoft/SysDb/Icons/任务计划程序.png
new file mode 100644
index 0000000..d3e7d98
Binary files /dev/null and b/Bin/Debug/VSoft/SysDb/Icons/任务计划程序.png differ
diff --git a/Bin/Debug/VSoft/SysDb/Icons/计算机管理.png b/Bin/Debug/VSoft/SysDb/Icons/计算机管理.png
new file mode 100644
index 0000000..b226fd0
Binary files /dev/null and b/Bin/Debug/VSoft/SysDb/Icons/计算机管理.png differ
diff --git a/Bin/Debug/VSoft/SysDb/SysConfig.dat b/Bin/Debug/VSoft/SysDb/SysConfig.dat
index c0d3369..849a528 100644
Binary files a/Bin/Debug/VSoft/SysDb/SysConfig.dat and b/Bin/Debug/VSoft/SysDb/SysConfig.dat differ
diff --git a/Bin/Debug/VSoft/UserDb/Softs.dat b/Bin/Debug/VSoft/UserDb/Softs.dat
index 56ae960..83302a5 100644
Binary files a/Bin/Debug/VSoft/UserDb/Softs.dat and b/Bin/Debug/VSoft/UserDb/Softs.dat differ
diff --git a/Bin/Debug/VSoft/UserDb/Win.dat b/Bin/Debug/VSoft/UserDb/Win.dat
index 3dd5b98..3d48117 100644
--- a/Bin/Debug/VSoft/UserDb/Win.dat
+++ b/Bin/Debug/VSoft/UserDb/Win.dat
@@ -3,6 +3,6 @@ hwnd=135982
width=733
height=570
[VSoft_Test]
-hwnd=10425404
+hwnd=333278
width=733
height=570
diff --git a/Bin/Debug/VSoft/VSoft.dll b/Bin/Debug/VSoft/VSoft.dll
index 11b872a..829ad88 100644
Binary files a/Bin/Debug/VSoft/VSoft.dll and b/Bin/Debug/VSoft/VSoft.dll differ
diff --git a/Bin/Debug/VSoft/VSoftBox.exe b/Bin/Debug/VSoft/VSoftBox.exe
index 44705ce..9e54bbb 100644
Binary files a/Bin/Debug/VSoft/VSoftBox.exe and b/Bin/Debug/VSoft/VSoftBox.exe differ
diff --git a/Bin/Debug/VSoft/cUpdate.dat b/Bin/Debug/VSoft/cUpdate.dat
index 30e12ab..55dbe29 100644
--- a/Bin/Debug/VSoft/cUpdate.dat
+++ b/Bin/Debug/VSoft/cUpdate.dat
@@ -1,3 +1,3 @@
-
+
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33c865b..d474704 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,11 @@
-### 2021-03-06更新
+### 2021-03-07更新
+------
+#### VSoft V1.0.2103.0701
+- *.[新增]当拖放的文件是快捷方式时,支持获取备注信息。
+- *.[修复]修复内置命令编辑状态时,拖放会导致文件添加到主界面的BUG。
+- *.[修复]修复内置命令拖放文件时,在添加界面会保持拖放状态的BUG。
+
+### 2021-03-06更新
------
#### VSoft V1.0.2103.0601
- *.[新增]公司条件编译下拥有独立的皮肤。
diff --git a/Source/.vs/VSoft/v16/.suo b/Source/.vs/VSoft/v16/.suo
index f8a512f..aa8846f 100644
Binary files a/Source/.vs/VSoft/v16/.suo and b/Source/.vs/VSoft/v16/.suo differ
diff --git a/Source/VSoft_Dll/FrmAddSoft.cs b/Source/VSoft_Dll/FrmAddSoft.cs
index 04e1ccf..092274e 100644
--- a/Source/VSoft_Dll/FrmAddSoft.cs
+++ b/Source/VSoft_Dll/FrmAddSoft.cs
@@ -35,6 +35,7 @@ namespace VSoft
TxtPath.Text = shortcut.TargetPath;
TxtRunPram.Text = shortcut.Arguments;
TxtStartPath.Text = shortcut.WorkDir;
+ TxtDes.Text = shortcut.Description;
//ShellLink cc = new ShellLink(path);
//PicImg.Image = cc.LargeIcon.ToBitmap();
}
diff --git a/Source/VSoft_Dll/FrmInCMD.cs b/Source/VSoft_Dll/FrmInCMD.cs
index 971c4f9..f721913 100644
--- a/Source/VSoft_Dll/FrmInCMD.cs
+++ b/Source/VSoft_Dll/FrmInCMD.cs
@@ -5,6 +5,7 @@ using System;
using System.ComponentModel;
using System.Data;
using System.Drawing;
+using System.Threading;
using System.Windows.Forms;
using VSoft.Prams;
@@ -708,13 +709,24 @@ namespace VSoft
return;
}
var path = ((string[])filedrop)[0];
- FrmAddSoft frm = new FrmAddSoft(path);
- frm.ColumnId = ColumnId;
- if (frm.ShowDialog() == DialogResult.OK)
+ Thread th = new Thread(DragFiles);
+ th.Start();
+ void DragFiles()
{
- LoadDb();
+ this.BeginInvoke(new Action(() =>
+ {
+ FrmAddSoft frm = new FrmAddSoft(path)
+ {
+ ColumnId = ColumnId,
+ SQLConnStr = SQLConnStr
+ };
+ if (frm.ShowDialog() == DialogResult.OK)
+ {
+ LoadDb();
+ }
+ frm.Dispose();
+ }));
}
- frm.Dispose();
return;
#endregion
}
diff --git a/Source/VSoft_Dll/FrmVSoft.Designer.cs b/Source/VSoft_Dll/FrmVSoft.Designer.cs
index 16a486c..97a640b 100644
--- a/Source/VSoft_Dll/FrmVSoft.Designer.cs
+++ b/Source/VSoft_Dll/FrmVSoft.Designer.cs
@@ -464,7 +464,7 @@
this.TabList_Column.SelectedEndBackColor = System.Drawing.Color.SkyBlue;
this.TabList_Column.SelectedForeColor = System.Drawing.Color.Black;
this.TabList_Column.SelectedStartBackColor = System.Drawing.Color.PowderBlue;
- this.TabList_Column.Size = new System.Drawing.Size(598, 29);
+ this.TabList_Column.Size = new System.Drawing.Size(450, 29);
this.TabList_Column.TabIndex = 1;
this.TabList_Column.TileSize = new System.Drawing.Size(70, 30);
this.TabList_Column.UseCompatibleStateImageBehavior = false;
diff --git a/Source/VSoft_Dll/FrmVSoft.cs b/Source/VSoft_Dll/FrmVSoft.cs
index 836f142..915498c 100644
--- a/Source/VSoft_Dll/FrmVSoft.cs
+++ b/Source/VSoft_Dll/FrmVSoft.cs
@@ -908,6 +908,7 @@ namespace VSoft
var path = ((string[])filedrop)[0];
var pram = "";
var StartPath = "";
+ var des = "";
var name = System.IO.Path.GetFileNameWithoutExtension(path);
IDbInterface db3 = Itrycn_Db.CreateDataProvider(Itrycn_Db.dataType);
if (db3.ConnDb(SQLConnStr) == 1)
@@ -918,6 +919,7 @@ namespace VSoft
path = shortcut.TargetPath;
pram = shortcut.Arguments;
StartPath = shortcut.WorkDir;
+ des = shortcut.Description;
}
else
{
@@ -933,7 +935,7 @@ namespace VSoft
Json json = new Json("");
json.Add("RunAsAdmin", false);
mySQL.AddField("SetJson", json.Text);//设置
- mySQL.AddField("Des", "");//备注
+ mySQL.AddField("Des", des);//备注
mySQL.AddField("Pinyin", ryCommon.PinYin.Convert(name) + "\r\n" + ryCommon.PinYin.ConvertFirstPY(name));
mySQL.AddField("editTime", DateTime.Now);
mySQL.AddField("SoftType", 0);//0表示运行文件,1表示执行快速命令,2表示执行脚本
diff --git a/Source/VSoft_Dll/Prams/API.cs b/Source/VSoft_Dll/Prams/API.cs
index ce256f2..f7536c2 100644
--- a/Source/VSoft_Dll/Prams/API.cs
+++ b/Source/VSoft_Dll/Prams/API.cs
@@ -73,7 +73,8 @@ namespace VSoft.Prams
TargetPath = TargetPath,
Arguments = shortcut.Arguments,
WorkDir = shortcut.WorkingDirectory,
- IconLocation= shortcut.IconLocation
+ IconLocation= shortcut.IconLocation,
+ Description = shortcut.Description
};
}
}
diff --git a/Source/VSoft_Dll/Prams/ShortcutDescription.cs b/Source/VSoft_Dll/Prams/ShortcutDescription.cs
index 6b700bf..b84f2b2 100644
--- a/Source/VSoft_Dll/Prams/ShortcutDescription.cs
+++ b/Source/VSoft_Dll/Prams/ShortcutDescription.cs
@@ -11,5 +11,6 @@ namespace VSoft.Prams
public string Arguments { get; set; } = "";
public string WorkDir { get; set; } = "";
public string IconLocation { get; set; } = "";
+ public string Description { get; set; } = "";
}
}
diff --git a/Source/VSoft_Dll/Properties/AssemblyInfo.cs b/Source/VSoft_Dll/Properties/AssemblyInfo.cs
index b986475..8c5169e 100644
--- a/Source/VSoft_Dll/Properties/AssemblyInfo.cs
+++ b/Source/VSoft_Dll/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.2103.0601")]
-[assembly: AssemblyFileVersion("1.0.2103.0601")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.0.2103.0701")]
+[assembly: AssemblyFileVersion("1.0.2103.0701")]
\ No newline at end of file
diff --git a/Source/VSoft_Dll/VSoft.csproj b/Source/VSoft_Dll/VSoft.csproj
index b6ff2fa..8803fe7 100644
--- a/Source/VSoft_Dll/VSoft.csproj
+++ b/Source/VSoft_Dll/VSoft.csproj
@@ -18,7 +18,7 @@
full
false
..\..\Bin\Debug\VSoft\
- TRACE;DEBUG;DY;TEST
+ TRACE;DEBUG;TEST
prompt
4
x86