();
@@ -1512,13 +1641,18 @@ namespace 开发辅助工具.Tools
{
if (lines.Count > 0)
{
+ var have = false;
for (int j = line_index; j >= 0; j--)
{
if (lines[j].StartsWith("#### "))
{
- line_index = j + 1; break;
+ line_index = j + 1; have = true; break;
}
}
+ if(!have)
+ {
+ line_index = 0;
+ }
}
}
var find_line = -1;
@@ -1541,8 +1675,12 @@ namespace 开发辅助工具.Tools
{
if (find_line >= 0)
{
- lines.Insert(find_line+1, "*.[" + name + "]");
find_line++;
+ rich.SelectionStart = rich.GetFirstCharIndexFromLine(find_line);
+ rich.SelectionLength = 0;
+ rich.SelectedText = "*.[" + name + "]\n";
+ rich.SelectionStart--;
+ //lines.Insert(find_line, "*.[" + name + "]");
match = true;
break;
}
@@ -1550,50 +1688,68 @@ namespace 开发辅助工具.Tools
}
if(find_line>=0 && !match)
{
- lines.Add("*.[" + name + "]");
+ rich.SelectionStart =rich.Text.Length;
+ rich.SelectionLength = 0;
+ rich.SelectedText = "\n*.[" + name + "]";
+ //lines.Add("*.[" + name + "]");
find_line++;
}
if(find_line == -1)
{
if (name == "新增")
{
- lines.Insert(0, "*.[" + name + "]");
- find_line = 0;
+ rich.SelectionStart = rich.GetFirstCharIndexFromLine(line_index);
+ rich.SelectionLength = 0;
+ rich.SelectedText = "*.[" + name + "]\n";
+ rich.SelectionStart--;
+ //lines.Insert(line_index, "*.[" + name + "]");
+ find_line = line_index;
}
else if (name == "改进")
{
if (dict_line.ContainsKey("新增"))
{
- lines.Insert(dict_line["新增"]+1, "*.[" + name + "]");
+ rich.SelectionStart = rich.GetFirstCharIndexFromLine(dict_line["新增"] + 1);
+ rich.SelectionLength = 0;
+ rich.SelectedText = "*.[" + name + "]\n";
+ rich.SelectionStart--;
+ //lines.Insert(dict_line["新增"]+1, "*.[" + name + "]");
find_line = dict_line["新增"]+1;
}
else
{
- lines.Insert(0, "*.[" + name + "]");
- find_line = 0;
+ rich.SelectionStart = rich.GetFirstCharIndexFromLine(line_index);
+ rich.SelectionLength = 0;
+ rich.SelectedText = "*.[" + name + "]\n";
+ rich.SelectionStart--;
+ //lines.Insert(line_index, "*.[" + name + "]");
+ find_line = line_index;
}
}
else
{
- lines.Add("*.[" + name + "]");
+ rich.SelectionStart = rich.Text.Length;
+ rich.SelectionLength = 0;
+ rich.SelectedText = "\n*.[" + name + "]";
+ //lines.Add("*.[" + name + "]");
find_line = lines.Count - 1;
}
}
- var txt = "";
- var SelectionStart = -1;
- for (int t = 0; t < lines.Count; t++)
- {
- if (lines[t].Length == 0) { continue; }
- if (txt.Length > 0) { txt += "\n"; }
- txt += lines[t];
- if(find_line==t)
- {
- SelectionStart = txt.Length;
- }
- }
- rich.Text = txt;
- rich.SelectionStart= SelectionStart;
- rich.SelectionLength = 0;
+ //var txt = "";
+ //var SelectionStart = -1;
+ //for (int t = 0; t < lines.Count; t++)
+ //{
+ // if (lines[t].Length == 0) { continue; }
+ // if (txt.Length > 0) { txt += "\n"; }
+ // txt += lines[t];
+ // if(find_line==t)
+ // {
+ // SelectionStart = txt.Length;
+ // }
+ //}
+ //rich.Text = txt;
+ //rich.SelectionStart= SelectionStart;
+ //rich.SelectionLength = 0;
}
var ds_now_up = db.ReadData("select * from ProjectNowLogs where Name='" + p_name + "'");
if (ds_now_up.HaveData())
@@ -1746,7 +1902,10 @@ namespace 开发辅助工具.Tools
foreach (var item in main_info_all)
{
var main_info = item.Value;
- log_text += "\r\n" + System.Web.HttpUtility.HtmlEncode(item.Key) + "
";
+ if (item.Key.Length > 0)
+ {
+ log_text += "\r\n" + System.Web.HttpUtility.HtmlEncode(item.Key) + "
";
+ }
for (int i = 0; i < main_info.AddInfo.Count; i++)
{
log_text += "\r\n" + System.Web.HttpUtility.HtmlEncode(main_info.AddInfo[i]) + "
";
@@ -1777,7 +1936,10 @@ namespace 开发辅助工具.Tools
foreach (var item2 in main_info_all)
{
var main_info = item2.Value;
- log_text += "\r\n" + System.Web.HttpUtility.HtmlEncode(item2.Key) + "
";
+ if (item2.Key.Length > 0)
+ {
+ log_text += "\r\n" + System.Web.HttpUtility.HtmlEncode(item2.Key) + "
";
+ }
for (int i = 0; i < main_info.AddInfo.Count; i++)
{
log_text += "\r\n" + System.Web.HttpUtility.HtmlEncode(main_info.AddInfo[i]) + "
";
@@ -1823,6 +1985,41 @@ namespace 开发辅助工具.Tools
}
}
}
+
+ private void BtnFtpFiles_Click(object sender, EventArgs e)
+ {
+ var _path = GetBFFolderPath();
+ if (_path.Length > 0)
+ {
+ var txt = RyFiles.ReadAllText(_path+ "\\FTPUploadData.jryp");
+ FrmSaveContent frm=new FrmSaveContent();
+ frm.Text = "FTP上传文件列表";
+ frm.Rich1.Text = txt;
+ if(frm.ShowDialog()==DialogResult.OK)
+ {
+ RyFiles.WriteAllText(_path + "\\FTPUploadData.jryp", frm.Rich1.Text);
+ BtnUploadProject.Enabled = true;
+ }
+ frm.Dispose();
+ }
+ }
+
+ private void BtnPackFileList_Click(object sender, EventArgs e)
+ {
+ var _path = GetBFFolderPath();
+ if (_path.Length > 0)
+ {
+ var txt = RyFiles.ReadAllText(_path + "\\Publish\\Publish.set");
+ FrmSaveContent frm = new FrmSaveContent();
+ frm.Text = "打包文件列表";
+ frm.Rich1.Text = txt;
+ if (frm.ShowDialog() == DialogResult.OK)
+ {
+ RyFiles.WriteAllText(_path + "\\Publish\\Publish.set", frm.Rich1.Text);
+ }
+ frm.Dispose();
+ }
+ }
}
class UpLogItem
{
diff --git a/Source/开发辅助工具/Tools/FrmWebGet.Designer.cs b/Source/开发辅助工具/Tools/FrmWebGet.Designer.cs
index 2f28ec0..45adce9 100644
--- a/Source/开发辅助工具/Tools/FrmWebGet.Designer.cs
+++ b/Source/开发辅助工具/Tools/FrmWebGet.Designer.cs
@@ -86,11 +86,11 @@
this.objectListView2 = new BrightIdeasSoftware.FastObjectListView();
this.OlvUrl = ((BrightIdeasSoftware.OLVColumn)(new BrightIdeasSoftware.OLVColumn()));
this.OlvName = ((BrightIdeasSoftware.OLVColumn)(new BrightIdeasSoftware.OLVColumn()));
- this.BtnMore = new ryControls.SuperPictureBox();
this.MenuMore = new System.Windows.Forms.ContextMenuStrip(this.components);
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
- this.BtnSetting = new ryControls.SuperPictureBox();
this.BtnShare = new ryControls.SuperPictureBox();
+ this.BtnSetting = new ryControls.SuperPictureBox();
+ this.BtnMore = new ryControls.SuperPictureBox();
this.RbHead = new System.Windows.Forms.RadioButton();
this.MenuSetting = new System.Windows.Forms.ContextMenuStrip(this.components);
this.生成代码ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -114,9 +114,9 @@
this.groupBox1.SuspendLayout();
this.contextMenuStrip1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.objectListView2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.BtnMore)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.BtnSetting)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.BtnShare)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.BtnSetting)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.BtnMore)).BeginInit();
this.MenuSetting.SuspendLayout();
this.SuspendLayout();
//
@@ -161,8 +161,8 @@
//
// RichHtml
//
+ this.RichHtml.BackColor = System.Drawing.Color.White;
this.RichHtml.BorderStyle = System.Windows.Forms.BorderStyle.None;
- this.RichHtml.DetectUrls = false;
this.RichHtml.Dock = System.Windows.Forms.DockStyle.Fill;
this.RichHtml.EmptyText = "";
this.RichHtml.Font = new System.Drawing.Font("Courier New", 10F);
@@ -216,8 +216,8 @@
//
// RichCookie
//
+ this.RichCookie.BackColor = System.Drawing.Color.White;
this.RichCookie.BorderStyle = System.Windows.Forms.BorderStyle.None;
- this.RichCookie.DetectUrls = false;
this.RichCookie.Dock = System.Windows.Forms.DockStyle.Fill;
this.RichCookie.EmptyText = "";
this.RichCookie.Font = new System.Drawing.Font("Courier New", 10F);
@@ -244,8 +244,8 @@
//
// RichStatus
//
+ this.RichStatus.BackColor = System.Drawing.Color.White;
this.RichStatus.BorderStyle = System.Windows.Forms.BorderStyle.None;
- this.RichStatus.DetectUrls = false;
this.RichStatus.Dock = System.Windows.Forms.DockStyle.Fill;
this.RichStatus.EmptyText = "";
this.RichStatus.Font = new System.Drawing.Font("Courier New", 10F);
@@ -272,8 +272,8 @@
//
// RichHeader
//
+ this.RichHeader.BackColor = System.Drawing.Color.White;
this.RichHeader.BorderStyle = System.Windows.Forms.BorderStyle.None;
- this.RichHeader.DetectUrls = false;
this.RichHeader.Dock = System.Windows.Forms.DockStyle.Fill;
this.RichHeader.EmptyText = "";
this.RichHeader.Font = new System.Drawing.Font("Courier New", 10F);
@@ -285,7 +285,6 @@
this.RichHeader.Size = new System.Drawing.Size(882, 300);
this.RichHeader.TabIndex = 6;
this.RichHeader.Text = "";
- this.RichHeader.WordWrap = true;
//
// tabPreview
//
@@ -340,11 +339,11 @@
this.label1.BackColor = System.Drawing.Color.White;
this.label1.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.ForeColor = System.Drawing.Color.Gray;
- this.label1.Location = new System.Drawing.Point(314, 39);
+ this.label1.Location = new System.Drawing.Point(292, 39);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(189, 14);
+ this.label1.Size = new System.Drawing.Size(238, 14);
this.label1.TabIndex = 4;
- this.label1.Text = "当前模式下无法修改Post数据";
+ this.label1.Text = "当前模式下Post数据不生效,无法修改";
this.label1.Visible = false;
//
// TxtPost
@@ -387,7 +386,6 @@
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.TxtCookie.BorderStyle = System.Windows.Forms.BorderStyle.None;
- this.TxtCookie.DetectUrls = false;
this.TxtCookie.EmptyText = "请填写请求时要发送的Cookie";
this.TxtCookie.Font = new System.Drawing.Font("Courier New", 10F);
this.TxtCookie.ForeColor = System.Drawing.Color.Black;
@@ -418,7 +416,6 @@
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.TxtInputHeader.BorderStyle = System.Windows.Forms.BorderStyle.None;
- this.TxtInputHeader.DetectUrls = false;
this.TxtInputHeader.EmptyText = "请填写请求时要发送的Header";
this.TxtInputHeader.Font = new System.Drawing.Font("Courier New", 10F);
this.TxtInputHeader.ForeColor = System.Drawing.Color.Black;
@@ -466,8 +463,9 @@
this.CbbContentType.Name = "CbbContentType";
this.CbbContentType.SelectedIndex = -1;
this.CbbContentType.SelectedItem = null;
- this.CbbContentType.Size = new System.Drawing.Size(205, 23);
+ this.CbbContentType.Size = new System.Drawing.Size(218, 23);
this.CbbContentType.TabIndex = 304;
+ this.CbbContentType.ToolTipText = "";
//
// CbbUserAgent
//
@@ -476,18 +474,17 @@
this.CbbUserAgent.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(236)))), ((int)(((byte)(239)))), ((int)(((byte)(244)))));
this.CbbUserAgent.ButtonRoundBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(236)))), ((int)(((byte)(239)))), ((int)(((byte)(244)))));
this.CbbUserAgent.EmptyText = "";
- this.CbbUserAgent.Items.Add("Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)");
- this.CbbUserAgent.Items.Add("Mozilla/5.0 (Windows NT 6.1; WOW64; rv:18.0) Gecko/20100101 Firefox/18.0");
- this.CbbUserAgent.Items.Add("Mozilla/4.0 (compatible; MSIE 8.0; Windows NT6.0)");
- this.CbbUserAgent.Items.Add("Opera/9.27 (Windows NT 5.2; U; zh-cn)");
- this.CbbUserAgent.Location = new System.Drawing.Point(360, 18);
+ this.CbbUserAgent.Location = new System.Drawing.Point(374, 18);
this.CbbUserAgent.MaxPopupHeight = 0;
this.CbbUserAgent.MaxPopupWidth = 0;
this.CbbUserAgent.Name = "CbbUserAgent";
this.CbbUserAgent.SelectedIndex = -1;
this.CbbUserAgent.SelectedItem = null;
- this.CbbUserAgent.Size = new System.Drawing.Size(520, 23);
+ this.CbbUserAgent.Size = new System.Drawing.Size(506, 23);
this.CbbUserAgent.TabIndex = 303;
+ this.toolTip1.SetToolTip(this.CbbUserAgent, "assdddddd");
+ this.CbbUserAgent.ToolTipText = "";
+ this.CbbUserAgent.SelectedIndexChanged += new System.EventHandler(this.CbbUserAgent_SelectedIndexChanged);
//
// CbbReferer
//
@@ -496,7 +493,7 @@
this.CbbReferer.BackColor = System.Drawing.Color.White;
this.CbbReferer.EmptyText = "引用页(可选)";
this.CbbReferer.ImeMode = System.Windows.Forms.ImeMode.Close;
- this.CbbReferer.Location = new System.Drawing.Point(360, 46);
+ this.CbbReferer.Location = new System.Drawing.Point(374, 46);
this.CbbReferer.LongTime = 2000;
this.CbbReferer.MaxLength = 999999999;
this.CbbReferer.MaxUndoRedoSteps = 50;
@@ -508,7 +505,7 @@
this.CbbReferer.SelectedText = "";
this.CbbReferer.SelectionLength = 0;
this.CbbReferer.SelectionStart = 0;
- this.CbbReferer.Size = new System.Drawing.Size(520, 23);
+ this.CbbReferer.Size = new System.Drawing.Size(506, 23);
this.CbbReferer.TabIndex = 302;
this.CbbReferer.TextAlign = System.Windows.Forms.HorizontalAlignment.Left;
this.CbbReferer.ToolTip = "";
@@ -531,7 +528,7 @@
this.CbbIp.SelectedText = "";
this.CbbIp.SelectionLength = 0;
this.CbbIp.SelectionStart = 0;
- this.CbbIp.Size = new System.Drawing.Size(205, 23);
+ this.CbbIp.Size = new System.Drawing.Size(218, 23);
this.CbbIp.TabIndex = 301;
this.CbbIp.TextAlign = System.Windows.Forms.HorizontalAlignment.Left;
this.CbbIp.ToolTip = "";
@@ -549,7 +546,7 @@
// label7
//
this.label7.AutoSize = true;
- this.label7.Location = new System.Drawing.Point(297, 24);
+ this.label7.Location = new System.Drawing.Point(310, 24);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(59, 12);
this.label7.TabIndex = 2;
@@ -558,7 +555,7 @@
// label11
//
this.label11.AutoSize = true;
- this.label11.Location = new System.Drawing.Point(299, 50);
+ this.label11.Location = new System.Drawing.Point(312, 50);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(47, 12);
this.label11.TabIndex = 0;
@@ -876,26 +873,31 @@
this.OlvName.Text = "名称";
this.OlvName.Width = 200;
//
- // BtnMore
- //
- this.BtnMore.Cursor = System.Windows.Forms.Cursors.Hand;
- this.BtnMore.Image = ((System.Drawing.Image)(resources.GetObject("BtnMore.Image")));
- this.BtnMore.ImageDomain = null;
- this.BtnMore.ImageResFolder = null;
- this.BtnMore.Location = new System.Drawing.Point(556, 8);
- this.BtnMore.Name = "BtnMore";
- this.BtnMore.Size = new System.Drawing.Size(20, 18);
- this.BtnMore.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
- this.BtnMore.TabIndex = 114;
- this.BtnMore.TabStop = false;
- this.toolTip1.SetToolTip(this.BtnMore, "更多选项");
- this.BtnMore.Click += new System.EventHandler(this.BtnMore_Click);
- //
// MenuMore
//
this.MenuMore.Name = "MenuMore";
this.MenuMore.Size = new System.Drawing.Size(61, 4);
//
+ // toolTip1
+ //
+ this.toolTip1.ShowAlways = true;
+ this.toolTip1.ToolTipIcon = System.Windows.Forms.ToolTipIcon.Info;
+ //
+ // BtnShare
+ //
+ this.BtnShare.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.BtnShare.Image = ((System.Drawing.Image)(resources.GetObject("BtnShare.Image")));
+ this.BtnShare.ImageDomain = null;
+ this.BtnShare.ImageResFolder = null;
+ this.BtnShare.Location = new System.Drawing.Point(849, 11);
+ this.BtnShare.Name = "BtnShare";
+ this.BtnShare.Size = new System.Drawing.Size(20, 18);
+ this.BtnShare.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
+ this.BtnShare.TabIndex = 117;
+ this.BtnShare.TabStop = false;
+ this.toolTip1.SetToolTip(this.BtnShare, "分享当前页面数据给别人");
+ this.BtnShare.Click += new System.EventHandler(this.BtnShare_Click);
+ //
// BtnSetting
//
this.BtnSetting.Cursor = System.Windows.Forms.Cursors.Hand;
@@ -911,20 +913,20 @@
this.toolTip1.SetToolTip(this.BtnSetting, "更多选项");
this.BtnSetting.Click += new System.EventHandler(this.BtnSetting_Click);
//
- // BtnShare
+ // BtnMore
//
- this.BtnShare.Cursor = System.Windows.Forms.Cursors.Hand;
- this.BtnShare.Image = ((System.Drawing.Image)(resources.GetObject("BtnShare.Image")));
- this.BtnShare.ImageDomain = null;
- this.BtnShare.ImageResFolder = null;
- this.BtnShare.Location = new System.Drawing.Point(849, 11);
- this.BtnShare.Name = "BtnShare";
- this.BtnShare.Size = new System.Drawing.Size(20, 18);
- this.BtnShare.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
- this.BtnShare.TabIndex = 117;
- this.BtnShare.TabStop = false;
- this.toolTip1.SetToolTip(this.BtnShare, "分享当前页面数据给别人");
- this.BtnShare.Click += new System.EventHandler(this.BtnShare_Click);
+ this.BtnMore.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.BtnMore.Image = ((System.Drawing.Image)(resources.GetObject("BtnMore.Image")));
+ this.BtnMore.ImageDomain = null;
+ this.BtnMore.ImageResFolder = null;
+ this.BtnMore.Location = new System.Drawing.Point(556, 8);
+ this.BtnMore.Name = "BtnMore";
+ this.BtnMore.Size = new System.Drawing.Size(20, 18);
+ this.BtnMore.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
+ this.BtnMore.TabIndex = 114;
+ this.BtnMore.TabStop = false;
+ this.toolTip1.SetToolTip(this.BtnMore, "更多选项");
+ this.BtnMore.Click += new System.EventHandler(this.BtnMore_Click);
//
// RbHead
//
@@ -1000,14 +1002,8 @@
this.Controls.Add(this.RbGet);
this.Controls.Add(this.label2);
this.Controls.Add(this.objectListView2);
- this.DockAreas = ((WeifenLuo.WinFormsUI.Docking.DockAreas)((((((WeifenLuo.WinFormsUI.Docking.DockAreas.Float | WeifenLuo.WinFormsUI.Docking.DockAreas.DockLeft)
- | WeifenLuo.WinFormsUI.Docking.DockAreas.DockRight)
- | WeifenLuo.WinFormsUI.Docking.DockAreas.DockTop)
- | WeifenLuo.WinFormsUI.Docking.DockAreas.DockBottom)
- | WeifenLuo.WinFormsUI.Docking.DockAreas.Document)));
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "FrmWebGet";
- this.ShowHint = WeifenLuo.WinFormsUI.Docking.DockState.Unknown;
this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Show;
this.TabPageContextMenuStrip = this.menuRight1;
this.Text = "网页抓取工具";
@@ -1033,9 +1029,9 @@
this.groupBox1.PerformLayout();
this.contextMenuStrip1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.objectListView2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.BtnMore)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.BtnSetting)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.BtnShare)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.BtnSetting)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.BtnMore)).EndInit();
this.MenuSetting.ResumeLayout(false);
this.ResumeLayout(false);
this.PerformLayout();
diff --git a/Source/开发辅助工具/Tools/FrmWebGet.cs b/Source/开发辅助工具/Tools/FrmWebGet.cs
index 3ff86c5..b6cdee9 100644
--- a/Source/开发辅助工具/Tools/FrmWebGet.cs
+++ b/Source/开发辅助工具/Tools/FrmWebGet.cs
@@ -32,6 +32,7 @@ using SuperDesign.Manager;
using SuperDesign.Tools;
using ScintillaNETV2.Highlight;
using System.Runtime.InteropServices;
+using WinShell;
namespace 开发辅助工具.Tools
{
@@ -43,6 +44,7 @@ namespace 开发辅助工具.Tools
LoadPram();
tabControl2.SelectedTab = tabPage12;
OlvUrl.AspectGetter = delegate (object x) { return ((UrlInfo)x)?.Url; };
+ OlvUrl.Renderer = new UrlRenderer();
OlvName.AspectGetter = delegate (object x) {
var item = (UrlInfo)x;
if (item==null || item.Des.Length == 0)
@@ -56,6 +58,40 @@ namespace 开发辅助工具.Tools
objectListView2.FormatRow += ObjectListView2_FormatRow;
}
+ class UrlRenderer : BaseRenderer
+ {
+ public UrlRenderer()
+ {
+ UseGdiTextRendering = false;
+ }
+ //
+ // 摘要:
+ // Draw the flags
+ //
+ // 参数:
+ // g:
+ //
+ // r:
+ public override void Render(Graphics g, Rectangle r)
+ {
+ DrawBackground(g, r);
+ if (!(base.Aspect is IConvertible convertible))
+ {
+ return;
+ }
+
+ r = ApplyCellPadding(r);
+ if (base.RowObject is UrlInfo item1)
+ {
+ var start_x = 0;
+ if(item1.Icon!=null)
+ {
+ start_x += DrawImage2(g, r, start_x,new Bitmap(item1.Icon));
+ }
+ start_x += DrawText2(g, r, start_x,item1.Url);
+ }
+ }
+ }
private DescribedTaskRenderer CreateDescribedTaskRenderer()
{
@@ -95,18 +131,34 @@ namespace 开发辅助工具.Tools
private void LoadPram()
{
CbbContentType.SelectedIndex = 0;
- CbbUserAgent.SelectedIndex = 0;
CbbEncoding.SelectedIndex = 0;
CbbTimeout.SelectedIndex = CbbTimeout.Items.Count-2;
CbbWriteTimeout.SelectedIndex = CbbWriteTimeout.Items.Count - 2;
- CbbUserAgent.Items.AddRange(new UserAgentInfo[]{
- new UserAgentInfo() { name = "QQ浏览器极速模式", useragent = "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.26 Safari/537.36 Core/1.63.6776.400 QQBrowser/10.3.2601.400" },
- new UserAgentInfo() { name = "360浏览器极速模式", useragent = "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.132 Safari/537.36" },
- new UserAgentInfo() { name = "QQ浏览器手机版", useragent = "Mozilla/5.0 (Linux; U; Android 8.1.0; zh-cn; BLA-AL00 Build/HUAWEIBLA-AL00) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/57.0.2987.132 MQQBrowser/8.9 Mobile Safari/537.36" },
- new UserAgentInfo() { name = "微信", useragent = "Mozilla/5.0 (Linux; U; Android 4.1.2; zh-cn; GT-I9300 Build/JZO54K) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30 MicroMessenger/5.2.380" },
- new UserAgentInfo() { name = "iPhone", useragent = "Mozilla/5.0 (iPhone; U; CPU like Mac OS X; en) AppleWebKit/420+ (KHTML, like Gecko) Version/3.0 Mobile/1C28 Safari/419.3" },
- new UserAgentInfo() { name = "安卓", useragent = "Mozilla/5.0 (Linux; Android 4.1.1; Nexus 7 Build/JRO03S) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.166 Safari/535.19" },
+ CbbUserAgent.Items.AddRange(new ComboPopupItem[]{
+ new ComboPopupItem() {Image=SuperDesign.Properties.Resources.windows,Text = "Edge浏览器", ValueStr1 = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/132.0.0.0 Safari/537.36 Edg/132.0.0.0" },
+ new ComboPopupItem() {Image=SuperDesign.Properties.Resources.windows,Text = "Chrome浏览器", ValueStr1 = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/109.0.0.0 Safari/537.36" },
+ new ComboPopupItem() {Image=SuperDesign.Properties.Resources.windows,Text = "Firefox浏览器", ValueStr1 = "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:18.0) Gecko/20100101 Firefox/18.0" },
+ new ComboPopupItem() {Image=SuperDesign.Properties.Resources.windows,Text = "Opera浏览器", ValueStr1 = "Opera/9.27 (Windows NT 5.2; U; zh-cn)" },
+ new ComboPopupItem() {Image=SuperDesign.Properties.Resources.windows,Text = "IE7浏览器", ValueStr1 = "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT6.0)" },
+ new ComboPopupItem() {Image=SuperDesign.Properties.Resources.windows,Text = "IE9浏览器", ValueStr1 = "Mozilla/5.0(compatible;MSIE9.0;WindowsNT6.1;Trident/5.0;" },
+ new ComboPopupItem() {Image=SuperDesign.Properties.Resources.windows,Text = "QQ浏览器极速模式", ValueStr1 = "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.26 Safari/537.36 Core/1.63.6776.400 QQBrowser/10.3.2601.400" },
+ new ComboPopupItem() {Image=SuperDesign.Properties.Resources.windows,Text = "360浏览器极速模式", ValueStr1 = "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.132 Safari/537.36" },
+ new ComboPopupItem() {Image=SuperDesign.Properties.Resources.安卓, Text = "华为浏览器安卓手机版", ValueStr1 = "Mozilla/5.0 (Linux; Android 12; HarmonyOS; NAM-AL00; HMSCore 6.14.0.302) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.5735.196 HuaweiBrowser/15.0.7.301 Mobile Safari/537.36" },
+ new ComboPopupItem() {Image=SuperDesign.Properties.Resources.安卓,Text = "UC浏览器安卓手机版", ValueStr1 = "Mozilla/5.0 (Linux; U; Android 12; zh-CN; NAM-AL00 Build/HUAWEINAM-AL00) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/100.0.4896.58 UCBrowser/16.4.2.1293 Mobile Safari/537.36" },
+ new ComboPopupItem() {Image=SuperDesign.Properties.Resources.安卓,Text = "QQ浏览器安卓手机版", ValueStr1 = "Mozilla/5.0 (Linux; U; Android 8.1.0; zh-cn; BLA-AL00 Build/HUAWEIBLA-AL00) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/57.0.2987.132 MQQBrowser/8.9 Mobile Safari/537.36" },
+ new ComboPopupItem() {Image=SuperDesign.Properties.Resources.安卓,Text = "360浏览器安卓手机版", ValueStr1 = "Mozilla/5.0 (Linux; Android 12; NAM-AL00 Build/HUAWEINAM-AL00; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/81.0.4044.145 Mobile Safari/537.36" },
+ new ComboPopupItem() {Image=SuperDesign.Properties.Resources.安卓,Text = "安卓", ValueStr1 = "Mozilla/5.0 (Linux; Android 4.1.1; Nexus 7 Build/JRO03S) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.166 Safari/535.19" },
+ new ComboPopupItem() {Image=SuperDesign.Properties.Resources.鸿蒙os, Text = "Harmony OS NEXT 华为浏览器", ValueStr1 = "Mozilla/5.0 (Phone; OpenHarmony 5.0)AppleWebKit/537.36 (KHTML, like Gecko)Chrome/114.0.0.0 Safari/537.36 ArkWeb/4.1.6.1 Mobile HuaweiBrowser/5.0.3.351" },
+ new ComboPopupItem() {Image=SuperDesign.Properties.Resources.鸿蒙os, Text = "Harmony OS NEXT UC浏览器", ValueStr1 = "Mozilla/5.0 (Phone; OpenHarmony 5.0)AppleWebKit/537.36 (KHTML, like Gecko)Chrome/114.0.0.0 ArkWeb/4.1.6.1 UCBrowser/1.1.6.0 Mobile Safari/537.36" },
+ new ComboPopupItem() {Image=SuperDesign.Properties.Resources.鸿蒙os, Text = "Harmony OS NEXT QQ浏览器", ValueStr1 = "Mozilla/5.0 (Phone; Android 14;OpenHarmony 5.0) AppleWebKit/537.36(KHTML, like Gecko) Version/4.0 Chrome/ 114.0.0.0 ArkWeb/4.1.6.1 Mobile Safari/537.36qbyouthfynohead/15.0" },
+ new ComboPopupItem() {Image=SuperDesign.Properties.Resources.鸿蒙os, Text = "Harmony OS NEXT 360浏览器", ValueStr1 = "Mozilla/5.0 (Phone; OpenHarmony 5.0;HarmonyOS 5.0) AppleWebKit/537.36(KHTML,like Gecko) Chrome/114.0.0.0 Safari/537.36 ArkWeb/4.1.6.1 Mobile Browser/harmony360Browser/1.0.0" },
+ new ComboPopupItem() {Image=SuperDesign.Properties.Resources.微信,Text = "微信", ValueStr1 = "Mozilla/5.0 (Linux; U; Android 4.1.2; zh-cn; GT-I9300 Build/JZO54K) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30 MicroMessenger/5.2.380" },
+ new ComboPopupItem() {Image=SuperDesign.Properties.Resources.iphone, Text = "iPhone", ValueStr1 = "Mozilla/5.0 (iPhone; U; CPU like Mac OS X; en) AppleWebKit/420+ (KHTML, like Gecko) Version/3.0 Mobile/1C28 Safari/419.3" },
+ new ComboPopupItem() {Image=SuperDesign.Properties.Resources.iphone, Text = "Safari Mac浏览器", ValueStr1 = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.6 Safari/605.1.15" },
+ new ComboPopupItem() {Image=SuperDesign.Properties.Resources.iphone, Text = "Edge浏览器 Mac版", ValueStr1 = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36 Edg/128.0.0.0" },
+ new ComboPopupItem() {Image=SuperDesign.Properties.Resources.iphone, Text = "Chrome浏览器 Mac版", ValueStr1 = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36" },
});
+ CbbUserAgent.SelectedIndex = 0;
TxtPost.AddSeparatorMenu();
TxtPost.AddMenu("将选定项进行Url编码(UTF8)", "").Click += new EventHandler((object sender2, EventArgs e2) =>
@@ -273,9 +325,9 @@ namespace 开发辅助工具.Tools
}
if (CbbUserAgent.SelectedIndex != -1)
{
- if (CbbUserAgent.SelectedItem is UserAgentInfo info)
+ if (CbbUserAgent.SelectedItem is ComboPopupItem info)
{
- item.UserAgent = info.useragent;
+ item.UserAgent = info.ValueStr1;
}
}
if (!string.IsNullOrEmpty(this.CbbIp.Text.Trim()))
@@ -314,6 +366,15 @@ namespace 开发辅助工具.Tools
{
uri = new Uri(item.URL);
var host = uri.Host.ToLower();
+ if(!System.IO.File.Exists(Application.StartupPath+ "\\SysDb\\webicons\\"+host+".png") &&
+ !System.IO.File.Exists(Application.StartupPath + "\\UserDb\\webicons\\" + host + ".ico"))
+ {
+ var img = RyImage.LoadPic(uri.Scheme+"://"+uri.Host+ "/favicon.ico");
+ if(img!=null)
+ {
+ img.Save(Application.StartupPath + "\\UserDb\\webicons\\" + host + ".ico");
+ }
+ }
if (host.IndexOfEx("www.87g") == 0 || host.IndexOfEx("www.3h3") == 0
|| host.IndexOfEx("www.downxia") == 0 || host.IndexOfEx("www.downbank") == 0 || host.IndexOfEx("www.downxing") == 0 || host.IndexOfEx("downwn.com") == 0)
{
@@ -441,7 +502,7 @@ namespace 开发辅助工具.Tools
db.Free();
}
}
- catch { }
+ catch(Exception ex) { MessageBox.Show(ex.Message); }
}
this.Invoke(new Action(() =>
{
@@ -763,6 +824,7 @@ namespace 开发辅助工具.Tools
method= RbGet.Checked ? "get" : "post";
}
mySQL.AddField("Method", method);
+ mySQL.AddField("UserAgent", CbbUserAgent.Text);
mySQL.AddField("Referer", CbbReferer.Text);
mySQL.AddField("ContentType", CbbContentType.Text);
mySQL.AddField("Encoding", CbbEncoding.Text);
@@ -813,6 +875,7 @@ namespace 开发辅助工具.Tools
db.Free();
}
bool proc_use = false;
+ private bool IsAddNewUrl = false;
private void ClickItem(bool run = false)
{
if (objectListView2.SelectedObject!=null)
@@ -835,6 +898,7 @@ namespace 开发辅助工具.Tools
SetValueByRich(TxtCookie,"Cookie");
SetValueByHightlight(TxtPost, "Postdata");
SetValueByRich(TxtInputHeader, "Header");
+ SetValue2(CbbUserAgent, "UserAgent");
SetValue(CbbReferer, "Referer");
SetValue2(CbbContentType, "ContentType");
SetValue3(CbbEncoding, "Encoding");
@@ -861,7 +925,26 @@ namespace 开发辅助工具.Tools
}
void SetValue2(ryControls.ComboBoxEx2 cbb, string Field)
{
- if (row[Field].ToString().Length>0) { cbb.Text = row[Field].ToString(); }
+ if (row[Field].ToString().Length>0)
+ {
+ var have = false;
+ for (int i = 0; i < cbb.Items.Count; i++)
+ {
+ if(cbb.Items[i] is ComboPopupItem item2)
+ {
+ if(item2.ValueStr1== row[Field].ToString())
+ {
+ cbb.SelectedIndex = i;
+ have = true;
+ break;
+ }
+ }
+ }
+ if (!have)
+ {
+ cbb.Text = row[Field].ToString();
+ }
+ }
}
void SetValue3(ryControls.RyComboBox cbb, string Field)
{
@@ -875,6 +958,7 @@ namespace 开发辅助工具.Tools
db.Free();
}
TxtUrl.Text = url;
+ IsAddNewUrl = false;
if (TxtCookie.Text != "") { tabPage2.Text = "Cookie(有数据)"; }
else { tabPage2.Text = "Cookie"; }
if (TxtInputHeader.Text != "") { tabPage7.Text = "Header(有数据)"; }
@@ -916,12 +1000,38 @@ namespace 开发辅助工具.Tools
{
db.AddParameter("SearchText", "%" + TxtUrl.Text + "%");
db.AddParameter("today",DateTime.Now.Date);
-
+ Dictionary dict_icon = new Dictionary();
DataSet ds2 = db.ReadData("select * from Urls" + sql_where + " and editTime>=@today order by IsFav desc,editTime desc", db.GetParameter());
for (int i = 0; i < ds2.Tables[0].Rows.Count; i++)
{
DataRow row = ds2.Tables[0].Rows[i];
DateTime editTime = row["editTime"].ToDateTime();
+ Image icon = null;
+ try
+ {
+ var uri = new Uri(row["Url"].ToString());
+ if(dict_icon.ContainsKey(uri.Host))
+ {
+ icon=dict_icon[uri.Host];
+ }
+ else
+ {
+ if (System.IO.File.Exists(Application.StartupPath + "\\SysDb\\webicons\\" + uri.Host + ".png"))
+ {
+ icon = RyImage.LoadPic(Application.StartupPath + "\\SysDb\\webicons\\" + uri.Host + ".png");
+ }
+ else if (System.IO.File.Exists(Application.StartupPath + "\\UserDb\\webicons\\" + uri.Host + ".ico"))
+ {
+ icon = RyImage.LoadPic(Application.StartupPath + "\\UserDb\\webicons\\" + uri.Host + ".ico");
+ }
+ else if (System.IO.File.Exists(Application.StartupPath + "\\UserDb\\webicons\\" + uri.Host + ".png"))
+ {
+ icon = RyImage.LoadPic(Application.StartupPath + "\\UserDb\\webicons\\" + uri.Host + ".png");
+ }
+ dict_icon[uri.Host] = icon;
+ }
+ }
+ catch { }
var item = new UrlInfo()
{
Id = row["id"].ToInt(),
@@ -929,7 +1039,8 @@ namespace 开发辅助工具.Tools
Des = row["Des"].ToString(),
Url = row["Url"].ToString(),
ClickCount = row["ClickCount"].ToInt(),
- Fav = row["IsFav"].ToInt() == 1
+ Fav = row["IsFav"].ToInt() == 1,
+ Icon=icon
};
if (editTime >= DateTime.Now.AddMinutes(-10))
{
@@ -946,11 +1057,40 @@ namespace 开发辅助工具.Tools
{
DataRow row = ds.Tables[0].Rows[i];
DateTime editTime = row["editTime"].ToDateTime();
- var item = new UrlInfo() { Id = row["id"].ToInt(), Name = row["Name"].ToString(),
+ Image icon = null;
+ try
+ {
+ var uri = new Uri(row["Url"].ToString());
+ if (dict_icon.ContainsKey(uri.Host))
+ {
+ icon = dict_icon[uri.Host];
+ }
+ else
+ {
+ if (System.IO.File.Exists(Application.StartupPath + "\\SysDb\\webicons\\" + uri.Host + ".png"))
+ {
+ icon = RyImage.LoadPic(Application.StartupPath + "\\SysDb\\webicons\\" + uri.Host + ".png");
+ }
+ else if (System.IO.File.Exists(Application.StartupPath + "\\UserDb\\webicons\\" + uri.Host + ".ico"))
+ {
+ icon = RyImage.LoadPic(Application.StartupPath + "\\UserDb\\webicons\\" + uri.Host + ".ico");
+ }
+ else if (System.IO.File.Exists(Application.StartupPath + "\\UserDb\\webicons\\" + uri.Host + ".png"))
+ {
+ icon = RyImage.LoadPic(Application.StartupPath + "\\UserDb\\webicons\\" + uri.Host + ".png");
+ }
+ dict_icon[uri.Host] = icon;
+ }
+ }
+ catch { }
+ var item = new UrlInfo() {
+ Id = row["id"].ToInt(), Name = row["Name"].ToString(),
Des = row["Des"].ToString(),
Url = row["Url"].ToString(),
ClickCount = row["ClickCount"].ToInt(),
- Fav = row["IsFav"].ToInt()==1 };
+ Fav = row["IsFav"].ToInt()==1,
+ Icon=icon
+ };
if (editTime >= DateTime.Now.AddMinutes(-10))
{
list.Insert(0,item);
@@ -966,6 +1106,7 @@ namespace 开发辅助工具.Tools
objectListView2.Visible = list.Count != 0;
objectListView2.BringToFront();
}
+ IsAddNewUrl = true;
#endregion
}
@@ -989,6 +1130,38 @@ namespace 开发辅助工具.Tools
private void TxtUrl_Leave(object sender, EventArgs e)
{
+ if (IsAddNewUrl && !objectListView2.Visible)
+ {
+ if (TxtCookie.Text.Length > 0 && TxtInputHeader.Text.Length > 0)
+ {
+ if (MessageBox.Show("你修改了新Url,是否要清空Cookie和Header？", "询问", MessageBoxButtons.OKCancel, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button2) == DialogResult.OK)
+ {
+ TxtCookie.Text = "";
+ TxtInputHeader.Text = "";
+ }
+ }
+ else if (TxtCookie.Text.Length > 0)
+ {
+ if (MessageBox.Show("你修改了新Url,是否要清空Cookie？", "询问", MessageBoxButtons.OKCancel, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button2) == DialogResult.OK)
+ {
+ TxtCookie.Text = "";
+ }
+ }
+ else if (TxtInputHeader.Text.Length > 0)
+ {
+ if (MessageBox.Show("你修改了新Url,是否要清空Header？", "询问", MessageBoxButtons.OKCancel, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button2) == DialogResult.OK)
+ {
+ TxtInputHeader.Text = "";
+ }
+ }
+ if (CbbReferer.Text.Length > 0)
+ {
+ if (MessageBox.Show("你修改了新Url,是否要清空引用页？", "询问", MessageBoxButtons.OKCancel, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button2) == DialogResult.OK)
+ {
+ CbbReferer.Text = "";
+ }
+ }
+ }
if (!objectListView2.Focused)
{
objectListView2.Visible = false;
@@ -1429,9 +1602,9 @@ namespace 开发辅助工具.Tools
};
if (CbbUserAgent.SelectedIndex != -1)
{
- if (CbbUserAgent.SelectedItem is UserAgentInfo info2)
+ if (CbbUserAgent.SelectedItem is ComboPopupItem info2)
{
- item.UserAgent = info2.useragent;
+ item.UserAgent = info2.ValueStr1;
}
}
if (!string.IsNullOrEmpty(this.CbbIp.Text.Trim()))
@@ -1653,6 +1826,7 @@ namespace 开发辅助工具.Tools
else if (Method == "head") { RbHead.Checked = true; }
else { RbGet.Checked = true; }
TxtUrl.Text = json_set.GetJsonValue("Url", "");
+ IsAddNewUrl = false;
CbbEncoding.Text = json_set.GetJsonValue("Encoding", "");
CbbTimeout.Text = json_set.GetJsonValue("Timeout", "");
CbbWriteTimeout.Text = json_set.GetJsonValue("WriteTimeout", "");
@@ -1781,6 +1955,25 @@ namespace 开发辅助工具.Tools
highlightEditor1.SetHightlightText(curl, "bat");
tabControl2.SelectedTab = tabPage12;
}
+
+ private void CbbUserAgent_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ if (CbbUserAgent.SelectedIndex != -1)
+ {
+ if (CbbUserAgent.SelectedItem is ComboPopupItem info2)
+ {
+ CbbUserAgent.ToolTipText= info2.ValueStr1;
+ }
+ else
+ {
+ CbbUserAgent.ToolTipText = CbbUserAgent.Text;
+ }
+ }
+ else
+ {
+ CbbUserAgent.ToolTipText = CbbUserAgent.Text;
+ }
+ }
}
public class UrlInfo
{
@@ -1793,14 +1986,6 @@ namespace 开发辅助工具.Tools
/// 是否收藏
///
public bool Fav { get; set; } = false;
- }
- public class UserAgentInfo
- {
- public string name = "";
- public string useragent = "";
- public override string ToString()
- {
- return name;
- }
+ public Image Icon { get; set; } = null;
}
}
diff --git a/Source/开发辅助工具/Tools/FrmWebGet.resx b/Source/开发辅助工具/Tools/FrmWebGet.resx
index 4f8dcad..9d1824f 100644
--- a/Source/开发辅助工具/Tools/FrmWebGet.resx
+++ b/Source/开发辅助工具/Tools/FrmWebGet.resx
@@ -117,33 +117,33 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 423, 17
+
141, 17
17, 17
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAeFJREFUWEe9
- ldErBFEYxefVX+BlX7Rzv+8iSma+a1OS8qCUB3lUnjz4J0SUEomIUkoRf5EHpZQHpTwo5UHRLDszzt7d
- vbPu7K+mdr85954zs7NzgiAIguFqLQzD8WryuWwGBkw/sxmtVGp99UEYmiEm+UoOIlnHBT7RKlrMvOK1
- +jC58sawzBDMZoGUfGY+Zjk9mZiWGUIrmWeSj8zD3KCmtBBE0RwreU/3ZrlCTYrvEIPKzDLJW27PS9Q0
- 4SsEs8wwyWu2j7lATUv+G2JQxVNM8pLb4xw1Hek2BHM0SUqes3XxGWqcKRpCqQnDJE/pGiUnqCmMawhm
- iZjlMac7Qk3XdAoRhtEYkzxkV24O8ue90CqE1rURIrlvzDXJHq71hi0Ek7lLZxzv4hondBhNJwfObWCI
- 7LbLDmptJOWnVbySDrQWym5fvPFH3QIMQSTbqLHBLEuplzKr9SG2IbNs4UIbaQhlNvGcjbz5T+g2beh6
- O/Hf0Ao0d2rDrh8ooMm8SBtqkn3UFKHJvMs2PESNC2j+rzZkMseoaQeae2lDZjlFjQ0099qGna4EzUtq
- Q/tviealtiE+zWjeqza8TuZo3tM2ZJLbP989vbzaYgnxe9vdXt9ewBCubeiVom1YCq5t2I5vVLR22kys
- XlkAAAAASUVORK5CYII=
-
-
-
- 423, 17
-
306, 17
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABGdBTUEAALGPC/xhBQAAAglJREFUaEPt
+ mettwzAMhD1KR8koziQdpSMEcAbwKB6lBcU8HIqUdBKlGEU+gH/aUrqjaVp2p+nDh07M1+9pXn6m87JN
+ 5+W3IDbOuXzJpcYyX0+KuPIgE61UF4E2l4JqopVwJdFCkGsppC42uTTMvZBQS56XVRGDB1w5hX0nFJnw
+ qr6HeCJu5TVtwr5xabKc5J+7QsLmZX70PU8+rRsSJmLHvhWVBMHQiL7HppsYYYCuJIuO98FCMdHbgN4S
+ LSFM9DJArSLX9IyHiR4G/KuuxcqbeRrgkTxQfNjUyQCLRycLHjQMXjd2MjCi8qomDwP14tdQ0RC3h5m1
+ Fg0FlVYDVr4WLHaOZ/kObb3kiUBL4KS8gZJzFFc3IUAg9WRzZQJiwLrcD+GJSlvs9WTFE7UG7ENg4uBV
+ AOsBDpK1BrSRmcspgU+nheKJGgNx7wMV86bKwEvO7qn4DmoMHEY8gRp4tk/7C7wLsIH7lGiYNCU8XzUz
+ 9xZqgH+XWbQR+XyxtAQQA+ElXPm5J/GEu+nxOAuZizhi6rH2NhM0A537nkD0BOCEzsB64ITOwHrghM7A
+ euCEzsB64ITOwHrghM7AeqwvaNHni0FY31BtA+abFcUaEkeFPEK8GkgcX7S3q6NFEnYfJx0lSF+W416F
+ wveOUd82saB7MNH7GtxO7zdS1DYpwr+FlEnRNTKfHf8bf6XooWOz/B1WAAAAAElFTkSuQmCC
+
+
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAj9JREFUWEft
@@ -159,18 +159,18 @@
zn1q0AY31aIeqje67w35nxkHkkdnx0z/8z/OP/FHzL6w8yGpAAAAAElFTkSuQmCC
-
+
- iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABGdBTUEAALGPC/xhBQAAAglJREFUaEPt
- mettwzAMhD1KR8koziQdpSMEcAbwKB6lBcU8HIqUdBKlGEU+gH/aUrqjaVp2p+nDh07M1+9pXn6m87JN
- 5+W3IDbOuXzJpcYyX0+KuPIgE61UF4E2l4JqopVwJdFCkGsppC42uTTMvZBQS56XVRGDB1w5hX0nFJnw
- qr6HeCJu5TVtwr5xabKc5J+7QsLmZX70PU8+rRsSJmLHvhWVBMHQiL7HppsYYYCuJIuO98FCMdHbgN4S
- LSFM9DJArSLX9IyHiR4G/KuuxcqbeRrgkTxQfNjUyQCLRycLHjQMXjd2MjCi8qomDwP14tdQ0RC3h5m1
- Fg0FlVYDVr4WLHaOZ/kObb3kiUBL4KS8gZJzFFc3IUAg9WRzZQJiwLrcD+GJSlvs9WTFE7UG7ENg4uBV
- AOsBDpK1BrSRmcspgU+nheKJGgNx7wMV86bKwEvO7qn4DmoMHEY8gRp4tk/7C7wLsIH7lGiYNCU8XzUz
- 9xZqgH+XWbQR+XyxtAQQA+ElXPm5J/GEu+nxOAuZizhi6rH2NhM0A537nkD0BOCEzsB64ITOwHrghM7A
- euCEzsB64ITOwHrghM7AeqwvaNHni0FY31BtA+abFcUaEkeFPEK8GkgcX7S3q6NFEnYfJx0lSF+W416F
- wveOUd82saB7MNH7GtxO7zdS1DYpwr+FlEnRNTKfHf8bf6XooWOz/B1WAAAAAElFTkSuQmCC
+ iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAeFJREFUWEe9
+ ldErBFEYxefVX+BlX7Rzv+8iSma+a1OS8qCUB3lUnjz4J0SUEomIUkoRf5EHpZQHpTwo5UHRLDszzt7d
+ vbPu7K+mdr85954zs7NzgiAIguFqLQzD8WryuWwGBkw/sxmtVGp99UEYmiEm+UoOIlnHBT7RKlrMvOK1
+ +jC58sawzBDMZoGUfGY+Zjk9mZiWGUIrmWeSj8zD3KCmtBBE0RwreU/3ZrlCTYrvEIPKzDLJW27PS9Q0
+ 4SsEs8wwyWu2j7lATUv+G2JQxVNM8pLb4xw1Hek2BHM0SUqes3XxGWqcKRpCqQnDJE/pGiUnqCmMawhm
+ iZjlMac7Qk3XdAoRhtEYkzxkV24O8ue90CqE1rURIrlvzDXJHq71hi0Ek7lLZxzv4hondBhNJwfObWCI
+ 7LbLDmptJOWnVbySDrQWym5fvPFH3QIMQSTbqLHBLEuplzKr9SG2IbNs4UIbaQhlNvGcjbz5T+g2beh6
+ O/Hf0Ao0d2rDrh8ooMm8SBtqkn3UFKHJvMs2PESNC2j+rzZkMseoaQeae2lDZjlFjQ0099qGna4EzUtq
+ Q/tviealtiE+zWjeqza8TuZo3tM2ZJLbP989vbzaYgnxe9vdXt9ewBCubeiVom1YCq5t2I5vVLR22kys
+ XlkAAAAASUVORK5CYII=
diff --git a/Source/开发辅助工具/Tools/UpLog/FrmCompareLog.Designer.cs b/Source/开发辅助工具/Tools/UpLog/FrmCompareLog.Designer.cs
index e8690a5..529b5d4 100644
--- a/Source/开发辅助工具/Tools/UpLog/FrmCompareLog.Designer.cs
+++ b/Source/开发辅助工具/Tools/UpLog/FrmCompareLog.Designer.cs
@@ -48,6 +48,7 @@
this.Rich1.Size = new System.Drawing.Size(356, 497);
this.Rich1.TabIndex = 0;
this.Rich1.Text = "";
+ this.Rich1.WordWrap = true;
//
// Rich2
//
@@ -60,10 +61,10 @@
this.Rich2.Size = new System.Drawing.Size(356, 497);
this.Rich2.TabIndex = 1;
this.Rich2.Text = "";
+ this.Rich2.WordWrap = true;
//
// BtnSubmit
//
- this.BtnSubmit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.BtnSubmit.BaseColor = System.Drawing.Color.Green;
this.BtnSubmit.ColorGradient = true;
this.BtnSubmit.Location = new System.Drawing.Point(2, 5);
@@ -77,7 +78,6 @@
//
// BtnCancel
//
- this.BtnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.BtnCancel.BaseColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
this.BtnCancel.ColorGradient = true;
this.BtnCancel.Location = new System.Drawing.Point(83, 5);
diff --git a/Source/开发辅助工具/Tools/UpLog/FrmGroupSelected.Designer.cs b/Source/开发辅助工具/Tools/UpLog/FrmGroupSelected.Designer.cs
new file mode 100644
index 0000000..50561ba
--- /dev/null
+++ b/Source/开发辅助工具/Tools/UpLog/FrmGroupSelected.Designer.cs
@@ -0,0 +1,100 @@
+namespace SuperDesign.Tools.UpLog
+{
+ partial class FrmGroupSelected
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmGroupSelected));
+ this.objectListView1 = new BrightIdeasSoftware.ObjectListView();
+ this.OlvGroup = ((BrightIdeasSoftware.OLVColumn)(new BrightIdeasSoftware.OLVColumn()));
+ this.BtnDel = new ryControls.ButtonEx();
+ ((System.ComponentModel.ISupportInitialize)(this.objectListView1)).BeginInit();
+ this.SuspendLayout();
+ //
+ // objectListView1
+ //
+ this.objectListView1.AllColumns.Add(this.OlvGroup);
+ this.objectListView1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.objectListView1.CellEditUseWholeCell = false;
+ this.objectListView1.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+ this.OlvGroup});
+ this.objectListView1.Cursor = System.Windows.Forms.Cursors.Default;
+ this.objectListView1.FullRowSelect = true;
+ this.objectListView1.HideSelection = false;
+ this.objectListView1.Location = new System.Drawing.Point(12, 42);
+ this.objectListView1.Name = "objectListView1";
+ this.objectListView1.Size = new System.Drawing.Size(636, 504);
+ this.objectListView1.TabIndex = 0;
+ this.objectListView1.UseCompatibleStateImageBehavior = false;
+ this.objectListView1.View = System.Windows.Forms.View.Details;
+ this.objectListView1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.ObjectListView1_MouseDoubleClick);
+ //
+ // OlvGroup
+ //
+ this.OlvGroup.Text = "分组";
+ this.OlvGroup.Width = 300;
+ //
+ // BtnDel
+ //
+ this.BtnDel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.BtnDel.BaseColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
+ this.BtnDel.ColorGradient = true;
+ this.BtnDel.Location = new System.Drawing.Point(573, 3);
+ this.BtnDel.Name = "BtnDel";
+ this.BtnDel.Size = new System.Drawing.Size(75, 33);
+ this.BtnDel.TabIndex = 12;
+ this.BtnDel.Text = "删除";
+ this.BtnDel.UseDefSkin = false;
+ this.BtnDel.UseVisualStyleBackColor = true;
+ this.BtnDel.Click += new System.EventHandler(this.BtnDel_Click);
+ //
+ // FrmGroupSelected
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(660, 558);
+ this.Controls.Add(this.BtnDel);
+ this.Controls.Add(this.objectListView1);
+ this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+ this.Name = "FrmGroupSelected";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "分组";
+ this.Load += new System.EventHandler(this.FrmGroupSelected_Load);
+ ((System.ComponentModel.ISupportInitialize)(this.objectListView1)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private BrightIdeasSoftware.ObjectListView objectListView1;
+ private BrightIdeasSoftware.OLVColumn OlvGroup;
+ private ryControls.ButtonEx BtnDel;
+ }
+}
\ No newline at end of file
diff --git a/Source/开发辅助工具/Tools/UpLog/FrmGroupSelected.cs b/Source/开发辅助工具/Tools/UpLog/FrmGroupSelected.cs
new file mode 100644
index 0000000..df07ae8
--- /dev/null
+++ b/Source/开发辅助工具/Tools/UpLog/FrmGroupSelected.cs
@@ -0,0 +1,128 @@
+using Newtonsoft.Json.Linq;
+using ryCommon;
+using ryCommonDb;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace SuperDesign.Tools.UpLog
+{
+ public partial class FrmGroupSelected : Form
+ {
+ public FrmGroupSelected()
+ {
+ InitializeComponent();
+ OlvGroup.AspectGetter = delegate (object x) { return ((GroupInfo)x).GroupName; };
+ }
+ public string ProjectName { get; set; }
+ public string DbPath { get; set; }
+ public string SelectedGroupName { get; private set; } = "";
+ class GroupInfo
+ {
+ public string GroupName { get; set; }
+ public long Time { get; set; }
+ }
+
+ private void ObjectListView1_MouseDoubleClick(object sender, MouseEventArgs e)
+ {
+ if (objectListView1.SelectedObject == null) { return; }
+ var item = (GroupInfo)objectListView1.SelectedObject;
+ SelectedGroupName = item.GroupName;
+ DialogResult = DialogResult.OK;
+ }
+
+ private void FrmGroupSelected_Load(object sender, EventArgs e)
+ {
+ IDbInterface db = new SQLiteDataProvider();
+ if (db.ConnDb(DbPath) == 1)
+ {
+ JObject jo_group;
+ try
+ {
+ var ds_group = db.ReadData("select * from Settings where Name='GroupList'");
+ if (ds_group.HaveData())
+ {
+ jo_group = JObject.Parse(ds_group.GetRow(0)["Value"].ToString());
+ }
+ else
+ {
+ jo_group = new JObject();
+ }
+ ds_group?.Dispose();
+ }
+ catch { jo_group = new JObject(); }
+ var jarr_group = jo_group.GetJsonValue("group_" +ProjectName, new JArray());
+ List list = new List();
+ for (int i = 0; i < jarr_group.Count; i++)
+ {
+ list.Add(new GroupInfo()
+ {
+ GroupName = jarr_group[i].GetJsonValue("text",""),
+ Time = jarr_group[i].GetJsonValue("time", 0L),
+ });
+ }
+ objectListView1.AddObjects(list);
+ }
+ db.Free();
+ }
+
+ private void BtnDel_Click(object sender, EventArgs e)
+ {
+ if (objectListView1.SelectedObject == null) {
+ MessageBox.Show("请选择分组。", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ return;
+ }
+ if (MessageBox.Show("是否确认要删除该分组?", "询问", MessageBoxButtons.OKCancel, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button2) != DialogResult.OK)
+ {
+ return;
+ }
+ var item = (GroupInfo)objectListView1.SelectedObject;
+ IDbInterface db = new SQLiteDataProvider();
+ if (db.ConnDb(DbPath) == 1)
+ {
+ JObject jo_group;
+ try
+ {
+ var ds_group = db.ReadData("select * from Settings where Name='GroupList'");
+ if (ds_group.HaveData())
+ {
+ jo_group = JObject.Parse(ds_group.GetRow(0)["Value"].ToString());
+ }
+ else
+ {
+ jo_group = new JObject();
+ }
+ ds_group?.Dispose();
+ }
+ catch { jo_group = new JObject(); }
+ var jarr_group = jo_group.GetJsonValue("group_" + ProjectName, new JArray());
+ for (int i = 0; i < jarr_group.Count; i++)
+ {
+ if(jarr_group[i].GetJsonValue("text", "")==item.GroupName)
+ {
+ jarr_group[i].Remove();
+ objectListView1.RemoveObject(item);
+ break;
+ }
+ }
+ jo_group["group_" + ProjectName] = jarr_group;
+ RyQuickSQL MySQL_Setting = new RyQuickSQL("Settings");
+ MySQL_Setting.AddField("Name", "GroupList");
+ MySQL_Setting.AddField("Value", jo_group.ToString());
+ MySQL_Setting.AddField("EditTime", DateTime.Now);
+ if (db.Update(MySQL_Setting, "Name=@Name") == 0)
+ {
+ MySQL_Setting.AddField("AddTime", DateTime.Now);
+ db.Insert(MySQL_Setting);
+ }
+ }
+ db.Free();
+ }
+ }
+}
diff --git a/Source/开发辅助工具/Tools/UpLog/FrmGroupSelected.resx b/Source/开发辅助工具/Tools/UpLog/FrmGroupSelected.resx
new file mode 100644
index 0000000..67b27b4
--- /dev/null
+++ b/Source/开发辅助工具/Tools/UpLog/FrmGroupSelected.resx
@@ -0,0 +1,135 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+
+
+ AAABAAEAICAAAAAAIAAxAgAAFgAAAIlQTkcNChoKAAAADUlIRFIAAAAgAAAAIAgGAAAAc3p69AAAAARn
+ QU1BAACxjwv8YQUAAAHoSURBVFhHxVZLTsMwEO1ROEgXPQqLInEAVmx6hNwAH6EiLCoWkEWFIkGlsi0b
+ Lyp1AwuKaMVH7UNj7MoeJ46bNPCkJ7XJeN6zPfak06mJpI9BcgIkJ5D0m79vDZYwZ7tGtLAsEOY8rJGk
+ j16kMCeNOeb5opGc4qimMCetSI/nL4UWzgoSNWXYiBYWBQMPTeEYUcLlld0mBWl3WlruWMr/NiD+cu9d
+ 8ruixernzNTel4Euj5aMhI9hPnRdaSOtXESOFv3JU2R5CuQphP3SOqJ1jHhXsdK6wkBrZUorTyH1A0Op
+ goqNcJEies2ICTtaZMDMnnNfI/sIG4qYIGXETsy2po4weE5TC8ILDBgpwt7CHIsZurN7TL2BASMxM368
+ Rb5+w5k9zgEtK4AMGh8rjGgQT+QY+WVZDSlObzD/WiMxeQHIyQhdR9hcPHeXGH9/IreDV0uMKQlPXEUa
+ 876EsHJhs8H86WF3ye26IT/jkoxQsBm43WL++oxhjBGKodiAsKNV2g0vzjGfXGPIjbws1JLzu4Mo6V2k
+ sGFWdbaVEUpC28GNUI3QjGsIE4VXhKG2bBkJIkK4ohtWtGXLyM5M5Iy9phRElRFjhsifNxLmaNCWvW5Y
+ G3o1Yo14veFgqPg+aE+YwzJCNdJI+AcH16VD0jG8swAAAABJRU5ErkJggg==
+
+
+
\ No newline at end of file
diff --git a/Source/开发辅助工具/Tools/UpLog/FrmSaveContent.Designer.cs b/Source/开发辅助工具/Tools/UpLog/FrmSaveContent.Designer.cs
new file mode 100644
index 0000000..a96a31e
--- /dev/null
+++ b/Source/开发辅助工具/Tools/UpLog/FrmSaveContent.Designer.cs
@@ -0,0 +1,102 @@
+namespace SuperDesign.Tools.UpLog
+{
+ partial class FrmSaveContent
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmSaveContent));
+ this.Rich1 = new ryControls.Controls.RichTextBox2();
+ this.BtnSave = new ryControls.ButtonEx();
+ this.BtnCancel = new ryControls.ButtonEx();
+ this.SuspendLayout();
+ //
+ // Rich1
+ //
+ this.Rich1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.Rich1.DetectUrls = false;
+ this.Rich1.EmptyText = "";
+ this.Rich1.Font = new System.Drawing.Font("Courier New", 10F);
+ this.Rich1.Location = new System.Drawing.Point(1, 44);
+ this.Rich1.Name = "Rich1";
+ this.Rich1.OnlyInputText = true;
+ this.Rich1.Size = new System.Drawing.Size(786, 515);
+ this.Rich1.TabIndex = 0;
+ this.Rich1.Text = "";
+ this.Rich1.WordWrap = true;
+ //
+ // BtnSave
+ //
+ this.BtnSave.BaseColor = System.Drawing.Color.Green;
+ this.BtnSave.ColorGradient = true;
+ this.BtnSave.Location = new System.Drawing.Point(2, 5);
+ this.BtnSave.Name = "BtnSave";
+ this.BtnSave.Size = new System.Drawing.Size(75, 33);
+ this.BtnSave.TabIndex = 10;
+ this.BtnSave.Text = "保存";
+ this.BtnSave.UseDefSkin = false;
+ this.BtnSave.UseVisualStyleBackColor = true;
+ this.BtnSave.Click += new System.EventHandler(this.BtnSubmit_Click);
+ //
+ // BtnCancel
+ //
+ this.BtnCancel.BaseColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
+ this.BtnCancel.ColorGradient = true;
+ this.BtnCancel.Location = new System.Drawing.Point(83, 5);
+ this.BtnCancel.Name = "BtnCancel";
+ this.BtnCancel.Size = new System.Drawing.Size(75, 33);
+ this.BtnCancel.TabIndex = 11;
+ this.BtnCancel.Text = "取消";
+ this.BtnCancel.UseDefSkin = false;
+ this.BtnCancel.UseVisualStyleBackColor = true;
+ this.BtnCancel.Click += new System.EventHandler(this.BtnCancel_Click);
+ //
+ // FrmSaveContent
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(790, 563);
+ this.Controls.Add(this.BtnCancel);
+ this.Controls.Add(this.BtnSave);
+ this.Controls.Add(this.Rich1);
+ this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+ this.Name = "FrmSaveContent";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "内容设置";
+ this.Load += new System.EventHandler(this.FrmCompareLog_Load);
+ this.Resize += new System.EventHandler(this.FrmCompareLog_Resize);
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+ private ryControls.ButtonEx BtnSave;
+ private ryControls.ButtonEx BtnCancel;
+ public ryControls.Controls.RichTextBox2 Rich1;
+ }
+}
\ No newline at end of file
diff --git a/Source/开发辅助工具/Tools/UpLog/FrmSaveContent.cs b/Source/开发辅助工具/Tools/UpLog/FrmSaveContent.cs
new file mode 100644
index 0000000..259a6f9
--- /dev/null
+++ b/Source/开发辅助工具/Tools/UpLog/FrmSaveContent.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace SuperDesign.Tools.UpLog
+{
+ public partial class FrmSaveContent : Form
+ {
+ public FrmSaveContent()
+ {
+ InitializeComponent();
+ }
+ private void FrmCompareLog_Resize(object sender, EventArgs e)
+ {
+ }
+
+ private void FrmCompareLog_Load(object sender, EventArgs e)
+ {
+ }
+
+ private void BtnSubmit_Click(object sender, EventArgs e)
+ {
+ DialogResult = DialogResult.OK;
+ }
+
+ private void BtnCancel_Click(object sender, EventArgs e)
+ {
+ DialogResult = DialogResult.Cancel;
+ }
+ }
+}
diff --git a/Source/开发辅助工具/Tools/UpLog/FrmSaveContent.resx b/Source/开发辅助工具/Tools/UpLog/FrmSaveContent.resx
new file mode 100644
index 0000000..2869032
--- /dev/null
+++ b/Source/开发辅助工具/Tools/UpLog/FrmSaveContent.resx
@@ -0,0 +1,133 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+
+
+ AAABAAEAICAAAAAAIADGAQAAFgAAAIlQTkcNChoKAAAADUlIRFIAAAAgAAAAIAgGAAAAc3p69AAAAARn
+ QU1BAACxjwv8YQUAAAF9SURBVFhHY2CAgsOP/zscevR//qFH/+8fevT//9rTr/5L6oRSjNVss/5P33Ll
+ P8hMqNn7QXbB7AWDQ4/+J0AVwDFIE8gAoZRXFGE5cxQHwPHhh//rkX2OoQCkCaRZMPc/RRiXA0B4//3/
+ CiDfg4IdQ5JcB/hO+v9/6Yn///XrCTsAFB0gB6ALUuQAGDh8iygH/KeZA0BgZDvg4dsBcgAoAYJAxzYI
+ X9GSTAeACiJQISIcewXDEkIYlgNAekFlCcgsdPMJOgCES6bu/y9tmgUuUNAtIYRBemQdGv5HFkzFMJdo
+ B4BcntSw6r+yddZ/ZZcGkjDI54QsJ+gAGAY5pGnefpIwuhm4MFEOoCUedcCoA0YdMOoAgg5Yf+/T/9IL
+ Z0nGHVdvgvWim4eOCTrA/8Tm/xr7Z5GFrQ8vxzAPHQ9+B4CCERSc6EFMDKZKFNAagxwA7ooNEL4PcgDW
+ jgmd8H5Y12xAQgHeSQV1FNEl6YATUHrI0JDYT4fQmI/cPQcAn3IBrGGmgNcAAAAASUVORK5CYII=
+
+
+
\ No newline at end of file
diff --git a/Source/开发辅助工具/Tools/UpLog/FrmUpdateLog.cs b/Source/开发辅助工具/Tools/UpLog/FrmUpdateLog.cs
index fc305e9..22d5483 100644
--- a/Source/开发辅助工具/Tools/UpLog/FrmUpdateLog.cs
+++ b/Source/开发辅助工具/Tools/UpLog/FrmUpdateLog.cs
@@ -99,7 +99,7 @@ namespace SuperDesign.Tools
DateTime retStartDay = DateTime.Now.Date.AddDays(-(index - 1));
if(dt >= retStartDay && dt < retStartDay.AddDays(7))
{
- dt_str = "本周 " + dt.ToString("dd HH:mm");
+ dt_str = "本" + dt.ToString("ddd HH:mm");
}
}
line += "" + System.Web.HttpUtility.HtmlEncode("=>" + dt_str) + "";
diff --git a/查看项目.ryp b/查看项目.ryp
index 0d155a5..64a8309 100644
--- a/查看项目.ryp
+++ b/查看项目.ryp
@@ -1,9 +1,10 @@
[project]
name=
-engname=SupperDesign
+engname=SuperDesign
usqver=3.0
proglang=c#
progID=39871d4b-1b46-4e3c-9c45-8fda3613d857
-confuse=0
-ftpid=1
-ftp_remote_dir=/OnlineUpgrade
+confuse=0
+ftpid=1
+ftp_remote_dir=/OnlineUpgrade
+UploadName=SuperDesign
\ No newline at end of file