Commit 9f7c4781 authored by 皮倩雯's avatar 皮倩雯

修复事件功能问题

parent 9b678b50
Pipeline #41323 passed with stages
in 26 minutes 3 seconds
......@@ -38,7 +38,7 @@ const EditModal = props => {
const [checkAll, setCheckAll] = useState([]);
const [selectData, setSelectData] = useState([]);
const [arrValue, setArrValue] = useState([]);
const [data, setData] = useState([]);
const [data, setData] = useState(0);
const [flagg, setFlagg] = useState(0);
const [type, setType] = useState(); // 是否全选
let objArr = [];
......@@ -76,13 +76,11 @@ const EditModal = props => {
}
});
// 将每次新增数据从尾部写入已选择数组里
console.log(addArr);
if (addArr.length != 0) {
addArr.map(item => {
newArr.push(item);
});
}
console.log(newArr);
// 保存此次所有数据顺序
setArrValue(newArr);
setCheckedList(checkedListArr);
......@@ -97,18 +95,14 @@ const EditModal = props => {
};
const onSubmit1 = () => {
console.log(selectData);
let aRR = [];
selectData.map(item => {
console.log(typeof item);
if (typeof item == 'string') {
console.log(1111);
aRR = selectData;
} else {
aRR.push(item.name);
}
});
console.log(aRR);
let newArr = selectData.map(item => item.name);
callBackSubmit({
checkedList,
......@@ -130,24 +124,23 @@ const EditModal = props => {
? (checkedListArr[e.target.index] = e.target.checkvalue)
: (checkedListArr[e.target.index] = []);
setType(e.target.checked);
console.log(checkedListArr);
setCheckedList(checkedListArr);
setIndeterminate(indeterminateArr);
setCheckAll(checkAllArr);
};
useEffect(() => {
console.log(flagg);
// 不是第一次
if (flagg == 0) {
console.log(12121);
selectAll();
}
// 是否是全选
if (data == 1) {
selectAll();
}
selectAll();
// console.log(flagg);
// // 不是第一次
// if (flagg == 0) {
// console.log(12121);
// selectAll();
// }
// // 是否是全选
// if (data == 1) {
// selectAll();
// }
setData(0);
}, [checkedList]);
......@@ -158,8 +151,7 @@ const EditModal = props => {
checkedList.map(item => {
objArr = objArr.concat(item);
});
console.log(arrValue);
console.log(objArr);
// 判断是否操作全部勾选的复选框
if (data == 1) {
// 处理上次选中改变顺序后的数据扁平化
......@@ -171,7 +163,6 @@ const EditModal = props => {
newArr = arrValue.map(item => item.name);
}
});
console.log(newArr);
// 判断是否为全选
if (type == false) {
// 判断上次有顺序的数据是否包含这次未排序已选列表数据
......@@ -184,8 +175,6 @@ const EditModal = props => {
if (newArr1.length === 1 && newArr1[0].name === '') {
newArr1 = [];
}
console.log(lastArr);
console.log(newArr1);
setSelectData(newArr1);
setArrValue(lastArr);
} else {
......@@ -196,16 +185,13 @@ const EditModal = props => {
addArr.push(item);
}
});
console.log(addArr);
addArr.map(item => {
newArr.push(item);
});
console.log(newArr);
let newArr1 = newArr.map(item => ({ name: item }));
if (newArr1.length === 1 && newArr1[0].name === '') {
newArr1 = [];
}
console.log(newArr1);
setSelectData(newArr1);
setArrValue(newArr);
}
......@@ -220,8 +206,6 @@ const EditModal = props => {
if (newArr1.length === 1 && newArr1[0].name === '') {
newArr1 = [];
}
console.log(lastArr);
console.log(newArr1);
setSelectData(newArr1);
setArrValue(lastArr);
}
......@@ -236,7 +220,6 @@ const EditModal = props => {
let checkArr = [];
let indeterminateArr = [];
let checkAllArr = [];
console.log(newCheckedList);
arr.map((item, index) => {
checkArr[index] = [];
newCheckedList.map(checkItem => {
......@@ -250,27 +233,19 @@ const EditModal = props => {
);
checkAllArr.push(checkArr[index].length === filed[item].length);
});
console.log(checkArr);
console.log(indeterminateArr);
console.log(checkAllArr);
setCheckedList(checkArr);
setIndeterminate(indeterminateArr);
setCheckAll(checkAllArr);
console.log(characterValue);
let newArr = characterValue.length ? characterValue.split(',') : [];
console.log(newArr);
let newArr1 = newCheckedList.map(item => ({ name: item }));
if (newArr1.length === 1 && newArr1[0].name === '') {
newArr1 = [];
}
console.log(newArr1);
setSelectData(newArr1);
setArrValue(newArr1);
}
}, [visible]);
const dragCallBack = arr => {
console.log(arr);
if (arr) {
setSelectData(arr);
let newArr = [];
......
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