### 2021-09-15更新

------
#### MyDb    V3.0.2109.1501
- *.[新增]QuickWeb类的GetSize函数新增支持返回异常信息。
- *.[新增]MSSQL数据库操作新增对byte[]字段的支持。

#### MyDb_SQLite    V3.0.2109.1501
- *.[新增]新增对byte[]字段的支持。

#### MyDb_MySQL    V3.0.2109.1501
  - *.[新增]新增对byte[]字段的支持。
This commit is contained in:
鑫Intel 2021-09-15 17:32:07 +08:00
parent 83d0e095d5
commit 95bffb50bf
44 changed files with 376 additions and 65 deletions

View File

@ -7498,6 +7498,13 @@
<param name="field"></param>
<param name="value"></param>
</member>
<member name="M:ryCommonDb.RyQuickSQL.AddField(System.String,System.Byte[])">
<summary>
添加byte[]字段
</summary>
<param name="field"></param>
<param name="value"></param>
</member>
<member name="M:ryCommonDb.RyQuickSQL.AddField(System.String,System.Boolean)">
<summary>
添加bool字段
@ -8150,6 +8157,14 @@
<param name="url"></param>
<returns></returns>
</member>
<member name="M:RyWeb.QuickWeb.GetSize(System.String,System.String@)">
<summary>
获取网址对应的文件大小
</summary>
<param name="url"></param>
<param name="errormsg"></param>
<returns></returns>
</member>
<member name="P:RyWeb.QuickWeb.UserAgent">
<summary>

View File

@ -7498,6 +7498,13 @@
<param name="field"></param>
<param name="value"></param>
</member>
<member name="M:ryCommonDb.RyQuickSQL.AddField(System.String,System.Byte[])">
<summary>
添加byte[]字段
</summary>
<param name="field"></param>
<param name="value"></param>
</member>
<member name="M:ryCommonDb.RyQuickSQL.AddField(System.String,System.Boolean)">
<summary>
添加bool字段
@ -8150,6 +8157,14 @@
<param name="url"></param>
<returns></returns>
</member>
<member name="M:RyWeb.QuickWeb.GetSize(System.String,System.String@)">
<summary>
获取网址对应的文件大小
</summary>
<param name="url"></param>
<param name="errormsg"></param>
<returns></returns>
</member>
<member name="P:RyWeb.QuickWeb.UserAgent">
<summary>

View File

@ -7471,6 +7471,13 @@
<param name="field"></param>
<param name="value"></param>
</member>
<member name="M:ryCommonDb.RyQuickSQL.AddField(System.String,System.Byte[])">
<summary>
添加byte[]字段
</summary>
<param name="field"></param>
<param name="value"></param>
</member>
<member name="M:ryCommonDb.RyQuickSQL.AddField(System.String,System.Boolean)">
<summary>
添加bool字段
@ -8123,6 +8130,14 @@
<param name="url"></param>
<returns></returns>
</member>
<member name="M:RyWeb.QuickWeb.GetSize(System.String,System.String@)">
<summary>
获取网址对应的文件大小
</summary>
<param name="url"></param>
<param name="errormsg"></param>
<returns></returns>
</member>
<member name="P:RyWeb.QuickWeb.UserAgent">
<summary>

View File

@ -7471,6 +7471,13 @@
<param name="field"></param>
<param name="value"></param>
</member>
<member name="M:ryCommonDb.RyQuickSQL.AddField(System.String,System.Byte[])">
<summary>
添加byte[]字段
</summary>
<param name="field"></param>
<param name="value"></param>
</member>
<member name="M:ryCommonDb.RyQuickSQL.AddField(System.String,System.Boolean)">
<summary>
添加bool字段
@ -8123,6 +8130,14 @@
<param name="url"></param>
<returns></returns>
</member>
<member name="M:RyWeb.QuickWeb.GetSize(System.String,System.String@)">
<summary>
获取网址对应的文件大小
</summary>
<param name="url"></param>
<param name="errormsg"></param>
<returns></returns>
</member>
<member name="P:RyWeb.QuickWeb.UserAgent">
<summary>

View File

@ -1,4 +1,17 @@
### 2021-09-12更新
### 2021-09-15更新
------
#### MyDb V3.0.2109.1501
- *.[新增]QuickWeb类的GetSize函数新增支持返回异常信息。
- *.[新增]MSSQL数据库操作新增对byte[]字段的支持。
#### MyDb_SQLite V3.0.2109.1501
- *.[新增]新增对byte[]字段的支持。
#### MyDb_MySQL V3.0.2109.1501
- *.[新增]新增对byte[]字段的支持。
### 2021-09-12更新
------
#### ryControls V3.0.2109.1201
- *.[改进]ObjectListView控件的AspectToStringConverter函数新增行数据参数。

View File

@ -5,45 +5,203 @@ using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Runtime.InteropServices;
using System.Text;
using System.Windows.Forms;
namespace RySkins
{
[ComVisible(true)]
public partial class SKinForm : GMForm
{
public SKinForm()
/// <summary>
/// 无参数启动
/// </summary>
public SKinForm() : base()
{
InitializeComponent();
}
public SKinForm(string[] args)
private IntPtr ActiveHandle = IntPtr.Zero;
protected override void OnCreateControl()
{
//ActiveHandle= ryCommon.RyForm.GetActiveWindow();
base.OnCreateControl();
InitForm();
}
protected override void OnHandleCreated(EventArgs e)
{
ActiveHandle = ryCommon.RyForm.GetActiveWindow();
base.OnHandleCreated(e);
}
/// <summary>
/// 以参数方式启动
/// </summary>
/// <param name="args"></param>
public SKinForm(string[] args) : base()
{
InitializeComponent();
}
/// <summary>
/// 以单参数方式启动
/// </summary>
/// <param name="arg"></param>
public SKinForm(string arg) : base()
{
InitializeComponent();
}
private void InitForm()
{
if (this.Parent == null)
{
if (this.StartPosition == FormStartPosition.CenterParent)
{
var handle = ActiveHandle;
var parent_handle = WinAPI.User32.GetParent(Handle);
//var dd= this.ParentForm;
if (parent_handle == IntPtr.Zero) { parent_handle = handle; }
var forms = Application.OpenForms;
for (int i = 0; i < forms.Count; i++)
{
if (forms[i].Handle == handle)
{
ShowInCenter(forms[i]);
break;
}
}
}
else if (this.StartPosition == FormStartPosition.CenterScreen)
{
ShowInCenter(null);
}
}
}
/// <summary>
/// 显示在父窗体中间,如果没有父窗体,则显示在显示器中间
/// </summary>
/// <param name="parent"></param>
public void ShowInCenter(Form parent)
{
this.StartPosition = FormStartPosition.Manual;
var screen = Screen.FromControl(this);
ShowInCenter(this, parent);
}
/// <summary>
/// 显示在父窗体中间,如果没有父窗体,则显示在显示器中间
/// </summary>
/// <param name="CurForm"></param>
/// <param name="parent"></param>
public static void ShowInCenter(Form CurForm, Form parent)
{
CurForm.StartPosition = FormStartPosition.Manual;
var screen = Screen.FromControl(CurForm);
if (parent == null) //如果没有父窗体,则显示在显示器中间
{
Location = new Point((screen.WorkingArea.Width-Width)/2,(screen.WorkingArea.Height-Height)/2);
CurForm.Location = new Point((screen.WorkingArea.Width - CurForm.Width) / 2, (screen.WorkingArea.Height - CurForm.Height) / 2);
return;
}
var x = parent.Left+(parent.Width - Width) / 2;
var y =parent.Top+ (parent.Height - Height) / 2;
if((x+Width)> screen.WorkingArea.X+ screen.WorkingArea.Width)
var x = parent.Left + (parent.Width - CurForm.Width) / 2;
var y = parent.Top + (parent.Height - CurForm.Height) / 2;
if ((x + CurForm.Width) > screen.WorkingArea.X + screen.WorkingArea.Width)
{
x = screen.WorkingArea.X + screen.WorkingArea.Width - Width;
x = screen.WorkingArea.X + screen.WorkingArea.Width - CurForm.Width;
}
if ((y + Height) > screen.WorkingArea.Y + screen.WorkingArea.Height)
if ((y + CurForm.Height) > screen.WorkingArea.Y + screen.WorkingArea.Height)
{
y = screen.WorkingArea.Y + screen.WorkingArea.Height - Height;
y = screen.WorkingArea.Y + screen.WorkingArea.Height - CurForm.Height;
}
Location = new Point(x, y);
CurForm.Location = new Point(x, y);
}
/// <summary>
/// 激活窗体
/// </summary>
public void ActiveSkinForm()
{
ryCommon.RyForm.BringToTop(Handle);
ryCommon.RyForm.SetActiveWindow(Handle);
}
/// <summary>
/// 显示窗体
/// </summary>
/// <param name="type">指定要显示的窗体类型名</param>
public static void ShowForm(Type type)
{
RySkins.SKinForm form = (RySkins.SKinForm)Activator.CreateInstance(type);
form.Show();
}
/// <summary>
/// 显示窗体
/// </summary>
/// <param name="type">指定要显示的窗体类型名</param>
/// <param name="arg">参数</param>
public static void ShowForm(Type type, string arg)
{
RySkins.SKinForm form = (RySkins.SKinForm)Activator.CreateInstance(type, new object[] { arg });
form.Show();
}
/// <summary>
/// 显示窗体
/// </summary>
/// <param name="type">指定要显示的窗体类型名</param>
/// <param name="arg">参数</param>
public static void ShowForm(Type type, string[] arg)
{
RySkins.SKinForm form = (RySkins.SKinForm)Activator.CreateInstance(type, arg);
form.Show();
}
/// <summary>
/// 显示模式窗体
/// </summary>
/// <param name="type">指定要显示的窗体类型名</param>
/// <param name="arg">参数</param>
public static void ShowDialogForm(Type type, string[] arg)
{
RySkins.SKinForm form = (RySkins.SKinForm)Activator.CreateInstance(type, arg);
form.ShowDialog();
form.Dispose();
}
/// <summary>
/// 显示窗体,如果当前已经显示过,则激活窗体。
/// </summary>
/// <param name="type">指定要显示的窗体类型名</param>
public static void ShowFormOne(Form parent, Type type)
{
ShowFormOne(parent, type, null);
}
/// <summary>
/// 显示窗体,如果当前已经显示过,则激活窗体。
/// </summary>
/// <param name="type">指定要显示的窗体类型名</param>
/// <param name="arg">参数</param>
public static void ShowFormOne(Form parent, Type type, string[] arg)
{
var forms = Application.OpenForms;
for (int i = 0; i < forms.Count; i++)
{
if (forms[i].GetType() == type)
{
if (forms[i] is RySkins.SKinForm)
{
var skin_form = (RySkins.SKinForm)forms[i];
skin_form.ShowInCenter(parent);
skin_form.ActiveSkinForm();
skin_form.Show();
return;
}
else
{
forms[i].Show();
}
}
}
Form form;
if (arg == null)
{ form = (Form)Activator.CreateInstance(type); }
else
{
form = (Form)Activator.CreateInstance(type, arg);
}
ShowInCenter(form, parent);
ryCommon.RyForm.BringToTop(form.Handle);
ryCommon.RyForm.SetActiveWindow(form.Handle);
form.Show();
}
private void SKinForm_Load(object sender, EventArgs e)
{

View File

@ -138,6 +138,10 @@ namespace ryCommonDb
{
mySQL.AddField(col.ColumnName, ds.Tables[0].Rows[i][col].ToBool());
}
else if (col.DataType == typeof(byte[]))
{
mySQL.AddField(col.ColumnName, (byte[])ds.Tables[0].Rows[i][col]);
}
#endregion
}
list.Add(mySQL);

View File

@ -320,6 +320,10 @@ namespace ryCommonDb
{
tmpSQL += "[" + item.Field + "] [DATETIME],";
}
else if (item.value is byte[])
{
tmpSQL += "[" + item.Field + "] [varbinary](max),";
}
}
object[] param = null;
return ExecuteNonQuery(tmpSQL.Substring(0, tmpSQL.Length - 1) + ")", param);

View File

@ -156,6 +156,15 @@ namespace ryCommonDb
ListAdd(new SQLIitem(field, value));
}
/// <summary>
/// 添加byte[]字段
/// </summary>
/// <param name="field"></param>
/// <param name="value"></param>
public void AddField(string field, byte[] value)
{
ListAdd(new SQLIitem(field, value));
}
/// <summary>
/// 添加bool字段
/// </summary>
/// <param name="field"></param>

View File

@ -32,5 +32,5 @@ using System;
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值,
// 方法是按如下所示使用“*”: :
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("3.0.2109.0801")]
[assembly: AssemblyFileVersion("3.0.2109.0801")]
[assembly: AssemblyVersion("3.0.2109.1501")]
[assembly: AssemblyFileVersion("3.0.2109.1501")]

View File

@ -1,7 +1,9 @@
using DotNet4.Utilities;
using ryCommon;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Text;
namespace RyWeb
@ -65,7 +67,8 @@ namespace RyWeb
Timeout = Timeout,
ReadWriteTimeout = Timeout,
UserAgent = UserAgent,
Referer=Referer
Referer=Referer,
KeepAlive = false
};
if (cookie.Length > 0)
{
@ -97,6 +100,17 @@ namespace RyWeb
/// <returns></returns>
public long GetSize(string url)
{
return GetSize(url, out _);
}
/// <summary>
/// 获取网址对应的文件大小
/// </summary>
/// <param name="url"></param>
/// <param name="errormsg"></param>
/// <returns></returns>
public long GetSize(string url,out string errormsg)
{
errormsg = "";
try
{
HttpHelper t = new HttpHelper();
@ -109,12 +123,27 @@ namespace RyWeb
Timeout = Timeout,
ReadWriteTimeout = Timeout,
UserAgent = UserAgent,
Referer = Referer
Referer = Referer,
KeepAlive=false
};
HttpResult r = t.GetHtml(m);
if (r.StatusCode == System.Net.HttpStatusCode.OK)
{
return Convert.ToInt64(r.Header["Content-Length"]);
return GetContentLen();
}
else if (r.StatusCode == System.Net.HttpStatusCode.NotFound)
{
errormsg = "404错误";
return -404;
}
else if (r.StatusCode == System.Net.HttpStatusCode.Found)
{
return GetContentLen();
}
else if (r.StatusCode == 0)
{
errormsg = r.Html;
return 0;
}
else if (r.StatusCode == System.Net.HttpStatusCode.MethodNotAllowed)
{
@ -126,9 +155,29 @@ namespace RyWeb
}
else
return 0;
}
catch
long GetContentLen()
{
var size = r.Header["Content-Length"].ToInt64(0);
if (size == 0)
{
System.Net.ServicePointManager.DefaultConnectionLimit = 512;
HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(url);
request.AllowAutoRedirect = true;
request.Timeout = 3000;
request.ReadWriteTimeout = 3000;
HttpWebResponse response = (HttpWebResponse)request.GetResponse();
long totalBytes = response.ContentLength;
return totalBytes;
}
else
{
return size;
}
}
}
catch(Exception ex)
{
errormsg = ex.Message;
return 0;
}
}
@ -153,7 +202,8 @@ namespace RyWeb
HttpItem m = new HttpItem()
{
URL = url,
ContentType= "application/x-www-form-urlencoded"
ContentType= "application/x-www-form-urlencoded",
KeepAlive = false
};
if (cookie.Length>0)
{
@ -190,7 +240,8 @@ namespace RyWeb
HttpHelper t = new HttpHelper();
HttpItem m = new HttpItem()
{
URL = url
URL = url,
KeepAlive = false
};
if (cookie != "")
{

View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值,
// 方法是按如下所示使用“*”: :
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("3.0.2105.2201")]
[assembly: AssemblyFileVersion("3.0.2105.2201")]
[assembly: AssemblyVersion("3.0.2109.1501")]
[assembly: AssemblyFileVersion("3.0.2109.1501")]

View File

@ -317,6 +317,10 @@ namespace ryCommonDb
{
tmpSQL += "[" + item.Field + "] [DATETIME],";
}
else if (item.value is byte[])
{
tmpSQL += "[" + item.Field + "] [LONGBLOB],";
}
}
object[] param = null;
return ExecuteNonQuery(tmpSQL.Substring(0, tmpSQL.Length - 1) + ")", param);

View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值,
// 方法是按如下所示使用“*”: :
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("3.0.2105.2201")]
[assembly: AssemblyFileVersion("3.0.2105.2201")]
[assembly: AssemblyVersion("3.0.2109.1501")]
[assembly: AssemblyFileVersion("3.0.2109.1501")]

View File

@ -353,6 +353,10 @@ namespace ryCommonDb
{
Field = "[" + item.Field.TrimStart('[').TrimEnd(']') + "] DATETIME";
}
else if (item.value is byte[])
{
Field = "[" + item.Field.TrimStart('[').TrimEnd(']') + "] BLOB";
}
try
{
object[] param = null;
@ -386,6 +390,10 @@ namespace ryCommonDb
{
tmpSQL += "[" + item.Field.TrimStart('[').TrimEnd(']') + "] DATETIME,";
}
else if (item.value is byte[])
{
tmpSQL += "[" + item.Field.TrimStart('[').TrimEnd(']') + "] BLOB,";
}
}
object[] param = null;
return ExecuteNonQuery(tmpSQL.Substring(0, tmpSQL.Length - 1) + ")", param);

View File

@ -652,7 +652,7 @@ namespace BrightIdeasSoftware
this.Layout += new LayoutEventHandler(this.HandleLayout);
this.ColumnWidthChanging += new ColumnWidthChangingEventHandler(this.HandleColumnWidthChanging);
this.ColumnWidthChanged += new ColumnWidthChangedEventHandler(this.HandleColumnWidthChanged);
base.ShowGroups = false;
base.View = View.Details;
base.FullRowSelect = true;
// Turn on owner draw so that we are responsible for our own fates (and isolated from bugs in the underlying ListView)

View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值,
// 方法是按如下所示使用“*”: :
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("3.0.2109.1201")]
[assembly: AssemblyFileVersion("3.0.2109.1201")]
[assembly: AssemblyVersion("3.0.2109.1301")]
[assembly: AssemblyFileVersion("3.0.2109.1301")]