Compare commits

..

No commits in common. "785bb81f1846c21031f65d5103bc2e109ad415b3" and "9184185de25c5e300ee1f63ba8e55786da4055e3" have entirely different histories.

7 changed files with 23 additions and 26 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -346,7 +346,7 @@ watch(tableDataSource, () => {
tmp.total = tableDataSource.value.length; tmp.total = tableDataSource.value.length;
emit("update:page", tmp); emit("update:page", tmp);
// tableDataSource.value = endlist // tableDataSource.value = endlist
sxlist.value = {}; sxlist.value = [];
change({ change({
limit: props.page.limit, limit: props.page.limit,
current: pagecurrent || props.page.current, current: pagecurrent || props.page.current,
@ -759,7 +759,7 @@ const soultop = ref(0);
const soulleft = ref(0); const soulleft = ref(0);
const selcolumn = ref<any>({}); const selcolumn = ref<any>({});
const soulkey = ref(""); const soulkey = ref("");
const sxlist: any = ref({}); const sxlist: any = ref([]);
function showsoul(event: MouseEvent, column: any, key: string) { function showsoul(event: MouseEvent, column: any, key: string) {
console.log(event); console.log(event);
soulleft.value = event.pageX; soulleft.value = event.pageX;
@ -782,17 +782,16 @@ function desc(event: any) {
function sx(e: any) { function sx(e: any) {
sxlist.value[e.key] = e.list; sxlist.value[e.key] = e.list;
console.log("筛选事件", sxlist.value, sxlist.value.length);
} }
watch(sxlist, () => { watch(sxlist, () => {
console.log("sxlist更新"); console.log("sxlist更新");
}); });
watch( watch(
[() => sxlist, () => props.dataSource], [sxlist, () => props.dataSource],
(old, new1) => { (old, new1) => {
// tableDataSource // tableDataSource
// console.log(JSON.stringify(sxlist.value),JSON.stringify(props.dataSource),old[0] == new1[0],old[1] == new1[1]) // console.log(JSON.stringify(sxlist.value),JSON.stringify(props.dataSource),old[0] == new1[0],old[1] == new1[1])
if (Object.keys(sxlist.value).length == 0) { if (sxlist.value.length == 0) {
return; return;
} }
let list: any = [...props.dataSource]; let list: any = [...props.dataSource];

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long