Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
陈庄旺
uni-app
提交
5f85117a
U
uni-app
项目概览
陈庄旺
/
uni-app
与 Fork 源项目一致
Fork自
DCloud / uni-app
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
uni-app
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
5f85117a
编写于
4月 26, 2021
作者:
D
DCloud_LXH
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(h5): 1. UniServiceJSBridge.on tree sharkable in showToast 2. fix checkbox disabled status
上级
77f943f0
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
21 addition
and
13 deletion
+21
-13
packages/uni-components/src/components/checkbox/index.tsx
packages/uni-components/src/components/checkbox/index.tsx
+4
-1
packages/uni-h5/dist/uni-h5.esm.js
packages/uni-h5/dist/uni-h5.esm.js
+10
-7
packages/uni-h5/src/service/api/ui/popup/showToast.ts
packages/uni-h5/src/service/api/ui/popup/showToast.ts
+7
-5
未找到文件。
packages/uni-components/src/components/checkbox/index.tsx
浏览文件 @
5f85117a
...
...
@@ -84,7 +84,10 @@ export default /*#__PURE__*/ defineComponent({
return
(
<
uni
-
checkbox
disabled
=
{
disabled
}
onClick
=
{
_onClick
}
>
<
div
class
=
"uni-checkbox-wrapper"
>
<
div
class
=
"uni-checkbox-input"
>
<
div
class
=
"uni-checkbox-input"
class
=
{
{
'
uni-checkbox-input-disabled
'
:
disabled
}
}
>
{
checkboxChecked
.
value
?
createSvgIconVNode
(
ICON_PATH_SUCCESS_NO_CIRCLE
,
color
,
16
)
:
''
}
...
...
packages/uni-h5/dist/uni-h5.esm.js
浏览文件 @
5f85117a
...
...
@@ -5419,8 +5419,10 @@ var index$9 = /* @__PURE__ */ defineComponent({
},
[
createVNode
(
"
div
"
,
{
class
:
"
uni-checkbox-wrapper
"
},
[
createVNode
(
"
div
"
,
{
class
:
"
uni-checkbox-input
"
},
[
checkboxChecked
.
value
?
createSvgIconVNode
(
ICON_PATH_SUCCESS_NO_CIRCLE
,
color
,
16
)
:
""
]),
slots
.
default
&&
slots
.
default
()])],
8
,
[
"
disabled
"
,
"
onClick
"
]);
class
:
[
"
uni-checkbox-input
"
,
{
"
uni-checkbox-input-disabled
"
:
disabled
}]
},
[
checkboxChecked
.
value
?
createSvgIconVNode
(
ICON_PATH_SUCCESS_NO_CIRCLE
,
color
,
16
)
:
""
],
2
),
slots
.
default
&&
slots
.
default
()])],
8
,
[
"
disabled
"
,
"
onClick
"
]);
};
}
});
...
...
@@ -13250,6 +13252,9 @@ function useToastIcon(props2) {
let
showToastState
;
let
showType
=
""
;
let
timeoutId
;
const
onHidePopupOnce
=
once
(()
=>
{
UniServiceJSBridge
.
on
(
"
onHidePopup
"
,
()
=>
hidePopup
(
"
onHidePopup
"
));
});
function
createToast
(
args
)
{
if
(
!
showToastState
)
{
showToastState
=
reactive
(
args
);
...
...
@@ -13273,6 +13278,7 @@ function createToast(args) {
timeoutId
&&
clearTimeout
(
timeoutId
);
}
});
onHidePopupOnce
();
}
const
showToast
=
defineAsyncApi
(
API_SHOW_TOAST
,
(
args
,
{
resolve
,
reject
})
=>
{
createToast
(
args
);
...
...
@@ -13298,7 +13304,7 @@ const hideLoading = defineAsyncApi(API_HIDE_LOADING, (args, {resolve, reject}) =
hidePopup
(
"
onHideLoading
"
);
resolve
();
});
const
hidePopup
=
(
type
)
=>
{
function
hidePopup
(
type
)
{
const
{
t
:
t2
}
=
useI18n
();
if
(
!
showType
)
{
return
;
...
...
@@ -13316,10 +13322,7 @@ const hidePopup = (type) => {
setTimeout
(()
=>
{
showToastState
.
visible
=
false
;
},
10
);
};
setTimeout
(()
=>
{
UniServiceJSBridge
.
on
(
"
onHidePopup
"
,
()
=>
hidePopup
(
"
onHidePopup
"
));
},
0
);
}
const
loadFontFace
=
defineAsyncApi
(
API_LOAD_FONT_FACE
,
({
family
,
source
,
desc
},
{
resolve
,
reject
})
=>
{
addFont
(
family
,
source
,
desc
).
then
(()
=>
{
resolve
();
...
...
packages/uni-h5/src/service/api/ui/popup/showToast.ts
浏览文件 @
5f85117a
...
...
@@ -24,11 +24,15 @@ import type {
API_TYPE_HIDE_LOADING
,
API_TYPE_SHOW_TOAST
,
}
from
'
@dcloudio/uni-api
'
import
{
once
}
from
'
@dcloudio/uni-shared
'
//#endregion
let
showToastState
:
ToastProps
let
showType
:
'
onShowToast
'
|
'
onShowLoading
'
|
''
=
''
let
timeoutId
:
number
const
onHidePopupOnce
=
once
(()
=>
{
UniServiceJSBridge
.
on
(
'
onHidePopup
'
,
()
=>
hidePopup
(
'
onHidePopup
'
))
})
function
createToast
(
args
:
ToastProps
)
{
if
(
!
showToastState
)
{
...
...
@@ -56,6 +60,8 @@ function createToast(args: ToastProps) {
timeoutId
&&
clearTimeout
(
timeoutId
)
}
})
onHidePopupOnce
()
}
export
const
showToast
=
defineAsyncApi
<
API_TYPE_SHOW_TOAST
>
(
...
...
@@ -103,7 +109,7 @@ export const hideLoading = defineAsyncApi<API_TYPE_HIDE_LOADING>(
}
)
const
hidePopup
=
(
type
:
'
onHideToast
'
|
'
onHideLoading
'
|
'
onHidePopup
'
)
=>
{
function
hidePopup
(
type
:
'
onHideToast
'
|
'
onHideLoading
'
|
'
onHidePopup
'
)
{
const
{
t
}
=
useI18n
()
if
(
!
showType
)
{
return
...
...
@@ -123,7 +129,3 @@ const hidePopup = (type: 'onHideToast' | 'onHideLoading' | 'onHidePopup') => {
showToastState
.
visible
=
false
},
10
)
}
setTimeout
(()
=>
{
UniServiceJSBridge
.
on
(
'
onHidePopup
'
,
()
=>
hidePopup
(
'
onHidePopup
'
))
},
0
)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录