Merge branch 'uid' into dev

Author: mydearxym

components/AvatarsRow/index.js

@@ -13,7 +13,7 @@ import { ATATARS_LIST_LENGTH } from '../../config/general'
 
 import { Avatars, AvatarsItem, AvatarsImg, AvatarsMore } from './styles'
 
-import { makeDebugger, prettyNum, uid } from '../../utils'
+import { makeDebugger, prettyNum } from '../../utils'
 
 /* eslint-disable no-unused-vars */
 const debug = makeDebugger('c:AvatarsRow:index')
@@ -48,7 +48,7 @@ const AvatarsRow = ({
       )}
 
       {R.slice(0, limit, users).map(user => (
-        <AvatarsItem key={uid.gen()} onClick={onUserSelect.bind(this, user)}>
+        <AvatarsItem key={user.id} onClick={onUserSelect.bind(this, user)}>
           <Tooltip title={user.nickname}>
             <AvatarsImg src={user.avatar} />
           </Tooltip>

components/CommunityList/index.js

@@ -11,7 +11,7 @@ import R from 'ramda'
 import Popover from '../Popover'
 import { Wrapper, Logo, PopoverInfo } from './styles'
 
-import { uid, makeDebugger } from '../../utils'
+import { makeDebugger } from '../../utils'
 
 /* eslint-disable no-unused-vars */
 const debug = makeDebugger('c:CommunityList:index')
@@ -28,7 +28,7 @@ const CommunityList = ({ items, emptyHint }) => {
     <Wrapper>
       {items.map(community => (
         <Popover
-          key={uid.gen()}
+          key={community.id}
           placement="bottom"
           trigger="hover"
           content={<PopoverInfo>{community.title}</PopoverInfo>}

components/ContentFilter/JobEducationFilter.js

@@ -11,7 +11,7 @@ import {
   SelectItem,
 } from './styles'
 
-import { uid } from '../../utils'
+// import { uid } from '../../utils'
 
 const JobEducationFilter = ({ activeFilter, onSelect }) => (
   <ColumnWrapper>
@@ -23,7 +23,7 @@ const JobEducationFilter = ({ activeFilter, onSelect }) => (
 
     {LABEL_POOL.education.data.map(item => (
       <SelectItem
-        key={uid.gen()}
+        key={item}
         active={activeFilter.jobEducation === item}
         onClick={onSelect.bind(this, { jobEducation: item })}
       >

components/ContentFilter/JobExpFilter.js

@@ -12,7 +12,7 @@ import {
   SelectItem,
 } from './styles'
 
-import { uid } from '../../utils'
+// import { uid } from '../../utils'
 
 const JobExpFilter = ({ activeFilter, onSelect }) => (
   <ColumnWrapper>
@@ -25,7 +25,7 @@ const JobExpFilter = ({ activeFilter, onSelect }) => (
     <LeftAlignWrapper>
       {LABEL_POOL.exp.data.map(item => (
         <SelectItem
-          key={uid.gen()}
+          key={item}
           active={activeFilter.jobExp === item}
           onClick={onSelect.bind(this, { jobExp: item })}
         >

components/ContentFilter/JobFieldFilter.js

@@ -12,7 +12,7 @@ import {
   SelectItem,
 } from './styles'
 
-import { uid } from '../../utils'
+// import { uid } from '../../utils'
 
 const JobFieldFilter = ({ activeFilter, onSelect }) => (
   <ColumnWrapper>
@@ -24,7 +24,7 @@ const JobFieldFilter = ({ activeFilter, onSelect }) => (
     <LeftAlignWrapper>
       {LABEL_POOL.field.data.map(item => (
         <SelectItem
-          key={uid.gen()}
+          key={item}
           active={activeFilter.jobField === item}
           onClick={onSelect.bind(this, { jobField: item })}
         >

components/ContentFilter/JobFinaceFilter.js

@@ -12,7 +12,7 @@ import {
   SelectItem,
 } from './styles'
 
-import { uid } from '../../utils'
+// import { uid } from '../../utils'
 
 const JobFinaceFilter = ({ activeFilter, onSelect }) => (
   <ColumnWrapper>
@@ -25,7 +25,7 @@ const JobFinaceFilter = ({ activeFilter, onSelect }) => (
     <LeftAlignWrapper>
       {LABEL_POOL.finance.data.map(item => (
         <SelectItem
-          key={uid.gen()}
+          key={item}
           active={activeFilter.jobFinace === item}
           onClick={onSelect.bind(this, { jobFinace: item })}
         >

components/ContentFilter/JobSalaryFilter.js

@@ -12,7 +12,7 @@ import {
   SelectItem,
 } from './styles'
 
-import { uid } from '../../utils'
+// import { uid } from '../../utils'
 
 const JobSalaryFilter = ({ activeFilter, onSelect }) => (
   <ColumnWrapper>
@@ -25,7 +25,7 @@ const JobSalaryFilter = ({ activeFilter, onSelect }) => (
     <LeftAlignWrapper>
       {LABEL_POOL.salary.data.map(item => (
         <SelectItem
-          key={uid.gen()}
+          key={item}
           active={activeFilter.jobSalary === item}
           onClick={onSelect.bind(this, { jobSalary: item })}
         >

components/ContentFilter/JobScaleFilter.js

@@ -12,7 +12,7 @@ import {
   SelectItem,
 } from './styles'
 
-import { uid } from '../../utils'
+// import { uid } from '../../utils'
 
 const JobScaleFilter = ({ activeFilter, onSelect }) => (
   <ColumnWrapper>
@@ -25,7 +25,7 @@ const JobScaleFilter = ({ activeFilter, onSelect }) => (
     <LeftAlignWrapper>
       {LABEL_POOL.scale.data.map(item => (
         <SelectItem
-          key={uid.gen()}
+          key={item}
           active={activeFilter.jobScale === item}
           onClick={onSelect.bind(this, { jobScale: item })}
         >

components/ContentSourceCard/TagList.js

@@ -3,15 +3,13 @@ import R from 'ramda'
 
 import { Wrapper, TagDot, TagTitle, NomoreDesc } from './styles/tag_list'
 
-import { uid } from '../../utils'
-
 const TagList = ({ items }) => {
   if (R.isEmpty(items)) return <NomoreDesc>无标签</NomoreDesc>
 
   return (
     <React.Fragment>
       {items.map(t => (
-        <Wrapper key={uid.gen()}>
+        <Wrapper key={t.id}>
           <TagDot color={t.color} />
           <TagTitle>{t.title}</TagTitle>
         </Wrapper>

components/ContentSourceCard/UserList.js

@@ -2,13 +2,12 @@ import React from 'react'
 
 import Popover from '../Popover'
 import { Wrapper, Avatar, PopInfo } from './styles/user_list'
-import { uid } from '../../utils'
 
 const UserList = ({ items }) => (
   <Wrapper>
     {items.map(user => (
       <Popover
-        key={uid.gen()}
+        key={user.id}
         placement="bottom"
         trigger="hover"
         content={<PopInfo>{user.nickname}</PopInfo>}