Parcourir la source

refactor: remove iconfont component

lanjianrong il y a 3 ans
Parent
commit
042c4fa04a

+ 1 - 2
config/defaultSettings.ts

@@ -14,8 +14,7 @@ const Settings: LayoutSettings & {
   colorWeak: false,
   title: '指标库后台',
   pwa: false,
-  logo: '/logo.png',
-  iconfontUrl: '//at.alicdn.com/t/font_2906856_2hmrdvasx37.js'
+  logo: '/logo.png'
 }
 
 export default Settings

+ 0 - 7
src/components/IconFont/index.tsx

@@ -1,7 +0,0 @@
-import { createFromIconfontCN } from '@ant-design/icons'
-
-const IconFont = createFromIconfontCN({
-  scriptUrl: ['//at.alicdn.com/t/font_2906856_7fztb9pnp5.js']
-})
-
-export default IconFont

+ 2 - 4
src/pages/Institutions/Company/Detail/components/Staff.tsx

@@ -12,9 +12,9 @@ import { BaseMenuEnum } from '@/pages/Schema/Base'
 import { generateColumns } from '@/utils/util'
 import AnimateContent from '@/components/AnimateContent'
 import { ModalType } from '@/utils/enum'
-import IconFont from '@/components/IconFont'
 import type { ColumnsStateType } from '@ant-design/pro-table/lib/typing'
 import { BackstagePermission } from '@/enums/access'
+import { UserOutlined } from '@ant-design/icons'
 
 type ListProps = ConnectProps & {
   accountType: API.AccountType[]
@@ -68,9 +68,7 @@ const Staff: React.FC<ListProps> = ({
       renderText: (text, record) => (
         <div className="flex flex-row items-center">
           <div>{text}</div>
-          <div className="ml-1 text-16px">
-            {record.ID === managerID ? <IconFont type="icon-admin" /> : null}
-          </div>
+          <div className="ml-1 text-16px">{record.ID === managerID ? <UserOutlined /> : null}</div>
         </div>
       ),
       width: 86,

+ 3 - 7
src/pages/Project/Verification/Detail/Flow/components/Edge/index.tsx

@@ -1,9 +1,8 @@
 import { buildUUID } from '@/utils/uuid'
-import { SolutionOutlined } from '@ant-design/icons'
+import { PlusOutlined, SolutionOutlined } from '@ant-design/icons'
 import { Button, Popover } from 'antd'
 import React, { useMemo, useState, useContext } from 'react'
 import type { EdgeProps } from 'react-flow-renderer'
-import { isNode } from 'react-flow-renderer'
 import { getBezierPath, getEdgeCenter, getMarkerEnd, useStoreState } from 'react-flow-renderer'
 import { Actions, eId, FlowContext } from '../../context'
 import { generateElements, genreateElementEnum, getEdgeParams } from '../../utils'
@@ -12,7 +11,6 @@ import styles from './index.less'
 import 'antd/lib/button/style/css'
 import consts from '@/utils/consts'
 import useLoading from '../../hooks/useLoading'
-import IconFont from '@/components/IconFont'
 import { ConfigureType } from '../../enum'
 const foreignObjectSize = 50
 
@@ -47,9 +45,7 @@ export function CommonEdge(props: EdgeProps) {
   }
   const showBtn =
     flowData.get(source) && target === eId
-      ? flowData
-          .get(source)
-          ?.accounts.every(item => !item.configure.includes(ConfigureType.NEXTSECTOR))
+      ? flowData.get(source)?.accounts.every(item => !item.configure.includes(ConfigureType.NEXTSECTOR))
       : true
 
   const nodes = useStoreState(store => store.nodes)
@@ -158,7 +154,7 @@ export function CommonEdge(props: EdgeProps) {
               onVisibleChange={togglePopver}
               overlayClassName="flow-popover">
               <Button
-                icon={<IconFont type="icon-plus" />}
+                icon={<PlusOutlined />}
                 shape="circle"
                 size="small"
                 onClick={event => onEdgeClick(event, id)}