Merge branch 'master' of g.civnet.cn:test/maintenance

.vscode/setting.json

 {
     "editor.codeActionsOnSave": {
         "source.fixAll": true
-    }
+    },
+    "editor.tabSize": 2
 }
\ No newline at end of file

jsconfig.json

@@ -7,7 +7,8 @@
         "baseUrl": "./",
         "paths": {
             "@/*": ["src/*"]
-        }
+        },
+        "spaces": 2
     },
     "exclude": [
         "node_modules"

src/components/PreviewConfigDrawer/index.js

+import React from 'react';
+import { Drawer, Form, Button } from 'antd';
+import classnames from 'classnames';
+import styles from './index.less';
+
+export default props => {
+  const {
+    visible,
+    setVisible,
+    drawerProps,
+    previewContent,
+    drawerContent,
+    previewClass,
+    children,
+  } = props;
+  return (
+    <div className={classnames(styles.preViewContainer, previewClass)}>
+      <div className={styles.previewBox}>{previewContent}</div>
+      <Drawer
+        title="Multi-level drawer"
+        width={520}
+        closable
+        onClose={() => {
+          setVisible(false);
+        }}
+        visible={visible}
+        {...drawerProps}
+      >
+        {children || drawerContent}
+      </Drawer>
+    </div>
+  );
+};

src/components/PreviewConfigDrawer/index.less

+.preViewContainer{
+    width: 100%;
+    @minHeight: calc(100vh - 240px);
+    min-height: @minHeight;
+    padding: 6px 12px;
+    .previewBox{
+        width: 100%;
+        height: max(@minHeight, 720px);
+        background: #f5eebb;
+    }
+}
\ No newline at end of file

src/layouts/BlankLayout.js

 import check from '@/components/Authorized/CheckPermissions';
 import React from 'react';
 import { renderRoutes } from 'react-router-config';
-
+import page403 from '@/pages/exception/403';
 const Layout = ({ children, route }) => (
   <>
     {children ||
       renderRoutes(
-        route.routes.filter(
-          r => !r.authority || check(r.authority, true, false),
-        ),
+        route.routes.map(r => {
+          if (!r.authority) {
+            return r;
+          }
+          r.component = check(r.authority, r.component, page403);
+          return r;
+        }),
       )}
   </>
 );

src/pages/appConfig/index.js

+import React from 'react';
+import { PageContainer } from '@ant-design/pro-layout';
+
+const AppConfigPage = props => <PageContainer>appConfigPage</PageContainer>;
+
+export default AppConfigPage;

src/pages/mobileConfig/index.js

+import React from 'react';
+import { PageContainer } from '@ant-design/pro-layout';
+
+const MobileConfigPage = props => (
+  <PageContainer>mobileConfigPage</PageContainer>
+);
+
+export default MobileConfigPage;

src/pages/userCenter/UserManage.js

@@ -44,8 +44,9 @@ const UserManage = () => {
     const haveChildren = Array.isArray(org.children) && org.children.length > 0;
     return {
       title: (
+        <>
+          <span>{org.text}</span>
           <div className={styles.iconWraper1}>
-          {org.text}
             <Tooltip title="添加用户">
               <FileAddTwoTone onClick={e => addUser(e, org.text, org.id)} />
             </Tooltip>
@@ -59,6 +60,7 @@ const UserManage = () => {
               <DeleteTwoTone onClick={e => deleteOrg(e, org.text, org.id)} />
             </Tooltip>
           </div>
+        </>
       ),
       key: org.id,
       // icon: <CaretDownOutlined />,
@@ -96,6 +98,7 @@ const UserManage = () => {
     {
       title: '操作',
       key: 'action',
+      align: 'center',
       render: (text, record) => (
         <Space size="middle">
           <a>关联角色 {record.name}</a>
@@ -340,18 +343,10 @@ const UserManage = () => {
   };
 
   return (
-    <PageContainer>
-      <div
-        style={{
-          width: '20%',
-          height: 'calc(100vh - 194px)',
-          background: 'white',
-          float: 'left',
-          padding: '10px',
-          minWidth: '330px',
-        }}
-      >
-        <span style={{ padding: '8px' }}>
+    <PageContainer className={styles.userManageContainer}>
+      <div className={styles.contentContainer}>
+        <div className={styles.orgContainer}>
+          <span style={{ padding: '8px', fontSize: '16px' }}>
             机构列表
             <Tooltip title="添加下级机构">
               <FolderAddTwoTone
@@ -369,15 +364,7 @@ const UserManage = () => {
             treeData={treeData}
           />
         </div>
-      <div
-        style={{
-          width: '79%',
-          height: 'calc(100vh - 194px)',
-          background: 'white',
-          float: 'right',
-          padding: '20px',
-        }}
-      >
+        <div className={styles.userContainer}>
           <Table
             columns={columns}
             dataSource={tableData}
@@ -507,6 +494,7 @@ const UserManage = () => {
         >
           <p>即将关联删除 主站点 用户关系，是否确认删除？</p>
         </Modal>
+      </div>
     </PageContainer>
   );
 };

src/pages/userCenter/UserManage.less

-.iconWraper1{
+.userManageContainer{
+    .ant-tree-treenode{
+        width: 100%;
+        .ant-tree-node-content-wrapper.ant-tree-node-content-wrapper-normal{
+            display: inline-block;
+            width: 100%;
+        }
+        .iconWraper1{
+            float: right;
             span{
                 display: none;   
             }
-}
-.iconWraper1:hover{
-    span{
+        }
+    }
+
+    .ant-tree-treenode:hover{
+        .iconWraper1>span{
             margin-left: 12px;
             font-size: 16px;
             display: inline-block;   
         }
-    // display: block;
+    }
+    .contentContainer{
+        min-height: calc(100vh - 194px);
+        display: flex;
+        .orgContainer{
+            width: 20%;
+            height: calc(100vh - 194px);
+            float: left;
+            padding: 10px;
+            min-width: 330px;
+            background: white;
+            .ant-tree{
+                padding-top: 6px;
+            }
+        }
+        .userContainer{
+            margin-left: 12px;
+            flex: 1;
+            height: calc(100vh - 194px);
+            background: white;
+            .ant-table-pagination-right{
+                padding-right: 12px;
+            }
+        }
+    }
 }

src/pages/webConfig/componets/siteConfig.js

+import React from 'react';
+import { Button } from 'antd';
+import styles from './siteConfig.less';
+import PreviewConfigDrawer from '@/components/PreviewConfigDrawer';
+import BaseForm from '@/components/BaseForm';
+
+export default props => {
+  const { visible, setVisible } = props;
+  return (
+    <div className={styles.siteConfigContainer}>
+      <PreviewConfigDrawer
+        visible={visible}
+        setVisible={setVisible}
+        drawerProps={
+          {
+            // maskStyle: { opacity: 0.6 },
+          }
+        }
+        previewContent={
+          <Button onClick={() => setVisible(true)}>打开配置</Button>
+        }
+      >
+        <BaseForm />
+      </PreviewConfigDrawer>
+    </div>
+  );
+};

src/pages/webConfig/componets/siteConfig.less

+.siteConfigContainer{
+    width: 100%;
+    @minHeight: calc(100vh - 240px);
+    min-height: @minHeight;
+    padding: 6px 12px;
+    .previewBox{
+        width: 100%;
+        height: max(@minHeight, 720px);
+        background: #f5eebb;
+    }
+}
\ No newline at end of file

src/pages/webConfig/index.js

+import React, { useState } from 'react';
+import { PageContainer } from '@ant-design/pro-layout';
+import { Tabs } from 'antd';
+import menuTree from '@/services/mocks/web4site';
+import styles from './index.less';
+import SiteConfig from './componets/siteConfig';
+const { TabPane } = Tabs;
+
+const WebConfigPage = props => {
+  const [configVisible, setConfigVisible] = useState(false);
+  const renderPage = () => {};
+  const renderTabPane = tabPaneItem => (
+    <TabPane key={tabPaneItem.id} tab={tabPaneItem.text}>
+      <SiteConfig visible={configVisible} setVisible={setConfigVisible} />
+    </TabPane>
+  );
+
+  const onEdit = (targetKey, action) => {
+    // console.log(targetKey, action); // action: add|remove
+  };
+  return (
+    <PageContainer>
+      <div className={styles.webConfigContainer}>
+        <Tabs type="editable-card" onEdit={onEdit}>
+          {menuTree.children.map(renderTabPane)}
+        </Tabs>
+      </div>
+    </PageContainer>
+  );
+};
+
+export default WebConfigPage;

src/pages/webConfig/index.less

+.webConfigContainer{
+
+}
+
+.webConfigContainer > .ant-tabs-card .ant-tabs-content {
+    height: 100%;
+    margin-top: -16px;
+  }
+  .webConfigContainer > .ant-tabs-card .ant-tabs-content > .ant-tabs-tabpane {
+    background: #fff;
+    padding: 16px;
+  }
+  .webConfigContainer > .ant-tabs-card > .ant-tabs-nav::before {
+    display: none;
+  }
+  .webConfigContainer > .ant-tabs-card .ant-tabs-tab,
+  [data-theme='compact'] .webConfigContainer > .ant-tabs-card .ant-tabs-tab {
+    border-color: transparent;
+    background: transparent;
+  }
+  .webConfigContainer > .ant-tabs-card .ant-tabs-tab-active,
+  [data-theme='compact'] .webConfigContainer > .ant-tabs-card .ant-tabs-tab-active {
+    border-color: #fff;
+    background: #fff;
+  }
+  #components-tabs-demo-card-top .code-box-demo {
+    background: #f5f5f5;
+    overflow: hidden;
+    padding: 24px;
+  }
+  [data-theme='compact'] .webConfigContainer > .ant-tabs-card .ant-tabs-content {
+    height: 120px;
+    margin-top: -8px;
+  }
+  [data-theme='dark'] .webConfigContainer > .ant-tabs-card .ant-tabs-tab {
+    border-color: transparent;
+    background: transparent;
+  }
+  [data-theme='dark'] #components-tabs-demo-card-top .code-box-demo {
+    background: #000;
+  }
+  [data-theme='dark'] .webConfigContainer > .ant-tabs-card .ant-tabs-content > .ant-tabs-tabpane {
+    background: #141414;
+  }
+  [data-theme='dark'] .webConfigContainer > .ant-tabs-card .ant-tabs-tab-active {
+    border-color: #141414;
+    background: #141414;
+  }
\ No newline at end of file

src/routes/config.js

 import React from 'react';
-import { omit } from 'lodash';
 import {
   DatabaseOutlined,
   UsergroupAddOutlined,
@@ -22,6 +21,9 @@ import RoleManage from '../pages/userCenter/RoleManage';
 import SiteManage from '../pages/userCenter/siteManage/SiteManage';
 // import DefaultComponent from '../pages/orgnazation/DefaultComponent';
 import TestTable from '../pages/orgnazation/TestTable';
+import WebConfigPage from '@/pages/webConfig';
+import AppConfigPage from '@/pages/appConfig';
+import MobileConfigPage from '@/pages/mobileConfig';
 import { USER_MODE } from '@/utils/constants';
 const iconStyle = { verticalAlign: '0.125em' };
 
@@ -62,11 +64,13 @@ export default {
             {
               path: '/dbm/dbInit',
               name: '数据库初始化',
+              authority: adminAuthority,
               component: InitDataBase,
             },
             {
               path: '/dbm/dbsm',
               name: '数据库标准化管理',
+              authority: superAuthority,
               component: ManagementDataBase,
             },
           ],
@@ -150,17 +154,17 @@ export default {
             {
               path: '/productCenter/web',
               name: 'web配置',
-              component: Welcome,
+              component: WebConfigPage,
             },
             {
               path: '/productCenter/app',
               name: 'app配置',
-              component: Welcome,
+              component: AppConfigPage,
             },
             {
               path: '/productCenter/miniProgram',
               name: '小程序配置',
-              component: Welcome,
+              component: MobileConfigPage,
             },
           ],
         },