Merge pull request #61 from Tencent/develop

升级react-router-dom
Tencent · Apr 10, 2022 · 06ed5ae · 06ed5ae
2 parents 60af2e8 + 5ba83be
commit 06ed5ae
Show file tree

Hide file tree

Showing 61 changed files with 6,095 additions and 1,019 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tdesign-react-starter",
-  "version": "0.1.0",
+  "version": "0.1.3",
   "private": true,
   "scripts": {
     "dev:mock": "vite --open --mode mock",
@@ -21,11 +21,11 @@
     "@types/echarts": "^4.9.13",
     "@types/lodash": "^4.14.178",
     "@types/mockjs": "^1.0.6",
-    "@types/node": "^16.11.18",
+    "@types/node": "^17.0.23",
     "@types/qrcode.react": "^1.0.2",
     "@types/react": "^17.0.38",
     "@types/react-dom": "^17.0.11",
-    "@types/react-router-dom": "^5.3.2",
+    "@types/react-router-dom": "^5.3.3",
     "@vitejs/plugin-react": "^1.2.0",
     "eslint": "^8.3.0",
     "eslint-config-airbnb-base": "^15.0.0",
@@ -52,12 +52,11 @@
     "lodash": "^4.17.21",
     "mockjs": "^1.1.0",
     "qrcode.react": "^2.0.0",
-    "query-string": "^6.12.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-redux": "^7.2.4",
-    "react-router-dom": "^5.2.0",
-    "tdesign-icons-react": "0.0.8",
+    "react-router-dom": "^6.3.0",
+    "tdesign-icons-react": "0.0.9",
     "tdesign-react": "^0.30.1",
     "tvision-color": "^1.3.1"
   },

diff --git a/src/assets/svg/assets-logo-full.svg b/src/assets/svg/assets-logo-full.svg
diff --git a/src/assets/svg/assets-t-logo.svg b/src/assets/svg/assets-t-logo.svg
diff --git a/src/components/Board/index.module.less b/src/components/Board/index.module.less
@@ -1,16 +1,9 @@
-//.boardPanel {
-//  padding: 24px 32px;
-//  background: var(--td-bg-color-container);
-//  border-radius: 3px;
-//  width: 100%;
-//  display: flex;
-//  flex-direction: column;
-//  height: 168px;
-//  position: relative;
-//}
+.panel {
+  height: 160px
+}
 
 .boardPanelDark {
-  background: var(--td-brand-color);
+  background: var(--td-brand-color)!important;
   .boardTitle, .boardItemLeft, .boardItemDesc, .trendColorUp, .trendColorDown, .boardItemBottom {
     color: var(--td-text-color-anti);
   }
@@ -21,22 +14,6 @@
 
 .boardTitle {}
 
-//.boardTitle {
-//  display: flex;
-//  justify-content: space-between;
-//  font-size: 14px;
-//  line-height: 22px;
-//  color: var(--td-text-color-secondary);
-//  margin-bottom: 8px;
-//}
-//
-//.boardContainer {
-//  flex: 1;
-//  display: flex;
-//  flex-direction: column;
-//  justify-content: space-between;
-//}
-
 .boardItem {
   display: flex;
   justify-content: space-between;

diff --git a/src/components/Board/index.tsx b/src/components/Board/index.tsx
@@ -49,8 +49,7 @@ export const TrendIcon = ({ trend, trendNum }: { trend?: TTrend; trendNum?: stri
 const Board = ({ title, count, desc, trend, trendNum, Icon, dark, border }: IBoardProps) => (
   <Card
     title={<div className={Style.boardTitle}>{title}</div>}
-    style={{ height: 160 }}
-    className={classnames({
+    className={classnames(Style.panel, {
       [Style.boardPanelDark]: dark,
     })}
     border={border}

diff --git a/src/components/Card/index.tsx b/src/components/Card/index.tsx
@@ -9,7 +9,6 @@ export interface ICardProps {
   className?: string;
   border?: boolean;
   size?: 'small' | 'large';
-  [key: string]: any;
 }
 
 const Card = ({
@@ -20,7 +19,6 @@ const Card = ({
   border,
   className,
   size,
-  ...other
 }: React.PropsWithChildren<ICardProps>) => (
   <div
     className={classnames(
@@ -30,7 +28,6 @@ const Card = ({
       },
       className,
     )}
-    {...other}
   >
     <div className={Style.top}>
       <div className={Style.left}>

diff --git a/src/components/PageBox/index.tsx b/src/components/PageBox/index.tsx
@@ -13,8 +13,8 @@ export interface IPageBoxProps {
 
 const PageBox: React.FC<React.PropsWithChildren<IPageBoxProps>> = ({
   children,
-  withColor = true,
-  withPadding = true,
+  withColor,
+  withPadding,
   className,
   ...others
 }) => (