From 6208de611ecfc954aefe2886f0812508d6e29d8d Mon Sep 17 00:00:00 2001 From: jay4q Date: Tue, 23 Mar 2021 10:22:36 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E8=A1=A5=E5=85=A8=20cover-view=20?= =?UTF-8?q?=E5=9C=A8=E9=85=8D=E5=90=88=20map=20=E7=BB=84=E4=BB=B6=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E6=97=B6=E7=9A=84=E7=89=B9=E6=AE=8A=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/shared/src/components.ts | 2 ++ packages/taro-components/types/CoverView.d.ts | 11 +++++++++++ 2 files changed, 13 insertions(+) diff --git a/packages/shared/src/components.ts b/packages/shared/src/components.ts index 70c029a51108..ab776856db00 100644 --- a/packages/shared/src/components.ts +++ b/packages/shared/src/components.ts @@ -251,6 +251,8 @@ const CoverImage = { const CoverView = { 'scroll-top': 'false', + 'marker-id': '', + 'slot': '', ...touchEvents } diff --git a/packages/taro-components/types/CoverView.d.ts b/packages/taro-components/types/CoverView.d.ts index 49a007fe608f..24c8155d53f9 100644 --- a/packages/taro-components/types/CoverView.d.ts +++ b/packages/taro-components/types/CoverView.d.ts @@ -6,6 +6,17 @@ interface CoverViewProps extends ViewProps { * @supported weapp */ scrollTop?: number + + /** + * 适用于地图组件 map 的自定义气泡 customCallout + * @supported weapp + */ + markerId?: string + + /** + * @supported weapp + */ + slot?: string } /** 覆盖在原生组件之上的文本视图。可覆盖的原生组件包括 map、video、canvas、camera、live-player、live-pusher 只支持嵌套 cover-view、cover-image，可在 cover-view 中使用 button。 From 96f578f29821111556713055483ec47082912a90 Mon Sep 17 00:00:00 2001 From: jay4q Date: Fri, 26 Mar 2021 10:51:22 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=20CoverView=20=E7=9A=84=E7=89=B9?= =?UTF-8?q?=E6=AE=8A=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/shared/src/components.ts | 2 -- packages/taro-weapp/src/components.ts | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/shared/src/components.ts b/packages/shared/src/components.ts index ab776856db00..70c029a51108 100644 --- a/packages/shared/src/components.ts +++ b/packages/shared/src/components.ts @@ -251,8 +251,6 @@ const CoverImage = { const CoverView = { 'scroll-top': 'false', - 'marker-id': '', - 'slot': '', ...touchEvents } diff --git a/packages/taro-weapp/src/components.ts b/packages/taro-weapp/src/components.ts index 8467a5f3fbb0..6323f7b76fef 100644 --- a/packages/taro-weapp/src/components.ts +++ b/packages/taro-weapp/src/components.ts @@ -173,6 +173,10 @@ export const components = { 'ad-type': singleQuote('banner'), 'ad-theme': singleQuote('white') }, + CoverView: { + 'marker-id': '', + slot: '', + }, // ======== 额外组件 ======== Editor: { 'read-only': 'false', From 45c36f6f81f9fec5814bc726a614277003aec73b Mon Sep 17 00:00:00 2001 From: jay4q <79517790+jay4q@users.noreply.github.com> Date: Fri, 2 Apr 2021 14:09:27 +0800 Subject: [PATCH 3/4] fix: type error --- packages/taro-weapp/src/components.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/taro-weapp/src/components.ts b/packages/taro-weapp/src/components.ts index 6323f7b76fef..7d73a176440c 100644 --- a/packages/taro-weapp/src/components.ts +++ b/packages/taro-weapp/src/components.ts @@ -175,7 +175,7 @@ export const components = { }, CoverView: { 'marker-id': '', - slot: '', + slot: '' }, // ======== 额外组件 ======== Editor: { From 11179c16d2d91cc61d202868641b6d9c3169cd62 Mon Sep 17 00:00:00 2001 From: chenjiajian <798095202@qq.com> Date: Sun, 25 Apr 2021 11:22:33 +0800 Subject: [PATCH 4/4] fix: ci --- .../__tests__/__snapshots__/babel.spec.ts.snap | 4 ++++ .../__snapshots__/common-style.spec.ts.snap | 4 ++++ .../__tests__/__snapshots__/config.spec.ts.snap | 12 ++++++++++++ .../__snapshots__/css-modules.spec.ts.snap | 8 ++++++++ .../__snapshots__/custom-tabbar.spec.ts.snap | 4 ++++ .../__tests__/__snapshots__/nerv.spec.ts.snap | 4 ++++ .../__snapshots__/parse-html.spec.ts.snap | 4 ++++ .../__snapshots__/prerender.spec.ts.snap | 12 ++++++++++++ .../src/__tests__/__snapshots__/qq.spec.ts.snap | 8 ++++++++ .../__tests__/__snapshots__/react.spec.ts.snap | 4 ++++ .../__tests__/__snapshots__/sass.spec.ts.snap | 16 ++++++++++++++++ .../__snapshots__/subpackages.spec.ts.snap | 4 ++++ .../__tests__/__snapshots__/tabbar.spec.ts.snap | 4 ++++ .../src/__tests__/__snapshots__/ts.spec.ts.snap | 4 ++++ .../src/__tests__/__snapshots__/vue.spec.ts.snap | 4 ++++ .../__tests__/__snapshots__/vue3.spec.ts.snap | 4 ++++ .../__snapshots__/wx-hybrid.spec.ts.snap | 4 ++++ packages/taro-weapp/types/components.d.ts | 4 ++++ 18 files changed, 108 insertions(+) diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/babel.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/babel.spec.ts.snap index 447665456e76..db9bd64bf356 100644 --- a/packages/taro-mini-runner/src/__tests__/__snapshots__/babel.spec.ts.snap +++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/babel.spec.ts.snap @@ -1481,6 +1481,10 @@ require(\\"./taro\\"); \\"ad-type\\": singleQuote(\\"banner\\"), \\"ad-theme\\": singleQuote(\\"white\\") }, + CoverView: { + \\"marker-id\\": \\"\\", + slot: \\"\\" + }, Editor: { \\"read-only\\": \\"false\\", placeholder: \\"\\", diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/common-style.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/common-style.spec.ts.snap index 5622701c176a..194d64a26a4a 100644 --- a/packages/taro-mini-runner/src/__tests__/__snapshots__/common-style.spec.ts.snap +++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/common-style.spec.ts.snap @@ -1481,6 +1481,10 @@ require(\\"./taro\\"); \\"ad-type\\": singleQuote(\\"banner\\"), \\"ad-theme\\": singleQuote(\\"white\\") }, + CoverView: { + \\"marker-id\\": \\"\\", + slot: \\"\\" + }, Editor: { \\"read-only\\": \\"false\\", placeholder: \\"\\", diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/config.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/config.spec.ts.snap index e894d1c9f001..84e5140c9b76 100644 --- a/packages/taro-mini-runner/src/__tests__/__snapshots__/config.spec.ts.snap +++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/config.spec.ts.snap @@ -1481,6 +1481,10 @@ require(\\"./taro\\"); \\"ad-type\\": singleQuote(\\"banner\\"), \\"ad-theme\\": singleQuote(\\"white\\") }, + CoverView: { + \\"marker-id\\": \\"\\", + slot: \\"\\" + }, Editor: { \\"read-only\\": \\"false\\", placeholder: \\"\\", @@ -4525,6 +4529,10 @@ require(\\"./taro\\"); \\"ad-type\\": singleQuote(\\"banner\\"), \\"ad-theme\\": singleQuote(\\"white\\") }, + CoverView: { + \\"marker-id\\": \\"\\", + slot: \\"\\" + }, Editor: { \\"read-only\\": \\"false\\", placeholder: \\"\\", @@ -7393,6 +7401,10 @@ require(\\"./taro\\"); \\"ad-type\\": singleQuote(\\"banner\\"), \\"ad-theme\\": singleQuote(\\"white\\") }, + CoverView: { + \\"marker-id\\": \\"\\", + slot: \\"\\" + }, Editor: { \\"read-only\\": \\"false\\", placeholder: \\"\\", diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/css-modules.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/css-modules.spec.ts.snap index 31a6df389842..70f0778198ac 100644 --- a/packages/taro-mini-runner/src/__tests__/__snapshots__/css-modules.spec.ts.snap +++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/css-modules.spec.ts.snap @@ -1481,6 +1481,10 @@ require(\\"./taro\\"); \\"ad-type\\": singleQuote(\\"banner\\"), \\"ad-theme\\": singleQuote(\\"white\\") }, + CoverView: { + \\"marker-id\\": \\"\\", + slot: \\"\\" + }, Editor: { \\"read-only\\": \\"false\\", placeholder: \\"\\", @@ -4367,6 +4371,10 @@ require(\\"./taro\\"); \\"ad-type\\": singleQuote(\\"banner\\"), \\"ad-theme\\": singleQuote(\\"white\\") }, + CoverView: { + \\"marker-id\\": \\"\\", + slot: \\"\\" + }, Editor: { \\"read-only\\": \\"false\\", placeholder: \\"\\", diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/custom-tabbar.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/custom-tabbar.spec.ts.snap index 26b98d431873..614c3e24d98e 100644 --- a/packages/taro-mini-runner/src/__tests__/__snapshots__/custom-tabbar.spec.ts.snap +++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/custom-tabbar.spec.ts.snap @@ -1481,6 +1481,10 @@ require(\\"./taro\\"); \\"ad-type\\": singleQuote(\\"banner\\"), \\"ad-theme\\": singleQuote(\\"white\\") }, + CoverView: { + \\"marker-id\\": \\"\\", + slot: \\"\\" + }, Editor: { \\"read-only\\": \\"false\\", placeholder: \\"\\", diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/nerv.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/nerv.spec.ts.snap index 9dbab63ffe77..a34a1632d1a8 100644 --- a/packages/taro-mini-runner/src/__tests__/__snapshots__/nerv.spec.ts.snap +++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/nerv.spec.ts.snap @@ -1481,6 +1481,10 @@ require(\\"./taro\\"); \\"ad-type\\": singleQuote(\\"banner\\"), \\"ad-theme\\": singleQuote(\\"white\\") }, + CoverView: { + \\"marker-id\\": \\"\\", + slot: \\"\\" + }, Editor: { \\"read-only\\": \\"false\\", placeholder: \\"\\", diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/parse-html.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/parse-html.spec.ts.snap index 7376b0cfabee..0ae05fac38b9 100644 --- a/packages/taro-mini-runner/src/__tests__/__snapshots__/parse-html.spec.ts.snap +++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/parse-html.spec.ts.snap @@ -1481,6 +1481,10 @@ require(\\"./taro\\"); \\"ad-type\\": singleQuote(\\"banner\\"), \\"ad-theme\\": singleQuote(\\"white\\") }, + CoverView: { + \\"marker-id\\": \\"\\", + slot: \\"\\" + }, Editor: { \\"read-only\\": \\"false\\", placeholder: \\"\\", diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/prerender.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/prerender.spec.ts.snap index 0f6c3a802b87..790fa6144c23 100644 --- a/packages/taro-mini-runner/src/__tests__/__snapshots__/prerender.spec.ts.snap +++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/prerender.spec.ts.snap @@ -1655,6 +1655,10 @@ require(\\"./taro\\"); \\"ad-type\\": Object(_tarojs_shared__WEBPACK_IMPORTED_MODULE_0__[\\"d\\"])(\\"banner\\"), \\"ad-theme\\": Object(_tarojs_shared__WEBPACK_IMPORTED_MODULE_0__[\\"d\\"])(\\"white\\") }, + CoverView: { + \\"marker-id\\": \\"\\", + slot: \\"\\" + }, Editor: { \\"read-only\\": \\"false\\", placeholder: \\"\\", @@ -6002,6 +6006,10 @@ require(\\"./taro\\"); \\"ad-type\\": singleQuote(\\"banner\\"), \\"ad-theme\\": singleQuote(\\"white\\") }, + CoverView: { + \\"marker-id\\": \\"\\", + slot: \\"\\" + }, Editor: { \\"read-only\\": \\"false\\", placeholder: \\"\\", @@ -10303,6 +10311,10 @@ require(\\"./taro\\"); \\"ad-type\\": singleQuote(\\"banner\\"), \\"ad-theme\\": singleQuote(\\"white\\") }, + CoverView: { + \\"marker-id\\": \\"\\", + slot: \\"\\" + }, Editor: { \\"read-only\\": \\"false\\", placeholder: \\"\\", diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/qq.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/qq.spec.ts.snap index af1ecfafc4c9..87821b7c924d 100644 --- a/packages/taro-mini-runner/src/__tests__/__snapshots__/qq.spec.ts.snap +++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/qq.spec.ts.snap @@ -1481,6 +1481,10 @@ require(\\"./taro\\"); \\"ad-type\\": singleQuote(\\"banner\\"), \\"ad-theme\\": singleQuote(\\"white\\") }, + CoverView: { + \\"marker-id\\": \\"\\", + slot: \\"\\" + }, Editor: { \\"read-only\\": \\"false\\", placeholder: \\"\\", @@ -4976,6 +4980,10 @@ require(\\"./taro\\"); \\"ad-type\\": singleQuote(\\"banner\\"), \\"ad-theme\\": singleQuote(\\"white\\") }, + CoverView: { + \\"marker-id\\": \\"\\", + slot: \\"\\" + }, Editor: { \\"read-only\\": \\"false\\", placeholder: \\"\\", diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/react.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/react.spec.ts.snap index 2f53cbb97204..68328cc1fe2d 100644 --- a/packages/taro-mini-runner/src/__tests__/__snapshots__/react.spec.ts.snap +++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/react.spec.ts.snap @@ -1481,6 +1481,10 @@ require(\\"./taro\\"); \\"ad-type\\": singleQuote(\\"banner\\"), \\"ad-theme\\": singleQuote(\\"white\\") }, + CoverView: { + \\"marker-id\\": \\"\\", + slot: \\"\\" + }, Editor: { \\"read-only\\": \\"false\\", placeholder: \\"\\", diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/sass.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/sass.spec.ts.snap index 9ec124f59101..1aeaa2e799f4 100644 --- a/packages/taro-mini-runner/src/__tests__/__snapshots__/sass.spec.ts.snap +++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/sass.spec.ts.snap @@ -1481,6 +1481,10 @@ require(\\"./taro\\"); \\"ad-type\\": singleQuote(\\"banner\\"), \\"ad-theme\\": singleQuote(\\"white\\") }, + CoverView: { + \\"marker-id\\": \\"\\", + slot: \\"\\" + }, Editor: { \\"read-only\\": \\"false\\", placeholder: \\"\\", @@ -4350,6 +4354,10 @@ require(\\"./taro\\"); \\"ad-type\\": singleQuote(\\"banner\\"), \\"ad-theme\\": singleQuote(\\"white\\") }, + CoverView: { + \\"marker-id\\": \\"\\", + slot: \\"\\" + }, Editor: { \\"read-only\\": \\"false\\", placeholder: \\"\\", @@ -7219,6 +7227,10 @@ require(\\"./taro\\"); \\"ad-type\\": singleQuote(\\"banner\\"), \\"ad-theme\\": singleQuote(\\"white\\") }, + CoverView: { + \\"marker-id\\": \\"\\", + slot: \\"\\" + }, Editor: { \\"read-only\\": \\"false\\", placeholder: \\"\\", @@ -10088,6 +10100,10 @@ require(\\"./taro\\"); \\"ad-type\\": singleQuote(\\"banner\\"), \\"ad-theme\\": singleQuote(\\"white\\") }, + CoverView: { + \\"marker-id\\": \\"\\", + slot: \\"\\" + }, Editor: { \\"read-only\\": \\"false\\", placeholder: \\"\\", diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/subpackages.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/subpackages.spec.ts.snap index 8d4340a5efc5..0a2a0d579a48 100644 --- a/packages/taro-mini-runner/src/__tests__/__snapshots__/subpackages.spec.ts.snap +++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/subpackages.spec.ts.snap @@ -1481,6 +1481,10 @@ require(\\"./taro\\"); \\"ad-type\\": singleQuote(\\"banner\\"), \\"ad-theme\\": singleQuote(\\"white\\") }, + CoverView: { + \\"marker-id\\": \\"\\", + slot: \\"\\" + }, Editor: { \\"read-only\\": \\"false\\", placeholder: \\"\\", diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/tabbar.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/tabbar.spec.ts.snap index 235390b3906f..c2755b58b0da 100644 --- a/packages/taro-mini-runner/src/__tests__/__snapshots__/tabbar.spec.ts.snap +++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/tabbar.spec.ts.snap @@ -3868,6 +3868,10 @@ require(\\"./taro\\"); \\"ad-type\\": singleQuote(\\"banner\\"), \\"ad-theme\\": singleQuote(\\"white\\") }, + CoverView: { + \\"marker-id\\": \\"\\", + slot: \\"\\" + }, Editor: { \\"read-only\\": \\"false\\", placeholder: \\"\\", diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/ts.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/ts.spec.ts.snap index a569561c2640..de279d670983 100644 --- a/packages/taro-mini-runner/src/__tests__/__snapshots__/ts.spec.ts.snap +++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/ts.spec.ts.snap @@ -1481,6 +1481,10 @@ require(\\"./taro\\"); \\"ad-type\\": singleQuote(\\"banner\\"), \\"ad-theme\\": singleQuote(\\"white\\") }, + CoverView: { + \\"marker-id\\": \\"\\", + slot: \\"\\" + }, Editor: { \\"read-only\\": \\"false\\", placeholder: \\"\\", diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/vue.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/vue.spec.ts.snap index d78a0a760931..a6c38404fa41 100644 --- a/packages/taro-mini-runner/src/__tests__/__snapshots__/vue.spec.ts.snap +++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/vue.spec.ts.snap @@ -1477,6 +1477,10 @@ require(\\"./taro\\"); \\"ad-type\\": singleQuote(\\"banner\\"), \\"ad-theme\\": singleQuote(\\"white\\") }, + CoverView: { + \\"marker-id\\": \\"\\", + slot: \\"\\" + }, Editor: { \\"read-only\\": \\"false\\", placeholder: \\"\\", diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/vue3.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/vue3.spec.ts.snap index 48524e8fd1fd..0f1ae9924cc3 100644 --- a/packages/taro-mini-runner/src/__tests__/__snapshots__/vue3.spec.ts.snap +++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/vue3.spec.ts.snap @@ -1479,6 +1479,10 @@ require(\\"./taro\\"); \\"ad-type\\": singleQuote(\\"banner\\"), \\"ad-theme\\": singleQuote(\\"white\\") }, + CoverView: { + \\"marker-id\\": \\"\\", + slot: \\"\\" + }, Editor: { \\"read-only\\": \\"false\\", placeholder: \\"\\", diff --git a/packages/taro-mini-runner/src/__tests__/__snapshots__/wx-hybrid.spec.ts.snap b/packages/taro-mini-runner/src/__tests__/__snapshots__/wx-hybrid.spec.ts.snap index ee540731c868..d72c0b1bb90a 100644 --- a/packages/taro-mini-runner/src/__tests__/__snapshots__/wx-hybrid.spec.ts.snap +++ b/packages/taro-mini-runner/src/__tests__/__snapshots__/wx-hybrid.spec.ts.snap @@ -1262,6 +1262,10 @@ require(\\"./taro\\"); \\"ad-type\\": singleQuote(\\"banner\\"), \\"ad-theme\\": singleQuote(\\"white\\") }, + CoverView: { + \\"marker-id\\": \\"\\", + slot: \\"\\" + }, Editor: { \\"read-only\\": \\"false\\", placeholder: \\"\\", diff --git a/packages/taro-weapp/types/components.d.ts b/packages/taro-weapp/types/components.d.ts index fe738833f834..ea629a67876c 100644 --- a/packages/taro-weapp/types/components.d.ts +++ b/packages/taro-weapp/types/components.d.ts @@ -165,6 +165,10 @@ export declare const components: { 'ad-type': string; 'ad-theme': string; }; + CoverView: { + 'marker-id': string; + slot: string; + }; Editor: { 'read-only': string; placeholder: string;