Browse Source

Merge pull request #270 from nameczz/dev

fix wrong link
ryjiang 3 years ago
parent
commit
e53aa66b42

+ 1 - 1
client/src/i18n/cn/insert.ts

@@ -8,7 +8,7 @@ const insertTrans = {
   noteTitle: 'Note',
   noteTitle: 'Note',
   notes: [
   notes: [
     `Make sure column names in the data are same as the field label names in Schema.`,
     `Make sure column names in the data are same as the field label names in Schema.`,
-    `Data size should be less than 5MB and the number of rows should be less than 100000, for the data to be imported properly.`,
+    `Data size should be less than 150MB and the number of rows should be less than 100000, for the data to be imported properly.`,
     `The "Import Data" option will only append new records. You cannot update existing records using this option.`,
     `The "Import Data" option will only append new records. You cannot update existing records using this option.`,
   ],
   ],
   overSizeWarning: 'File data size should less than {{size}}MB',
   overSizeWarning: 'File data size should less than {{size}}MB',

+ 1 - 1
client/src/i18n/en/insert.ts

@@ -8,7 +8,7 @@ const insertTrans = {
   noteTitle: 'Note',
   noteTitle: 'Note',
   notes: [
   notes: [
     `Make sure column names in the data are same as the field label names in Schema.`,
     `Make sure column names in the data are same as the field label names in Schema.`,
-    `Data size should be less than 5MB and the number of rows should be less than 100000, for the data to be imported properly.`,
+    `Data size should be less than 150MB and the number of rows should be less than 100000, for the data to be imported properly.`,
     `The "Import Data" option will only append new records. You cannot update existing records using this option.`,
     `The "Import Data" option will only append new records. You cannot update existing records using this option.`,
   ],
   ],
   overSizeWarning: 'File data size should less than {{size}}MB',
   overSizeWarning: 'File data size should less than {{size}}MB',

+ 15 - 23
client/src/pages/overview/collectionCard/CollectionCard.tsx

@@ -1,10 +1,4 @@
-import {
-  makeStyles,
-  Theme,
-  Link,
-  Typography,
-  Divider,
-} from '@material-ui/core';
+import { makeStyles, Theme, Typography, Divider } from '@material-ui/core';
 import { FC } from 'react';
 import { FC } from 'react';
 import CustomButton from '../../../components/customButton/CustomButton';
 import CustomButton from '../../../components/customButton/CustomButton';
 import icons from '../../../components/icons/Icons';
 import icons from '../../../components/icons/Icons';
@@ -13,29 +7,31 @@ import CustomToolTip from '../../../components/customToolTip/CustomToolTip';
 import { CollectionCardProps } from './Types';
 import { CollectionCardProps } from './Types';
 import { useTranslation } from 'react-i18next';
 import { useTranslation } from 'react-i18next';
 import CustomIconButton from '../../../components/customButton/CustomIconButton';
 import CustomIconButton from '../../../components/customButton/CustomIconButton';
-import { useHistory } from 'react-router-dom';
+import { useHistory, Link } from 'react-router-dom';
 import { LOADING_STATE } from '../../../consts/Milvus';
 import { LOADING_STATE } from '../../../consts/Milvus';
 
 
 const useStyles = makeStyles((theme: Theme) => ({
 const useStyles = makeStyles((theme: Theme) => ({
   wrapper: {
   wrapper: {
     padding: theme.spacing(2),
     padding: theme.spacing(2),
     textAlign: 'end',
     textAlign: 'end',
+    '& .link': {
+      display: 'flex',
+      alignItems: 'center',
+
+      margin: theme.spacing(2, 0),
+
+      color: theme.palette.milvusDark.main,
+      fontSize: '20px',
+      lineHeight: '24px',
+      fontWeight: 'bold',
+      textDecoration: 'none',
+    },
   },
   },
   loading: {
   loading: {
     background: '#F0F4F9',
     background: '#F0F4F9',
     border: `1px dashed #06AFF2`,
     border: `1px dashed #06AFF2`,
   },
   },
-  link: {
-    display: 'flex',
-    alignItems: 'center',
-
-    margin: theme.spacing(2, 0),
 
 
-    color: theme.palette.milvusDark.main,
-    fontSize: '20px',
-    lineHeight: '24px',
-    fontWeight: 'bold',
-  },
   icon: {
   icon: {
     color: theme.palette.primary.main,
     color: theme.palette.primary.main,
     marginLeft: theme.spacing(0.5),
     marginLeft: theme.spacing(0.5),
@@ -115,11 +111,7 @@ const CollectionCard: FC<CollectionCardProps> = ({
       <div>
       <div>
         <Status status={status} percentage={_loadedPercentage} />
         <Status status={status} percentage={_loadedPercentage} />
       </div>
       </div>
-      <Link
-        classes={{ root: classes.link }}
-        underline="none"
-        href={`/collections/${name}`}
-      >
+      <Link className="link" to={`/collections/${name}`}>
         {name}
         {name}
         <RightArrowIcon classes={{ root: classes.icon }} />
         <RightArrowIcon classes={{ root: classes.icon }} />
       </Link>
       </Link>