Skip to content

Commit 1ce795c

Browse files
starlyingstarlying
authored
Merge branch 'dev' into master
2 parents aa4805d + 3993d34 commit 1ce795c

File tree

1,072 files changed

+93790
-44236
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,072 files changed

+93790
-44236
lines changed

‎home/src/lib/models/config/index.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ export type Config = {
66
beianNo?: string
77
isWritingEnabled?: boolean
88
isRegisterAllowed?: boolean
9+
isFindPassword?: boolean
910
}

‎home/src/login/index.jsx‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@ class IndexPage extends React.Component {
5353
if (this.props.config.isRegisterAllowed) {
5454
regEl = <Link className="signUpAccount quc-link" to="/reg">注册帐号</Link>;
5555
}
56+
let findPasswordEl = null;
57+
if (this.props.config.isFindPassword) {
58+
findPasswordEl = <Link className="forgetPass quc-link" to="/findpwd">找回密码？</Link>;
59+
}
5660
return (<div>
5761
<div id="doc">
5862
<div className="login-page">
@@ -110,15 +114,15 @@ class IndexPage extends React.Component {
110114
</span>
111115
</p>
112116
<p className="quc-field quc-field-keep-alive quc-clearfix">
113-
<Link className="forgetPass quc-link" to="/findpwd">找回密码？</Link>
117+
{findPasswordEl}
114118
{regEl}
115119
</p>
116120
<p className={cx({ "quc-field quc-field-submit": true, "disabled": this.state.controls.submitting })}>
117121
<a href="javascript:;" className="quc-submit quc-button quc-button-sign-in" onClick={(e) => {
118122
this.submit();
119123
}}>{this.state.controls.submitting ? '登录中...' : '登录'}</a>
120124
</p>
121-
<p className="quc-field quc-field-third-part" style={{ display: 'none' }}>
125+
<p className="quc-field quc-field-third-part">
122126
<span>第三方帐号登录：</span>
123127
<span className="quc-third-part">
124128
<a href="#" className="quc-third-part-icon quc-third-part-icon-weixin" title="微信登录"/>

‎home/src/login/index.jsx.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎home/src/login/index.tsx‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,10 @@ class IndexPage extends React.Component<P, S> {
7575
if (this.props.config.isRegisterAllowed) {
7676
regEl = <Link className="signUpAccount quc-link" to="/reg">注册帐号</Link>
7777
}
78+
let findPasswordEl = null
79+
if (this.props.config.isFindPassword) {
80+
findPasswordEl = <Link className="forgetPass quc-link" to="/findpwd">找回密码？</Link>
81+
}
7882

7983
return (
8084
<div>
@@ -134,7 +138,7 @@ class IndexPage extends React.Component<P, S> {
134138
</span>
135139
</p>
136140
<p className="quc-field quc-field-keep-alive quc-clearfix">
137-
<Link className="forgetPass quc-link" to="/findpwd">找回密码？</Link>
141+
{findPasswordEl}
138142
{regEl}
139143
</p>
140144
<p className={cx({ "quc-field quc-field-submit": true, "disabled": this.state.controls.submitting })}>

‎source/BaiRong.Core/AppManager.cs‎

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public class AppManager
88
{
99
private AppManager() { }
1010

11-
public const string Version = "5.0";
11+
public const string Version = "5.1";
1212

1313
public static string GetFullVersion()
1414
{
@@ -608,6 +608,7 @@ public class LeftMenu
608608
public const string IdAccounts = "Accounts";
609609

610610
public const string IdFunction = "Function";
611+
public const string IdConfiguration = "Configuration";
611612

612613
public class Function
613614
{
@@ -799,29 +800,17 @@ private WebSite() { }
799800

800801
public static List<string> GetAppIdList()
801802
{
802-
return new List<string> { Cms.AppId, Wcm.AppId };
803+
return new List<string> { Cms.AppId, Wcm.AppId, WeiXin.AppId };
803804
}
804805

805-
public static string GetAppName(string appId, bool isFullName)
806+
public static bool IsWcm()
806807
{
807-
var retval = string.Empty;
808-
if (StringUtils.EqualsIgnoreCase(appId, Cms.AppId))
809-
{
810-
retval = "SiteServer CMS";
811-
if (isFullName) retval += " 内容管理系统";
812-
}
813-
else if (StringUtils.EqualsIgnoreCase(appId, Wcm.AppId))
814-
{
815-
retval = "SiteServer WCM";
816-
if (isFullName) retval += " 内容协作平台";
817-
}
818-
819-
return retval;
808+
return FileUtils.IsFileExists(PathUtils.GetMenusPath(Wcm.AppId, "Management.config"));
820809
}
821810

822-
public static bool IsWcm()
811+
public static bool IsWeiXin()
823812
{
824-
return FileUtils.IsFileExists(PathUtils.GetMenusPath(Wcm.AppId, "Management.config"));
813+
return FileUtils.IsFileExists(PathUtils.GetMenusPath(WeiXin.AppId, "Management.config"));
825814
}
826815

827816
public static void Upgrade(string version, out string errorMessage)

‎source/BaiRong.Core/AuxiliaryTable/TableStyleManager.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System.Collections;
1+
using System.Collections;
22
using System.Collections.Generic;
33
using System.Data;
44
using BaiRong.Core.Collection;

‎source/BaiRong.Core/BaiRong.Core.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,9 +215,6 @@
215215
<Compile Include="AreaManager.cs" />
216216
<Compile Include="CacheManager.cs" />
217217
<Compile Include="AppManager.cs" />
218-
<Compile Include="ProductFileUtils.cs">
219-
<SubType>Code</SubType>
220-
</Compile>
221218
<Compile Include="SmsManager.cs" />
222219
<Compile Include="DepartmentManager.cs" />
223220
<Compile Include="IO\CSVUtils.cs" />

‎source/BaiRong.Core/ConfigManager.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ public class ConfigManager
77
{
88
private const string CacheKey = "BaiRong.Core.ConfigManager";
99

10-
private ConfigManager() { }
11-
1210
public static ConfigInfo Instance
1311
{
1412
get
@@ -22,10 +20,6 @@ public static ConfigInfo Instance
2220
}
2321
}
2422

25-
public static UserConfigInfo UserConfigInfo => Instance.UserConfigInfo;
26-
27-
public static SystemConfigInfo SystemConfigInfo => Instance.SystemConfigInfo;
28-
2923
public static bool IsChanged
3024
{
3125
set
@@ -37,6 +31,12 @@ public static bool IsChanged
3731
}
3832
}
3933

34+
private ConfigManager() { }
35+
36+
public static UserConfigInfo UserConfigInfo => Instance.UserConfigInfo;
37+
38+
public static SystemConfigInfo SystemConfigInfo => Instance.SystemConfigInfo;
39+
4040
public static string Cipherkey
4141
{
4242
get

0 commit comments

Comments
 (0)