From 17c2022a6f86d435e416694196248e8a118fa7c8 Mon Sep 17 00:00:00 2001
From: chenjiahan <chenjiahan@youzan.com>
Date: Sun, 20 Feb 2022 20:36:04 +0800
Subject: [PATCH] chore(AddressEdit): avoid using innerHTML

---
 .../vant/src/address-edit/AddressEditDetail.tsx | 17 ++---------------
 packages/vant/src/address-edit/index.less       | 10 ++--------
 packages/vant/src/cell/README.md                |  2 +-
 packages/vant/src/cell/README.zh-CN.md          |  2 +-
 packages/vant/src/cell/demo/index.vue           |  2 +-
 .../cell/test/__snapshots__/demo.spec.ts.snap   |  2 +-
 packages/vant/src/empty/README.md               |  2 +-
 packages/vant/src/empty/README.zh-CN.md         |  2 +-
 packages/vant/src/empty/demo/index.vue          |  2 +-
 .../empty/test/__snapshots__/demo.spec.ts.snap  |  2 +-
 10 files changed, 12 insertions(+), 31 deletions(-)

diff --git a/packages/vant/src/address-edit/AddressEditDetail.tsx b/packages/vant/src/address-edit/AddressEditDetail.tsx
index d0d5c0826..199d84375 100644
--- a/packages/vant/src/address-edit/AddressEditDetail.tsx
+++ b/packages/vant/src/address-edit/AddressEditDetail.tsx
@@ -41,17 +41,6 @@ export default defineComponent({
       emit('input', `${express.address || ''} ${express.name || ''}`.trim());
     };
 
-    const renderSearchTitle = (express: AddressEditSearchItem) => {
-      if (express.name) {
-        const text = express.name.replace(
-          props.value!,
-          `<span class=${bem('keyword')}>${props.value}</span>`
-        );
-
-        return <div innerHTML={text} />;
-      }
-    };
-
     const renderSearchResult = () => {
       if (!showSearchResult()) {
         return;
@@ -60,12 +49,10 @@ export default defineComponent({
       const { searchResult } = props;
       return searchResult!.map((express) => (
         <Cell
-          v-slots={{
-            title: () => renderSearchTitle(express),
-          }}
           clickable
-          key={express.name + express.address}
+          key={(express.name || '') + (express.address || '')}
           icon="location-o"
+          title={express.name}
           label={express.address}
           class={bem('search-item')}
           border={false}
diff --git a/packages/vant/src/address-edit/index.less b/packages/vant/src/address-edit/index.less
index 653bb2e5f..4329861f0 100644
--- a/packages/vant/src/address-edit/index.less
+++ b/packages/vant/src/address-edit/index.less
@@ -33,13 +33,7 @@ body {
     font-size: var(--van-address-edit-button-font-size);
   }
 
-  &-detail {
-    &__search-item {
-      background: var(--van-gray-2);
-    }
-
-    &__keyword {
-      color: var(--van-danger-color);
-    }
+  &-detail__search-item {
+    background: var(--van-gray-2);
   }
 }
diff --git a/packages/vant/src/cell/README.md b/packages/vant/src/cell/README.md
index c09cecc33..b5115cea7 100644
--- a/packages/vant/src/cell/README.md
+++ b/packages/vant/src/cell/README.md
@@ -104,7 +104,7 @@ app.use(CellGroup);
   <!-- Use the title slot to customize the title -->
   <template #title>
     <span class="custom-title">Title</span>
-    <van-tag type="danger">Tag</van-tag>
+    <van-tag type="primary">Tag</van-tag>
   </template>
 </van-cell>
 
diff --git a/packages/vant/src/cell/README.zh-CN.md b/packages/vant/src/cell/README.zh-CN.md
index 70cbb7920..58e767d7f 100644
--- a/packages/vant/src/cell/README.zh-CN.md
+++ b/packages/vant/src/cell/README.zh-CN.md
@@ -107,7 +107,7 @@ app.use(CellGroup);
   <!-- 使用 title 插槽来自定义标题 -->
   <template #title>
     <span class="custom-title">单元格</span>
-    <van-tag type="danger">标签</van-tag>
+    <van-tag type="primary">标签</van-tag>
   </template>
 </van-cell>
 
diff --git a/packages/vant/src/cell/demo/index.vue b/packages/vant/src/cell/demo/index.vue
index eac2bebbb..3763121fc 100644
--- a/packages/vant/src/cell/demo/index.vue
+++ b/packages/vant/src/cell/demo/index.vue
@@ -105,7 +105,7 @@ const t = useTranslate({
     <van-cell :value="t('content')" is-link>
       <template #title>
         <span class="custom-title">{{ t('cell') }}</span>
-        <van-tag type="danger">{{ t('tag') }}</van-tag>
+        <van-tag type="primary">{{ t('tag') }}</van-tag>
       </template>
     </van-cell>
 
diff --git a/packages/vant/src/cell/test/__snapshots__/demo.spec.ts.snap b/packages/vant/src/cell/test/__snapshots__/demo.spec.ts.snap
index 199b84b74..cdc102fde 100644
--- a/packages/vant/src/cell/test/__snapshots__/demo.spec.ts.snap
+++ b/packages/vant/src/cell/test/__snapshots__/demo.spec.ts.snap
@@ -237,7 +237,7 @@ exports[`should render demo and match snapshot 1`] = `
         Cell title
       </span>
       <transition-stub>
-        <span class="van-tag van-tag--danger">
+        <span class="van-tag van-tag--primary">
           Tag
         </span>
       </transition-stub>
diff --git a/packages/vant/src/empty/README.md b/packages/vant/src/empty/README.md
index cb2452178..b9693fc8e 100644
--- a/packages/vant/src/empty/README.md
+++ b/packages/vant/src/empty/README.md
@@ -57,7 +57,7 @@ Use the image prop to display different placeholder images.
 
 ```html
 <van-empty description="Description">
-  <van-button round type="danger" class="bottom-button">Button</van-button>
+  <van-button round type="primary" class="bottom-button">Button</van-button>
 </van-empty>
 
 <style>
diff --git a/packages/vant/src/empty/README.zh-CN.md b/packages/vant/src/empty/README.zh-CN.md
index f506c40cb..2c53b1171 100644
--- a/packages/vant/src/empty/README.zh-CN.md
+++ b/packages/vant/src/empty/README.zh-CN.md
@@ -62,7 +62,7 @@ Empty 组件内置了多种占位图片类型，可以在不同业务场景下
 
 ```html
 <van-empty description="描述文字">
-  <van-button round type="danger" class="bottom-button">按钮</van-button>
+  <van-button round type="primary" class="bottom-button">按钮</van-button>
 </van-empty>
 
 <style>
diff --git a/packages/vant/src/empty/demo/index.vue b/packages/vant/src/empty/demo/index.vue
index 576a99b26..01ceeacda 100644
--- a/packages/vant/src/empty/demo/index.vue
+++ b/packages/vant/src/empty/demo/index.vue
@@ -59,7 +59,7 @@ const active = ref('error');
 
   <demo-block :title="t('bottomContent')">
     <van-empty :description="t('description')">
-      <van-button round type="danger" class="bottom-button">
+      <van-button round type="primary" class="bottom-button">
         {{ t('button') }}
       </van-button>
     </van-empty>
diff --git a/packages/vant/src/empty/test/__snapshots__/demo.spec.ts.snap b/packages/vant/src/empty/test/__snapshots__/demo.spec.ts.snap
index d55e14031..fe539ec5a 100644
--- a/packages/vant/src/empty/test/__snapshots__/demo.spec.ts.snap
+++ b/packages/vant/src/empty/test/__snapshots__/demo.spec.ts.snap
@@ -113,7 +113,7 @@ exports[`should render demo and match snapshot 1`] = `
     </p>
     <div class="van-empty__bottom">
       <button type="button"
-              class="van-button van-button--danger van-button--normal van-button--round bottom-button"
+              class="van-button van-button--primary van-button--normal van-button--round bottom-button"
       >
         <div class="van-button__content">
           <span class="van-button__text">