@liujitcn/kratos-admin-system 0.0.51 → 0.0.53

package/dist/package/src/views/ai/chat/components/speech-recognition.ts

@@ -5,6 +5,7 @@ export type SpeechResultList = ArrayLike<{
   0?: {
     transcript: string;
   };
+  isFinal?: boolean;
   length: number;
 }>;
 
@@ -17,6 +18,7 @@ export type SpeechRecognitionError = {
 
 type SpeechRecognitionResultEvent = {
   results: SpeechResultList;
+  resultIndex: number;
 };
 
 type SpeechRecognitionInstance = {
@@ -49,13 +51,28 @@ type SpeechRecognitionOptions = {
   onResult?: (text: string) => void;
 };
 
-/** 收集一次识别事件中的完整文本。 */
-export function collectSpeechResultText(results: SpeechResultList) {
-  let text = "";
-  for (let index = 0; index < results.length; index++) {
-    text += results[index]?.[0]?.transcript ?? "";
+/** 增量累积语音识别结果，避免连续模式下 interim 结果重复计入已确认文本。 */
+export function accumulateSpeechResultText(
+  results: SpeechResultList,
+  resultIndex: number,
+  previousFinalText: string
+): { finalText: string; text: string } {
+  let finalText = previousFinalText;
+  let interimText = "";
+  for (let index = resultIndex; index < results.length; index++) {
+    const result = results[index];
+    const transcript = result?.[0]?.transcript ?? "";
+    if (result?.isFinal) {
+      finalText += transcript;
+    } else {
+      interimText += transcript;
+    }
+  }
+  // Chrome 连续模式下 interim 结果会累计包含已确认的 final 文本，去除重复前缀。
+  if (interimText && finalText && interimText.startsWith(finalText)) {
+    interimText = interimText.slice(finalText.length);
   }
-  return text;
+  return { finalText, text: finalText + interimText };
 }
 
 /** 创建浏览器语音识别实例，并统一结果、状态和卸载处理。 */
@@ -64,6 +81,7 @@ export function useSpeechRecognition({ onError, onStart, onEnd, onResult }: Spee
   const value = ref("");
   let recognition: SpeechRecognitionInstance | null = null;
   let recognitionSession = 0;
+  let finalText = "";
 
   /** 获取当前浏览器支持的语音识别构造函数。 */
   function resolveRecognitionConstructor() {
@@ -84,6 +102,7 @@ export function useSpeechRecognition({ onError, onStart, onEnd, onResult }: Spee
     const nextRecognition = new RecognitionConstructor();
     const currentSession = ++recognitionSession;
     recognition = nextRecognition;
+    finalText = "";
     const isCurrentRecognition = () => recognition === nextRecognition && recognitionSession === currentSession;
     nextRecognition.continuous = true;
     nextRecognition.interimResults = true;
@@ -96,7 +115,9 @@ export function useSpeechRecognition({ onError, onStart, onEnd, onResult }: Spee
     };
     nextRecognition.onresult = event => {
       if (!isCurrentRecognition()) return;
-      value.value = collectSpeechResultText(event.results);
+      const accumulated = accumulateSpeechResultText(event.results, event.resultIndex, finalText);
+      finalText = accumulated.finalText;
+      value.value = accumulated.text;
       onResult?.(value.value);
     };
     nextRecognition.onerror = error => {

package/dist/package/src/views/ai/chat/index.vue

@@ -107,6 +107,7 @@ const pendingDeltaMap = new Map<string, AiStreamPayload>();
 const runningStreamTaskMap = new Map<string, AiStreamTask>();
 let pendingDeltaFrame = 0;
 let speakingMessageID = "";
+let createSessionPromise: Promise<string | undefined> | undefined;
 
 /** 当前会话的流式任务状态。 */
 type AiStreamTask = {
@@ -728,13 +729,21 @@ async function ensureActiveSession() {
 
 /** 创建新的助手会话，并同步到本地列表。 */
 async function createSession(options?: { title?: string }) {
-  const response = await defAiSessionService.CreateAiSession({
-    title: options?.title || t("system.ai.chat.value.new_conversation"),
-    terminal: Terminal.TERMINAL_ADMIN
-  });
-  const normalizedSession = normalizeSession(response.session);
-  upsertSession(normalizedSession);
-  return normalizedSession.id;
+  if (createSessionPromise) return createSessionPromise;
+  createSessionPromise = (async () => {
+    const response = await defAiSessionService.CreateAiSession({
+      title: options?.title || t("system.ai.chat.value.new_conversation"),
+      terminal: Terminal.TERMINAL_ADMIN
+    });
+    const normalizedSession = normalizeSession(response.session);
+    upsertSession(normalizedSession);
+    return normalizedSession.id;
+  })();
+  try {
+    return await createSessionPromise;
+  } finally {
+    createSessionPromise = undefined;
+  }
 }
 
 /** 使用当前消息内容生成一个易识别的分支会话标题。 */

package/dist/package/src/views/base/api-log/index.vue

@@ -35,7 +35,7 @@ const resultOptions = computed(() =>
   ])
 );
 const columns = computed<ColumnProps[]>(() => [
-  { prop: "operation", label: t("system.base.log.field.operation"), minWidth: 320, search: { el: "input" } },
+  { prop: "operation", label: t("system.base.log.field.operation"), minWidth: 320, search: { el: "input", key: "keyword" } },
   { prop: "method", label: t("system.base.log.field.method"), minWidth: 90 },
   { prop: "status_code", label: t("system.base.log.field.status_code"), minWidth: 100, align: "right" },
   {

package/dist/package/src/views/base/area/index.vue

@@ -113,7 +113,9 @@ async function loadParentIdFormTreeOptions(
   resolve(normalizeLazyTreeOptions((response.list ?? []) as GeneratedTreeOption[]));
 }
 
-void loadFormOptions();
+void loadFormOptions().then(options => {
+  parentIdFormOptions.value = options;
+});
 
 /** 行政区域表单字段配置。 */
 const formFields = computed<ProFormField[]>(() => [
@@ -218,7 +220,7 @@ async function loadFormOptions() {
   const parentIdFormResponse = await defBaseAreaService.OptionBaseArea({ parent_id: 0, lazy: true } as Parameters<
     typeof defBaseAreaService.OptionBaseArea
   >[0]);
-  parentIdFormOptions.value = [
+  return [
     { label: t("system.base.area.value.root"), value: 0 },
     ...normalizeLazyTreeOptions((parentIdFormResponse.list ?? []) as GeneratedTreeOption[]).filter(
       option => Number(option.value) !== 0
@@ -231,19 +233,23 @@ async function loadFormOptions() {
  */
 async function handleOpenDialog(id?: number) {
   resetForm();
-  await loadFormOptions();
   dialog.titleKey = id ? "system.base.area.action.edit" : "system.base.area.action.create";
-  dialog.visible = true;
-  if (!id) return;
-
-  const data = await defBaseAreaService.GetBaseArea({ id });
-  Object.assign(formData, data);
+  await formDialogRef.value?.open({
+    load: async () => ({
+      options: await loadFormOptions(),
+      data: id ? await defBaseAreaService.GetBaseArea({ id }) : undefined
+    }),
+    commit: ({ options, data }) => {
+      parentIdFormOptions.value = options;
+      if (data) Object.assign(formData, data);
+    }
+  });
 }
 /**
  * 关闭行政区域弹窗。
  */
 function handleCloseDialog() {
-  dialog.visible = false;
+  formDialogRef.value?.close();
   resetForm();
 }
 /**

package/dist/package/src/views/base/backup-management/archive-config/index.vue

@@ -83,13 +83,21 @@ function refresh() { proTable.value?.getTableList(); }
 function defaultForm(): BaseTableArchiveForm { return { id: 0, source_name: "", table_name: "", archive_mode: BaseTableArchiveMode.BASE_TABLE_ARCHIVE_MODE_INTERNAL_DATABASE, online_retention_days: 180, archive_retention_days: 3650, batch_size: 5000, delete_after_verify: false, oss_prefix: "archive", status: Status.STATUS_ENABLE }; }
 function resetForm() { dialog.visible = false; formDialogRef.value?.resetFields(); Object.assign(formData, defaultForm()); }
 async function openDialog(id?: number) {
-  await loadSourceOptions();
-  Object.assign(formData, defaultForm());
-  dialog.editing = Boolean(id);
-  if (id) Object.assign(formData, await defBaseTableArchiveService.GetBaseTableArchive({ id }));
-  if (!formData.source_name) formData.source_name = String(sourceOptions.value[0]?.value ?? "");
-  await loadTableOptions(formData.source_name);
-  dialog.visible = true;
+  await formDialogRef.value?.open({
+    load: async () => {
+      await loadSourceOptions();
+      const data = id ? await defBaseTableArchiveService.GetBaseTableArchive({ id }) : undefined;
+      const form = { ...defaultForm(), ...(data ?? {}) };
+      if (!form.source_name) form.source_name = String(sourceOptions.value[0]?.value ?? "");
+      const loadedTableOptions = form.source_name ? await requestTableOptions(form.source_name) : [];
+      return { form, loadedTableOptions };
+    },
+    commit: ({ form, loadedTableOptions }) => {
+      Object.assign(formData, form);
+      dialog.editing = Boolean(id);
+      tableOptions.value = loadedTableOptions;
+    }
+  });
 }
 async function loadSourceOptions() {
   if (sourceOptions.value.length || loadingSources.value) return;
@@ -107,12 +115,16 @@ async function handleSourceChange(value: string | number | boolean | undefined)
   await loadTableOptions(formData.source_name);
 }
 async function loadTableOptions(sourceName: string) {
-  tableOptions.value = [];
-  if (!sourceName) return;
+  tableOptions.value = await requestTableOptions(sourceName);
+}
+
+/** 请求指定数据源下的数据表选项。 */
+async function requestTableOptions(sourceName: string) {
+  if (!sourceName) return [];
   loadingTables.value = true;
   try {
     const data = await defBaseTableSourceService.OptionBaseTable({ source_name: sourceName });
-    tableOptions.value = (data.value ?? []).map(value => ({ label: value, value }));
+    return (data.value ?? []).map(value => ({ label: value, value }));
   } finally {
     loadingTables.value = false;
   }

package/dist/package/src/views/base/backup-management/backup-config/index.vue

@@ -68,12 +68,19 @@ function refresh() { proTable.value?.getTableList(); }
 function defaultForm(): BaseTableBackupForm { return { id: 0, source_name: "", backup_type: BaseTableBackupType.BASE_TABLE_BACKUP_TYPE_FULL, oss_prefix: "backup/database", retention_count: 7, status: Status.STATUS_ENABLE }; }
 function resetForm() { dialog.visible = false; formDialogRef.value?.resetFields(); Object.assign(formData, defaultForm()); }
 async function openDialog(id?: number) {
-  await loadSourceOptions();
-  Object.assign(formData, defaultForm());
-  dialog.editing = Boolean(id);
-  if (id) Object.assign(formData, await defBaseTableBackupService.GetBaseTableBackup({ id }));
-  if (!formData.source_name) formData.source_name = String(sourceOptions.value[0]?.value ?? "");
-  dialog.visible = true;
+  await formDialogRef.value?.open({
+    load: async () => {
+      await loadSourceOptions();
+      const data = id ? await defBaseTableBackupService.GetBaseTableBackup({ id }) : undefined;
+      const form = { ...defaultForm(), ...(data ?? {}) };
+      if (!form.source_name) form.source_name = String(sourceOptions.value[0]?.value ?? "");
+      return form;
+    },
+    commit: form => {
+      Object.assign(formData, form);
+      dialog.editing = Boolean(id);
+    }
+  });
 }
 async function loadSourceOptions() {
   if (sourceOptions.value.length || loadingSources.value) return;

package/dist/package/src/views/base/config/index.vue

@@ -10,10 +10,11 @@
     />
 
     <ProDialog
+      ref="dialogRef"
       v-model="dialog.visible"
       class="system-config-dialog"
       :title="t(dialog.titleKey, { resource: t('system.base.config.resource') })"
-      width="min(1040px, calc(100vw - 32px))"
+      width="min(1280px, calc(100vw - 32px))"
       top="4vh"
       :confirm-loading="saving"
       @confirm="handleSubmit"
@@ -32,6 +33,7 @@
             :rules="rules"
             :col-span="12"
             :gutter="24"
+            label-width="10em"
             label-position="right"
             scroll-to-error
           >
@@ -96,6 +98,7 @@
                 :fields="localizedFormFields"
                 :col-span="12"
                 :gutter="24"
+                label-width="10em"
                 label-position="right"
                 scroll-to-error
               />
@@ -160,6 +163,7 @@ defineOptions({
 
 const { BUTTONS } = useAuthButtons();
 const proTable = ref<ProTableInstance>();
+const dialogRef = ref<InstanceType<typeof ProDialog>>();
 const basicFormRef = ref<ProFormInstance>();
 const activeTab = ref("basic");
 
@@ -635,29 +639,48 @@ function refreshTable() {
  * 打开系统配置弹窗。
  */
 async function handleOpenDialog(configId?: number) {
-  await loadEnabledBaseLanguages();
   resetForm();
   dialog.titleKey = configId ? "common.action.edit_resource" : "common.action.create_resource";
-  if (configId) {
-    Object.assign(formData, await defBaseConfigService.GetBaseConfig({ id: configId }));
-    if (formData.type === BaseConfigType.BASE_CONFIG_TYPE_FORM) {
-      loadFormValue(formData.value);
+  await dialogRef.value?.open({
+    load: async () => ({
+      data: configId ? await defBaseConfigService.GetBaseConfig({ id: configId }) : undefined,
+      languages: await loadEnabledBaseLanguages()
+    }),
+    commit: ({ data }) => {
+      if (data) {
+        Object.assign(formData, data);
+        if (formData.type === BaseConfigType.BASE_CONFIG_TYPE_FORM) loadFormValue(formData.value);
+      }
+      activeTab.value = configId && formData.type === BaseConfigType.BASE_CONFIG_TYPE_FORM ? "form" : "basic";
     }
-  }
-  activeTab.value = configId && formData.type === BaseConfigType.BASE_CONFIG_TYPE_FORM ? "form" : "basic";
-  dialog.visible = true;
+  });
 }
 
 /** 按注册定义创建独立模型，并用已保存的配置值覆盖默认值。 */
 function loadFormValue(value?: string) {
   const definition = formDefinition.value;
+  const parsed = value ? parseJSONValue(value) : {};
   formValue.value =
-    formData.type === BaseConfigType.BASE_CONFIG_TYPE_FORM && definition
-      ? Object.assign(definition.createModel(), value ? JSON.parse(value) : {})
-      : {};
+    formData.type === BaseConfigType.BASE_CONFIG_TYPE_FORM && definition && isJSONObject(parsed)
+      ? Object.assign(definition.createModel(), parsed)
+      : definition?.createModel() ?? {};
   valueFormRef.value?.clearValidate();
 }
 
+/** 安全解析运行配置 JSON，脏数据回退到表单默认模型。 */
+function parseJSONValue(value: string): unknown {
+  try {
+    return JSON.parse(value);
+  } catch {
+    return undefined;
+  }
+}
+
+/** 判断运行配置 JSON 是否为可合并对象。 */
+function isJSONObject(value: unknown): value is Record<string, unknown> {
+  return Boolean(value && typeof value === "object" && !Array.isArray(value));
+}
+
 /** 按字段声明恢复运行配置提交值的 JSON 类型。 */
 function normalizeRuntimeConfigValue() {
   if (!formDefinition.value) return;
@@ -669,7 +692,8 @@ function normalizeRuntimeConfigValue() {
     } else if (field.valueType === "boolean" && typeof value === "string") {
       setRuntimeConfigFieldValue(field.prop, value === "true");
     } else if (field.valueType === "json" && typeof value === "string" && value !== "") {
-      setRuntimeConfigFieldValue(field.prop, JSON.parse(value));
+      const parsed = parseJSONValue(value);
+      if (parsed !== undefined) setRuntimeConfigFieldValue(field.prop, parsed);
     }
   }
 }
@@ -690,7 +714,7 @@ function setRuntimeConfigFieldValue(prop: string, value: unknown) {
  * 关闭系统配置弹窗并恢复默认表单值。
  */
 function handleCloseDialog() {
-  dialog.visible = false;
+  dialogRef.value?.close();
   resetForm();
 }
 

package/dist/package/src/views/base/dept/index.vue

@@ -301,16 +301,15 @@ function refreshTable() {
 /**
  * 加载部门下拉树数据，供弹窗选择上级部门。
  */
-async function loadDeptOptions() {
+async function requestDeptOptions(tenantId = formData.tenant_id) {
   // 默认租户未选择目标租户时仅保留顶级部门，避免混入其他租户的部门树。
-  if (isDefaultTenant.value && !formData.tenant_id) {
-    deptOptions.value = [{ value: 0, label: t("system.base.dept.value.root"), disabled: false, has_children: true, children: [] }];
-    return;
+  if (isDefaultTenant.value && !tenantId) {
+    return [{ value: 0, label: t("system.base.dept.value.root"), disabled: false, has_children: true, children: [] }];
   }
   const optionBaseDeptResponse = await defBaseDeptService.OptionBaseDept({
-    tenant_id: toRequestTenantId(formData.tenant_id)
+    tenant_id: toRequestTenantId(tenantId)
   });
-  deptOptions.value = [
+  return [
     {
       value: 0,
       label: t("system.base.dept.value.root"),
@@ -321,6 +320,11 @@ async function loadDeptOptions() {
   ];
 }
 
+/** 加载部门下拉树数据并更新表单选项。 */
+async function loadDeptOptions() {
+  deptOptions.value = await requestDeptOptions();
+}
+
 /**
  * 切换表单租户时重新加载对应租户的上级部门树。
  */
@@ -333,31 +337,33 @@ async function handleFormTenantChange() {
  * 打开部门弹窗。
  */
 async function handleOpenDialog(parent_id?: number, deptId?: number, tenantId?: number) {
-  resetForm();
-  await loadTenantOptions();
-  if (deptId) {
-    dialog.titleKey = "common.action.edit_resource";
-    dialog.visible = true;
-    defBaseDeptService.GetBaseDept({ id: deptId }).then(async data => {
-      Object.assign(formData, data);
-      await loadDeptOptions();
-    });
-    return;
-  }
-
-  // 从部门行新增子部门时，继承父部门租户并加载同租户上级部门树。
-  formData.tenant_id = tenantId;
-  await loadDeptOptions();
-  dialog.titleKey = "common.action.create_resource";
-  dialog.visible = true;
-  formData.parent_id = parent_id ?? 0;
+  await formDialogRef.value?.open({
+    load: async () => {
+      await loadTenantOptions();
+      const data = deptId ? await defBaseDeptService.GetBaseDept({ id: deptId }) : undefined;
+      const options = await requestDeptOptions(data?.tenant_id ?? tenantId);
+      return { data, options };
+    },
+    commit: ({ data, options }) => {
+      resetForm();
+      deptOptions.value = options;
+      dialog.titleKey = deptId ? "common.action.edit_resource" : "common.action.create_resource";
+      if (data) {
+        Object.assign(formData, data);
+      } else {
+        // 从部门行新增子部门时，继承父部门租户并加载同租户上级部门树。
+        formData.tenant_id = tenantId;
+        formData.parent_id = parent_id ?? 0;
+      }
+    }
+  });
 }
 
 /**
  * 关闭部门弹窗。
  */
 function handleCloseDialog() {
-  dialog.visible = false;
+  formDialogRef.value?.close();
   resetForm();
 }
 

package/dist/package/src/views/base/dict/index.vue

@@ -247,22 +247,26 @@ function refreshTable() {
  * 打开字典编辑弹窗。
  */
 async function handleOpenDialog(dictId?: number) {
-  await loadEnabledBaseLanguages();
   resetForm();
   dialog.editing = Boolean(dictId);
-  dialog.visible = true;
-  if (!dictId) return;
-
-  const data = await defBaseDictService.GetBaseDict({ id: dictId });
-  Object.assign(formData, data);
-  i18nValues.value = normalizeDynamicI18ns(data.i18ns as DynamicI18nRecord[]);
+  await formDialogRef.value?.open({
+    load: async () => ({
+      data: dictId ? await defBaseDictService.GetBaseDict({ id: dictId }) : undefined,
+      languages: await loadEnabledBaseLanguages()
+    }),
+    commit: ({ data }) => {
+      if (!data) return;
+      Object.assign(formData, data);
+      i18nValues.value = normalizeDynamicI18ns(data.i18ns as DynamicI18nRecord[]);
+    }
+  });
 }
 
 /**
  * 关闭字典弹窗并恢复表单初始值。
  */
 function handleCloseDialog() {
-  dialog.visible = false;
+  formDialogRef.value?.close();
   resetForm();
 }
 

package/dist/package/src/views/base/dict/item.vue

@@ -310,22 +310,26 @@ function refreshTable() {
  * 打开字典项编辑弹窗。
  */
 async function handleOpenDialog(dictItemId?: number) {
-  await loadEnabledBaseLanguages();
   resetForm();
   dialog.editing = Boolean(dictItemId);
-  dialog.visible = true;
-  if (!dictItemId) return;
-
-  const data = await defBaseDictItemService.GetBaseDictItem({ id: dictItemId });
-  Object.assign(formData, data);
-  i18nValues.value = normalizeDynamicI18ns(data.i18ns as DynamicI18nRecord[]);
+  await formDialogRef.value?.open({
+    load: async () => ({
+      data: dictItemId ? await defBaseDictItemService.GetBaseDictItem({ id: dictItemId }) : undefined,
+      languages: await loadEnabledBaseLanguages()
+    }),
+    commit: ({ data }) => {
+      if (!data) return;
+      Object.assign(formData, data);
+      i18nValues.value = normalizeDynamicI18ns(data.i18ns as DynamicI18nRecord[]);
+    }
+  });
 }
 
 /**
  * 关闭字典项弹窗并恢复默认值。
  */
 function handleCloseDialog() {
-  dialog.visible = false;
+  formDialogRef.value?.close();
   resetForm();
 }
 

package/dist/package/src/views/base/i18n-custom/index.vue

@@ -213,14 +213,14 @@ const headerActions = computed<HeaderActionProps[]>(() => [
 
 /** 请求国际化自定义翻译分页列表。 */
 async function requestBaseI18nCustomTable(params: PageBaseI18nCustomRequest) {
-  await loadLanguages();
+  enabledLanguages.value = await loadLanguages();
   const data = await defBaseI18nCustomService.PageBaseI18nCustom(buildPageRequest(params));
   return { data: { list: data.items ?? [], total: data.total } };
 }
 
 /** 加载启用语言选项。 */
 async function loadLanguages() {
-  enabledLanguages.value = await loadEnabledBaseLanguages();
+  return loadEnabledBaseLanguages();
 }
 
 /** 返回语言显示名称。 */
@@ -231,17 +231,23 @@ function getLanguageLabel(locale: string) {
 
 /** 打开国际化自定义翻译编辑弹窗。 */
 async function handleOpenDialog(id?: number) {
-  await loadLanguages();
   resetForm();
   dialog.editing = Boolean(id);
-  dialog.visible = true;
-  if (!id) return;
-  Object.assign(formData, await defBaseI18nCustomService.GetBaseI18nCustom({ id }));
+  await formDialogRef.value?.open({
+    load: async () => ({
+      languages: await loadLanguages(),
+      data: id ? await defBaseI18nCustomService.GetBaseI18nCustom({ id }) : undefined
+    }),
+    commit: ({ languages, data }) => {
+      enabledLanguages.value = languages;
+      if (data) Object.assign(formData, data);
+    }
+  });
 }
 
 /** 关闭编辑弹窗并重置表单。 */
 function handleCloseDialog() {
-  dialog.visible = false;
+  formDialogRef.value?.close();
   resetForm();
 }
 

package/dist/package/src/views/base/job/index.vue

@@ -368,22 +368,26 @@ function refreshTable() {
  * 打开定时任务弹窗。
  */
 async function handleOpenDialog(jobId?: number) {
-  await loadEnabledBaseLanguages();
   resetForm();
   dialog.editing = Boolean(jobId);
-  dialog.visible = true;
-  if (!jobId) return;
-
-  const data = await defBaseJobService.GetBaseJob({ id: jobId });
-  Object.assign(formData, data);
-  i18nValues.value = normalizeDynamicI18ns(data.i18ns as DynamicI18nRecord[]);
+  await formDialogRef.value?.open({
+    load: async () => ({
+      data: jobId ? await defBaseJobService.GetBaseJob({ id: jobId }) : undefined,
+      languages: await loadEnabledBaseLanguages()
+    }),
+    commit: ({ data }) => {
+      if (!data) return;
+      Object.assign(formData, data);
+      i18nValues.value = normalizeDynamicI18ns(data.i18ns as DynamicI18nRecord[]);
+    }
+  });
 }
 
 /**
  * 关闭定时任务弹窗并恢复默认表单值。
  */
 function handleCloseDialog() {
-  dialog.visible = false;
+  formDialogRef.value?.close();
   resetForm();
 }
 

package/dist/package/src/views/base/job/log.vue

@@ -2,7 +2,7 @@
   <div class="table-box">
     <ProTable ref="proTable" row-key="id" :columns="columns" :request-api="requestBaseJobLogTable" />
 
-    <ProDialog v-model="dialog.visible" :title="t('system.base.job.log.title.detail')" width="1200px" @close="handleCloseDialog">
+    <ProDialog ref="dialogRef" v-model="dialog.visible" :title="t('system.base.job.log.title.detail')" width="1200px" @close="handleCloseDialog">
       <div class="detail-container">
         <el-descriptions :title="t('system.base.job.log.section.basic')" border :column="2">
           <el-descriptions-item :label="t('common.field.status')">
@@ -60,6 +60,7 @@ defineOptions({
 
 const route = useRoute();
 const proTable = ref<ProTableInstance>();
+const dialogRef = ref<InstanceType<typeof ProDialog>>();
 const initialJobID = Number(route.query.jobId ?? 0);
 
 const dialog = reactive({
@@ -180,21 +181,25 @@ async function requestBaseJobLogTable(params: PageBaseJobLogRequest) {
 /**
  * 打开定时任务日志详情弹窗。
  */
-function handleOpenDialog(logId?: number) {
+async function handleOpenDialog(logId?: number) {
   resetDetail();
-  dialog.visible = true;
-  if (!logId) return;
-
-  defBaseJobLogService.GetBaseJobLog({ id: logId }).then(data => {
-    Object.assign(detail, data);
-  });
+  try {
+    await dialogRef.value?.open({
+      load: () => (logId ? defBaseJobLogService.GetBaseJobLog({ id: logId }) : undefined),
+      commit: data => {
+        if (data) Object.assign(detail, data);
+      }
+    });
+  } catch {
+    dialogRef.value?.close();
+  }
 }
 
 /**
  * 关闭定时任务日志详情弹窗。
  */
 function handleCloseDialog() {
-  dialog.visible = false;
+  dialogRef.value?.close();
   resetDetail();
 }