diff --git a/Bin/Debug/SuperDesign/SuperDesign.exe b/Bin/Debug/SuperDesign/SuperDesign.exe index 443c592..d0ce0f6 100644 Binary files a/Bin/Debug/SuperDesign/SuperDesign.exe and b/Bin/Debug/SuperDesign/SuperDesign.exe differ diff --git a/Bin/Debug/SuperDesign/UserDb/MyDb.dat b/Bin/Debug/SuperDesign/UserDb/MyDb.dat index 5675599..3edc2c8 100644 Binary files a/Bin/Debug/SuperDesign/UserDb/MyDb.dat and b/Bin/Debug/SuperDesign/UserDb/MyDb.dat differ diff --git a/Bin/Debug/SuperDesign/UserDb/history.dat b/Bin/Debug/SuperDesign/UserDb/history.dat index 96d5830..e645298 100644 Binary files a/Bin/Debug/SuperDesign/UserDb/history.dat and b/Bin/Debug/SuperDesign/UserDb/history.dat differ diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f1a23d..d500e63 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,36 @@ -### 2025-01-14 星期二更新 +### 2025-01-15 星期三更新 + +---- + +#### SuperDesign V3.0.2501.1501 + +#### 项目功能->更新日志 + +- *.[新增]发布日志时自动填写到MD文件里的更新日志将自动携带表情信息。 +- *.[修复]修复更新日志为空时右键添加日志报错的BUG。 +- *.[修复]修复当存在分组时,右键菜单插入日志可能填入的位置不对的BUG。 + +### 2025-01-14 星期二更新 + ---- #### SuperDesign V3.0.2501.1401 + #### 项目功能 -- *.[新增]生成列表Html日志支持分组显示。 -- *.[新增]更新日志新增支持显示距离最近一次更新的用时。 -- *.[改进]优化双击更新日志时的日志展示。 -- *.[改进]右键插入更新日志时,支持识别分组并插入。 -- *.[修复]修复更新日志如果包含####,生成的MD日志格式不正确的BUG。 -#### 网页抓取工具 -- *.[新增]新增提交时间显示。 + +- :cactus:[新增]生成列表Html日志支持分组显示。 + +- :cactus:[新增]更新日志新增支持显示距离最近一次更新的用时。 + +- :butterfly:[改进]优化双击更新日志时的日志展示。 + +- :butterfly:[改进]右键插入更新日志时,支持识别分组并插入。 + +- :lady_beetle:[修复]修复更新日志如果包含####,生成的MD日志格式不正确的BUG。 + + #### 网页抓取工具 + +- :cactus:[新增]新增提交时间显示。 ### 2025-01-13 星期一更新 @@ -43,7 +64,7 @@ #### RySmartEditor V1.0.2501.0801 - *.[改进]复制文件到其它站点同位置功能支持复制文件夹。 - + #### SuperDesign V3.0.2501.0801 - *.[新增]支持直接设置主项目的功能。 diff --git a/README.md b/README.md index 1fc9a0b..29117d0 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,23 @@ # 开发辅助工具 -#### 介绍 -开发辅助工具是一款专为开发人员设计的工具,内置了多种开发人员常见工具。 -- 支持各种编码解码 -- 支持时间戳转换 +--- + +##### 开发辅助工具是一款专为开发人员设计的工具,内置了多种开发人员常见工具。 + +支持OS:Windows 支持框架:.NET 4.6.2 [更新日志](CHANGELOG.md) + +--- + +#### 特性 + +- 支持各种编码解码。 +- 支持时间戳转换。 - 更好用的网页抓取工具。 -- XPath测试工具 +- XPath测试工具。 - 正则表达式测试工具。 -- 字符串转代码工具 -- Json格式化工具 -- 二维码生成与解析工具 -- 字符串统计工具 -- 颜色转换工具 -- 毕方架构解析和辅助工具。 \ No newline at end of file +- 字符串转代码工具。 +- Json格式化工具。 +- 二维码生成与解析工具。 +- 字符串统计工具。 +- 颜色转换工具。 +- 毕方架构解析和辅助工具,支持项目更新日志快速更新。 \ No newline at end of file diff --git a/Source/开发辅助工具/Manager/APIManager.cs b/Source/开发辅助工具/Manager/APIManager.cs index a05d3ae..51fa111 100644 --- a/Source/开发辅助工具/Manager/APIManager.cs +++ b/Source/开发辅助工具/Manager/APIManager.cs @@ -12,7 +12,7 @@ namespace SuperDesign.Manager { public class APIManager { - public static string GetMdLogText(JArray jarr, DateTime dt) + public static string GetMdLogText(JArray jarr, DateTime dt,bool UseEmoji=false) { string log_text = "### " + DateTime.Now.ToString("yyyy-MM-dd dddd") + "更新"; log_text += "\r\n----"; @@ -25,14 +25,30 @@ namespace SuperDesign.Manager { if (logs[m].Length == 0) { continue; } var log_item = logs[m].Replace("[开发]",""); + if (log_item.StartsWith("*.")) + { + log_item = "- " + log_item; + } + if (UseEmoji) + { + var type_item = logs[m].GetStr("- *.[", "]"); + if (type_item == "修复") + { + log_item = log_item.Replace("*.[" + type_item + "]", ":lady_beetle:[" + type_item + "]"); + } + else if (type_item == "改进") + { + log_item = log_item.Replace("*.[" + type_item + "]", ":butterfly:[" + type_item + "]"); + } + else if (type_item == "新增") + { + log_item = log_item.Replace("*.[" + type_item + "]", ":cactus:[" + type_item + "]"); + } + } if (log_item.StartsWith("- *.")) { log_text += "\r\n" + log_item; } - else if (log_item.StartsWith("*.")) - { - log_text += "\r\n- " + log_item; - } else if (log_item.StartsWith("#### ")) { log_text += "\r\n" + log_item; diff --git a/Source/开发辅助工具/Properties/AssemblyInfo.cs b/Source/开发辅助工具/Properties/AssemblyInfo.cs index 4a37cd5..9599241 100644 --- a/Source/开发辅助工具/Properties/AssemblyInfo.cs +++ b/Source/开发辅助工具/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号 // 方法是按如下所示使用“*”: : // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.0.2501.1401")] -[assembly: AssemblyFileVersion("3.0.2501.1401")] \ No newline at end of file +[assembly: AssemblyVersion("3.0.2501.1501")] +[assembly: AssemblyFileVersion("3.0.2501.1501")] \ No newline at end of file diff --git a/Source/开发辅助工具/Tools/FrmProject.cs b/Source/开发辅助工具/Tools/FrmProject.cs index ce042cd..6cc1a2a 100644 --- a/Source/开发辅助工具/Tools/FrmProject.cs +++ b/Source/开发辅助工具/Tools/FrmProject.cs @@ -1178,7 +1178,7 @@ namespace 开发辅助工具.Tools Main_Version = first_tag.Version; } #region 日志表 - var log_text = SuperDesign.Manager.APIManager.GetMdLogText(jarr, DateTime.Now); + var log_text = SuperDesign.Manager.APIManager.GetMdLogText(jarr, DateTime.Now,true); var CHANGELOG = RyFiles.ReadAllText(_path+ "\\CHANGELOG.md").Trim(); CHANGELOG = log_text + "\r\n\r\n" + CHANGELOG; RyFiles.WriteAllText(_path + "\\CHANGELOG.md", CHANGELOG); @@ -1510,11 +1510,14 @@ namespace 开发辅助工具.Tools if (line_index < 0) { line_index = 0; } else { - for (int j = line_index; j>=0; j--) + if (lines.Count > 0) { - if (lines[j].StartsWith("#### ")) + for (int j = line_index; j >= 0; j--) { - line_index = j+1;break; + if (lines[j].StartsWith("#### ")) + { + line_index = j + 1; break; + } } } } diff --git a/Source/开发辅助工具/Tools/UpLog/FrmPublishLogs.Designer.cs b/Source/开发辅助工具/Tools/UpLog/FrmPublishLogs.Designer.cs index 2023c1c..cb71a2e 100644 --- a/Source/开发辅助工具/Tools/UpLog/FrmPublishLogs.Designer.cs +++ b/Source/开发辅助工具/Tools/UpLog/FrmPublishLogs.Designer.cs @@ -28,6 +28,7 @@ /// </summary> private void InitializeComponent() { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmPublishLogs)); this.BtnCopyMD = new ryControls.ButtonEx(); this.BtnCopyHtml = new ryControls.ButtonEx(); this.SuspendLayout(); @@ -66,6 +67,7 @@ this.Controls.Add(this.BtnCopyHtml); this.Controls.Add(this.BtnCopyMD); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FrmPublishLogs"; diff --git a/Source/开发辅助工具/Tools/UpLog/FrmPublishLogs.resx b/Source/开发辅助工具/Tools/UpLog/FrmPublishLogs.resx index 1af7de1..3a44dc1 100644 --- a/Source/开发辅助工具/Tools/UpLog/FrmPublishLogs.resx +++ b/Source/开发辅助工具/Tools/UpLog/FrmPublishLogs.resx @@ -117,4 +117,20 @@ <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> + <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> + <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + AAABAAEAICAAAAAAIABYAgAAFgAAAIlQTkcNChoKAAAADUlIRFIAAAAgAAAAIAgGAAAAc3p69AAAAARn + QU1BAACxjwv8YQUAAAIPSURBVFhH7Ze/SwMxFMcz+AMFdXMQhJt1lOZORSyCoF2chPNyiBWxk06Ci6h/ + gS7OujgIIi6Km+IkuIgODi6Oig4dHBwj35ytSa65u3B16we+0KYved/kvUtbQlpkwQ1KhLILfdgIYjEn + F57v1OUulAkNL5UxkwBiMUcfz0yB3RDKXiW9E8peSCFY0sbjctkRoeHj7xz1s8wgWHYtShBeKjFJiBOQ + SoC18htgV0pMEohtqgEwNN+hvE9Cj22KgTy0DOQ24LFZQhm3EubU5+c1ANBYNpJpioE8tAxgLS8s6sNm + GhkYX+6JaWS+T4kBNNjpHV3b73YrD53uymeXWzkV3yFW6AYK4UysyyPd12M832mn5bvBsd3vyeIZX5x+ + 5uszH3xu6pYPTxx8tdHyW2xTRnQDaeB4KeNIvF3iQoebnJ/vRa+h8eJJtctdrWYrhaUBHDd2XEsGXR9H + ksdwGuIkUrExUAiWBsa2qnIikwEI5UjvCQsDaDLsTE9kMoCTwonp66hYGECno9n0REj++vRnpGYGsell + sDDQqP7QXllNLp+GeIISsTCAR6+RAZNQLnE3JGJhoH90cwONpScyCfdEU5sQcaYy6EJMev2BjQHg+Q4u + Gfki0oXk0e+Ef7iIBJ7vYHcoB+qMboeQGLdgdBVnSQ7En4vYvd9YslHPd9ATaLLoi2i1Kp55Guwo67eQ + +AGrnEALTX7CoAAAAABJRU5ErkJggg== +</value> + </data> </root> \ No newline at end of file diff --git a/Source/开发辅助工具/Tools/UpLog/FrmUpdateLog.Designer.cs b/Source/开发辅助工具/Tools/UpLog/FrmUpdateLog.Designer.cs index dba6c8a..a721ecc 100644 --- a/Source/开发辅助工具/Tools/UpLog/FrmUpdateLog.Designer.cs +++ b/Source/开发辅助工具/Tools/UpLog/FrmUpdateLog.Designer.cs @@ -28,6 +28,7 @@ /// </summary> private void InitializeComponent() { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmUpdateLog)); this.tabControl1 = new System.Windows.Forms.TabControl(); this.SuspendLayout(); // @@ -48,6 +49,7 @@ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(786, 580); this.Controls.Add(this.tabControl1); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "FrmUpdateLog"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "更新日志"; diff --git a/Source/开发辅助工具/Tools/UpLog/FrmUpdateLog.cs b/Source/开发辅助工具/Tools/UpLog/FrmUpdateLog.cs index ac322fa..fc305e9 100644 --- a/Source/开发辅助工具/Tools/UpLog/FrmUpdateLog.cs +++ b/Source/开发辅助工具/Tools/UpLog/FrmUpdateLog.cs @@ -106,7 +106,7 @@ namespace SuperDesign.Tools } if(line.StartsWith("#### ")) { - line ="<b>"+ line + "</b>"; + line ="<br /><b>"+ line.Substring(5) + "</b>"; } LogText += line; } diff --git a/Source/开发辅助工具/Tools/UpLog/FrmUpdateLog.resx b/Source/开发辅助工具/Tools/UpLog/FrmUpdateLog.resx index 1af7de1..3a44dc1 100644 --- a/Source/开发辅助工具/Tools/UpLog/FrmUpdateLog.resx +++ b/Source/开发辅助工具/Tools/UpLog/FrmUpdateLog.resx @@ -117,4 +117,20 @@ <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> + <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> + <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + AAABAAEAICAAAAAAIABYAgAAFgAAAIlQTkcNChoKAAAADUlIRFIAAAAgAAAAIAgGAAAAc3p69AAAAARn + QU1BAACxjwv8YQUAAAIPSURBVFhH7Ze/SwMxFMcz+AMFdXMQhJt1lOZORSyCoF2chPNyiBWxk06Ci6h/ + gS7OujgIIi6Km+IkuIgODi6Oig4dHBwj35ytSa65u3B16we+0KYved/kvUtbQlpkwQ1KhLILfdgIYjEn + F57v1OUulAkNL5UxkwBiMUcfz0yB3RDKXiW9E8peSCFY0sbjctkRoeHj7xz1s8wgWHYtShBeKjFJiBOQ + SoC18htgV0pMEohtqgEwNN+hvE9Cj22KgTy0DOQ24LFZQhm3EubU5+c1ANBYNpJpioE8tAxgLS8s6sNm + GhkYX+6JaWS+T4kBNNjpHV3b73YrD53uymeXWzkV3yFW6AYK4UysyyPd12M832mn5bvBsd3vyeIZX5x+ + 5uszH3xu6pYPTxx8tdHyW2xTRnQDaeB4KeNIvF3iQoebnJ/vRa+h8eJJtctdrWYrhaUBHDd2XEsGXR9H + ksdwGuIkUrExUAiWBsa2qnIikwEI5UjvCQsDaDLsTE9kMoCTwonp66hYGECno9n0REj++vRnpGYGsell + sDDQqP7QXllNLp+GeIISsTCAR6+RAZNQLnE3JGJhoH90cwONpScyCfdEU5sQcaYy6EJMev2BjQHg+Q4u + Gfki0oXk0e+Ef7iIBJ7vYHcoB+qMboeQGLdgdBVnSQ7En4vYvd9YslHPd9ATaLLoi2i1Kp55Guwo67eQ + +AGrnEALTX7CoAAAAABJRU5ErkJggg== +</value> + </data> </root> \ No newline at end of file