Merge branch 'dev' of gitee.com:yudaocode/yudao-ui-admin-vben into dev-dict

Signed-off-by: xingyu <xingyu4j@vip.qq.com>

apps/web-ele/src/views/system/notify/template/index.vue

@@ -70,7 +70,6 @@ async function onDelete(row: SystemNotifyTemplateApi.NotifyTemplate) {
   });
   try {
     await deleteNotifyTemplate(row.id as number);
-    loadingInstance.close();
     ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.name]));
     onRefresh();
   } finally {
@@ -88,7 +87,6 @@ async function onDeleteBatch() {
   try {
     await deleteNotifyTemplateList(checkedIds.value);
     checkedIds.value = [];
-    loadingInstance.close();
     ElMessage.success($t('ui.actionMessage.deleteSuccess'));
     onRefresh();
   } finally {

apps/web-ele/src/views/system/notify/template/modules/form.vue

@@ -72,7 +72,7 @@ const [Modal, modalApi] = useVbenModal({
     }
     modalApi.lock();
     try {
-      formData.value = await getNotifyTemplate(data.id as number);
+      formData.value = await getNotifyTemplate(data.id);
       // 设置到 values
       await formApi.setValues(formData.value);
     } finally {