From 98f490dbbcb2daf32011eb148d72f1ae589bd8ff Mon Sep 17 00:00:00 2001
From: zcj <18137693952@163.com>
Date: Mon, 10 Oct 2022 22:31:14 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(search):=20=E4=BF=AE=E5=A4=8Dsearch?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=B2=A1=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E5=9B=BE=E6=A0=87=E5=BA=93=E7=9A=84=E8=AF=9D=EF=BC=8C?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=8C=89=E9=92=AE=E4=BC=9A=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E7=A9=BA=E7=99=BD=20(close=20#495)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/search-close-icon.tsx      | 11 +++++
 .../search/src/components/search-icon.tsx     | 10 +++++
 .../devui-vue/devui/search/src/search.scss    | 40 ++++++++++---------
 .../devui-vue/devui/search/src/search.tsx     |  8 ++--
 4 files changed, 47 insertions(+), 22 deletions(-)
 create mode 100644 packages/devui-vue/devui/search/src/components/search-close-icon.tsx
 create mode 100644 packages/devui-vue/devui/search/src/components/search-icon.tsx

diff --git a/packages/devui-vue/devui/search/src/components/search-close-icon.tsx b/packages/devui-vue/devui/search/src/components/search-close-icon.tsx
new file mode 100644
index 0000000000..15cc1e88e1
--- /dev/null
+++ b/packages/devui-vue/devui/search/src/components/search-close-icon.tsx
@@ -0,0 +1,11 @@
+const SearchCloseIcon = (): JSX.Element => (
+  <svg viewBox="0 0 1024 1024" width="12px" height="12px">
+    <path
+      d="M940.8 207.530667L818.602667 85.333333l-305.493334 305.493334L207.616 85.333333 \
+      85.333333 207.530667l305.493334 305.493333L85.333333 818.517333l122.282667 122.282667 \
+      305.493333-305.493333 305.493334 305.493333 122.197333-122.282667-305.493333-305.493333z"
+      p-id="30810"
+    ></path>
+  </svg>
+);
+export default SearchCloseIcon;
diff --git a/packages/devui-vue/devui/search/src/components/search-icon.tsx b/packages/devui-vue/devui/search/src/components/search-icon.tsx
new file mode 100644
index 0000000000..616065e652
--- /dev/null
+++ b/packages/devui-vue/devui/search/src/components/search-icon.tsx
@@ -0,0 +1,10 @@
+const SearchIcon = (): JSX.Element => (
+  <svg viewBox="0 0 1024 1024" version="1.1" width="12px" height="12px">
+    <path
+      d="M1005.312 914.752l-198.528-198.464A448 448 0 1 0 0 448a448 448 0 0 0 716.288 \
+      358.784l198.4 198.4a64 64 0 1 0 90.624-90.432zM448 767.936A320 320 0 1 1 448 128a320 320 0 0 1 0 640z"
+      fill="#262626" p-id="32547"
+    ></path>
+  </svg>
+);
+export default SearchIcon;
diff --git a/packages/devui-vue/devui/search/src/search.scss b/packages/devui-vue/devui/search/src/search.scss
index ac654e09a3..59cbad5404 100644
--- a/packages/devui-vue/devui/search/src/search.scss
+++ b/packages/devui-vue/devui/search/src/search.scss
@@ -44,18 +44,23 @@
     }
   }
 
-  svg.svg-icon-clear path,
-  svg.svg-icon-search path {
-    fill: $devui-icon-text;
+  &__clear,
+  &__icon {
+    @include size($devui-size-md, $devui-size-md);
+    @include flex;
+
+    & svg {
+      path {
+        fill: $devui-icon-fill;
+      }
+      @include size($devui-font-size-md, $devui-font-size-md);
+    }
   }
 
   &__clear {
     position: absolute;
     right: $devui-size-md;
     cursor: pointer;
-    height: 100%;
-    @include size($devui-size-md, $devui-size-md);
-    @include flex;
 
     &::after {
       content: '';
@@ -76,9 +81,6 @@
     z-index: 1;
     right: 0;
     top: 0;
-    width: $devui-size-md;
-    height: $devui-size-md;
-    @include flex;
   }
 
   &--sm {
@@ -91,15 +93,15 @@
       }
     }
 
-    .#{$devui-prefix}-search__icon {
-      font-size: $devui-font-size-sm;
+    .#{$devui-prefix}-search__icon, .#{$devui-prefix}-search__clear {
       @include size($devui-size-sm, $devui-size-sm);
+
+      svg {
+        @include size($devui-font-size-sm, $devui-font-size-sm);
+      }
     }
 
     .#{$devui-prefix}-search__clear {
-      font-size: $devui-font-size-sm;
-      @include size($devui-size-sm, $devui-size-sm);
-
       right: $devui-size-sm;
     }
   }
@@ -114,15 +116,15 @@
       }
     }
 
-    .#{$devui-prefix}-search__icon {
-      font-size: $devui-font-size-lg;
+    .#{$devui-prefix}-search__icon, .#{$devui-prefix}-search__clear {
       @include size($devui-size-lg, $devui-size-lg);
+
+      svg {
+        @include size($devui-font-size-lg, $devui-font-size-lg);
+      }
     }
 
     .#{$devui-prefix}-search__clear {
-      font-size: $devui-font-size-lg;
-      @include size($devui-size-lg, $devui-size-lg);
-
       right: $devui-size-lg;
     }
   }
diff --git a/packages/devui-vue/devui/search/src/search.tsx b/packages/devui-vue/devui/search/src/search.tsx
index 7c285ff5b4..b4c6b303ab 100644
--- a/packages/devui-vue/devui/search/src/search.tsx
+++ b/packages/devui-vue/devui/search/src/search.tsx
@@ -8,6 +8,8 @@ import { Icon } from '../../icon';
 import { useNamespace } from '../../shared/hooks/use-namespace';
 import './search.scss';
 import { createI18nTranslate } from '../../locale/create';
+import SearchCloseIcon from './components/search-close-icon';
+import SearchIcon from './components/search-icon';
 
 export default defineComponent({
   name: 'DSearch',
@@ -54,18 +56,18 @@ export default defineComponent({
         <label class={rootClasses.value}>
           {props.iconPosition === 'left' && (
             <div class={ns.e('icon')} onClick={onClickHandle}>
-              <Icon name="search" size="inherit" key="search"></Icon>
+              <SearchIcon></SearchIcon>
             </div>
           )}
           <DInput {...inputProps}></DInput>
           {clearIconShow.value && (
             <div class={ns.e('clear')} onClick={onClearHandle}>
-              <Icon name="close" size="inherit" key="close"></Icon>
+              <SearchCloseIcon></SearchCloseIcon>
             </div>
           )}
           {props.iconPosition === 'right' && (
             <div class={ns.e('icon')} onClick={onClickHandle}>
-              <Icon name="search" size="inherit" key="search"></Icon>
+              <SearchIcon></SearchIcon>
             </div>
           )}
         </label>

From 0cf253cd598e10cbb0fbde57bad3f10c85a7238b Mon Sep 17 00:00:00 2001
From: zcj <18137693952@163.com>
Date: Mon, 10 Oct 2022 22:37:06 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(search):=20=E7=A7=BB=E9=99=A4=20icon=20?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E7=9A=84=E5=BC=95=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/devui-vue/devui/search/src/search.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/devui-vue/devui/search/src/search.tsx b/packages/devui-vue/devui/search/src/search.tsx
index b4c6b303ab..aa0ad38641 100644
--- a/packages/devui-vue/devui/search/src/search.tsx
+++ b/packages/devui-vue/devui/search/src/search.tsx
@@ -4,7 +4,6 @@ import { getRootClass } from './composables/use-search-class';
 import { keywordsHandles } from './composables/use-search-keywords';
 import { keydownHandles } from './composables/use-search-keydown';
 import DInput from '../../input/src/input';
-import { Icon } from '../../icon';
 import { useNamespace } from '../../shared/hooks/use-namespace';
 import './search.scss';
 import { createI18nTranslate } from '../../locale/create';