Merge pull request #3 from CovenantSQL/dev

Dev

Author: foreseaz

src/components/Layout/Menu.js

@@ -112,7 +112,7 @@ class SiderMenu extends PureComponent {
         mode="inline"
         theme={theme}
         onOpenChange={this.onOpenChange}
-        inlineCollapsed={collapsed}
+        collapsed={String(collapsed)}
         selectedKeys={selectedKeys}
         onClick={
           isMobile

src/components/Layout/Sider.js

@@ -40,7 +40,7 @@ class Sider extends PureComponent {
 
         <div className={styles.menuContainer}>
           <ScrollBar
-            option={{
+            options={{
               // Disabled horizontal scrolling, https://github.com/utatti/perfect-scrollbar#options
               suppressScrollX: true,
             }}

src/models/app.js

@@ -7,7 +7,7 @@ import { message } from 'antd'
 import { ROLE_TYPE } from 'utils/constant'
 import { queryLayout, pathMatchRegexp } from 'utils'
 import { CANCEL_REQUEST_MESSAGE, USER_PERMISSION } from 'utils/constant'
-import { find } from 'lodash'
+import { find, unionBy } from 'lodash'
 import routes from 'utils/routes'
 import api from 'api'
 import config from 'config'
@@ -36,15 +36,7 @@ export default {
     permissions: {
       visit: [],
     },
-    routeList: [
-      {
-        id: '1',
-        icon: 'laptop',
-        name: 'Dashboard',
-        zhName: '仪表盘',
-        router: '/dashboard',
-      },
-    ],
+    routeList: routes,
     locationPathname: '',
     locationQuery: {},
     notifications: [
@@ -255,10 +247,12 @@ export default {
 
       yield put({ type: 'updateRoutes', payload: { append: routesToAppend } })
     },
-    *updateRoutes({ payload }, { put }) {
-      let routeList = routes
+    *updateRoutes({ payload }, { put, select }) {
+      const _app = yield select(_ => _.app)
+      let routeList = _app.routeList
+
       if (payload && payload.append) {
-        routeList = routeList.concat(payload.append)
+        routeList = unionBy(routeList, payload.append, 'id')
       }
 
       let permissions = USER_PERMISSION.DEVELOPER

src/pages/dashboard/components/taskList.js

@@ -71,17 +71,24 @@ class TaskList extends PureComponent {
       {
         title: 'Created',
         dataIndex: 'created',
-        render: text => moment(text).format('MM-DD HH:mm:ss'),
+        render: text => {
+          let d = new Date(text)
+          return moment(d).format('MM-DD HH:mm:ss')
+        },
       },
       {
         title: 'Finished',
         dataIndex: 'finished',
-        render: text =>
-          text
-            ? moment(text)
-                .startOf('second')
-                .fromNow()
-            : '-',
+        render: text => {
+          if (text) {
+            let d = new Date(text)
+            return moment(d)
+              .startOf('second')
+              .fromNow()
+          } else {
+            return '-'
+          }
+        },
       },
       {
         title: 'Details',