@liujitcn/kratos-admin-system 0.0.39 → 0.0.41

package/dist/package/src/views/tool/code-gen/config.ts

@@ -1,3 +1,5 @@
+import { getEditableLanguageOptions } from "@liujitcn/kratos-admin-system/components/dynamicI18n";
+import type { CodeGenLocaleConfig } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_i18n";
 import type { FormRules } from "element-plus";
 import { t } from "@liujitcn/kratos-admin-core";
 import type { ProFormComponentType, ProFormOption } from "@liujitcn/kratos-admin-core/components/ProForm/interface";
@@ -122,7 +124,9 @@ export function codeGenTableRules(): FormRules {
       { required: true, type: "number", min: 1, message: t("system.code.gen.validation.parent_menu_required"), trigger: "change" }
     ],
     page_type: [{ required: true, max: 32, message: t("system.code.gen.validation.page_type_required"), trigger: "change" }],
-    parent_column: [{ required: true, max: 64, message: t("system.code.gen.validation.parent_column_required"), trigger: "change" }],
+    parent_column: [
+      { required: true, max: 64, message: t("system.code.gen.validation.parent_column_required"), trigger: "change" }
+    ],
     tree_label_column: [
       { required: true, max: 64, message: t("system.code.gen.validation.tree_label_required"), trigger: "change" }
     ],
@@ -213,3 +217,13 @@ export function createDefaultCodeGenOptionConfig(): CodeGenColumnOptionConfig {
     lazy: false
   };
 }
+
+/** 保存代码生成配置时，以原值补齐尚未填写的启用语言描述。 */
+export function withCodeGenLocaleDefaults(values: Map<string, CodeGenLocaleConfig>, comment: string, leftTreeComment = "") {
+  const result = new Map(values);
+  for (const { value } of getEditableLanguageOptions()) {
+    const current = values.get(value);
+    result.set(value, { comment: current?.comment || comment, left_tree_comment: current?.left_tree_comment || leftTreeComment });
+  }
+  return result;
+}

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

@@ -30,11 +30,16 @@
     >
       <template #tableI18nConfig>
         <CodeGenLocaleEditor
-          class="code-gen-table-locales"
           :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>
@@ -51,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,
@@ -90,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,
@@ -224,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"),
@@ -315,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"),
@@ -599,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];
@@ -612,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 => ({
@@ -620,34 +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) {
-    ElMessage.warning(
-      t("system.code.gen.preview.message.missing_i18ns", {
-        items: missingI18ns.join(t("system.code.gen.preview.value.list_separator"))
-      })
-    );
-  }
   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)
     });
@@ -659,6 +689,7 @@ async function handleGenerate(selected: CodeGenGenerateTarget) {
     handleProgressDialogVisibleChange(true);
   } catch (error) {
     generating.value = false;
+    releaseGenerationUpdates();
     throw error;
   }
 }
@@ -704,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();
@@ -746,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 ?? [] } };
 }
@@ -856,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) {
@@ -1016,20 +1058,7 @@ function ensureLeftTreeConfig() {
 </script>
 
 <style scoped lang="scss">
-.code-gen-table-locales {
-  display: grid;
-  grid-template-columns: repeat(auto-fit, minmax(min(100%, 280px), 1fr));
-  width: 100%;
-  min-width: 0;
-  :deep(.el-alert) {
-    grid-column: 1 / -1;
-  }
-}
-
 @media (max-width: 767px) {
-  .code-gen-table-locales {
-    grid-template-columns: 1fr;
-  }
   :deep(.code-gen-table-form) {
     .el-col {
       flex: 0 0 100%;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@liujitcn/kratos-admin-system",
   "private": false,
-  "version": "0.0.39",
+  "version": "0.0.41",
   "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.39"
+    "@liujitcn/kratos-admin-core": "0.0.41"
   },
   "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/declarations/src/views/base/runtime-config/index.vue.d.ts

@@ -1,3 +0,0 @@
-declare const __VLS_export: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
-declare const _default: typeof __VLS_export;
-export default _default;

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" }]
-    }
-  ]
-};