From 8319b13051405f7a62328320c88545f22de28901 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8A=9B=E7=9A=93?= <lihao.ylh@alibaba-inc.com>
Date: Thu, 17 Jun 2021 11:14:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=85=BC=E5=AE=B9=20icon=20=E4=B8=BA=20?=
 =?UTF-8?q?esmodule=20=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/utils/src/create-icon.tsx | 4 ++++
 packages/utils/src/is-es-module.ts | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/utils/src/create-icon.tsx b/packages/utils/src/create-icon.tsx
index a69a042ae..34c405147 100644
--- a/packages/utils/src/create-icon.tsx
+++ b/packages/utils/src/create-icon.tsx
@@ -2,6 +2,7 @@ import { isValidElement, ReactNode, createElement, cloneElement } from 'react';
 import { Icon } from '@alifd/next';
 import { IconType } from '@ali/lowcode-types';
 import { isReactComponent } from './is-react';
+import { isESModule } from './is-es-module';
 
 const URL_RE = /^(https?:)\/\//i;
 
@@ -9,6 +10,9 @@ export function createIcon(icon?: IconType | null, props?: Record<string, unknow
   if (!icon) {
     return null;
   }
+  if (isESModule(icon)) {
+    icon = icon.default;
+  }
   if (typeof icon === 'string') {
     if (URL_RE.test(icon)) {
       return <img src={icon} {...props} />;
diff --git a/packages/utils/src/is-es-module.ts b/packages/utils/src/is-es-module.ts
index 32839a38b..6a9d0fa9e 100644
--- a/packages/utils/src/is-es-module.ts
+++ b/packages/utils/src/is-es-module.ts
@@ -1,3 +1,7 @@
-export function isESModule(obj: any): obj is { [key: string]: any } {
+export type ESModule = {
+  __esModule: true;
+  default: any;
+};
+export function isESModule(obj: any): obj is ESModule {
   return obj && obj.__esModule;
 }