@liujitcn/kratos-admin-system 0.0.38 → 0.0.40

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

@@ -103,21 +103,12 @@
                     maxlength="255"
                     :placeholder="t('system.code.gen.column.placeholder.comment')"
                   />
-                  <el-popover placement="right-start" :width="400" trigger="click">
-                    <template #reference>
-                      <el-button
-                        :icon="ChatLineSquare"
-                        circle
-                        :type="hasMissingColumnLocales(row as CodeGenColumnView) ? 'warning' : 'success'"
-                        :aria-label="t('system.code.gen.i18n.action.edit_column')"
-                      />
-                    </template>
-                    <CodeGenLocaleEditor
-                      :model-value="row.i18n_config"
-                      :source-comment="row.comment"
-                      @update:model-value="value => (row.i18n_config = value)"
-                    />
-                  </el-popover>
+                  <CodeGenLocaleEditor
+                    :model-value="row.i18n_config"
+                    :source-comment="row.comment"
+                    :disabled="!canEdit"
+                    @update:model-value="value => (row.i18n_config = value)"
+                  />
                 </div>
               </template>
             </el-table-column>
@@ -536,7 +527,7 @@
 <script setup lang="ts">
 import Sortable from "sortablejs";
 import { computed, nextTick, onBeforeUnmount, onMounted, reactive, ref, watch } from "vue";
-import { ChatLineSquare, Delete, Document, List, Plus, Setting } from "@element-plus/icons-vue";
+import { Delete, Document, List, Plus, Setting } from "@element-plus/icons-vue";
 import { useRoute, useRouter } from "vue-router";
 import { setAdminDocumentTitle, t } from "@liujitcn/kratos-admin-core";
 import ProDialog from "@liujitcn/kratos-admin-core/components/Dialog/ProDialog.vue";
@@ -557,7 +548,6 @@ import type {
 } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/code_gen_column";
 import type { CodeGenDatabaseTable, CodeGenTableForm } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/code_gen_table";
 import CodeGenLocaleEditor from "../components/CodeGenLocaleEditor.vue";
-import { getEditableLanguageOptions } from "@liujitcn/kratos-admin-system/components/dynamicI18n";
 import {
   copyCodeGenOptionToEmptyMatches,
   copyFirstMatchingCodeGenOption,
@@ -576,7 +566,8 @@ import {
   createDefaultCodeGenListConfig,
   createDefaultCodeGenOptionConfig,
   createDefaultCodeGenQueryConfig,
-  createDefaultCodeGenTableForm
+  createDefaultCodeGenTableForm,
+  withCodeGenLocaleDefaults
 } from "../config";
 
 defineOptions({
@@ -784,6 +775,7 @@ async function handleSaveColumns(showMessage = true) {
     code_gen_columns: columns.value.map((item, index) => ({
       ...item,
       table_id: formData.id,
+      i18n_config: withCodeGenLocaleDefaults(item.i18n_config, item.comment),
       sort: index + 1
     }))
   });
@@ -999,7 +991,10 @@ async function loadDatabaseColumns(tableName: string) {
   if (!tableName || databaseColumns[tableName] || loadingDatabaseColumns.has(tableName)) return;
   loadingDatabaseColumns.add(tableName);
   try {
-    const data = await defCodeGenColumnService.ListCodeGenDatabaseColumn({ source_name: formData.source_name, table_name: tableName });
+    const data = await defCodeGenColumnService.ListCodeGenDatabaseColumn({
+      source_name: formData.source_name,
+      table_name: tableName
+    });
     databaseColumns[tableName] = data.columns ?? [];
   } finally {
     loadingDatabaseColumns.delete(tableName);
@@ -1197,7 +1192,9 @@ function hasOptionConfig(option: CodeGenColumnOptionConfig) {
 /** 返回选项入口的当前状态提示。 */
 function optionEntryTip(option: CodeGenColumnOptionConfig) {
   return t(
-    hasOptionConfig(option) ? "system.code.gen.column.tooltip.option_configured" : "system.code.gen.column.tooltip.configure_option"
+    hasOptionConfig(option)
+      ? "system.code.gen.column.tooltip.option_configured"
+      : "system.code.gen.column.tooltip.configure_option"
   );
 }
 
@@ -1206,11 +1203,6 @@ function codeGenScopeLabel(scope: CodeGenOptionScope) {
   return t(`system.code.gen.column.scope.${scope}`);
 }
 
-/** 判断字段是否缺少任一非主语言描述。 */
-function hasMissingColumnLocales(column: CodeGenColumnView) {
-  return getEditableLanguageOptions().some(item => !column.i18n_config?.get(item.value)?.comment);
-}
-
 /** 判断组件是否依赖选择数据源。 */
 function hasOptionComponent(component: string, scope: CodeGenOptionScope) {
   return (

package/dist/package/src/views/tool/code-gen/components/CodeGenGenerateConfirm.vue

@@ -0,0 +1,115 @@
+<template>
+  <div class="generate-confirm">
+    <p class="generate-confirm__message">{{ message }}</p>
+    <template v-if="count">
+      <el-alert
+        :title="t('system.code.gen.table.dialog.missing_count', { count })"
+        :description="t('system.code.gen.table.dialog.missing_hint')"
+        type="warning"
+        show-icon
+        :closable="false"
+      />
+      <div class="generate-confirm__groups" tabindex="0" :aria-label="t('system.code.gen.table.dialog.missing_count', { count })">
+        <details v-for="group in groups" :key="group.name" :open="groups.length === 1">
+          <summary>
+            <span class="generate-confirm__name">{{ group.name }}</span>
+            <span class="generate-confirm__count">{{ group.items.length }}</span>
+          </summary>
+          <ul>
+            <li v-for="(item, index) in group.items" :key="index">{{ item }}</li>
+          </ul>
+        </details>
+      </div>
+    </template>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed } from "vue";
+import { t } from "@liujitcn/kratos-admin-core";
+
+/** 生成确认内容，按业务表保留缺失翻译明细。 */
+const props = defineProps<{
+  message: string;
+  groups: Array<{ name: string; items: string[] }>;
+}>();
+
+const count = computed(() => props.groups.reduce((total, group) => total + group.items.length, 0));
+</script>
+
+<style scoped lang="scss">
+:global(.code-gen-generate-confirm) {
+  width: 600px;
+  max-width: calc(100vw - 32px);
+}
+
+:global(.code-gen-generate-confirm .el-message-box__message) {
+  width: 100%;
+  min-width: 0;
+}
+
+.generate-confirm {
+  display: grid;
+  gap: 16px;
+  min-width: 0;
+  &__message {
+    margin: 0;
+    color: var(--el-text-color-primary);
+    font-size: 15px;
+    line-height: 1.6;
+    overflow-wrap: anywhere;
+  }
+  &__groups {
+    max-height: min(320px, 35vh);
+    overflow: auto;
+    border: 1px solid var(--el-border-color-lighter);
+    border-radius: 8px;
+    scrollbar-gutter: stable;
+  }
+  details + details {
+    border-top: 1px solid var(--el-border-color-lighter);
+  }
+  summary {
+    padding: 12px 16px;
+    color: var(--el-text-color-primary);
+    cursor: pointer;
+    background: var(--el-fill-color-light);
+    overflow-wrap: anywhere;
+    &:hover {
+      background: var(--el-fill-color);
+    }
+    &:focus-visible {
+      outline: 2px solid var(--el-color-primary);
+      outline-offset: -2px;
+    }
+  }
+  &__name {
+    font-weight: 600;
+  }
+  &__count {
+    display: inline-block;
+    padding: 0 8px;
+    margin-left: 8px;
+    font-size: 12px;
+    line-height: 20px;
+    color: var(--el-color-warning);
+    background: var(--el-color-warning-light-9);
+    border-radius: 10px;
+  }
+  ul {
+    padding: 4px 16px;
+    margin: 0;
+    list-style: none;
+  }
+  li {
+    padding: 8px 0;
+    font-size: 13px;
+    line-height: 1.6;
+    color: var(--el-text-color-regular);
+    overflow-wrap: anywhere;
+    & + li {
+      border-top: 1px solid var(--el-border-color-extra-light);
+    }
+  }
+}
+</style>

package/dist/package/src/views/tool/code-gen/components/CodeGenLocaleEditor.vue

@@ -1,200 +1,41 @@
 <template>
-  <div class="code-gen-locale-editor">
-    <el-alert
-      v-if="missingLocales.length"
-      :title="t('system.code.gen.i18n.message.missing', { locales: missingLocales.join(', ') })"
-      type="warning"
-      :closable="false"
-      show-icon
-    />
-    <div v-for="locale in editableLocales" :key="locale.value" class="code-gen-locale-editor__group">
-      <div class="code-gen-locale-editor__locale">
-        <span>{{ locale.label }}</span>
-        <el-tag v-if="hasComment(locale.value)" size="small" type="success" effect="plain">
-          {{ t("system.code.gen.i18n.status.complete") }}
-        </el-tag>
-        <el-tag v-else size="small" type="warning" effect="plain">
-          {{ t("system.code.gen.i18n.status.missing") }}
-        </el-tag>
-      </div>
-      <div class="code-gen-locale-editor__control">
-        <el-input
-          :model-value="localeValue(locale.value).comment"
-          :placeholder="t('system.code.gen.i18n.placeholder.comment', { source: sourceComment || '-' })"
-          :disabled="isTranslating(locale.value, 'comment')"
-          maxlength="255"
-          @update:model-value="value => updateLocale(locale.value, 'comment', value)"
-        />
-        <el-button
-          class="code-gen-locale-editor__translate"
-          link
-          type="primary"
-          size="small"
-          :icon="Promotion"
-          :loading="isTranslating(locale.value, 'comment')"
-          :disabled="!canTranslate(locale.value, 'comment', sourceComment)"
-          @click="handleTranslate(locale.value, 'comment', sourceComment, locale.label)"
-        >
-          {{ t("system.base.i18n.action.translate") }}
-        </el-button>
-      </div>
-      <div v-if="showLeftTreeComment" class="code-gen-locale-editor__control">
-        <el-input
-          :model-value="localeValue(locale.value).left_tree_comment"
-          :placeholder="t('system.code.gen.i18n.placeholder.left_tree_comment', { source: sourceLeftTreeComment || '-' })"
-          :disabled="isTranslating(locale.value, 'left_tree_comment')"
-          maxlength="255"
-          @update:model-value="value => updateLocale(locale.value, 'left_tree_comment', value)"
-        />
-        <el-button
-          class="code-gen-locale-editor__translate"
-          link
-          type="primary"
-          size="small"
-          :icon="Promotion"
-          :loading="isTranslating(locale.value, 'left_tree_comment')"
-          :disabled="!canTranslate(locale.value, 'left_tree_comment', sourceLeftTreeComment)"
-          @click="handleTranslate(locale.value, 'left_tree_comment', sourceLeftTreeComment, locale.label)"
-        >
-          {{ t("system.base.i18n.action.translate") }}
-        </el-button>
-      </div>
-    </div>
-  </div>
+  <DynamicI18nEditor
+    :model-value="values"
+    :source="sourceComment"
+    :maxlength="255"
+    :disabled="disabled"
+    @update:model-value="updateValues"
+  />
 </template>
 
 <script setup lang="ts">
-import { computed, ref } from "vue";
-import { Promotion } from "@element-plus/icons-vue";
-import { t } from "@liujitcn/kratos-admin-core";
-import { defBaseI18nService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_i18n";
-import { loadEnabledBaseLanguages, useEnabledBaseLanguages } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_language";
+import { computed } from "vue";
+import DynamicI18nEditor from "@liujitcn/kratos-admin-system/components/DynamicI18nEditor.vue";
+import { getEditableLanguageOptions, type DynamicI18nValue } from "@liujitcn/kratos-admin-system/components/dynamicI18n";
 import type { CodeGenLocaleConfig } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_i18n";
 
-/** 代码生成多语言编辑器属性。 */
+/** 代码生成描述使用统一国际化入口，按字段保存回语言配置。 */
 interface CodeGenLocaleEditorProps {
-  /** 按语言区域索引的生成配置。 */
   modelValue: Map<string, CodeGenLocaleConfig>;
-  /** 中文业务或字段描述。 */
   sourceComment?: string;
-  /** 是否编辑左树标题。 */
-  showLeftTreeComment?: boolean;
-  /** 中文左树标题。 */
-  sourceLeftTreeComment?: string;
-}
-
-const props = withDefaults(defineProps<CodeGenLocaleEditorProps>(), {
-  sourceComment: "",
-  showLeftTreeComment: false,
-  sourceLeftTreeComment: ""
-});
-
-const emit = defineEmits<{
-  "update:modelValue": [value: Map<string, CodeGenLocaleConfig>];
-}>();
-
-const { languages } = useEnabledBaseLanguages();
-const translatingField = ref("");
-void loadEnabledBaseLanguages();
-
-const editableLocales = computed(() =>
-  languages.value
-    .filter(item => !item.is_primary)
-    .map(item => ({ value: item.language_code, label: item.native_name || item.language_name || item.language_code }))
-);
-
-const missingLocales = computed(() =>
-  editableLocales.value.filter(locale => !hasComment(locale.value)).map(locale => locale.label)
+  field?: keyof CodeGenLocaleConfig;
+  disabled?: boolean;
+}
+const props = withDefaults(defineProps<CodeGenLocaleEditorProps>(), { sourceComment: "", field: "comment", disabled: false });
+const emit = defineEmits<{ "update:modelValue": [value: Map<string, CodeGenLocaleConfig>] }>();
+const values = computed<DynamicI18nValue[]>(() =>
+  getEditableLanguageOptions().map(({ value }) => ({
+    locale: value,
+    id: 0,
+    text: props.modelValue.get(value)?.[props.field] ?? ""
+  }))
 );
 
-/** 返回指定语言配置并补齐空字段。 */
-function localeValue(locale: string): CodeGenLocaleConfig {
-  return props.modelValue?.get(locale) ?? { comment: "", left_tree_comment: "" };
-}
-
-/** 判断指定语言是否已填写业务或字段描述。 */
-function hasComment(locale: string) {
-  const value = localeValue(locale);
-  return Boolean(value.comment && (!props.showLeftTreeComment || value.left_tree_comment));
-}
-
-/** 更新单个语言字段并保持 Map 引用语义。 */
-function updateLocale(locale: string, field: keyof CodeGenLocaleConfig, value: string) {
-  const next = new Map(props.modelValue ?? []);
-  next.set(locale, { ...localeValue(locale), [field]: value });
+/** 更新当前描述译文，保留其他字段和语言配置。 */
+function updateValues(values: DynamicI18nValue[]) {
+  const next = new Map(props.modelValue);
+  for (const item of values)
+    next.set(item.locale, { comment: "", left_tree_comment: "", ...next.get(item.locale), [props.field]: item.text });
   emit("update:modelValue", next);
 }
-
-/** 判断指定语言字段是否正在翻译。 */
-function isTranslating(locale: string, field: keyof CodeGenLocaleConfig) {
-  return translatingField.value === `${locale}:${field}`;
-}
-
-/** 判断指定语言字段当前是否允许自动翻译。 */
-function canTranslate(locale: string, field: keyof CodeGenLocaleConfig, source: string) {
-  return Boolean(source) && !localeValue(locale)[field] && !translatingField.value;
-}
-
-/** 翻译指定语言的单个代码生成描述。 */
-async function handleTranslate(locale: string, field: keyof CodeGenLocaleConfig, source: string, language: string) {
-  if (!canTranslate(locale, field, source)) return;
-  translatingField.value = `${locale}:${field}`;
-  try {
-    const response = await defBaseI18nService.DraftBaseI18n({ source, locale });
-    const i18n = response.i18ns.find(item => item.locale === locale)?.i18n;
-    if (!i18n) throw new Error("i18n not found");
-    updateLocale(locale, field, i18n);
-    ElMessage.success(t("system.base.i18n.message.translate_success", { language }));
-  } catch {
-    ElMessage.error(t("system.base.i18n.message.translate_failed", { language }));
-  } finally {
-    translatingField.value = "";
-  }
-}
 </script>
-
-<style scoped lang="scss">
-.code-gen-locale-editor {
-  display: flex;
-  flex-direction: column;
-  gap: 12px;
-}
-
-.code-gen-locale-editor__group {
-  display: grid;
-  gap: 8px;
-}
-
-.code-gen-locale-editor__locale {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  min-height: 24px;
-  font-size: 13px;
-  font-weight: 600;
-  color: var(--el-text-color-primary);
-}
-
-.code-gen-locale-editor__control {
-  position: relative;
-  display: flex;
-  align-items: center;
-  width: 100%;
-}
-
-.code-gen-locale-editor__control :deep(.el-input) {
-  flex: 1;
-}
-
-.code-gen-locale-editor__control :deep(.el-input__suffix) {
-  padding-right: 78px;
-}
-
-.code-gen-locale-editor__translate {
-  position: absolute;
-  z-index: 1;
-  top: 50%;
-  right: 8px;
-  transform: translateY(-50%);
-}
-</style>

package/dist/package/src/views/tool/code-gen/components/CodeGenProgressDialog.vue

@@ -111,6 +111,7 @@ import { getCurrentLocale, t } from "@liujitcn/kratos-admin-core";
 import ProDialog from "@liujitcn/kratos-admin-core/components/Dialog/ProDialog.vue";
 import { defCodeGenService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/code_gen";
 import { subscribeCodeGenProgress, type SseStop } from "../../../../utils/code_gen_sse";
+import { normalizeCodeGenTask } from "../../../../utils/code-gen-progress";
 import type { CodeGenTask } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/code_gen";
 import { CodeGenTaskStatus, CodeGenTaskStepStatus } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/code_gen";
 
@@ -174,6 +175,7 @@ async function loadTask(silent = false, taskId = props.taskId) {
 
 /** 应用实时或轮询返回的任务快照。 */
 function applyTask(latest: CodeGenTask) {
+  latest = normalizeCodeGenTask(latest);
   task.value = latest;
   const runningTable = latest.tables.find(table => table.status === CodeGenTaskStatus.CODE_GEN_TASK_STATUS_RUNNING);
   if (runningTable && !expandedTables.value.includes(runningTable.table_id)) {

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;
+}