From dc98faee2f89f86a1f2f5ee42ee2b92404c892da Mon Sep 17 00:00:00 2001 From: danranVm Date: Tue, 4 Apr 2023 10:45:15 +0800 Subject: [PATCH] fix(comp:icon): 'info' and 'exclamation' are exchanged (#1525) --- packages/components/button/style/themes/default.ts | 1 + packages/components/button/style/themes/seer.ts | 1 + packages/components/config/src/defaultConfig.ts | 6 +++--- packages/components/icon/demo/all.ts | 1 + packages/components/icon/src/definitions.ts | 11 ++++++++--- packages/components/icon/src/dependencies.ts | 12 ++++++------ packages/components/stepper/src/StepperItem.tsx | 2 +- scripts/gulp/icons/assets/exclamation-circle.svg | 2 +- scripts/gulp/icons/assets/exclamation.svg | 1 + scripts/gulp/icons/assets/info-circle.svg | 2 +- scripts/gulp/icons/assets/info.svg | 2 +- 11 files changed, 25 insertions(+), 16 deletions(-) create mode 100644 scripts/gulp/icons/assets/exclamation.svg diff --git a/packages/components/button/style/themes/default.ts b/packages/components/button/style/themes/default.ts index 302b592a6..cbd9442e3 100644 --- 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 index e5b323d90..27059ab97 100644 --- 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 index 8e64f06e6..f32e2804d 100644 --- 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 index f4f0c8c2d..a95f2af4a 100644 --- 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 index 13302184f..1e4225360 100644 --- 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: '', +} + +export const Exclamation = { + name: 'exclamation', + svg: '', } export const Exit = { @@ -542,12 +547,12 @@ export const InfoCircleFilled = { export const InfoCircle = { name: 'info-circle', - svg: '', + svg: '', } export const Info = { name: 'info', - svg: '', + svg: '', } export const Insurance = { diff --git a/packages/components/icon/src/dependencies.ts b/packages/components/icon/src/dependencies.ts index db44b7391..91d5b0eea 100644 --- 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 index cee381e4c..071921821 100644 --- a/packages/components/stepper/src/StepperItem.tsx +++ b/packages/components/stepper/src/StepperItem.tsx @@ -94,7 +94,7 @@ export default defineComponent({ const statusIcons: Partial> = { 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 index 67ca305cf..2532dfdcb 100644 --- a/scripts/gulp/icons/assets/exclamation-circle.svg +++ b/scripts/gulp/icons/assets/exclamation-circle.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/scripts/gulp/icons/assets/exclamation.svg b/scripts/gulp/icons/assets/exclamation.svg new file mode 100644 index 000000000..ebba4a234 --- /dev/null +++ b/scripts/gulp/icons/assets/exclamation.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/scripts/gulp/icons/assets/info-circle.svg b/scripts/gulp/icons/assets/info-circle.svg index 2532dfdcb..67ca305cf 100644 --- a/scripts/gulp/icons/assets/info-circle.svg +++ b/scripts/gulp/icons/assets/info-circle.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/scripts/gulp/icons/assets/info.svg b/scripts/gulp/icons/assets/info.svg index ebba4a234..c7a518e29 100644 --- a/scripts/gulp/icons/assets/info.svg +++ b/scripts/gulp/icons/assets/info.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file