@liujitcn/kratos-admin-system 0.0.52 → 0.0.54

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();
 }
 

package/dist/package/src/views/base/tenant-project-grant/index.vue

@@ -208,22 +208,33 @@ async function requestProjectGrantTable(params: Record<string, unknown>) {
 
 /** 打开项目授权新增或编辑弹窗。 */
 async function handleOpenDialog(row?: BaseTenantProjectGrant) {
-  resetForm();
-  dialog.editing = Boolean(row);
-  dialog.titleKey = row ? "common.action.edit_resource" : "common.action.create_resource";
   loading.value = true;
   try {
-    await loadTenantOptions(true);
-    if (!isDefaultTenant.value) formData.tenant_id = Number(tenantOptions.value[0]?.value) || undefined;
-    if (row) {
-      formData.tenant_id = row.tenant_id;
-      formData.subject_type = row.subject_type;
-      formData.subject_id = row.subject_id;
-      formData.all = row.project_id.length === 1 && row.project_id[0] === 0;
-      formData.project_id = formData.all ? [] : [...row.project_id];
-    }
-    await Promise.all([loadProjectOptions(), loadSubjectOptions()]);
-    dialog.visible = true;
+    await formDialogRef.value?.open({
+      load: async () => {
+        await loadTenantOptions(true);
+        const nextForm = {
+          tenant_id: row?.tenant_id ?? (isDefaultTenant.value ? undefined : Number(tenantOptions.value[0]?.value) || undefined),
+          subject_type: row?.subject_type ?? DEFAULT_SUBJECT_TYPE,
+          subject_id: row?.subject_id,
+          project_id: row && !(row.project_id.length === 1 && row.project_id[0] === 0) ? [...row.project_id] : [],
+          all: Boolean(row && row.project_id.length === 1 && row.project_id[0] === 0)
+        } satisfies ProjectGrantFormState;
+        const [projects, subjects] = await Promise.all([
+          requestProjectOptions(nextForm.tenant_id),
+          requestSubjectOptions(nextForm.tenant_id, nextForm.subject_type)
+        ]);
+        return { nextForm, projects, subjects };
+      },
+      commit: ({ nextForm, projects, subjects }) => {
+        resetForm();
+        dialog.editing = Boolean(row);
+        dialog.titleKey = row ? "common.action.edit_resource" : "common.action.create_resource";
+        Object.assign(formData, nextForm);
+        projectOptions.value = projects;
+        subjectOptions.value = subjects;
+      }
+    });
   } finally {
     loading.value = false;
   }
@@ -231,28 +242,34 @@ async function handleOpenDialog(row?: BaseTenantProjectGrant) {
 
 /** 加载目标租户项目选项。 */
 async function loadProjectOptions() {
-  projectOptions.value = formData.tenant_id
-    ? (await defBaseTenantProjectService.OptionBaseTenantProject({ tenant_id: toRequestTenantId(formData.tenant_id) })).list ?? []
-    : [];
+  projectOptions.value = await requestProjectOptions(formData.tenant_id);
+}
+
+/** 请求目标租户项目选项。 */
+async function requestProjectOptions(tenantId?: number) {
+  if (!tenantId) return [];
+  return (await defBaseTenantProjectService.OptionBaseTenantProject({ tenant_id: toRequestTenantId(tenantId) })).list ?? [];
 }
 
 /** 根据授权类型加载岗位、角色、部门或用户主体选项。 */
 async function loadSubjectOptions() {
-  subjectOptions.value = [];
-  if (!formData.tenant_id || formData.subject_type === BaseTenantProjectGrantSubjectType.BASE_TENANT_PROJECT_GRANT_SUBJECT_TYPE_UNSPECIFIED) return;
-  switch (formData.subject_type) {
+  subjectOptions.value = await requestSubjectOptions(formData.tenant_id, formData.subject_type);
+}
+
+/** 请求指定租户和主体类型的主体选项。 */
+async function requestSubjectOptions(tenantId: number | undefined, subjectType: BaseTenantProjectGrantSubjectType) {
+  if (!tenantId || subjectType === BaseTenantProjectGrantSubjectType.BASE_TENANT_PROJECT_GRANT_SUBJECT_TYPE_UNSPECIFIED) return [];
+  switch (subjectType) {
     case BaseTenantProjectGrantSubjectType.BASE_TENANT_PROJECT_GRANT_SUBJECT_TYPE_POST:
-      subjectOptions.value = (await defBasePostService.OptionBasePost({ tenant_id: formData.tenant_id })).list ?? [];
-      return;
+      return (await defBasePostService.OptionBasePost({ tenant_id: tenantId })).list ?? [];
     case BaseTenantProjectGrantSubjectType.BASE_TENANT_PROJECT_GRANT_SUBJECT_TYPE_ROLE:
-      subjectOptions.value = (await defBaseRoleService.OptionBaseRole({ tenant_id: formData.tenant_id })).list ?? [];
-      return;
+      return (await defBaseRoleService.OptionBaseRole({ tenant_id: tenantId })).list ?? [];
     case BaseTenantProjectGrantSubjectType.BASE_TENANT_PROJECT_GRANT_SUBJECT_TYPE_DEPT:
-      subjectOptions.value = ((await defBaseDeptService.OptionBaseDept({ tenant_id: formData.tenant_id })).list ?? []) as unknown as ProFormOption[];
-      return;
+      return ((await defBaseDeptService.OptionBaseDept({ tenant_id: tenantId })).list ?? []) as unknown as ProFormOption[];
     case BaseTenantProjectGrantSubjectType.BASE_TENANT_PROJECT_GRANT_SUBJECT_TYPE_USER:
-      subjectOptions.value = (await defBaseUserService.OptionBaseUser({ keyword: "", tenant_id: formData.tenant_id })).list ?? [];
+      return (await defBaseUserService.OptionBaseUser({ keyword: "", tenant_id: tenantId })).list ?? [];
   }
+  return [];
 }
 
 /** 切换目标租户时重置主体和项目选择。 */

package/dist/package/src/views/base/user/components/dept-tree.vue

@@ -22,7 +22,7 @@
 </template>
 
 <script setup lang="ts">
-import { onBeforeMount, ref, watchEffect } from "vue";
+import { nextTick, onBeforeMount, ref, watch } from "vue";
 import { useVModel } from "@vueuse/core";
 import { ElTree } from "element-plus";
 import { defBaseDeptService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_dept";
@@ -43,14 +43,9 @@ const emits = defineEmits(["nodeClick"]);
 
 const baseDeptId = useVModel(props, "modelValue", emits);
 
-watchEffect(
-  () => {
-    baseDeptTreeRef.value?.filter(name.value);
-  },
-  {
-    flush: "post" // watchEffect会在DOM挂载或者更新之前就会触发，此属性控制在DOM元素更新后运行
-  }
-);
+watch([name, baseDeptList], () => {
+  void nextTick(() => baseDeptTreeRef.value?.filter(name.value));
+}, { flush: "post" });
 
 /**
  * 部门筛选

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

@@ -169,7 +169,7 @@ const formData = reactive<BaseUserFormState>({
   /** 密码 */
   pwd: "",
   /** 性别 */
-  gender: 3,
+  gender: 1,
   /** 头像 */
   avatar: "",
   /** 用户状态 */
@@ -649,23 +649,30 @@ function refreshTable() {
  * 加载用户表单依赖的角色和部门选项。
  */
 async function loadFormOptions() {
+  const options = await requestFormOptions();
+  baseRoleOptions.value = options.roleOptions;
+  updateUndeletableRoleIds(baseRoleOptions.value);
+  basePostOptions.value = options.postOptions;
+  basedDeptOptions.value = options.deptOptions;
+}
+
+/** 请求用户表单依赖的角色和部门选项。 */
+async function requestFormOptions(tenantId = formData.tenant_id) {
   // 默认租户必须先选择目标租户，避免角色和部门选项跨租户混用。
-  if (isDefaultTenant.value && !formData.tenant_id) {
-    baseRoleOptions.value = [];
-    basePostOptions.value = [];
-    basedDeptOptions.value = [];
-    return;
+  if (isDefaultTenant.value && !tenantId) {
+    return { roleOptions: [], postOptions: [], deptOptions: [] };
   }
-  const tenantId = toRequestTenantId(formData.tenant_id);
+  const requestTenantId = toRequestTenantId(tenantId);
   const [optionBaseRoleResponse, optionBaseDeptResponse, optionBasePostResponse] = await Promise.all([
-    defBaseRoleService.OptionBaseRole({ tenant_id: tenantId }),
-    defBaseDeptService.OptionBaseDept({ tenant_id: tenantId }),
-    defBasePostService.OptionBasePost({ tenant_id: tenantId })
+    defBaseRoleService.OptionBaseRole({ tenant_id: requestTenantId }),
+    defBaseDeptService.OptionBaseDept({ tenant_id: requestTenantId }),
+    defBasePostService.OptionBasePost({ tenant_id: requestTenantId })
   ]);
-  baseRoleOptions.value = optionBaseRoleResponse.list || [];
-  updateUndeletableRoleIds(baseRoleOptions.value);
-  basePostOptions.value = optionBasePostResponse.list || [];
-  basedDeptOptions.value = optionBaseDeptResponse.list || [];
+  return {
+    roleOptions: optionBaseRoleResponse.list || [],
+    postOptions: optionBasePostResponse.list || [],
+    deptOptions: optionBaseDeptResponse.list || []
+  };
 }
 
 /**
@@ -682,18 +689,22 @@ async function handleFormTenantChange() {
  * 打开用户弹窗，并加载角色和部门下拉选项。
  */
 async function handleOpenDialog(id?: number) {
-  resetForm();
-  await loadTenantOptions();
-  dialog.editing = Boolean(id);
-  dialog.visible = true;
-  if (!id) {
-    await loadFormOptions();
-    return;
-  }
-
-  defBaseUserService.GetBaseUser({ id }).then(async data => {
-    Object.assign(formData, data);
-    await loadFormOptions();
+  await formDialogRef.value?.open({
+    load: async () => {
+      await loadTenantOptions();
+      const data = id ? await defBaseUserService.GetBaseUser({ id }) : undefined;
+      const options = await requestFormOptions(data?.tenant_id);
+      return { data, options };
+    },
+    commit: ({ data, options }) => {
+      resetForm();
+      dialog.editing = Boolean(id);
+      if (data) Object.assign(formData, data);
+      baseRoleOptions.value = options.roleOptions;
+      updateUndeletableRoleIds(baseRoleOptions.value);
+      basePostOptions.value = options.postOptions;
+      basedDeptOptions.value = options.deptOptions;
+    }
   });
 }
 
@@ -701,7 +712,7 @@ async function handleOpenDialog(id?: number) {
  * 关闭用户弹窗并恢复默认表单值。
  */
 function handleCloseDialog() {
-  dialog.visible = false;
+  formDialogRef.value?.close();
   resetForm();
 }
 
@@ -724,7 +735,7 @@ function resetForm() {
   formData.id_type = BaseUserIDType.BASE_USER_ID_TYPE_UNSPECIFIED;
   formData.id_code = "";
   formData.pwd = "";
-  formData.gender = 3;
+  formData.gender = 1;
   formData.avatar = "";
   formData.status = Status.STATUS_ENABLE;
   formData.remark = "";

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

@@ -1,7 +1,7 @@
 <template>
   <div class="table-box">
     <ProTable ref="proTable" row-key="id" :columns="columns" :header-actions="headerActions" :request-api="requestTable" />
-    <ProDialog v-model="detailVisible" :title="detail?.title" width="720px" destroy-on-close :show-footer="false">
+    <ProDialog ref="detailDialogRef" v-model="detailVisible" :title="detail?.title" width="720px" destroy-on-close :show-footer="false">
       <div v-if="detail" class="message-detail">
         <div class="message-meta">
           <span class="message-category" :style="{ color: detail.category_color || undefined }">
@@ -56,6 +56,7 @@ defineOptions({ name: "NotificationInbox", inheritAttrs: false });
 
 const proTable = ref<ProTableInstance>();
 const router = useRouter();
+const detailDialogRef = ref<InstanceType<typeof ProDialog>>();
 const detailVisible = ref(false);
 const detail = ref<Notification>();
 const categoryOptions = ref<NotificationCategory[]>([]);
@@ -177,8 +178,12 @@ async function loadCategoryOptions() {
 
 /** 打开消息详情并标记已读。 */
 async function openDetail(row: Notification) {
-  detail.value = await defNotificationService.GetNotification({ id: row.id });
-  detailVisible.value = true;
+  await detailDialogRef.value?.open({
+    load: () => defNotificationService.GetNotification({ id: row.id }),
+    commit: data => {
+      detail.value = data;
+    }
+  });
   if (!row.read_at) {
     await defNotificationService.MarkNotificationRead({ ids: [row.id] });
     proTable.value?.getTableList();

package/dist/package/src/views/profile/components/base.vue

@@ -120,7 +120,7 @@ const submitLoading = ref(false);
 const avatarSrc = ref(defaultAvatar);
 const accountForm = reactive<Pick<UserProfileForm, "nick_name" | "gender" | "email" | "id_type" | "id_code">>({
   nick_name: "",
-  gender: 3,
+  gender: 1,
   email: "",
   id_type: BaseUserIDType.BASE_USER_ID_TYPE_UNSPECIFIED,
   id_code: ""

package/dist/package/src/views/profile/index.vue

@@ -102,7 +102,7 @@ const userProfileForm = reactive<UserProfileForm>({
   user_name: "",
   nick_name: "",
   avatar: "",
-  gender: 3,
+  gender: 1,
   phone: "",
   email: "",
   id_type: 0,

package/dist/package/src/views/tool/cache/index.vue

@@ -95,7 +95,7 @@ const columns = computed<ColumnProps[]>(() => [
     prop: "key",
     label: t("system.cache.field.key"),
     minWidth: 280,
-    search: { el: "input", props: { clearable: true } },
+    search: { el: "input", key: "keyword", props: { clearable: true } },
     render: scope => h("code", { class: "cache-key-cell", title: scope.row.key }, scope.row.key)
   },
   {