Skip to content

feat: Enhance Bark alert configuration options and visibility #12362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
f2c-ci-robot merged 1 commit into from
Mar 30, 2026
+77 −54
Merged

feat: Enhance Bark alert configuration options and visibility #12362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions frontend/src/views/cronjob/cronjob/operate/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,6 +716,11 @@
cleanable
>
<el-option value="mail" :label="$t('xpack.alert.mail')" />
<el-option
v-if="!isProductPro"
value="bark"
:label="$t('xpack.alert.bark')"
/>
<el-option
value="weCom"
v-if="!globalStore.isIntl"
Expand All @@ -734,6 +739,11 @@
:disabled="!form.hasAlert || !isProductPro"
:label="$t('xpack.alert.feiShu')"
/>
<el-option
v-if="isProductPro"
value="bark"
:label="$t('xpack.alert.bark')"
/>
<el-option
value="sms"
v-if="!globalStore.isIntl"
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/views/setting/alert/dash/task/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@
<el-form-item :label="$t('xpack.alert.alertMethod')" prop="sendMethod">
<el-select class="selectClass" v-model="dialogData.rowData!.sendMethod" multiple cleanable>
<el-option value="mail" :label="$t('xpack.alert.mail')" />
<el-option value="bark" :label="$t('xpack.alert.bark')" />
<el-option v-if="!globalStore.isProductPro" value="bark" :label="$t('xpack.alert.bark')" />
<el-option
value="weCom"
v-if="!globalStore.isIntl"
Expand All @@ -341,6 +341,7 @@
:disabled="!globalStore.isProductPro"
:label="$t('xpack.alert.feiShu')"
/>
<el-option v-if="globalStore.isProductPro" value="bark" :label="$t('xpack.alert.bark')" />
<el-option
value="sms"
v-if="!globalStore.isIntl"
Expand Down
116 changes: 63 additions & 53 deletions frontend/src/views/setting/alert/setting/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,59 +121,6 @@
</el-button>
</div>
</el-card>
<el-card class="rounded-2xl shadow hover:shadow-md transition-all">
<div class="flex items-center justify-between mb-2">
<div class="text-lg font-semibold">{{ $t('xpack.alert.bark') }}</div>
<div>
<el-button
plain
round
size="default"
:disabled="!barkConfig.id"
@click="onChangeBark(barkConfig.id)"
>
{{ $t('commons.button.edit') }}
</el-button>
<el-button
size="default"
plain
round
:disabled="!barkConfig.id"
@click="onDelete(barkConfig.id)"
>
{{ $t('commons.button.delete') }}
</el-button>
</div>
</div>
<div class="text-sm mb-2">{{ $t('xpack.alert.barkConfigHelper') }}</div>
<el-divider class="!mb-2 !mt-3" />
<div class="text-sm config-form" v-if="barkConfig.id">
<el-form
@submit.prevent
ref="alertFormRef"
:label-position="mobile ? 'top' : 'left'"
label-width="110px"
>
<el-form-item :label="$t('xpack.alert.webhookName')" prop="displayName">
{{ barkConfig.config.displayName }}
</el-form-item>
<el-form-item :label="$t('xpack.alert.webhookUrl')" prop="url">
<div class="webhook-field">
<el-tooltip :content="barkConfig.config.url" placement="top" effect="dark">
<span class="webhook-text">
{{ barkConfig.config.url }}
</span>
</el-tooltip>
</div>
</el-form-item>
</el-form>
</div>
<div v-else class="flex items-center justify-center" style="height: 257px">
<el-button size="large" round plain type="primary" @click="onChangeBark(0)">
{{ $t('commons.button.create') }}
</el-button>
</div>
</el-card>
<el-card
class="rounded-2xl shadow hover:shadow-md transition-all"
v-if="globalStore.isProductPro && !globalStore.isIntl"
Expand Down Expand Up @@ -377,6 +324,68 @@
</el-button>
</div>
</el-card>
<el-card class="rounded-2xl shadow hover:shadow-md transition-all">
<div class="flex items-center justify-between mb-2">
<div class="text-lg font-semibold">{{ $t('xpack.alert.bark') }}</div>
<div>
<el-button
plain
round
size="default"
:disabled="!barkConfig.id"
@click="onChangeBark(barkConfig.id)"
>
{{ $t('commons.button.edit') }}
</el-button>
<el-button
size="default"
plain
round
:disabled="!barkConfig.id"
@click="onDelete(barkConfig.id)"
>
{{ $t('commons.button.delete') }}
</el-button>
</div>
</div>
<div class="text-sm mb-2">{{ $t('xpack.alert.barkConfigHelper') }}</div>
<el-divider class="!mb-2 !mt-3" />
<div class="text-sm config-form" v-if="barkConfig.id">
<el-form
@submit.prevent
ref="alertFormRef"
:label-position="mobile ? 'top' : 'left'"
label-width="110px"
>
<el-form-item :label="$t('xpack.alert.webhookName')" prop="displayName">
{{ barkConfig.config.displayName }}
</el-form-item>
<el-form-item :label="$t('xpack.alert.webhookUrl')" prop="url">
<div class="webhook-field">
<template v-if="barkUrlVisible">
<el-tooltip :content="barkConfig.config.url" placement="top" effect="dark">
<span class="webhook-text">
{{ barkConfig.config.url }}
</span>
</el-tooltip>
</template>
<template v-else>
<span class="webhook-text">****************</span>
</template>
<el-icon class="webhook-icon" @click="barkUrlVisible = !barkUrlVisible">
<Hide v-if="!barkUrlVisible" />
<View v-else />
</el-icon>
</div>
</el-form-item>
</el-form>
</div>
<div v-else class="flex items-center justify-center" style="height: 257px">
<el-button size="large" round plain type="primary" @click="onChangeBark(0)">
{{ $t('commons.button.create') }}
</el-button>
</div>
</el-card>
<el-card
class="rounded-2xl shadow hover:shadow-md transition-all"
v-if="globalStore.isProductPro && !globalStore.isIntl"
Expand Down Expand Up @@ -557,6 +566,7 @@ const feiShuConfig = ref<Alert.WebhookConfig>({ ...defaultFeiShuConfig });
const weComUrlVisible = ref(false);
const dingTalkUrlVisible = ref(false);
const feiShuUrlVisible = ref(false);
const barkUrlVisible = ref(false);

const config = ref<Alert.AlertConfigInfo>({
id: 0,
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/views/toolbox/clam/operate/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@
cleanable
>
<el-option value="mail" :label="$t('xpack.alert.mail')" />
<el-option v-if="!isProductPro" value="bark" :label="$t('xpack.alert.bark')" />
<el-option
value="weCom"
v-if="!globalStore.isIntl"
Expand All @@ -172,6 +173,7 @@
:disabled="!dialogData.rowData!.hasAlert || !isProductPro"
:label="$t('xpack.alert.feiShu')"
/>
<el-option v-if="isProductPro" value="bark" :label="$t('xpack.alert.bark')" />
<el-option
value="sms"
v-if="!globalStore.isIntl"
Expand Down
Loading