Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小浣熊撸代码
uni-app
提交
acef7a9f
U
uni-app
项目概览
小浣熊撸代码
/
uni-app
与 Fork 源项目一致
Fork自
DCloud / uni-app
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
uni-app
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
acef7a9f
编写于
1月 18, 2022
作者:
fxy060608
浏览文件
操作
浏览文件
下载
差异文件
chore: merge
上级
08e78cb0
53e1bc4b
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
116 addition
and
7 deletion
+116
-7
packages/uni-shared/dist/uni-shared.cjs.js
packages/uni-shared/dist/uni-shared.cjs.js
+38
-2
packages/uni-shared/dist/uni-shared.d.ts
packages/uni-shared/dist/uni-shared.d.ts
+2
-0
packages/uni-shared/dist/uni-shared.es.js
packages/uni-shared/dist/uni-shared.es.js
+38
-3
packages/uni-shared/src/tags.ts
packages/uni-shared/src/tags.ts
+38
-2
未找到文件。
packages/uni-shared/dist/uni-shared.cjs.js
浏览文件 @
acef7a9f
...
...
@@ -71,6 +71,41 @@ const TAGS = [
'
shadow-root
'
,
].
map
((
tag
)
=>
'
uni-
'
+
tag
);
const
NVUE_BUILT_IN_TAGS
=
[
'
svg
'
,
'
view
'
,
'
a
'
,
'
div
'
,
'
img
'
,
'
image
'
,
'
text
'
,
'
span
'
,
'
input
'
,
'
textarea
'
,
'
spinner
'
,
'
select
'
,
'
slider
'
,
'
slider-neighbor
'
,
'
indicator
'
,
'
canvas
'
,
'
list
'
,
'
cell
'
,
'
header
'
,
'
loading
'
,
'
loading-indicator
'
,
'
refresh
'
,
'
scrollable
'
,
'
scroller
'
,
'
video
'
,
'
web
'
,
'
embed
'
,
'
tabbar
'
,
'
tabheader
'
,
'
datepicker
'
,
'
timepicker
'
,
'
marquee
'
,
'
countdown
'
,
];
const
NVUE_U_BUILT_IN_TAGS
=
[
'
text
'
,
'
image
'
,
'
input
'
,
...
...
@@ -95,11 +130,11 @@ function isAppNativeTag(tag) {
return
shared
.
isHTMLTag
(
tag
)
||
shared
.
isSVGTag
(
tag
)
||
isBuiltInComponent
(
tag
);
}
function
isAppNVueNativeTag
(
tag
)
{
if
(
isAppNativeTag
(
tag
))
{
if
(
NVUE_BUILT_IN_TAGS
.
includes
(
tag
))
{
return
true
;
}
// u-text,u-video...
if
(
NVUE_BUILT_IN_TAGS
.
includes
(
tag
.
replace
(
'
u-
'
,
''
)))
{
if
(
NVUE_
U_
BUILT_IN_TAGS
.
includes
(
tag
.
replace
(
'
u-
'
,
''
)))
{
return
true
;
}
return
false
;
...
...
@@ -1273,6 +1308,7 @@ exports.NODE_TYPE_ELEMENT = NODE_TYPE_ELEMENT;
exports
.
NODE_TYPE_PAGE
=
NODE_TYPE_PAGE
;
exports
.
NODE_TYPE_TEXT
=
NODE_TYPE_TEXT
;
exports
.
NVUE_BUILT_IN_TAGS
=
NVUE_BUILT_IN_TAGS
;
exports
.
NVUE_U_BUILT_IN_TAGS
=
NVUE_U_BUILT_IN_TAGS
;
exports
.
NVueTextNode
=
NVueTextNode
;
exports
.
ON_ADD_TO_FAVORITES
=
ON_ADD_TO_FAVORITES
;
exports
.
ON_APP_ENTER_BACKGROUND
=
ON_APP_ENTER_BACKGROUND
;
...
...
packages/uni-shared/dist/uni-shared.d.ts
浏览文件 @
acef7a9f
...
...
@@ -300,6 +300,8 @@ export declare interface NVue {
export
declare
const
NVUE_BUILT_IN_TAGS
:
string
[];
export
declare
const
NVUE_U_BUILT_IN_TAGS
:
string
[];
export
declare
interface
NVueConfigAPI
{
bundleUrl
:
string
;
bundleType
:
string
;
...
...
packages/uni-shared/dist/uni-shared.es.js
浏览文件 @
acef7a9f
...
...
@@ -67,6 +67,41 @@ const TAGS = [
'
shadow-root
'
,
].
map
((
tag
)
=>
'
uni-
'
+
tag
);
const
NVUE_BUILT_IN_TAGS
=
[
'
svg
'
,
'
view
'
,
'
a
'
,
'
div
'
,
'
img
'
,
'
image
'
,
'
text
'
,
'
span
'
,
'
input
'
,
'
textarea
'
,
'
spinner
'
,
'
select
'
,
'
slider
'
,
'
slider-neighbor
'
,
'
indicator
'
,
'
canvas
'
,
'
list
'
,
'
cell
'
,
'
header
'
,
'
loading
'
,
'
loading-indicator
'
,
'
refresh
'
,
'
scrollable
'
,
'
scroller
'
,
'
video
'
,
'
web
'
,
'
embed
'
,
'
tabbar
'
,
'
tabheader
'
,
'
datepicker
'
,
'
timepicker
'
,
'
marquee
'
,
'
countdown
'
,
];
const
NVUE_U_BUILT_IN_TAGS
=
[
'
text
'
,
'
image
'
,
'
input
'
,
...
...
@@ -91,11 +126,11 @@ function isAppNativeTag(tag) {
return
isHTMLTag
(
tag
)
||
isSVGTag
(
tag
)
||
isBuiltInComponent
(
tag
);
}
function
isAppNVueNativeTag
(
tag
)
{
if
(
isAppNativeTag
(
tag
))
{
if
(
NVUE_BUILT_IN_TAGS
.
includes
(
tag
))
{
return
true
;
}
// u-text,u-video...
if
(
NVUE_BUILT_IN_TAGS
.
includes
(
tag
.
replace
(
'
u-
'
,
''
)))
{
if
(
NVUE_
U_
BUILT_IN_TAGS
.
includes
(
tag
.
replace
(
'
u-
'
,
''
)))
{
return
true
;
}
return
false
;
...
...
@@ -1229,4 +1264,4 @@ function getEnvLocale() {
return
(
lang
&&
lang
.
replace
(
/
[
.:
]
.*/
,
''
))
||
'
en
'
;
}
export
{
ACTION_TYPE_ADD_EVENT
,
ACTION_TYPE_ADD_WXS_EVENT
,
ACTION_TYPE_CREATE
,
ACTION_TYPE_EVENT
,
ACTION_TYPE_INSERT
,
ACTION_TYPE_PAGE_CREATE
,
ACTION_TYPE_PAGE_CREATED
,
ACTION_TYPE_PAGE_SCROLL
,
ACTION_TYPE_REMOVE
,
ACTION_TYPE_REMOVE_ATTRIBUTE
,
ACTION_TYPE_REMOVE_EVENT
,
ACTION_TYPE_SET_ATTRIBUTE
,
ACTION_TYPE_SET_TEXT
,
ATTR_CHANGE_PREFIX
,
ATTR_CLASS
,
ATTR_INNER_HTML
,
ATTR_STYLE
,
ATTR_TEXT_CONTENT
,
ATTR_V_OWNER_ID
,
ATTR_V_RENDERJS
,
ATTR_V_SHOW
,
BACKGROUND_COLOR
,
BUILT_IN_TAGS
,
BUILT_IN_TAG_NAMES
,
COMPONENT_NAME_PREFIX
,
COMPONENT_PREFIX
,
COMPONENT_SELECTOR_PREFIX
,
DATA_RE
,
EventChannel
,
EventModifierFlags
,
I18N_JSON_DELIMITERS
,
JSON_PROTOCOL
,
LINEFEED
,
MINI_PROGRAM_PAGE_RUNTIME_HOOKS
,
NAVBAR_HEIGHT
,
NODE_TYPE_COMMENT
,
NODE_TYPE_ELEMENT
,
NODE_TYPE_PAGE
,
NODE_TYPE_TEXT
,
NVUE_BUILT_IN_TAGS
,
NVueTextNode
,
ON_ADD_TO_FAVORITES
,
ON_APP_ENTER_BACKGROUND
,
ON_APP_ENTER_FOREGROUND
,
ON_BACK_PRESS
,
ON_ERROR
,
ON_HIDE
,
ON_KEYBOARD_HEIGHT_CHANGE
,
ON_LAUNCH
,
ON_LOAD
,
ON_NAVIGATION_BAR_BUTTON_TAP
,
ON_NAVIGATION_BAR_SEARCH_INPUT_CHANGED
,
ON_NAVIGATION_BAR_SEARCH_INPUT_CLICKED
,
ON_NAVIGATION_BAR_SEARCH_INPUT_CONFIRMED
,
ON_NAVIGATION_BAR_SEARCH_INPUT_FOCUS_CHANGED
,
ON_PAGE_NOT_FOUND
,
ON_PAGE_SCROLL
,
ON_PULL_DOWN_REFRESH
,
ON_REACH_BOTTOM
,
ON_REACH_BOTTOM_DISTANCE
,
ON_READY
,
ON_RESIZE
,
ON_SHARE_APP_MESSAGE
,
ON_SHARE_TIMELINE
,
ON_SHOW
,
ON_TAB_ITEM_TAP
,
ON_THEME_CHANGE
,
ON_UNHANDLE_REJECTION
,
ON_UNLOAD
,
ON_WEB_INVOKE_APP_SERVICE
,
ON_WXS_INVOKE_CALL_METHOD
,
PLUS_RE
,
PRIMARY_COLOR
,
RENDERJS_MODULES
,
RESPONSIVE_MIN_WIDTH
,
SCHEME_RE
,
SELECTED_COLOR
,
SLOT_DEFAULT_NAME
,
TABBAR_HEIGHT
,
TAGS
,
UNI_SSR
,
UNI_SSR_DATA
,
UNI_SSR_GLOBAL_DATA
,
UNI_SSR_STORE
,
UNI_SSR_TITLE
,
UNI_STORAGE_LOCALE
,
UniBaseNode
,
UniCommentNode
,
UniElement
,
UniEvent
,
UniInputElement
,
UniLifecycleHooks
,
UniNode
,
UniTextAreaElement
,
UniTextNode
,
WEB_INVOKE_APPSERVICE
,
WXS_MODULES
,
WXS_PROTOCOL
,
addFont
,
addLeadingSlash
,
cache
,
cacheStringFunction
,
callOptions
,
createIsCustomElement
,
createRpx2Unit
,
createUniEvent
,
debounce
,
decode
,
decodedQuery
,
defaultMiniProgramRpx2Unit
,
defaultRpx2Unit
,
dynamicSlotName
,
forcePatchProp
,
formatAppLog
,
formatDateTime
,
formatH5Log
,
formatLog
,
getCustomDataset
,
getEnvLocale
,
getLen
,
getValueByDataPath
,
initCustomDataset
,
invokeArrayFns
,
isAppNVueNativeTag
,
isAppNativeTag
,
isBuiltInComponent
,
isComponentInternalInstance
,
isComponentTag
,
isH5CustomElement
,
isH5NativeTag
,
isMiniProgramNativeTag
,
isRootHook
,
normalizeDataset
,
normalizeEventType
,
normalizeTarget
,
once
,
parseEventName
,
parseQuery
,
parseUrl
,
passive
,
plusReady
,
removeLeadingSlash
,
resolveComponentInstance
,
resolveOwnerEl
,
resolveOwnerVm
,
sanitise
,
scrollTo
,
stringifyQuery
,
updateElementStyle
};
export
{
ACTION_TYPE_ADD_EVENT
,
ACTION_TYPE_ADD_WXS_EVENT
,
ACTION_TYPE_CREATE
,
ACTION_TYPE_EVENT
,
ACTION_TYPE_INSERT
,
ACTION_TYPE_PAGE_CREATE
,
ACTION_TYPE_PAGE_CREATED
,
ACTION_TYPE_PAGE_SCROLL
,
ACTION_TYPE_REMOVE
,
ACTION_TYPE_REMOVE_ATTRIBUTE
,
ACTION_TYPE_REMOVE_EVENT
,
ACTION_TYPE_SET_ATTRIBUTE
,
ACTION_TYPE_SET_TEXT
,
ATTR_CHANGE_PREFIX
,
ATTR_CLASS
,
ATTR_INNER_HTML
,
ATTR_STYLE
,
ATTR_TEXT_CONTENT
,
ATTR_V_OWNER_ID
,
ATTR_V_RENDERJS
,
ATTR_V_SHOW
,
BACKGROUND_COLOR
,
BUILT_IN_TAGS
,
BUILT_IN_TAG_NAMES
,
COMPONENT_NAME_PREFIX
,
COMPONENT_PREFIX
,
COMPONENT_SELECTOR_PREFIX
,
DATA_RE
,
EventChannel
,
EventModifierFlags
,
I18N_JSON_DELIMITERS
,
JSON_PROTOCOL
,
LINEFEED
,
MINI_PROGRAM_PAGE_RUNTIME_HOOKS
,
NAVBAR_HEIGHT
,
NODE_TYPE_COMMENT
,
NODE_TYPE_ELEMENT
,
NODE_TYPE_PAGE
,
NODE_TYPE_TEXT
,
NVUE_BUILT_IN_TAGS
,
NV
UE_U_BUILT_IN_TAGS
,
NV
ueTextNode
,
ON_ADD_TO_FAVORITES
,
ON_APP_ENTER_BACKGROUND
,
ON_APP_ENTER_FOREGROUND
,
ON_BACK_PRESS
,
ON_ERROR
,
ON_HIDE
,
ON_KEYBOARD_HEIGHT_CHANGE
,
ON_LAUNCH
,
ON_LOAD
,
ON_NAVIGATION_BAR_BUTTON_TAP
,
ON_NAVIGATION_BAR_SEARCH_INPUT_CHANGED
,
ON_NAVIGATION_BAR_SEARCH_INPUT_CLICKED
,
ON_NAVIGATION_BAR_SEARCH_INPUT_CONFIRMED
,
ON_NAVIGATION_BAR_SEARCH_INPUT_FOCUS_CHANGED
,
ON_PAGE_NOT_FOUND
,
ON_PAGE_SCROLL
,
ON_PULL_DOWN_REFRESH
,
ON_REACH_BOTTOM
,
ON_REACH_BOTTOM_DISTANCE
,
ON_READY
,
ON_RESIZE
,
ON_SHARE_APP_MESSAGE
,
ON_SHARE_TIMELINE
,
ON_SHOW
,
ON_TAB_ITEM_TAP
,
ON_THEME_CHANGE
,
ON_UNHANDLE_REJECTION
,
ON_UNLOAD
,
ON_WEB_INVOKE_APP_SERVICE
,
ON_WXS_INVOKE_CALL_METHOD
,
PLUS_RE
,
PRIMARY_COLOR
,
RENDERJS_MODULES
,
RESPONSIVE_MIN_WIDTH
,
SCHEME_RE
,
SELECTED_COLOR
,
SLOT_DEFAULT_NAME
,
TABBAR_HEIGHT
,
TAGS
,
UNI_SSR
,
UNI_SSR_DATA
,
UNI_SSR_GLOBAL_DATA
,
UNI_SSR_STORE
,
UNI_SSR_TITLE
,
UNI_STORAGE_LOCALE
,
UniBaseNode
,
UniCommentNode
,
UniElement
,
UniEvent
,
UniInputElement
,
UniLifecycleHooks
,
UniNode
,
UniTextAreaElement
,
UniTextNode
,
WEB_INVOKE_APPSERVICE
,
WXS_MODULES
,
WXS_PROTOCOL
,
addFont
,
addLeadingSlash
,
cache
,
cacheStringFunction
,
callOptions
,
createIsCustomElement
,
createRpx2Unit
,
createUniEvent
,
debounce
,
decode
,
decodedQuery
,
defaultMiniProgramRpx2Unit
,
defaultRpx2Unit
,
dynamicSlotName
,
forcePatchProp
,
formatAppLog
,
formatDateTime
,
formatH5Log
,
formatLog
,
getCustomDataset
,
getEnvLocale
,
getLen
,
getValueByDataPath
,
initCustomDataset
,
invokeArrayFns
,
isAppNVueNativeTag
,
isAppNativeTag
,
isBuiltInComponent
,
isComponentInternalInstance
,
isComponentTag
,
isH5CustomElement
,
isH5NativeTag
,
isMiniProgramNativeTag
,
isRootHook
,
normalizeDataset
,
normalizeEventType
,
normalizeTarget
,
once
,
parseEventName
,
parseQuery
,
parseUrl
,
passive
,
plusReady
,
removeLeadingSlash
,
resolveComponentInstance
,
resolveOwnerEl
,
resolveOwnerVm
,
sanitise
,
scrollTo
,
stringifyQuery
,
updateElementStyle
};
packages/uni-shared/src/tags.ts
浏览文件 @
acef7a9f
...
...
@@ -70,6 +70,42 @@ export const TAGS = [
].
map
((
tag
)
=>
'
uni-
'
+
tag
)
export
const
NVUE_BUILT_IN_TAGS
=
[
'
svg
'
,
'
view
'
,
'
a
'
,
'
div
'
,
'
img
'
,
'
image
'
,
'
text
'
,
'
span
'
,
'
input
'
,
'
textarea
'
,
'
spinner
'
,
'
select
'
,
'
slider
'
,
'
slider-neighbor
'
,
'
indicator
'
,
'
canvas
'
,
'
list
'
,
'
cell
'
,
'
header
'
,
'
loading
'
,
'
loading-indicator
'
,
'
refresh
'
,
'
scrollable
'
,
'
scroller
'
,
'
video
'
,
'
web
'
,
'
embed
'
,
'
tabbar
'
,
'
tabheader
'
,
'
datepicker
'
,
'
timepicker
'
,
'
marquee
'
,
'
countdown
'
,
]
export
const
NVUE_U_BUILT_IN_TAGS
=
[
'
text
'
,
'
image
'
,
'
input
'
,
...
...
@@ -101,11 +137,11 @@ export function isAppNativeTag(tag: string) {
}
export
function
isAppNVueNativeTag
(
tag
:
string
)
{
if
(
isAppNativeTag
(
tag
))
{
if
(
NVUE_BUILT_IN_TAGS
.
includes
(
tag
))
{
return
true
}
// u-text,u-video...
if
(
NVUE_BUILT_IN_TAGS
.
includes
(
tag
.
replace
(
'
u-
'
,
''
)))
{
if
(
NVUE_
U_
BUILT_IN_TAGS
.
includes
(
tag
.
replace
(
'
u-
'
,
''
)))
{
return
true
}
return
false
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录