Skip to content

C
CivManage
Commit fb805444 authored by Maofei94's avatar Maofei94
Browse files
Options

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

parents b65bbf94 ecdb2e32
Hide whitespace changes
Inline Side-by-side
Showing with 414 additions and 203 deletions
.vscode/setting.json
View file @ fb805444
{ {
"editor.codeActionsOnSave": { "editor.codeActionsOnSave": {
"source.fixAll": true "source.fixAll": true
} },
"editor.tabSize": 2
} }
\ No newline at end of file
jsconfig.json
View file @ fb805444
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
"baseUrl": "./", "baseUrl": "./",
"paths": { "paths": {
"@/*": ["src/*"] "@/*": ["src/*"]
} },
"spaces": 2
}, },
"exclude": [ "exclude": [
"node_modules" "node_modules"
......
src/components/PreviewConfigDrawer/index.js 0 → 100644
View file @ fb805444
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 0 → 100644
View file @ fb805444
.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
View file @ fb805444
import check from '@/components/Authorized/CheckPermissions'; import check from '@/components/Authorized/CheckPermissions';
import React from 'react'; import React from 'react';
import { renderRoutes } from 'react-router-config'; import { renderRoutes } from 'react-router-config';
import page403 from '@/pages/exception/403';
const Layout = ({ children, route }) => ( const Layout = ({ children, route }) => (
<> <>
{children || {children ||
renderRoutes( renderRoutes(
route.routes.filter( route.routes.map(r => {
r => !r.authority || check(r.authority, true, false), if (!r.authority) {
), return r;
}
r.component = check(r.authority, r.component, page403);
return r;
}),
)} )}
</> </>
); );
......
src/pages/appConfig/index.js 0 → 100644
View file @ fb805444
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 0 → 100644
View file @ fb805444
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
View file @ fb805444
...@@ -44,21 +44,23 @@ const UserManage = () => { ...@@ -44,21 +44,23 @@ const UserManage = () => {
const haveChildren = Array.isArray(org.children) && org.children.length > 0; const haveChildren = Array.isArray(org.children) && org.children.length > 0;
return { return {
title: ( title: (
<div className={styles.iconWraper1}> <>
{org.text} <span>{org.text}</span>
<Tooltip title="添加用户"> <div className={styles.iconWraper1}>
<FileAddTwoTone onClick={e => addUser(e, org.text, org.id)} /> <Tooltip title="添加用户">
</Tooltip> <FileAddTwoTone onClick={e => addUser(e, org.text, org.id)} />
<Tooltip title="添加下级机构"> </Tooltip>
<FolderAddTwoTone onClick={e => addSubOrg(e, org.text, org.id)} /> <Tooltip title="添加下级机构">
</Tooltip> <FolderAddTwoTone onClick={e => addSubOrg(e, org.text, org.id)} />
<Tooltip title="编辑当前机构"> </Tooltip>
<EditTwoTone onClick={e => editOrg(e, org.text, org.id)} /> <Tooltip title="编辑当前机构">
</Tooltip> <EditTwoTone onClick={e => editOrg(e, org.text, org.id)} />
<Tooltip title="删除当前机构"> </Tooltip>
<DeleteTwoTone onClick={e => deleteOrg(e, org.text, org.id)} /> <Tooltip title="删除当前机构">
</Tooltip> <DeleteTwoTone onClick={e => deleteOrg(e, org.text, org.id)} />
</div> </Tooltip>
</div>
</>
), ),
key: org.id, key: org.id,
// icon: <CaretDownOutlined />, // icon: <CaretDownOutlined />,
...@@ -96,6 +98,7 @@ const UserManage = () => { ...@@ -96,6 +98,7 @@ const UserManage = () => {
{ {
title: '操作', title: '操作',
key: 'action', key: 'action',
align: 'center',
render: (text, record) => ( render: (text, record) => (
<Space size="middle"> <Space size="middle">
<a>关联角色 {record.name}</a> <a>关联角色 {record.name}</a>
...@@ -340,173 +343,158 @@ const UserManage = () => { ...@@ -340,173 +343,158 @@ const UserManage = () => {
}; };
return ( return (
<PageContainer> <PageContainer className={styles.userManageContainer}>
<div <div className={styles.contentContainer}>
style={{ <div className={styles.orgContainer}>
width: '20%', <span style={{ padding: '8px', fontSize: '16px' }}>
height: 'calc(100vh - 194px)', 机构列表
background: 'white', <Tooltip title="添加下级机构">
float: 'left', <FolderAddTwoTone
padding: '10px', style={{ fontSize: '16px', float: 'right' }}
minWidth: '330px', onClick={e => addSubOrg(e, '根目录', '-1')}
}} />
> </Tooltip>
<span style={{ padding: '8px' }}> </span>
机构列表 <Tree
<Tooltip title="添加下级机构"> showLine="true"
<FolderAddTwoTone showIcon="true"
style={{ fontSize: '16px', float: 'right' }} selectedKeys={[currentSelect]}
onClick={e => addSubOrg(e, '根目录', '-1')} loading={treeLoading}
/> onSelect={onSelect}
</Tooltip> treeData={treeData}
</span> />
<Tree </div>
showLine="true" <div className={styles.userContainer}>
showIcon="true" <Table
selectedKeys={[currentSelect]} columns={columns}
loading={treeLoading} dataSource={tableData}
onSelect={onSelect} loading={tableLoading}
treeData={treeData} />
/> </div>
</div> {/* 添加用户 */}
<div <Modal
style={{ title={orgTitle}
width: '79%', visible={userVisible}
height: 'calc(100vh - 194px)', onOk={submitAddUser}
background: 'white', onCancel={() => setUserVisible(false)}
float: 'right', okText="确认"
padding: '20px', cancelText="取消"
}} >
> <Form form={addUserForm}>
<Table <Form.Item
columns={columns} name="loginName"
dataSource={tableData} label="登录名称"
loading={tableLoading} rules={[
/> {
required: true,
},
]}
>
<Input placeholder="情输入登录名称" />
</Form.Item>
<Form.Item
name="password"
label="账户密码"
rules={[
{
required: true,
},
]}
>
<Input placeholder="情输入账户密码" />
</Form.Item>
<Form.Item
name="userName"
label="用户名称"
rules={[
{
required: true,
},
]}
>
<Input placeholder="情输入用户姓名" />
</Form.Item>
<Form.Item name="phone" label="手 机 号 码">
<Input placeholder="情输入手机号码" />
</Form.Item>
<Form.Item name="email" label="电 子 邮 箱">
<Input placeholder="情输入电子邮箱" />
</Form.Item>
</Form>
</Modal>
{/* 添加下级机构 */}
<Modal
title={orgTitle}
visible={addOrgVisible}
onOk={submitAddOrg}
onCancel={() => setAddOrgVisible(false)}
okText="确认"
cancelText="取消"
>
<Form form={addOrgForm}>
<Form.Item
name="OUName"
label="机构名称"
rules={[
{
required: true,
},
]}
>
<Input placeholder="情输入机构名称" />
</Form.Item>
<Form.Item name="description" label="--描---述--">
<Input placeholder="情输入相关描述" />
</Form.Item>
</Form>
</Modal>
{/* 编辑机构 */}
<Modal
title={orgTitle}
visible={editOrgVisible}
onOk={submitEditOrg}
onCancel={() => setEditOrgVisible(false)}
okText="确认"
cancelText="取消"
>
<Form form={editOrgForm}>
<Form.Item
name="OUName"
label="机构名称"
rules={[
{
required: true,
},
]}
>
<Input placeholder="情输入机构名称" />
</Form.Item>
<Form.Item name="description" label="--描---述--">
<Input placeholder="情输入相关描述" />
</Form.Item>
</Form>
</Modal>
<Modal
title="确认删除机构"
visible={deleteOrgVisible}
onOk={submitDeleteOrg}
onCancel={() => setDeleteOrgVisible(false)}
okText="确认"
cancelText="取消"
>
<p>即将删除该机构，是否确认删除？</p>
</Modal>
<Modal
title="确认删除用户"
visible={deleteUserVisible}
onOk={submitDeleteUser}
onCancel={() => setDeleteUserVisible(false)}
okText="确认"
cancelText="取消"
>
<p>即将关联删除 主站点 用户关系，是否确认删除？</p>
</Modal>
</div> </div>
{/* 添加用户 */}
<Modal
title={orgTitle}
visible={userVisible}
onOk={submitAddUser}
onCancel={() => setUserVisible(false)}
okText="确认"
cancelText="取消"
>
<Form form={addUserForm}>
<Form.Item
name="loginName"
label="登录名称"
rules={[
{
required: true,
},
]}
>
<Input placeholder="情输入登录名称" />
</Form.Item>
<Form.Item
name="password"
label="账户密码"
rules={[
{
required: true,
},
]}
>
<Input placeholder="情输入账户密码" />
</Form.Item>
<Form.Item
name="userName"
label="用户名称"
rules={[
{
required: true,
},
]}
>
<Input placeholder="情输入用户姓名" />
</Form.Item>
<Form.Item name="phone" label="手 机 号 码">
<Input placeholder="情输入手机号码" />
</Form.Item>
<Form.Item name="email" label="电 子 邮 箱">
<Input placeholder="情输入电子邮箱" />
</Form.Item>
</Form>
</Modal>
{/* 添加下级机构 */}
<Modal
title={orgTitle}
visible={addOrgVisible}
onOk={submitAddOrg}
onCancel={() => setAddOrgVisible(false)}
okText="确认"
cancelText="取消"
>
<Form form={addOrgForm}>
<Form.Item
name="OUName"
label="机构名称"
rules={[
{
required: true,
},
]}
>
<Input placeholder="情输入机构名称" />
</Form.Item>
<Form.Item name="description" label="--描---述--">
<Input placeholder="情输入相关描述" />
</Form.Item>
</Form>
</Modal>
{/* 编辑机构 */}
<Modal
title={orgTitle}
visible={editOrgVisible}
onOk={submitEditOrg}
onCancel={() => setEditOrgVisible(false)}
okText="确认"
cancelText="取消"
>
<Form form={editOrgForm}>
<Form.Item
name="OUName"
label="机构名称"
rules={[
{
required: true,
},
]}
>
<Input placeholder="情输入机构名称" />
</Form.Item>
<Form.Item name="description" label="--描---述--">
<Input placeholder="情输入相关描述" />
</Form.Item>
</Form>
</Modal>
<Modal
title="确认删除机构"
visible={deleteOrgVisible}
onOk={submitDeleteOrg}
onCancel={() => setDeleteOrgVisible(false)}
okText="确认"
cancelText="取消"
>
<p>即将删除该机构，是否确认删除？</p>
</Modal>
<Modal
title="确认删除用户"
visible={deleteUserVisible}
onOk={submitDeleteUser}
onCancel={() => setDeleteUserVisible(false)}
okText="确认"
cancelText="取消"
>
<p>即将关联删除 主站点 用户关系，是否确认删除？</p>
</Modal>
</PageContainer> </PageContainer>
); );
}; };
......
src/pages/userCenter/UserManage.less
View file @ fb805444
.iconWraper1{ .userManageContainer{
span{ .ant-tree-treenode{
display: none; 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{ .ant-tree-treenode:hover{
span{ .iconWraper1>span{
margin-left: 12px; margin-left: 12px;
font-size: 16px; font-size: 16px;
display: inline-block; display: inline-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;
}
}
} }
// display: block; }
}
\ No newline at end of file
src/pages/webConfig/componets/siteConfig.js 0 → 100644
View file @ fb805444
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 0 → 100644
View file @ fb805444
.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 0 → 100644
View file @ fb805444
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 0 → 100644
View file @ fb805444
.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
View file @ fb805444
import React from 'react'; import React from 'react';
import { omit } from 'lodash';
import { import {
DatabaseOutlined, DatabaseOutlined,
UsergroupAddOutlined, UsergroupAddOutlined,
...@@ -22,6 +21,9 @@ import RoleManage from '../pages/userCenter/RoleManage'; ...@@ -22,6 +21,9 @@ import RoleManage from '../pages/userCenter/RoleManage';
import SiteManage from '../pages/userCenter/siteManage/SiteManage'; import SiteManage from '../pages/userCenter/siteManage/SiteManage';
// import DefaultComponent from '../pages/orgnazation/DefaultComponent'; // import DefaultComponent from '../pages/orgnazation/DefaultComponent';
import TestTable from '../pages/orgnazation/TestTable'; 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'; import { USER_MODE } from '@/utils/constants';
const iconStyle = { verticalAlign: '0.125em' }; const iconStyle = { verticalAlign: '0.125em' };
...@@ -62,11 +64,13 @@ export default { ...@@ -62,11 +64,13 @@ export default {
{ {
path: '/dbm/dbInit', path: '/dbm/dbInit',
name: '数据库初始化', name: '数据库初始化',
authority: adminAuthority,
component: InitDataBase, component: InitDataBase,
}, },
{ {
path: '/dbm/dbsm', path: '/dbm/dbsm',
name: '数据库标准化管理', name: '数据库标准化管理',
authority: superAuthority,
component: ManagementDataBase, component: ManagementDataBase,
}, },
], ],
...@@ -150,17 +154,17 @@ export default { ...@@ -150,17 +154,17 @@ export default {
{ {
path: '/productCenter/web', path: '/productCenter/web',
name: 'web配置', name: 'web配置',
component: Welcome, component: WebConfigPage,
}, },
{ {
path: '/productCenter/app', path: '/productCenter/app',
name: 'app配置', name: 'app配置',
component: Welcome, component: AppConfigPage,
}, },
{ {
path: '/productCenter/miniProgram', path: '/productCenter/miniProgram',
name: '小程序配置', name: '小程序配置',
component: Welcome, component: MobileConfigPage,
}, },
], ],
}, },
......
src/services/mocks/web4site.js 0 → 100644
View file @ fb805444
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment