Skip to content

Commit 6f28848

Browse files
committed
refactor: 更新销毁逻辑
1 parent d5a0616 commit 6f28848

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

src/BootstrapBlazor/Components/Table/Table.razor.js

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
export { getResponsive } from '../../modules/responsive.js'
22
import { copy, drag, getDescribedElement, getOuterHeight, getWidth, isVisible } from '../../modules/utility.js'
3-
import browser from '../../modules/browser.min.mjs'
3+
import browser from '../../modules/browser.min.mjs'
44
import Data from '../../modules/data.js'
55
import EventHandler from '../../modules/event-handler.js'
66
import Popover from "../../modules/base-popover.js"
@@ -1006,24 +1006,23 @@ export function resetColumnList(id) {
10061006
if (table) {
10071007
const { toolbar } = table;
10081008
if (toolbar) {
1009-
console.log(table);
10101009
const dropdown = toolbar.querySelector('.dropdown-column');
1011-
console.log(dropdown);
1012-
10131010
if (dropdown) {
1014-
const button = dropdown.querySelector('.dropdown-toggle')
1011+
const button = dropdown.querySelector('.dropdown-toggle');
1012+
const dropdownToggle = bootstrap.Dropdown.getInstance(button);
1013+
if (dropdownToggle) {
1014+
dropdownToggle.dispose();
1015+
}
1016+
const p = table.popovers.find(i => i.el === dropdown);
1017+
if (p) {
1018+
table.popovers = table.popovers.filter(i => i !== p);
1019+
Popover.dispose(p);
1020+
}
10151021
if (button.getAttribute('data-bs-toggle') === 'bb.dropdown') {
10161022
table.popovers.push(Popover.init(dropdown, {
10171023
isDisabled: () => false
10181024
}));
10191025
}
1020-
else {
1021-
const p = table.popovers.find(i => i.el === dropdown);
1022-
if (p) {
1023-
Popover.dispose(p);
1024-
table.popovers = table.popovers.filter(i => i !== p);
1025-
}
1026-
}
10271026
}
10281027
}
10291028
}

0 commit comments

Comments
 (0)