@liujitcn/kratos-admin-system 0.0.52 → 0.0.54

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.52",
+  "version": "0.0.54",
   "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.52"
+    "@liujitcn/kratos-admin-core": "0.0.54"
   },
   "peerDependencies": {
     "@element-plus/icons-vue": "^2.3.1",