@liujitcn/kratos-admin-system 0.0.21 → 0.0.23

package/dist/package/src/views/base/dept/index.vue

@@ -16,12 +16,11 @@
     <FormDialog
       v-model="dialog.visible"
       ref="formDialogRef"
-      :title="t(dialog.titleKey, { resource: t('system.dept.resource') })"
+      :title="t(dialog.titleKey, { resource: t('system.base.dept.resource') })"
       width="600px"
       :model="formData"
       :fields="formFields"
       :rules="rules"
-      label-width="90px"
       @confirm="handleSubmit"
       @close="handleCloseDialog"
     />
@@ -64,7 +63,7 @@ const proTable = ref<ProTableInstance>();
 const formDialogRef = ref<InstanceType<typeof FormDialog>>();
 
 const dialog = reactive({
-  titleKey: "system.common.action.createResource",
+  titleKey: "common.action.create_resource",
   visible: false
 });
 
@@ -97,34 +96,34 @@ const rules = computed(() => ({
   tenant_id: [
     {
       required: true,
-      message: t("system.common.validation.requiredSelect", { field: t("system.common.field.tenant") }),
+      message: t("common.validation.required_select", { field: t("common.field.tenant") }),
       trigger: "change"
     }
   ],
   parent_id: [
     {
       required: true,
-      message: t("system.common.validation.requiredSelect", { field: t("system.dept.field.parent") }),
+      message: t("common.validation.required_select", { field: t("system.base.dept.field.parent") }),
       trigger: "change"
     }
   ],
   name: [
     {
       required: true,
-      message: t("system.common.validation.requiredInput", { field: t("system.dept.field.name") }),
+      message: t("common.validation.required_input", { field: t("system.base.dept.field.name") }),
       trigger: "blur"
     },
     {
       max: 255,
-      message: t("system.common.validation.maxLength", { field: t("system.dept.field.name"), max: 255 }),
+      message: t("common.validation.max_length", { field: t("system.base.dept.field.name"), max: 255 }),
       trigger: "blur"
     }
   ],
-  sort: [{ required: true, type: "number", min: 1, message: t("system.common.validation.sortPositive"), trigger: "blur" }],
+  sort: [{ required: true, type: "number", min: 1, message: t("common.validation.sort_positive"), trigger: "blur" }],
   status: [
     {
       required: true,
-      message: t("system.common.validation.requiredSelect", { field: t("system.common.field.status") }),
+      message: t("common.validation.required_select", { field: t("common.field.status") }),
       trigger: "change"
     }
   ]
@@ -137,10 +136,10 @@ const isDefaultTenant = computed(() => userStore.userInfo.tenant_code === DEFAUL
 const formFields = computed<ProFormField[]>(() => [
   {
     prop: "tenant_id",
-    label: t("system.common.field.tenant"),
+    label: t("common.field.tenant"),
     component: "select",
     props: {
-      placeholder: t("system.common.validation.requiredSelect", { field: t("system.common.field.tenant") }),
+      placeholder: t("common.validation.required_select", { field: t("common.field.tenant") }),
       filterable: true,
       disabled: Boolean(formData.id),
       onChange: handleFormTenantChange
@@ -150,11 +149,11 @@ const formFields = computed<ProFormField[]>(() => [
   },
   {
     prop: "parent_id",
-    label: t("system.dept.field.parent"),
+    label: t("system.base.dept.field.parent"),
     component: "tree-select",
     options: deptOptions.value,
     props: {
-      placeholder: t("system.common.validation.requiredSelect", { field: t("system.dept.field.parent") }),
+      placeholder: t("common.validation.required_select", { field: t("system.base.dept.field.parent") }),
       filterable: true,
       checkStrictly: true,
       renderAfterExpand: false,
@@ -163,23 +162,23 @@ const formFields = computed<ProFormField[]>(() => [
   },
   {
     prop: "name",
-    label: t("system.dept.field.name"),
+    label: t("system.base.dept.field.name"),
     component: "input",
-    props: { placeholder: t("system.common.validation.requiredInput", { field: t("system.dept.field.name") }) }
+    props: { placeholder: t("common.validation.required_input", { field: t("system.base.dept.field.name") }) }
   },
   {
     prop: "sort",
-    label: t("system.common.field.sort"),
+    label: t("common.field.sort"),
     component: "input-number",
     props: { min: 1, precision: 0, step: 1, controlsPosition: "right", style: { width: "100%" } }
   },
   {
     prop: "remark",
-    label: t("system.common.field.remark"),
+    label: t("common.field.remark"),
     component: "textarea",
-    props: { placeholder: t("system.common.placeholder.remark") }
+    props: { placeholder: t("common.placeholder.remark") }
   },
-  { prop: "status", label: t("system.common.field.status"), component: "radio-group", options: statusOptions.value }
+  { prop: "status", label: t("common.field.status"), component: "radio-group", options: statusOptions.value }
 ]);
 
 /** 部门树表格列配置。 */
@@ -189,7 +188,7 @@ const columns = computed<ColumnProps[]>(() => [
     ? ([
         {
           prop: "tenant_id",
-          label: t("system.common.field.tenant"),
+          label: t("common.field.tenant"),
           minWidth: 140,
           showOverflowTooltip: true,
           search: { el: "select", key: "tenant_id", props: { filterable: true }, order: 1 },
@@ -197,12 +196,12 @@ const columns = computed<ColumnProps[]>(() => [
         }
       ] satisfies ColumnProps[])
     : []),
-  { prop: "name", label: t("system.dept.field.name"), minWidth: 140, align: "left", search: { el: "input" } },
-  { prop: "remark", label: t("system.common.field.remark"), minWidth: 160, search: { el: "input" } },
-  { prop: "sort", label: t("system.common.field.sort"), minWidth: 90, align: "right" },
+  { prop: "name", label: t("system.base.dept.field.name"), minWidth: 140, align: "left", search: { el: "input" } },
+  { prop: "remark", label: t("common.field.remark"), minWidth: 160, search: { el: "input" } },
+  { prop: "sort", label: t("common.field.sort"), minWidth: 90, align: "right" },
   {
     prop: "status",
-    label: t("system.common.field.status"),
+    label: t("common.field.status"),
     minWidth: 100,
     search: { el: "select" },
     cellType: "status",
@@ -215,11 +214,11 @@ const columns = computed<ColumnProps[]>(() => [
       beforeChange: scope => handleBeforeSetStatus(scope.row as BaseDept)
     }
   },
-  { prop: "created_at", label: t("system.common.field.createdAt"), minWidth: 180 },
-  { prop: "updated_at", label: t("system.common.field.updatedAt"), minWidth: 180 },
+  { prop: "created_at", label: t("common.field.created_at"), minWidth: 180 },
+  { prop: "updated_at", label: t("common.field.updated_at"), minWidth: 180 },
   {
     prop: "operation",
-    label: t("system.common.field.operation"),
+    label: t("common.field.operation"),
     width: 220,
     fixed: "right",
     cellType: "actions",
@@ -332,7 +331,7 @@ function refreshTable() {
 async function loadDeptOptions() {
   // 默认租户未选择目标租户时仅保留顶级部门，避免混入其他租户的部门树。
   if (isDefaultTenant.value && !formData.tenant_id) {
-    deptOptions.value = [{ value: 0, label: t("system.dept.value.root"), disabled: false, has_children: true, children: [] }];
+    deptOptions.value = [{ value: 0, label: t("system.base.dept.value.root"), disabled: false, has_children: true, children: [] }];
     return;
   }
   const optionBaseDeptResponse = await defBaseDeptService.OptionBaseDept({
@@ -341,7 +340,7 @@ async function loadDeptOptions() {
   deptOptions.value = [
     {
       value: 0,
-      label: t("system.dept.value.root"),
+      label: t("system.base.dept.value.root"),
       disabled: false,
       has_children: true,
       children: optionBaseDeptResponse.list
@@ -373,7 +372,7 @@ async function handleOpenDialog(parent_id?: number, deptId?: number, tenantId?:
   resetForm();
   await loadTenantOptions();
   if (deptId) {
-    dialog.titleKey = "system.common.action.editResource";
+    dialog.titleKey = "common.action.edit_resource";
     dialog.visible = true;
     defBaseDeptService.GetBaseDept({ id: deptId }).then(async data => {
       Object.assign(formData, data);
@@ -385,7 +384,7 @@ async function handleOpenDialog(parent_id?: number, deptId?: number, tenantId?:
   // 从部门行新增子部门时，继承父部门租户并加载同租户上级部门树。
   formData.tenant_id = tenantId;
   await loadDeptOptions();
-  dialog.titleKey = "system.common.action.createResource";
+  dialog.titleKey = "common.action.create_resource";
   dialog.visible = true;
   formData.parent_id = parent_id ?? 0;
 }
@@ -427,8 +426,8 @@ function handleSubmit() {
       : defBaseDeptService.CreateBaseDept({ base_dept: submitData });
     request.then(() => {
       ElMessage.success(
-        t(submitData.id ? "system.common.message.updateSuccess" : "system.common.message.createSuccess", {
-          resource: t("system.dept.resource")
+        t(submitData.id ? "common.message.update_success" : "common.message.create_success", {
+          resource: t("system.base.dept.resource")
         })
       );
       handleCloseDialog();
@@ -446,10 +445,10 @@ async function handleBeforeSetStatus(row: BaseDept) {
   const deptName = row.name || `ID:${row.id}`;
   try {
     await ElMessageBox.confirm(
-      t("system.common.dialog.statusChange", {
+      t("common.dialog.status_change", {
         action: text,
-        resource: t("system.dept.resource"),
-        field: t("system.dept.field.name"),
+        resource: t("system.base.dept.resource"),
+        field: t("system.base.dept.field.name"),
         value: deptName
       }),
       t("common.title.notice"),
@@ -460,7 +459,7 @@ async function handleBeforeSetStatus(row: BaseDept) {
       }
     );
     await defBaseDeptService.SetBaseDeptStatus({ id: row.id, status: nextStatus });
-    ElMessage.success(t("system.common.message.statusSuccess", { action: text }));
+    ElMessage.success(t("common.message.status_success", { action: text }));
     refreshTable();
     return true;
   } catch {
@@ -481,15 +480,15 @@ function handleDelete(selected?: number | string | Array<number | string> | Base
     deptList.length ? deptList.map(item => item.id) : normalizeSelectedIds(selected as number | string | Array<number | string>)
   ).join(",");
   if (!deptIds) {
-    ElMessage.warning(t("system.common.message.selectDeleteItem"));
+    ElMessage.warning(t("common.message.select_delete_item"));
     return;
   }
 
   const confirmMessage = deptList.length
     ? deptList.length === 1
-      ? `${t("system.common.dialog.deleteSingle", { resource: t("system.dept.resource") })}\n${t("system.common.dialog.resourceField", { field: t("system.dept.field.name"), value: deptList[0].name || `ID:${deptList[0].id}` })}`
-      : t("system.common.dialog.deleteBatch", { count: deptList.length, unit: "", resource: t("system.dept.resource") })
-    : t("system.common.dialog.deleteSelected", { resource: t("system.dept.resource") });
+      ? `${t("common.dialog.delete_single", { resource: t("system.base.dept.resource") })}\n${t("common.dialog.resource_field", { field: t("system.base.dept.field.name"), value: deptList[0].name || `ID:${deptList[0].id}` })}`
+      : t("common.dialog.delete_batch", { count: deptList.length, unit: "", resource: t("system.base.dept.resource") })
+    : t("common.dialog.delete_selected", { resource: t("system.base.dept.resource") });
 
   ElMessageBox.confirm(confirmMessage, t("common.title.warning"), {
     confirmButtonText: t("common.action.confirm"),
@@ -498,12 +497,12 @@ function handleDelete(selected?: number | string | Array<number | string> | Base
   }).then(
     () => {
       defBaseDeptService.DeleteBaseDept({ id: deptIds }).then(() => {
-        ElMessage.success(t("system.common.message.deleteSuccess", { resource: t("system.dept.resource") }));
+        ElMessage.success(t("common.message.delete_success", { resource: t("system.base.dept.resource") }));
         refreshTable();
       });
     },
     () => {
-      ElMessage.info(t("system.common.dialog.cancelDelete", { resource: t("system.dept.resource") }));
+      ElMessage.info(t("common.dialog.cancel_delete", { resource: t("system.base.dept.resource") }));
     }
   );
 }

package/dist/package/src/views/base/dict/index.vue

@@ -12,21 +12,18 @@
     <FormDialog
       v-model="dialog.visible"
       ref="formDialogRef"
-      :title="t(dialog.editing ? 'system.dict.action.edit' : 'system.dict.action.create')"
+      :title="t(dialog.editing ? 'system.base.dict.action.edit' : 'system.base.dict.action.create')"
       width="700px"
       :model="formData"
       :fields="formFields"
       :rules="rules"
-      label-width="100px"
       @confirm="handleSubmit"
       @close="handleCloseDialog"
     >
       <template #translations>
         <DynamicTranslationEditor
           v-model="translationValues"
-          :resource-id="formData.id"
-          :resource-type="TranslationResourceType.TRANSLATION_RESOURCE_TYPE_DICT"
-          :draft-enabled="configStore.translationDraftEnabled"
+          :source="formData.name"
           :maxlength="50"
         />
       </template>
@@ -53,9 +50,9 @@ import { loadEnabledBaseLanguages } from "@liujitcn/kratos-admin-system/api/syst
 import type { BaseDict, BaseDictForm, PageBaseDictRequest } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_dict";
 import router, { navigateTo } from "@liujitcn/kratos-admin-core/navigation";
 import { Status } from "@liujitcn/kratos-admin-system/rpc/common/v1/enum";
+import { TranslationTargetType } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_translation";
 import { buildPageRequest, normalizeSelectedIds } from "@liujitcn/kratos-admin-core/table";
 import { t } from "@liujitcn/kratos-admin-core";
-import { useConfigStore } from "@liujitcn/kratos-admin-core/stores/runtime";
 import DynamicTranslationEditor from "@liujitcn/kratos-admin-system/components/DynamicTranslationEditor.vue";
 import DynamicTranslationCell from "@liujitcn/kratos-admin-system/components/DynamicTranslationCell.vue";
 import {
@@ -64,8 +61,6 @@ import {
   type DynamicTranslationRecord,
   type DynamicTranslationValue
 } from "@liujitcn/kratos-admin-system/components/dynamicTranslation";
-import { TranslationResourceType } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_translation";
-import type { BaseDictTranslation } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_dict";
 
 defineOptions({
   name: "BaseDict",
@@ -73,11 +68,9 @@ defineOptions({
 });
 
 const { BUTTONS } = useAuthButtons();
-const configStore = useConfigStore();
 const proTable = ref<ProTableInstance>();
 const formDialogRef = ref<InstanceType<typeof FormDialog>>();
 const translationValues = ref<DynamicTranslationValue[]>(normalizeDynamicTranslations(undefined, "name"));
-
 const dialog = reactive({
   editing: false,
   visible: false
@@ -98,25 +91,25 @@ const formData = reactive<BaseDictForm>({
 
 const rules = computed(() => ({
   name: [
-    { required: true, message: t("system.dict.placeholder.name"), trigger: "blur" },
+    { required: true, message: t("system.base.dict.placeholder.name"), trigger: "blur" },
     {
       max: 50,
-      message: t("system.common.validation.maxLength", { field: t("system.dict.field.name"), max: 50 }),
+      message: t("common.validation.max_length", { field: t("system.base.dict.field.name"), max: 50 }),
       trigger: "blur"
     }
   ],
   code: [
-    { required: true, message: t("system.dict.placeholder.code"), trigger: "blur" },
+    { required: true, message: t("system.base.dict.placeholder.code"), trigger: "blur" },
     {
       max: 50,
-      message: t("system.common.validation.maxLength", { field: t("system.dict.field.code"), max: 50 }),
+      message: t("common.validation.max_length", { field: t("system.base.dict.field.code"), max: 50 }),
       trigger: "blur"
     }
   ],
   status: [
     {
       required: true,
-      message: t("system.common.validation.requiredSelect", { field: t("system.common.field.status") }),
+      message: t("common.validation.required_select", { field: t("common.field.status") }),
       trigger: "change"
     }
   ]
@@ -131,18 +124,18 @@ const statusOptions = computed<ProFormOption[]>(() => [
 const formFields = computed<ProFormField[]>(() => [
   {
     prop: "name",
-    label: t("system.dict.field.name"),
+    label: t("system.base.dict.field.name"),
     component: "input",
-    props: { placeholder: t("system.dict.placeholder.name") }
+    props: { placeholder: t("system.base.dict.placeholder.name") }
   },
   {
     prop: "code",
-    label: t("system.dict.field.code"),
+    label: t("system.base.dict.field.code"),
     component: "input",
-    props: { placeholder: t("system.dict.placeholder.code") }
+    props: { placeholder: t("system.base.dict.placeholder.code") }
   },
-  { prop: "translations", label: t("system.translation.field.translations"), component: "slot", slotName: "translations" },
-  { prop: "status", label: t("system.common.field.status"), component: "radio-group", options: statusOptions.value }
+  { prop: "translations", label: t("system.base.translation.field.translations"), component: "slot", slotName: "translations" },
+  { prop: "status", label: t("common.field.status"), component: "radio-group", options: statusOptions.value }
 ]);
 
 /** 渲染字典名称翻译预览，并复用当前页面的编辑弹窗。 */
@@ -150,8 +143,9 @@ function renderDictNameCell(scope: RenderScope<BaseDict>) {
   const row = scope.row;
   return h(DynamicTranslationCell, {
     source: row.name,
-    translations: row.translations,
-    textField: "name"
+    targetType: TranslationTargetType.TRANSLATION_TARGET_TYPE_BASE_DICT,
+    targetId: row.id,
+    translations: row.translations
   });
 }
 
@@ -160,16 +154,16 @@ const columns = computed<ColumnProps[]>(() => [
   { type: "selection", width: 55 },
   {
     prop: "name",
-    label: t("system.dict.field.name"),
+    label: t("system.base.dict.field.name"),
     minWidth: 140,
     search: { el: "input" },
     showOverflowTooltip: false,
     render: scope => renderDictNameCell(scope as unknown as RenderScope<BaseDict>)
   },
-  { prop: "code", label: t("system.dict.field.code"), minWidth: 160, search: { el: "input" } },
+  { prop: "code", label: t("system.base.dict.field.code"), minWidth: 160, search: { el: "input" } },
   {
     prop: "status",
-    label: t("system.common.field.status"),
+    label: t("common.field.status"),
     minWidth: 100,
     search: { el: "select" },
     cellType: "status",
@@ -182,17 +176,17 @@ const columns = computed<ColumnProps[]>(() => [
       beforeChange: scope => handleBeforeSetStatus(scope.row as BaseDict)
     }
   },
-  { prop: "created_at", label: t("system.common.field.createdAt"), minWidth: 180 },
-  { prop: "updated_at", label: t("system.common.field.updatedAt"), minWidth: 180 },
+  { prop: "created_at", label: t("common.field.created_at"), minWidth: 180 },
+  { prop: "updated_at", label: t("common.field.updated_at"), minWidth: 180 },
   {
     prop: "operation",
-    label: t("system.common.field.action"),
+    label: t("common.field.action"),
     width: 240,
     fixed: "right",
     cellType: "actions",
     actions: [
       {
-        label: t("system.dict.action.items"),
+        label: t("system.base.dict.action.items"),
         type: "primary",
         link: true,
         icon: List,
@@ -300,12 +294,16 @@ function handleSubmit() {
     if (!isValid) return;
 
     const submitData = JSON.parse(JSON.stringify(formData)) as BaseDictForm;
-    submitData.translations = serializeDynamicTranslations(translationValues.value, "name") as unknown as BaseDictTranslation[];
+    submitData.translations = serializeDynamicTranslations(
+      translationValues.value,
+      TranslationTargetType.TRANSLATION_TARGET_TYPE_BASE_DICT,
+      submitData.id
+    );
     const request = submitData.id
       ? defBaseDictService.UpdateBaseDict({ base_dict: submitData })
       : defBaseDictService.CreateBaseDict({ base_dict: submitData });
     request.then(() => {
-      ElMessage.success(t(submitData.id ? "system.dict.message.updateSuccess" : "system.dict.message.createSuccess"));
+      ElMessage.success(t(submitData.id ? "system.base.dict.message.update_success" : "system.base.dict.message.create_success"));
       handleCloseDialog();
       refreshTable();
     });
@@ -320,13 +318,17 @@ async function handleBeforeSetStatus(row: BaseDict) {
   const action = t(nextStatus === Status.ENABLE ? "common.status.enabled" : "common.status.disabled");
   const dictName = row.name || row.code || String(row.id);
   try {
-    await ElMessageBox.confirm(t("system.dict.message.confirmStatus", { action, name: dictName }), t("common.title.notice"), {
-      confirmButtonText: t("common.action.confirm"),
-      cancelButtonText: t("common.action.cancel"),
-      type: "warning"
-    });
+    await ElMessageBox.confirm(
+      t("system.base.dict.message.confirm_status", { action, name: dictName }),
+      t("common.title.notice"),
+      {
+        confirmButtonText: t("common.action.confirm"),
+        cancelButtonText: t("common.action.cancel"),
+        type: "warning"
+      }
+    );
     await defBaseDictService.SetBaseDictStatus({ id: row.id, status: nextStatus });
-    ElMessage.success(t("system.common.message.statusSuccess", { action }));
+    ElMessage.success(t("common.message.status_success", { action }));
     refreshTable();
     return true;
   } catch {
@@ -347,15 +349,17 @@ function handleDelete(selected?: number | string | Array<number | string> | Base
     dictList.length ? dictList.map(item => item.id) : normalizeSelectedIds(selected as number | string | Array<number | string>)
   ).join(",");
   if (!dictIds) {
-    ElMessage.warning(t("system.common.message.selectDeleteItem"));
+    ElMessage.warning(t("common.message.select_delete_item"));
     return;
   }
 
   const confirmMessage = dictList.length
     ? dictList.length === 1
-      ? t("system.dict.message.confirmDeleteSingle", { name: dictList[0].name || dictList[0].code || `ID:${dictList[0].id}` })
-      : t("system.dict.message.confirmDeleteBatch", { count: dictList.length })
-    : t("system.dict.message.confirmDeleteSelected");
+      ? t("system.base.dict.message.confirm_delete_single", {
+          name: dictList[0].name || dictList[0].code || `ID:${dictList[0].id}`
+        })
+      : t("system.base.dict.message.confirm_delete_batch", { count: dictList.length })
+    : t("system.base.dict.message.confirm_delete_selected");
 
   ElMessageBox.confirm(confirmMessage, t("common.title.warning"), {
     confirmButtonText: t("common.action.confirm"),
@@ -364,12 +368,12 @@ function handleDelete(selected?: number | string | Array<number | string> | Base
   }).then(
     () => {
       defBaseDictService.DeleteBaseDict({ id: dictIds }).then(() => {
-        ElMessage.success(t("system.dict.message.deleteSuccess"));
+        ElMessage.success(t("system.base.dict.message.delete_success"));
         refreshTable();
       });
     },
     () => {
-      ElMessage.info(t("system.dict.message.deleteCanceled"));
+      ElMessage.info(t("system.base.dict.message.delete_canceled"));
     }
   );
 }
@@ -378,6 +382,6 @@ function handleDelete(selected?: number | string | Array<number | string> | Base
  * 打开字典数据页面。
  */
 function handleOpenBaseDictItem(row: BaseDict) {
-  navigateTo(router, "/base/dict/item", { dictId: row.id, title: t("system.dict.title.items", { name: row.name }) });
+  navigateTo(router, "/base/dict/item", { dictId: row.id, title: t("system.base.dict.title.items", { name: row.name }) });
 }
 </script>