File tree Expand file tree Collapse file tree 11 files changed +66
-54
lines changed Expand file tree Collapse file tree 11 files changed +66
-54
lines changed Original file line number Diff line number Diff line change 20
20
</modal >
21
21
<modal
22
22
visible =" {{isCustomBtnModalShow}}"
23
- content =" 人在天边月上明,风初紧,吹入画帘旌 "
23
+ content =" 人在天边月上明"
24
24
mainButtonText =" 在线阅读"
25
25
addonButtonText =" 下载文件"
26
26
maskClosable =" {{false}}"
29
29
</modal >
30
30
<modal
31
31
visible =" {{isMainBtnModalShow}}"
32
- content =" 人在天边月上明,风初紧,吹入画帘旌 "
32
+ content =" 人在天边月上明"
33
33
mainButtonText =" 在线阅读"
34
34
addonButtonText =" "
35
35
maskClosable =" {{false}}"
Original file line number Diff line number Diff line change 3
3
visible =" {{visible}}"
4
4
maskClosable =" {{maskClosable}}"
5
5
duration =" {{duration}}"
6
+ disableScroll =" {{disableScroll}}"
7
+ animation =" {{animation}}"
8
+ zIndex =" {{zIndex}}"
6
9
onClose =" onClose" >
7
10
<view class =" amd-dialog-content" >
8
11
<view class =" amd-dialog-content-image-container" >
9
- <image class =" amd-dialog-content-image amd-dialog-content-image-{{imageSize}}"
10
- src =" {{image}}"
11
- a : if =" {{image}}" />
12
+ <image class =" amd-dialog-content-image amd-dialog-content-image-{{imageSize}}"
13
+ src =" {{image}}"
14
+ a : if =" {{image}}"
15
+ />
12
16
</view >
13
17
<view class =" amd-dialog-content-title" >
14
18
{{title}}
Original file line number Diff line number Diff line change 48
48
}
49
49
& :empty ~ .amd-dialog-content-content {
50
50
margin-bottom : 5 * @rpx ;
51
- margin-top : 16 * @rpx ;
51
+ margin-top : 40 * @rpx ;
52
52
}
53
53
}
54
54
Original file line number Diff line number Diff line change @@ -27,6 +27,9 @@ toc: false
27
27
| visible | boolean | 是 | false | 是否可见,受控模式 |
28
28
| duration | number | 否 | 300 | 过渡动画时长,单位毫秒 |
29
29
| maskClosable | boolean | 否 | true | 点击蒙层关闭 |
30
+ | disableScroll | boolean | 否 | true | 弹窗展示时,是否禁止页面滚动 |
31
+ | animation | boolean | 否 | true | 是否开启过渡动画 |
32
+ | zIndex | number | 否 | 998 | 弹窗层级 |
30
33
| className | string | 否 | - | 类名 |
31
34
32
35
## 事件
@@ -57,17 +60,17 @@ toc: false
57
60
58
61
59
62
<style >
60
- table th :first-of-type { width : 180px ; }
61
- .__dumi-default-layout-content article table :first-of-type th :nth-of-type (2 ) {
62
- width : 140px
63
- }
64
- .__dumi-default-layout-content article table :first-of-type th :nth-of-type (3 ) {
65
- width : 30px
66
- }
67
- .__dumi-default-layout-content article table :first-of-type th :nth-of-type (4 ) {
68
- width : 50px
69
- }
70
- .__dumi-default-layout-content article table :nth-of-type (4 ) th :first-of-type {
71
- width : 300px
72
- }
63
+ table th :first-of-type { width : 180px ; }
64
+ .__dumi-default-layout-content article table :first-of-type th :nth-of-type (2 ) {
65
+ width : 140px ;
66
+ }
67
+ .__dumi-default-layout-content article table :first-of-type th :nth-of-type (3 ) {
68
+ width : 30px ;
69
+ }
70
+ .__dumi-default-layout-content article table :first-of-type th :nth-of-type (4 ) {
71
+ width : 50px ;
72
+ }
73
+ .__dumi-default-layout-content article table :nth-of-type (4 ) th :first-of-type {
74
+ width : 300px ;
75
+ }
73
76
</style >
Original file line number Diff line number Diff line change 1
1
<import-sjs name =" icon"
2
2
from =' ./index.sjs' />
3
3
<text class =" amd-icon amd-icon-{{type}} {{icon.getSize(size)}} {{className ? className : ''}}"
4
- style =" {{color ? `color: ${color};` : ''}}"
4
+ style =" {{color ? `color: ${color};` : ''}} {{fontSize ? `font-size: ${fontSize};`: ''}} "
5
5
onTap =" onTap" >
6
6
</text >
Original file line number Diff line number Diff line change @@ -23,6 +23,7 @@ toc: false
23
23
| type | string | 是 | "" | icon 图标的类型 |
24
24
| size | 'x-small' &verbar ; 'small' &verbar ; 'medium' &verbar ; 'large' &verbar ; 'x-large' | 否 | "medium" | icon 的大小,x-small(16)、small(32)、medium(48)、large(64)、x-large(128), |
25
25
| color | string | 否 | - | icon 的颜色,即 CSS 中 color 属性的值 |
26
+ | fontSize | string | 否 | - | icon 的大小 |
26
27
| className | string | 否 | - | 类名 |
27
28
28
29
## 事件
@@ -37,15 +38,15 @@ toc: false
37
38
| amd-icon | 整体样式 |
38
39
39
40
<style >
40
- table th :first-of-type { width : 180px ; }
41
- .__dumi-default-layout-content article table :first-of-type th :nth-of-type (2 ) {
42
- width : 140px
43
- }
44
- .__dumi-default-layout-content article table :first-of-type th :nth-of-type (3 ) {
45
- width : 30px
46
- }
47
- .__dumi-default-layout-content article table :first-of-type th :nth-of-type (4 ) {
48
- width : 50px
49
- }
41
+ table th :first-of-type { width : 180px ; }
42
+ .__dumi-default-layout-content article table :first-of-type th :nth-of-type (2 ) {
43
+ width : 140px ;
44
+ }
45
+ .__dumi-default-layout-content article table :first-of-type th :nth-of-type (3 ) {
46
+ width : 30px ;
47
+ }
48
+ .__dumi-default-layout-content article table :first-of-type th :nth-of-type (4 ) {
49
+ width : 50px ;
50
+ }
50
51
51
52
</style >
Original file line number Diff line number Diff line change 3
3
visible =" {{visible}}"
4
4
duration =" {{duration}}"
5
5
maskClosable =" {{maskClosable}}"
6
+ disableScroll =" {{disableScroll}}"
7
+ animation =" {{animation}}"
8
+ zIndex =" {{zIndex}}"
6
9
onClose =" onClose" >
7
10
<view class =" amd-modal-content" >
8
11
<view class =" amd-modal-content-image-container" >
Original file line number Diff line number Diff line change @@ -29,6 +29,9 @@ toc: false
29
29
| mainButtonText | string | 否 | '主操作' | 主按钮 |
30
30
| addonButtonText | string | 否 | '辅助操作' | 辅助按钮,第二个按钮 |
31
31
| maskClosable | boolean | 否 | true | 点击蒙层关闭 |
32
+ | disableScroll | boolean | 否 | true | 弹窗展示时,是否禁止页面滚动 |
33
+ | animation | boolean | 否 | true | 是否开启过渡动画 |
34
+ | zIndex | number | 否 | 998 | 弹窗层级 |
32
35
| className | string | 否 | - | 类名 |
33
36
34
37
## 事件
@@ -58,17 +61,17 @@ toc: false
58
61
| amd-modal-close | close 图标样式 |
59
62
60
63
<style >
61
- table th :first-of-type { width : 180px ; }
62
- .__dumi-default-layout-content article table :first-of-type th :nth-of-type (2 ) {
63
- width : 140px
64
- }
65
- .__dumi-default-layout-content article table :first-of-type th :nth-of-type (3 ) {
66
- width : 30px
67
- }
68
- .__dumi-default-layout-content article table :first-of-type th :nth-of-type (4 ) {
69
- width : 50px
70
- }
71
- .__dumi-default-layout-content article table :nth-of-type (4 ) th :first-of-type {
72
- width : 300px
73
- }
64
+ table th :first-of-type { width : 180px ; }
65
+ .__dumi-default-layout-content article table :first-of-type th :nth-of-type (2 ) {
66
+ width : 140px ;
67
+ }
68
+ .__dumi-default-layout-content article table :first-of-type th :nth-of-type (3 ) {
69
+ width : 30px ;
70
+ }
71
+ .__dumi-default-layout-content article table :first-of-type th :nth-of-type (4 ) {
72
+ width : 50px ;
73
+ }
74
+ .__dumi-default-layout-content article table :nth-of-type (4 ) th :first-of-type {
75
+ width : 300px ;
76
+ }
74
77
</style >
Original file line number Diff line number Diff line change 13
13
onTouchMove =" {{disableScroll && supportSjs ? _sjs.enableScrollEvent : ''}}"
14
14
>
15
15
<view class =" amd-popup-close-container" a : if =" {{showCloseIcon}}" >
16
- <icon type =" CloseOutline" size = " x-small " onTap =" onClose" />
16
+ <icon type =" CloseOutline" onTap =" onClose" />
17
17
</view >
18
18
<view >
19
19
<slot />
Original file line number Diff line number Diff line change 19
19
justify-content : center ;
20
20
right : 24 * @rpx ;
21
21
.amd-icon {
22
- font-size : 26 * @rpx ;
22
+ font-size : 36 * @rpx ;
23
23
display : flex ;
24
24
align-items : center ;
25
25
justify-content : center ;
You can’t perform that action at this time.
0 commit comments