diff --git a/SGGL/FineUIPro.Web/AttachFile/OnlineEditingPrivate.aspx b/SGGL/FineUIPro.Web/AttachFile/OnlineEditingPrivate.aspx new file mode 100644 index 00000000..a5eb61ad --- /dev/null +++ b/SGGL/FineUIPro.Web/AttachFile/OnlineEditingPrivate.aspx @@ -0,0 +1,298 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="OnlineEditingPrivate.aspx.cs" Inherits="FineUIPro.Web.AttachFile.OnlineEditingPrivate" %> + + + + + + + + + + Spire.Office + + + + + + + + + + +
+
+ +
+
+ +
+
+
+
+ + + + diff --git a/SGGL/FineUIPro.Web/AttachFile/OnlineEditingPrivate.aspx.cs b/SGGL/FineUIPro.Web/AttachFile/OnlineEditingPrivate.aspx.cs new file mode 100644 index 00000000..b37339d9 --- /dev/null +++ b/SGGL/FineUIPro.Web/AttachFile/OnlineEditingPrivate.aspx.cs @@ -0,0 +1,79 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using BLL; + +namespace FineUIPro.Web.AttachFile +{ + public partial class OnlineEditingPrivate : PageBase + { + #region 定义参数 + + public string CallBackUrl + { + get + { + var sysSet = (from x in Funs.DB.Sys_Const where x.ConstText == "OnlineEditCallBackurl" select x).ToList().FirstOrDefault(); + if (sysSet != null) + { + return sysSet.ConstValue; + } + else + { + return ""; + } + } + } + public string ReadOnly + { + get + { + return (string)ViewState["ReadOnly"]; + } + set + { + ViewState["ReadOnly"] = value; + } + } + public string PCUrl + { + get + { + return (string)ViewState["PCUrl"]; + } + set + { + ViewState["PCUrl"] = value; + } + } + public string editorMode + { + get + { + return (string)ViewState["editorMode"]; + } + set + { + ViewState["editorMode"] = value; + } + } + #endregion + + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + /*UserId = Request.Params["UserId"]; + AttachFileId = Request.Params["AttachFileId"]; + ReadOnly = Request.Params["ReadOnly"];*/ + PCUrl = Request.Params["fileUrl"]; + editorMode = Request.Params["editorMode"]; + + + } + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/AttachFile/OnlineEditingPrivate.aspx.designer.cs b/SGGL/FineUIPro.Web/AttachFile/OnlineEditingPrivate.aspx.designer.cs new file mode 100644 index 00000000..56ed2427 --- /dev/null +++ b/SGGL/FineUIPro.Web/AttachFile/OnlineEditingPrivate.aspx.designer.cs @@ -0,0 +1,17 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.AttachFile +{ + + + public partial class OnlineEditingPrivate + { + } +} diff --git a/SGGL/FineUIPro.Web/AttachFile/webuploader.aspx.cs b/SGGL/FineUIPro.Web/AttachFile/webuploader.aspx.cs index 3333ace5..4d5fc9b1 100644 --- a/SGGL/FineUIPro.Web/AttachFile/webuploader.aspx.cs +++ b/SGGL/FineUIPro.Web/AttachFile/webuploader.aspx.cs @@ -968,7 +968,17 @@ namespace FineUIPro.Web.AttachFile if (isSupportType) { url = url.Replace(Funs.RootPath, ""); - PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../AttachFile/OnlineEditing.aspx?fileUrl={0}&&editorMode={1}", url, editorMode, "编辑 -"))); + var sysSet4 = (from x in Funs.DB.Sys_Const where x.ConstText == "IsUseLoaclService" select x).ToList().FirstOrDefault(); + if (sysSet4!=null&& sysSet4.ConstValue=="1") + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../AttachFile/OnlineEditingPrivate.aspx?fileUrl={0}&&editorMode={1}", url, editorMode, "编辑 -"))); + + } + else + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../AttachFile/OnlineEditing.aspx?fileUrl={0}&&editorMode={1}", url, editorMode, "编辑 -"))); + + } } else { diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index d714d98f..23dad3ce 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -208,6 +208,7 @@ + @@ -6393,6 +6394,13 @@ OnlineEditing.aspx + + OnlineEditingPrivate.aspx + ASPXCodeBehind + + + OnlineEditingPrivate.aspx + player.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx b/SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx index 39131980..eb87a094 100644 --- a/SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx +++ b/SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx @@ -376,6 +376,13 @@ + + + + + + + diff --git a/SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx.cs b/SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx.cs index 299ff39e..f02f2c5e 100644 --- a/SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx.cs +++ b/SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx.cs @@ -1048,6 +1048,18 @@ namespace FineUIPro.Web.SysManage { txtCallBackapiurl.Text = sysSet3.ConstValue; } + var sysSet4 = (from x in db.Sys_Const where x.ConstText == "IsUseLoaclService" select x).ToList().FirstOrDefault(); + if (sysSet4 != null) + { + if (sysSet4.ConstValue=="1") + { + ckIsUseLoaclService .Checked=true; + } + else + { + ckIsUseLoaclService.Checked = false; + } + } } protected void OnlineMenuSetSave_OnClick(object sender, EventArgs e) { @@ -1115,6 +1127,36 @@ namespace FineUIPro.Web.SysManage Funs.DB.Sys_Const.InsertOnSubmit(sysSet3); Funs.DB.SubmitChanges(); } + Model.Sys_Const sysSet4 = db.Sys_Const.FirstOrDefault(x => x.ConstText == "IsUseLoaclService"); + if (sysSet4 != null) + { + if (ckIsUseLoaclService.Checked) + { + sysSet4.ConstValue ="1"; + } + else + { + sysSet4.ConstValue = "0"; + } + + db.SubmitChanges(); + } + else + { + sysSet4 = new Model.Sys_Const(); + if (ckIsUseLoaclService.Checked) + { + sysSet4.ConstValue = "1"; + } + else + { + sysSet4.ConstValue = "0"; + } + sysSet4.ConstText = "IsUseLoaclService"; + sysSet4.ID = SQLHelper.GetNewID(); + Funs.DB.Sys_Const.InsertOnSubmit(sysSet4); + Funs.DB.SubmitChanges(); + } ShowNotify("保存成功！", MessageBoxIcon.Success); } #endregion diff --git a/SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx.designer.cs b/SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx.designer.cs index 2a80b251..5246388d 100644 --- a/SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx.designer.cs @@ -869,6 +869,15 @@ namespace FineUIPro.Web.SysManage /// protected global::FineUIPro.TextBox txtCallBackapiurl; + /// + /// ckIsUseLoaclService 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.CheckBox ckIsUseLoaclService; + /// /// Toolbar5 控件。 /// diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config index 26b12067..1527ce2f 100644 --- a/SGGL/FineUIPro.Web/Web.config +++ b/SGGL/FineUIPro.Web/Web.config @@ -12,7 +12,7 @@ - + @@ -188,7 +188,7 @@ - +