Commit 5cb40867 authored by 皮倩雯's avatar 皮倩雯

fix: '新增角色管理添加角色验证'

parent 790b67d1
Pipeline #44198 passed with stages
in 2 minutes 57 seconds
...@@ -161,13 +161,13 @@ const TemplateManage = () => { ...@@ -161,13 +161,13 @@ const TemplateManage = () => {
), ),
}, },
{ {
title: '模板参数1.0', title: '模板参数',
dataIndex: 'template_params1', dataIndex: 'template_params1',
key: 'template_params1', key: 'template_params1',
align: 'center', align: 'center',
}, },
{ {
title: '模板参数2.0', title: '解析参数',
dataIndex: 'template_params2', dataIndex: 'template_params2',
key: 'template_params2', key: 'template_params2',
align: 'center', align: 'center',
......
...@@ -209,10 +209,10 @@ const AddModal = props => { ...@@ -209,10 +209,10 @@ const AddModal = props => {
</> </>
)} )}
<Item label="模板参数1.0" labelCol={{ span: 6 }} name="params"> <Item label="模板参数(仅限2.0)" labelCol={{ span: 6 }} name="params">
<TextArea rows={2} style={{ width: '95%' }} placeholder="first|Second|Third|Four" /> <TextArea rows={2} style={{ width: '95%' }} placeholder="first|Second|Third|Four" />
</Item> </Item>
<Item label="模板参数2.0" labelCol={{ span: 6 }} name="param1"> <Item label="模板参数(仅限2.0)" labelCol={{ span: 6 }} name="param1">
<TextArea rows={2} style={{ width: '95%' }} placeholder="first|Second|Third|Four" /> <TextArea rows={2} style={{ width: '95%' }} placeholder="first|Second|Third|Four" />
</Item> </Item>
<Item label="参数说明" name="desc" labelCol={{ span: 6 }}> <Item label="参数说明" name="desc" labelCol={{ span: 6 }}>
...@@ -222,7 +222,7 @@ const AddModal = props => { ...@@ -222,7 +222,7 @@ const AddModal = props => {
placeholder="first: 标题信息|Second: 展示内容|Third: 时间|Four: 备注信息" placeholder="first: 标题信息|Second: 展示内容|Third: 时间|Four: 备注信息"
/> />
</Item> </Item>
<Item label="解析规则" name="analysis_params" labelCol={{ span: 6 }}> <Item label="解析规则(仅限1.0)" name="analysis_params" labelCol={{ span: 6 }}>
<TextArea rows={2} style={{ width: '95%' }} placeholder="param1|param2|param3|param4" /> <TextArea rows={2} style={{ width: '95%' }} placeholder="param1|param2|param3|param4" />
</Item> </Item>
</Form> </Form>
......
...@@ -345,7 +345,6 @@ const EditForm = props => { ...@@ -345,7 +345,6 @@ const EditForm = props => {
</EditeConfigWrapper> </EditeConfigWrapper>
</Item> </Item>
<div className={styles.boe}> <div className={styles.boe}>
{/* <div style={{ marginTop: '-16px', fontSize: '16px', marginLeft: '21px' }}>关联角色</div> */}
<div <div
style={{ width: '95%', marginLeft: '2%', marginTop: '10px', marginBottom: '20px' }} style={{ width: '95%', marginLeft: '2%', marginTop: '10px', marginBottom: '20px' }}
> >
......
import React, { useState, useEffect } from 'react'; import React, { useState, useEffect } from 'react';
import { Row, Col, Card, Input, Spin, notification, Button, Tooltip, Space, Empty } from 'antd'; import {
Row,
Col,
Card,
Input,
Spin,
notification,
Button,
Tooltip,
Space,
Empty,
message,
} from 'antd';
import Tree from '@/components/ExpendableTree'; import Tree from '@/components/ExpendableTree';
import PageContainer from '@/components/BasePageContainer'; import PageContainer from '@/components/BasePageContainer';
import { import {
...@@ -456,6 +468,14 @@ const SiteManage = () => { ...@@ -456,6 +468,14 @@ const SiteManage = () => {
}; };
// 新增角色 // 新增角色
const addsUser = (e, record) => { const addsUser = (e, record) => {
console.log(e);
console.log(record);
if (record.visibleTitle == '默认分组') {
message.warn({
duration: 5,
content: '默认分组下的角色不能被关联',
});
}
e.stopPropagation(); e.stopPropagation();
setItemObj(record); setItemObj(record);
setModalVisible(true); setModalVisible(true);
......
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