Merge branch 'upgrade-pkg' into dev

Author: mydearxym

components/A/index.js

@@ -19,13 +19,11 @@ export const StyledA = styled.a`
   }
 `
 
-function A(props) {
-  return (
-    <StyledA href={props.href} rel="noopener noreferrer" target={props.target}>
-      {props.children}
-    </StyledA>
-  )
-}
+const A = ({ href, target, children }) => (
+  <StyledA href={href} rel="noopener noreferrer" target={target}>
+    {children}
+  </StyledA>
+)
 
 A.propTypes = {
   href: PropTypes.oneOfType([PropTypes.string, PropTypes.object]).isRequired,

components/AdderCell/styles/index.js

@@ -1,7 +1,7 @@
 import styled from 'styled-components'
 
+import Img from '../../Img'
 import { Animate } from '../../../utils'
-import { Img } from '../../../components'
 
 export const AddWrapper = styled.div`
   display: flex;

components/AvatarsRow/index.js

@@ -8,9 +8,9 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import R from 'ramda'
 
+import { Tooltip } from 'antd'
 import { ATATARS_LIST_LENGTH } from '../../config/general'
 
-import { Tooltip } from '../../components'
 import { Avatars, AvatarsItem, AvatarsImg, AvatarsMore } from './styles'
 
 /* eslint-disable no-unused-vars */
@@ -19,7 +19,10 @@ import { makeDebugger, prettyNum, uid } from '../../utils'
 const debug = makeDebugger('c:AvatarsRow:index')
 /* eslint-enable no-unused-vars */
 
-const validUser = R.compose(R.not, R.isNil)
+const validUser = R.compose(
+  R.not,
+  R.isNil
+)
 
 const AvatarsRow = ({
   users,

components/BannerCountBrief/index.js

@@ -26,22 +26,30 @@ const CountBrief = ({ filteredCount, totalCount, thread, unit }) => {
     return (
       <Result>
         <ResultBottom>
-          <ResultText>当前共有{thread}</ResultText>
+          <ResultText>
+            当前共有
+            {thread}
+          </ResultText>
           <ResultNumber>{totalCount} </ResultNumber>
           <ResultText>{unit}</ResultText>
         </ResultBottom>
       </Result>
     )
-  } else if (filteredCount < 0 && totalCount === 0) {
+  }
+  if (filteredCount < 0 && totalCount === 0) {
     return <Result>正在加载, 请稍后...</Result>
   }
   return (
     <Result>
       <ResultTop>
-        {thread}总数为 {totalCount} {unit}
+        {thread}
+        总数为 {totalCount} {unit}
       </ResultTop>
       <ResultBottom>
-        <ResultText>符合当前条件的{thread}</ResultText>
+        <ResultText>
+          符合当前条件的
+          {thread}
+        </ResultText>
         <ResultNumber>{filteredCount} </ResultNumber>
         <ResultText>
           {unit}, 占比 {toPercentNum(filteredCount, totalCount)}

components/CategoriesCell/index.js

@@ -7,10 +7,11 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 import R from 'ramda'
+import { Icon } from 'antd'
 
 import { ICON_CMD } from '../../config'
 
-import { AdderCell, Icon } from '../../components'
+import AdderCell from '../AdderCell'
 
 import {
   Wrapper,

components/CategoriesCell/styles/index.js

@@ -1,7 +1,7 @@
 import styled from 'styled-components'
 
+import Img from '../../Img'
 import { Animate } from '../../../utils'
-import { Img } from '../../../components'
 
 export const UnsetText = styled.div`
   color: tomato;

components/CommunityCell/index.js

@@ -10,7 +10,8 @@ import PropTypes from 'prop-types'
 import ReactTooltip from 'react-tooltip'
 
 import { ICON_CMD } from '../../config'
-import { AdderCell } from '../../components'
+
+import AdderCell from '../AdderCell'
 
 import {
   Wrapper,
@@ -71,7 +72,8 @@ const renderContent = props => {
   const { data, array, withSetter, source, thread, onAdd, onDelete } = props
   if (!R.isEmpty(data)) {
     return <SingleCommunity community={data} />
-  } else if (withSetter && !R.isEmpty(array)) {
+  }
+  if (withSetter && !R.isEmpty(array)) {
     return (
       <Wrapper>
         <CommunitiesSetter
@@ -85,7 +87,8 @@ const renderContent = props => {
         </div>
       </Wrapper>
     )
-  } else if (!R.isEmpty(array)) {
+  }
+  if (!R.isEmpty(array)) {
     return (
       <Wrapper>
         <CommunitiesLogoArray array={array} />

components/CommunityCell/styles/index.js

@@ -1,7 +1,7 @@
 import styled from 'styled-components'
 
+import Img from '../../Img'
 import { Animate } from '../../../utils'
-import { Img } from '../../../components'
 
 export const Wrapper = styled.div`
   display: flex;

components/CommunityMatrix/styles/index.js

@@ -1,6 +1,6 @@
 import styled from 'styled-components'
-import { Img } from '../../../components'
 
+import Img from '../../Img'
 import { smokey } from '../../../utils'
 
 export const MatrixWrapper = styled.div`

components/ContentFilter/index.js

@@ -7,7 +7,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 import { Button, Row, Col, Tag } from 'antd'
-import { Popover } from '../../components'
+import Popover from '../Popover'
 
 import { ICON_CMD } from '../../config'