Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MuGuiLin
uni-app
提交
2538ff31
U
uni-app
项目概览
MuGuiLin
/
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,发现更多精彩内容 >>
提交
2538ff31
编写于
2月 17, 2022
作者:
fxy060608
浏览文件
操作
浏览文件
下载
差异文件
chore: merge
上级
f05f836f
fdb017c6
变更
9
显示空白变更内容
内联
并排
Showing
9 changed file
with
377 addition
and
191 deletion
+377
-191
packages/uni-components/dist/components.js
packages/uni-components/dist/components.js
+179
-91
packages/uni-components/src/nvue/button/index.tsx
packages/uni-components/src/nvue/button/index.tsx
+179
-91
packages/uni-components/src/nvue/navigator/index.tsx
packages/uni-components/src/nvue/navigator/index.tsx
+6
-4
packages/uni-components/src/nvue/utils.ts
packages/uni-components/src/nvue/utils.ts
+4
-0
packages/uni-h5/dist/uni-h5.cjs.js
packages/uni-h5/dist/uni-h5.cjs.js
+1
-1
packages/uni-h5/dist/uni-h5.es.js
packages/uni-h5/dist/uni-h5.es.js
+1
-1
packages/uni-h5/src/view/components/map/index.tsx
packages/uni-h5/src/view/components/map/index.tsx
+3
-3
packages/uni-shared/dist/uni-shared.d.ts
packages/uni-shared/dist/uni-shared.d.ts
+2
-0
packages/uni-shared/src/nvue.ts
packages/uni-shared/src/nvue.ts
+2
-0
未找到文件。
packages/uni-components/dist/components.js
浏览文件 @
2538ff31
...
...
@@ -102,9 +102,11 @@ function createNVueTextVNode(text, attrs) {
}
const
navigatorStyles
=
[{
"
navigator-hover
"
:
{
""
:
{
backgroundColor
:
"
rgba(0,0,0,0.1)
"
,
opacity
:
0.7
}
}
}];
var
Navigator
=
defineComponent
({
name
:
"
Navigator
"
,
...
...
@@ -311,6 +313,7 @@ const buttonProps = {
};
const
buttonStyle
=
[{
ub
:
{
""
:
{
flexDirection
:
"
row
"
,
alignItems
:
"
center
"
,
justifyContent
:
"
center
"
,
...
...
@@ -324,167 +327,252 @@ const buttonStyle = [{
borderStyle
:
"
solid
"
,
borderWidth
:
"
1
"
,
borderColor
:
"
#dbdbdb
"
}
},
"
ub-t
"
:
{
""
:
{
color
:
"
#000000
"
,
fontSize
:
"
18
"
,
textDecoration
:
"
none
"
,
lineHeight
:
"
46
"
}
},
"
ub-d
"
:
{
""
:
{
backgroundColor
:
"
#f8f8f8
"
}
},
"
ub-p
"
:
{
""
:
{
backgroundColor
:
"
#007aff
"
,
borderColor
:
"
#0062cc
"
}
},
"
ub-w
"
:
{
""
:
{
backgroundColor
:
"
#e64340
"
,
borderColor
:
"
#b83633
"
}
},
"
ub-d-t
"
:
{
""
:
{
color
:
"
#000000
"
}
},
"
ub-p-t
"
:
{
""
:
{
color
:
"
#ffffff
"
}
},
"
ub-w-t
"
:
{
""
:
{
color
:
"
#ffffff
"
}
},
"
ub-d-d
"
:
{
""
:
{
backgroundColor
:
"
#f7f7f7
"
}
},
"
ub-p-d
"
:
{
""
:
{
backgroundColor
:
"
#63acfc
"
,
borderColor
:
"
#4f8aca
"
}
},
"
ub-w-d
"
:
{
""
:
{
backgroundColor
:
"
#ec8b89
"
,
borderColor
:
"
#bd6f6e
"
}
},
"
ub-d-t-d
"
:
{
""
:
{
color
:
"
#cccccc
"
}
},
"
ub-p-t-d
"
:
{
""
:
{
color
:
"
rgba(255,255,255,0.6)
"
}
},
"
ub-w-t-d
"
:
{
""
:
{
color
:
"
rgba(255,255,255,0.6)
"
}
},
"
ub-d-plain
"
:
{
""
:
{
borderColor
:
"
#353535
"
,
backgroundColor
:
"
rgba(0,0,0,0)
"
}
},
"
ub-p-plain
"
:
{
""
:
{
borderColor
:
"
#007aff
"
,
backgroundColor
:
"
rgba(0,0,0,0)
"
}
},
"
ub-w-plain
"
:
{
""
:
{
borderColor
:
"
#e64340
"
,
backgroundColor
:
"
rgba(0,0,0,0)
"
}
},
"
ub-d-t-plain
"
:
{
""
:
{
color
:
"
#353535
"
}
},
"
ub-p-t-plain
"
:
{
""
:
{
color
:
"
#007aff
"
}
},
"
ub-w-t-plain
"
:
{
""
:
{
color
:
"
#e64340
"
}
},
"
ub-d-d-plain
"
:
{
""
:
{
borderColor
:
"
#c6c6c6
"
,
backgroundColor
:
"
rgba(0,0,0,0)
"
}
},
"
ub-p-d-plain
"
:
{
""
:
{
borderColor
:
"
#c6c6c6
"
,
backgroundColor
:
"
rgba(0,0,0,0)
"
}
},
"
ub-w-d-plain
"
:
{
""
:
{
borderColor
:
"
#c6c6c6
"
,
backgroundColor
:
"
rgba(0,0,0,0)
"
}
},
"
ub-d-t-d-plain
"
:
{
""
:
{
color
:
"
rgba(0,0,0,0.2)
"
}
},
"
ub-p-t-d-plain
"
:
{
""
:
{
color
:
"
rgba(0,0,0,0.2)
"
}
},
"
ub-w-t-d-plain
"
:
{
""
:
{
color
:
"
rgba(0,0,0,0.2)
"
}
},
"
ub-mini
"
:
{
""
:
{
lineHeight
:
"
30
"
,
fontSize
:
"
13
"
,
paddingTop
:
0
,
paddingRight
:
"
17.5
"
,
paddingBottom
:
0
,
paddingLeft
:
"
17.5
"
}
},
"
ub-loading
"
:
{
""
:
{
width
:
"
18
"
,
height
:
"
18
"
,
marginRight
:
"
10
"
}
},
"
ub-d-loading
"
:
{
""
:
{
color
:
"
rgba(255,255,255,0.6)
"
,
backgroundColor
:
"
rgba(0,0,0,0)
"
}
},
"
ub-p-loading
"
:
{
""
:
{
color
:
"
rgba(255,255,255,0.6)
"
,
backgroundColor
:
"
rgba(0,0,0,0)
"
}
},
"
ub-w-loading
"
:
{
""
:
{
color
:
"
rgba(255,255,255,0.6)
"
,
backgroundColor
:
"
rgba(0,0,0,0)
"
}
},
"
ub-d-loading-plain
"
:
{
""
:
{
color
:
"
#353535
"
}
},
"
ub-p-loading-plain
"
:
{
""
:
{
color
:
"
#007aff
"
,
backgroundColor
:
"
#0062cc
"
}
},
"
ub-w-loading-plain
"
:
{
""
:
{
color
:
"
#e64340
"
,
backgroundColor
:
"
rgba(0,0,0,0)
"
}
},
"
ub-d-hover
"
:
{
""
:
{
opacity
:
0.8
,
backgroundColor
:
"
#dedede
"
}
},
"
ub-p-hover
"
:
{
""
:
{
opacity
:
0.8
,
backgroundColor
:
"
#0062cc
"
}
},
"
ub-w-hover
"
:
{
""
:
{
opacity
:
0.8
,
backgroundColor
:
"
#ce3c39
"
}
},
"
ub-d-t-hover
"
:
{
""
:
{
color
:
"
rgba(0,0,0,0.6)
"
}
},
"
ub-p-t-hover
"
:
{
""
:
{
color
:
"
rgba(255,255,255,0.6)
"
}
},
"
ub-w-t-hover
"
:
{
""
:
{
color
:
"
rgba(255,255,255,0.6)
"
}
},
"
ub-d-hover-plain
"
:
{
""
:
{
color
:
"
rgba(53,53,53,0.6)
"
,
borderColor
:
"
rgba(53,53,53,0.6)
"
,
backgroundColor
:
"
rgba(0,0,0,0)
"
}
},
"
ub-p-hover-plain
"
:
{
""
:
{
color
:
"
rgba(26,173,25,0.6)
"
,
borderColor
:
"
rgba(0,122,255,0.6)
"
,
backgroundColor
:
"
rgba(0,0,0,0)
"
}
},
"
ub-w-hover-plain
"
:
{
""
:
{
color
:
"
rgba(230,67,64,0.6)
"
,
borderColor
:
"
rgba(230,67,64,0.6)
"
,
backgroundColor
:
"
rgba(0,0,0,0)
"
}
}
}];
const
TYPES
=
{
default
:
"
d
"
,
...
...
packages/uni-components/src/nvue/button/index.tsx
浏览文件 @
2538ff31
...
...
@@ -9,13 +9,18 @@ import {
import
{
uniLabelKey
,
UniLabelCtx
}
from
'
../label
'
import
{
useListeners
}
from
'
../../helpers/useListeners
'
import
{
useAttrs
}
from
'
../../helpers/useAttrs
'
import
{
createNVueTextVNode
,
useHoverClass
}
from
'
../utils
'
import
{
createNVueTextVNode
,
NVueComponentStyles
,
useHoverClass
,
}
from
'
../utils
'
import
{
buttonProps
}
from
'
../../components/button
'
import
{
extend
}
from
'
@vue/shared
'
const
buttonStyle
=
[
const
buttonStyle
:
NVueComponentStyles
=
[
{
ub
:
{
''
:
{
flexDirection
:
'
row
'
,
alignItems
:
'
center
'
,
justifyContent
:
'
center
'
,
...
...
@@ -30,95 +35,147 @@ const buttonStyle = [
borderWidth
:
'
1
'
,
borderColor
:
'
#dbdbdb
'
,
},
},
'
ub-t
'
:
{
''
:
{
color
:
'
#000000
'
,
fontSize
:
'
18
'
,
textDecoration
:
'
none
'
,
lineHeight
:
'
46
'
,
},
},
'
ub-d
'
:
{
''
:
{
backgroundColor
:
'
#f8f8f8
'
,
},
},
'
ub-p
'
:
{
''
:
{
backgroundColor
:
'
#007aff
'
,
borderColor
:
'
#0062cc
'
,
},
},
'
ub-w
'
:
{
''
:
{
backgroundColor
:
'
#e64340
'
,
borderColor
:
'
#b83633
'
,
},
},
'
ub-d-t
'
:
{
''
:
{
color
:
'
#000000
'
,
},
},
'
ub-p-t
'
:
{
''
:
{
color
:
'
#ffffff
'
,
},
},
'
ub-w-t
'
:
{
''
:
{
color
:
'
#ffffff
'
,
},
},
'
ub-d-d
'
:
{
''
:
{
backgroundColor
:
'
#f7f7f7
'
,
},
},
'
ub-p-d
'
:
{
''
:
{
backgroundColor
:
'
#63acfc
'
,
borderColor
:
'
#4f8aca
'
,
},
},
'
ub-w-d
'
:
{
''
:
{
backgroundColor
:
'
#ec8b89
'
,
borderColor
:
'
#bd6f6e
'
,
},
},
'
ub-d-t-d
'
:
{
''
:
{
color
:
'
#cccccc
'
,
},
},
'
ub-p-t-d
'
:
{
''
:
{
color
:
'
rgba(255,255,255,0.6)
'
,
},
},
'
ub-w-t-d
'
:
{
''
:
{
color
:
'
rgba(255,255,255,0.6)
'
,
},
},
'
ub-d-plain
'
:
{
''
:
{
borderColor
:
'
#353535
'
,
backgroundColor
:
'
rgba(0,0,0,0)
'
,
},
},
'
ub-p-plain
'
:
{
''
:
{
borderColor
:
'
#007aff
'
,
backgroundColor
:
'
rgba(0,0,0,0)
'
,
},
},
'
ub-w-plain
'
:
{
''
:
{
borderColor
:
'
#e64340
'
,
backgroundColor
:
'
rgba(0,0,0,0)
'
,
},
},
'
ub-d-t-plain
'
:
{
''
:
{
color
:
'
#353535
'
,
},
},
'
ub-p-t-plain
'
:
{
''
:
{
color
:
'
#007aff
'
,
},
},
'
ub-w-t-plain
'
:
{
''
:
{
color
:
'
#e64340
'
,
},
},
'
ub-d-d-plain
'
:
{
''
:
{
borderColor
:
'
#c6c6c6
'
,
backgroundColor
:
'
rgba(0,0,0,0)
'
,
},
},
'
ub-p-d-plain
'
:
{
''
:
{
borderColor
:
'
#c6c6c6
'
,
backgroundColor
:
'
rgba(0,0,0,0)
'
,
},
},
'
ub-w-d-plain
'
:
{
''
:
{
borderColor
:
'
#c6c6c6
'
,
backgroundColor
:
'
rgba(0,0,0,0)
'
,
},
},
'
ub-d-t-d-plain
'
:
{
''
:
{
color
:
'
rgba(0,0,0,0.2)
'
,
},
},
'
ub-p-t-d-plain
'
:
{
''
:
{
color
:
'
rgba(0,0,0,0.2)
'
,
},
},
'
ub-w-t-d-plain
'
:
{
''
:
{
color
:
'
rgba(0,0,0,0.2)
'
,
},
},
'
ub-mini
'
:
{
''
:
{
lineHeight
:
'
30
'
,
fontSize
:
'
13
'
,
paddingTop
:
0
,
...
...
@@ -126,71 +183,102 @@ const buttonStyle = [
paddingBottom
:
0
,
paddingLeft
:
'
17.5
'
,
},
},
'
ub-loading
'
:
{
''
:
{
width
:
'
18
'
,
height
:
'
18
'
,
marginRight
:
'
10
'
,
},
},
'
ub-d-loading
'
:
{
''
:
{
color
:
'
rgba(255,255,255,0.6)
'
,
backgroundColor
:
'
rgba(0,0,0,0)
'
,
},
},
'
ub-p-loading
'
:
{
''
:
{
color
:
'
rgba(255,255,255,0.6)
'
,
backgroundColor
:
'
rgba(0,0,0,0)
'
,
},
},
'
ub-w-loading
'
:
{
''
:
{
color
:
'
rgba(255,255,255,0.6)
'
,
backgroundColor
:
'
rgba(0,0,0,0)
'
,
},
},
'
ub-d-loading-plain
'
:
{
color
:
'
#353535
'
,
''
:
{
color
:
'
#353535
'
}
,
},
'
ub-p-loading-plain
'
:
{
''
:
{
color
:
'
#007aff
'
,
backgroundColor
:
'
#0062cc
'
,
},
},
'
ub-w-loading-plain
'
:
{
''
:
{
color
:
'
#e64340
'
,
backgroundColor
:
'
rgba(0,0,0,0)
'
,
},
},
'
ub-d-hover
'
:
{
''
:
{
opacity
:
0.8
,
backgroundColor
:
'
#dedede
'
,
},
},
'
ub-p-hover
'
:
{
''
:
{
opacity
:
0.8
,
backgroundColor
:
'
#0062cc
'
,
},
},
'
ub-w-hover
'
:
{
''
:
{
opacity
:
0.8
,
backgroundColor
:
'
#ce3c39
'
,
},
},
'
ub-d-t-hover
'
:
{
''
:
{
color
:
'
rgba(0,0,0,0.6)
'
,
},
},
'
ub-p-t-hover
'
:
{
''
:
{
color
:
'
rgba(255,255,255,0.6)
'
,
},
},
'
ub-w-t-hover
'
:
{
''
:
{
color
:
'
rgba(255,255,255,0.6)
'
,
},
},
'
ub-d-hover-plain
'
:
{
''
:
{
color
:
'
rgba(53,53,53,0.6)
'
,
borderColor
:
'
rgba(53,53,53,0.6)
'
,
backgroundColor
:
'
rgba(0,0,0,0)
'
,
},
},
'
ub-p-hover-plain
'
:
{
''
:
{
color
:
'
rgba(26,173,25,0.6)
'
,
borderColor
:
'
rgba(0,122,255,0.6)
'
,
backgroundColor
:
'
rgba(0,0,0,0)
'
,
},
},
'
ub-w-hover-plain
'
:
{
''
:
{
color
:
'
rgba(230,67,64,0.6)
'
,
borderColor
:
'
rgba(230,67,64,0.6)
'
,
backgroundColor
:
'
rgba(0,0,0,0)
'
,
},
},
},
]
const
TYPES
=
{
default
:
'
d
'
,
...
...
packages/uni-components/src/nvue/navigator/index.tsx
浏览文件 @
2538ff31
...
...
@@ -3,15 +3,17 @@ import {
createNavigatorOnClick
,
navigatorProps
,
}
from
'
../../components/navigator
'
import
{
useHoverClass
}
from
'
../utils
'
import
{
NVueComponentStyles
,
useHoverClass
}
from
'
../utils
'
const
navigatorStyles
:
Record
<
string
,
Record
<
string
,
string
|
number
>>
[]
=
[
const
navigatorStyles
:
NVueComponentStyles
=
[
{
'
navigator-hover
'
:
{
''
:
{
backgroundColor
:
'
rgba(0,0,0,0.1)
'
,
opacity
:
0.7
,
},
},
},
]
export
default
defineComponent
({
...
...
packages/uni-components/src/nvue/utils.ts
浏览文件 @
2538ff31
import
{
createElementVNode
}
from
'
vue
'
import
{
extend
,
hasOwn
}
from
'
@vue/shared
'
export
type
NVueComponentStyles
=
Array
<
Record
<
string
,
Record
<
string
,
Record
<
string
,
unknown
>>>
>
interface
HoverProps
{
hoverClass
?:
string
hoverStartTime
?:
number
|
string
...
...
packages/uni-h5/dist/uni-h5.cjs.js
浏览文件 @
2538ff31
...
...
@@ -8633,7 +8633,7 @@ var index$c = /* @__PURE__ */ defineBuiltInComponent({
},
[
vue
.
createVNode
(
"
div
"
,
{
"
ref
"
:
mapRef
,
"
style
"
:
"
width: 100%; height: 100%; position: relative; overflow: hidden
"
},
null
,
512
),
props2
.
markers
.
map
((
item
)
=>
item
.
id
&&
vue
.
createVNode
(
MapMarker
,
vue
.
mergeProps
({
},
null
,
512
),
props2
.
markers
.
map
((
item
)
=>
vue
.
createVNode
(
MapMarker
,
vue
.
mergeProps
({
"
key
"
:
item
.
id
},
item
),
null
,
16
)),
props2
.
polyline
.
map
((
item
)
=>
vue
.
createVNode
(
MapPolyline
,
item
,
null
,
16
)),
props2
.
circles
.
map
((
item
)
=>
vue
.
createVNode
(
MapCircle
,
item
,
null
,
16
)),
props2
.
controls
.
map
((
item
)
=>
vue
.
createVNode
(
MapControl
,
item
,
null
,
16
)),
props2
.
showLocation
&&
vue
.
createVNode
(
MapLocation
,
null
,
null
),
vue
.
createVNode
(
"
div
"
,
{
"
style
"
:
"
position: absolute;top: 0;width: 100%;height: 100%;overflow: hidden;pointer-events: none;
"
...
...
packages/uni-h5/dist/uni-h5.es.js
浏览文件 @
2538ff31
...
...
@@ -20394,7 +20394,7 @@ var Map$1 = /* @__PURE__ */ defineBuiltInComponent({
}, [createVNode("div", {
"ref": mapRef,
"style": "width: 100%; height: 100%; position: relative; overflow: hidden"
}, null, 512), props2.markers.map((item) =>
item.id &&
createVNode(MapMarker, mergeProps({
}, null, 512), props2.markers.map((item) => createVNode(MapMarker, mergeProps({
"key": item.id
}, item), null, 16)), props2.polyline.map((item) => createVNode(MapPolyline, item, null, 16)), props2.circles.map((item) => createVNode(MapCircle, item, null, 16)), props2.controls.map((item) => createVNode(MapControl, item, null, 16)), props2.showLocation && createVNode(MapLocation, null, null), createVNode("div", {
"style": "position: absolute;top: 0;width: 100%;height: 100%;overflow: hidden;pointer-events: none;"
...
...
packages/uni-h5/src/view/components/map/index.tsx
浏览文件 @
2538ff31
...
...
@@ -463,9 +463,9 @@ export default /*#__PURE__*/ defineBuiltInComponent({
ref
=
{
mapRef
}
style
=
"width: 100%; height: 100%; position: relative; overflow: hidden"
/>
{
props
.
markers
.
map
(
(
item
)
=>
item
.
id
&&
<
MapMarker
key
=
{
item
.
id
}
{
...
item
}
/>
)
}
{
props
.
markers
.
map
(
(
item
)
=>
(
<
MapMarker
key
=
{
item
.
id
}
{
...
item
}
/>
)
)
}
{
props
.
polyline
.
map
((
item
)
=>
(
<
MapPolyline
{
...
item
}
/>
))
}
...
...
packages/uni-shared/dist/uni-shared.d.ts
浏览文件 @
2538ff31
...
...
@@ -349,6 +349,7 @@ export declare interface NVueElement {
type
:
string
;
ref
:
string
;
text
?:
string
;
classList
:
string
[];
parentNode
:
NVueElement
|
null
;
children
:
Array
<
NVueElement
>
;
previousSibling
:
NVueElement
|
null
;
...
...
@@ -359,6 +360,7 @@ export declare interface NVueElement {
insertAfter
:
(
node
:
NVueElement
,
after
:
NVueElement
)
=>
void
;
setAttr
:
(
key
:
string
,
value
:
any
,
silent
?:
boolean
)
=>
void
;
setAttrs
:
(
attrs
:
Record
<
string
,
unknown
>
,
silent
?:
boolean
)
=>
void
;
setClassList
:
(
classList
:
string
[])
=>
void
;
setStyle
:
(
key
:
string
,
value
:
any
,
silent
?:
boolean
)
=>
void
;
setStyles
:
(
attrs
:
Record
<
string
,
unknown
>
,
silent
?:
boolean
)
=>
void
;
addEvent
:
(
type
:
string
,
handler
:
Function
,
args
?:
Array
<
any
>
)
=>
void
;
...
...
packages/uni-shared/src/nvue.ts
浏览文件 @
2538ff31
...
...
@@ -85,6 +85,7 @@ export interface NVueElement {
ref
:
string
text
?:
string
classList
:
string
[]
parentNode
:
NVueElement
|
null
children
:
Array
<
NVueElement
>
previousSibling
:
NVueElement
|
null
...
...
@@ -96,6 +97,7 @@ export interface NVueElement {
insertAfter
:
(
node
:
NVueElement
,
after
:
NVueElement
)
=>
void
setAttr
:
(
key
:
string
,
value
:
any
,
silent
?:
boolean
)
=>
void
setAttrs
:
(
attrs
:
Record
<
string
,
unknown
>
,
silent
?:
boolean
)
=>
void
setClassList
:
(
classList
:
string
[])
=>
void
setStyle
:
(
key
:
string
,
value
:
any
,
silent
?:
boolean
)
=>
void
setStyles
:
(
attrs
:
Record
<
string
,
unknown
>
,
silent
?:
boolean
)
=>
void
addEvent
:
(
type
:
string
,
handler
:
Function
,
args
?:
Array
<
any
>
)
=>
void
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录