SVN r623
SVN-Revision: r623
This commit is contained in:
@@ -38,6 +38,7 @@ using System.Net;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System.Collections;
|
||||
using Newtonsoft.Json;
|
||||
using System.Web;
|
||||
|
||||
namespace Lskj.Control
|
||||
{
|
||||
@@ -860,13 +861,13 @@ namespace Lskj.Control
|
||||
{
|
||||
string codeSql = "select";
|
||||
codeSql += string.Format(" '{0}' as {1}", this.PrimaryValue, this.PrimaryKey);
|
||||
url=ReplaceHelper.ReplaceRowParam(BaseImpl.GetDataRowResult(codeSql), ReplaceHelper.ReplaceWhereCond(detailModel.DetailSql));
|
||||
url = ReplaceHelper.ReplaceRowParam(BaseImpl.GetDataRowResult(codeSql), ReplaceHelper.ReplaceWhereCond(detailModel.DetailSql));
|
||||
}
|
||||
if (this.ControlObj.CurrentData != null) url = ReplaceHelper.ReplaceRowParam(this.ControlObj.CurrentData, url);
|
||||
//url= System.Web.HttpUtility.UrlEncode(url);
|
||||
if (SystemInfo.Instance.PrimitiveBrowser)
|
||||
{
|
||||
FrmMiniBlink webView = new FrmMiniBlink();
|
||||
FrmMiniBlink webView = new FrmMiniBlink();
|
||||
webView.IsDownVerify = true;
|
||||
webView.Dock = DockStyle.Fill;
|
||||
webView.Tag = detailModel;
|
||||
@@ -876,7 +877,7 @@ namespace Lskj.Control
|
||||
}
|
||||
else
|
||||
{
|
||||
FrmWebBrowser webView = new FrmWebBrowser();
|
||||
FrmWebBrowser webView = new FrmWebBrowser();
|
||||
webView.Dock = DockStyle.Fill;
|
||||
webView.Tag = detailModel;
|
||||
tabPage.Tag = webView;
|
||||
@@ -900,7 +901,7 @@ namespace Lskj.Control
|
||||
}
|
||||
else
|
||||
{
|
||||
FrmWebBrowser2 webView =new FrmWebBrowser2();
|
||||
FrmWebBrowser2 webView = new FrmWebBrowser2();
|
||||
webView.Dock = DockStyle.Fill;
|
||||
webView.Tag = detailModel;
|
||||
tabPage.Tag = webView;
|
||||
@@ -925,7 +926,7 @@ namespace Lskj.Control
|
||||
}
|
||||
else
|
||||
{
|
||||
FrmWebBrowser2 webView = new FrmWebBrowser2();
|
||||
FrmWebBrowser2 webView = new FrmWebBrowser2();
|
||||
webView.Dock = DockStyle.Fill;
|
||||
webView.Tag = detailModel;
|
||||
webView.AllowDownload = false;
|
||||
@@ -1074,7 +1075,7 @@ namespace Lskj.Control
|
||||
if (this.ControlObj.CurrentData != null) url = ReplaceHelper.ReplaceRowParam(this.ControlObj.CurrentData, url);
|
||||
webView.LoadUrl(url);
|
||||
webView.Dock = DockStyle.Fill;
|
||||
|
||||
|
||||
}
|
||||
else if (tabPage.Tag is FrmMiniBlink)
|
||||
{
|
||||
@@ -2080,7 +2081,6 @@ namespace Lskj.Control
|
||||
if (imageEdit != null)
|
||||
{
|
||||
int result = BaseModuleImpl.UpdateRecord(this.SysModel.MenuTable, imageEdit.Model.FieldName, "", this.PrimaryKey, this.PrimaryValue);
|
||||
|
||||
MessageUtil.Show(result > 0 ? ResourceKeys.OperSuccess : ResourceKeys.OperFault);
|
||||
}
|
||||
}
|
||||
@@ -2209,7 +2209,7 @@ namespace Lskj.Control
|
||||
string postUrl = "{0}Api/FileUploadApi.ashx?moduleId={1}&idValue={2}&folder={3}&totsize={4}&position={5}&filename={6}&method={7}";
|
||||
Dictionary<string, string> headerDic = new Dictionary<string, string>();
|
||||
headerDic.Add("Authorization", $"Bearer {token}");
|
||||
postUrl = string.Format(postUrl, SystemInfo.Instance.OAUrl, this.Model.ModuleCode, this.PrimaryValue, "UploadFilesTemp", fileBytes.Length, 0, Path.GetFileName(_imageEdit.CurrentImagePath), "DoWebUpload");
|
||||
postUrl = string.Format(postUrl, SystemInfo.Instance.OAUrl, this.Model.ModuleCode, this.PrimaryValue, "UploadFilesTemp", fileBytes.Length, 0, HttpUtility.UrlEncode($"{Guid.NewGuid()}_{Path.GetFileName(_imageEdit.CurrentImagePath)}"), "DoWebUpload");
|
||||
HttpTools.setting("application/x-www-form-urlencoded", null, null);
|
||||
HttpWebResponse webResponse = HttpTools.Post(postUrl, fileBase64Str, null, headerDic, HttpTools.Method.POST, out CookieCollection cookieCollection, out string result);
|
||||
if (webResponse != null && !string.IsNullOrEmpty(result))
|
||||
|
||||
Reference in New Issue
Block a user