alighasami/vant
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'dev' into next

Browse Source
This commit is contained in:
chenjiahan
2020-07-25 15:50:49 +08:00
parent 5879abbaf9 5c5761fc86
commit 73d538be05
109 changed files with 1699 additions and 744 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/action-sheet/index.js
+1 -1
View File
@@ -120,7 +120,7 @@ export default createComponent({
function OptionContent() {
if (loading) {
return <Loading size="20px" />;
return <Loading class={bem('loading-icon')} />;
}
return [
src/action-sheet/index.less
+9
View File
@@ -41,6 +41,10 @@
}
}
&__cancel {
color: @action-sheet-cancel-text-color;
}
&__subname {
margin-top: @padding-xs;
color: @action-sheet-subname-color;
@@ -74,6 +78,11 @@
}
}
&__loading-icon .van-loading__spinner {
width: @action-sheet-loading-icon-size;
height: @action-sheet-loading-icon-size;
}
&__close {
position: absolute;
top: 0;
src/action-sheet/test/__snapshots__/index.spec.js.snap
+1 -1
View File
@@ -2,7 +2,7 @@
exports[`callback events 1`] = `
<div class="van-popup van-popup--round van-popup--bottom van-popup--safe-area-inset-bottom van-action-sheet" name="van-popup-slide-bottom"><button type="button" class="van-action-sheet__item"><span class="van-action-sheet__name">Option</span></button><button type="button" class="van-action-sheet__item van-action-sheet__item--disabled"><span class="van-action-sheet__name">Option</span></button><button type="button" class="van-action-sheet__item van-action-sheet__item--loading">
<div class="van-loading van-loading--circular"><span class="van-loading__spinner van-loading__spinner--circular" style="width: 20px; height: 20px;"><svg viewBox="25 25 50 50" class="van-loading__circular"><circle cx="50" cy="50" r="20" fill="none"></circle></svg></span></div>
<div class="van-loading van-loading--circular van-action-sheet__loading-icon"><span class="van-loading__spinner van-loading__spinner--circular"><svg viewBox="25 25 50 50" class="van-loading__circular"><circle cx="50" cy="50" r="20" fill="none"></circle></svg></span></div>
</button><button type="button" class="van-action-sheet__item"><span class="van-action-sheet__name">Option</span>
<div class="van-action-sheet__subname">Subname</div></button>
<div class="van-action-sheet__gap"></div><button type="button" class="van-action-sheet__cancel">Cancel</button>