Merge pull request #138 from dotnetcore/develop

release v2.4.1

Author: alienwow

CHANGELOG.md

@@ -1,7 +1,23 @@
 # 更新日志
 
+## v3.0.x
+### v3.0.0 (2019-11-15)
+3.0版本正式发布，支持.netcore 3.0，包括2.x最新版本的所有功能
+
 ## v2.4.x
 
+### v2.4.1 (2019-11-15)
+
+* **修改：**  修复同时使用Cookie和jwt登陆时报错的bug（不建议混合两种模式）
+
+#### 前后端不分离模式
+* **修改：**  修复Combobox联动由于没有图表而报错的bug
+
+#### React前后端分离模式
+* **新增：**  多语言支持
+* **修改：**  修复菜单地址bug
+* **修改：**  修复菜单管理，数去权限管理页面问题
+
 ### v2.4.0 (2019-11-5)
 本次更新为大版本更新，废弃了之前Session的模式，使用Jwt和cookie两种方式进行登陆认证。
 框架目前支持Cookie和Jwt两种模式，继承BaseController和BaseApiController的控制器将默认支持Cookie模式。

demo/WalkingTec.Mvvm.Demo/Program.cs

@@ -3,6 +3,7 @@
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Localization;
@@ -47,7 +48,7 @@ public static IWebHostBuilder CreateWebHostBuilder(string[] args)
                             new DataPrivilegeInfo<School>("学校", y => y.SchoolName),
                             new DataPrivilegeInfo<Major>("专业", y => y.MajorName)
                         };
-                        x.AddFrameworkService(dataPrivilegeSettings: pris, webHostBuilderContext: hostingCtx);
+                        x.AddFrameworkService(dataPrivilegeSettings: pris, webHostBuilderContext: hostingCtx,CsSector:CSSelector);
                         x.AddLayui();
                         x.AddSwaggerGen(c =>
                         {
@@ -80,5 +81,25 @@ public static IWebHostBuilder CreateWebHostBuilder(string[] args)
                     })
                     .UseUrls(globalConfig.ApplicationUrl);
         }
+
+        public static string CSSelector(ActionExecutingContext context)
+        {
+            var userinfo = (context.Controller as IBaseController)?.LoginUserInfo;
+            if (userinfo == null)
+            {
+                return "default";
+            }
+            else
+            {
+                if (userinfo.ITCode.StartsWith("a"))
+                {
+                    return "default";
+                }
+                else
+                {
+                    return "default";
+                }
+            }
+        }
     }
 }

demo/WalkingTec.Mvvm.Demo/appsettings.json

@@ -15,6 +15,7 @@
   "PageMode": "Tab", //页面显示模式，Single或者Tab
   "TabMode": "Simple", //Tab页显示方式，Default或者Simple
   "IsFilePublic": true,
+  "ErrorHandler": "/_Framework/Error",
   "Languages": "zh,en",
   "CorsOptions": {
     "EnableAll": true, //所有方法是否默认跨域

demo/WalkingTec.Mvvm.ReactDemo/ClientApp/package.json

@@ -3,7 +3,7 @@
   "version": "0.0.1",
   "private": true,
   "dependencies": {
-    "@ant-design/pro-layout": "^4.5.16",
+    "@ant-design/pro-layout": "4.6.2",
     "ag-grid-community": "^21.2.1",
     "ag-grid-enterprise": "^21.2.1",
     "ag-grid-react": "^21.2.1",

demo/WalkingTec.Mvvm.ReactDemo/ClientApp/src/app/layout/antdPro/GlobalHeader/index.module.less

@@ -43,7 +43,7 @@
   float: right;
   height: 100%;
   overflow: hidden;
-
+  display: flex;
   // color: #fff;
   .action {
     display: inline-block;
@@ -89,10 +89,12 @@
   background-color: #fff;
   border-radius: 4px;
   box-shadow: @shadow-1-down;
+  
 }
 
 .userAvatar {
   display: inline-block;
+  cursor: pointer;
 }
 
 .dark {

demo/WalkingTec.Mvvm.ReactDemo/ClientApp/src/app/layout/antdPro/GlobalHeader/userMenu.tsx

@@ -54,7 +54,7 @@ export default class UserMenu extends React.Component<any, any> {
 @DialogFormDes({
   onFormSubmit(values) {
     return Request.ajax({
-      url: "/api/_account/ChangePassword",
+      url: "/api/_login/ChangePassword",
       method: "post",
       body: values
     }).toPromise()

demo/WalkingTec.Mvvm.ReactDemo/ClientApp/src/app/layout/antdPro/SettingDrawer/index.tsx

@@ -382,20 +382,20 @@ class SettingDrawer extends Component<SettingDrawerProps, SettingDrawerState> {
         onClose={this.togglerContent}
         placement="right"
         getContainer={getContainer}
-        handler={
-          <div
-            className="ant-pro-setting-drawer-handle"
-            onClick={this.togglerContent}
-          >
-            <Icon
-              type={collapse ? 'close' : 'setting'}
-              style={{
-                color: '#fff',
-                fontSize: 20,
-              }}
-            />
-          </div>
-        }
+        // handler={
+        //   <div
+        //     className="ant-pro-setting-drawer-handle"
+        //     onClick={this.togglerContent}
+        //   >
+        //     <Icon
+        //       type={collapse ? 'close' : 'setting'}
+        //       style={{
+        //         color: '#fff',
+        //         fontSize: 20,
+        //       }}
+        //     />
+        //   </div>
+        // }
         style={{
           zIndex: 999,
         }}

demo/WalkingTec.Mvvm.ReactDemo/ClientApp/src/app/layout/antdPro/index.tsx

@@ -2,7 +2,7 @@ import { BasicLayout, GridContent } from '@ant-design/pro-layout';
 import LayoutSpin from "components/other/LayoutSpin";
 import GlobalConfig from 'global.config';
 import lodash from 'lodash';
-import { action, toJS } from 'mobx';
+import { action, toJS, observable } from 'mobx';
 import { observer } from 'mobx-react';
 import * as React from 'react';
 import { renderRoutes } from 'react-router-config';
@@ -13,12 +13,14 @@ import UserMenu from './GlobalHeader/userMenu';
 import TabsPages from './TabsPages';
 import SettingDrawer, { ContentWidth } from './SettingDrawer';
 import './style.less';
+import { Icon } from 'antd';
 // import { ConfigConsumer } from 'antd/lib/config-provider';
 // import {  } from 'antd';
 // ConfigConsumer
 @observer
 export default class App extends React.Component<any> {
-    static con
+    @observable
+    collapse = false;
     /**
      *settings 变更 事件
      *
@@ -66,6 +68,11 @@ export default class App extends React.Component<any> {
     }
     componentDidMount() {
     }
+    @action.bound
+    togglerContent() {
+        this.collapse = !this.collapse;
+    };
+
     public render() {
         const settings = toJS(GlobalConfig.settings);
         const { language } = GlobalConfig;
@@ -78,6 +85,9 @@ export default class App extends React.Component<any> {
                     rightContentRender={rightProps => (
                         <RightContent {...rightProps} selectedLang={language} changeLang={this.changeLang} >
                             <UserMenu {...rightProps} {...this.props} />
+                            <div className={`ant-pro-setting ${settings.navTheme} ${settings.layout}`} onClick={this.togglerContent}>
+                                <Icon type={ 'setting'} />
+                            </div>
                         </RightContent>
                     )}
                     menuHeaderRender={(logo, title) => <Link to="/">{logo}{title}</Link>}
@@ -100,7 +110,7 @@ export default class App extends React.Component<any> {
                 >
                     {settings.tabsPage && settings.contentWidth !== "Fixed" ? <TabsPages {...this.props} /> : <MainContent {...this.props} contentWidth={settings.contentWidth} />}
                 </BasicLayout>
-                <SettingDrawer settings={settings} onSettingChange={this.onSettingChange} />
+                <SettingDrawer collapse={this.collapse} onCollapseChange={this.togglerContent} settings={settings} onSettingChange={this.onSettingChange} />
             </>
         );
     }

demo/WalkingTec.Mvvm.ReactDemo/ClientApp/src/app/layout/antdPro/style.less

@@ -7,6 +7,28 @@
         font-size: 16px;
     }
 }
+.ant-pro-top-nav-header-menu{
+    max-width: initial !important;
+}
+.ant-pro-setting {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 16px;
+    text-align: center;
+    width: 40px;
+    cursor: pointer;
+
+    &.dark {
+
+        &.sidemenu {
+            color: rgba(0, 0, 0, 0.65);
+        }
+        &.topmenu {
+            color: #fff;
+        }
+    }
+}
 
 .ant-pro-sider-menu-sider.light .ant-pro-sider-menu-logo {
     box-shadow: none;
@@ -39,5 +61,4 @@
             font-size: 12px;
         }
     }
-}
-
+}

demo/WalkingTec.Mvvm.ReactDemo/ClientApp/src/locale/en-US/action.ts

@@ -22,4 +22,6 @@ export default {
     'action.user.apiDocument':'API document',
     'action.user.changePassword':'Change Password',
     'action.user.logout':'Logout',
+    'action.sys.refreshMenu': 'Refresh Menu',
+    'action.privilege':'Privilege',
 };