+ const inner = (
+ <>
{renderOverlayContent}
{renderContent}
+ >
+ );
+
+ const renderPopupContent = mounted.value ? (
+
+ {inner}
) : (
-
- {renderOverlayContent}
- {renderContent}
-
+ inner
);
return (!props.destroyOnClose || wrapperVisible.value) && renderPopupContent;
From 6e534ecb9465a4f8814b3b01a5e809855a28aad5 Mon Sep 17 00:00:00 2001
From: novlan1 <1576271227@qq.com>
Date: Wed, 27 Nov 2024 12:25:00 +0800
Subject: [PATCH 06/11] chore: update snapshot
---
.../__test__/__snapshots__/demo.test.jsx.snap | 48 ++++----
.../__test__/__snapshots__/demo.test.jsx.snap | 56 ++++-----
.../__test__/__snapshots__/demo.test.jsx.snap | 16 +--
.../__test__/__snapshots__/demo.test.jsx.snap | 36 +++---
.../__test__/__snapshots__/demo.test.jsx.snap | 112 +++++++++---------
.../__test__/__snapshots__/demo.test.jsx.snap | 32 ++---
.../__test__/__snapshots__/demo.test.jsx.snap | 24 ++--
.../__test__/__snapshots__/demo.test.jsx.snap | 36 +++---
.../__test__/__snapshots__/demo.test.jsx.snap | 16 +--
9 files changed, 188 insertions(+), 188 deletions(-)
diff --git a/src/calendar/__test__/__snapshots__/demo.test.jsx.snap b/src/calendar/__test__/__snapshots__/demo.test.jsx.snap
index d35f248bf..64604b523 100644
--- a/src/calendar/__test__/__snapshots__/demo.test.jsx.snap
+++ b/src/calendar/__test__/__snapshots__/demo.test.jsx.snap
@@ -3,7 +3,7 @@
exports[`Calendar > Calendar baseVue demo works fine 1`] = `
-
+
Calendar baseVue demo works fine 1`] = `
-
+
Calendar customButtonVue demo works fine 1`] = `
>
-
+
Calendar customButtonVue demo works fine 1`] = `
-
+
Calendar customRangeVue demo works fine 1`] = `
>
-
+
Calendar customRangeVue demo works fine 1`] = `
-
+
Calendar customTextVue demo works fine 1`] = `
>
-
+
Calendar customTextVue demo works fine 1`] = `
-
+
Calendar mobileVue demo works fine 1`] = `
>
-
+
Calendar mobileVue demo works fine 1`] = `
-
+
Calendar mobileVue demo works fine 1`] = `
-
+
Calendar mobileVue demo works fine 1`] = `
-
+
Calendar mobileVue demo works fine 1`] = `
-
+
Calendar mobileVue demo works fine 1`] = `
-
+
Calendar mobileVue demo works fine 1`] = `
-
+
Calendar mobileVue demo works fine 1`] = `
-
+
Calendar mobileVue demo works fine 1`] = `
-
+
Calendar mobileVue demo works fine 1`] = `
-
+
Calendar mobileVue demo works fine 1`] = `
-
+
Calendar mobileVue demo works fine 1`] = `
-
+
Calendar mobileVue demo works fine 1`] = `
exports[`Calendar > Calendar multipleVue demo works fine 1`] = `
-
+
Calendar multipleVue demo works fine 1`] = `
-
+
Calendar multipleVue demo works fine 1`] = `
exports[`Calendar > Calendar rangeVue demo works fine 1`] = `
-
+
Calendar rangeVue demo works fine 1`] = `
-
+
Cascader baseVue demo works fine 1`] = `
-
+
Cascader baseVue demo works fine 1`] = `
-
+
`;
@@ -267,7 +267,7 @@ exports[`Cascader > Cascader checkStrictlyVue demo works fine 1`] = `
-
+
Cascader checkStrictlyVue demo works fine 1`] = `
-
+
`;
@@ -477,7 +477,7 @@ exports[`Cascader > Cascader keysVue demo works fine 1`] = `
-
+
Cascader keysVue demo works fine 1`] = `
-
+
`;
@@ -692,7 +692,7 @@ exports[`Cascader > Cascader lazyVue demo works fine 1`] = `
-
+
Cascader lazyVue demo works fine 1`] = `
-
+
`;
@@ -908,7 +908,7 @@ exports[`Cascader > Cascader mobileVue demo works fine 1`] = `
-
+
Cascader mobileVue demo works fine 1`] = `
-
+
@@ -1136,7 +1136,7 @@ exports[`Cascader > Cascader mobileVue demo works fine 1`] = `
-
+
Cascader mobileVue demo works fine 1`] = `
-
+
@@ -1339,7 +1339,7 @@ exports[`Cascader > Cascader mobileVue demo works fine 1`] = `
-
+
Cascader mobileVue demo works fine 1`] = `
-
+
@@ -1567,7 +1567,7 @@ exports[`Cascader > Cascader mobileVue demo works fine 1`] = `
-
+
Cascader mobileVue demo works fine 1`] = `
-
+
@@ -1795,7 +1795,7 @@ exports[`Cascader > Cascader mobileVue demo works fine 1`] = `
-
+
Cascader mobileVue demo works fine 1`] = `
-
+
@@ -2027,7 +2027,7 @@ exports[`Cascader > Cascader mobileVue demo works fine 1`] = `
-
+
Cascader mobileVue demo works fine 1`] = `
-
+
@@ -2226,7 +2226,7 @@ exports[`Cascader > Cascader mobileVue demo works fine 1`] = `
-
+
Cascader mobileVue demo works fine 1`] = `
-
+
@@ -2439,7 +2439,7 @@ exports[`Cascader > Cascader themeTabVue demo works fine 1`] = `
-
+
Cascader themeTabVue demo works fine 1`] = `
-
+
`;
@@ -2625,7 +2625,7 @@ exports[`Cascader > Cascader withTitleVue demo works fine 1`] = `
-
+
Cascader withTitleVue demo works fine 1`] = `
-
+
`;
@@ -2844,7 +2844,7 @@ exports[`Cascader > Cascader withValueVue demo works fine 1`] = `
-
+
Cascader withValueVue demo works fine 1`] = `
-
+
`;
diff --git a/src/config-provider/__test__/__snapshots__/demo.test.jsx.snap b/src/config-provider/__test__/__snapshots__/demo.test.jsx.snap
index 13206441d..8c5379695 100644
--- a/src/config-provider/__test__/__snapshots__/demo.test.jsx.snap
+++ b/src/config-provider/__test__/__snapshots__/demo.test.jsx.snap
@@ -567,7 +567,7 @@ exports[`ConfigProvider > ConfigProvider mobileVue demo works fine 1`] = `
-
+
ConfigProvider mobileVue demo works fine 1`] = `
-
+
ConfigProvider mobileVue demo works fine 1`] = `
-
+
ConfigProvider mobileVue demo works fine 1`] = `
-
+
@@ -3837,7 +3837,7 @@ exports[`ConfigProvider > ConfigProvider otherEnVue demo works fine 1`] = `
-
+
ConfigProvider otherEnVue demo works fine 1`] = `
-
+
ConfigProvider otherEnVue demo works fine 1`] = `
-
+
ConfigProvider otherEnVue demo works fine 1`] = `
-
+
diff --git a/src/date-time-picker/__test__/__snapshots__/demo.test.jsx.snap b/src/date-time-picker/__test__/__snapshots__/demo.test.jsx.snap
index 6d26fc759..1c3e07a8e 100644
--- a/src/date-time-picker/__test__/__snapshots__/demo.test.jsx.snap
+++ b/src/date-time-picker/__test__/__snapshots__/demo.test.jsx.snap
@@ -32,7 +32,7 @@ exports[`DateTimePicker > DateTimePicker baseVue demo works fine 1`] = `
-
+
DateTimePicker baseVue demo works fine 1`] = `
-
+
`;
@@ -597,7 +597,7 @@ exports[`DateTimePicker > DateTimePicker customRangeVue demo works fine 1`] = `
-
+
DateTimePicker customRangeVue demo works fine 1`] = `
-
+
`;
@@ -1064,7 +1064,7 @@ exports[`DateTimePicker > DateTimePicker fullVue demo works fine 1`] = `
-
+
DateTimePicker fullVue demo works fine 1`] = `
-
+
`;
@@ -2708,7 +2708,7 @@ exports[`DateTimePicker > DateTimePicker mobileVue demo works fine 1`] = `
-
+
DateTimePicker mobileVue demo works fine 1`] = `
-
+
DateTimePicker mobileVue demo works fine 1`] = `
-
+
DateTimePicker mobileVue demo works fine 1`] = `
-
+
DateTimePicker mobileVue demo works fine 1`] = `
-
+
DateTimePicker mobileVue demo works fine 1`] = `
-
+
@@ -4321,7 +4321,7 @@ exports[`DateTimePicker > DateTimePicker mobileVue demo works fine 1`] = `
-
+
DateTimePicker mobileVue demo works fine 1`] = `
-
+
@@ -4791,7 +4791,7 @@ exports[`DateTimePicker > DateTimePicker timeVue demo works fine 1`] = `
-
+
DateTimePicker timeVue demo works fine 1`] = `
-
+
`;
@@ -5492,7 +5492,7 @@ exports[`DateTimePicker > DateTimePicker yearMonthVue demo works fine 1`] = `
-
+
DateTimePicker yearMonthVue demo works fine 1`] = `
-
+
`;
diff --git a/src/dialog/__test__/__snapshots__/demo.test.jsx.snap b/src/dialog/__test__/__snapshots__/demo.test.jsx.snap
index 0e46ca6b7..271502ea2 100644
--- a/src/dialog/__test__/__snapshots__/demo.test.jsx.snap
+++ b/src/dialog/__test__/__snapshots__/demo.test.jsx.snap
@@ -21,7 +21,7 @@ exports[`Dialog > Dialog confirmVue demo works fine 1`] = `
-
+
Dialog confirmVue demo works fine 1`] = `
-
+
@@ -114,7 +114,7 @@ exports[`Dialog > Dialog confirmVue demo works fine 1`] = `
-
+
Dialog confirmVue demo works fine 1`] = `
-
+
`;
@@ -209,7 +209,7 @@ exports[`Dialog > Dialog feedbackVue demo works fine 1`] = `
-
+
Dialog feedbackVue demo works fine 1`] = `
-
+
@@ -289,7 +289,7 @@ exports[`Dialog > Dialog feedbackVue demo works fine 1`] = `
-
+
Dialog feedbackVue demo works fine 1`] = `
-
+
@@ -365,7 +365,7 @@ exports[`Dialog > Dialog feedbackVue demo works fine 1`] = `
-
+
Dialog feedbackVue demo works fine 1`] = `
-
+
`;
@@ -454,7 +454,7 @@ exports[`Dialog > Dialog imageDialogVue demo works fine 1`] = `
-
+
Dialog imageDialogVue demo works fine 1`] = `
-
+
Dialog imageDialogVue demo works fine 1`] = `
-
+
Dialog imageDialogVue demo works fine 1`] = `
-
+
`;
@@ -739,7 +739,7 @@ exports[`Dialog > Dialog inputVue demo works fine 1`] = `
-
+
Dialog inputVue demo works fine 1`] = `
-
+
Dialog inputVue demo works fine 1`] = `
-
+
Dialog inputVue demo works fine 1`] = `
-
+
`;
@@ -1043,7 +1043,7 @@ exports[`Dialog > Dialog mobileVue demo works fine 1`] = `
-
+
Dialog mobileVue demo works fine 1`] = `
-
+
@@ -1123,7 +1123,7 @@ exports[`Dialog > Dialog mobileVue demo works fine 1`] = `
-
+
Dialog mobileVue demo works fine 1`] = `
-
+
@@ -1199,7 +1199,7 @@ exports[`Dialog > Dialog mobileVue demo works fine 1`] = `
-
+
Dialog mobileVue demo works fine 1`] = `
-
+
@@ -1300,7 +1300,7 @@ exports[`Dialog > Dialog mobileVue demo works fine 1`] = `
-
+
Dialog mobileVue demo works fine 1`] = `
-
+
@@ -1393,7 +1393,7 @@ exports[`Dialog > Dialog mobileVue demo works fine 1`] = `
-
+
Dialog mobileVue demo works fine 1`] = `
-
+
@@ -1502,7 +1502,7 @@ exports[`Dialog > Dialog mobileVue demo works fine 1`] = `
-
+
Dialog mobileVue demo works fine 1`] = `
-
+
Dialog mobileVue demo works fine 1`] = `
-
+
Dialog mobileVue demo works fine 1`] = `
-
+
@@ -1789,7 +1789,7 @@ exports[`Dialog > Dialog mobileVue demo works fine 1`] = `
-
+
Dialog mobileVue demo works fine 1`] = `
-
+
Dialog mobileVue demo works fine 1`] = `
-
+
Dialog mobileVue demo works fine 1`] = `
-
+
@@ -2090,7 +2090,7 @@ exports[`Dialog > Dialog mobileVue demo works fine 1`] = `
-
+
Dialog mobileVue demo works fine 1`] = `
-
+
@@ -2183,7 +2183,7 @@ exports[`Dialog > Dialog mobileVue demo works fine 1`] = `
-
+
Dialog mobileVue demo works fine 1`] = `
-
+
@@ -2276,7 +2276,7 @@ exports[`Dialog > Dialog mobileVue demo works fine 1`] = `
-
+
Dialog mobileVue demo works fine 1`] = `
-
+
@@ -2369,7 +2369,7 @@ exports[`Dialog > Dialog mobileVue demo works fine 1`] = `
-
+
Dialog mobileVue demo works fine 1`] = `
-
+
@@ -2479,7 +2479,7 @@ exports[`Dialog > Dialog mobileVue demo works fine 1`] = `
-
+
Dialog mobileVue demo works fine 1`] = `
-
+
@@ -2634,7 +2634,7 @@ exports[`Dialog > Dialog multiStateVue demo works fine 1`] = `
-
+
Dialog multiStateVue demo works fine 1`] = `
-
+
@@ -2727,7 +2727,7 @@ exports[`Dialog > Dialog multiStateVue demo works fine 1`] = `
-
+
Dialog multiStateVue demo works fine 1`] = `
-
+
@@ -2820,7 +2820,7 @@ exports[`Dialog > Dialog multiStateVue demo works fine 1`] = `
-
+
Dialog multiStateVue demo works fine 1`] = `
-
+
@@ -2913,7 +2913,7 @@ exports[`Dialog > Dialog multiStateVue demo works fine 1`] = `
-
+
Dialog multiStateVue demo works fine 1`] = `
-
+
@@ -3023,7 +3023,7 @@ exports[`Dialog > Dialog multiStateVue demo works fine 1`] = `
-
+
Dialog multiStateVue demo works fine 1`] = `
-
+
`;
diff --git a/src/drawer/__test__/__snapshots__/demo.test.jsx.snap b/src/drawer/__test__/__snapshots__/demo.test.jsx.snap
index 23eab174f..2b55830c0 100644
--- a/src/drawer/__test__/__snapshots__/demo.test.jsx.snap
+++ b/src/drawer/__test__/__snapshots__/demo.test.jsx.snap
@@ -5,7 +5,7 @@ exports[`Drawer > Drawer baseVue demo works fine 1`] = `
data-v-app=""
>
-
+
Drawer baseVue demo works fine 1`] = `
-
+
+
Dialog feedbackVue demo works fine 1`] = `
+
`;
@@ -543,6 +555,7 @@ exports[`Dialog > Dialog imageDialogVue demo works fine 1`] = `
+
Dialog imageDialogVue demo works fine 1`] = `
+
Dialog imageDialogVue demo works fine 1`] = `
+
Dialog imageDialogVue demo works fine 1`] = `
+
Dialog imageDialogVue demo works fine 1`] = `
+
Dialog imageDialogVue demo works fine 1`] = `
+
Dialog imageDialogVue demo works fine 1`] = `
+
Dialog imageDialogVue demo works fine 1`] = `
+
Dialog imageDialogVue demo works fine 1`] = `
+
Dialog imageDialogVue demo works fine 1`] = `
+
Dialog imageDialogVue demo works fine 1`] = `
+
Dialog imageDialogVue demo works fine 1`] = `
+
@@ -1356,6 +1380,7 @@ exports[`Dialog > Dialog inputVue demo works fine 1`] = `
+
Dialog inputVue demo works fine 1`] = `
+
Dialog inputVue demo works fine 1`] = `
+
Dialog inputVue demo works fine 1`] = `
+
`;
@@ -1660,6 +1688,7 @@ exports[`Dialog > Dialog mobileVue demo works fine 1`] = `
+
Dialog mobileVue demo works fine 1`] = `
+
@@ -1740,6 +1770,7 @@ exports[`Dialog > Dialog mobileVue demo works fine 1`] = `
+
Dialog mobileVue demo works fine 1`] = `
+
@@ -1816,6 +1848,7 @@ exports[`Dialog > Dialog mobileVue demo works fine 1`] = `
+
Dialog mobileVue demo works fine 1`] = `
+
@@ -1921,6 +1955,7 @@ exports[`Dialog > Dialog mobileVue demo works fine 1`] = `
+
Dialog mobileVue demo works fine 1`] = `
+
@@ -2014,6 +2050,7 @@ exports[`Dialog > Dialog mobileVue demo works fine 1`] = `
+
Dialog mobileVue demo works fine 1`] = `
+
Dialog mobileVue demo works fine 1`] = `
+
Dialog mobileVue demo works fine 1`] = `
+
@@ -2208,6 +2248,7 @@ exports[`Dialog > Dialog mobileVue demo works fine 1`] = `
+
Dialog mobileVue demo works fine 1`] = `
+
Dialog mobileVue demo works fine 1`] = `
+
Dialog mobileVue demo works fine 1`] = `
+
@@ -2495,6 +2539,7 @@ exports[`Dialog > Dialog mobileVue demo works fine 1`] = `
+
Dialog mobileVue demo works fine 1`] = `
+
Dialog mobileVue demo works fine 1`] = `
+
Dialog mobileVue demo works fine 1`] = `
+
Dialog mobileVue demo works fine 1`] = `
+
Dialog mobileVue demo works fine 1`] = `
+
Dialog mobileVue demo works fine 1`] = `
+
Dialog mobileVue demo works fine 1`] = `
+
Dialog mobileVue demo works fine 1`] = `
+
Dialog mobileVue demo works fine 1`] = `
+
Dialog mobileVue demo works fine 1`] = `
+
Dialog mobileVue demo works fine 1`] = `
+
@@ -3325,6 +3381,7 @@ exports[`Dialog > Dialog mobileVue demo works fine 1`] = `
+
Dialog mobileVue demo works fine 1`] = `
+
@@ -3423,6 +3481,7 @@ exports[`Dialog > Dialog mobileVue demo works fine 1`] = `
+
Dialog mobileVue demo works fine 1`] = `
+
@@ -3521,6 +3581,7 @@ exports[`Dialog > Dialog mobileVue demo works fine 1`] = `
+
Dialog mobileVue demo works fine 1`] = `
+
@@ -3619,6 +3681,7 @@ exports[`Dialog > Dialog mobileVue demo works fine 1`] = `
+
Dialog mobileVue demo works fine 1`] = `
+
@@ -3734,6 +3798,7 @@ exports[`Dialog > Dialog mobileVue demo works fine 1`] = `
+
Dialog mobileVue demo works fine 1`] = `
+
@@ -3894,6 +3960,7 @@ exports[`Dialog > Dialog multiStateVue demo works fine 1`] = `
+
Dialog multiStateVue demo works fine 1`] = `
+
@@ -3992,6 +4060,7 @@ exports[`Dialog > Dialog multiStateVue demo works fine 1`] = `
+
Dialog multiStateVue demo works fine 1`] = `
+
@@ -4090,6 +4160,7 @@ exports[`Dialog > Dialog multiStateVue demo works fine 1`] = `
+
Dialog multiStateVue demo works fine 1`] = `
+
@@ -4188,6 +4260,7 @@ exports[`Dialog > Dialog multiStateVue demo works fine 1`] = `
+
Dialog multiStateVue demo works fine 1`] = `
+
@@ -4303,6 +4377,7 @@ exports[`Dialog > Dialog multiStateVue demo works fine 1`] = `
+
Dialog multiStateVue demo works fine 1`] = `
+
`;
diff --git a/src/drawer/__test__/__snapshots__/demo.test.jsx.snap b/src/drawer/__test__/__snapshots__/demo.test.jsx.snap
index 59f978606..96b058db6 100644
--- a/src/drawer/__test__/__snapshots__/demo.test.jsx.snap
+++ b/src/drawer/__test__/__snapshots__/demo.test.jsx.snap
@@ -5,6 +5,7 @@ exports[`Drawer > Drawer baseVue demo works fine 1`] = `
data-v-app=""
>
+
Drawer baseVue demo works fine 1`] = `
+
Drawer footerVue demo works fine 1`] = `
data-v-app=""
>
+
Drawer footerVue demo works fine 1`] = `
+
Drawer iconVue demo works fine 1`] = `
data-v-app=""
>
+
Drawer iconVue demo works fine 1`] = `
+
Drawer mobileVue demo works fine 1`] = `
>
+
Drawer mobileVue demo works fine 1`] = `
+
Drawer mobileVue demo works fine 1`] = `
>
+
Drawer mobileVue demo works fine 1`] = `
+
Drawer mobileVue demo works fine 1`] = `
>
+
Drawer mobileVue demo works fine 1`] = `
+
Drawer mobileVue demo works fine 1`] = `
>
+
Drawer mobileVue demo works fine 1`] = `
+
Drawer titleVue demo works fine 1`] = `
data-v-app=""
>
+
Drawer titleVue demo works fine 1`] = `
+
Form horizontalVue demo works fine 1`] = `
+
Form horizontalVue demo works fine 1`] = `
+
@@ -886,6 +888,7 @@ exports[`Form > Form horizontalVue demo works fine 1`] = `
+
Form horizontalVue demo works fine 1`] = `
+
@@ -2137,6 +2141,7 @@ exports[`Form > Form mobileVue demo works fine 1`] = `
+
Form mobileVue demo works fine 1`] = `
+
@@ -2664,6 +2670,7 @@ exports[`Form > Form mobileVue demo works fine 1`] = `
+
Form mobileVue demo works fine 1`] = `
+
@@ -3774,6 +3782,7 @@ exports[`Form > Form verticalVue demo works fine 1`] = `
+
Form verticalVue demo works fine 1`] = `
+
@@ -4299,6 +4309,7 @@ exports[`Form > Form verticalVue demo works fine 1`] = `
+
Form verticalVue demo works fine 1`] = `
+
diff --git a/src/picker/__test__/__snapshots__/demo.test.jsx.snap b/src/picker/__test__/__snapshots__/demo.test.jsx.snap
index ec1014d3a..397dbf682 100644
--- a/src/picker/__test__/__snapshots__/demo.test.jsx.snap
+++ b/src/picker/__test__/__snapshots__/demo.test.jsx.snap
@@ -47,6 +47,7 @@ exports[`Picker > Picker areaVue demo works fine 1`] = `
+
Picker areaVue demo works fine 1`] = `
+
`;
@@ -244,6 +246,7 @@ exports[`Picker > Picker baseVue demo works fine 1`] = `
+
Picker baseVue demo works fine 1`] = `
+
+
Picker baseVue demo works fine 1`] = `
+
`;
@@ -601,6 +607,7 @@ exports[`Picker > Picker cascadeVue demo works fine 1`] = `
+
Picker cascadeVue demo works fine 1`] = `
+
`;
@@ -898,6 +906,7 @@ exports[`Picker > Picker mobileVue demo works fine 1`] = `
+
Picker mobileVue demo works fine 1`] = `
+
+
Picker mobileVue demo works fine 1`] = `
+
Picker mobileVue demo works fine 1`] = `
+
Picker mobileVue demo works fine 1`] = `
+
@@ -1445,6 +1459,7 @@ exports[`Picker > Picker mobileVue demo works fine 1`] = `
+
Picker mobileVue demo works fine 1`] = `
+
Picker titleVue demo works fine 1`] = `
+
Picker titleVue demo works fine 1`] = `
+
`;
diff --git a/src/popup/__test__/__snapshots__/demo.test.jsx.snap b/src/popup/__test__/__snapshots__/demo.test.jsx.snap
index 403cd3280..cc6e21bce 100644
--- a/src/popup/__test__/__snapshots__/demo.test.jsx.snap
+++ b/src/popup/__test__/__snapshots__/demo.test.jsx.snap
@@ -116,6 +116,7 @@ exports[`Popup > Popup customCloseVue demo works fine 1`] = `
+
Popup customCloseVue demo works fine 1`] = `
+
`;
@@ -323,6 +325,7 @@ exports[`Popup > Popup mobileVue demo works fine 1`] = `
+
Popup mobileVue demo works fine 1`] = `
+
@@ -438,6 +444,7 @@ exports[`Popup > Popup withTitleVue demo works fine 1`] = `
+
Popup withTitleVue demo works fine 1`] = `
+
`;
diff --git a/src/popup/popup.tsx b/src/popup/popup.tsx
index aeeefe860..14c47e32c 100644
--- a/src/popup/popup.tsx
+++ b/src/popup/popup.tsx
@@ -154,7 +154,7 @@ export default defineComponent({
{renderContent}
>
);
- console.log('mounted.value ', mounted.value);
+
const renderPopupContent =
mounted.value || isBrowser ? (
From 4c87617b43feef053edb007fb05f7b46e83f235d Mon Sep 17 00:00:00 2001
From: novlan1 <1576271227@qq.com>
Date: Mon, 17 Feb 2025 19:51:03 +0800
Subject: [PATCH 10/11] =?UTF-8?q?feat(popup):=20=E6=A0=B9=E6=8D=AEvisible?=
=?UTF-8?q?=E5=88=A4=E6=96=ADmounted?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../__test__/__snapshots__/demo.test.jsx.snap | 26 -------
.../__test__/__snapshots__/demo.test.jsx.snap | 28 -------
.../__test__/__snapshots__/demo.test.jsx.snap | 8 --
.../__test__/__snapshots__/demo.test.jsx.snap | 18 -----
.../__test__/__snapshots__/demo.test.jsx.snap | 76 -------------------
.../__test__/__snapshots__/demo.test.jsx.snap | 16 ----
.../__test__/__snapshots__/demo.test.jsx.snap | 12 ---
.../__test__/__snapshots__/demo.test.jsx.snap | 18 -----
.../__test__/__snapshots__/demo.test.jsx.snap | 8 --
src/popup/popup.tsx | 20 ++---
10 files changed, 8 insertions(+), 222 deletions(-)
diff --git a/src/calendar/__test__/__snapshots__/demo.test.jsx.snap b/src/calendar/__test__/__snapshots__/demo.test.jsx.snap
index 73228344d..e79eefe52 100644
--- a/src/calendar/__test__/__snapshots__/demo.test.jsx.snap
+++ b/src/calendar/__test__/__snapshots__/demo.test.jsx.snap
@@ -3,7 +3,6 @@
exports[`Calendar > Calendar baseVue demo works fine 1`] = `
-
Calendar baseVue demo works fine 1`] = `
-
Calendar customButtonVue demo works fine 1`] = `
>
-
Calendar customButtonVue demo works fine 1`] = `
-
Calendar customRangeVue demo works fine 1`] = `
>
-
Calendar customRangeVue demo works fine 1`] = `
-
Calendar customTextVue demo works fine 1`] = `
>
-
Calendar customTextVue demo works fine 1`] = `
-
Calendar mobileVue demo works fine 1`] = `
>
-
Calendar mobileVue demo works fine 1`] = `
-
Calendar mobileVue demo works fine 1`] = `
-
Calendar mobileVue demo works fine 1`] = `
-
Calendar mobileVue demo works fine 1`] = `
-
Calendar mobileVue demo works fine 1`] = `
-
Calendar mobileVue demo works fine 1`] = `
-
Calendar mobileVue demo works fine 1`] = `
-
Calendar mobileVue demo works fine 1`] = `
-
Calendar mobileVue demo works fine 1`] = `
-
Calendar mobileVue demo works fine 1`] = `
-
Calendar mobileVue demo works fine 1`] = `
-
Calendar mobileVue demo works fine 1`] = `
-
Calendar mobileVue demo works fine 1`] = `
-
Calendar mobileVue demo works fine 1`] = `
exports[`Calendar > Calendar multipleVue demo works fine 1`] = `
-
Calendar multipleVue demo works fine 1`] = `
-
Calendar multipleVue demo works fine 1`] = `
exports[`Calendar > Calendar rangeVue demo works fine 1`] = `
-
Calendar rangeVue demo works fine 1`] = `
-
Cascader baseVue demo works fine 1`] = `
-
Cascader baseVue demo works fine 1`] = `
-
`;
@@ -269,7 +267,6 @@ exports[`Cascader > Cascader checkStrictlyVue demo works fine 1`] = `
-
Cascader checkStrictlyVue demo works fine 1`] = `
-
`;
@@ -481,7 +477,6 @@ exports[`Cascader > Cascader keysVue demo works fine 1`] = `
-
Cascader keysVue demo works fine 1`] = `
-
`;
@@ -698,7 +692,6 @@ exports[`Cascader > Cascader lazyVue demo works fine 1`] = `
-
Cascader lazyVue demo works fine 1`] = `
-
`;
@@ -916,7 +908,6 @@ exports[`Cascader > Cascader mobileVue demo works fine 1`] = `
-
Cascader mobileVue demo works fine 1`] = `
-
@@ -1146,7 +1136,6 @@ exports[`Cascader > Cascader mobileVue demo works fine 1`] = `
-
Cascader mobileVue demo works fine 1`] = `
-
@@ -1351,7 +1339,6 @@ exports[`Cascader > Cascader mobileVue demo works fine 1`] = `
-
Cascader mobileVue demo works fine 1`] = `
-
@@ -1581,7 +1567,6 @@ exports[`Cascader > Cascader mobileVue demo works fine 1`] = `
-
Cascader mobileVue demo works fine 1`] = `
-
@@ -1811,7 +1795,6 @@ exports[`Cascader > Cascader mobileVue demo works fine 1`] = `
-
Cascader mobileVue demo works fine 1`] = `
-
@@ -2045,7 +2027,6 @@ exports[`Cascader > Cascader mobileVue demo works fine 1`] = `
-
Cascader mobileVue demo works fine 1`] = `
-
@@ -2246,7 +2226,6 @@ exports[`Cascader > Cascader mobileVue demo works fine 1`] = `
-
Cascader mobileVue demo works fine 1`] = `
-
@@ -2461,7 +2439,6 @@ exports[`Cascader > Cascader themeTabVue demo works fine 1`] = `
-
Cascader themeTabVue demo works fine 1`] = `
-
`;
@@ -2649,7 +2625,6 @@ exports[`Cascader > Cascader withTitleVue demo works fine 1`] = `
-
Cascader withTitleVue demo works fine 1`] = `
-
`;
@@ -2870,7 +2844,6 @@ exports[`Cascader > Cascader withValueVue demo works fine 1`] = `
-
Cascader withValueVue demo works fine 1`] = `
-
`;
diff --git a/src/config-provider/__test__/__snapshots__/demo.test.jsx.snap b/src/config-provider/__test__/__snapshots__/demo.test.jsx.snap
index 0d7a2d893..f0882b3c9 100644
--- a/src/config-provider/__test__/__snapshots__/demo.test.jsx.snap
+++ b/src/config-provider/__test__/__snapshots__/demo.test.jsx.snap
@@ -565,7 +565,6 @@ exports[`ConfigProvider > ConfigProvider mobileVue demo works fine 1`] = `
-
ConfigProvider mobileVue demo works fine 1`] = `
-
ConfigProvider mobileVue demo works fine 1`] = `
-
ConfigProvider mobileVue demo works fine 1`] = `
-
@@ -3840,7 +3836,6 @@ exports[`ConfigProvider > ConfigProvider otherEnVue demo works fine 1`] = `
-
ConfigProvider otherEnVue demo works fine 1`] = `
-
ConfigProvider otherEnVue demo works fine 1`] = `
-
ConfigProvider otherEnVue demo works fine 1`] = `
-
diff --git a/src/date-time-picker/__test__/__snapshots__/demo.test.jsx.snap b/src/date-time-picker/__test__/__snapshots__/demo.test.jsx.snap
index 1bdd1210b..bc12f1767 100644
--- a/src/date-time-picker/__test__/__snapshots__/demo.test.jsx.snap
+++ b/src/date-time-picker/__test__/__snapshots__/demo.test.jsx.snap
@@ -32,7 +32,6 @@ exports[`DateTimePicker > DateTimePicker baseVue demo works fine 1`] = `
-
DateTimePicker baseVue demo works fine 1`] = `
-
`;
@@ -606,7 +604,6 @@ exports[`DateTimePicker > DateTimePicker customRangeVue demo works fine 1`] = `
-
DateTimePicker customRangeVue demo works fine 1`] = `
-
`;
@@ -1075,7 +1071,6 @@ exports[`DateTimePicker > DateTimePicker fullVue demo works fine 1`] = `
-
DateTimePicker fullVue demo works fine 1`] = `
-
`;
@@ -2721,7 +2715,6 @@ exports[`DateTimePicker > DateTimePicker mobileVue demo works fine 1`] = `
-
DateTimePicker mobileVue demo works fine 1`] = `
-
DateTimePicker mobileVue demo works fine 1`] = `
-
DateTimePicker mobileVue demo works fine 1`] = `
-
DateTimePicker mobileVue demo works fine 1`] = `
-
DateTimePicker mobileVue demo works fine 1`] = `
-
@@ -4347,7 +4335,6 @@ exports[`DateTimePicker > DateTimePicker mobileVue demo works fine 1`] = `
-
DateTimePicker mobileVue demo works fine 1`] = `
-
@@ -4819,7 +4805,6 @@ exports[`DateTimePicker > DateTimePicker timeVue demo works fine 1`] = `
-
DateTimePicker timeVue demo works fine 1`] = `
-
`;
@@ -5522,7 +5506,6 @@ exports[`DateTimePicker > DateTimePicker yearMonthVue demo works fine 1`] = `
-
DateTimePicker yearMonthVue demo works fine 1`] = `
-
`;
diff --git a/src/dialog/__test__/__snapshots__/demo.test.jsx.snap b/src/dialog/__test__/__snapshots__/demo.test.jsx.snap
index b887c3e14..5763811ad 100644
--- a/src/dialog/__test__/__snapshots__/demo.test.jsx.snap
+++ b/src/dialog/__test__/__snapshots__/demo.test.jsx.snap
@@ -21,7 +21,6 @@ exports[`Dialog > Dialog confirmVue demo works fine 1`] = `
-
Dialog confirmVue demo works fine 1`] = `
-
@@ -116,7 +114,6 @@ exports[`Dialog > Dialog confirmVue demo works fine 1`] = `
-
Dialog confirmVue demo works fine 1`] = `
-
@@ -207,7 +203,6 @@ exports[`Dialog > Dialog confirmVue demo works fine 1`] = `
-
Dialog confirmVue demo works fine 1`] = `
-
`;
@@ -300,7 +294,6 @@ exports[`Dialog > Dialog feedbackVue demo works fine 1`] = `
-
Dialog feedbackVue demo works fine 1`] = `
-
@@ -382,7 +374,6 @@ exports[`Dialog > Dialog feedbackVue demo works fine 1`] = `
-
Dialog feedbackVue demo works fine 1`] = `
-
@@ -460,7 +450,6 @@ exports[`Dialog > Dialog feedbackVue demo works fine 1`] = `
-
Dialog feedbackVue demo works fine 1`] = `
-
`;
@@ -555,7 +543,6 @@ exports[`Dialog > Dialog imageDialogVue demo works fine 1`] = `
-
Dialog imageDialogVue demo works fine 1`] = `
-
Dialog imageDialogVue demo works fine 1`] = `
-
Dialog imageDialogVue demo works fine 1`] = `
-
Dialog imageDialogVue demo works fine 1`] = `
-
Dialog imageDialogVue demo works fine 1`] = `
-
Dialog imageDialogVue demo works fine 1`] = `
-
Dialog imageDialogVue demo works fine 1`] = `
-
Dialog imageDialogVue demo works fine 1`] = `
-
Dialog imageDialogVue demo works fine 1`] = `
-
Dialog imageDialogVue demo works fine 1`] = `
-
Dialog imageDialogVue demo works fine 1`] = `
-
`;
@@ -1380,7 +1356,6 @@ exports[`Dialog > Dialog inputVue demo works fine 1`] = `
-
Dialog inputVue demo works fine 1`] = `
-
Dialog inputVue demo works fine 1`] = `
-
Dialog inputVue demo works fine 1`] = `
-
`;
@@ -1688,7 +1660,6 @@ exports[`Dialog > Dialog mobileVue demo works fine 1`] = `
-
Dialog mobileVue demo works fine 1`] = `
-
@@ -1770,7 +1740,6 @@ exports[`Dialog > Dialog mobileVue demo works fine 1`] = `
-
Dialog mobileVue demo works fine 1`] = `
-
@@ -1848,7 +1816,6 @@ exports[`Dialog > Dialog mobileVue demo works fine 1`] = `
-
Dialog mobileVue demo works fine 1`] = `
-
@@ -1955,7 +1921,6 @@ exports[`Dialog > Dialog mobileVue demo works fine 1`] = `
-
Dialog mobileVue demo works fine 1`] = `
-
@@ -2050,7 +2014,6 @@ exports[`Dialog > Dialog mobileVue demo works fine 1`] = `
-
Dialog mobileVue demo works fine 1`] = `
-
@@ -2141,7 +2103,6 @@ exports[`Dialog > Dialog mobileVue demo works fine 1`] = `
-
Dialog mobileVue demo works fine 1`] = `
-
@@ -2248,7 +2208,6 @@ exports[`Dialog > Dialog mobileVue demo works fine 1`] = `
-
Dialog mobileVue demo works fine 1`] = `
-
Dialog mobileVue demo works fine 1`] = `
-
Dialog mobileVue demo works fine 1`] = `
-
@@ -2539,7 +2495,6 @@ exports[`Dialog > Dialog mobileVue demo works fine 1`] = `
-
Dialog mobileVue demo works fine 1`] = `
-
Dialog mobileVue demo works fine 1`] = `
-
Dialog mobileVue demo works fine 1`] = `
-
Dialog mobileVue demo works fine 1`] = `
-
Dialog mobileVue demo works fine 1`] = `
-
Dialog mobileVue demo works fine 1`] = `
-
Dialog mobileVue demo works fine 1`] = `
-
Dialog mobileVue demo works fine 1`] = `
-
Dialog mobileVue demo works fine 1`] = `
-
Dialog mobileVue demo works fine 1`] = `
-
Dialog mobileVue demo works fine 1`] = `
-
@@ -3381,7 +3325,6 @@ exports[`Dialog > Dialog mobileVue demo works fine 1`] = `
-
Dialog mobileVue demo works fine 1`] = `
-
@@ -3481,7 +3423,6 @@ exports[`Dialog > Dialog mobileVue demo works fine 1`] = `
-
Dialog mobileVue demo works fine 1`] = `
-
@@ -3581,7 +3521,6 @@ exports[`Dialog > Dialog mobileVue demo works fine 1`] = `
-
Dialog mobileVue demo works fine 1`] = `
-
@@ -3681,7 +3619,6 @@ exports[`Dialog > Dialog mobileVue demo works fine 1`] = `
-
Dialog mobileVue demo works fine 1`] = `
-
@@ -3798,7 +3734,6 @@ exports[`Dialog > Dialog mobileVue demo works fine 1`] = `
-
Dialog mobileVue demo works fine 1`] = `
-
@@ -3960,7 +3894,6 @@ exports[`Dialog > Dialog multiStateVue demo works fine 1`] = `
-
Dialog multiStateVue demo works fine 1`] = `
-
@@ -4060,7 +3992,6 @@ exports[`Dialog > Dialog multiStateVue demo works fine 1`] = `
-
Dialog multiStateVue demo works fine 1`] = `
-
@@ -4160,7 +4090,6 @@ exports[`Dialog > Dialog multiStateVue demo works fine 1`] = `
-
Dialog multiStateVue demo works fine 1`] = `
-
@@ -4260,7 +4188,6 @@ exports[`Dialog > Dialog multiStateVue demo works fine 1`] = `
-
Dialog multiStateVue demo works fine 1`] = `
-
@@ -4377,7 +4303,6 @@ exports[`Dialog > Dialog multiStateVue demo works fine 1`] = `
-
Dialog multiStateVue demo works fine 1`] = `
-
`;
diff --git a/src/drawer/__test__/__snapshots__/demo.test.jsx.snap b/src/drawer/__test__/__snapshots__/demo.test.jsx.snap
index 96b058db6..59f978606 100644
--- a/src/drawer/__test__/__snapshots__/demo.test.jsx.snap
+++ b/src/drawer/__test__/__snapshots__/demo.test.jsx.snap
@@ -5,7 +5,6 @@ exports[`Drawer > Drawer baseVue demo works fine 1`] = `
data-v-app=""
>
-
Drawer baseVue demo works fine 1`] = `
-
Drawer footerVue demo works fine 1`] = `
data-v-app=""
>
-
Drawer footerVue demo works fine 1`] = `
-
Drawer iconVue demo works fine 1`] = `
data-v-app=""
>
-
Drawer iconVue demo works fine 1`] = `
-
Drawer mobileVue demo works fine 1`] = `
>
-
Drawer mobileVue demo works fine 1`] = `
-
Drawer mobileVue demo works fine 1`] = `
>
-
Drawer mobileVue demo works fine 1`] = `
-
Drawer mobileVue demo works fine 1`] = `
>
-
Drawer mobileVue demo works fine 1`] = `
-
Drawer mobileVue demo works fine 1`] = `
>
-
Drawer mobileVue demo works fine 1`] = `
-
Drawer titleVue demo works fine 1`] = `
data-v-app=""
>
-
Drawer titleVue demo works fine 1`] = `
-
Form horizontalVue demo works fine 1`] = `
-
Form horizontalVue demo works fine 1`] = `
-
@@ -888,7 +886,6 @@ exports[`Form > Form horizontalVue demo works fine 1`] = `
-
Form horizontalVue demo works fine 1`] = `
-
@@ -2141,7 +2137,6 @@ exports[`Form > Form mobileVue demo works fine 1`] = `
-
Form mobileVue demo works fine 1`] = `
-
@@ -2670,7 +2664,6 @@ exports[`Form > Form mobileVue demo works fine 1`] = `
-
Form mobileVue demo works fine 1`] = `
-
@@ -3782,7 +3774,6 @@ exports[`Form > Form verticalVue demo works fine 1`] = `
-
Form verticalVue demo works fine 1`] = `
-
@@ -4309,7 +4299,6 @@ exports[`Form > Form verticalVue demo works fine 1`] = `
-
Form verticalVue demo works fine 1`] = `
-
diff --git a/src/picker/__test__/__snapshots__/demo.test.jsx.snap b/src/picker/__test__/__snapshots__/demo.test.jsx.snap
index 397dbf682..ec1014d3a 100644
--- a/src/picker/__test__/__snapshots__/demo.test.jsx.snap
+++ b/src/picker/__test__/__snapshots__/demo.test.jsx.snap
@@ -47,7 +47,6 @@ exports[`Picker > Picker areaVue demo works fine 1`] = `
-
Picker areaVue demo works fine 1`] = `
-
`;
@@ -246,7 +244,6 @@ exports[`Picker > Picker baseVue demo works fine 1`] = `
-
Picker baseVue demo works fine 1`] = `
-
-
Picker baseVue demo works fine 1`] = `
-
`;
@@ -607,7 +601,6 @@ exports[`Picker > Picker cascadeVue demo works fine 1`] = `
-
Picker cascadeVue demo works fine 1`] = `
-
`;
@@ -906,7 +898,6 @@ exports[`Picker > Picker mobileVue demo works fine 1`] = `
-
Picker mobileVue demo works fine 1`] = `
-
-
Picker mobileVue demo works fine 1`] = `
-
Picker mobileVue demo works fine 1`] = `
-
Picker mobileVue demo works fine 1`] = `
-
@@ -1459,7 +1445,6 @@ exports[`Picker > Picker mobileVue demo works fine 1`] = `
-
Picker mobileVue demo works fine 1`] = `
-
Picker titleVue demo works fine 1`] = `
-
Picker titleVue demo works fine 1`] = `
-
`;
diff --git a/src/popup/__test__/__snapshots__/demo.test.jsx.snap b/src/popup/__test__/__snapshots__/demo.test.jsx.snap
index cc6e21bce..403cd3280 100644
--- a/src/popup/__test__/__snapshots__/demo.test.jsx.snap
+++ b/src/popup/__test__/__snapshots__/demo.test.jsx.snap
@@ -116,7 +116,6 @@ exports[`Popup > Popup customCloseVue demo works fine 1`] = `
-
Popup customCloseVue demo works fine 1`] = `
-
`;
@@ -325,7 +323,6 @@ exports[`Popup > Popup mobileVue demo works fine 1`] = `
-
Popup mobileVue demo works fine 1`] = `
-
@@ -444,7 +438,6 @@ exports[`Popup > Popup withTitleVue demo works fine 1`] = `
-
Popup withTitleVue demo works fine 1`] = `
-
`;
diff --git a/src/popup/popup.tsx b/src/popup/popup.tsx
index 14c47e32c..e56cc0e8f 100644
--- a/src/popup/popup.tsx
+++ b/src/popup/popup.tsx
@@ -39,10 +39,6 @@ export default defineComponent({
const innerVisible = ref(currentVisible.value);
const mounted = ref(false);
- onMounted(() => {
- mounted.value = true;
- });
-
// 因为开启 destroyOnClose,会影响 transition 的动画,因此需要前后设置 visible
watch(currentVisible, (v) => {
if (v) {
@@ -112,6 +108,7 @@ export default defineComponent({
props.onOpen?.();
setVisible(true);
}
+ mounted.value = val;
},
);
@@ -155,14 +152,13 @@ export default defineComponent({
>
);
- const renderPopupContent =
- mounted.value || isBrowser ? (
-
- {inner}
-
- ) : (
- inner
- );
+ const renderPopupContent = mounted.value ? (
+
+ {inner}
+
+ ) : (
+ inner
+ );
return (!props.destroyOnClose || wrapperVisible.value) && renderPopupContent;
};
From 22966717636e24a4f78abaf5257912df8b538a07 Mon Sep 17 00:00:00 2001
From: novlan1 <1576271227@qq.com>
Date: Mon, 17 Feb 2025 19:52:00 +0800
Subject: [PATCH 11/11] chore: lint
---
src/popup/popup.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/popup/popup.tsx b/src/popup/popup.tsx
index e56cc0e8f..04057966a 100644
--- a/src/popup/popup.tsx
+++ b/src/popup/popup.tsx
@@ -5,7 +5,7 @@ import popupProps from './props';
import TOverlay from '../overlay';
import config from '../config';
import { TdPopupProps } from './type';
-import { useDefault, TNode, isBrowser } from '../shared';
+import { useDefault, TNode } from '../shared';
import { usePrefixClass } from '../hooks/useClass';
import { useLockScroll } from '../hooks/useLockScroll';
import { useContent, useTNodeJSX } from '../hooks/tnode';