1、版本号规则修改：改为（年份+年度版本序号）

2、系统帮助文档界面优化

AppHome/Tools.exe.config

 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <appSettings>
-    <add key="UpdateTime" value="2021-08-24 17:46:26.417" />
+    <add key="UpdateTime" value="2021-08-25 13:49:29.883" />
   </appSettings>
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>

Tools/UI/sys/wHelpDocument.cs

@@ -43,7 +43,12 @@ namespace Tools.UI.sys
             this.dgvDetail.AllowUserToAddRows = false;
             this.dgvDetail.AutoGenerateColumns = false;
             this.dgvDetail.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
+            //表格事件
+            this.dgvDetail.CellContentClick += DgvDetail_CellContentClick;
         }
+
+       
+
         public override void InitData()
         {
             this._ds = this._db.GetData(this.ModuleTableList, true);
@@ -53,8 +58,8 @@ namespace Tools.UI.sys
             });
         }
 
-        //事件：上传
-        private void btnUpload_Click(object sender, EventArgs e)
+        //工具栏：上传文件
+        private void tsbAdd_Click(object sender, EventArgs e)
         {
             var list = Utils.SelectFile(true);
             if (list.Count > 0)
@@ -71,35 +76,8 @@ namespace Tools.UI.sys
                 this.Save();
             }
         }
-        //事件：下载
-        private void btnDownload_Click(object sender, EventArgs e)
-        {
-            if(this.dgvDetail.SelectedRows.Count == 0)
-            {
-                Utils.Tip("请选中要下载的行！");
-                return;
-            }
-            //选择文件夹
-            var dlg = new FolderBrowserDialog()
-            {
-                RootFolder = Environment.SpecialFolder.Desktop,
-                ShowNewFolderButton = true,
-                Description = "选择一个文件夹",
-            };
-            if (dlg.ShowDialog() == DialogResult.OK)
-            {
-                for (int i = 0; i < this.dgvDetail.SelectedRows.Count; i++)
-                {
-                    var index = this.dgvDetail.SelectedRows[i].Index;
-                    var drNow = this._ds.Tables[0].DefaultView[index];
-                    var fileName = drNow["dName"].ToString();
-                    File.WriteAllBytes($@"{dlg.SelectedPath}\{fileName}", drNow["dData"] as byte[]);
-                }
-                Utils.Tip("下载成功！");
-            }
-        }
-        //事件：更新文件
-        private void btnUpdate_Click(object sender, EventArgs e)
+        //工具栏：更新文件
+        private void tsbUpdate_Click(object sender, EventArgs e)
         {
             if (this.dgvDetail.SelectedRows.Count != 1)
             {
@@ -119,12 +97,47 @@ namespace Tools.UI.sys
             }
         }
 
+        //事件：下载
+        private void btnDownload_Click(object sender, EventArgs e)
+        {
+            if(this.dgvDetail.SelectedRows.Count == 0)
+            {
+                Utils.Tip("请选中要下载的行！");
+                return;
+            }
+            
+        }
+
+        //表格：下载文件
+        private void DgvDetail_CellContentClick(object sender, DataGridViewCellEventArgs e)
+        {
+            if (e.RowIndex < 0)
+                return;
+            if (this.dgvDetail.Columns[e.ColumnIndex] is DataGridViewButtonColumn)
+            {
+                //选择文件夹
+                var dlg = new FolderBrowserDialog()
+                {
+                    RootFolder = Environment.SpecialFolder.Desktop,
+                    ShowNewFolderButton = true,
+                    Description = "选择一个文件夹",
+                };
+                if (dlg.ShowDialog() == DialogResult.OK)
+                {
+                    var drNow = this._ds.Tables[0].DefaultView[e.RowIndex];
+                    var fileName = drNow["dName"].ToString();
+                    File.WriteAllBytes($@"{dlg.SelectedPath}\{fileName}", drNow["dData"] as byte[]);
+                    Utils.Tip("下载成功！");
+                }
+            }
+        }
+
+
         //按钮有效性
         private void ButtonEnabled(bool enable)
         {
-            this.btnUpload.Enabled = enable;
-            this.btnDownload.Enabled = enable;
-            this.btnUpdate.Enabled = enable;
+            this.tsbAdd.Enabled = enable;
+            this.tsbUpdate.Enabled = enable;
         }
 
         //填充数据行
@@ -145,5 +158,6 @@ namespace Tools.UI.sys
             return true;
         }
 
+       
     }
 }

Tools/UI/sys/wHelpDocument.resx

@@ -117,6 +117,21 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -126,4 +141,7 @@
   <metadata name="Column4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
 </root>
\ No newline at end of file

Tools/UI/wFlowShare.Designer.cs

@@ -31,7 +31,6 @@
             this.toolStrip1 = new System.Windows.Forms.ToolStrip();
             this.tsbAdd = new System.Windows.Forms.ToolStripButton();
             this.tsbUpdate = new System.Windows.Forms.ToolStripButton();
-            this.tsbSave = new System.Windows.Forms.ToolStripButton();
             this.dgvDetail = new System.Windows.Forms.DataGridView();
             this.Column6 = new System.Windows.Forms.DataGridViewButtonColumn();
             this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -46,8 +45,7 @@
             // 
             this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.tsbAdd,
-            this.tsbUpdate,
-            this.tsbSave});
+            this.tsbUpdate});
             this.toolStrip1.Location = new System.Drawing.Point(0, 0);
             this.toolStrip1.Name = "toolStrip1";
             this.toolStrip1.Size = new System.Drawing.Size(707, 25);
@@ -72,15 +70,6 @@
             this.tsbUpdate.Text = "更新文件";
             this.tsbUpdate.Click += new System.EventHandler(this.tsbUpdate_Click);
             // 
-            // tsbSave
-            // 
-            this.tsbSave.Image = global::Tools.Properties.Resources.保存;
-            this.tsbSave.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.tsbSave.Name = "tsbSave";
-            this.tsbSave.Size = new System.Drawing.Size(52, 22);
-            this.tsbSave.Text = "保存";
-            this.tsbSave.Click += new System.EventHandler(this.tsbSave_Click);
-            // 
             // dgvDetail
             // 
             this.dgvDetail.BackgroundColor = System.Drawing.SystemColors.Window;
@@ -160,7 +149,6 @@
         private System.Windows.Forms.ToolStripButton tsbAdd;
         private System.Windows.Forms.ToolStripButton tsbUpdate;
         private System.Windows.Forms.DataGridView dgvDetail;
-        private System.Windows.Forms.ToolStripButton tsbSave;
         private System.Windows.Forms.DataGridViewButtonColumn Column6;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column3;

Tools/UI/wFlowShare.cs

@@ -36,12 +36,12 @@ namespace Tools.UI
         public override void InitUI()
         {
             //表格初始化
+            this.dgvDetail.ReadOnly = true;
             this.dgvDetail.AllowUserToAddRows = false;
             this.dgvDetail.AutoGenerateColumns = false;
             this.dgvDetail.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
             //表格事件
             this.dgvDetail.CellContentClick += DgvDetail_CellContentClick;
-            this.dgvDetail.CellBeginEdit += DgvDetail_CellBeginEdit;
         }
         public override void InitData()
         {
@@ -51,12 +51,6 @@ namespace Tools.UI
             });
         }
 
-        //表格：编辑控制
-        private void DgvDetail_CellBeginEdit(object sender, DataGridViewCellCancelEventArgs e)
-        {
-            //只许编辑类型
-            e.Cancel = dgvDetail.Columns[e.ColumnIndex].DataPropertyName != "dType";
-        }
         //表格：下载文件
         private void DgvDetail_CellContentClick(object sender, DataGridViewCellEventArgs e)
         {
@@ -73,13 +67,9 @@ namespace Tools.UI
                 };
                 if (dlg.ShowDialog() == DialogResult.OK)
                 {
-                    for (int i = 0; i < this.dgvDetail.SelectedRows.Count; i++)
-                    {
-                        var index = this.dgvDetail.SelectedRows[i].Index;
-                        var drNow = this._ds.Tables[0].DefaultView[index];
-                        var fileName = drNow["dName"].ToString();
-                        File.WriteAllBytes($@"{dlg.SelectedPath}\{fileName}", drNow["dData"] as byte[]);
-                    }
+                    var drNow = this._ds.Tables[0].DefaultView[e.RowIndex];
+                    var fileName = drNow["dName"].ToString();
+                    File.WriteAllBytes($@"{dlg.SelectedPath}\{fileName}", drNow["dData"] as byte[]);
                     Utils.Tip("下载成功！");
                 }
             }
@@ -125,11 +115,6 @@ namespace Tools.UI
                 }
             }
         }
-        //工具栏：保存
-        private void tsbSave_Click(object sender, EventArgs e)
-        {
-            this.Save();
-        }
 
         //填充数据行
         private bool FillRowData(DataRow dr, string path)

Tools/wExtend.cs

@@ -72,7 +72,11 @@ namespace Tools
                 ImageIndex = this.GetGroupImageIndex(group),
             };
         }
-
+        /// <summary>
+        /// 获取图片序号
+        /// </summary>
+        /// <param name="group"></param>
+        /// <returns></returns>
         private int GetGroupImageIndex(string group)
         {
             int result = 0;

Tools/wMain.cs

@@ -28,6 +28,10 @@ namespace Tools
         /// 已打开的窗口列表
         /// </summary>
         List<string> OpenedList = new List<string>();
+        /// <summary>
+        /// 数据库访问对象
+        /// </summary>
+        DBHelper _db = null;
 
         public wMain()
         {
@@ -64,18 +68,29 @@ namespace Tools
             this.tabControl1.SelectedIndexChanged += TabControl1_SelectedIndexChanged;
             this.tabControl1.MouseDoubleClick += TabControl1_MouseDoubleClick;
 
+            //初始化数据库链接
+            var link = Utils.GetDbLinkString204("FTT_Work");
+            this._db = new DBHelper(link);
             //检查更新
             Task.Run(() => this.CheckUpdate(true));
             //加载首页
             Task.Run(() => this.AsyncUI(() => {
-                    this.webBrowser1.Url = new Uri("http://www.feteto.cn/#/");
-                    this.webBrowser1.Show();
-                })
-            );
+                this.webBrowser1.Url = new Uri("http://www.feteto.cn/#/");
+                this.webBrowser1.Show();
+            }));
+            //版本号处理
+            Task.Run(() => this.AsyncUI(() => {
+                var dt = this._db.GetDataTable($@"
+                        SELECT TOP 1 CAST(DATENAME(YEAR, UDate) AS VARCHAR(10)) + '.' + CAST(COUNT(*) AS VARCHAR(10)) AS SysVersion 
+                        FROM dbo.FTT_AutoUpdate
+                        GROUP BY DATENAME(YEAR, UDate)
+                        ORDER BY DATENAME(YEAR, UDate) DESC", "version", false);
+                this.lbSysVersion.Text = dt.DefaultView.Count == 0 ? $"2021.1" : $"{dt.DefaultView[0][0]}";
+            }));
         }
-
         private void wMain_FormClosing(object sender, FormClosingEventArgs e)
         {
+            this._db = null;
             this.webBrowser1.Hide();
             this.webBrowser1.Dispose();
         }
@@ -234,8 +249,7 @@ namespace Tools
         private void CheckUpdate(bool IsSilentWhenNotFound = false)
         {
             var updateTime = Utils.AppSettings("UpdateTime");
-            var link = Utils.GetDbLinkString204("FTT_Work");
-            var dt = new SmpDB().GetDataTable(link, $"SELECT TOP 1 UDate, URemark FROM dbo.FTT_AutoUpdate WHERE UDate > '{updateTime}'  ORDER BY UDate DESC", "FTT_AutoUpdate");
+            var dt =this._db.GetDataTable($"SELECT TOP 1 UDate, URemark FROM dbo.FTT_AutoUpdate WHERE UDate > '{updateTime}'  ORDER BY UDate DESC", "FTT_AutoUpdate");
             if (dt.DefaultView.Count > 0)
             {
                 var drv = dt.DefaultView[0];
@@ -268,8 +282,7 @@ namespace Tools
         private void ViewUpdateLog()
         {
             StringBuilder sb = new StringBuilder("*注：仅展示最近20条更新记录\r\n");
-            var link = Utils.GetDbLinkString204("FTT_Work");
-            var dt = new SmpDB().GetDataTable(link, "SELECT TOP 20 ROW_NUMBER() OVER(ORDER BY ID) AS SN, UDate, URemark FROM dbo.FTT_AutoUpdate ORDER BY ID DESC", "Log", false);
+            var dt = this._db.GetDataTable("SELECT TOP 20 ROW_NUMBER() OVER(ORDER BY ID) AS SN, UDate, URemark FROM dbo.FTT_AutoUpdate ORDER BY ID DESC", "Log", false);
             foreach (DataRowView r in dt.DefaultView)
             {
                 var date = (r["UDate"] as DateTime?)?.ToString("yyyy/MM/dd HH:mm:ss.fff");