Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小浣熊撸代码
uni-app
提交
e73b4b9e
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,发现更多精彩内容 >>
提交
e73b4b9e
编写于
11月 04, 2021
作者:
Q
qiang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: map -> marker -> callout style
上级
b8016ef6
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
12 addition
and
9 deletion
+12
-9
packages/uni-h5/dist/uni-h5.cjs.js
packages/uni-h5/dist/uni-h5.cjs.js
+4
-3
packages/uni-h5/dist/uni-h5.es.js
packages/uni-h5/dist/uni-h5.es.js
+4
-3
packages/uni-h5/src/view/components/map/MapMarker.tsx
packages/uni-h5/src/view/components/map/MapMarker.tsx
+4
-3
未找到文件。
packages/uni-h5/dist/uni-h5.cjs.js
浏览文件 @
e73b4b9e
...
@@ -7826,7 +7826,7 @@ var MapMarker = /* @__PURE__ */ defineSystemComponent({
...
@@ -7826,7 +7826,7 @@ var MapMarker = /* @__PURE__ */ defineSystemComponent({
w
=
img
.
width
/
2
;
w
=
img
.
width
/
2
;
h
=
img
.
height
/
2
;
h
=
img
.
height
/
2
;
}
}
top
=
h
-
(
h
-
y
);
top
=
h
-
(
h
-
y
*
h
);
if
(
"
MarkerImage
"
in
maps
)
{
if
(
"
MarkerImage
"
in
maps
)
{
icon
=
new
maps
.
MarkerImage
(
img
.
src
,
null
,
null
,
new
maps
.
Point
(
x
*
w
,
y
*
h
),
new
maps
.
Size
(
w
,
h
));
icon
=
new
maps
.
MarkerImage
(
img
.
src
,
null
,
null
,
new
maps
.
Point
(
x
*
w
,
y
*
h
),
new
maps
.
Size
(
w
,
h
));
}
else
{
}
else
{
...
@@ -7878,6 +7878,7 @@ var MapMarker = /* @__PURE__ */ defineSystemComponent({
...
@@ -7878,6 +7878,7 @@ var MapMarker = /* @__PURE__ */ defineSystemComponent({
let
callout
=
marker
.
callout
;
let
callout
=
marker
.
callout
;
let
calloutStyle
;
let
calloutStyle
;
if
(
calloutOpt
.
content
||
title
)
{
if
(
calloutOpt
.
content
||
title
)
{
const
boxShadow
=
"
0px 0px 3px 1px rgba(0,0,0,0.5)
"
;
calloutStyle
=
calloutOpt
.
content
?
{
calloutStyle
=
calloutOpt
.
content
?
{
position
,
position
,
map
,
map
,
...
@@ -7888,14 +7889,14 @@ var MapMarker = /* @__PURE__ */ defineSystemComponent({
...
@@ -7888,14 +7889,14 @@ var MapMarker = /* @__PURE__ */ defineSystemComponent({
borderRadius
:
calloutOpt
.
borderRadius
,
borderRadius
:
calloutOpt
.
borderRadius
,
bgColor
:
calloutOpt
.
bgColor
,
bgColor
:
calloutOpt
.
bgColor
,
padding
:
calloutOpt
.
padding
,
padding
:
calloutOpt
.
padding
,
boxShadow
:
calloutOpt
.
boxShadow
,
boxShadow
:
calloutOpt
.
boxShadow
||
boxShadow
,
display
:
calloutOpt
.
display
display
:
calloutOpt
.
display
}
:
{
}
:
{
position
,
position
,
map
,
map
,
top
,
top
,
content
:
title
,
content
:
title
,
boxShadow
:
"
0px 0px 3px 1px rgba(0,0,0,0.5)
"
boxShadow
};
};
if
(
callout
)
{
if
(
callout
)
{
callout
.
setOption
(
calloutStyle
);
callout
.
setOption
(
calloutStyle
);
...
...
packages/uni-h5/dist/uni-h5.es.js
浏览文件 @
e73b4b9e
...
@@ -15239,7 +15239,7 @@ var MapMarker = /* @__PURE__ */ defineSystemComponent({
...
@@ -15239,7 +15239,7 @@ var MapMarker = /* @__PURE__ */ defineSystemComponent({
w = img.width / 2;
w = img.width / 2;
h = img.height / 2;
h = img.height / 2;
}
}
top = h - (h - y);
top = h - (h - y
* h
);
if ("MarkerImage" in maps2) {
if ("MarkerImage" in maps2) {
icon = new maps2.MarkerImage(img.src, null, null, new maps2.Point(x * w, y * h), new maps2.Size(w, h));
icon = new maps2.MarkerImage(img.src, null, null, new maps2.Point(x * w, y * h), new maps2.Size(w, h));
} else {
} else {
...
@@ -15291,6 +15291,7 @@ var MapMarker = /* @__PURE__ */ defineSystemComponent({
...
@@ -15291,6 +15291,7 @@ var MapMarker = /* @__PURE__ */ defineSystemComponent({
let callout = marker.callout;
let callout = marker.callout;
let calloutStyle;
let calloutStyle;
if (calloutOpt.content || title) {
if (calloutOpt.content || title) {
const boxShadow = "0px 0px 3px 1px rgba(0,0,0,0.5)";
calloutStyle = calloutOpt.content ? {
calloutStyle = calloutOpt.content ? {
position,
position,
map,
map,
...
@@ -15301,14 +15302,14 @@ var MapMarker = /* @__PURE__ */ defineSystemComponent({
...
@@ -15301,14 +15302,14 @@ var MapMarker = /* @__PURE__ */ defineSystemComponent({
borderRadius: calloutOpt.borderRadius,
borderRadius: calloutOpt.borderRadius,
bgColor: calloutOpt.bgColor,
bgColor: calloutOpt.bgColor,
padding: calloutOpt.padding,
padding: calloutOpt.padding,
boxShadow: calloutOpt.boxShadow,
boxShadow: calloutOpt.boxShadow
|| boxShadow
,
display: calloutOpt.display
display: calloutOpt.display
} : {
} : {
position,
position,
map,
map,
top,
top,
content: title,
content: title,
boxShadow
: "0px 0px 3px 1px rgba(0,0,0,0.5)"
boxShadow
};
};
if (callout) {
if (callout) {
callout.setOption(calloutStyle);
callout.setOption(calloutStyle);
...
...
packages/uni-h5/src/view/components/map/MapMarker.tsx
浏览文件 @
e73b4b9e
...
@@ -153,7 +153,7 @@ export default /*#__PURE__*/ defineSystemComponent({
...
@@ -153,7 +153,7 @@ export default /*#__PURE__*/ defineSystemComponent({
w
=
img
.
width
/
2
w
=
img
.
width
/
2
h
=
img
.
height
/
2
h
=
img
.
height
/
2
}
}
top
=
h
-
(
h
-
y
)
top
=
h
-
(
h
-
y
*
h
)
if
(
'
MarkerImage
'
in
maps
)
{
if
(
'
MarkerImage
'
in
maps
)
{
icon
=
new
maps
.
MarkerImage
(
icon
=
new
maps
.
MarkerImage
(
img
.
src
,
img
.
src
,
...
@@ -211,6 +211,7 @@ export default /*#__PURE__*/ defineSystemComponent({
...
@@ -211,6 +211,7 @@ export default /*#__PURE__*/ defineSystemComponent({
let
callout
=
marker
.
callout
let
callout
=
marker
.
callout
let
calloutStyle
:
CalloutOptions
let
calloutStyle
:
CalloutOptions
if
(
calloutOpt
.
content
||
title
)
{
if
(
calloutOpt
.
content
||
title
)
{
const
boxShadow
=
'
0px 0px 3px 1px rgba(0,0,0,0.5)
'
calloutStyle
=
calloutOpt
.
content
calloutStyle
=
calloutOpt
.
content
?
{
?
{
position
,
position
,
...
@@ -222,7 +223,7 @@ export default /*#__PURE__*/ defineSystemComponent({
...
@@ -222,7 +223,7 @@ export default /*#__PURE__*/ defineSystemComponent({
borderRadius
:
calloutOpt
.
borderRadius
,
borderRadius
:
calloutOpt
.
borderRadius
,
bgColor
:
calloutOpt
.
bgColor
,
bgColor
:
calloutOpt
.
bgColor
,
padding
:
calloutOpt
.
padding
,
padding
:
calloutOpt
.
padding
,
boxShadow
:
calloutOpt
.
boxShadow
,
boxShadow
:
calloutOpt
.
boxShadow
||
boxShadow
,
display
:
calloutOpt
.
display
,
display
:
calloutOpt
.
display
,
}
}
:
{
:
{
...
@@ -230,7 +231,7 @@ export default /*#__PURE__*/ defineSystemComponent({
...
@@ -230,7 +231,7 @@ export default /*#__PURE__*/ defineSystemComponent({
map
,
map
,
top
,
top
,
content
:
title
,
content
:
title
,
boxShadow
:
'
0px 0px 3px 1px rgba(0,0,0,0.5)
'
,
boxShadow
,
}
}
if
(
callout
)
{
if
(
callout
)
{
callout
.
setOption
(
calloutStyle
)
callout
.
setOption
(
calloutStyle
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录