outaozhen пре 5 година
родитељ
комит
b4f7d29f7c

+ 3 - 2
src/pages/Customer/Company/components/AddCompany/index.jsx

@@ -3,7 +3,8 @@ import { Form, Row, Col, Button } from 'antd'
 import LazyCascader from '@/components/LazyCascader'
 import { ModalForm, ProFormSelect, ProFormText } from '@ant-design/pro-form'
 import { connect } from 'dva'
-import SvgIcon, { IconPark } from '@/components/SvgIcon'
+import SvgIcon from '@/components/SvgIcon'
+import { Plus } from '@icon-park/react'
 
 const AddCompany = props => {
   const { natures, onConfirm, dispatch } = props
@@ -25,7 +26,7 @@ const AddCompany = props => {
       {...layout}
       trigger={
         <Button key="button" type="primary" size="small">
-          <IconPark type="plus" theme="filled" className="zh-mg-right-5" />
+          <Plus theme="filled" className="zh-mg-right-5" />
           <span>客户</span>
         </Button>
       }

+ 3 - 15
src/pages/Customer/Company/components/CompanyDetail/CompanyForm.jsx

@@ -3,7 +3,7 @@ import { Row, Col, Tooltip } from 'antd'
 import EditableForm from '@/components/EditableForm'
 import PersonLabel from '../PersonLabel'
 import { TagTypeEnum, TagDataTypeEnum, LabelModeType } from '../PersonLabel/const'
-import { IconPark } from '@/components/SvgIcon'
+import { Add, Down, Check } from '@icon-park/react'
 import { connect } from 'umi'
 
 const CompanyForm = props => {
@@ -110,13 +110,7 @@ const CompanyForm = props => {
             tagColumn={TagDataTypeEnum.COMPANY}
             checkCallBack={refreshClient}
             modeType={LabelModeType.column}>
-            <IconPark
-              type="add"
-              theme="filled"
-              size="20"
-              fill="#868e96"
-              className="cursor-pointer"
-            />
+            <Add theme="filled" size="20" fill="#868e96" className="cursor-pointer" />
           </PersonLabel>
         </div>
       ),
@@ -143,13 +137,7 @@ const CompanyForm = props => {
             tagColumn={TagDataTypeEnum.COMPANY}
             checkCallBack={refreshClient}
             modeType={LabelModeType.column}>
-            <IconPark
-              type="add"
-              theme="filled"
-              size="20"
-              fill="#868e96"
-              className="cursor-pointer"
-            />
+            <Add theme="filled" size="20" fill="#868e96" className="cursor-pointer" />
           </PersonLabel>
         </div>
       ),

+ 3 - 5
src/pages/Customer/Company/components/CompanyDetail/index.jsx

@@ -6,7 +6,7 @@ import CompanyForm from './CompanyForm'
 import CompanyLowerList from './CompanyLowerList'
 import CompanyTabList from './CompanyTabList'
 import { connect } from 'dva'
-import { IconPark } from '@/components/SvgIcon'
+import { Up, Down } from '@icon-park/react'
 import { FlipOverEnum, useFlipOver } from '@/hooks/web/useFlipOver'
 
 const CompanyDetail = props => {
@@ -62,8 +62,7 @@ const CompanyDetail = props => {
             {orderIds.length ? (
               <div className="mb-3">
                 <Tooltip title="上一条记录">
-                  <IconPark
-                    type="up"
+                  <Up
                     fill={flipConsts.disableUpBtn ? '#BDBDBE' : '#886ab5'}
                     size="20"
                     onClick={() => flipFn(FlipOverEnum.UP)}
@@ -73,8 +72,7 @@ const CompanyDetail = props => {
                   />
                 </Tooltip>
                 <Tooltip title="下一条记录">
-                  <IconPark
-                    type="down"
+                  <Down
                     fill={flipConsts.disableDownBtn ? '#BDBDBE' : '#886ab5'}
                     size="20"
                     onClick={() => flipFn(FlipOverEnum.DOWN)}

+ 8 - 8
src/pages/Customer/Company/index.jsx

@@ -12,7 +12,7 @@ import { useModal } from '@/components/Modal'
 import { formatValues } from '@/components/LazyCascader'
 import PersonLabel from './components/PersonLabel'
 import { TagTypeEnum, TagDataTypeEnum, LabelModeType } from './components/PersonLabel/const'
-import { IconPark } from '@/components/SvgIcon'
+import { Add, Down, Check } from '@icon-park/react'
 import { apiBatchLink } from '@/services/customer'
 
 const Company = props => {
@@ -200,7 +200,7 @@ const Company = props => {
             tagColumn={TagDataTypeEnum.COMPANY}
             checkCallBack={refreshData}
             modeType={LabelModeType.column}>
-            <IconPark type="add" theme="filled" size="20" fill="#868e96" className="zh-pointer" />
+            <Add size="20" fill="#868e96" className="zh-pointer" />
           </PersonLabel>
         </div>
       )
@@ -236,7 +236,7 @@ const Company = props => {
             tagColumn={TagDataTypeEnum.COMPANY}
             checkCallBack={refreshData}
             modeType={LabelModeType.column}>
-            <IconPark type="add" theme="filled" size="20" fill="#868e96" className="zh-pointer" />
+            <Add theme="filled" size="20" fill="#868e96" className="zh-pointer" />
           </PersonLabel>
         </div>
       )
@@ -381,12 +381,12 @@ const Company = props => {
                     style={{ backgroundColor: personTagColorMap[item] }}
                   />
                 ))}
-                <IconPark type="down" />
+                <Down />
               </Button>
             ) : (
               <Button>
                 个人标签
-                <IconPark type="down" />
+                <Down />
               </Button>
             )}
           </PersonLabel>
@@ -406,18 +406,18 @@ const Company = props => {
                     style={{ backgroundColor: teamTagColorMap[item] }}
                   />
                 ))}
-                <IconPark type="down" />
+                <Down />
               </Button>
             ) : (
               <Button>
                 协作标签
-                <IconPark type="down" />
+                <Down />
               </Button>
             )}
           </PersonLabel>
         </div>
         <Button onClick={() => tagsSettingConfirm(selectedRowKeys)}>
-          <IconPark type="check" size={14} />
+          <Check size={14} />
           确认
         </Button>
       </div>

+ 3 - 3
src/pages/Customer/Contact/components/AddContact/index.jsx

@@ -2,7 +2,7 @@ import React from 'react'
 import { Form, Row, Col, Button } from 'antd'
 import LazyCascader, { validCascaderRule } from '@/components/LazyCascader'
 import { ModalForm, ProFormSelect, ProFormText } from '@ant-design/pro-form'
-import { IconPark } from '@/components/SvgIcon'
+import { Plus } from '@icon-park/react'
 
 const Addcontact = props => {
   const { onConfirm } = props
@@ -16,8 +16,8 @@ const Addcontact = props => {
       {...layout}
       title="添加联系人"
       trigger={
-        <Button key="button" type="primary" size="small">
-          <IconPark type="plus" className="zh-mg-right-5" />
+        <Button key="button" type="primary" size="small" className="flex items-center">
+          <Plus className="zh-mg-right-5" />
           联系人
         </Button>
       }

+ 4 - 4
src/pages/Customer/Contact/components/ChangeCompany/index.jsx

@@ -1,5 +1,5 @@
 import { useModal } from '@/components/Modal'
-import { IconPark } from '@/components/SvgIcon'
+import { LinkOne, LinkInterrupt, Switch } from '@icon-park/react'
 import { Card, Tooltip } from 'antd'
 import React from 'react'
 import styles from './index.less'
@@ -32,7 +32,7 @@ const ChangeCompanyInput = props => {
   const notValueRender = (
     <div onClick={handleConnectCustomer} className={styles.notCompanyContent}>
       {/* style={{ transform: 'rotate(-90deg)' }} */}
-      <IconPark type="link-one" size="14" />
+      <LinkOne size="14" />
       <span className="zh-mg-left-5">关联客户</span>
     </div>
   )
@@ -76,7 +76,7 @@ const ChangeCompanyInput = props => {
         <div className="w-55px">
           <Tooltip placement="right" title="移除客户">
             <span className={styles.unlinkIcon} onClick={removeCustomer}>
-              <IconPark type="link-interrupt" />
+              <LinkInterrupt />
             </span>
           </Tooltip>
           <Tooltip
@@ -85,7 +85,7 @@ const ChangeCompanyInput = props => {
             className="zh-mg-left-5"
             onClick={handleConnectCustomer}>
             <span className={styles.switchIcon}>
-              <IconPark type="switch" />
+              <Switch />
             </span>
           </Tooltip>
         </div>

+ 3 - 15
src/pages/Customer/Contact/components/ContactDetail/ContanctForm.jsx

@@ -4,7 +4,7 @@ import EditableForm from '@/components/EditableForm'
 import ChangeCompanyInput from '@/pages/customer/Contact/components/ChangeCompany'
 import { connect } from 'umi'
 import PersonLabel from '@/pages/customer/Company/components/PersonLabel'
-import { IconPark } from '@/components/SvgIcon'
+import { Add } from '@icon-park/react'
 import {
   TagTypeEnum,
   TagDataTypeEnum,
@@ -149,13 +149,7 @@ const ContanctForm = props => {
             tagColumn={TagDataTypeEnum.CONTACT}
             checkCallBack={refreshClient}
             modeType={LabelModeType.column}>
-            <IconPark
-              type="add"
-              theme="filled"
-              size="20"
-              fill="#868e96"
-              className="cursor-pointer"
-            />
+            <Add theme="filled" size="20" fill="#868e96" className="cursor-pointer" />
           </PersonLabel>
         </div>
       ),
@@ -182,13 +176,7 @@ const ContanctForm = props => {
             tagColumn={TagDataTypeEnum.CONTACT}
             checkCallBack={refreshClient}
             modeType={LabelModeType.column}>
-            <IconPark
-              type="add"
-              theme="filled"
-              size="20"
-              fill="#868e96"
-              className="cursor-pointer"
-            />
+            <Add theme="filled" size="20" fill="#868e96" className="cursor-pointer" />
           </PersonLabel>
         </div>
       ),

+ 3 - 5
src/pages/Customer/Contact/components/ContactDetail/index.jsx

@@ -6,7 +6,7 @@ import ContanctLowerList from './ContanctLowerList.jsx'
 import { apiContactDetail } from '@/services/contact'
 import consts from '@/consts'
 import { connect } from 'dva'
-import { IconPark } from '@/components/SvgIcon'
+import { Up, Down } from '@icon-park/react'
 import { FlipOverEnum, useFlipOver } from '@/hooks/web/useFlipOver'
 
 const ContactDetail = props => {
@@ -55,8 +55,7 @@ const ContactDetail = props => {
             {orderIds.length ? (
               <div className="mb-3">
                 <Tooltip title="上一条记录">
-                  <IconPark
-                    type="up"
+                  <Up
                     fill={flipConsts.disableUpBtn ? '#BDBDBE' : '#886ab5'}
                     size="20"
                     onClick={() => flipFn(FlipOverEnum.UP)}
@@ -66,8 +65,7 @@ const ContactDetail = props => {
                   />
                 </Tooltip>
                 <Tooltip title="下一条记录">
-                  <IconPark
-                    type="down"
+                  <Down
                     fill={flipConsts.disableDownBtn ? '#BDBDBE' : '#886ab5'}
                     size="20"
                     onClick={() => flipFn(FlipOverEnum.DOWN)}

+ 8 - 20
src/pages/Customer/Contact/index.jsx

@@ -15,7 +15,7 @@ import {
   TagDataTypeEnum,
   LabelModeType
 } from '../Company/components/PersonLabel/const'
-import { IconPark } from '@/components/SvgIcon'
+import { Add, Down, Check } from '@icon-park/react'
 import { useTableScroll } from '@/hooks/useAutoTable'
 import { apiAddClient, queryContact } from '@/services/contact'
 import { apiBatchLink } from '@/services/customer'
@@ -261,13 +261,7 @@ const Contact = props => {
             tagColumn={TagDataTypeEnum.CONTACT}
             checkCallBack={refreshData}
             modeType={LabelModeType.column}>
-            <IconPark
-              type="add"
-              theme="filled"
-              size="20"
-              fill="#868e96"
-              className="cursor-pointer"
-            />
+            <Add theme="filled" size="20" fill="#868e96" className="cursor-pointer" />
           </PersonLabel>
         </div>
       )
@@ -304,13 +298,7 @@ const Contact = props => {
             tagColumn={TagDataTypeEnum.CONTACT}
             checkCallBack={refreshData}
             modeType={LabelModeType.column}>
-            <IconPark
-              type="add"
-              theme="filled"
-              size="20"
-              fill="#868e96"
-              className="cursor-pointer"
-            />
+            <Add theme="filled" size="20" fill="#868e96" className="cursor-pointer" />
           </PersonLabel>
         </div>
       )
@@ -519,12 +507,12 @@ const Contact = props => {
                     style={{ backgroundColor: personTagColorMap[item] }}
                   />
                 ))}
-                <IconPark type="down" />
+                <Down />
               </Button>
             ) : (
               <Button>
                 个人标签
-                <IconPark type="down" />
+                <Down />
               </Button>
             )}
           </PersonLabel>
@@ -544,18 +532,18 @@ const Contact = props => {
                     style={{ backgroundColor: teamTagColorMap[item] }}
                   />
                 ))}
-                <IconPark type="down" />
+                <Down />
               </Button>
             ) : (
               <Button>
                 协作标签
-                <IconPark type="down" />
+                <Down />
               </Button>
             )}
           </PersonLabel>
         </div>
         <Button onClick={() => tagsSettingConfirm(selectedRowKeys)}>
-          <IconPark type="check" size={14} />
+          <Check size={14} />
           确认
         </Button>
       </div>

+ 2 - 2
src/pages/Customer/Test/index.jsx

@@ -1,12 +1,12 @@
 import React from 'react'
 
 import { connect } from 'dva'
-import { IconPark } from '@/components/SvgIcon'
+import { Add } from '@icon-park/react'
 
 const Test = () => {
   return (
     <div>
-      <IconPark type="add" theme="filled" size="20" fill="#868e96" className="zh-pointer" />
+      <Add theme="filled" size="20" fill="#868e96" className="zh-pointer" />
     </div>
   )
 }