Commit 5fe04ccf authored by tr's avatar tr

1、版本号规则修改:改为(年份+年度版本序号)

2、系统帮助文档界面优化
parent 9373377a
<?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"/>
......
......@@ -29,18 +29,18 @@
private void InitializeComponent()
{
this.dgvDetail = new System.Windows.Forms.DataGridView();
this.Column3 = new System.Windows.Forms.DataGridViewButtonColumn();
this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.btnUpload = new System.Windows.Forms.Button();
this.btnDownload = new System.Windows.Forms.Button();
this.panel1 = new System.Windows.Forms.Panel();
this.btnUpdate = new System.Windows.Forms.Button();
this.panel2 = new System.Windows.Forms.Panel();
this.label1 = new System.Windows.Forms.Label();
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.tsbAdd = new System.Windows.Forms.ToolStripButton();
this.tsbUpdate = new System.Windows.Forms.ToolStripButton();
((System.ComponentModel.ISupportInitialize)(this.dgvDetail)).BeginInit();
this.panel1.SuspendLayout();
this.panel2.SuspendLayout();
this.toolStrip1.SuspendLayout();
this.SuspendLayout();
//
// dgvDetail
......@@ -48,17 +48,26 @@
this.dgvDetail.BackgroundColor = System.Drawing.SystemColors.Window;
this.dgvDetail.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvDetail.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.Column3,
this.Column1,
this.Column2,
this.Column4});
this.dgvDetail.Dock = System.Windows.Forms.DockStyle.Fill;
this.dgvDetail.Location = new System.Drawing.Point(0, 38);
this.dgvDetail.Location = new System.Drawing.Point(0, 25);
this.dgvDetail.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.dgvDetail.Name = "dgvDetail";
this.dgvDetail.RowTemplate.Height = 23;
this.dgvDetail.Size = new System.Drawing.Size(659, 381);
this.dgvDetail.Size = new System.Drawing.Size(659, 348);
this.dgvDetail.TabIndex = 1;
//
// Column3
//
this.Column3.HeaderText = "操作";
this.Column3.Name = "Column3";
this.Column3.Text = "下载";
this.Column3.UseColumnTextForButtonValue = true;
this.Column3.Width = 65;
//
// Column1
//
this.Column1.DataPropertyName = "dName";
......@@ -80,67 +89,12 @@
this.Column4.Name = "Column4";
this.Column4.Width = 150;
//
// btnUpload
//
this.btnUpload.BackColor = System.Drawing.SystemColors.Window;
this.btnUpload.Enabled = false;
this.btnUpload.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpload.Location = new System.Drawing.Point(12, 6);
this.btnUpload.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.btnUpload.Name = "btnUpload";
this.btnUpload.Size = new System.Drawing.Size(87, 27);
this.btnUpload.TabIndex = 0;
this.btnUpload.Text = "上传文件";
this.btnUpload.UseVisualStyleBackColor = false;
this.btnUpload.Click += new System.EventHandler(this.btnUpload_Click);
//
// btnDownload
//
this.btnDownload.BackColor = System.Drawing.SystemColors.Window;
this.btnDownload.Enabled = false;
this.btnDownload.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDownload.Location = new System.Drawing.Point(122, 6);
this.btnDownload.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.btnDownload.Name = "btnDownload";
this.btnDownload.Size = new System.Drawing.Size(87, 27);
this.btnDownload.TabIndex = 1;
this.btnDownload.Text = "下载文件";
this.btnDownload.UseVisualStyleBackColor = false;
this.btnDownload.Click += new System.EventHandler(this.btnDownload_Click);
//
// panel1
//
this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(234)))), ((int)(((byte)(245)))), ((int)(((byte)(255)))));
this.panel1.Controls.Add(this.btnUpdate);
this.panel1.Controls.Add(this.btnDownload);
this.panel1.Controls.Add(this.btnUpload);
this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(659, 38);
this.panel1.TabIndex = 0;
//
// btnUpdate
//
this.btnUpdate.BackColor = System.Drawing.SystemColors.Window;
this.btnUpdate.Enabled = false;
this.btnUpdate.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpdate.Location = new System.Drawing.Point(560, 6);
this.btnUpdate.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.btnUpdate.Name = "btnUpdate";
this.btnUpdate.Size = new System.Drawing.Size(87, 27);
this.btnUpdate.TabIndex = 2;
this.btnUpdate.Text = "更新文件";
this.btnUpdate.UseVisualStyleBackColor = false;
this.btnUpdate.Click += new System.EventHandler(this.btnUpdate_Click);
//
// panel2
//
this.panel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(234)))), ((int)(((byte)(245)))), ((int)(((byte)(255)))));
this.panel2.Controls.Add(this.label1);
this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
this.panel2.Location = new System.Drawing.Point(0, 419);
this.panel2.Location = new System.Drawing.Point(0, 373);
this.panel2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(659, 38);
......@@ -152,18 +106,47 @@
this.label1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(41)))), ((int)(((byte)(101)))), ((int)(((byte)(204)))));
this.label1.Location = new System.Drawing.Point(12, 10);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(267, 17);
this.label1.Size = new System.Drawing.Size(255, 17);
this.label1.TabIndex = 0;
this.label1.Text = "*温馨提示:上传时超过50M的文件将被直接忽略";
this.label1.Text = "*温馨提示:上传超过50M的文件将被直接忽略";
//
// toolStrip1
//
this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.tsbAdd,
this.tsbUpdate});
this.toolStrip1.Location = new System.Drawing.Point(0, 0);
this.toolStrip1.Name = "toolStrip1";
this.toolStrip1.Size = new System.Drawing.Size(659, 25);
this.toolStrip1.TabIndex = 3;
this.toolStrip1.Text = "toolStrip1";
//
// tsbAdd
//
this.tsbAdd.Image = global::Tools.Properties.Resources.新增;
this.tsbAdd.ImageTransparentColor = System.Drawing.Color.Magenta;
this.tsbAdd.Name = "tsbAdd";
this.tsbAdd.Size = new System.Drawing.Size(76, 22);
this.tsbAdd.Text = "上传文件";
this.tsbAdd.Click += new System.EventHandler(this.tsbAdd_Click);
//
// tsbUpdate
//
this.tsbUpdate.Image = global::Tools.Properties.Resources.更新;
this.tsbUpdate.ImageTransparentColor = System.Drawing.Color.Magenta;
this.tsbUpdate.Name = "tsbUpdate";
this.tsbUpdate.Size = new System.Drawing.Size(76, 22);
this.tsbUpdate.Text = "更新文件";
this.tsbUpdate.Click += new System.EventHandler(this.tsbUpdate_Click);
//
// wHelpDocument
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.Window;
this.ClientSize = new System.Drawing.Size(659, 457);
this.ClientSize = new System.Drawing.Size(659, 411);
this.Controls.Add(this.dgvDetail);
this.Controls.Add(this.panel1);
this.Controls.Add(this.toolStrip1);
this.Controls.Add(this.panel2);
this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
......@@ -172,23 +155,25 @@
this.Text = "帮助文档";
this.Load += new System.EventHandler(this.wHelpDocument_Load);
((System.ComponentModel.ISupportInitialize)(this.dgvDetail)).EndInit();
this.panel1.ResumeLayout(false);
this.panel2.ResumeLayout(false);
this.panel2.PerformLayout();
this.toolStrip1.ResumeLayout(false);
this.toolStrip1.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.DataGridView dgvDetail;
private System.Windows.Forms.Button btnUpload;
private System.Windows.Forms.Button btnDownload;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Panel panel2;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.DataGridViewButtonColumn Column3;
private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
private System.Windows.Forms.DataGridViewTextBoxColumn Column4;
private System.Windows.Forms.Panel panel2;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Button btnUpdate;
private System.Windows.Forms.ToolStrip toolStrip1;
private System.Windows.Forms.ToolStripButton tsbAdd;
private System.Windows.Forms.ToolStripButton tsbUpdate;
}
}
\ No newline at end of file
......@@ -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;
}
}
}
......@@ -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
......@@ -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;
......
......@@ -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)
......
......@@ -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;
......
......@@ -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");
......
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