diff --git a/io.sc.platform.core.frontend/src/platform/components/toolbar/Buttons.vue b/io.sc.platform.core.frontend/src/platform/components/toolbar/Buttons.vue index 0d6965ef..6063854d 100644 --- a/io.sc.platform.core.frontend/src/platform/components/toolbar/Buttons.vue +++ b/io.sc.platform.core.frontend/src/platform/components/toolbar/Buttons.vue @@ -20,7 +20,7 @@ :label="toolbar.props.dense ? '' : toolbar.getLabel(btn.data[0].label)" :icon="toolbar.props.dense ? undefined : toolbar.getIcon(btn.data[0].icon)" :split="btn.data[0].click ? true : false" - :disable="btn.data[0]?.enableIf ? !btn.data[0].enableIf(toolbar.cm.args.value) : false" + :disable-main-btn="btn.data[0]?.enableIf ? !btn.data[0].enableIf(toolbar.cm.args.value) : false" class="class-action-item" content-class="w-toolbar-btn-dropdown" @click="toolbar.buttonClick(btn.data[0])" diff --git a/io.sc.platform.core.frontend/src/platform/components/toolbar/Toolbar.ts b/io.sc.platform.core.frontend/src/platform/components/toolbar/Toolbar.ts index fc316091..8b1001fd 100644 --- a/io.sc.platform.core.frontend/src/platform/components/toolbar/Toolbar.ts +++ b/io.sc.platform.core.frontend/src/platform/components/toolbar/Toolbar.ts @@ -63,7 +63,11 @@ export class Toolbar { // 按钮enableIf校验 if (button.enableIf && !button.enableIf(args)) { - console.warn('[w-toolbar] The function `enableIf` returns false, causing the `click` not to trigger.' + ' button name is `' + button['name'] + '`'); + if (button.disableTip && typeof button.disableTip === 'function') { + button.disableTip(args); + } else { + console.warn('[w-toolbar] The function `enableIf` returns false, causing the `click` not to trigger.' + ' button name is `' + button['name'] + '`'); + } return; }