gtsoft/gtsoft-snail-job-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/1.3.0-beta1' into 1.3.0-beta1

Browse Source
This commit is contained in:
wodeyangzipingpingwuqi 2024-12-26 17:51:20 +08:00
commit ef2ac40748
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/notify/config/index.vue
View File

@ -48,8 +48,8 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
width: 64 width: 64
}, },
{ {
key: 'businessName', key: 'notifyName',
title: $t('page.notifyConfig.businessName'), title: $t('page.notifyConfig.notifyName'),
align: 'left', align: 'left',
width: 120, width: 120,
render: row => { render: row => {
@ -60,7 +60,7 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
return ( return (
<n-button text tag="a" type="primary" onClick={showDetailDrawer} class="ws-normal"> <n-button text tag="a" type="primary" onClick={showDetailDrawer} class="ws-normal">
{row.businessName} {row.notifyName}
</n-button> </n-button>
); );
} }

4
src/views/notify/config/modules/notify-config-detail-drawer.vue
View File

@ -22,8 +22,8 @@ const visible = defineModel<boolean>('visible', {
<template> <template>
<OperateDrawer v-model="visible" :title="$t('page.groupConfig.detail')"> <OperateDrawer v-model="visible" :title="$t('page.groupConfig.detail')">
<NDescriptions label-placement="top" bordered :column="2"> <NDescriptions label-placement="top" bordered :column="2">
<NDescriptionsItem :label="$t('page.notifyConfig.businessName')" :span="2"> <NDescriptionsItem :label="$t('page.notifyConfig.notifyName')" :span="2">
{{ rowData?.businessName }} {{ rowData?.notifyName }}
</NDescriptionsItem> </NDescriptionsItem>
<NDescriptionsItem :label="$t('page.groupConfig.groupName')" :span="2"> <NDescriptionsItem :label="$t('page.groupConfig.groupName')" :span="2">
{{ rowData?.groupName }} {{ rowData?.groupName }}

13
src/views/notify/config/modules/notify-config-operate-drawer.vue
View File

@ -61,7 +61,7 @@ const retrySceneDisable = defineModel<boolean>('retrySceneDisable', {
default: true default: true
}); });
const notifySceneOptions = ref<CommonType.Option<string | number>[]>(translateOptions(retryNotifySceneOptions)); const notifySceneOptions = ref<CommonType.Option<string | number>[]>([]);
const { formRef, validate, restoreValidation } = useNaiveForm(); const { formRef, validate, restoreValidation } = useNaiveForm();
const { defaultRequiredRule } = useFormRules(); const { defaultRequiredRule } = useFormRules();
@ -145,6 +145,7 @@ function handleUpdateModelWhenEdit() {
Object.assign(model, createDefaultModel()); Object.assign(model, createDefaultModel());
retrySceneDisable.value = true; retrySceneDisable.value = true;
retryNotifyStatusDisable.value = true; retryNotifyStatusDisable.value = true;
notifySceneOptions.value = [];
return; return;
} }
@ -292,6 +293,13 @@ watch(visible, () => {
<template> <template>
<OperateDrawer v-model="visible" :title="title" :min-size="480" @handle-submit="handleSubmit"> <OperateDrawer v-model="visible" :title="title" :min-size="480" @handle-submit="handleSubmit">
<NForm ref="formRef" :model="model" :rules="rules"> <NForm ref="formRef" :model="model" :rules="rules">
<NFormItem :label="$t('page.notifyConfig.notifyName')" path="notifyName">
<NInput
v-model:value="model.notifyName"
:placeholder="$t('page.notifyConfig.form.notifyName')"
:maxlength="32"
/>
</NFormItem>
<NFormItem :label="$t('page.notifyConfig.groupName')" path="groupName"> <NFormItem :label="$t('page.notifyConfig.groupName')" path="groupName">
<SelectGroup v-model:value="model.groupName" @update:model-value="groupNameUpdate" /> <SelectGroup v-model:value="model.groupName" @update:model-value="groupNameUpdate" />
</NFormItem> </NFormItem>
@ -303,9 +311,6 @@ watch(visible, () => {
@update:value="systemTaskTypeChange" @update:value="systemTaskTypeChange"
/> />
</NFormItem> </NFormItem>
<NFormItem :label="$t('page.notifyConfig.notifyName')" path="notifyName">
<NInput v-model:value="model.notifyName" :placeholder="$t('page.notifyConfig.form.notifyName')" />
</NFormItem>
<NFormItem :label="$t('page.notifyConfig.notifyScene')" path="notifyScene"> <NFormItem :label="$t('page.notifyConfig.notifyScene')" path="notifyScene">
<NSelect <NSelect
v-model:value="model.notifyScene" v-model:value="model.notifyScene"