Skip to content

C
CivManage
Commit 587e1833 authored by 张烨's avatar 张烨
Browse files
Options

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

parents 2106012f dd52e920
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 174 additions and 166 deletions
src/pages/mobileConfig/SiteConfig.jsx
View file @ 587e1833
...@@ -21,8 +21,8 @@ const SiteConfig = props => { ...@@ -21,8 +21,8 @@ const SiteConfig = props => {
const [form] = Form.useForm(); const [form] = Form.useForm();
const layout = { const layout = {
layout: 'horizontal', layout: 'horizontal',
labelCol: { span: 3 }, labelCol: { span: 7 },
wrapperCol: { span: 14 }, wrapperCol: { span: 6 },
}; };
useEffect(() => { useEffect(() => {
console.log(miniTitle, 'miniTitle'); console.log(miniTitle, 'miniTitle');
...@@ -88,105 +88,107 @@ const SiteConfig = props => { ...@@ -88,105 +88,107 @@ const SiteConfig = props => {
}; };
return ( return (
<Spin spinning={loading} tip="loading..."> <Spin spinning={loading} tip="loading...">
<Form form={form} {...layout}> <div style={{ minHeight: 'calc(100vh - 172px)', marginTop: '20px' }}>
<Item <Form form={form} {...layout}>
label="应用名称：" <Item
name="title" label="应用名称："
rules={[ name="title"
{ rules={[
required: true, {
message: '请输入应用名称', required: true,
}, message: '请输入应用名称',
]} },
> ]}
<Input placeholder="请输入应用名称" allowClear /> >
</Item> <Input placeholder="请输入应用名称" allowClear />
</Item>
<Item <Item
label="系统图标：" label="系统图标："
name="shortcutIcon" name="shortcutIcon"
rules={[ rules={[
{ {
required: true, required: true,
message: '请选择系统图标', message: '请选择系统图标',
}, },
]} ]}
> >
<Input placeholder="请输入系统图标名称" allowClear /> <Input placeholder="请输入系统图标名称" allowClear />
</Item> </Item>
<Item label="系统图标预览："> <Item label="系统图标预览：">
<PicturesWall /> <PicturesWall />
</Item> </Item>
<Item <Item
label="登陆页面：" label="登陆页面："
name="loginTemplate" name="loginTemplate"
rules={[ rules={[
{ {
required: true, required: true,
message: '请选择登陆页面', message: '请选择登陆页面',
}, },
]} ]}
> >
<Select placeholder="请选择登陆页面"> <Select placeholder="请选择登陆页面">
{loginList && {loginList &&
loginList.map((item, index) => ( loginList.map((item, index) => (
<Option value={item.value} key={`item${index}`}> <Option value={item.value} key={`item${index}`}>
{item.text} {item.text}
</Option> </Option>
))} ))}
</Select> </Select>
</Item> </Item>
<Item <Item
label="系统皮肤：" label="系统皮肤："
name="theme" name="theme"
rules={[ rules={[
{ {
required: true, required: true,
message: '请选择系统皮肤', message: '请选择系统皮肤',
}, },
]} ]}
> >
<Select placeholder="请选择系统皮肤"> <Select placeholder="请选择系统皮肤">
{themeList && {themeList &&
themeList.map((item, index) => ( themeList.map((item, index) => (
<Option value={item.value} key={`item${index}`}> <Option value={item.value} key={`item${index}`}>
{item.text} {item.text}
</Option> </Option>
))} ))}
</Select> </Select>
</Item> </Item>
<Item <Item
label="系统风格：" label="系统风格："
name="style" name="style"
rules={[ rules={[
{ {
required: true, required: true,
message: '请选择系统风格', message: '请选择系统风格',
}, },
]} ]}
> >
<Select placeholder="请选择系统风格"> <Select placeholder="请选择系统风格">
{styleList && {styleList &&
styleList.map((item, index) => ( styleList.map((item, index) => (
<Option value={item.value} key={`item${index}`}> <Option value={item.value} key={`item${index}`}>
{item.text} {item.text}
</Option> </Option>
))} ))}
</Select> </Select>
</Item> </Item>
<Item label="开启云登陆：" name="cloudLogin"> <Item label="开启云登陆：" name="cloudLogin">
<Radio.Group onChange={radioChange}> <Radio.Group onChange={radioChange}>
<Radio value>是</Radio> <Radio value>是</Radio>
<Radio value={false}>否</Radio> <Radio value={false}>否</Radio>
</Radio.Group> </Radio.Group>
</Item> </Item>
<Item style={{ textAlign: 'center' }}> <Item wrapperCol={{ span: 6, offset: 7 }}>
<Button type="primary" onClick={submit}> <Button type="primary" onClick={submit}>
提交 提交
</Button> </Button>
</Item> </Item>
</Form> </Form>
</div>
</Spin> </Spin>
); );
}; };
......
src/pages/mobileConfig/menuconfig/LeftPart.less
View file @ 587e1833
.contentContainer{ .contentContainer{
max-height: calc(100vh - 300px); // min-height: calc(100vh - 48px);
overflow-x: auto; overflow-x: auto;
display: flex; display: flex;
.menuContainer{ .menuContainer{
min-width: 300px; min-width: 300px;
border:1px solid #abaeb1; border:2px solid #eee;
// min-height:calc(100vh - 300px); min-height:calc(100vh - 172px);
overflow-y:auto; overflow-y:auto;
.ant-tree-list{ .ant-tree-list{
padding: 10px; padding: 10px;
height:calc(100vh - 330px); height:calc(100vh - 330px);
.ant-tree-switcher{ .ant-tree-switcher{
line-height: 1; line-height: 1;
color:#1890FF; color:#1890FF;
} }
.ant-tree-iconEle{ .ant-tree-iconEle{
line-height: 1.2; line-height: 1.2;
color:#1890FF; color:#1890FF;
} }
} }
} }
.editContainer{ .editContainer{
margin-left: 12px; margin-left: 12px;
flex: 1; flex: 1;
padding: 16px; padding: 16px;
float: left; float: left;
min-width: 500px; min-width: 500px;
border:1px solid #abaeb1; border:2px solid #eee;
.ant-table-pagination-right{ .ant-table-pagination-right{
padding-right: 12px; padding-right: 12px;
} }
} }
.previewContainer{ .previewContainer{
margin-left: 12px; margin-left: 12px;
// flex: 1; // flex: 1;
float: left; float: left;
min-width: 400px; min-width: 700px;
border:1px solid #abaeb1; border:2px solid #eee;
.ant-table-pagination-right{ .ant-table-pagination-right{
padding-right: 12px; padding-right: 12px;
} }
} }
.ant-tree-treenode{ .ant-tree-treenode{
width: 100% !important; width: 100% !important;
.ant-tree-node-content-wrapper{ .ant-tree-node-content-wrapper{
display: inline-block; display: inline-block;
width: 100%; width: 100%;
} }
.iconWraper1{ .iconWraper1{
float: right; float: right;
span{ span{
display: none; display: none;
} }
} }
} }
.ant-tree-treenode:hover{ .ant-tree-treenode:hover{
.iconWraper1>span{ .iconWraper1>span{
margin-left: 12px; margin-left: 12px;
font-size: 18px; font-size: 18px;
display: inline-block; display: inline-block;
} }
} }
} }
.redText{ .redText{
color: red; color: red;
cursor: pointer; cursor: pointer;
} }
\ No newline at end of file
src/pages/mobileConfig/menuconfig/MenuConfig.jsx
View file @ 587e1833
...@@ -6,10 +6,10 @@ import LeftPart from './LeftPart'; ...@@ -6,10 +6,10 @@ import LeftPart from './LeftPart';
const MenuConfig = props => { const MenuConfig = props => {
const [flag, setFlag] = useState(1); const [flag, setFlag] = useState(1);
return ( return (
<ProCard split="vertical"> <div split="vertical">
<LeftPart /> <LeftPart />
{/* <ProCard><AddForm /></ProCard> */} {/* <ProCard><AddForm /></ProCard> */}
</ProCard> </div>
); );
}; };
export default MenuConfig; export default MenuConfig;
src/pages/userCenter/siteManage/SiteManage.jsx
View file @ 587e1833
...@@ -130,6 +130,7 @@ const SiteManage = () => { ...@@ -130,6 +130,7 @@ const SiteManage = () => {
let arr = list.map(item => { let arr = list.map(item => {
item.id = item.OUID * 10000; item.id = item.OUID * 10000;
item.text = item.OUName; item.text = item.OUName;
item.isChecked = false;
item.type = 'widgetGroup'; item.type = 'widgetGroup';
item.children = item.userList.map(u => ({ item.children = item.userList.map(u => ({
...u, ...u,
......
src/services/mobileConfig/api.js
View file @ 587e1833
...@@ -37,3 +37,7 @@ export const editWebsite = (params, options) => { ...@@ -37,3 +37,7 @@ export const editWebsite = (params, options) => {
options, options,
); );
}; };
/**
* @获取菜单配置
*/
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