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 2021-09-02 17:39:17 +08:00
parent 2d3bb192f9
commit d402952ed5
27 changed files with 10567 additions and 366 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Bin/Debug/SuperDesign/MyDb.dll
View File

Binary file not shown.

5201
Bin/Debug/SuperDesign/MyDb.xml
View File

File diff suppressed because it is too large Load Diff

BIN
Bin/Debug/SuperDesign/MyDb_SQLite.dll
View File

Binary file not shown.

BIN
Bin/Debug/SuperDesign/RyWeb.dll
View File

Binary file not shown.

5
Bin/Debug/SuperDesign/RyWeb.xml
View File

@ -472,6 +472,11 @@
</summary>
</member>
<member name="P:RyWeb.QuickWeb.Referer">
<summary>
</summary>
</member>
<member name="P:RyWeb.QuickWeb.Timeout">
<summary>

BIN
Bin/Debug/SuperDesign/SuperDesign.exe
View File

Binary file not shown.

BIN
Bin/Debug/SuperDesign/SuperDesign.rar Normal file
View File

Binary file not shown.

BIN
Bin/Debug/SuperDesign/System.Data.SQLite.dll
View File

Binary file not shown.

BIN
Bin/Debug/SuperDesign/XPTable.dll
View File

Binary file not shown.

BIN
Bin/Debug/SuperDesign/ryControls.dll
View File

Binary file not shown.

5152
Bin/Debug/SuperDesign/ryControls.xml
View File

File diff suppressed because it is too large Load Diff

BIN
Bin/Debug/SuperDesign/x64/SQLite.Interop.dll Normal file
View File

Binary file not shown.

BIN
Bin/Debug/SuperDesign/x86/SQLite.Interop.dll Normal file
View File

Binary file not shown.

13
CHANGELOG.md
View File

@ -1,4 +1,15 @@
### 2021-02-28更新
### 2021-09-02更新
------
#### SuperDesign V2.0.2105.1701
- *.[改进]新增对新版公用库的支持,将RyWeb等合并到一个库里。
### 2021-05-17更新
------
#### SuperDesign V2.0.2105.1701
- *.[新增]新增对新版SQLite库文件的更新支持。
- *.[新增]新增支持x64。
### 2021-02-28更新
------
#### SuperDesign V2.0.2102.2801
- *.[新增]支持毕方3.0标准。

BIN
Source/.vs/开发辅助工具/v16/.suo
View File

Binary file not shown.

BIN
Source/.vs/开发辅助工具/v17/.suo Normal file
View File

Binary file not shown.

25
Source/开发辅助工具/Controls/FrmText.Designer.cs generated
View File

@ -29,9 +29,9 @@
private void InitializeComponent()
{
this.panelEx1 = new ryControls.PanelEx();
this.BtnSave = new ryControls.ButtonEx();
this.richTextBox1 = new System.Windows.Forms.RichTextBox();
this.contextMenuStripRichText1 = new ryProcessManager.hezuo.ContextMenuStripRichText();
this.BtnSave = new ryControls.ButtonEx();
this.panelEx1.SuspendLayout();
this.SuspendLayout();
//
@ -49,17 +49,6 @@
this.panelEx1.TabIndex = 0;
this.panelEx1.TileBackColor = System.Drawing.Color.White;
//
// BtnSave
//
this.BtnSave.ForeColor = System.Drawing.Color.White;
this.BtnSave.Location = new System.Drawing.Point(12, 6);
this.BtnSave.Name = "BtnSave";
this.BtnSave.Size = new System.Drawing.Size(65, 26);
this.BtnSave.TabIndex = 1;
this.BtnSave.Text = "保存";
this.BtnSave.UseVisualStyleBackColor = true;
this.BtnSave.Click += new System.EventHandler(this.BtnSave_Click);
//
// richTextBox1
//
this.richTextBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
@ -78,6 +67,17 @@
this.contextMenuStripRichText1.Name = "contextMenuStripRichText1";
this.contextMenuStripRichText1.Size = new System.Drawing.Size(101, 164);
//
// BtnSave
//
this.BtnSave.BaseColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(76)))), ((int)(((byte)(95)))));
this.BtnSave.Location = new System.Drawing.Point(12, 6);
this.BtnSave.Name = "BtnSave";
this.BtnSave.Size = new System.Drawing.Size(65, 26);
this.BtnSave.TabIndex = 1;
this.BtnSave.Text = "保存";
this.BtnSave.UseVisualStyleBackColor = true;
this.BtnSave.Click += new System.EventHandler(this.BtnSave_Click);
//
// FrmText
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@ -88,6 +88,7 @@
this.Name = "FrmText";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "文本编辑 ";
this.Load += new System.EventHandler(this.FrmText_Load);
this.panelEx1.ResumeLayout(false);
this.ResumeLayout(false);

5
Source/开发辅助工具/Controls/FrmText.cs
View File

@ -20,5 +20,10 @@ namespace 开发辅助工具.Controls
{
DialogResult = DialogResult.OK;
}
private void FrmText_Load(object sender, EventArgs e)
{
richTextBox1.AutoWordSelection = false;
}
}
}

45
Source/开发辅助工具/Manager/RyProject.cs
View File

@ -69,10 +69,19 @@ namespace 开发辅助工具.Manager
/// <summary>
/// 通过dll名称来寻找dll路径
/// </summary>
/// <param name="_ReferenceDllPath"></param>
/// <param name="dll_name"></param>
/// <returns></returns>
public string GetDllPath(string dll_name)
{
return GetDllPath("", dll_name);
}
/// <summary>
/// 通过dll名称来寻找dll路径
/// </summary>
/// <param name="dll_foldername">为空则表示根目录下查找,否则查找子目录</param>
/// <param name="dll_name"></param>
/// <returns></returns>
public string GetDllPath(string dll_foldername,string dll_name)
{
var path_list = ReferenceDllPath.Replace("\r", "").Split('\n');
var find = false;
@ -80,9 +89,11 @@ namespace 开发辅助工具.Manager
#region 在引用文件夹查找是否有该dll,有则使用引用文件夹里的dll
for (int m = 0; m < path_list.Length; m++)
{
if (path_list[m].Trim() == "") { continue; }
if (!System.IO.Directory.Exists(path_list[m])) { continue; }
var files = System.IO.Directory.GetFiles(path_list[m]);
if (path_list[m].Trim().Length==0) { continue; }
var path = path_list[m].Trim('\\');
if (dll_foldername.Length > 0) { path += "\\" + dll_foldername; }
if (!System.IO.Directory.Exists(path)) { continue; }
var files = System.IO.Directory.GetFiles(path);
for (int z = 0; z < files.Length; z++)
{
if (System.IO.Path.GetFileName(files[z]).ToLower() == dll_name.ToLower())
@ -152,19 +163,31 @@ namespace 开发辅助工具.Manager
/// </summary>
public int UpdateDlls(string folder,out string error_str)
{
error_str = "";
var _error_str = "";
int error = 0;
Updates(folder);
void Updates(string _path)
Updates("",folder);
Updates("x86", folder+"\\x86");
Updates("x64", folder + "\\x64");
void Updates(string foldername,string _path)
{
if (!System.IO.Directory.Exists(_path)) { return; }
var files = System.IO.Directory.GetFiles(_path, "*.dll");
for (int i = 0; i < files.Length; i++)
{
string filename = System.IO.Path.GetFileName(files[i]);
var dllpath = GetDllPath(filename);
if (dllpath != "")
var dllpath = GetDllPath(foldername,filename);
if (dllpath.Length>0)
{
if (filename.ToLower() == "System.Data.SQLite.dll".ToLower())
{
RyFiles.CreateDirectory(_path + "\\x86");
RyFiles.CreateDirectory(_path + "\\x64");
var sourch_folder = System.IO.Path.GetDirectoryName(dllpath);
if (RyFiles.CopyFile(sourch_folder + "\\x86\\*", _path + "\\x86\\") != 0)
{ _error_str += sourch_folder + "\\x86\\*\r\n"; error++; }
if (RyFiles.CopyFile(sourch_folder + "\\x64\\*", _path + "\\x64\\") != 0)
{ _error_str += sourch_folder + "\\x64\\*\r\n"; error++; }
}
if (RyFiles.CopyFile(dllpath, files[i]) != 0)
{ _error_str += files[i]+ "\r\n"; error++; }
var dll_xml_path = System.IO.Path.GetDirectoryName(dllpath) +"\\"+ System.IO.Path.GetFileNameWithoutExtension(dllpath) + ".xml";
@ -178,7 +201,7 @@ namespace 开发辅助工具.Manager
var dirs = System.IO.Directory.GetDirectories(_path);
for (int i = 0; i < dirs.Length; i++)
{
Updates(dirs[i]);
Updates(foldername,dirs[i]);
}
}
error_str = _error_str;
@ -239,7 +262,7 @@ namespace 开发辅助工具.Manager
{
var Reference_Name = HintPath.Substring(iPos + 1);//引用的dll名称
var dll_path = GetDllPath(Reference_Name);
if (dll_path != "")
if (dll_path.Length>0)
{
if (CopyDllToBin)
{

4
Source/开发辅助工具/Properties/AssemblyInfo.cs
View File

@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
// 方法是按如下所示使用“*”: :
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.0.2102.2801")]
[assembly: AssemblyFileVersion("2.0.2102.2801")]
[assembly: AssemblyVersion("2.0.2109.0201")]
[assembly: AssemblyFileVersion("2.0.2109.0201")]

14
Source/开发辅助工具/SuperDesign.csproj
View File

@ -13,7 +13,7 @@
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>x86</PlatformTarget>
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
@ -41,12 +41,6 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\Bin\Debug\SuperDesign\FastColoredTextBox.dll</HintPath>
</Reference>
<Reference Include="HtmlAgilityPack">
<HintPath>..\..\Bin\Debug\SupperDesign\HtmlAgilityPack.dll</HintPath>
</Reference>
<Reference Include="MGdUI">
<HintPath>..\..\Bin\Debug\SupperDesign\MGdUI.dll</HintPath>
</Reference>
<Reference Include="MyDb">
<HintPath>..\..\Bin\Debug\SupperDesign\MyDb.dll</HintPath>
</Reference>
@ -60,12 +54,6 @@
<Reference Include="ryControls">
<HintPath>..\..\Bin\Debug\SupperDesign\ryControls.dll</HintPath>
</Reference>
<Reference Include="RyWeb">
<HintPath>..\..\Bin\Debug\SupperDesign\RyWeb.dll</HintPath>
</Reference>
<Reference Include="SCREEN_CAPTURE">
<HintPath>..\..\Bin\Debug\SupperDesign\SCREEN_CAPTURE.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Design" />

3
Source/开发辅助工具/Tools/FrmCreateProject.cs
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 替换命名空间

3
Source/开发辅助工具/Tools/FrmQrCode.cs
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)
{

2
Source/开发辅助工具/Tools/FrmWebGet.cs
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;

42
Source/开发辅助工具/Tools/FrmXpath.Designer.cs generated
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);

25
Source/开发辅助工具/Tools/FrmXpath.cs
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表达式"; }
}
}
}