iconpark-transfer (#2208)

* feat(common): iconpark transfer * feat(common): iconpark-transfer * feat(common): iconpark transfer * feat(common): feat(common): iconpark transfer * feat(common): update pnpm-lock.yaml Co-authored-by: 随风 <daskyrk@users.noreply.github.com>
erda-project · Dec 13, 2021 · 30fc6d8 · 30fc6d8
1 parent f7f13ef
commit 30fc6d8
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 59 deletions.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/shell/app/App-vite.tsx b/shell/app/App-vite.tsx
@@ -41,7 +41,6 @@ import orgStore, { isAdminRoute } from 'app/org-home/stores/org';
 // import modules from './mf-modules'; // ambiguous modules may conflict with modules folder, then rename to mf-modules
 import './styles/antd-extension.scss';
 import './styles/app.scss';
-import '@icon-park/react/styles/index.css';
 import '@erda-ui/dashboard-configurator/dist/index.css';
 import 'tailwindcss/tailwind.css';
 
@@ -69,11 +68,6 @@ Pagination.defaultProps = {
 const start = (userData: ILoginUser, orgs: ORG.IOrg[]) => {
   setLS('diceLoginState', true);
 
-  const IconConfig = {
-    ...DEFAULT_ICON_CONFIGS,
-    prefix: 'erda',
-  };
-
   const locale = window.localStorage.getItem('locale') || 'zh';
   moment.locale(momentLangMap[locale]);
   orgStore.reducers.updateJoinedOrg(orgs);
@@ -104,9 +98,7 @@ const start = (userData: ILoginUser, orgs: ORG.IOrg[]) => {
     const Wrap = () => {
       return (
         <ConfigProvider renderEmpty={EmptyListHolder} locale={isZh() ? antd_zhCN : antd_enUS}>
-          <IconProvider value={IconConfig}>
-            <App />
-          </IconProvider>
+          <App />
         </ConfigProvider>
       );
     };

diff --git a/shell/app/App.tsx b/shell/app/App.tsx
@@ -41,7 +41,6 @@ import orgStore, { isAdminRoute } from 'app/org-home/stores/org';
 import modules from './mf-modules'; // ambiguous modules may conflict with modules folder, then rename to mf-modules
 import './styles/antd-extension.scss';
 import './styles/app.scss';
-import '@icon-park/react/styles/index.css';
 import '@erda-ui/dashboard-configurator/dist/index.css';
 import 'tailwindcss/tailwind.css';
 
@@ -66,11 +65,6 @@ Pagination.defaultProps = {
 const start = (userData: ILoginUser, orgs: ORG.IOrg[]) => {
   setLS('diceLoginState', true);
 
-  const IconConfig = {
-    ...DEFAULT_ICON_CONFIGS,
-    prefix: 'erda',
-  };
-
   const locale = window.localStorage.getItem('locale') || 'zh';
   moment.locale(momentLangMap[locale]);
   orgStore.reducers.updateJoinedOrg(orgs);
@@ -102,9 +96,7 @@ const start = (userData: ILoginUser, orgs: ORG.IOrg[]) => {
     const Wrap = () => {
       return (
         <ConfigProvider renderEmpty={EmptyListHolder} locale={isZh() ? antd_zhCN : antd_enUS}>
-          <IconProvider value={IconConfig}>
-            <App />
-          </IconProvider>
+          <App />
         </ConfigProvider>
       );
     };

diff --git a/shell/app/layout/pages/page-container/components/side-navigation.tsx b/shell/app/layout/pages/page-container/components/side-navigation.tsx
@@ -114,9 +114,9 @@ const SideNavigation = ({
       <div className="h-12 relative">
         <Button type="primary" onClick={handleOnFold} className="absolute right-0 p-1">
           {isFold ? (
-            <ErdaIcon type="menu-unfold" size="18" />
+            <ErdaIcon className="mt-0.5 mr-1" type="menu-unfold" size="18" />
           ) : (
-            <ErdaIcon type="menu-fold" size="18" />
+            <ErdaIcon className="mt-0.5 mr-1" type="menu-fold" size="18" />
           )}
         </Button>
       </div>

diff --git a/shell/app/modules/project/common/components/issue/issue-config.tsx b/shell/app/modules/project/common/components/issue/issue-config.tsx
@@ -14,7 +14,6 @@
 import i18n from 'i18n';
 import React from 'react';
 import { Icon as CustomIcon, ErdaIcon } from 'common';
-import { List as IconTask, Bug as IconBug } from '@icon-park/react';
 import './issue-config.scss';
 
 export enum ISSUE_TYPE {
@@ -30,10 +29,10 @@ export const ISSUE_ICON = {
   iteration: <CustomIcon type="bb1" className="issue-icon iteration" />,
   priority: {
     // 优先级icon
-    URGENT: <ErdaIcon type="jinji" size="20px"/>,
-    HIGH: <ErdaIcon type="gao" size="20px"/>,
+    URGENT: <ErdaIcon type="jinji" size="20px" />,
+    HIGH: <ErdaIcon type="gao" size="20px" />,
     NORMAL: <ErdaIcon type="zhong" size="20px" />,
-    LOW: <ErdaIcon type="di" size="20px"/>,
+    LOW: <ErdaIcon type="di" size="20px" />,
   },
   issue: {
     // 时间类型icon

diff --git a/shell/app/modules/project/common/components/issue/subscribers-selector.tsx b/shell/app/modules/project/common/components/issue/subscribers-selector.tsx
@@ -18,12 +18,6 @@ import { Icon as CustomIcon, MemberSelector, ErdaIcon } from 'common';
 import userStore from 'app/user/stores';
 import { useUserMap } from 'core/stores/userMap';
 import issueStore from 'project/stores/issues';
-import {
-  PreviewOpen as IconPreviewOpen,
-  PreviewCloseOne as IconPreviewCloseOne,
-  Plus as IconPlus,
-  Right as IconRight,
-} from '@icon-park/react';
 import { getAvatarChars } from 'app/common/utils';
 
 interface IProps {

diff --git a/shell/app/modules/project/pages/settings/components/project-label.tsx b/shell/app/modules/project/pages/settings/components/project-label.tsx
@@ -20,7 +20,6 @@ import projectLabel from 'project/stores/label';
 import React from 'react';
 import { useEffectOnce } from 'react-use';
 import './project-label.scss';
-import { Close as IconClose, Plus as IconPlus } from '@icon-park/react';
 import { auxiliaryColorMap } from 'common/constants';
 
 const colors = Object.keys(auxiliaryColorMap);
@@ -145,8 +144,9 @@ const ProjectLabel = () => {
               onClick={() => onClickLabel(label)}
             >
               {label.name}
-              <IconClose
-                className="ml-1"
+              <ErdaIcon
+                type="close"
+                className="ml-1 align-middle"
                 onClick={(e) => {
                   e.stopPropagation();
                   handleDelete(label);

diff --git a/shell/babel.config.js b/shell/babel.config.js
@@ -69,15 +69,6 @@ module.exports = {
       },
       'lodash',
     ],
-    [
-      'import',
-      {
-        libraryName: '@icon-park/react',
-        libraryDirectory: 'es/icons',
-        camel2DashComponentName: false,
-      },
-      'iconpark',
-    ],
     [
       'import',
       {

diff --git a/shell/mf.config.js b/shell/mf.config.js
@@ -87,9 +87,6 @@ module.exports = [
         singleton: true,
         requiredVersion: packageJson.dependencies['react-dom'],
       },
-      '@icon-park/react': {
-        requiredVersion: packageJson.dependencies['@icon-park/react'],
-      },
     },
   },
 ];
diff --git a/shell/package.json b/shell/package.json
@@ -49,7 +49,6 @@
   "dependencies": {
     "@erda-ui/dashboard-configurator": "2.0.5",
     "@erda-ui/react-markdown-editor-lite": "^1.4.7",
-    "@icon-park/react": "^1.3.3",
     "ace-builds": "^1.4.7",
     "ansi_up": "^5.0.1",
     "antd": "^4.16.13",