From 735f7dd24a662481c9ed37a52c8d8ffedbf1e642 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@youzan.com>
Date: Wed, 11 Aug 2021 11:06:53 +0800
Subject: [PATCH] chore: remote isWeapp mixin (#9236)

* chore: remote isWeapp mixin

* fix: demo locale
---
 docs/site/demo-locale.js           | 9 ---------
 docs/site/entry.js                 | 5 +----
 src/action-bar/demo/index.vue      | 2 +-
 src/button/demo/index.vue          | 2 +-
 src/calendar/demo/index.vue        | 1 -
 src/cell/demo/index.vue            | 4 ++--
 src/checkbox/demo/index.vue        | 4 ++--
 src/col/demo/index.vue             | 2 +-
 src/datetime-picker/demo/index.vue | 6 +++---
 src/field/demo/FormatValue.vue     | 2 +-
 src/field/demo/ShowWordLimit.vue   | 2 +-
 src/notice-bar/demo/index.vue      | 2 +-
 src/picker/demo/index.vue          | 4 ++--
 src/popup/demo/index.vue           | 2 +-
 src/progress/demo/index.vue        | 2 +-
 src/radio/demo/index.vue           | 2 +-
 src/rate/demo/index.vue            | 2 +-
 src/slider/demo/index.vue          | 4 ++--
 src/stepper/demo/index.vue         | 2 +-
 src/sticky/demo/index.vue          | 2 +-
 src/tab/demo/index.vue             | 6 +++---
 src/toast/demo/index.vue           | 4 ++--
 src/uploader/demo/index.vue        | 2 +-
 test/demo.ts                       | 3 +--
 24 files changed, 31 insertions(+), 45 deletions(-)

diff --git a/docs/site/demo-locale.js b/docs/site/demo-locale.js
index e9df61e0e..f37be8300 100644
--- a/docs/site/demo-locale.js
+++ b/docs/site/demo-locale.js
@@ -5,15 +5,6 @@ Locale.add({
   'en-US': enUS,
 });
 
-export const DemoLocaleMixin = {
-  computed: {
-    // flag for vant-weapp demos
-    isWeapp() {
-      return location.search.indexOf('weapp=1') !== -1;
-    },
-  },
-};
-
 // switch lang after routing
 if (window.vueRouter) {
   window.vueRouter.afterEach((to) => {
diff --git a/docs/site/entry.js b/docs/site/entry.js
index a1f425679..853c6a18e 100644
--- a/docs/site/entry.js
+++ b/docs/site/entry.js
@@ -1,11 +1,8 @@
-import { DemoLocaleMixin } from './demo-locale';
+import './demo-locale';
 import Lazyload from '../../src/lazyload';
 
 const { app } = window;
 if (app) {
-  // helper for demo locales
-  app.mixin(DemoLocaleMixin);
-
   app.use(Lazyload, {
     lazyComponent: true,
   });
diff --git a/src/action-bar/demo/index.vue b/src/action-bar/demo/index.vue
index add8ccea1..86cfd3e13 100644
--- a/src/action-bar/demo/index.vue
+++ b/src/action-bar/demo/index.vue
@@ -72,7 +72,7 @@ const onClickButton = () => Toast(t('clickButton'));
     </van-action-bar>
   </demo-block>
 
-  <demo-block v-if="!isWeapp" :title="t('customIconColor')">
+  <demo-block :title="t('customIconColor')">
     <van-action-bar>
       <van-action-bar-icon icon="chat-o" :text="t('icon1')" color="#ee0a24" />
       <van-action-bar-icon icon="cart-o" :text="t('icon2')" />
diff --git a/src/button/demo/index.vue b/src/button/demo/index.vue
index d1019475e..8e88ea1e1 100644
--- a/src/button/demo/index.vue
+++ b/src/button/demo/index.vue
@@ -124,7 +124,7 @@ const t = useTranslate(i18n);
     <van-button type="primary" block>{{ t('blockElement') }}</van-button>
   </demo-block>
 
-  <demo-block v-if="!isWeapp" :title="t('router')">
+  <demo-block :title="t('router')">
     <van-button :text="t('urlRoute')" type="primary" url="/vant/mobile.html" />
     <van-button :text="t('vueRoute')" type="primary" to="index" />
   </demo-block>
diff --git a/src/calendar/demo/index.vue b/src/calendar/demo/index.vue
index f6f8d3923..c938806a1 100644
--- a/src/calendar/demo/index.vue
+++ b/src/calendar/demo/index.vue
@@ -282,7 +282,6 @@ const onConfirm = (date: Date | Date[]) => {
     />
 
     <van-cell
-      v-if="!isWeapp"
       is-link
       :title="t('firstDayOfWeek')"
       @click="show('single', 'firstDayOfWeek')"
diff --git a/src/cell/demo/index.vue b/src/cell/demo/index.vue
index d80898877..7f56960a3 100644
--- a/src/cell/demo/index.vue
+++ b/src/cell/demo/index.vue
@@ -45,7 +45,7 @@ const t = useTranslate(i18n);
     </van-cell-group>
   </demo-block>
 
-  <demo-block v-if="!isWeapp" :title="t('insetGrouped')">
+  <demo-block :title="t('insetGrouped')">
     <van-cell-group inset>
       <van-cell :title="t('cell')" :value="t('content')" />
       <van-cell :title="t('cell')" :value="t('content')" :label="t('desc')" />
@@ -66,7 +66,7 @@ const t = useTranslate(i18n);
     <van-cell :title="t('cell')" :value="t('content')" icon="location-o" />
   </demo-block>
 
-  <demo-block v-if="!isWeapp" :title="t('valueOnly')">
+  <demo-block :title="t('valueOnly')">
     <van-cell :value="t('content')" />
   </demo-block>
 
diff --git a/src/checkbox/demo/index.vue b/src/checkbox/demo/index.vue
index 3f6b9f243..93b4fb01c 100644
--- a/src/checkbox/demo/index.vue
+++ b/src/checkbox/demo/index.vue
@@ -126,7 +126,7 @@ const toggleAll = () => {
     </van-checkbox-group>
   </demo-block>
 
-  <demo-block v-if="!isWeapp" :title="t('horizontal')">
+  <demo-block :title="t('horizontal')">
     <van-checkbox-group v-model="state.horizontalResult" direction="horizontal">
       <van-checkbox name="a">{{ t('checkbox') }} a</van-checkbox>
       <van-checkbox name="b">{{ t('checkbox') }} b</van-checkbox>
@@ -141,7 +141,7 @@ const toggleAll = () => {
     </van-checkbox-group>
   </demo-block>
 
-  <demo-block v-if="!isWeapp" :title="t('toggleAll')">
+  <demo-block :title="t('toggleAll')">
     <van-checkbox-group v-model="state.checkAllResult" ref="group">
       <van-checkbox name="a">{{ t('checkbox') }} a</van-checkbox>
       <van-checkbox name="b">{{ t('checkbox') }} b</van-checkbox>
diff --git a/src/col/demo/index.vue b/src/col/demo/index.vue
index 396ce67e1..c3ea3f180 100644
--- a/src/col/demo/index.vue
+++ b/src/col/demo/index.vue
@@ -41,7 +41,7 @@ const t = useTranslate(i18n);
     </van-row>
   </demo-block>
 
-  <demo-block v-if="!isWeapp" :title="t('justify')">
+  <demo-block :title="t('justify')">
     <van-row justify="center">
       <van-col span="6">span: 6</van-col>
       <van-col span="6">span: 6</van-col>
diff --git a/src/datetime-picker/demo/index.vue b/src/datetime-picker/demo/index.vue
index a94dd59aa..68f6acb4d 100644
--- a/src/datetime-picker/demo/index.vue
+++ b/src/datetime-picker/demo/index.vue
@@ -89,7 +89,7 @@ const formatter = (type: string, value: string) => {
     />
   </demo-block>
 
-  <demo-block v-if="!isWeapp" card :title="t('monthDayType')">
+  <demo-block card :title="t('monthDayType')">
     <van-datetime-picker
       v-model="value.monthDay"
       type="month-day"
@@ -120,7 +120,7 @@ const formatter = (type: string, value: string) => {
     />
   </demo-block>
 
-  <demo-block v-if="!isWeapp" card :title="t('datehourType')">
+  <demo-block card :title="t('datehourType')">
     <van-datetime-picker
       v-model="value.datehour"
       type="datehour"
@@ -139,7 +139,7 @@ const formatter = (type: string, value: string) => {
     />
   </demo-block>
 
-  <demo-block v-if="!isWeapp" card :title="t('sortColumns')">
+  <demo-block card :title="t('sortColumns')">
     <van-datetime-picker
       v-model="value.sortColumnsDate"
       type="date"
diff --git a/src/field/demo/FormatValue.vue b/src/field/demo/FormatValue.vue
index f0b9e687b..87b388189 100644
--- a/src/field/demo/FormatValue.vue
+++ b/src/field/demo/FormatValue.vue
@@ -26,7 +26,7 @@ const formatter = (value: string) => value.replace(/\d/g, '');
 </script>
 
 <template>
-  <demo-block v-if="!isWeapp" :title="t('formatValue')">
+  <demo-block :title="t('formatValue')">
     <van-cell-group inset>
       <van-field
         v-model="state.value1"
diff --git a/src/field/demo/ShowWordLimit.vue b/src/field/demo/ShowWordLimit.vue
index 9302a587e..69727d42f 100644
--- a/src/field/demo/ShowWordLimit.vue
+++ b/src/field/demo/ShowWordLimit.vue
@@ -20,7 +20,7 @@ const value = ref('');
 </script>
 
 <template>
-  <demo-block v-if="!isWeapp" :title="t('showWordLimit')">
+  <demo-block :title="t('showWordLimit')">
     <van-cell-group inset>
       <van-field
         v-model="value"
diff --git a/src/notice-bar/demo/index.vue b/src/notice-bar/demo/index.vue
index ba3ced868..84a74fbb2 100644
--- a/src/notice-bar/demo/index.vue
+++ b/src/notice-bar/demo/index.vue
@@ -55,7 +55,7 @@ const t = useTranslate(i18n);
     />
   </demo-block>
 
-  <demo-block v-if="!isWeapp" :title="t('verticalScroll')">
+  <demo-block :title="t('verticalScroll')">
     <van-notice-bar left-icon="volume-o" :scrollable="false">
       <van-swipe
         vertical
diff --git a/src/picker/demo/index.vue b/src/picker/demo/index.vue
index 3f0bf8eaf..974cfd1c3 100644
--- a/src/picker/demo/index.vue
+++ b/src/picker/demo/index.vue
@@ -149,7 +149,7 @@ const onConfirm2 = (value: string) => {
     />
   </demo-block>
 
-  <demo-block card v-if="!isWeapp" :title="t('cascade')">
+  <demo-block card :title="t('cascade')">
     <van-picker :title="t('title')" :columns="t('cascadeColumns')" />
   </demo-block>
 
@@ -170,7 +170,7 @@ const onConfirm2 = (value: string) => {
     <van-picker loading :title="t('title')" :columns="columns" />
   </demo-block>
 
-  <demo-block card v-if="!isWeapp" :title="t('withPopup')">
+  <demo-block card :title="t('withPopup')">
     <van-field
       v-model="fieldValue"
       is-link
diff --git a/src/popup/demo/index.vue b/src/popup/demo/index.vue
index d8ac4bebb..9dd85bfc8 100644
--- a/src/popup/demo/index.vue
+++ b/src/popup/demo/index.vue
@@ -129,7 +129,7 @@ const showCustomIconPosition = ref(false);
     />
   </demo-block>
 
-  <demo-block card v-if="!isWeapp" :title="t('teleport')">
+  <demo-block card :title="t('teleport')">
     <van-cell :title="t('teleport')" is-link @click="showGetContainer = true" />
     <van-popup
       v-model:show="showGetContainer"
diff --git a/src/progress/demo/index.vue b/src/progress/demo/index.vue
index b129cb19d..64f988ecd 100644
--- a/src/progress/demo/index.vue
+++ b/src/progress/demo/index.vue
@@ -22,7 +22,7 @@ const t = useTranslate(i18n);
     <van-progress :percentage="50" />
   </demo-block>
 
-  <demo-block v-if="!isWeapp" :title="t('strokeWidth')">
+  <demo-block :title="t('strokeWidth')">
     <van-progress :percentage="50" stroke-width="8" />
   </demo-block>
 
diff --git a/src/radio/demo/index.vue b/src/radio/demo/index.vue
index c9c479c9b..b7291153e 100644
--- a/src/radio/demo/index.vue
+++ b/src/radio/demo/index.vue
@@ -51,7 +51,7 @@ const inactiveIcon = 'https://img.yzcdn.cn/vant/user-inactive.png';
     </van-radio-group>
   </demo-block>
 
-  <demo-block v-if="!isWeapp" :title="t('horizontal')">
+  <demo-block :title="t('horizontal')">
     <van-radio-group
       v-model="radioHorizontal"
       class="demo-radio-group"
diff --git a/src/rate/demo/index.vue b/src/rate/demo/index.vue
index e6816e31c..f12097767 100644
--- a/src/rate/demo/index.vue
+++ b/src/rate/demo/index.vue
@@ -80,7 +80,7 @@ const onChange = (value: number) => Toast(t('toastContent', value));
     <van-rate v-model="value7" readonly allow-half />
   </demo-block>
 
-  <demo-block v-if="!isWeapp" :title="t('changeEvent')">
+  <demo-block :title="t('changeEvent')">
     <van-rate v-model="value8" @change="onChange" />
   </demo-block>
 </template>
diff --git a/src/slider/demo/index.vue b/src/slider/demo/index.vue
index fa2a62074..ddddd02ed 100644
--- a/src/slider/demo/index.vue
+++ b/src/slider/demo/index.vue
@@ -47,7 +47,7 @@ const onChange = (value: string) => Toast(t('text') + value);
     <van-slider v-model="value1" @change="onChange" />
   </demo-block>
 
-  <demo-block v-if="!isWeapp" :title="t('title2')">
+  <demo-block :title="t('title2')">
     <van-slider range v-model="value2" @change="onChange" />
   </demo-block>
 
@@ -80,7 +80,7 @@ const onChange = (value: string) => Toast(t('text') + value);
     </van-slider>
   </demo-block>
 
-  <demo-block v-if="!isWeapp" :title="t('vertical')">
+  <demo-block :title="t('vertical')">
     <div :style="{ height: '150px', paddingLeft: '30px' }">
       <van-slider v-model="value8" vertical @change="onChange" />
       <van-slider
diff --git a/src/stepper/demo/index.vue b/src/stepper/demo/index.vue
index e71c48b8e..6a768753f 100644
--- a/src/stepper/demo/index.vue
+++ b/src/stepper/demo/index.vue
@@ -106,7 +106,7 @@ const beforeChange = () => {
       </template>
     </van-cell>
 
-    <van-cell v-if="!isWeapp" center :title="t('roundTheme')">
+    <van-cell center :title="t('roundTheme')">
       <template #value>
         <van-stepper
           v-model="stepperRound"
diff --git a/src/sticky/demo/index.vue b/src/sticky/demo/index.vue
index bdc5b0899..b6d529a1c 100644
--- a/src/sticky/demo/index.vue
+++ b/src/sticky/demo/index.vue
@@ -36,7 +36,7 @@ const container = ref(null);
     </van-sticky>
   </demo-block>
 
-  <demo-block v-if="!isWeapp" :title="t('setContainer')">
+  <demo-block :title="t('setContainer')">
     <div ref="container" style="height: 150px; background-color: #fff">
       <van-sticky :container="container">
         <van-button type="warning" style="margin-left: 215px">
diff --git a/src/tab/demo/index.vue b/src/tab/demo/index.vue
index 20d3ac908..4e44a2691 100644
--- a/src/tab/demo/index.vue
+++ b/src/tab/demo/index.vue
@@ -119,7 +119,7 @@ const beforeChange = (name: number) => {
     </van-tabs>
   </demo-block>
 
-  <demo-block v-if="!isWeapp" :title="t('title7')">
+  <demo-block :title="t('title7')">
     <van-tabs :active="active">
       <van-tab v-for="index in 2" :key="index">
         <template #title> <van-icon name="more-o" />{{ t('tab') }} </template>
@@ -144,7 +144,7 @@ const beforeChange = (name: number) => {
     </van-tabs>
   </demo-block>
 
-  <demo-block v-if="!isWeapp" :title="t('title10')">
+  <demo-block :title="t('title10')">
     <van-tabs scrollspy sticky>
       <van-tab :title="t('tab') + index" v-for="index in 8" :key="index">
         {{ t('content') }} {{ index }}
@@ -152,7 +152,7 @@ const beforeChange = (name: number) => {
     </van-tabs>
   </demo-block>
 
-  <demo-block v-if="!isWeapp" :title="t('beforeChange')">
+  <demo-block :title="t('beforeChange')">
     <van-tabs :before-change="beforeChange">
       <van-tab :title="t('tab') + index" v-for="index in 4" :key="index">
         {{ t('content') }} {{ index }}
diff --git a/src/toast/demo/index.vue b/src/toast/demo/index.vue
index 32ff34643..49a48d9f1 100644
--- a/src/toast/demo/index.vue
+++ b/src/toast/demo/index.vue
@@ -116,7 +116,7 @@ const showCustomizedToast = () => {
     <van-cell is-link :title="t('fail')" @click="showFailToast" />
   </demo-block>
 
-  <demo-block card v-if="!isWeapp" :title="t('customIcon')">
+  <demo-block card :title="t('customIcon')">
     <van-cell is-link :title="t('customIcon')" @click="showIconToast" />
     <van-cell is-link :title="t('customImage')" @click="showImageToast" />
     <van-cell
@@ -126,7 +126,7 @@ const showCustomizedToast = () => {
     />
   </demo-block>
 
-  <demo-block card v-if="!isWeapp" :title="t('customPosition')">
+  <demo-block card :title="t('customPosition')">
     <van-cell is-link :title="t('positionTop')" @click="showTopToast" />
     <van-cell is-link :title="t('positionBottom')" @click="showBottomToast" />
   </demo-block>
diff --git a/src/uploader/demo/index.vue b/src/uploader/demo/index.vue
index 9e1be8f54..d8252410f 100644
--- a/src/uploader/demo/index.vue
+++ b/src/uploader/demo/index.vue
@@ -132,7 +132,7 @@ const onOversize = (file: UploaderFileListItem, detail: unknown) => {
     <van-uploader v-model="fileList" multiple accept="*" />
   </demo-block>
 
-  <demo-block v-if="!isWeapp" :title="t('status')">
+  <demo-block :title="t('status')">
     <van-uploader v-model="statusFileList" :after-read="afterReadFailed" />
   </demo-block>
 
diff --git a/test/demo.ts b/test/demo.ts
index 789e80f68..9937e8692 100644
--- a/test/demo.ts
+++ b/test/demo.ts
@@ -1,7 +1,7 @@
 import { h, defineComponent } from 'vue';
 import Locale from '../src/locale';
 import { mount, later } from '.';
-import { DemoLocaleMixin } from '../docs/site/demo-locale';
+import '../docs/site/demo-locale';
 
 const EmptyComponent = defineComponent({
   inheritAttrs: false,
@@ -22,7 +22,6 @@ export function snapshotDemo(Demo: any, option: any = {}) {
 
     const wrapper = mount(Demo, {
       global: {
-        mixins: [DemoLocaleMixin],
         components: {
           'demo-block': EmptyComponent,
         },