|
@ -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); |
|
|
} |
|
|
} |
|
|