diff --git a/components/CustomIcon/IconFont.js b/components/CustomIcon/IconFont.js index 3786e9d7e94ca4a0ef16f41c7168b14f86b1fd70..4b9f9ecef59d87cb053291f3c1873ca7aeee180b 100755 --- a/components/CustomIcon/IconFont.js +++ b/components/CustomIcon/IconFont.js @@ -1,7 +1,7 @@ import { createFromIconfontCN } from '@ant-design/icons'; const IconFont = createFromIconfontCN({ - scriptUrl: 'https://influencer-attachment.mttop.cn/influencer/v2/website/20200524/iconFont.js', + scriptUrl: 'https://influencer-attachment.mttop.cn/influencer/v2/website/20200629/iconFont.js', }); export default IconFont; diff --git a/components/IconFont/IconFont.ts b/components/IconFont/IconFont.ts index cb9fe8b8679a80c1084ccc5e86f7fad1032fd1b6..4b9f9ecef59d87cb053291f3c1873ca7aeee180b 100755 --- a/components/IconFont/IconFont.ts +++ b/components/IconFont/IconFont.ts @@ -1,7 +1,7 @@ import { createFromIconfontCN } from '@ant-design/icons'; const IconFont = createFromIconfontCN({ - scriptUrl: 'https://influencer-attachment.mttop.cn//influencer/v2/website/20200613/iconFont.js', + scriptUrl: 'https://influencer-attachment.mttop.cn/influencer/v2/website/20200629/iconFont.js', }); export default IconFont; diff --git a/components/apolloTable/component/Cell.tsx b/components/apolloTable/component/Cell.tsx index 0e9188bf34b29c4a98954b9a59285f535eb5ab86..c485a7eb031296418220ef0a74fde05174981c7d 100644 --- a/components/apolloTable/component/Cell.tsx +++ b/components/apolloTable/component/Cell.tsx @@ -160,10 +160,15 @@ const Cell = (props: CellProps) => { return (current - 1) * pageSize + rowIndex + 1; }; const getCheckedIndex = () => { + if (!rowSelection) { + return -1; + } const { selectedRows } = rowSelection; - const index = selectedRows.findIndex((item: any) => { - return item.id === record.id; - }); + const index = + selectedRows && + selectedRows.findIndex((item: any) => { + return item.id === record.id; + }); return index; }; const getCheckbox = () => { diff --git a/components/apolloTable/component/base/detail/text-link/index.tsx b/components/apolloTable/component/base/detail/text-link/index.tsx index fa04a745e986c93e1c6e9b8347940b42ecb5643b..eff6e9b7316574bbbe5716354803c53848b79758 100644 --- a/components/apolloTable/component/base/detail/text-link/index.tsx +++ b/components/apolloTable/component/base/detail/text-link/index.tsx @@ -2,7 +2,7 @@ import React, { useState, useRef, useEffect } from 'react'; import { Popover } from 'antd'; import classNames from 'classnames'; import s from './index.less'; -import extendIcon from '../../../../assets/extend.png'; +import IconFont from '@/submodule/components/IconFont'; export const ApolloTextLinkDetail = (props: any) => { const { value, origin, formatter } = props; @@ -86,7 +86,7 @@ export const ApolloTextLinkDetail = (props: any) => { } >