zilinsoft/SuperDesign
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

### 2021-09-02更新

Browse Source 
------
#### SuperDesign    V2.0.2105.1701
- *.[改进]新增对新版公用库的支持,将RyWeb等合并到一个库里。
This commit is contained in:
鑫Intel committed 2021-09-02 17:40:24 +08:00
1 parent 2d3bb192f9
commit d402952ed5
27 files changed
+10567 -366
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Source/开发辅助工具/Tools/FrmCreateProject.cs
+2 -1
View File
@@ -175,6 +175,7 @@ namespace 开发辅助工具.Tools
#region 复制和修改基准项目
if (System.IO.Directory.Exists(CshapeBasePath) && prog_lang == "c#") //存在基准项目
{
ryCommon.RyFiles.DeleteFile(full_path + "\\Bin\\Debug\\CommonControls");
var source_folder = full_path + "\\Source\\" + project_Eng_name;
ryCommon.RyFiles.CopyFile(CshapeBasePath + "\\*", source_folder);
ryCommon.RyFiles.DeleteFile(source_folder + "\\Bin");
@@ -193,7 +194,7 @@ namespace 开发辅助工具.Tools
var AssemblyInfo = ryCommon.RyFiles.ReadAllText(Application.StartupPath + "\\SysDb\\AssemblyInfo.cs");
AssemblyInfo = AssemblyInfo.Replace("@AssemblyTitle", project_Eng_name);
AssemblyInfo = AssemblyInfo.Replace("@AssemblyProduct", project_Eng_name);
AssemblyInfo = AssemblyInfo.Replace("@Copyright", "Copyright 2010-2020");
AssemblyInfo = AssemblyInfo.Replace("@Copyright", "Copyright 2010-2021");
ryCommon.RyFiles.WriteAllText(source_folder + "\\Properties\\AssemblyInfo.cs", AssemblyInfo, Encoding.UTF8);
#endregion
#region 替换命名空间
Source/开发辅助工具/Tools/FrmQrCode.cs
+2 -1
View File
@@ -1,4 +1,5 @@
using _SCREEN_CAPTURE;
using ryCommon._SCREEN_CAPTURE;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -123,7 +124,7 @@ namespace 开发辅助工具.Tools
private void BtnCapture_Click(object sender, EventArgs e)
{
ScreenCapture capture = new _SCREEN_CAPTURE.ScreenCapture();
ScreenCapture capture = new ScreenCapture();
Bitmap m = capture.StartCapture(false);
if (m != null)
{
Source/开发辅助工具/Tools/FrmWebGet.cs
+2
View File
@@ -34,6 +34,7 @@ namespace 开发辅助工具.Tools
Te_Format.AutoIndentNeeded -= fctb_AutoIndentNeeded;
Te_Format.Language = Language.JSON;
Te_Format.OnSyntaxHighlight(new TextChangedEventArgs(Te_Format.Range));
}
private void fctb_AutoIndentNeeded(object sender, AutoIndentEventArgs args)
{
@@ -457,6 +458,7 @@ namespace 开发辅助工具.Tools
private void FrmWebGet_Load(object sender, EventArgs e)
{
//TxtPost.AutoWordSelection = false;
System.Net.ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12; //加上这一句
contextMenuStripHighlightText1.AddSeparatorMenu();
contextMenuStripHighlightText1.AddMenu("将选中的内容作为Json分析", "").Click += AnalyJson_Click;
Source/开发辅助工具/Tools/FrmXpath.Designer.cs
Generated
+23 -19
View File
@@ -33,12 +33,12 @@
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.TxtXML = new ryControls.Controls.RichTextBox2();
this.panelEx1 = new ryControls.PanelEx();
this.fastColoredTextBox1 = new FastColoredTextBoxNS.FastColoredTextBox();
this.contextMenuStripHighlightText1 = new ryProcessManager.hezuo.ContextMenuStripHighlightText();
this.RySearchXpath = new ryControls.rySearch();
this.label1 = new System.Windows.Forms.Label();
this.CbbXMLType = new ryControls.RyComboBox();
this.menuRight1 = new ryPaiban.Model.MenuRight(this.components);
this.fastColoredTextBox1 = new FastColoredTextBoxNS.FastColoredTextBox();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@@ -62,8 +62,8 @@
// splitContainer1.Panel2
//
this.splitContainer1.Panel2.Controls.Add(this.panelEx1);
this.splitContainer1.Size = new System.Drawing.Size(875, 475);
this.splitContainer1.SplitterDistance = 145;
this.splitContainer1.Size = new System.Drawing.Size(875, 471);
this.splitContainer1.SplitterDistance = 143;
this.splitContainer1.SplitterWidth = 2;
this.splitContainer1.TabIndex = 13;
//
@@ -79,7 +79,7 @@
this.TxtXML.Location = new System.Drawing.Point(3, 3);
this.TxtXML.Name = "TxtXML";
this.TxtXML.OnlyInputText = true;
this.TxtXML.Size = new System.Drawing.Size(868, 139);
this.TxtXML.Size = new System.Drawing.Size(868, 137);
this.TxtXML.TabIndex = 32;
this.TxtXML.Text = "";
this.TxtXML.DoubleClick += new System.EventHandler(this.TxtXML_DoubleClick);
@@ -95,10 +95,23 @@
this.panelEx1.Name = "panelEx1";
this.panelEx1.Padding = new System.Windows.Forms.Padding(2);
this.panelEx1.RoundeStyle = ryControls.RoundStyle.None;
this.panelEx1.Size = new System.Drawing.Size(869, 322);
this.panelEx1.Size = new System.Drawing.Size(869, 324);
this.panelEx1.TabIndex = 8;
this.panelEx1.TileBackColor = System.Drawing.Color.White;
//
// fastColoredTextBox1
//
this.fastColoredTextBox1.AutoScrollMinSize = new System.Drawing.Size(0, 14);
this.fastColoredTextBox1.ContextMenuStrip = this.contextMenuStripHighlightText1;
this.fastColoredTextBox1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.fastColoredTextBox1.Dock = System.Windows.Forms.DockStyle.Fill;
this.fastColoredTextBox1.Font = new System.Drawing.Font("Courier New", 9.75F);
this.fastColoredTextBox1.ImeMode = System.Windows.Forms.ImeMode.On;
this.fastColoredTextBox1.Location = new System.Drawing.Point(2, 2);
this.fastColoredTextBox1.Name = "fastColoredTextBox1";
this.fastColoredTextBox1.Size = new System.Drawing.Size(865, 320);
this.fastColoredTextBox1.TabIndex = 0;
//
// contextMenuStripHighlightText1
//
this.contextMenuStripHighlightText1.Name = "contextMenuStripHighlightText1";
@@ -110,6 +123,7 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.RySearchXpath.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(236)))), ((int)(((byte)(239)))), ((int)(((byte)(244)))));
this.RySearchXpath.BaseColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(76)))), ((int)(((byte)(95)))));
this.RySearchXpath.ButtonRoundBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(236)))), ((int)(((byte)(239)))), ((int)(((byte)(244)))));
this.RySearchXpath.EmptyText = "";
this.RySearchXpath.Location = new System.Drawing.Point(179, 3);
this.RySearchXpath.Name = "RySearchXpath";
@@ -135,11 +149,13 @@
this.CbbXMLType.FormattingEnabled = true;
this.CbbXMLType.Items.AddRange(new object[] {
"XML内容",
"Html内容"});
"Html内容",
"JSon内容"});
this.CbbXMLType.Location = new System.Drawing.Point(11, 3);
this.CbbXMLType.Name = "CbbXMLType";
this.CbbXMLType.Size = new System.Drawing.Size(85, 24);
this.CbbXMLType.TabIndex = 10;
this.CbbXMLType.SelectedIndexChanged += new System.EventHandler(this.CbbXMLType_SelectedIndexChanged);
//
// menuRight1
//
@@ -147,18 +163,6 @@
this.menuRight1.Size = new System.Drawing.Size(185, 92);
this.menuRight1.SourceContent = this;
//
// fastColoredTextBox1
//
this.fastColoredTextBox1.AutoScrollMinSize = new System.Drawing.Size(27, 14);
this.fastColoredTextBox1.ContextMenuStrip = this.contextMenuStripHighlightText1;
this.fastColoredTextBox1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.fastColoredTextBox1.Dock = System.Windows.Forms.DockStyle.Fill;
this.fastColoredTextBox1.Font = new System.Drawing.Font("Courier New", 9.75F);
this.fastColoredTextBox1.Location = new System.Drawing.Point(2, 2);
this.fastColoredTextBox1.Name = "fastColoredTextBox1";
this.fastColoredTextBox1.Size = new System.Drawing.Size(865, 318);
this.fastColoredTextBox1.TabIndex = 0;
//
// FrmXpath
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -171,7 +175,7 @@
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "FrmXpath";
this.TabPageContextMenuStrip = this.menuRight1;
this.Text = "Xpath测试工具";
this.Text = "Xpath/JPath测试工具";
this.Load += new System.EventHandler(this.FrmXpath_Load);
this.splitContainer1.Panel1.ResumeLayout(false);
this.splitContainer1.Panel2.ResumeLayout(false);
Source/开发辅助工具/Tools/FrmXpath.cs
+25
View File
@@ -1,5 +1,7 @@
using FastColoredTextBoxNS;
using HtmlAgilityPack;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -102,6 +104,23 @@ namespace 开发辅助工具.Tools
}
}
}
else if (CbbXMLType.SelectedIndex == 2)
{
fastColoredTextBox1.Language = Language.JSON;
try
{
JObject jo = (JObject)JsonConvert.DeserializeObject(TxtXML.Text);
var list= jo.SelectTokens(RySearchXpath.Text).ToList();
for (int i = 0; i < list.Count; i++)
{
if (text != "") { text += "\r\n\r\n"; }
text += list[i].ToString();
}
}
catch (Exception ex)
{
}
}
}
catch (Exception ex)
{
@@ -128,5 +147,11 @@ namespace 开发辅助工具.Tools
txt.Text = frm.richTextBox1.Text;
}
}
private void CbbXMLType_SelectedIndexChanged(object sender, EventArgs e)
{
if (CbbXMLType.SelectedIndex == 2) { label1.Text = "JPath表达式"; }
else { label1.Text = "XPath表达式"; }
}
}
}