fix(comp:icon): 'info' and 'exclamation' are exchanged (#1525)

IDuxFE · Apr 4, 2023 · dc98fae · dc98fae
1 parent c758931
commit dc98fae
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 16 deletions.
diff --git a/packages/components/button/style/themes/default.ts b/packages/components/button/style/themes/default.ts
@@ -1,5 +1,6 @@
 // style dependencies
 import '@idux/components/_private/wave/style/themes/default'
 import '@idux/components/icon/style/themes/default'
+import '@idux/components/space/style/themes/default'
 
 import './default.less'
diff --git a/packages/components/button/style/themes/seer.ts b/packages/components/button/style/themes/seer.ts
@@ -1,5 +1,6 @@
 // style dependencies
 import '@idux/components/_private/wave/style/themes/seer'
 import '@idux/components/icon/style/themes/seer'
+import '@idux/components/space/style/themes/seer'
 
 import './seer.less'
diff --git a/packages/components/config/src/defaultConfig.ts b/packages/components/config/src/defaultConfig.ts
@@ -22,10 +22,10 @@ export const defaultConfig: GlobalConfig = {
     closable: false,
     icon: {
       success: 'check-circle',
-      error: 'info-circle',
+      error: 'exclamation-circle',
       info: 'bulb',
-      warning: 'exclamation-circle',
-      offline: 'exclamation-circle',
+      warning: 'info-circle',
+      offline: 'info-circle',
     },
   },
   anchor: {

diff --git a/packages/components/icon/demo/all.ts b/packages/components/icon/demo/all.ts
@@ -71,6 +71,7 @@ export const allIcons = [
   'exception',
   'exclamation-circle-filled',
   'exclamation-circle',
+  'exclamation',
   'exit',
   'expand',
   'export',

diff --git a/packages/components/icon/src/definitions.ts b/packages/components/icon/src/definitions.ts
@@ -362,7 +362,12 @@ export const ExclamationCircleFilled = {
 
 export const ExclamationCircle = {
   name: 'exclamation-circle',
-  svg: '<svg viewBox="0 0 1024 1024" focusable="false"><path d="M512 960c247.424 0 448-200.576 448-448S759.424 64 512 64 64 264.576 64 512s200.576 448 448 448Zm0-64c-212.077 0-384-171.923-384-384s171.923-384 384-384 384 171.923 384 384-171.923 384-384 384Zm19.2-576c6.967 0 12.634-5.566 12.796-12.493L544 268.8c0-6.967-5.566-12.634-12.493-12.796L492.8 256c-6.967 0-12.634 5.566-12.796 12.493L480 307.2c0 6.967 5.566 12.634 12.493 12.796L531.2 320Zm0 448c6.967 0 12.634-5.566 12.796-12.493L544 396.8c0-6.967-5.566-12.634-12.493-12.8H492.8c-6.967 0-12.634 5.566-12.796 12.493L480 755.2c0 6.967 5.566 12.634 12.493 12.8H531.2Z"/></svg>',
+  svg: '<svg viewBox="0 0 1024 1024" focusable="false"><path d="M512 64c247.424 0 448 200.576 448 448S759.424 960 512 960 64 759.424 64 512 264.576 64 512 64Zm0 64c-212.077 0-384 171.923-384 384s171.923 384 384 384 384-171.923 384-384-171.923-384-384-384Zm19.2 576c6.967 0 12.634 5.566 12.796 12.493L544 755.2c0 6.967-5.566 12.634-12.493 12.796L492.8 768c-6.967 0-12.634-5.566-12.796-12.493L480 716.8c0-6.967 5.566-12.634 12.493-12.796L531.2 704Zm0-448c6.967 0 12.634 5.566 12.796 12.493L544 627.2c0 6.967-5.566 12.634-12.493 12.8H492.8c-6.967 0-12.634-5.566-12.796-12.493L480 268.8c0-6.967 5.566-12.634 12.493-12.8H531.2Z"/></svg>',
+}
+
+export const Exclamation = {
+  name: 'exclamation',
+  svg: '<svg viewBox="0 0 1024 1024" focusable="false"><path d="M550.4 768c14.08 0 25.6 11.52 25.6 25.6v76.8a25.6 25.6 0 0 1-25.6 25.6h-76.8a25.6 25.6 0 0 1-25.6-25.6v-76.8c0-14.08 11.52-25.6 25.6-25.6h76.8zm0-576c14.08 0 25.6 11.52 25.6 25.6v460.8a25.6 25.6 0 0 1-25.6 25.6h-76.8a25.6 25.6 0 0 1-25.6-25.6V217.6c0-14.08 11.52-25.6 25.6-25.6h76.8z"/></svg>',
 }
 
 export const Exit = {
@@ -542,12 +547,12 @@ export const InfoCircleFilled = {
 
 export const InfoCircle = {
   name: 'info-circle',
-  svg: '<svg viewBox="0 0 1024 1024" focusable="false"><path d="M512 64c247.424 0 448 200.576 448 448S759.424 960 512 960 64 759.424 64 512 264.576 64 512 64Zm0 64c-212.077 0-384 171.923-384 384s171.923 384 384 384 384-171.923 384-384-171.923-384-384-384Zm19.2 576c6.967 0 12.634 5.566 12.796 12.493L544 755.2c0 6.967-5.566 12.634-12.493 12.796L492.8 768c-6.967 0-12.634-5.566-12.796-12.493L480 716.8c0-6.967 5.566-12.634 12.493-12.796L531.2 704Zm0-448c6.967 0 12.634 5.566 12.796 12.493L544 627.2c0 6.967-5.566 12.634-12.493 12.8H492.8c-6.967 0-12.634-5.566-12.796-12.493L480 268.8c0-6.967 5.566-12.634 12.493-12.8H531.2Z"/></svg>',
+  svg: '<svg viewBox="0 0 1024 1024" focusable="false"><path d="M512 960c247.424 0 448-200.576 448-448S759.424 64 512 64 64 264.576 64 512s200.576 448 448 448Zm0-64c-212.077 0-384-171.923-384-384s171.923-384 384-384 384 171.923 384 384-171.923 384-384 384Zm19.2-576c6.967 0 12.634-5.566 12.796-12.493L544 268.8c0-6.967-5.566-12.634-12.493-12.796L492.8 256c-6.967 0-12.634 5.566-12.796 12.493L480 307.2c0 6.967 5.566 12.634 12.493 12.796L531.2 320Zm0 448c6.967 0 12.634-5.566 12.796-12.493L544 396.8c0-6.967-5.566-12.634-12.493-12.8H492.8c-6.967 0-12.634 5.566-12.796 12.493L480 755.2c0 6.967 5.566 12.634 12.493 12.8H531.2Z"/></svg>',
 }
 
 export const Info = {
   name: 'info',
-  svg: '<svg viewBox="0 0 1024 1024" focusable="false"><path d="M550.4 768c14.08 0 25.6 11.52 25.6 25.6v76.8a25.6 25.6 0 0 1-25.6 25.6h-76.8a25.6 25.6 0 0 1-25.6-25.6v-76.8c0-14.08 11.52-25.6 25.6-25.6h76.8zm0-576c14.08 0 25.6 11.52 25.6 25.6v460.8a25.6 25.6 0 0 1-25.6 25.6h-76.8a25.6 25.6 0 0 1-25.6-25.6V217.6c0-14.08 11.52-25.6 25.6-25.6h76.8z"/></svg>',
+  svg: '<svg viewBox="0 0 1024 1024" focusable="false"><path d="M448 224a64 64 0 1 0 128 0 64 64 0 1 0-128 0zm96 168h-64c-4.4 0-8 3.6-8 8v464c0 4.4 3.6 8 8 8h64c4.4 0 8-3.6 8-8V400c0-4.4-3.6-8-8-8z"/></svg>',
 }
 
 export const Insurance = {

diff --git a/packages/components/icon/src/dependencies.ts b/packages/components/icon/src/dependencies.ts
@@ -26,11 +26,11 @@ import {
   Down,
   Ellipsis,
   Empty,
+  Exclamation,
   ExclamationCircle,
   ExclamationCircleFilled,
   FilterFilled,
   Holder,
-  Info,
   InfoCircle,
   InfoCircleFilled,
   LayoutCompact,
@@ -82,13 +82,13 @@ export const IDUX_ICON_DEPENDENCIES: IconDefinition[] = [
   Down, // Select Table
   Ellipsis, // Table
   Empty, // Empty
-  ExclamationCircle, // Message Result Alert Notification
-  ExclamationCircleFilled, // Modal Popconfirm
+  InfoCircle, // Message Result Alert Notification
+  InfoCircleFilled, // Modal Popconfirm
   FilterFilled, // Table
   Holder, // tree
-  Info, // Stepper
-  InfoCircle, // Message Result Alert Notification
-  InfoCircleFilled, // Modal
+  Exclamation, // Stepper
+  ExclamationCircle, // Message Result Alert Notification
+  ExclamationCircleFilled, // Modal
   LayoutCompact, // ProTable
   LayoutLarge, // ProTable
   LayoutMedium, // ProTable

diff --git a/packages/components/stepper/src/StepperItem.tsx b/packages/components/stepper/src/StepperItem.tsx
@@ -94,7 +94,7 @@ export default defineComponent({
 
 const statusIcons: Partial<Record<StepperStatus, string>> = {
   finish: 'success',
-  error: 'info',
+  error: 'exclamation',
 }
 
 function renderIcon(

diff --git a/scripts/gulp/icons/assets/exclamation-circle.svg b/scripts/gulp/icons/assets/exclamation-circle.svg
diff --git a/scripts/gulp/icons/assets/exclamation.svg b/scripts/gulp/icons/assets/exclamation.svg
diff --git a/scripts/gulp/icons/assets/info-circle.svg b/scripts/gulp/icons/assets/info-circle.svg
diff --git a/scripts/gulp/icons/assets/info.svg b/scripts/gulp/icons/assets/info.svg