@liujitcn/kratos-admin-system 0.0.51 → 0.0.53

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

@@ -144,14 +144,17 @@ async function requestBaseLanguageTable(params: PageBaseLanguageRequest) {
 async function handleOpenDialog(id?: number) {
   resetForm();
   dialog.editing = Boolean(id);
-  dialog.visible = true;
-  if (!id) return;
-  Object.assign(formData, await defBaseLanguageService.GetBaseLanguage({ id }));
+  await formDialogRef.value?.open({
+    load: () => (id ? defBaseLanguageService.GetBaseLanguage({ id }) : undefined),
+    commit: data => {
+      if (data) Object.assign(formData, data);
+    }
+  });
 }
 
 /** 关闭语言编辑弹窗。 */
 function handleCloseDialog() {
-  dialog.visible = false;
+  formDialogRef.value?.close();
   resetForm();
 }
 

package/dist/package/src/views/base/login-policy/index.vue

@@ -442,23 +442,34 @@ async function requestTable(params: Record<string, unknown>) {
 
 /** 打开登录策略表单。 */
 async function openDialog(id?: number) {
-  Object.assign(formData, defaultForm());
-  dialog.titleKey = id ? "common.action.edit" : "common.action.create";
-  await loadTenantOptions();
-  if (id) {
-    const detail = await defBaseLoginPolicyService.GetBaseLoginPolicy({ id });
-    Object.assign(formData, detail, { initial_password: "", rules: detail.rules ?? [] });
-    if (formData.scope_type === BaseLoginPolicyScopeType.BASE_LOGIN_POLICY_SCOPE_TYPE_USER && formData.tenant_id) {
-      await loadUserOptions(formData.tenant_id);
+  await formDialogRef.value?.open({
+    load: async () => {
+      await loadTenantOptions();
+      const detail = id ? await defBaseLoginPolicyService.GetBaseLoginPolicy({ id }) : undefined;
+      const loadedUserOptions =
+        detail?.scope_type === BaseLoginPolicyScopeType.BASE_LOGIN_POLICY_SCOPE_TYPE_USER && detail.tenant_id
+          ? await requestUserOptions(detail.tenant_id)
+          : [];
+      return { detail, loadedUserOptions };
+    },
+    commit: ({ detail, loadedUserOptions }) => {
+      Object.assign(formData, defaultForm());
+      dialog.titleKey = id ? "common.action.edit" : "common.action.create";
+      if (detail) Object.assign(formData, detail, { initial_password: "", rules: detail.rules ?? [] });
+      userOptions.value = loadedUserOptions;
     }
-  }
-  dialog.visible = true;
+  });
 }
 
 /** 加载指定租户的用户选项。 */
 async function loadUserOptions(tenantId: number) {
+  userOptions.value = await requestUserOptions(tenantId);
+}
+
+/** 请求指定租户的用户选项。 */
+async function requestUserOptions(tenantId: number) {
   const response = await defBaseUserService.OptionBaseUser({ keyword: "", tenant_id: tenantId });
-  userOptions.value = response.list ?? [];
+  return response.list ?? [];
 }
 
 /** 提交登录策略表单。 */

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

@@ -1053,8 +1053,10 @@ function buildSubmitPayload(): BaseMenuForm {
 /** 加载菜单树选项和 API 列表，确保弹窗打开时相关数据已可用。 */
 async function loadDialogResources() {
   const [menuData, apiData] = await Promise.all([defBaseMenuService.TreeBaseMenu({}), defBaseApiService.OptionBaseApi({})]);
-  menuOptions.value = buildMenuOptions(menuData.base_menus ?? []);
-  apiList.value = apiData.base_apis ?? [];
+  return {
+    menuOptions: buildMenuOptions(menuData.base_menus ?? []),
+    apiList: apiData.base_apis ?? []
+  };
 }
 
 /** 根据关键字递归过滤菜单树，保留匹配节点及其父级。 */
@@ -1108,24 +1110,29 @@ function refreshTable() {
  * parentMenu 为新增时的固定父节点，menuId 为编辑时的菜单 ID。
  */
 async function handleOpenDialog(parentMenu?: BaseMenu, menuId?: number) {
-  await loadEnabledBaseLanguages();
-  await loadDialogResources();
-  dialog.parentLocked = Boolean(parentMenu || menuId);
-  dialog.editing = Boolean(menuId);
-  dialog.parentType = parentMenu?.type ?? BaseMenuType.BASE_MENU_TYPE_UNSPECIFIED;
-  resetForm(menuId ? undefined : { parent_id: parentMenu?.id });
-  dialog.visible = true;
-
-  if (menuId) {
-    const data = await defBaseMenuService.GetBaseMenu({ id: menuId });
-    resetForm(data);
-    return;
-  }
+  await formDialogRef.value?.open({
+    load: async () => {
+      await loadEnabledBaseLanguages();
+      const [resources, data] = await Promise.all([
+        loadDialogResources(),
+        menuId ? defBaseMenuService.GetBaseMenu({ id: menuId }) : Promise.resolve(undefined)
+      ]);
+      return { resources, data };
+    },
+    commit: ({ resources, data }) => {
+      menuOptions.value = resources.menuOptions;
+      apiList.value = resources.apiList;
+      dialog.parentLocked = Boolean(parentMenu || menuId);
+      dialog.editing = Boolean(menuId);
+      dialog.parentType = parentMenu?.type ?? BaseMenuType.BASE_MENU_TYPE_UNSPECIFIED;
+      resetForm(data ?? (menuId ? undefined : { parent_id: parentMenu?.id }));
+    }
+  });
 }
 
 /** 关闭菜单弹窗并显式重置表单与校验状态。 */
 function handleCloseDialog() {
-  dialog.visible = false;
+  formDialogRef.value?.close();
   dialog.parentType = BaseMenuType.BASE_MENU_TYPE_UNSPECIFIED;
   dialog.parentLocked = true;
   resetForm();

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

@@ -47,6 +47,7 @@
       </template>
     </FormDialog>
     <ProDialog
+      ref="contentDialogRef"
       v-model="content.visible"
       :title="content.data?.base_message?.title || t('system.base.message.content.title')"
       width="760px"
@@ -68,6 +69,7 @@
       </template>
     </ProDialog>
     <ProDialog
+      ref="detailDialogRef"
       v-model="detail.visible"
       :title="t('system.base.message.send_detail.title')"
       width="min(1200px, calc(100vw - 32px))"
@@ -112,7 +114,9 @@
           <el-table-column prop="include_children" :label="t('system.base.message.field.include_children')" width="120">
             <template #default="scope">{{ scope.row.include_children ? t("common.value.yes") : t("common.value.no") }}</template>
           </el-table-column>
-          <el-table-column prop="status" :label="t('common.field.status')" width="120" />
+          <el-table-column prop="status" :label="t('common.field.status')" width="120">
+            <template #default="scope">{{ optionLabel(dispatchStatusOptions, scope.row.status) }}</template>
+          </el-table-column>
           <el-table-column prop="matched_total" :label="t('system.base.message.field.matched_total')" width="110" align="right" />
           <el-table-column prop="inserted_total" :label="t('system.base.message.field.inserted_total')" width="110" align="right" />
           <el-table-column prop="attempt_count" :label="t('system.base.message.field.attempt_count')" width="90" align="right" />
@@ -190,6 +194,8 @@ const { BUTTONS } = useAuthButtons();
 const { isDefaultTenant, tenantColumns, tenantFormField, loadTenantOptions } = useTenantScope();
 const proTable = ref<ProTableInstance>();
 const formDialogRef = ref<InstanceType<typeof FormDialog>>();
+const contentDialogRef = ref<InstanceType<typeof ProDialog>>();
+const detailDialogRef = ref<InstanceType<typeof ProDialog>>();
 const categoryOptions = ref<ProFormOption[]>([]);
 const dialog = reactive({ visible: false, titleKey: "common.action.create" });
 const content = reactive<{ visible: boolean; loading: boolean; data?: BaseMessageDetail }>({ visible: false, loading: false });
@@ -219,6 +225,13 @@ const statusOptions = computed<ProFormOption[]>(() => [
   { label: t("system.base.message.status.published"), value: MessageStatus.MESSAGE_STATUS_PUBLISHED },
   { label: t("system.base.message.status.revoked"), value: MessageStatus.MESSAGE_STATUS_REVOKED }
 ]);
+const dispatchStatusOptions = computed<ProFormOption[]>(() => [
+  { label: t("system.base.message.dispatch_status.pending"), value: MessageDispatchStatus.MESSAGE_DISPATCH_STATUS_PENDING },
+  { label: t("system.base.message.dispatch_status.running"), value: MessageDispatchStatus.MESSAGE_DISPATCH_STATUS_RUNNING },
+  { label: t("system.base.message.dispatch_status.succeeded"), value: MessageDispatchStatus.MESSAGE_DISPATCH_STATUS_SUCCEEDED },
+  { label: t("system.base.message.dispatch_status.failed"), value: MessageDispatchStatus.MESSAGE_DISPATCH_STATUS_FAILED },
+  { label: t("system.base.message.dispatch_status.cancelled"), value: MessageDispatchStatus.MESSAGE_DISPATCH_STATUS_CANCELLED }
+]);
 onMounted(() => {
   void loadCategoryOptions();
   void loadTenantOptions();
@@ -539,26 +552,42 @@ async function requestTable(params: Record<string, unknown>) {
 
 /** 加载消息分类选项。 */
 async function loadCategoryOptions() {
+  categoryOptions.value = await requestCategoryOptions();
+}
+
+/** 请求消息分类选项。 */
+async function requestCategoryOptions() {
   const result = await defBaseMessageCategoryService.OptionBaseMessageCategory({});
-  categoryOptions.value = result.list.map(item => ({ label: item.label, value: item.value, disabled: item.disabled }));
+  return result.list.map(item => ({ label: item.label, value: item.value, disabled: item.disabled }));
 }
 
 /** 打开消息草稿表单。 */
 async function openDialog(id?: number) {
-  await loadTenantOptions();
-  Object.assign(formState, defaultForm());
-  dialog.titleKey = id ? "common.action.edit" : "common.action.create";
-  if (id) {
-    const detail = await defBaseMessageService.GetBaseMessage({ id });
-    Object.assign(formState, detail.form);
-    formState.audiences = detail.form?.audiences?.map(item => ({ ...item })) ?? [defaultAudience()];
-  }
-  await loadCategoryOptions();
-  dialog.visible = true;
+  await formDialogRef.value?.open({
+    load: async () => {
+      await loadTenantOptions();
+      const [detail, categories] = await Promise.all([
+        id ? defBaseMessageService.GetBaseMessage({ id }) : Promise.resolve(undefined),
+        requestCategoryOptions()
+      ]);
+      return { detail, categories };
+    },
+    commit: ({ detail, categories }) => {
+      Object.assign(formState, defaultForm());
+      dialog.titleKey = id ? "common.action.edit" : "common.action.create";
+      categoryOptions.value = categories;
+      if (detail) {
+        Object.assign(formState, detail.form);
+        formState.audiences = detail.form?.audiences?.map(item => ({ ...item })) ?? [defaultAudience()];
+      }
+    }
+  });
 }
 
 /** 提交消息草稿。 */
 async function handleSubmit() {
+  const valid = await formDialogRef.value?.validate();
+  if (!valid) return;
   const audiences = formState.audiences.length > 0 ? formState.audiences.map(item => ({ ...item })) : [defaultAudience()];
   const payload: BaseMessageForm = {
     ...formState,
@@ -576,21 +605,27 @@ async function handleSubmit() {
 
 /** 打开发送详情并加载投递进度。 */
 async function openDetail(id: number) {
-  detail.data = await defBaseMessageService.GetBaseMessage({ id });
-  detail.visible = true;
+  await detailDialogRef.value?.open({
+    load: () => defBaseMessageService.GetBaseMessage({ id }),
+    commit: data => {
+      detail.data = data;
+    }
+  });
 }
 
 /** 打开消息正文并单独展示内容。 */
 async function openContent(id: number) {
-  content.visible = true;
-  content.loading = true;
-  content.data = undefined;
   try {
-    content.data = await defBaseMessageService.GetBaseMessage({ id });
+    await contentDialogRef.value?.open({
+      load: () => defBaseMessageService.GetBaseMessage({ id }),
+      commit: data => {
+        content.data = data;
+        content.loading = false;
+      }
+    });
   } catch {
-    content.visible = false;
-  } finally {
     content.loading = false;
+    contentDialogRef.value?.close();
   }
 }
 
@@ -604,7 +639,16 @@ async function retryDispatch(id: number) {
 
 /** 删除草稿消息。 */
 async function handleDelete(value: BaseMessage | BaseMessage[] | number | number[]) {
-  const ids = normalizeSelectedIds(value as Parameters<typeof normalizeSelectedIds>[0]);
+  const idList = Array.isArray(value)
+    ? value.map(item => (typeof item === "object" ? item.id : item))
+    : typeof value === "object"
+      ? [value.id]
+      : normalizeSelectedIds(value);
+  const ids = idList.filter(item => item !== undefined && item !== null && item !== "");
+  if (!ids.length) {
+    ElMessage.warning(t("common.message.select_delete_item"));
+    return;
+  }
   await ElMessageBox.confirm(t("common.confirm.delete"), t("common.title.warning"), { type: "warning" });
   await defBaseMessageService.DeleteBaseMessage({ id: ids.join(",") });
   ElMessage.success(t("common.message.operation_success"));

package/dist/package/src/views/base/message-category/index.vue

@@ -302,14 +302,20 @@ async function requestTable(params: Record<string, unknown>) {
 
 /** 打开消息分类表单。 */
 async function openDialog(id?: number) {
-  Object.assign(formData, defaultForm());
-  dialog.titleKey = id ? "common.action.edit" : "common.action.create";
-  if (id) Object.assign(formData, await defBaseMessageCategoryService.GetBaseMessageCategory({ id }));
-  dialog.visible = true;
+  await formDialogRef.value?.open({
+    load: () => (id ? defBaseMessageCategoryService.GetBaseMessageCategory({ id }) : undefined),
+    commit: data => {
+      Object.assign(formData, defaultForm());
+      dialog.titleKey = id ? "common.action.edit" : "common.action.create";
+      if (data) Object.assign(formData, data);
+    }
+  });
 }
 
 /** 提交消息分类表单。 */
 async function handleSubmit() {
+  const valid = await formDialogRef.value?.validate();
+  if (!valid) return;
   const payload = formData as BaseMessageCategoryForm;
   if (payload.id) await defBaseMessageCategoryService.UpdateBaseMessageCategory({ base_message_category: payload });
   else await defBaseMessageCategoryService.CreateBaseMessageCategory({ base_message_category: payload });

package/dist/package/src/views/base/oauth-client/index.vue

@@ -266,12 +266,17 @@ async function loadApiOptions() {
 }
 
 async function handleOpenDialog(id?: number) {
-  await loadTenantOptions();
-  await loadApiOptions();
   resetForm();
   dialog.titleKey = id ? "common.action.edit" : "common.action.create";
-  dialog.visible = true;
-  if (id) Object.assign(formData, await defOauthClientService.GetOauthClient({ id }));
+  await formDialogRef.value?.open({
+    load: async () => ({
+      data: id ? await defOauthClientService.GetOauthClient({ id }) : undefined,
+      resources: await Promise.all([loadTenantOptions(), loadApiOptions()])
+    }),
+    commit: ({ data }) => {
+      if (data) Object.assign(formData, data);
+    }
+  });
 }
 
 function resetForm() {
@@ -289,7 +294,7 @@ function resetForm() {
 }
 
 function handleCloseDialog() {
-  dialog.visible = false;
+  formDialogRef.value?.close();
   resetForm();
 }
 
@@ -369,6 +374,11 @@ function handleDelete(selected?: number | string | Array<number | string> | Oaut
 }
 
 async function handleCopyCredentials(row: OauthClient) {
+  await ElMessageBox.confirm(
+    t("system.base.oauth_client.confirm.rotate_credentials"),
+    t("common.title.warning"),
+    { type: "warning" }
+  );
   const credentials = await defOauthClientService.RotateOauthClientCredentials({ id: row.id });
   const content = [
     `${t("system.base.oauth_client.field.client_id")}：${credentials.client_id}`,

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

@@ -249,15 +249,21 @@ function refreshTable() {
 /** 打开岗位编辑弹窗。 */
 async function handleOpenDialog(id?: number) {
   resetForm();
-  await loadTenantOptions();
   dialog.titleKey = id ? "common.action.edit_resource" : "common.action.create_resource";
-  dialog.visible = true;
-  if (id) Object.assign(formData, await defBasePostService.GetBasePost({ id }));
+  await formDialogRef.value?.open({
+    load: async () => ({
+      data: id ? await defBasePostService.GetBasePost({ id }) : undefined,
+      tenants: await loadTenantOptions()
+    }),
+    commit: ({ data }) => {
+      if (data) Object.assign(formData, data);
+    }
+  });
 }
 
 /** 关闭岗位弹窗并清理表单。 */
 function handleCloseDialog() {
-  dialog.visible = false;
+  formDialogRef.value?.close();
   resetForm();
 }
 

package/dist/package/src/views/base/redact-output-policy/index.vue

@@ -207,6 +207,7 @@ const ruleOptions = ref<ProFormOption[]>([]);
 const ruleCatalog = ref<BaseRedactRule[]>([]);
 const dialog = reactive({ visible: false, titleKey: "common.action.create_resource" });
 const form = reactive<OutputFormState>(defaultForm());
+let responseFieldsRequestRevision = 0;
 const statusOptions = computed<ProFormOption[]>(() => [{ label: t("common.status.enabled"), value: Status.STATUS_ENABLE }, { label: t("common.status.disabled"), value: Status.STATUS_DISABLE }]);
 const serviceOptions = computed<ProFormOption[]>(() => {
   const services = new Map<string, string>();
@@ -254,21 +255,27 @@ const headerActions = computed<HeaderActionProps[]>(() => [{ label: t("common.ac
 /** 请求出库脱敏策略分页列表。 */
 async function requestTable(params: PageBaseRedactOutputPolicyRequest) { const data = await defBaseRedactOutputPolicyService.PageBaseRedactOutputPolicy(buildPageRequest(params)); return { data: { list: data.base_redact_output_policies ?? [], total: data.total } }; }
 /** 加载 API 选项。 */
-async function loadApis() { const data = await defBaseApiService.OptionBaseApi({ include_public: true }); apiCatalog.value = data.base_apis ?? []; }
+async function loadApis() { apiCatalog.value = await requestApis(); }
+/** 请求 API 选项。 */
+async function requestApis() { const data = await defBaseApiService.OptionBaseApi({ include_public: true }); return data.base_apis ?? []; }
 /** 加载脱敏规则选项。 */
-async function loadRules() { const data = await defBaseRedactRuleService.PageBaseRedactRule({ code: "", name: "", rule_type: "", page_num: 1, page_size: 100 }); ruleCatalog.value = data.base_redact_rules ?? []; ruleOptions.value = ruleCatalog.value.map(item => ({ label: `${item.name} (${item.code})`, value: item.id, disabled: item.status !== Status.STATUS_ENABLE })); }
+async function loadRules() { const rules = await requestRules(); ruleCatalog.value = rules.catalog; ruleOptions.value = rules.options; }
+/** 请求脱敏规则选项。 */
+async function requestRules() { const data = await defBaseRedactRuleService.PageBaseRedactRule({ code: "", name: "", rule_type: "", page_num: 1, page_size: 100 }); const catalog = data.base_redact_rules ?? []; return { catalog, options: catalog.map(item => ({ label: `${item.name} (${item.code})`, value: item.id, disabled: item.status !== Status.STATUS_ENABLE })) }; }
 /** 服务变更后清空接口和返回字段。 */
-function handleServiceChange(serviceName?: string) { form.service_name = serviceName ?? ""; form.api_id = undefined; form.operation = ""; form.message_ref = ""; form.field_path = ""; form.field_rows = []; }
+function handleServiceChange(serviceName?: string) { responseFieldsRequestRevision += 1; form.service_name = serviceName ?? ""; form.api_id = undefined; form.operation = ""; form.message_ref = ""; form.field_path = ""; form.field_rows = []; }
 /** API 变更后重新加载返回字段。 */
 async function handleApiChange(apiId?: number) { const api = interfaceOptions.value.find(item => item.id === apiId); form.service_name = api?.service_name ?? form.service_name; form.operation = api?.operation ?? ""; form.field_rows = []; if (apiId !== undefined) await loadResponseFields(apiId); }
 /** 加载 API 返回字段并初始化表格行。 */
-async function loadResponseFields(apiId: number) { const api = apiCatalog.value.find(item => item.id === apiId); if (!api) return; const doc = await defBaseRedactOutputPolicyService.GetBaseRedactOutputFieldDoc({ api_id: apiId }); const rows: OutputFieldRow[] = []; for (const response of doc.responses ?? []) { if (response.body) collectFields(response.body, "", "", rows, true); } form.field_rows = [...new Map(rows.map(item => [String(item.value), item])).values()]; }
+async function loadResponseFields(apiId: number) { const revision = ++responseFieldsRequestRevision; const rows = await requestResponseFields(apiId); if (revision === responseFieldsRequestRevision) form.field_rows = rows; }
+/** 请求 API 返回字段并转换为表格行。 */
+async function requestResponseFields(apiId: number) { const doc = await defBaseRedactOutputPolicyService.GetBaseRedactOutputFieldDoc({ api_id: apiId }); const rows: OutputFieldRow[] = []; for (const response of doc.responses ?? []) { if (response.body) collectFields(response.body, "", "", rows, true); } return [...new Map(rows.map(item => [String(item.value), item])).values()]; }
 /** 递归收集可配置的返回叶子字段。 */
 function collectFields(schema: BaseApiDocSchema, parentRef: string, parentPath: string, result: OutputFieldRow[], root: boolean) { const schemaRef = normalizeRef(schema.ref); const messageRef = schemaRef || parentRef; const startsNewMessage = Boolean(schemaRef && parentRef && schemaRef !== parentRef); const rootContainer = root || (!parentRef && (schema.name === "body" || schema.name === "body[]")); const path = rootContainer || startsNewMessage ? "" : schema.name ? (parentPath ? `${parentPath}.${schema.name}` : schema.name) : parentPath; if (!schema.children?.length) { const fieldName = path.split(".").pop()?.toLowerCase() ?? ""; if (path && !OUTPUT_SYSTEM_FIELD_NAMES.has(fieldName)) result.push(createFieldRow({ label: `${messageRef}.${path}${schema.description ? ` (${schema.description})` : ""}`, value: `${messageRef}\u0000${path}`, message_ref: messageRef, field_path: path, description: schema.description })); return; } for (const child of schema.children) collectFields(child, messageRef, path, result, false); }
 /** 规范化 OpenAPI 引用名称。 */
 function normalizeRef(ref?: string) { const parts = (ref ?? "").split("/"); return parts[parts.length - 1] || ""; }
 /** 打开新增或编辑弹窗。 */
-async function openDialog(id?: number) { resetForm(); await Promise.all([loadApis(), loadRules()]); if (id !== undefined) { const data = await defBaseRedactOutputPolicyService.GetBaseRedactOutputPolicy({ id }); Object.assign(form, data); const api = apiCatalog.value.find(item => item.operation === data.operation); if (api) { form.service_name = api.service_name; form.api_id = api.id; await loadResponseFields(api.id); const row = form.field_rows.find(item => item.message_ref === data.message_ref && item.field_path === data.field_path); if (row) applyPolicy(row, data); } } dialog.titleKey = id !== undefined ? "common.action.edit_resource" : "common.action.create_resource"; dialog.visible = true; }
+async function openDialog(id?: number) { await dialogRef.value?.open({ load: async () => { const [apis, rules, data] = await Promise.all([requestApis(), requestRules(), id !== undefined ? defBaseRedactOutputPolicyService.GetBaseRedactOutputPolicy({ id }) : Promise.resolve(undefined)]); const api = data ? apis.find(item => item.operation === data.operation) : undefined; const rows = api ? await requestResponseFields(api.id) : []; return { apis, rules, data, rows }; }, commit: ({ apis, rules, data, rows }) => { resetForm(); apiCatalog.value = apis; ruleCatalog.value = rules.catalog; ruleOptions.value = rules.options; if (data) { Object.assign(form, data); const api = apis.find(item => item.operation === data.operation); if (api) { form.service_name = api.service_name; form.api_id = api.id; form.field_rows = rows; const row = form.field_rows.find(item => item.message_ref === data.message_ref && item.field_path === data.field_path); if (row) applyPolicy(row, data); } } dialog.titleKey = id !== undefined ? "common.action.edit_resource" : "common.action.create_resource"; } }); }
 /** 重置弹窗表单。 */
 function resetForm() { dialog.visible = false; dialogRef.value?.resetFields(); Object.assign(form, defaultForm()); }
 /** 保存表格中已配置的全部字段。 */

package/dist/package/src/views/base/redact-rule/index.vue

@@ -212,13 +212,14 @@ async function requestTable(params: PageBaseRedactRuleRequest) {
 
 /** 打开新增或编辑弹窗。 */
 async function openDialog(id?: number) {
-  resetForm();
-  if (id !== undefined) {
-    const data = await defBaseRedactRuleService.GetBaseRedactRule({ id });
-    Object.assign(form, data, { params: parseRuleParams(data.rule_type, data.rule) });
-  }
-  dialog.titleKey = id !== undefined ? "common.action.edit_resource" : "common.action.create_resource";
-  dialog.visible = true;
+  await dialogRef.value?.open({
+    load: () => (id !== undefined ? defBaseRedactRuleService.GetBaseRedactRule({ id }) : undefined),
+    commit: data => {
+      resetForm();
+      if (data) Object.assign(form, data, { params: parseRuleParams(data.rule_type, data.rule) });
+      dialog.titleKey = id !== undefined ? "common.action.edit_resource" : "common.action.create_resource";
+    }
+  });
 }
 
 /** 重置规则编辑表单。 */

package/dist/package/src/views/base/redact-storage-policy/index.vue

@@ -188,6 +188,7 @@ const ruleOptions = ref<ProFormOption[]>([]);
 const ruleCatalog = ref<BaseRedactRule[]>([]);
 const dialog = reactive({ visible: false, titleKey: "common.action.create_resource" });
 const form = reactive<StorageFormState>(defaultForm());
+let columnsRequestRevision = 0;
 const statusOptions = computed<ProFormOption[]>(() => [{ label: t("common.status.enabled"), value: Status.STATUS_ENABLE }, { label: t("common.status.disabled"), value: Status.STATUS_DISABLE }]);
 const configuredFieldCount = computed(() => form.column_rows.filter(row => Boolean(row.rule_id)).length);
 const fields = computed<ProFormField[]>(() => [
@@ -216,25 +217,48 @@ const headerActions = computed<HeaderActionProps[]>(() => [{ label: t("common.ac
 /** 请求入库脱敏策略分页列表。 */
 async function requestTable(params: PageBaseRedactStoragePolicyRequest) { const data = await defBaseRedactStoragePolicyService.PageBaseRedactStoragePolicy(buildPageRequest(params)); return { data: { list: data.base_redact_storage_policies ?? [], total: data.total } }; }
 /** 加载脱敏规则选项。 */
-async function loadRules() { const data = await defBaseRedactRuleService.PageBaseRedactRule({ code: "", name: "", rule_type: "", page_num: 1, page_size: 100 }); ruleCatalog.value = data.base_redact_rules ?? []; ruleOptions.value = ruleCatalog.value.map(item => ({ label: `${item.name} (${item.code})`, value: item.id, disabled: item.status !== Status.STATUS_ENABLE })); }
+async function loadRules() { const rules = await requestRules(); ruleCatalog.value = rules.catalog; ruleOptions.value = rules.options; }
+/** 请求脱敏规则选项。 */
+async function requestRules() { const data = await defBaseRedactRuleService.PageBaseRedactRule({ code: "", name: "", rule_type: "", page_num: 1, page_size: 100 }); const catalog = data.base_redact_rules ?? []; return { catalog, options: catalog.map(item => ({ label: `${item.name} (${item.code})`, value: item.id, disabled: item.status !== Status.STATUS_ENABLE })) }; }
 /** 数据源变更后清空下级选择并加载数据表。 */
-async function handleSourceChange(sourceName: string) { form.source_name = sourceName; form.table_name = ""; form.column_name = ""; form.column_rows = []; tableOptions.value = []; await loadTables(); }
+async function handleSourceChange(sourceName: string) { columnsRequestRevision += 1; form.source_name = sourceName; form.table_name = ""; form.column_name = ""; form.column_rows = []; tableOptions.value = []; await loadTables(); }
 /** 数据表变更后加载字段表格。 */
-async function handleTableChange(tableName: string) { form.table_name = tableName; form.column_name = ""; form.column_rows = []; await loadColumns(); }
+async function handleTableChange(tableName: string) { columnsRequestRevision += 1; form.table_name = tableName; form.column_name = ""; form.column_rows = []; await loadColumns(); }
 /** 加载数据源选项。 */
-async function loadSourceOptions() { const data = await defBaseTableSourceService.OptionBaseTableSource({}); sourceOptions.value = (data.value ?? []).map(value => ({ label: value, value })); }
+async function loadSourceOptions() { sourceOptions.value = await requestSourceOptions(); }
+/** 请求数据源选项。 */
+async function requestSourceOptions() { const data = await defBaseTableSourceService.OptionBaseTableSource({}); return (data.value ?? []).map(value => ({ label: value, value })); }
 /** 加载指定数据源的数据表选项。 */
-async function loadTables(sourceName = form.source_name) { if (!sourceName) { tableOptions.value = []; return; } const data = await defCodeGenTableService.ListCodeGenDatabaseTable({ source_name: sourceName }); tableOptions.value = (data.tables ?? []).map((item: CodeGenDatabaseTable) => ({ label: item.comment ? `${item.comment}（${item.name}）` : item.name, value: item.name })); }
+async function loadTables(sourceName = form.source_name) { tableOptions.value = await requestTables(sourceName); }
+/** 请求指定数据源的数据表选项。 */
+async function requestTables(sourceName: string) { if (!sourceName) return []; const data = await defCodeGenTableService.ListCodeGenDatabaseTable({ source_name: sourceName }); return (data.tables ?? []).map((item: CodeGenDatabaseTable) => ({ label: item.comment ? `${item.comment}（${item.name}）` : item.name, value: item.name })); }
 /** 预加载数据表中文注释，供列表显示。 */
 async function loadTableComments() { await loadSourceOptions(); const comments = new Map<string, string>(); await Promise.all(sourceOptions.value.map(async option => { const sourceName = String(option.value); const data = await defCodeGenTableService.ListCodeGenDatabaseTable({ source_name: sourceName }); for (const item of data.tables ?? []) { if (item.comment) comments.set(`${sourceName}\x00${item.name}`, item.comment); } })); tableCommentMap.value = comments; }
 /** 加载并过滤数据库字段。 */
-async function loadColumns() { if (!form.source_name || !form.table_name) { form.column_rows = []; return; } const data = await defBaseRedactStoragePolicyService.ListBaseRedactStorageColumn({ source_name: form.source_name, table_name: form.table_name }); form.column_rows = (data.columns ?? []).filter(item => !STORAGE_AUDIT_COLUMN_NAMES.has(item.name.toLowerCase())).map(item => createColumnRow({ label: item.name, value: item.name, name: item.name, comment: item.comment, db_type: item.db_type })); }
+async function loadColumns() { const revision = ++columnsRequestRevision; const rows = await requestColumns(form.source_name, form.table_name); if (revision === columnsRequestRevision) form.column_rows = rows; }
+/** 请求并转换数据库字段。 */
+async function requestColumns(sourceName: string, tableName: string) { if (!sourceName || !tableName) return []; const data = await defBaseRedactStoragePolicyService.ListBaseRedactStorageColumn({ source_name: sourceName, table_name: tableName }); return (data.columns ?? []).filter(item => !STORAGE_AUDIT_COLUMN_NAMES.has(item.name.toLowerCase())).map(item => createColumnRow({ label: item.name, value: item.name, name: item.name, comment: item.comment, db_type: item.db_type })); }
 /** 打开新增或编辑弹窗。 */
-async function openDialog(id?: number) { resetForm(); await Promise.all([loadSourceOptions(), loadRules()]); if (id !== undefined) { const data = await defBaseRedactStoragePolicyService.GetBaseRedactStoragePolicy({ id }); Object.assign(form, data); await loadTables(); await loadColumns(); const row = form.column_rows.find(item => item.name === data.column_name); if (row) applyPolicy(row, data); } dialog.titleKey = id !== undefined ? "common.action.edit_resource" : "common.action.create_resource"; dialog.visible = true; }
+async function openDialog(id?: number) { await dialogRef.value?.open({ load: async () => { const [sources, rules, data] = await Promise.all([requestSourceOptions(), requestRules(), id !== undefined ? defBaseRedactStoragePolicyService.GetBaseRedactStoragePolicy({ id }) : Promise.resolve(undefined)]); const sourceName = data?.source_name ?? ""; const tables = await requestTables(sourceName); const columns = data ? await requestColumns(sourceName, data.table_name) : []; return { sources, rules, data, tables, columns }; }, commit: ({ sources, rules, data, tables, columns }) => { resetForm(); sourceOptions.value = sources; tableOptions.value = tables; ruleCatalog.value = rules.catalog; ruleOptions.value = rules.options; if (data) { Object.assign(form, data); form.column_rows = columns; const row = form.column_rows.find(item => item.name === data.column_name); if (row) applyPolicy(row, data); } dialog.titleKey = id !== undefined ? "common.action.edit_resource" : "common.action.create_resource"; } }); }
 /** 重置弹窗表单。 */
 function resetForm() { dialog.visible = false; dialogRef.value?.resetFields(); Object.assign(form, defaultForm()); sourceOptions.value = []; tableOptions.value = []; }
 /** 保存表格中已配置的全部字段。 */
-async function submit() { const valid = await dialogRef.value?.validate(); if (!valid || !form.column_rows.some(row => Boolean(row.rule_id))) return; const rows = form.column_rows.filter(row => Boolean(row.rule_id)); const createPolicies = rows.filter(row => !row.id).map(buildPayload); const updatePolicies = rows.filter(row => Boolean(row.id)).map(buildPayload); const requests: Promise<unknown>[] = []; if (createPolicies.length) requests.push(defBaseRedactStoragePolicyService.CreateBaseRedactStoragePolicy({ base_redact_storage_policy: createPolicies })); if (updatePolicies.length) requests.push(defBaseRedactStoragePolicyService.UpdateBaseRedactStoragePolicy({ base_redact_storage_policy: updatePolicies })); await Promise.all(requests); ElMessage.success(t("system.base.redact_storage_policy.message.batch_save_success", { count: rows.length })); resetForm(); table.value?.getTableList(); }
+async function submit() {
+  const valid = await dialogRef.value?.validate();
+  const rows = form.column_rows.filter(row => Boolean(row.rule_id));
+  const removedIds = form.column_rows.filter(row => row.id > 0 && !row.rule_id).map(row => row.id);
+  if (!valid || (!rows.length && !removedIds.length)) return;
+  const createPolicies = rows.filter(row => !row.id).map(buildPayload);
+  const updatePolicies = rows.filter(row => Boolean(row.id)).map(buildPayload);
+  const requests: Promise<unknown>[] = [];
+  if (createPolicies.length) requests.push(defBaseRedactStoragePolicyService.CreateBaseRedactStoragePolicy({ base_redact_storage_policy: createPolicies }));
+  if (updatePolicies.length) requests.push(defBaseRedactStoragePolicyService.UpdateBaseRedactStoragePolicy({ base_redact_storage_policy: updatePolicies }));
+  if (removedIds.length) requests.push(defBaseRedactStoragePolicyService.DeleteBaseRedactStoragePolicy({ id: removedIds.join(",") }));
+  await Promise.all(requests);
+  ElMessage.success(t("system.base.redact_storage_policy.message.batch_save_success", { count: rows.length }));
+  resetForm();
+  table.value?.getTableList();
+}
 /** 将表格行转换为入库策略请求。 */
 function buildPayload(row: StorageColumnRow): BaseRedactStoragePolicyForm { syncRowParams(row); return { id: row.id, source_name: form.source_name, table_name: form.table_name, column_name: row.name, rule_id: row.rule_id ?? 0, rule_params: row.rule_params, status: form.status, remark: form.remark }; }
 /** 将已保存的策略回填到对应字段行。 */

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

@@ -392,10 +392,13 @@ function refreshTable() {
  * 按目标角色加载可分配的菜单权限树数据。
  */
 async function loadMenuPermOptions(roleId?: number) {
-  const optionBaseMenuRes = await defBaseMenuService.OptionBaseMenu({
-    role_id: roleId
-  });
-  menuPermOptions.value = optionBaseMenuRes.list ?? [];
+  menuPermOptions.value = await requestMenuPermOptions(roleId);
+}
+
+/** 请求指定角色可分配的菜单权限树。 */
+async function requestMenuPermOptions(roleId?: number) {
+  const optionBaseMenuRes = await defBaseMenuService.OptionBaseMenu({ role_id: roleId });
+  return optionBaseMenuRes.list ?? [];
 }
 
 /**
@@ -410,25 +413,29 @@ async function handleFormTenantChange() {
  * 打开角色弹窗。
  */
 async function handleOpenDialog(roleId?: number) {
-  resetForm();
-  await loadTenantOptions();
-  dialog.editing = Boolean(roleId);
-  dialog.visible = true;
-  if (!roleId) {
-    await loadMenuPermOptions();
-    return;
-  }
-
-  const data = await defBaseRoleService.GetBaseRole({ id: roleId });
-  Object.assign(formData, data);
-  await loadMenuPermOptions(roleId);
+  await formDialogRef.value?.open({
+    load: async () => {
+      await loadTenantOptions();
+      const [data, menuOptions] = await Promise.all([
+        roleId ? defBaseRoleService.GetBaseRole({ id: roleId }) : Promise.resolve(undefined),
+        requestMenuPermOptions(roleId)
+      ]);
+      return { data, menuOptions };
+    },
+    commit: ({ data, menuOptions }) => {
+      resetForm();
+      dialog.editing = Boolean(roleId);
+      menuPermOptions.value = menuOptions;
+      if (data) Object.assign(formData, data);
+    }
+  });
 }
 
 /**
  * 关闭角色弹窗并恢复默认表单值。
  */
 function handleCloseDialog() {
-  dialog.visible = false;
+  formDialogRef.value?.close();
   resetForm();
 }
 

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

@@ -329,18 +329,19 @@ function isProtectedManagementTenant(row?: BaseTenant) {
 async function handleOpenDialog(tenantId?: number) {
   resetForm();
   dialog.titleKey = tenantId ? "common.action.edit_resource" : "common.action.create_resource";
-  dialog.visible = true;
-  if (!tenantId) return;
-
-  const data = await defBaseTenantService.GetBaseTenant({ id: tenantId });
-  Object.assign(formData, data);
+  await formDialogRef.value?.open({
+    load: () => (tenantId ? defBaseTenantService.GetBaseTenant({ id: tenantId }) : undefined),
+    commit: data => {
+      if (data) Object.assign(formData, data);
+    }
+  });
 }
 
 /**
  * 关闭租户弹窗并恢复默认表单值。
  */
 function handleCloseDialog() {
-  dialog.visible = false;
+  formDialogRef.value?.close();
   resetForm();
 }