@liujitcn/kratos-admin-system 0.0.51 → 0.0.53

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)
   },
   {

package/dist/package/src/views/tool/code-gen/columns/index.vue

@@ -261,6 +261,7 @@
     </el-card>
 
     <ProDialog
+      ref="optionDialogRef"
       v-model="optionDialog.visible"
       :title="optionDialogTitle"
       width="560px"
@@ -591,6 +592,7 @@ const staticOptions = reactive(new Map<string, CodeGenStaticOption[]>());
 const loadingDictionaries = ref(false);
 const loadingDatabaseTables = ref(false);
 const loadingDatabaseColumns = reactive(new Set<string>());
+const optionDialogRef = ref<InstanceType<typeof ProDialog>>();
 let dictionariesLoaded = false;
 let databaseTablesLoaded = false;
 let columnSortable: Sortable | undefined;
@@ -868,22 +870,39 @@ function handleFormEnabledChange(row: CodeGenColumnView) {
 /** 打开查询、列表或表单自己的选项编辑弹窗。 */
 async function openOptionDialog(row: CodeGenColumnView, scope: CodeGenOptionScope) {
   const config = getCodeGenOptionContainer(row, scope);
-  syncOptionKind(config, scope);
-  optionDialog.scope = scope;
-  optionDialog.columnName = row.name;
-  optionDialog.component = config.component;
-  optionDialog.isJSONColumn = row.db_type.trim().toLowerCase() === "json";
-  optionDialog.cacheKey = `${row.table_id}:${row.name}:${scope}`;
-  optionDialog.option = config.option;
-  optionDialog.formConfig = scope === "form" && config.component === "tree-select" ? row.form_config : null;
-  optionDialog.visible = true;
-  await prepareOptionEditor();
+  const draft = {
+    scope,
+    columnName: row.name,
+    component: config.component,
+    isJSONColumn: row.db_type.trim().toLowerCase() === "json",
+    cacheKey: `${row.table_id}:${row.name}:${scope}`,
+    option: { ...config.option },
+    formConfig:
+      scope === "form" && config.component === "tree-select"
+        ? { ...row.form_config, option: { ...row.form_config.option } }
+        : null
+  } satisfies Omit<CodeGenOptionDialog, "visible">;
+  await optionDialogRef.value?.open({
+    load: async () => {
+      syncOptionKind({ ...config, option: draft.option }, scope);
+      await prepareOptionEditor(draft);
+      return draft;
+    },
+    commit: loaded => {
+      Object.assign(optionDialog, loaded);
+    }
+  });
 }
 
 /** 保存选项配置并关闭弹窗。 */
 function handleSaveOptionDialog() {
   const row = columns.value.find(item => item.name === optionDialog.columnName);
-  if (row) copyCodeGenOptionToEmptyMatches(row, optionDialog.scope);
+  if (row && optionDialog.option) {
+    const config = getCodeGenOptionContainer(row, optionDialog.scope);
+    Object.assign(config.option, optionDialog.option);
+    if (optionDialog.formConfig) Object.assign(row.form_config, optionDialog.formConfig, { option: config.option });
+    copyCodeGenOptionToEmptyMatches(row, optionDialog.scope);
+  }
   optionDialog.visible = false;
 }
 
@@ -894,12 +913,12 @@ function handleOptionDialogClosed() {
 }
 
 /** 按当前选项来源准备弹窗所需数据。 */
-async function prepareOptionEditor() {
-  const option = optionDialog.option;
+async function prepareOptionEditor(context: Pick<CodeGenOptionDialog, "option" | "cacheKey" | "component"> = optionDialog) {
+  const option = context.option;
   if (!option) return;
   if (option.source_type === "static") {
-    if (!staticOptions.has(optionDialog.cacheKey)) {
-      staticOptions.set(optionDialog.cacheKey, parseCodeGenStaticOptions(option.source_value));
+    if (!staticOptions.has(context.cacheKey)) {
+      staticOptions.set(context.cacheKey, parseCodeGenStaticOptions(option.source_value));
     }
     return;
   }
@@ -912,7 +931,7 @@ async function prepareOptionEditor() {
   if (option.source_type === "table") {
     await loadDatabaseTables();
     await loadDatabaseColumns(option.source_value);
-    applyTableOptionDefaultFields(option, optionDialog.component);
+    applyTableOptionDefaultFields(option, context.component);
   }
 }
 

package/dist/package/src/views/tool/code-gen/table/index.vue

@@ -789,33 +789,58 @@ function refreshTable() {
 
 /** 打开新增或编辑弹窗，并加载当前表单所需选项。 */
 async function handleOpenDialog(tableId?: number) {
-  resetForm();
-  await loadSourceOptions();
-  const detail = tableId ? await defCodeGenTableService.GetCodeGenTable({ id: tableId }) : undefined;
-  if (detail) Object.assign(formData, detail);
-  if (!formData.source_name) formData.source_name = String(sourceOptions.value[0]?.value ?? "");
-  const [tableData, menuData, dictionaryData] = await Promise.all([
-    loadDatabaseTables(formData.source_name),
-    defBaseMenuService.TreeBaseMenu({}),
-    defBaseDictService.OptionBaseDict({})
-  ]);
-  databaseTables.value = tableData.tables ?? [];
-  parentMenuOptions.value = convertMenuOptions(menuData.base_menus ?? []);
-  businessModuleItems.value = dictionaryData.base_dicts?.find(item => item.code === "business_module")?.items ?? [];
-  if (detail) {
-    formData.parent_menu_id = detail.parent_menu_id || undefined;
-    formData.left_tree_config ??= createDefaultCodeGenLeftTreeConfig();
-    if (!formData.comment) {
-      formData.comment = databaseTables.value.find(item => item.name === formData.name)?.comment ?? "";
-    }
-    if (!formData.left_tree_config.comment) {
-      formData.left_tree_config.comment =
-        databaseTables.value.find(item => item.name === formData.left_tree_config?.table_name)?.comment ?? "";
+  await formDialogRef.value?.open({
+    load: async () => {
+      await loadSourceOptions();
+      const detail = tableId ? await defCodeGenTableService.GetCodeGenTable({ id: tableId }) : undefined;
+      const sourceName = detail?.source_name || String(sourceOptions.value[0]?.value ?? "");
+      const [tableData, menuData, dictionaryData] = await Promise.all([
+        loadDatabaseTables(sourceName),
+        defBaseMenuService.TreeBaseMenu({}),
+        defBaseDictService.OptionBaseDict({})
+      ]);
+      const tables = tableData.tables ?? [];
+      const form = {
+        ...createDefaultCodeGenTableForm(),
+        ...(detail ?? {}),
+        source_name: sourceName,
+        parent_menu_id: detail?.parent_menu_id || undefined,
+        left_tree_config: detail?.left_tree_config
+          ? { ...detail.left_tree_config }
+          : createDefaultCodeGenLeftTreeConfig()
+      };
+      if (detail) {
+        if (!form.comment) form.comment = tables.find(item => item.name === form.name)?.comment ?? "";
+        if (!form.left_tree_config.comment) {
+          form.left_tree_config.comment = tables.find(item => item.name === form.left_tree_config?.table_name)?.comment ?? "";
+        }
+      }
+      const [columns, leftTreeColumns] = detail
+        ? await Promise.all([
+            requestDatabaseColumns(form.source_name, form.name),
+            form.page_type === "left_tree" ? requestDatabaseColumns(form.source_name, form.left_tree_config.table_name) : Promise.resolve([])
+          ])
+        : [[], []];
+      return {
+        form,
+        tables,
+        menuOptions: convertMenuOptions(menuData.base_menus ?? []),
+        businessModuleItems: dictionaryData.base_dicts?.find(item => item.code === "business_module")?.items ?? [],
+        columns,
+        leftTreeColumns
+      };
+    },
+    commit: ({ form, tables, menuOptions, businessModuleItems: items, columns, leftTreeColumns }) => {
+      resetForm();
+      Object.assign(formData, form);
+      databaseTables.value = tables;
+      parentMenuOptions.value = menuOptions;
+      businessModuleItems.value = items;
+      databaseColumns.value = columns;
+      leftTreeDatabaseColumns.value = leftTreeColumns;
+      dialog.editing = Boolean(tableId);
     }
-    await Promise.all([loadDatabaseColumns(databaseColumns, formData.source_name, formData.name), loadLeftTreeDatabaseColumns()]);
-    dialog.editing = true;
-  }
-  dialog.visible = true;
+  });
 }
 
 /** 加载已初始化的数据源选项。 */
@@ -971,12 +996,14 @@ async function loadDatabaseTables(sourceName: string) {
 
 /** 查询指定数据源的数据表字段选项。 */
 async function loadDatabaseColumns(target: { value: CodeGenDatabaseColumn[] }, sourceName: string, tableName: string) {
-  if (!tableName) {
-    target.value = [];
-    return;
-  }
+  target.value = await requestDatabaseColumns(sourceName, tableName);
+}
+
+/** 请求指定数据源和数据表的字段选项。 */
+async function requestDatabaseColumns(sourceName: string, tableName: string) {
+  if (!tableName) return [];
   const data = await defCodeGenColumnService.ListCodeGenDatabaseColumn({ source_name: sourceName, table_name: tableName });
-  target.value = data.columns ?? [];
+  return data.columns ?? [];
 }
 
 /** 查询左树来源表字段选项。 */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@liujitcn/kratos-admin-system",
   "private": false,
-  "version": "0.0.51",
+  "version": "0.0.53",
   "type": "module",
   "description": "kratos-admin system management module",
   "license": "MIT",
@@ -16,7 +16,7 @@
     "sortablejs": "^1.15.2",
     "swagger-ui-dist": "^5.32.15",
     "vue-element-plus-x": "^2.0.3",
-    "@liujitcn/kratos-admin-core": "0.0.51"
+    "@liujitcn/kratos-admin-core": "0.0.53"
   },
   "peerDependencies": {
     "@element-plus/icons-vue": "^2.3.1",