github_mirrors/gf-vben-admin
1
0
Fork 0
mirror of https://github.com/vbenjs/gf-vben-admin.git synced 2025-01-23 11:50:20 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'vben/main' into local

Browse Source
This commit is contained in:
JinMao 2022-05-05 08:01:44 +08:00
commit 3c58f6dce7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/Table/src/hooks/useColumns.ts
View File

@ -298,7 +298,7 @@ export function formatCell(text: string, format: CellFormat, record: Recordable,
try { try {
// date type // date type
const DATE_FORMAT_PREFIX = 'date|'; const DATE_FORMAT_PREFIX = 'date|';
if (isString(format) && format.startsWith(DATE_FORMAT_PREFIX)) { if (isString(format) && format.startsWith(DATE_FORMAT_PREFIX) && text) {
const dateFormat = format.replace(DATE_FORMAT_PREFIX, ''); const dateFormat = format.replace(DATE_FORMAT_PREFIX, '');
if (!dateFormat) { if (!dateFormat) {

4
src/router/routes/modules/about.ts
View File

@ -3,7 +3,7 @@ import type { AppRouteModule } from '/@/router/types';
import { LAYOUT } from '/@/router/constant'; import { LAYOUT } from '/@/router/constant';
import { t } from '/@/hooks/web/useI18n'; import { t } from '/@/hooks/web/useI18n';
const dashboard: AppRouteModule = { const about: AppRouteModule = {
path: '/about', path: '/about',
name: 'About', name: 'About',
component: LAYOUT, component: LAYOUT,
@ -28,4 +28,4 @@ const dashboard: AppRouteModule = {
], ],
}; };
export default dashboard; export default about;