From 14ac2e17898ad2fe3b4379b010dac7c7f829b3d9 Mon Sep 17 00:00:00 2001 From: fxy060608 Date: Tue, 18 Jan 2022 18:24:39 +0800 Subject: [PATCH] chore: nvue native tag --- packages/uni-shared/dist/uni-shared.cjs.js | 27 +++++++++++++++++++++ packages/uni-shared/dist/uni-shared.es.js | 27 +++++++++++++++++++++ packages/uni-shared/src/tags.ts | 28 ++++++++++++++++++++++ 3 files changed, 82 insertions(+) diff --git a/packages/uni-shared/dist/uni-shared.cjs.js b/packages/uni-shared/dist/uni-shared.cjs.js index c35ee5a5a..12fe20954 100644 --- a/packages/uni-shared/dist/uni-shared.cjs.js +++ b/packages/uni-shared/dist/uni-shared.cjs.js @@ -129,7 +129,34 @@ function isH5NativeTag(tag) { function isAppNativeTag(tag) { return shared.isHTMLTag(tag) || shared.isSVGTag(tag) || isBuiltInComponent(tag); } +const NVUE_CUSTOM_COMPONENTS = [ + 'ad', + 'ad-draw', + 'button', + 'checkbox-group', + 'checkbox', + 'form', + 'icon', + 'label', + 'movable-area', + 'movable-view', + 'navigator', + 'picker', + 'progress', + 'radio-group', + 'radio', + 'rich-text', + 'swiper-item', + 'swiper', + 'switch', + 'slider', + 'picker-view', + 'picker-view-column', +]; function isAppNVueNativeTag(tag) { + if (NVUE_CUSTOM_COMPONENTS.includes(tag)) { + return false; + } if (isBuiltInComponent(tag)) { return true; } diff --git a/packages/uni-shared/dist/uni-shared.es.js b/packages/uni-shared/dist/uni-shared.es.js index 8fb38bb9c..e2eae5008 100644 --- a/packages/uni-shared/dist/uni-shared.es.js +++ b/packages/uni-shared/dist/uni-shared.es.js @@ -125,7 +125,34 @@ function isH5NativeTag(tag) { function isAppNativeTag(tag) { return isHTMLTag(tag) || isSVGTag(tag) || isBuiltInComponent(tag); } +const NVUE_CUSTOM_COMPONENTS = [ + 'ad', + 'ad-draw', + 'button', + 'checkbox-group', + 'checkbox', + 'form', + 'icon', + 'label', + 'movable-area', + 'movable-view', + 'navigator', + 'picker', + 'progress', + 'radio-group', + 'radio', + 'rich-text', + 'swiper-item', + 'swiper', + 'switch', + 'slider', + 'picker-view', + 'picker-view-column', +]; function isAppNVueNativeTag(tag) { + if (NVUE_CUSTOM_COMPONENTS.includes(tag)) { + return false; + } if (isBuiltInComponent(tag)) { return true; } diff --git a/packages/uni-shared/src/tags.ts b/packages/uni-shared/src/tags.ts index 45a4dc041..3a540d449 100644 --- a/packages/uni-shared/src/tags.ts +++ b/packages/uni-shared/src/tags.ts @@ -136,7 +136,35 @@ export function isAppNativeTag(tag: string) { return isHTMLTag(tag) || isSVGTag(tag) || isBuiltInComponent(tag) } +const NVUE_CUSTOM_COMPONENTS = [ + 'ad', + 'ad-draw', + 'button', + 'checkbox-group', + 'checkbox', + 'form', + 'icon', + 'label', + 'movable-area', + 'movable-view', + 'navigator', + 'picker', + 'progress', + 'radio-group', + 'radio', + 'rich-text', + 'swiper-item', + 'swiper', + 'switch', + 'slider', + 'picker-view', + 'picker-view-column', +] + export function isAppNVueNativeTag(tag: string) { + if (NVUE_CUSTOM_COMPONENTS.includes(tag)) { + return false + } if (isBuiltInComponent(tag)) { return true } -- GitLab