@liujitcn/kratos-admin-system 0.0.38 → 0.0.40

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

@@ -15,8 +15,8 @@
       v-model="dialog.visible"
       ref="formDialogRef"
       :title="dialogTitle"
-      width="920px"
-      label-width="240px"
+      width="min(1440px, calc(100vw - 32px))"
+      label-width="180px"
       top="4vh"
       :model="formData"
       :fields="formFields"
@@ -24,6 +24,7 @@
       :confirm-loading="saving"
       :gutter="16"
       :col-span="12"
+      :form-props="{ class: 'code-gen-table-form' }"
       @confirm="handleSubmit"
       @close="handleCloseDialog"
     >
@@ -31,8 +32,14 @@
         <CodeGenLocaleEditor
           :model-value="formData.i18n_config"
           :source-comment="formData.comment"
-          :show-left-tree-comment="formData.page_type === 'left_tree'"
-          :source-left-tree-comment="formData.left_tree_config?.comment"
+          @update:model-value="value => (formData.i18n_config = value)"
+        />
+      </template>
+      <template #leftTreeI18nConfig>
+        <CodeGenLocaleEditor
+          :model-value="formData.i18n_config"
+          :source-comment="formData.left_tree_config?.comment"
+          field="left_tree_comment"
           @update:model-value="value => (formData.i18n_config = value)"
         />
       </template>
@@ -49,7 +56,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed, nextTick, reactive, ref } from "vue";
+import { computed, h, onBeforeUnmount, nextTick, reactive, ref } from "vue";
 import { useRouter } from "vue-router";
 import {
   CirclePlus,
@@ -88,8 +95,11 @@ import { CodeGenTableStatus } from "@liujitcn/kratos-admin-system/rpc/system/adm
 import { buildPageRequest, normalizeSelectedIds } from "@liujitcn/kratos-admin-core/table";
 import { t } from "@liujitcn/kratos-admin-core";
 import CodeGenProgressDialog from "../components/CodeGenProgressDialog.vue";
+import { loadEnabledBaseLanguages } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_language";
 import CodeGenLocaleEditor from "../components/CodeGenLocaleEditor.vue";
+import CodeGenGenerateConfirm from "../components/CodeGenGenerateConfirm.vue";
 import {
+  withCodeGenLocaleDefaults,
   codeGenPageTypeOptions,
   codeGenTableRules,
   createDefaultCodeGenLeftTreeConfig,
@@ -222,20 +232,13 @@ const formFields = computed<ProFormField[]>(() => [
   },
   {
     prop: "comment",
+    suffixSlotName: "tableI18nConfig",
     label: t("system.code.gen.table.field.comment"),
     component: "input",
     colSpan: 24,
     labelTooltip: t("system.code.gen.table.tooltip.comment"),
     props: { placeholder: t("system.code.gen.table.placeholder.comment") }
   },
-  {
-    prop: "i18n_config",
-    label: t("system.code.gen.i18n.field.i18ns"),
-    component: "slot",
-    slotName: "tableI18nConfig",
-    colSpan: 24,
-    labelTooltip: t("system.code.gen.i18n.tooltip.table")
-  },
   {
     prop: "business_module",
     label: t("system.code.gen.table.field.business_module"),
@@ -263,6 +266,7 @@ const formFields = computed<ProFormField[]>(() => [
     prop: "page_type",
     label: t("system.code.gen.table.field.page_type"),
     component: "segmented",
+    colSpan: 16,
     options: pageTypeOptions.value,
     labelTooltip: t("system.code.gen.table.tooltip.page_type"),
     props: { onChange: handlePageTypeChange }
@@ -312,6 +316,7 @@ const formFields = computed<ProFormField[]>(() => [
   },
   {
     prop: "left_tree_config.comment",
+    suffixSlotName: "leftTreeI18nConfig",
     label: t("system.code.gen.table.field.left_tree_comment"),
     component: "input",
     labelTooltip: t("system.code.gen.table.tooltip.left_tree_comment"),
@@ -387,9 +392,9 @@ const formFields = computed<ProFormField[]>(() => [
     label: t("system.code.gen.table.field.gen_backend"),
     component: "switch",
     labelTooltip: t("system.code.gen.table.tooltip.gen_backend"),
-    // 三个生成开关始终从新行开始并排展示。
+    // 生成开关按两列排列，减少表单横向空置并保持开关内容紧凑。
     rowBreakBefore: true,
-    colSpan: 8,
+    colSpan: 12,
     props: { activeText: t("system.code.gen.value.generate"), inactiveText: t("system.code.gen.value.skip") }
   },
   {
@@ -397,14 +402,15 @@ const formFields = computed<ProFormField[]>(() => [
     label: t("system.code.gen.table.field.gen_frontend"),
     component: "switch",
     labelTooltip: t("system.code.gen.table.tooltip.gen_frontend"),
-    colSpan: 8,
+    colSpan: 12,
     props: { activeText: t("system.code.gen.value.generate"), inactiveText: t("system.code.gen.value.skip") }
   },
   {
     prop: "gen_sql",
     label: t("system.code.gen.table.field.gen_sql"),
     component: "switch",
-    colSpan: 8,
+    colSpan: 12,
+    rowBreakBefore: false,
     labelTooltip: t("system.code.gen.table.tooltip.gen_sql"),
     props: { activeText: t("system.code.gen.value.generate"), inactiveText: t("system.code.gen.value.skip") }
   },
@@ -412,7 +418,7 @@ const formFields = computed<ProFormField[]>(() => [
     prop: "status",
     label: t("system.code.gen.table.field.status"),
     component: "dict",
-    colSpan: 24,
+    colSpan: 12,
     props: { code: "code_gen_table_status", codeType: "number", type: "radio" },
     labelTooltip: t("system.code.gen.table.tooltip.status")
   },
@@ -595,6 +601,37 @@ async function handleOpenCodePreview(tableId: number) {
   await router.push(`/code/gen/code/preview/${tableId}`);
 }
 
+let releaseGenerationHotUpdates: (() => void) | undefined;
+
+/** 等待开发服务器暂停热更新，避免生成文件的中间状态反复刷新页面。 */
+async function holdGenerationHotUpdates() {
+  const hot = import.meta.hot;
+  if (!hot || releaseGenerationHotUpdates) return;
+  await new Promise<void>(resolve => {
+    const held = () => {
+      clearTimeout(timeout);
+      hot.off("admin:codegen-held", held);
+      releaseGenerationHotUpdates = () => hot.send("admin:codegen-release", {});
+      resolve();
+    };
+    const timeout = setTimeout(() => {
+      hot.off("admin:codegen-held", held);
+      hot.send("admin:codegen-release", {});
+      resolve();
+    }, 2000);
+    hot.on("admin:codegen-held", held);
+    hot.send("admin:codegen-hold", {});
+  });
+}
+
+/** 任务结束且结果弹窗关闭后恢复开发热更新。 */
+function releaseGenerationUpdates() {
+  releaseGenerationHotUpdates?.();
+  releaseGenerationHotUpdates = undefined;
+}
+
+onBeforeUnmount(releaseGenerationUpdates);
+
 /** 创建单项或批量代码生成任务。 */
 async function handleGenerate(selected: CodeGenGenerateTarget) {
   const tables = Array.isArray(selected) ? selected : [selected];
@@ -608,7 +645,7 @@ async function handleGenerate(selected: CodeGenGenerateTarget) {
     return;
   }
   generating.value = true;
-  let missingI18ns: string[] = [];
+  let missingI18ns: Array<{ name: string; items: string[] }> = [];
   try {
     const previewEntries = await Promise.all(
       tables.map(async table => ({
@@ -616,44 +653,31 @@ async function handleGenerate(selected: CodeGenGenerateTarget) {
         preview: await defCodeGenService.PreviewCodeGen({ table_id: table.id, output_paths: undefined })
       }))
     );
-    missingI18ns = previewEntries.flatMap(({ table, preview }) =>
-      (preview.missing_i18ns ?? []).map(item => (tables.length === 1 ? item : `${table.name}: ${item}`))
-    );
+    missingI18ns = previewEntries
+      .map(({ table, preview }) => ({ name: table.name, items: preview.missing_i18ns ?? [] }))
+      .filter(group => group.items.length);
   } finally {
     generating.value = false;
   }
-  if (missingI18ns.length) {
-    try {
-      await ElMessageBox.alert(
-        t("system.code.gen.preview.message.missing_i18ns", {
-          items: missingI18ns.join(t("system.code.gen.preview.value.list_separator"))
-        }),
-        t("common.title.warning"),
-        {
-          confirmButtonText: t("common.action.close"),
-          type: "warning"
-        }
-      );
-    } catch {
-      // 关闭提示框与点击关闭按钮语义一致。
-    }
-    return;
-  }
   const message =
     tables.length === 1
       ? t("system.code.gen.table.dialog.generate_one", { name: tables[0].name })
       : t("system.code.gen.table.dialog.generate_batch", { count: tables.length });
   try {
-    await ElMessageBox.confirm(message, t("common.title.notice"), {
-      confirmButtonText: t("common.action.confirm"),
+    const content = h(CodeGenGenerateConfirm, { message, groups: missingI18ns });
+    await ElMessageBox.confirm(content, t("system.code.gen.table.dialog.generate_title"), {
+      confirmButtonText: t("system.code.gen.action.generate"),
       cancelButtonText: t("common.action.cancel"),
-      type: "warning"
+      customClass: "code-gen-generate-confirm",
+      showClose: true,
+      closeOnClickModal: false
     });
   } catch {
     return;
   }
   generating.value = true;
   try {
+    await holdGenerationHotUpdates();
     const data = await defCodeGenService.StartCodeGenTask({
       table_ids: tables.map(table => table.id)
     });
@@ -665,6 +689,7 @@ async function handleGenerate(selected: CodeGenGenerateTarget) {
     handleProgressDialogVisibleChange(true);
   } catch (error) {
     generating.value = false;
+    releaseGenerationUpdates();
     throw error;
   }
 }
@@ -710,11 +735,13 @@ function handleProgressDialogVisibleChange(visible: boolean) {
     return;
   }
   window.sessionStorage.removeItem(codeGenProgressDialogVisibleStorageKey);
+  if (!generating.value) releaseGenerationUpdates();
 }
 
 /** 生成任务结束后刷新列表。 */
 function handleProgressCompleted() {
   generating.value = false;
+  if (!progressDialogVisible.value) releaseGenerationUpdates();
   window.sessionStorage.removeItem(codeGenProgressDialogVisibleStorageKey);
   progressSelectedTableIds.value = [];
   proTable.value?.clearSelection();
@@ -752,6 +779,7 @@ function removeProgressSelectedTableIds() {
 
 /** 请求代码生成表配置列表。 */
 async function requestCodeGenTable(params: PageCodeGenTableRequest) {
+  await loadEnabledBaseLanguages();
   const data = await defCodeGenTableService.PageCodeGenTable(buildPageRequest(params));
   return { data: { ...data, list: data.code_gen_tables ?? [] } };
 }
@@ -862,7 +890,15 @@ async function handleSubmit() {
   if (!valid) return;
   if (!formData.parent_menu_id) return;
 
-  const payload: CodeGenTableForm = { ...formData, parent_menu_id: formData.parent_menu_id };
+  const payload: CodeGenTableForm = {
+    ...formData,
+    parent_menu_id: formData.parent_menu_id,
+    i18n_config: withCodeGenLocaleDefaults(
+      formData.i18n_config,
+      formData.comment,
+      formData.page_type === "left_tree" ? formData.left_tree_config?.comment : ""
+    )
+  };
   saving.value = true;
   try {
     if (formData.id) {
@@ -970,14 +1006,14 @@ function resolveDefaultColumn(columns: CodeGenDatabaseColumn[], columnName: stri
   return columns.some(item => item.name === columnName) ? columnName : "";
 }
 
-/** 转换菜单树为 ProForm 树形选择项。 */
+/** 转换菜单树为 ProForm 树形选择项，仅允许八位编号的一至三级目录承载生成页面。 */
 function convertMenuOptions(options: BaseMenu[]): ProFormOption[] {
   return options
     .filter(item => item.type === BaseMenuType.BASE_MENU_TYPE_FOLDER)
     .map(item => ({
       label: item.meta?.title || item.name || item.path,
       value: item.id,
-      disabled: item.id < 100 || item.id > 99999,
+      disabled: item.id < 10000000 || item.id > 99999999 || item.id % 100 !== 0,
       children: convertMenuOptions(item.children ?? [])
     }));
 }
@@ -1022,6 +1058,25 @@ function ensureLeftTreeConfig() {
 </script>
 
 <style scoped lang="scss">
+@media (max-width: 767px) {
+  :deep(.code-gen-table-form) {
+    .el-col {
+      flex: 0 0 100%;
+      max-width: 100%;
+    }
+    .el-form-item {
+      flex-direction: column;
+    }
+    .el-form-item__label {
+      justify-content: flex-start;
+      width: auto !important;
+    }
+    .el-form-item__content {
+      margin-left: 0 !important;
+    }
+  }
+}
+
 /* 固定操作列表头与普通表头使用同一主题背景，并保持行内操作单行展示。 */
 :deep(.code-gen-table) {
   --el-table-header-bg-color: var(--el-fill-color-light);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@liujitcn/kratos-admin-system",
   "private": false,
-  "version": "0.0.38",
+  "version": "0.0.40",
   "type": "module",
   "description": "kratos-admin system management module",
   "license": "MIT",
@@ -11,11 +11,12 @@
     "url": "git@github.com:liujitcn/kratos-admin.git"
   },
   "dependencies": {
+    "@lucide/vue": "^1.39.0",
     "@microsoft/fetch-event-source": "^2.0.1",
     "sortablejs": "^1.15.2",
     "swagger-ui-dist": "^5.32.9",
     "vue-element-plus-x": "^2.0.3",
-    "@liujitcn/kratos-admin-core": "0.0.38"
+    "@liujitcn/kratos-admin-core": "0.0.40"
   },
   "peerDependencies": {
     "@element-plus/icons-vue": "^2.3.1",

package/dist/package/declarations/src/config/database-backup.d.ts

@@ -1,12 +0,0 @@
-import type { RuntimeConfigDefinition } from "./types";
-/** 数据库备份配置模型。 */
-export interface DatabaseBackupConfig {
-    enabled: boolean;
-    integrity_key: string;
-    encryption_key: string;
-    directory: string;
-    gzip: boolean;
-    retention_count: number;
-}
-/** 数据库备份配置定义。 */
-export declare const databaseBackupConfig: RuntimeConfigDefinition<DatabaseBackupConfig>;

package/dist/package/src/config/database-backup.ts

@@ -1,57 +0,0 @@
-import { Coin } from "@element-plus/icons-vue";
-import type { RuntimeConfigDefinition } from "./types";
-
-/** 数据库备份配置模型。 */
-export interface DatabaseBackupConfig {
-  enabled: boolean;
-  integrity_key: string;
-  encryption_key: string;
-  directory: string;
-  gzip: boolean;
-  retention_count: number;
-}
-
-/** 数据库备份配置定义。 */
-export const databaseBackupConfig: RuntimeConfigDefinition<DatabaseBackupConfig> = {
-  key: "databaseBackup",
-  titleKey: "system.base.runtime_config.backup.title",
-  descriptionKey: "system.base.runtime_config.backup.description",
-  icon: Coin,
-  createModel: () => ({
-    enabled: false,
-    integrity_key: "",
-    encryption_key: "",
-    directory: "./backups",
-    gzip: true,
-    retention_count: 7
-  }),
-  fields: [
-    { prop: "enabled", labelKey: "system.base.runtime_config.field.enabled", component: "switch" },
-    {
-      prop: "integrity_key",
-      labelKey: "system.base.runtime_config.field.integrity_key",
-      component: "password",
-      props: { showPassword: true, autocomplete: "new-password" }
-    },
-    {
-      prop: "encryption_key",
-      labelKey: "system.base.runtime_config.field.encryption_key",
-      component: "password",
-      props: { showPassword: true, autocomplete: "new-password" }
-    },
-    {
-      prop: "directory",
-      labelKey: "system.base.runtime_config.field.directory",
-      component: "input",
-      rules: [{ required: true, messageKey: "system.base.runtime_config.validation.directory", trigger: "blur" }]
-    },
-    { prop: "gzip", labelKey: "system.base.runtime_config.field.gzip", component: "switch" },
-    {
-      prop: "retention_count",
-      labelKey: "system.base.runtime_config.field.retention_count",
-      component: "input-number",
-      props: { min: 1, max: 1000, controls: true },
-      rules: [{ type: "number", min: 1, messageKey: "system.base.runtime_config.validation.retention_count", trigger: "blur" }]
-    }
-  ]
-};