diff --git a/src/hooks/common/form.ts b/src/hooks/common/form.ts index acc93560..eeac4847 100644 --- a/src/hooks/common/form.ts +++ b/src/hooks/common/form.ts @@ -71,8 +71,13 @@ export function useNaiveForm() { await formRef.value?.validate(); } + async function restoreValidation() { + formRef.value?.restoreValidation(); + } + return { formRef, - validate + validate, + restoreValidation }; } diff --git a/src/hooks/common/table.ts b/src/hooks/common/table.ts index 3c0277be..cafe2804 100644 --- a/src/hooks/common/table.ts +++ b/src/hooks/common/table.ts @@ -4,6 +4,7 @@ import type { DataTableBaseColumn, DataTableExpandColumn, DataTableSelectionColu import type { TableColumnGroup } from 'naive-ui/es/data-table/src/interface'; import { useBoolean, useLoading } from '@sa/hooks'; import { useAppStore } from '@/store/modules/app'; +import { $t } from '@/locales'; type BaseData = Record; @@ -174,6 +175,7 @@ function useTableColumn( function reloadColumns() { allColumns.value = factory(); + filteredColumns.value = getFilteredColumns(factory()); } function getFilteredColumns(aColumns: TableColumn[]) { @@ -191,7 +193,7 @@ function useTableColumn( if (column.type === 'selection') { cols.push({ key: SELECTION_KEY, - title: '勾选', + title: $t('common.check'), checked: true }); } diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts index 93df9182..44381587 100644 --- a/src/locales/langs/zh-cn.ts +++ b/src/locales/langs/zh-cn.ts @@ -4,7 +4,7 @@ const local: App.I18n.Schema = { }, common: { action: '操作', - add: '添加', + add: '新增', addSuccess: '添加成功', backToHome: '返回首页', batchDelete: '批量删除', @@ -265,7 +265,7 @@ const local: App.I18n.Schema = { roleCode: '角色编码', roleStatus: '角色状态', roleDesc: '角色描述', - addRole: '添加角色', + addRole: '新增角色', editRole: '编辑角色', status: { enable: '启用', diff --git a/src/views/manage/role/operate-role-drawer.vue b/src/views/manage/role/operate-role-drawer.vue index 64041d34..105d6f5d 100644 --- a/src/views/manage/role/operate-role-drawer.vue +++ b/src/views/manage/role/operate-role-drawer.vue @@ -36,7 +36,7 @@ const visible = defineModel('visible', { default: false }); -const { formRef, validate } = useNaiveForm(); +const { formRef, validate, restoreValidation } = useNaiveForm(); const { defaultRequiredRule } = useFormRules(); const title = computed(() => { @@ -94,6 +94,7 @@ async function handleSubmit() { watch(visible, () => { if (visible.value) { handleUpdateModelWhenEdit(); + restoreValidation(); } });