### 2022-02-10更新

------ #### VSoft V1.0.2202.1001 - *.[改进]优化点击分组时的卡顿问题。
2022-02-11 17:01:04 +08:00 · 2022-02-11 17:01:04 +08:00 · 8648407df3
commit 8648407df3
parent a4462136c9
16 changed files with 109 additions and 73 deletions
--- a/Bin/Debug/VSoft/SysDb/SysConfig.dat
+++ b/Bin/Debug/VSoft/SysDb/SysConfig.dat
--- a/Bin/Debug/VSoft/UserDb/Softs.dat
+++ b/Bin/Debug/VSoft/UserDb/Softs.dat
--- a/Bin/Debug/VSoft/UserDb/Win.dat
+++ b/Bin/Debug/VSoft/UserDb/Win.dat
@ -1,8 +1,8 @@
 [VSoft]
-hwnd=207838
+hwnd=334384
 width=745
 height=543
 [VSoft_Test]
-hwnd=987400
+hwnd=1911702
 width=733
 height=570
--- a/Bin/Debug/VSoft/VSoft.dll
+++ b/Bin/Debug/VSoft/VSoft.dll
--- a/Bin/Debug/VSoft/VSoftBox.exe
+++ b/Bin/Debug/VSoft/VSoftBox.exe
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,4 +1,9 @@
-### 2021-10-18更新
+### 2022-02-10更新
+------
+#### VSoft    V1.0.2202.1001
+- *.[改进]优化点击分组时的卡顿问题。
+
+### 2021-10-18更新
 ------
 #### VSoft    V1.0.2110.1801
 - *.[修复]修复在流程软件目录下，无法准确获取数据库目录的BUG。
--- a/Source/.vs/VSoft/FileContentIndex/7a50249d-4387-4ee4-b462-f3692c4981e3.vsidx
+++ b/Source/.vs/VSoft/FileContentIndex/7a50249d-4387-4ee4-b462-f3692c4981e3.vsidx
--- a/Source/.vs/VSoft/FileContentIndex/read.lock
+++ b/Source/.vs/VSoft/FileContentIndex/read.lock
--- a/Source/.vs/VSoft/project-colors.json
+++ b/Source/.vs/VSoft/project-colors.json
@ -0,0 +1,21 @@
+{
+  "Version": 1,
+  "ProjectMap": {
+    "13c45e68-2da3-4c9e-9bca-e63d0fa9a760": {
+      "ProjectGuid": "13c45e68-2da3-4c9e-9bca-e63d0fa9a760",
+      "DisplayName": "VSoft",
+      "ColorIndex": 0
+    },
+    "8ee4505a-7d76-4209-85d5-274357a81fb8": {
+      "ProjectGuid": "8ee4505a-7d76-4209-85d5-274357a81fb8",
+      "DisplayName": "DyLine",
+      "ColorIndex": 1
+    },
+    "ca619284-2939-4a14-9525-30fd7c04adc7": {
+      "ProjectGuid": "ca619284-2939-4a14-9525-30fd7c04adc7",
+      "DisplayName": "VSoftBox",
+      "ColorIndex": 2
+    }
+  },
+  "NextColorIndex": 3
+}
--- a/Source/.vs/VSoft/v17/.suo
+++ b/Source/.vs/VSoft/v17/.suo
--- a/Source/VSoftBox/Properties/AssemblyInfo.cs
+++ b/Source/VSoftBox/Properties/AssemblyInfo.cs
@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.2110.1801")]
-[assembly: AssemblyFileVersion("1.0.2110.1801")]
+[assembly: AssemblyVersion("1.0.2112.1401")]
+[assembly: AssemblyFileVersion("1.0.2112.1401")]
--- a/Source/VSoft_Dll/FrmInCMD.Designer.cs
+++ b/Source/VSoft_Dll/FrmInCMD.Designer.cs
@ -78,7 +78,7 @@
            this.panelEx1.Name = "panelEx1";
            this.panelEx1.Padding = new System.Windows.Forms.Padding(3);
            this.panelEx1.RoundeStyle = ryControls.RoundStyle.None;
-            this.panelEx1.Size = new System.Drawing.Size(596, 446);
+            this.panelEx1.Size = new System.Drawing.Size(730, 474);
            this.panelEx1.TabIndex = 1;
            this.panelEx1.TileBackColor = System.Drawing.Color.White;
            // 
@ -106,7 +106,7 @@
            this.IconViewEx1.SelectedForeColor = System.Drawing.Color.Black;
            this.IconViewEx1.SelectedStartBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(251)))), ((int)(((byte)(237)))));
            this.IconViewEx1.ShowItemToolTips = true;
-            this.IconViewEx1.Size = new System.Drawing.Size(590, 410);
+            this.IconViewEx1.Size = new System.Drawing.Size(724, 438);
            this.IconViewEx1.TabIndex = 0;
            this.IconViewEx1.TextHeight = 20;
            this.IconViewEx1.TileSize = new System.Drawing.Size(90, 90);
@ -192,7 +192,7 @@
            this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
            this.panel1.Location = new System.Drawing.Point(3, 3);
            this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(590, 30);
+            this.panel1.Size = new System.Drawing.Size(724, 30);
            this.panel1.TabIndex = 1;
            this.panel1.Visible = false;
            // 
@ -210,7 +210,6 @@
            this.rySearch1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(236)))), ((int)(((byte)(239)))), ((int)(((byte)(244)))));
            this.rySearch1.BaseColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(76)))), ((int)(((byte)(95)))));
            this.rySearch1.ButtonRoundBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(236)))), ((int)(((byte)(239)))), ((int)(((byte)(244)))));
-            this.rySearch1.ColorGradient = true;
            this.rySearch1.EmptyText = "输入名称或拼音即可搜索";
            this.rySearch1.Location = new System.Drawing.Point(90, 34);
            this.rySearch1.Name = "rySearch1";
@ -223,7 +222,7 @@
            // 
            this.BtnAddColumn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
            this.BtnAddColumn.Image = ((System.Drawing.Image)(resources.GetObject("BtnAddColumn.Image")));
-            this.BtnAddColumn.Location = new System.Drawing.Point(658, 65);
+            this.BtnAddColumn.Location = new System.Drawing.Point(792, 65);
            this.BtnAddColumn.Name = "BtnAddColumn";
            this.BtnAddColumn.Size = new System.Drawing.Size(27, 28);
            this.BtnAddColumn.TabIndex = 3;
@ -324,7 +323,7 @@
            this.TabList_Type.SelectedEndBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(236)))), ((int)(((byte)(181)))));
            this.TabList_Type.SelectedForeColor = System.Drawing.Color.Black;
            this.TabList_Type.SelectedStartBackColor = System.Drawing.Color.LightSkyBlue;
-            this.TabList_Type.Size = new System.Drawing.Size(83, 443);
+            this.TabList_Type.Size = new System.Drawing.Size(83, 471);
            this.TabList_Type.TabIndex = 4;
            this.TabList_Type.TileSize = new System.Drawing.Size(80, 28);
            this.TabList_Type.UseCompatibleStateImageBehavior = false;
@ -362,7 +361,7 @@
            this.TabList_Column.SelectedEndBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(236)))), ((int)(((byte)(181)))));
            this.TabList_Column.SelectedForeColor = System.Drawing.Color.Black;
            this.TabList_Column.SelectedStartBackColor = System.Drawing.Color.LightSkyBlue;
-            this.TabList_Column.Size = new System.Drawing.Size(565, 29);
+            this.TabList_Column.Size = new System.Drawing.Size(699, 29);
            this.TabList_Column.TabIndex = 1;
            this.TabList_Column.TileSize = new System.Drawing.Size(70, 28);
            this.TabList_Column.UseCompatibleStateImageBehavior = false;
@ -378,7 +377,7 @@
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(698, 558);
+            this.ClientSize = new System.Drawing.Size(832, 586);
            this.Controls.Add(this.LblDrag);
            this.Controls.Add(this.pictureBox1);
            this.Controls.Add(this.TabList_Type);
@ -386,7 +385,6 @@
            this.Controls.Add(this.TabList_Column);
            this.Controls.Add(this.rySearch1);
            this.Controls.Add(this.panelEx1);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
            this.Name = "FrmInCMD";
            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
--- a/Source/VSoft_Dll/FrmInCMD.resx
+++ b/Source/VSoft_Dll/FrmInCMD.resx
@ -136,7 +136,7 @@
  <data name="IconViewEx1.Icon" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
-        EwAACxMBAJqcGAAABvRJREFUeF7tnE2IHEUUxwcjIjkE1JMREnMWD7phd7uzfuBJEPSkd0+55BLQc9ds
+        DwAACw8BkvkDpQAABvRJREFUeF7tnE2IHEUUxwcjIjkE1JMREnMWD7phd7uzfuBJEPSkd0+55BLQc9ds
        ooIXT+bix8kgbtSYgxA1hsWLImLAPYTEXBRUNGiMEojpnpTvdWpIT2/Nm+6e7uqerv+DH0tPVfVs7/t1
        ffTHDopEoPS9QTQ6FKrkbKjiC/TzCqFBp6CcpLk5G6h4GK7rYKD0HSaF1WL5iN4XqOR4ECU3cl8GFoAg
        ii8eWNePmXQWjyWld4ZRcox2kuR3ChYPOonfeVLpu0165TgQ6d3UlWzZdgQWF+oNvufcmjTbIzyq99KZ
@ -188,7 +188,7 @@
  <data name="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAYAAADxJz2MAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAu
-        IwAALiMBeKU/dgAABJxJREFUeF7tmM1tGzEQhX3OIYDvObkFt6ACcnELbkFIBVEJcQtqQYc0ICBpwC24
+        IgAALiIBquLdkgAABJxJREFUeF7tmM1tGzEQhX3OIYDvObkFt6ACcnELbkFIBVEJcQtqQYc0ICBpwC24
        BeW9zcxiyB2Rsz/6WYMDfIA05JIzs49c7j6cTqfGDFxnI47rbMRxnY04rrMRx3U24rjORhzX2YjjOhtx
        XGcjzk3ty5+fe3AAr15wa+BmxqKBk+GdPi/Ie+ZmhmIdTfHyQj57wd4jNzEUaGMK5tEKWDIUiPueVzhy
        8AK9V65uKFBNfRsv0Hvl6oYCldT37gV5z2hSj2ALPiSR7f+WZQ3jPsn451jfUxhB28Ip/P8oeS9mGPPN
--- a/Source/VSoft_Dll/FrmVSoft.cs
+++ b/Source/VSoft_Dll/FrmVSoft.cs
@ -154,6 +154,7 @@ namespace VSoft
                        info.Image = API.GetImg(img_path, 128);
                        dictCacheImg.Add(img_path, info.Image);
                    }
+                    Application.DoEvents();
                    IconViewEx1.Items.Add(info.Name).Tag = info ;
                }
                IconViewEx1.EndUpdate();
@ -1087,66 +1088,70 @@ namespace VSoft
                    Msg.ShowMsg("当前模式下不支持添加软件。", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
                    return;
                }
-                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)
                {
-                    if (System.IO.Path.GetExtension(path).ToLower() == ".lnk")
+                    var filelist = (string[])filedrop;
+                    for (int f = 0; f < filelist.Length; f++)
                    {
-                        var shortcut = API.ReadShortcut(path);
-                        path = shortcut.TargetPath;
-                        pram = shortcut.Arguments;
-                        StartPath = shortcut.WorkDir;
-                        des = shortcut.Description;
+                        var path = filelist[f];
+                        var pram = "";
+                        var StartPath = "";
+                        var des = "";
+                        var name = System.IO.Path.GetFileNameWithoutExtension(path);
+                        if (System.IO.Path.GetExtension(path).ToLower() == ".lnk")
+                        {
+                            var shortcut = API.ReadShortcut(path);
+                            path = shortcut.TargetPath;
+                            pram = shortcut.Arguments;
+                            StartPath = shortcut.WorkDir;
+                            des = shortcut.Description;
+                        }
+                        else
+                        {
+                            path = RyFiles.GetRelativePath(path);
+                        }
+                        RyQuickSQL mySQL = new RyQuickSQL("Softs");
+                        mySQL.AddField("Name", name);
+                        mySQL.AddField("CmdId", "");
+                        mySQL.AddField("Path", path);
+                        mySQL.AddField("RunPram", pram);
+                        mySQL.AddField("StartPath", StartPath);//起始路径
+                        mySQL.AddField("IconPath", "");//图标路径
+                        Json json = new Json("");
+                        json.Add("RunAsAdmin", false);
+                        mySQL.AddField("SetJson", json.Text);//设置
+                        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表示执行脚本
+                        mySQL.AddField("ClickCount", 0);//点击量
+                        mySQL.AddField("ColumnId", ColumnId);
+                        mySQL.AddField("sortindex", Itrycn_Db.GetSoftCount(db3, ColumnId) + 1);
+                        mySQL.AddField("addTime", DateTime.Now);
+                        var ds = db3.ReadData(mySQL.GetInsertSQL() + ";select last_insert_rowid();", mySQL);
+                        SoftInfo info = new SoftInfo();
+                        info.Id = ds.Tables[0].Rows[0][0].ToInt();
+                        info.SoftType = 0;
+                        info.ColumnId = ColumnId;
+                        info.Name = name;
+                        info.Path = path;
+                        info.RunPram = pram;
+                        info.SetJson = json.Text;
+                        info.StartPath = StartPath;
+                        info.IconPath = "";
+                        string img_path = info.TruePath;
+                        if (dictCacheImg.ContainsKey(img_path))
+                        {
+                            info.Image = dictCacheImg[img_path];
+                        }
+                        else
+                        {
+                            info.Image = API.GetImg(img_path, 128);
+                            dictCacheImg.Add(img_path, info.Image);
+                        }
+                        IconViewEx1.Items.Add(info.Name).Tag = info;
                    }
-                    else
-                    {
-                        path = RyFiles.GetRelativePath(path);
-                    }
-                    RyQuickSQL mySQL = new RyQuickSQL("Softs");
-                    mySQL.AddField("Name", name);
-                    mySQL.AddField("CmdId", "");
-                    mySQL.AddField("Path", path);
-                    mySQL.AddField("RunPram", pram);
-                    mySQL.AddField("StartPath", StartPath);//起始路径
-                    mySQL.AddField("IconPath", "");//图标路径
-                    Json json = new Json("");
-                    json.Add("RunAsAdmin", false);
-                    mySQL.AddField("SetJson", json.Text);//设置
-                    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表示执行脚本
-                    mySQL.AddField("ClickCount", 0);//点击量
-                    mySQL.AddField("ColumnId", ColumnId);
-                    mySQL.AddField("sortindex", Itrycn_Db.GetSoftCount(db3, ColumnId) + 1);
-                    mySQL.AddField("addTime", DateTime.Now);
-                    var ds= db3.ReadData(mySQL.GetInsertSQL()+ ";select last_insert_rowid();", mySQL);
-                    SoftInfo info = new SoftInfo();
-                    info.Id = ds.Tables[0].Rows[0][0].ToInt();
-                    info.SoftType =0;
-                    info.ColumnId = ColumnId;
-                    info.Name = name;
-                    info.Path = path;
-                    info.RunPram = pram;
-                    info.SetJson = json.Text;
-                    info.StartPath = StartPath;
-                    info.IconPath ="";
-                    string img_path = info.TruePath;
-                    if (dictCacheImg.ContainsKey(img_path))
-                    {
-                        info.Image = dictCacheImg[img_path];
-                    }
-                    else
-                    {
-                        info.Image = API.GetImg(img_path, 128);
-                        dictCacheImg.Add(img_path, info.Image);
-                    }
-                    IconViewEx1.Items.Add(info.Name).Tag = info;
                }
                db3.Free();
                return; 
--- a/Source/VSoft_Dll/Prams/Run.cs
+++ b/Source/VSoft_Dll/Prams/Run.cs
@ -59,6 +59,13 @@ namespace VSoft.Prams
                            SetJson = row["SetJson"].ToString();
                            StartPath = row["StartPath"].ToString();
                        }
+                        else
+                        {
+                            ds.Dispose();
+                            db.Free();
+                            return -1;
+                        }
+                        ds.Dispose();
                    }
                    db.Free();
                }
--- 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.2110.1801")]
-[assembly: AssemblyFileVersion("1.0.2110.1801")]
+[assembly: AssemblyVersion("1.0.2202.1001")]
+[assembly: AssemblyFileVersion("1.0.2202.1001")]