Browse Source

修改表格内置按钮触发afterEditOpen事件的逻辑

main
likunming 3 months ago
parent
commit
4e70486cd6
  1. 12
      io.sc.platform.core.frontend/src/platform/components/grid/GridTop.vue
  2. 4
      io.sc.platform.core.frontend/src/platform/components/toolbar/WToolbar.vue

12
io.sc.platform.core.frontend/src/platform/components/grid/GridTop.vue

@ -640,7 +640,11 @@ const handleChildrenBtn = (arr, moreQueryShow) => {
tempArr.push(buttonObj[btn]); tempArr.push(buttonObj[btn]);
} }
} else if (typeof btn === 'object' && btn.extend && buttonObj[btn.extend]) { } else if (typeof btn === 'object' && btn.extend && buttonObj[btn.extend]) {
tempArr.push({ ...buttonObj[btn.extend], ...btn, _click: buttonObj[btn.extend].click }); let overrideClick = false;
if (btn.click) {
overrideClick = true;
}
tempArr.push({ ...buttonObj[btn.extend], ...btn, _click: buttonObj[btn.extend].click, overrideClick });
} else { } else {
tempArr.push(btn); tempArr.push(btn);
} }
@ -680,7 +684,11 @@ const handleToolbarActions = () => {
buttons_.value.push(handleChildrenBtn(btn, moreQueryShow)); buttons_.value.push(handleChildrenBtn(btn, moreQueryShow));
} else if (typeof btn === 'object' && btn.extend && buttonObj[btn.extend]) { } else if (typeof btn === 'object' && btn.extend && buttonObj[btn.extend]) {
// //
buttons_.value.push({ ...buttonObj[btn.extend], ...btn, _click: buttonObj[btn.extend].click }); let overrideClick = false;
if (btn.click) {
overrideClick = true;
}
buttons_.value.push({ ...buttonObj[btn.extend], ...btn, _click: buttonObj[btn.extend].click, overrideClick: overrideClick });
} else { } else {
buttons_.value.push(btn); buttons_.value.push(btn);
} }

4
io.sc.platform.core.frontend/src/platform/components/toolbar/WToolbar.vue

@ -473,7 +473,9 @@ const buttonClick = async (button) => {
let callAfterEditorOpen = true; let callAfterEditorOpen = true;
const clickProps = { ...args }; const clickProps = { ...args };
if (button._click) { if (button._click) {
callAfterEditorOpen = false; if (button.overrideClick) {
callAfterEditorOpen = false;
}
clickProps['_click'] = (_args: any) => { clickProps['_click'] = (_args: any) => {
button._click(_args || args); button._click(_args || args);
callAfterEditorOpen = true; callAfterEditorOpen = true;

Loading…
Cancel
Save