From 3ba70d7789ba58a07f2fe1e15417af28b75f50cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=B8=85?= <qixian.cs@outlook.com>
Date: Wed, 29 May 2019 16:33:56 +0800
Subject: [PATCH] support dart

---
 .../src/components/Charts/TimelineChart/index.less       | 2 +-
 FormAdvancedForm/src/components/FooterToolbar/index.less | 2 +-
 ListBasicList/src/Result/index.less                      | 2 +-
 ListCardList/src/index.tsx                               | 2 +-
 ListCardList/src/style.less                              | 5 +----
 ListSearchApplications/src/style.less                    | 4 +---
 ResultFail/src/index.less                                | 5 +++++
 ResultFail/src/index.tsx                                 | 9 +++++++--
 package.json                                             | 2 +-
 9 files changed, 19 insertions(+), 14 deletions(-)
 create mode 100644 ResultFail/src/index.less

diff --git a/DashboardAnalysis/src/components/Charts/TimelineChart/index.less b/DashboardAnalysis/src/components/Charts/TimelineChart/index.less
index 17519756..208ffd89 100644
--- a/DashboardAnalysis/src/components/Charts/TimelineChart/index.less
+++ b/DashboardAnalysis/src/components/Charts/TimelineChart/index.less
@@ -1,3 +1,3 @@
 .timelineChart {
-  background: #fff;
+  background: @component-background;
 }
diff --git a/FormAdvancedForm/src/components/FooterToolbar/index.less b/FormAdvancedForm/src/components/FooterToolbar/index.less
index 5073cff6..ad87199b 100644
--- a/FormAdvancedForm/src/components/FooterToolbar/index.less
+++ b/FormAdvancedForm/src/components/FooterToolbar/index.less
@@ -9,7 +9,7 @@
   height: 56px;
   padding: 0 24px;
   line-height: 56px;
-  background: #fff;
+  background: @component-background;
   border-top: 1px solid @border-color-split;
   box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.03);
 
diff --git a/ListBasicList/src/Result/index.less b/ListBasicList/src/Result/index.less
index 00c95879..cc4ed6eb 100644
--- a/ListBasicList/src/Result/index.less
+++ b/ListBasicList/src/Result/index.less
@@ -40,7 +40,7 @@
   .extra {
     padding: 24px 40px;
     text-align: left;
-    background: #fafafa;
+    background: @component-background;
     border-radius: @border-radius-sm;
 
     @media screen and (max-width: @screen-xs) {
diff --git a/ListCardList/src/index.tsx b/ListCardList/src/index.tsx
index 27beda26..f5e8e915 100644
--- a/ListCardList/src/index.tsx
+++ b/ListCardList/src/index.tsx
@@ -96,7 +96,7 @@ class PAGE_NAME_UPPER_CAMEL_CASE extends Component<
             grid={{ gutter: 24, lg: 3, md: 2, sm: 1, xs: 1 }}
             dataSource={[nullData, ...list]}
             renderItem={item =>
-              item ? (
+              item && item.id ? (
                 <List.Item key={item.id}>
                   <Card
                     hoverable
diff --git a/ListCardList/src/style.less b/ListCardList/src/style.less
index f0674364..2189a160 100644
--- a/ListCardList/src/style.less
+++ b/ListCardList/src/style.less
@@ -14,9 +14,6 @@
           color: @heading-color;
         }
       }
-      .ant-card-actions {
-        background: #f7f9fa;
-      }
       .ant-card-body:hover {
         .ant-card-meta-title > a {
           color: @primary-color;
@@ -48,7 +45,7 @@
   width: 100%;
   height: 188px;
   color: @text-color-secondary;
-  background-color: #fff;
+  background-color: @component-background;
   border-color: @border-color-base;
   border-radius: @border-radius-sm;
 }
diff --git a/ListSearchApplications/src/style.less b/ListSearchApplications/src/style.less
index 6fa63e32..a8ad7554 100644
--- a/ListSearchApplications/src/style.less
+++ b/ListSearchApplications/src/style.less
@@ -10,9 +10,7 @@
     .ant-card-meta-avatar {
       font-size: 0;
     }
-    .ant-card-actions {
-      background: #f7f9fa;
-    }
+
     .ant-list .ant-list-item-content-single {
       max-width: 100%;
     }
diff --git a/ResultFail/src/index.less b/ResultFail/src/index.less
new file mode 100644
index 00000000..c594abfd
--- /dev/null
+++ b/ResultFail/src/index.less
@@ -0,0 +1,5 @@
+@import '~antd/lib/style/themes/default.less';
+
+.error_icon {
+  color: @highlight-color;
+}
diff --git a/ResultFail/src/index.tsx b/ResultFail/src/index.tsx
index e410ba56..b4be7061 100644
--- a/ResultFail/src/index.tsx
+++ b/ResultFail/src/index.tsx
@@ -3,6 +3,7 @@ import { formatMessage, FormattedMessage } from 'umi-plugin-react/locale';
 import { Button, Icon, Card } from 'antd';
 import Result from './Result';
 import { GridContent } from '@ant-design/pro-layout';
+import styles from './index.less';
 
 const extra = (
   <Fragment>
@@ -20,7 +21,7 @@ const extra = (
       />
     </div>
     <div style={{ marginBottom: 16 }}>
-      <Icon style={{ color: '#f5222d', marginRight: 8 }} type="close-circle-o" />
+      <Icon style={{ marginRight: 8 }} className={styles.error_icon} type="close-circle-o" />
       <FormattedMessage
         id="BLOCK_NAME.error.hint-text1"
         defaultMessage="Your account has been frozen"
@@ -31,7 +32,11 @@ const extra = (
       </a>
     </div>
     <div>
-      <Icon style={{ color: '#f5222d', marginRight: 8 }} type="close-circle-o" />
+      <Icon
+        style={{ color: '#f5222d', marginRight: 8 }}
+        className={styles.error_icon}
+        type="close-circle-o"
+      />
       <FormattedMessage
         id="BLOCK_NAME.error.hint-text2"
         defaultMessage="Your account is not yet eligible to apply"
diff --git a/package.json b/package.json
index bc2c6288..2963b26a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "scripts": {
-    "dev": "cross-env PAGES_PATH='AccountSettings/src' umi dev",
+    "dev": "cross-env PAGES_PATH='ListCardList/src' umi dev",
     "lint": "npm run lint:ts && npm run lint:style && npm run lint:prettier",
     "lint-staged": "lint-staged",
     "lint-staged:ts": "tslint",
-- 
GitLab