Merge pull request #55 from micro-in-cn/feature/dashboard

Feature/dashboard
stack-labs · Jul 22, 2020 · 2fa967f · 2fa967f
2 parents d48ff55 + ff6e67f
commit 2fa967f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/dashboard/src/App.tsx b/dashboard/src/App.tsx
@@ -1,7 +1,7 @@
 import React, { Suspense, useEffect, useMemo, useState } from 'react';
 import { Redirect, Route, Router, Switch } from 'react-router-dom';
 import { ConfigProvider } from 'antd';
-import { createBrowserHistory } from 'history';
+import { createHashHistory } from 'history';
 import { useTranslation } from 'react-i18next';
 
 import AppLayout from '@src/AppLayout';
@@ -10,7 +10,7 @@ import i18n, { antLocales } from '@src/i18n';
 import { getMenus, getRoutes } from '@src/pages';
 import { getLanguage, parseSearch } from '@src/tools';
 
-const history = createBrowserHistory({ basename: process.env.NODE_ENV === 'production' ? '/admin/ui' : '/' });
+const history = createHashHistory();
 const getLang = (search: string) => {
   const { lang } = parseSearch(search);
   return getLanguage(lang);

diff --git a/dashboard/src/locales/en_us.ts b/dashboard/src/locales/en_us.ts
@@ -39,7 +39,7 @@ const locale: Locale = {
     'table.columns.desc': 'Description',
     'table.columns.status': 'Status',
     'table.columns.createdAt': 'CreatedAt',
-    'table.columns.updatedAt': 'updatedAt',
+    'table.columns.updatedAt': 'UpdatedAt',
     'table.columns.control': 'Control',
     'table.columns.control.view': 'View',
     'table.columns.control.history': 'History',