Commit 1215edc8 authored by shaoan123's avatar shaoan123

解决表字段字符集中出现的bug

parent c65c49e5
Pipeline #31748 passed with stages
in 27 minutes 6 seconds
......@@ -19,10 +19,16 @@ const AddModal = props => {
const [checkAll, setCheckAll] = useState([]);
const [selectData, setSelectData] = useState([])
let objArr = []
const onChangeList = (list, index) => {
const onChangeList = (list, index,title) => {
const checkedListArr = [...checkedList]
checkedListArr[index] = list
setCheckedList(checkedListArr);
const indeterminateArr = [...indeterminate]
const checkAllArr = [...checkAll]
indeterminateArr[index] = !!list.length && list.length < filed[title].length
checkAllArr[index] = list.length === filed[title].length
setIndeterminate(indeterminateArr)
setCheckAll(checkAllArr);
};
const onCheckAllChange = e => {
......@@ -59,20 +65,23 @@ const AddModal = props => {
setCheckValue(formObj.rule)
}
else if (isType === 'characteristics') {
console.log(filed,'122');
console.log('newCheckedList',newCheckedList);
console.log('characterValue',characterValue);
let arr = Object.keys(filed)
setTitle(arr)
console.log('arr', arr);
let checkArr = []
let indeterminateArr = []
let checkAllArr = []
arr.map((item, index) => {
indeterminateArr.push(true)
checkAllArr.push(false)
checkArr[index] = []
newCheckedList.map(checkItem => {
if (filed[item].includes(checkItem)) {
checkArr[index].push(checkItem)
}
})
indeterminateArr.push(!!checkArr[index].length && checkArr[index].length < filed[item].length)
checkAllArr.push(checkArr[index].length === filed[item].length)
})
setCheckedList(newCheckedList)
setCheckedList(checkArr)
setIndeterminate(indeterminateArr)
setCheckAll(checkAllArr)
let newArr = characterValue.length? characterValue.split(","):[]
......@@ -162,7 +171,7 @@ const AddModal = props => {
{title.map((item, index) => {
return <div className={styles.cardItemData} key={index}>
<Divider orientation="left" style={{ margin: '0 0 10px 0', color: '#15428b', borderTopColor: '#99bbe8' }}>{item} <Checkbox indeterminate={indeterminate[index]} onChange={onCheckAllChange} index={index} checkvalue={filed[item]} checked={checkAll[index]}> </Checkbox></Divider>
<CheckboxGroup options={filed[item]} value={checkedList[index]} onChange={(e) => onChangeList(e, index)} /></div>
<CheckboxGroup options={filed[item]} value={checkedList[index]} onChange={(e) => onChangeList(e, index,item)} /></div>
})}
</div>
</div>
......
......@@ -112,6 +112,7 @@ const AddModal = props => {
}
setPramData({ ...res[0].data.root, coordinates, must, picture })
let index = res[2].data.root.find(item => { return item.Name == res[0].data.root.ExceptionEvent })
console.log('index',index);
getFieldData(index.TableName)
}
})
......
......@@ -146,7 +146,7 @@ const AddModal = props => {
let arr =formateArrDataA(res.data.root,'group')
let newArr = []
Object.keys(arr).map((item, index) => {
newArr.push({ type: item, key: index })
newArr.push({ type: item, key: index,id:index })
})
setAllData(arr);
setTableData(newArr);
......@@ -226,7 +226,7 @@ const AddModal = props => {
// pagination={{ pageSize: 10 }}
scroll={{ y: '45rem' }}
size="small"
rowKey={(record, index) => `complete${record.tableID}${index}`}
rowKey='id'
pagination={{
showTotal: (total, range) =>
`第${range[0]}-${range[1]} 条/共 ${total} 条`,
......
......@@ -10,7 +10,7 @@ import {
message
} from 'antd';
import { PlusCircleOutlined } from '@ant-design/icons';
import { useHistory } from 'react-router-dom';
const { Search } = Input;
const { Option } = Select;
import EditModal from './components/EditModal'
......@@ -18,7 +18,7 @@ import VisibleRoleModal from './components/RolseSelect/VisibleRoleModal'
import { GetMessageConfigList, TestPush, DeleteMessageConfig, GetMsgTypeList, DeleteIISAgentConfig } from '@/services/platform/messagemanage'
import styles from './ProjectManage.less'
const ProjectManage = () => {
const history = useHistory();
const [visibleParams, setvisibleParams] = useState({
addVisible: false, // 新增弹窗
delVisible: false, // 删除弹窗
......@@ -120,18 +120,18 @@ const ProjectManage = () => {
GetMessageList({ pageSize: 10, pageIndex: 0, search: value })
}
const changeDesc = (record) => {
setCurrentTempalte(record)
// history.push({pathname:`/platformCenter/schemeDetail`,state:{template:record}} )
handleShowModal("editVisible", true)
}
const TestDesc = (record) => {
console.log(record)
if(record.ThemeName)
TestPush({
theme:record.ThemeName,
msgType:record.MsgType,
tousers:record.PushGroup,
pushPath:record.item.AgentConfig.Url,
pushPath:record.item.AgentConfig?record.item.AgentConfig.Url:'',
msgTypeId:record.ID
}).then(
res =>{
......
This diff is collapsed.
.editModal_container{
width: 100%;
background-color: #FFFFFF;
overflow-y: scroll;
display: flex;
flex-direction: column;
.push_trench{
width: 100%;
height: fit-content;
display: flex;
flex-direction:row;
flex-wrap: wrap;
.trench_card{
width: 500px;
margin: 20px;
border-width: 1px;
border-color: #EEEEEE;
border-style: solid;
border-radius: 5px;
display: flex;
flex-direction: column;
justify-content: space-around;
align-items: center;
.card_title{
border-bottom-style: solid;
border-bottom-width: 1px;
border-bottom-color:#F6F7F9;
height:50px;
width: 100%;
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: center;
.lable{
font-size: large;
margin-left: 10px;
}
}
.card_body{
margin-top: 10px;
width: 100%;
padding: 10px;
}
}
}
}
\ No newline at end of file
......@@ -38,6 +38,7 @@ import BaseFrameContainer from '@/components/BaseFrameContainer';
import JumpContainer from '@/components/JumpContainer';
import HostManager from '@/pages/platformCenter/hostmanager'
import MessageManager from '@/pages/platformCenter/messageManage'
import SchemeDetail from '@/pages/platformCenter/schemeDetail/schemeDetail'
import SchemeConfig from '@/pages/platformCenter/schemeConfig/schemeConfig';
import DimensionsConfig from '@/pages/platformCenter/dimensionsConfig/dimensionsConfig';
......@@ -244,6 +245,12 @@ export default {
component: MessageManager,
},
{
path: '/platformCenter/SchemeDetail',
name: '模板编辑',
component: SchemeDetail,
hideMenu: true,
},
{
path: '/platformCenter/emq',
name: '宿主管理',
......
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