Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager

config/config.js

@@ -318,7 +318,6 @@ export default {
                 },
               ],
             },
-
             {
               path: '/staff',
               name: '员工管理',
@@ -335,7 +334,7 @@ export default {
                   hideInMenu: true,
                   component: './staff/list/editStaff',
                 },
-             
+
                 {
                   path: '/staff/RoleList',
                   name: '角色管理',
@@ -385,19 +384,19 @@ export default {
               ],
             },
             {
-              path: '/indexEcharts',
-              name: 'echarts',
+              path: '/system',
+              name: '系统管理',
               component: '../layouts/BlankLayout',
               routes: [
                 {
-                  path: '/indexEcharts/index',
-                  name: '报表',
-                  component: './indexEcharts/index',
+                  path: '/system/messageList',
+                  name: '客户留言',
+                  component: './system/messageList',
                 },
                 {
-                  path: '/indexEcharts/userSource',
-                  name: '用户来源',
-                  component: './indexEcharts/userSource',
+                  path: '/system/report',
+                  name: '报表数据',
+                  component: './system/report',
                 },
                 {
                   path: '/system/intention',
@@ -480,7 +479,7 @@ export default {
 
   proxy: {
     '/api/': {
-      target: 'http://192.168.0.84:8080/',
+      target: 'http://192.168.0.11:8080/',
       changeOrigin: true,
       // pathRewrite: { '^/server': '' },
     },

src/components/AuthButton/index.jsx

@@ -0,0 +1,25 @@
+import React from 'react';
+
+let allBtns = [];
+let current = [];
+
+const AuthButton = ({ children, name, noRight }) => {
+  const btn = allBtns.filter(x => x.code === name)[0]
+
+  // 没维护的按钮, 或者不需要权限的按钮直接通过
+  if (!btn || !btn.roles || !btn.roles.length) {
+    return <>{children}</>
+  }
+
+  const hasRight = btn.roles.some(x => current.some(y => x === y))
+  return hasRight ? <>{children}</> : <>{noRight}</>
+}
+
+const setAllBtnAuth = x => allBtns = x;
+const setUserBtnAuth = x => current = x;
+
+export default AuthButton;
+export {
+  setAllBtnAuth,
+  setUserBtnAuth,
+};

src/layouts/BasicLayout.jsx

@@ -9,8 +9,9 @@ import Link from 'umi/link';
 import Redirect from 'umi/redirect';
 import { connect } from 'dva';
 import { formatMessage } from 'umi-plugin-react/locale';
-import Authorized from '@/utils/Authorized';
+// import Authorized from '@/utils/Authorized';
 import RightContent from '@/components/GlobalHeader/RightContent';
+import RenderAuthorize from '@/components/Authorized';
 import { isAntDesignPro } from '@/utils/utils';
 import logo from '../assets/logo.png';
   
@@ -33,12 +34,9 @@ const footerRender = () => {
 
 const BasicLayout = props => {
   const { dispatch, children, settings } = props;
-  /**
-   * constructor
-   */
-
+  
   useEffect(() => {
-    if (dispatch) {
+    if (dispatch && !props.user.currentUser.userId) {
       dispatch({
         type: 'user/fetchCurrent',
       });
@@ -47,9 +45,8 @@ const BasicLayout = props => {
       });
     }
   }, []);
-  /**
-   * init variables
-   */
+  
+  const Authorized = RenderAuthorize(props.user.currentUser.roles)
 
   const handleMenuCollapse = payload => {
     if (dispatch) {

src/models/login.js

@@ -1,8 +1,13 @@
 import { routerRedux } from 'dva/router';
 import { stringify } from 'querystring';
-import { fakeAccountLogin, getFakeCaptcha } from '@/services/login';
+// import { fakeAccountLogin, getFakeCaptcha } from '@/services/login';
 import { setAuthority } from '@/utils/authority';
 import { getPageQuery } from '@/utils/utils';
+import { fetch, apis } from '@/utils/request';
+
+const signin = fetch(apis.user.signin);
+const signout = fetch(apis.user.signout);
+
 const Model = {
   namespace: 'login',
   state: {
@@ -10,7 +15,7 @@ const Model = {
   },
   effects: {
     *login({ payload }, { call, put }) {
-      const response = yield call(fakeAccountLogin, payload);
+      const response = yield call(signin, payload);
       yield put({
         type: 'changeLoginStatus',
         payload: response,
@@ -42,9 +47,11 @@ const Model = {
       yield call(getFakeCaptcha, payload);
     },
 
-    *logout(_, { put }) {
+    *logout(_, { put, call }) {
       const { redirect } = getPageQuery(); // redirect
 
+      yield call(signout, { logout: true });
+
       if (window.location.pathname !== '/user/login' && !redirect) {
         yield put(
           routerRedux.replace({
@@ -59,7 +66,7 @@ const Model = {
   },
   reducers: {
     changeLoginStatus(state, { payload }) {
-      setAuthority((payload.user.roles || []).map(x => x.roleId));
+      // setAuthority((payload.user.roles || []).map(x => x.roleId));
       return { ...state, status: 'ok', type: payload.type };
     },
   },

src/models/user.js

@@ -1,11 +1,14 @@
-import request from '../utils/request';
-import apis from '../services/apis';
+import { fetch, apis } from '@/utils/request';
+import { setAllBtnAuth, setUserBtnAuth } from '@/components/AuthButton';
+
+const getCurrentUser = fetch(apis.user.current)
 
 const UserModel = {
   namespace: 'user',
   state: {
     currentUser: {},
     menuList: [],
+    buttonList: [],
   },
   effects: {
     // *fetch(_, { call, put }) {
@@ -17,7 +20,7 @@ const UserModel = {
     // },
 
     *fetchCurrent(_, { call, put }) {
-      const response = yield call(request, apis.user.current);
+      const response = yield call(getCurrentUser);
 
       yield put({
         type: 'saveCurrentUser',
@@ -27,10 +30,13 @@ const UserModel = {
   },
   reducers: {
     saveCurrentUser(state, { payload }) {
-      const { taUser = {} , menuList = [] } = payload || {}
+      const { taUser = {} , menuList = [], buttonList = [] } = payload || {}
       const currentUser = { ...taUser, roles: (taUser.roles || []).map(x => x.roleId) }
 
-      return { ...state, currentUser, menuList };
+      setAllBtnAuth(buttonList)
+      setUserBtnAuth(currentUser.roles)
+
+      return { ...state, currentUser, menuList, buttonList };
     },
     changeNotifyCount(
       state = {

src/pages/building/list/index.jsx

@@ -5,6 +5,7 @@ import request from '../../../utils/request';
 import apis from '../../../services/apis';
 import Styles from './style.less';
 import { router } from 'umi';
+import AuthButton from '@/components/AuthButton';
 
 
 const { Option } = Select;
@@ -285,9 +286,12 @@ function body(props) {
           </Button>
         </Form.Item>
       </Form>
-      <Button type="danger" className={Styles.addButton} onClick={() => toAdd()}>
-        新增楼盘
-      </Button>
+
+      <AuthButton name="building.add" noRight={null}>
+        <Button type="danger" className={Styles.addButton} onClick={() => toAdd()}>
+          新增楼盘
+        </Button>
+      </AuthButton>
 
       {/* 卡片内容，显示楼盘项目  */}
       <Row style={{ padding: ' 0 10px' }}>

src/services/apis.js

@@ -16,6 +16,10 @@ export default {
       method: 'POST',
       url: `${prefix}/taUser/signin`,
     },
+    signout: {
+      method: 'POST',
+      url: `${prefix}/taUser/signout`,
+    },
   },
   building: {
     getList: {