diff --git a/apps/web-antd/src/locales/langs/en-US/utils.json b/apps/web-antd/src/locales/langs/en-US/utils.json new file mode 100644 index 00000000..b9206eff --- /dev/null +++ b/apps/web-antd/src/locales/langs/en-US/utils.json @@ -0,0 +1,14 @@ +{ + "rangePicker": { + "today": "Today", + "last7Days": "Last 7 Days", + "last30Days": "Last 30 Days", + "yesterday": "Yesterday", + "thisWeek": "This Week", + "thisMonth": "This Month", + "lastWeek": "Last Week", + "lastMonth": "Last Month", + "beginTime": "Begin Time", + "endTime": "End Time" + } +} diff --git a/apps/web-antd/src/locales/langs/zh-CN/utils.json b/apps/web-antd/src/locales/langs/zh-CN/utils.json new file mode 100644 index 00000000..d26f1f2c --- /dev/null +++ b/apps/web-antd/src/locales/langs/zh-CN/utils.json @@ -0,0 +1,14 @@ +{ + "rangePicker": { + "today": "今天", + "last7Days": "最近 7 天", + "last30Days": "最近 30 天", + "yesterday": "昨天", + "thisWeek": "本周", + "thisMonth": "本月", + "lastWeek": "上周", + "lastMonth": "上月", + "beginTime": "开始时间", + "endTime": "结束时间" + } +} diff --git a/apps/web-antd/src/utils/rangePickerProps.ts b/apps/web-antd/src/utils/rangePickerProps.ts index e88a1959..245e3d81 100644 --- a/apps/web-antd/src/utils/rangePickerProps.ts +++ b/apps/web-antd/src/utils/rangePickerProps.ts @@ -2,33 +2,43 @@ import type { Dayjs } from 'dayjs'; import dayjs from 'dayjs'; +import { $t } from '#/locales'; + /** 时间段选择器拓展 */ export function getRangePickerDefaultProps() { return { format: 'YYYY-MM-DD HH:mm:ss', - placeholder: ['开始时间', '结束时间'], + placeholder: [ + $t('utils.rangePicker.beginTime'), + $t('utils.rangePicker.endTime'), + ], ranges: { - 今天: () => + [$t('utils.rangePicker.today')]: () => [dayjs().startOf('day'), dayjs().endOf('day')] as [Dayjs, Dayjs], - '最近 7 天': () => + [$t('utils.rangePicker.last7Days')]: () => [dayjs().subtract(7, 'day').startOf('day'), dayjs().endOf('day')] as [ Dayjs, Dayjs, ], - '最近 30 天': () => + [$t('utils.rangePicker.last30Days')]: () => [dayjs().subtract(30, 'day').startOf('day'), dayjs().endOf('day')] as [ Dayjs, Dayjs, ], - 昨天: () => + [$t('utils.rangePicker.yesterday')]: () => [ dayjs().subtract(1, 'day').startOf('day'), dayjs().subtract(1, 'day').endOf('day'), ] as [Dayjs, Dayjs], - 本周: () => + [$t('utils.rangePicker.thisWeek')]: () => [dayjs().startOf('week'), dayjs().endOf('day')] as [Dayjs, Dayjs], - 本月: () => + [$t('utils.rangePicker.thisMonth')]: () => [dayjs().startOf('month'), dayjs().endOf('day')] as [Dayjs, Dayjs], + [$t('utils.rangePicker.lastWeek')]: () => + [dayjs().subtract(1, 'week').startOf('day'), dayjs().endOf('day')] as [ + Dayjs, + Dayjs, + ], }, showTime: { defaultValue: [ diff --git a/apps/web-antd/src/views/infra/codegen/data.ts b/apps/web-antd/src/views/infra/codegen/data.ts index 90ccb899..b9b354a2 100644 --- a/apps/web-antd/src/views/infra/codegen/data.ts +++ b/apps/web-antd/src/views/infra/codegen/data.ts @@ -9,11 +9,11 @@ import { h } from 'vue'; import { useAccess } from '@vben/access'; import { IconifyIcon } from '@vben/icons'; -import { $t } from '@vben/locales'; import { handleTree } from '@vben/utils'; import { getDataSourceConfigList } from '#/api/infra/data-source-config'; import { getMenuList } from '#/api/system/menu'; +import { $t } from '#/locales'; import { DICT_TYPE, getDictOptions, getRangePickerDefaultProps } from '#/utils'; const { hasAccessByCodes } = useAccess(); diff --git a/apps/web-antd/src/views/infra/codegen/modules/import-table.vue b/apps/web-antd/src/views/infra/codegen/modules/import-table.vue index ecf8a375..d321bde3 100644 --- a/apps/web-antd/src/views/infra/codegen/modules/import-table.vue +++ b/apps/web-antd/src/views/infra/codegen/modules/import-table.vue @@ -5,12 +5,12 @@ import type { InfraCodegenApi } from '#/api/infra/codegen'; import { reactive } from 'vue'; import { useVbenModal } from '@vben/common-ui'; -import { $t } from '@vben/locales'; import { message } from 'ant-design-vue'; import { useVbenVxeGrid } from '#/adapter/vxe-table'; import { createCodegenList, getSchemaTableList } from '#/api/infra/codegen'; +import { $t } from '#/locales'; import { useImportTableColumns, useImportTableFormSchema,