mali-applet-ui 1.0.8 → 1.0.10

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.
@@ -236,6 +236,10 @@ export default {
236
236
  }
237
237
  }
238
238
  &.is-border {
239
+ .ml-amount-input-clear-icon {
240
+ border: 1px solid #e5e5e5;
241
+ border-left: 0;
242
+ }
239
243
  .ml-amount-input-inp,
240
244
  .ml-amount-input-simulate {
241
245
  border: 1px solid #e5e5e5;
@@ -278,5 +282,11 @@ export default {
278
282
  color: #c0c4cc;
279
283
  border-radius: 0 $ml-border-radius $ml-border-radius 0;
280
284
  }
285
+ &.is-clear {
286
+ .ml-amount-input-inp {
287
+ padding-right: 0;
288
+ border-right: 0;
289
+ }
290
+ }
281
291
  }
282
292
  </style>
@@ -217,6 +217,10 @@ export default {
217
217
  }
218
218
  &.is-border,
219
219
  &.is-controls {
220
+ .ml-number-input-clear-icon {
221
+ border: 1px solid #e5e5e5;
222
+ border-left: 0;
223
+ }
220
224
  .ml-number-input-inp,
221
225
  .ml-number-input-simulate {
222
226
  border: 1px solid #e5e5e5;
@@ -267,5 +271,11 @@ export default {
267
271
  .ml-number-input-plus-btn {
268
272
  border-left: 0;
269
273
  }
274
+ &.is-clear {
275
+ .ml-number-input-inp {
276
+ padding-right: 0;
277
+ border-right: 0;
278
+ }
279
+ }
270
280
  }
271
281
  </style>
package/modal/modal.js CHANGED
@@ -9,13 +9,16 @@ const MaliModal = {
9
9
  confirmText: option.confirmButtonText || '确认',
10
10
  cancelText: option.cancelButtonText || '取消',
11
11
  success (res) {
12
+ let type
12
13
  if (res.confirm) {
13
- resolve('confirm')
14
+ type = 'confirm'
14
15
  } else if (res.cancel) {
15
- resolve('cancel')
16
- } else {
17
- resolve()
16
+ type = 'cancel'
18
17
  }
18
+ if (option.callback) {
19
+ option.callback(type)
20
+ }
21
+ resolve(type)
19
22
  }
20
23
  })
21
24
  })
@@ -28,7 +31,11 @@ const MaliModal = {
28
31
  showCancel: false,
29
32
  confirmText: option.confirmButtonText || '确认',
30
33
  success () {
31
- resolve('confirm')
34
+ const type = 'confirm'
35
+ if (option.callback) {
36
+ option.callback(type)
37
+ }
38
+ resolve(type)
32
39
  }
33
40
  })
34
41
  })
@@ -42,13 +49,16 @@ const MaliModal = {
42
49
  confirmText: option.confirmButtonText || '确认',
43
50
  cancelText: option.cancelButtonText || '取消',
44
51
  success (res) {
52
+ let type
45
53
  if (res.confirm) {
46
- resolve('confirm')
54
+ type = 'confirm'
47
55
  } else if (res.cancel) {
48
- resolve('cancel')
49
- } else {
50
- resolve()
56
+ type = 'cancel'
57
+ }
58
+ if (option.callback) {
59
+ option.callback(type)
51
60
  }
61
+ resolve(type)
52
62
  }
53
63
  })
54
64
  })
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "mali-applet-ui",
3
- "version": "1.0.8",
3
+ "version": "1.0.10",
4
4
  "description": "码里云小程序组件库",
5
5
  "files": [
6
6
  "lib",