### 2021-03-07更新

------
#### VSoft    V1.0.2103.0701
- *.[新增]当拖放的文件是快捷方式时,支持获取备注信息。
- *.[修复]修复内置命令编辑状态时,拖放会导致文件添加到主界面的BUG。
- *.[修复]修复内置命令拖放文件时,在添加界面会保持拖放状态的BUG。

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

Bin/Debug/VSoft/cUpdate.dat

@@ -1,3 +1,3 @@
 <root>
-  <list id="LastUpdateTime" Value="2021/3/6 22:14:53" />
+  <list id="LastUpdateTime" Value="2021/3/7 20:23:02" />
 </root>

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
 - *.[新增]公司条件编译下拥有独立的皮肤。

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();
             }

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);
+                Thread th = new Thread(DragFiles);
-                frm.ColumnId = ColumnId;
+                th.Start();
-                if (frm.ShowDialog() == DialogResult.OK)
+                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
             }

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;

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表示执行脚本

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
             };
         }
     }

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; } = "";
     }
 }

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: AssemblyVersion("1.0.2103.0701")]
-[assembly: AssemblyFileVersion("1.0.2103.0601")]
+[assembly: AssemblyFileVersion("1.0.2103.0701")]

Source/VSoft_Dll/VSoft.csproj

@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\..\Bin\Debug\VSoft\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;DY;TEST</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;TEST</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>x86</PlatformTarget>