inline conditional rendering (ant-design#107)

znspace · Oct 15, 2019 · 0f1e78d · 0f1e78d
1 parent d064557
commit 0f1e78d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 18 deletions.
diff --git a/AccountCenter/src/index.tsx b/AccountCenter/src/index.tsx
@@ -162,7 +162,7 @@ class PAGE_NAME_UPPER_CAMEL_CASE extends PureComponent<
         <Row gutter={24}>
           <Col lg={7} md={24}>
             <Card bordered={false} style={{ marginBottom: 24 }} loading={dataLoading}>
-              {!dataLoading ? (
+              {!dataLoading && (
                 <div>
                   <div className={styles.avatarHolder}>
                     <img alt="" src={currentUser.avatar} />
@@ -227,7 +227,7 @@ class PAGE_NAME_UPPER_CAMEL_CASE extends PureComponent<
                     </Row>
                   </div>
                 </div>
-              ) : null}
+              )}
             </Card>
           </Col>
           <Col lg={17} md={24}>

diff --git a/ListSearchArticles/src/index.tsx b/ListSearchArticles/src/index.tsx
@@ -99,20 +99,19 @@ class PAGE_NAME_UPPER_CAMEL_CASE extends Component<PAGE_NAME_UPPER_CAMEL_CASEPro
       },
     };
 
-    const loadMore =
-      list.length > 0 ? (
-        <div style={{ textAlign: 'center', marginTop: 16 }}>
-          <Button onClick={this.fetchMore} style={{ paddingLeft: 48, paddingRight: 48 }}>
-            {loading ? (
-              <span>
-                <Icon type="loading" /> 加载中...
-              </span>
-            ) : (
-              '加载更多'
-            )}
-          </Button>
-        </div>
-      ) : null;
+    const loadMore = list.length > 0 && (
+      <div style={{ textAlign: 'center', marginTop: 16 }}>
+        <Button onClick={this.fetchMore} style={{ paddingLeft: 48, paddingRight: 48 }}>
+          {loading ? (
+            <span>
+              <Icon type="loading" /> 加载中...
+            </span>
+          ) : (
+            '加载更多'
+          )}
+        </Button>
+      </div>
+    );
 
     return (
       <>

diff --git a/ListSearchProjects/src/index.tsx b/ListSearchProjects/src/index.tsx
@@ -41,7 +41,7 @@ class PAGE_NAME_UPPER_CAMEL_CASE extends Component<PAGE_NAME_UPPER_CAMEL_CASEPro
     } = this.props;
     const { getFieldDecorator } = form;
 
-    const cardList = list ? (
+    const cardList = list && (
       <List<ListItemDataType>
         rowKey="id"
         loading={loading}
@@ -80,7 +80,7 @@ class PAGE_NAME_UPPER_CAMEL_CASE extends Component<PAGE_NAME_UPPER_CAMEL_CASEPro
           </List.Item>
         )}
       />
-    ) : null;
+    );
 
     const formItemLayout = {
       wrapperCol: {