mali-applet-ui 0.1.80 → 0.1.82
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -41,6 +41,7 @@ export default {
|
|
|
41
41
|
<style lang="scss">
|
|
42
42
|
.ml-col {
|
|
43
43
|
white-space: normal;
|
|
44
|
+
word-break: keep-all;
|
|
44
45
|
$spans: 4.16667%, 8.33333%, 12.5%, 16.66667%, 20.83333%, 25%, 29.16667%, 33.33333%,
|
|
45
46
|
37.5%, 41.66667%, 45.83333%, 50%, 54.16667%, 58.33333%, 62.5%, 66.66667%,
|
|
46
47
|
70.83333%, 75%, 79.16667%, 83.33333%, 87.5%, 91.66667%, 95.83333%, 100%;
|
|
@@ -116,7 +116,7 @@ export default {
|
|
|
116
116
|
padding: 20rpx 4rpx;
|
|
117
117
|
}
|
|
118
118
|
.ml-input-inp {
|
|
119
|
-
padding: 0
|
|
119
|
+
padding: 0 10rpx;
|
|
120
120
|
height: 70rpx;
|
|
121
121
|
width: 100%;
|
|
122
122
|
font-size: $uni-font-size-base;
|
|
@@ -139,7 +139,7 @@ export default {
|
|
|
139
139
|
align-items: center;
|
|
140
140
|
justify-content: center;
|
|
141
141
|
border: 1px solid #e5e5e5;
|
|
142
|
-
font-size:
|
|
142
|
+
font-size: 34rpx;
|
|
143
143
|
padding: 0 10rpx;
|
|
144
144
|
color: rgba(0, 0, 0, 0.4);
|
|
145
145
|
}
|
package/modal/modal.js
CHANGED
|
@@ -2,14 +2,19 @@ const MaliModal = {
|
|
|
2
2
|
open (option = {}) {
|
|
3
3
|
return new Promise(resolve => {
|
|
4
4
|
uni.showModal({
|
|
5
|
-
title: option.title || '系统提示',
|
|
6
|
-
content: option.content || '',
|
|
7
5
|
...option,
|
|
6
|
+
content: option.content || '',
|
|
7
|
+
title: option.title || '系统提示',
|
|
8
|
+
showCancel: option.showCancelButton || false,
|
|
9
|
+
confirmText: option.confirmButtonText || '确认',
|
|
10
|
+
cancelText: option.cancelButtonText || '取消',
|
|
8
11
|
success (res) {
|
|
9
12
|
if (res.confirm) {
|
|
10
13
|
resolve('confirm')
|
|
11
14
|
} else if (res.cancel) {
|
|
12
15
|
resolve('cancel')
|
|
16
|
+
} else {
|
|
17
|
+
resolve()
|
|
13
18
|
}
|
|
14
19
|
}
|
|
15
20
|
})
|
|
@@ -20,6 +25,8 @@ const MaliModal = {
|
|
|
20
25
|
uni.showModal({
|
|
21
26
|
title: option.title || '系统提示',
|
|
22
27
|
content: option.content || '',
|
|
28
|
+
showCancel: false,
|
|
29
|
+
confirmText: option.confirmButtonText || '确认',
|
|
23
30
|
success () {
|
|
24
31
|
resolve('confirm')
|
|
25
32
|
}
|
|
@@ -32,11 +39,15 @@ const MaliModal = {
|
|
|
32
39
|
title: option.title || '系统提示',
|
|
33
40
|
content: option.content || '',
|
|
34
41
|
showCancel: true,
|
|
42
|
+
confirmText: option.confirmButtonText || '确认',
|
|
43
|
+
cancelText: option.cancelButtonText || '取消',
|
|
35
44
|
success (res) {
|
|
36
45
|
if (res.confirm) {
|
|
37
46
|
resolve('confirm')
|
|
38
47
|
} else if (res.cancel) {
|
|
39
48
|
resolve('cancel')
|
|
49
|
+
} else {
|
|
50
|
+
resolve()
|
|
40
51
|
}
|
|
41
52
|
}
|
|
42
53
|
})
|