Merge branch 'master' of http://git.ycjcjy.com/marketing/pc-admin into master

src/components/GlobalHeader/index.jsx

@@ -0,0 +1,13 @@
+import React from 'react'
+import RightContent from './RightContent'
+import styles from './index.less';
+
+export default (props) => {
+  
+  return (
+    <div className={styles['g-header']}>
+      <h1>{props.title}</h1>
+      <RightContent />
+    </div>
+  )
+}

src/components/GlobalHeader/index.less

@@ -2,6 +2,16 @@
 
 @pro-header-hover-bg: rgba(0, 0, 0, 0.025);
 
+.g-header {
+  flex: 100 100 0%;
+  display: flex;
+
+  h1 {
+    margin: 0;
+    padding: 0;
+  }
+}
+
 .menu {
   :global(.anticon) {
     margin-right: 8px;

src/components/TableList/TableList.jsx

@@ -4,7 +4,7 @@ import Styles from './style.less'
 
 const Actions = (props) => {
   const style = {
-    marginBottom: '1em'
+    padding: '1em',
   }
 
   return (
@@ -15,7 +15,7 @@ const Actions = (props) => {
 }
 
 export default (props) => {
-  const { actions, ...leftProps } = props
+  const { actionRender, ...leftProps } = props
 
   const tableProps = {
     ...leftProps,
@@ -24,7 +24,7 @@ export default (props) => {
   
   return (
     <div className={Styles['box-wrapper']}>
-      {actions && <Actions>{actions}</Actions>}
+      {typeof actionRender === 'function' && <Actions>{actionRender()}</Actions>}
       <Table {...tableProps} />
     </div>
   )

src/components/TableList/index.jsx

@@ -1,5 +1,5 @@
-import React, { useCallback, useState, useEffect, useImperativeHandle } from 'react';
-import { stringify } from 'querystring';
+import React, { useCallback, useRef, useState, useEffect, useImperativeHandle } from 'react';
+// import { stringify } from 'querystring';
 import { notification } from 'antd';
 import request from '@/utils/request'
 import TableList from './TableList';
@@ -7,56 +7,69 @@ import Pagination from './Pagination';
 
 export default React.forwardRef((props, ref) => {
   const [loading, setLoading] = useState(false)
-  const [pageConfig, setPageConfig] = useState({ current: 1, pageSize: 10, total: 0 })
+  const mounted = useRef(false)
   const [list, setList] = useState()
-  const { api, params = {}, onPageChange, ...tableProps } = props
-  const paramsStr = stringify({
-    ...params,
-    pageNum: pageConfig.current,
-    pageSize: pageConfig.pageSize,
-  })
-
-  const updatePageConfig = useCallback((config) => {
-    const newPage = {
-      ...pageConfig,
-      ...config,
-    }
-
-    setPageConfig(newPage)
+  const [pageTotal, setPageTotal] = useState(0)
+  const [pageConfig, setPageConfig] = useState({ current: 1, pageSize: 10 })
 
-    if (onPageChange) {
-      onPageChange(newPage)
-    }
-  }, [pageConfig])
+  const { api, params = {}, onPageChange, ...tableProps } = props
 
-  const handlePageChange = (current, pageSize) => {
-    const config = pageSize ? { current, pageSize } : { current }
-    updatePageConfig(config)
-  }
+  // 更新分页
+  const updatePage = useCallback(
+    (current, pageSize) => {
+      const config = pageSize ? { current, pageSize } : { current }
+      const newPage = {
+        ...pageConfig,
+        ...config,
+      }
+  
+      setPageConfig(newPage)
+      if (onPageChange) {
+        onPageChange(newPage)
+      }
+    },
+    [pageConfig],
+  )
 
   // 获取远程数据
   const fetchData = useCallback(
     () => {
-      const url = `${api.url}?${paramsStr}`
       setLoading(true)
-      request({...api, url}).then((res) => {
-        const {current, total, records = []} = res
+      const queryParams = {
+        ...params,
+        pageNum: pageConfig.current,
+        pageSize: pageConfig.pageSize,
+      }
+      request({...api, params: queryParams }).then((res) => {
+        const {total, records = []} = res
         setLoading(false)
         setList(records)
-        updatePageConfig({current, total})
+        setPageTotal(total)
       }).catch((err) => {
         console.error(err)
         setLoading(false)
         notification.warn({ message: err.message })
       })
     },
-    [paramsStr, api],
+    [params, pageConfig, api],
   )
 
   // 监控查询参数的修改
   useEffect(() => {
+    // 通过更新分页来触发查询
+    updatePage(1)
+  }, [params])
+  
+  // 监控分页的修改
+  useEffect(() => {
+    // 首次加载不查询
+    if (!mounted.current) {
+      mounted.current = true
+      return
+    }
+
     fetchData()
-  }, [paramsStr])
+  }, [pageConfig])
 
   // 透传给父组件部分方法
   useImperativeHandle(ref, () => ({
@@ -66,7 +79,7 @@ export default React.forwardRef((props, ref) => {
   return (
     <>
       <TableList loading={loading} dataSource={list} {...tableProps} />
-      <Pagination {...pageConfig} onChange={handlePageChange} />
+      <Pagination {...pageConfig} total={pageTotal} onChange={updatePage} />
     </>
   )
 });

src/layouts/BasicLayout.jsx

@@ -10,7 +10,7 @@ import { connect } from 'dva';
 import { Icon, Result, Button } from 'antd';
 import { formatMessage } from 'umi-plugin-react/locale';
 import Authorized from '@/utils/Authorized';
-import RightContent from '@/components/GlobalHeader/RightContent';
+import GlobalHeader from '@/components/GlobalHeader';
 import { isAntDesignPro, getAuthorityFromRouter } from '@/utils/utils';
 import logo from '../assets/logo.svg';
 const noMatch = (
@@ -63,6 +63,7 @@ const BasicLayout = (props) => {
     dispatch,
     children,
     settings,
+    history,
     location = {
       pathname: '/',
     },
@@ -76,9 +77,9 @@ const BasicLayout = (props) => {
       });
     }
   }; // get children authority
+  const routeItem = getAuthorityFromRouter(props.route.routes, location.pathname || '/')
 
   const authorized = useMemo(() => {
-    const routeItem = getAuthorityFromRouter(props.route.routes, location.pathname || '/')
     if (!routeItem || !routeItem.menuCode) {
       return {
         authority: undefined,
@@ -130,7 +131,7 @@ const BasicLayout = (props) => {
       footerRender={footerRender}
       menuDataRender={menuDataRender(menus)}
       formatMessage={formatMessage}
-      rightContentRender={() => <RightContent />}
+      rightContentRender={() => <GlobalHeader title={routeItem.name} history={history} location={location} />}
       {...props}
       {...settings}
     >

src/models/login.js

@@ -47,8 +47,7 @@ const Model = {
         }
       }
 
-      // yield put(routerRedux.replace(redirect || '/'));
-      yield put(routerRedux.replace('/'));
+      yield put(routerRedux.replace(redirect || '/'));
     },
 
     *logout(_, { put, call }) {

src/pages/building/List/index.jsx

@@ -1,19 +1,38 @@
 import React, { useMemo, useRef, useCallback, useState } from 'react'
-import { PageHeaderWrapper } from '@ant-design/pro-layout'
-import apis from '@/services/apis'
+// import { PageHeaderWrapper } from '@ant-design/pro-layout'
+import { Button, notification, Spin } from 'antd'
 import QueryTable from '@/components/QueryTable'
+import request from '@/utils/request'
+import apis from '@/services/apis'
 import getSearchFields from './searchFields'
 import getTableColumns from './tableColumns'
 
 export default (props) => {
   const ref = useRef()
+  const [loading, setLoading] = useState(false)
   const [page, setPage] = useState({current: 1, pageSize: 10})
   const onPublish = useCallback((row) => {
-    //
+    const buidingStatus = row.status === 1 ? 2 : 1
+    request({ ...apis.building.updateStatus, data: { id: row.buildingId, status: buidingStatus } }).then(() => {
+      notification.success({ message: '操作成功' })
+      setLoading(false)
+      ref.current.reload()
+    }).catch(err => {
+      console.error(err)
+      setLoading(false)
+    })
   }, [])
 
   const onDelete = useCallback((row) => {
-
+    setLoading(true)
+    request({ ...apis.building.deleteBuilding, urlData: { id: row.buildingId } }).then(() => {
+      notification.success({ message: '操作成功' })
+      setLoading(false)
+      ref.current.reload()
+    }).catch((err) => {
+      console.error(err)
+      setLoading(false)
+    })
   }, [])
 
   const searchFields = useMemo(getSearchFields, [])
@@ -25,16 +44,23 @@ export default (props) => {
     })
   }, [page])
 
+  const actionRender = () => {
+    return <Button type="primary" icon="plus">新增</Button>
+  }
+
   return (
-    <PageHeaderWrapper>
-      <QueryTable
-        ref={ref}
-        rowKey="buildingId"
-        api={apis.building.getList}
-        searchFields={searchFields}
-        columns={tableColumns}
-        onPageChange={(pg) => setPage(pg)}
-      />
-    </PageHeaderWrapper>
+    // <PageHeaderWrapper>
+      <Spin spinning={loading}>
+        <QueryTable
+          ref={ref}
+          rowKey="buildingId"
+          api={apis.building.getList}
+          searchFields={searchFields}
+          columns={tableColumns}
+          actionRender={actionRender}
+          onPageChange={(pg) => setPage(pg)}
+        />
+      </Spin>
+    // </PageHeaderWrapper>
   )
 }

src/pages/document.ejs

@@ -170,7 +170,7 @@
       <div
         style="display: flex;justify-content: center;align-items: center;flex-direction: column;min-height: 420px;height: 100%;"
       >
-        <img src="/pro_icon.svg" alt="logo" width="256" />
+        <!-- <img src="/pro_icon.svg" alt="logo" width="256" /> -->
         <div class="page-loading-warp">
           <div class="ant-spin ant-spin-lg ant-spin-spinning">
             <span class="ant-spin-dot ant-spin-dot-spin"
@@ -181,11 +181,11 @@
         </div>
         <div style="display: flex;justify-content: center;align-items: center;">
           <img
-            src="https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg"
+            src="./yz_logo.png"
             width="32"
             style="margin-right: 8px;"
           />
-          Ant Design
+          南京 云致
         </div>
       </div>
     </div>

src/utils/utils.js

@@ -29,13 +29,27 @@ export const getPageQuery = () => parse(window.location.href.split('?')[1]);
  */
 
 export const getAuthorityFromRouter = (router = [], pathname) => {
-  const authority = router.find(
-    ({ routes, path = '/' }) =>
-      (path && pathRegexp(path).exec(pathname)) ||
-      (routes && getAuthorityFromRouter(routes, pathname)),
-  );
-  if (authority) return authority;
-  return undefined;
+  // const authority = router.find(
+  //   ({ routes, path = '/' }) =>
+  //     (path && pathRegexp(path).exec(pathname)) ||
+  //     (routes && getAuthorityFromRouter(routes, pathname)),
+  // );
+
+  // if (authority) return authority;
+  // return undefined;
+
+  for (let r of router) {
+    if (pathRegexp(r.path || '/').exec(pathname)) {
+      return r
+    }
+
+    if (r.routes && r.routes.length) {
+      const f = getAuthorityFromRouter(r.routes, pathname)
+      if (f) {
+        return f
+      }
+    }
+  }
 };
 export const getRouteAuthority = (path, routeData) => {
   let authorities;