mali-applet-ui 0.2.52 → 0.2.54
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.
|
@@ -69,7 +69,7 @@ export default {
|
|
|
69
69
|
let startStr = ''
|
|
70
70
|
let enStr = ''
|
|
71
71
|
if (this.selectType === 5) {
|
|
72
|
-
this.$emit('dateType', this.selectType)
|
|
72
|
+
this.$emit('update:dateType', this.selectType)
|
|
73
73
|
return
|
|
74
74
|
}
|
|
75
75
|
if (this.selectType !== null) {
|
|
@@ -98,7 +98,7 @@ export default {
|
|
|
98
98
|
this.selectVal = ''
|
|
99
99
|
}
|
|
100
100
|
this.selectDates = startStr && enStr ? [startStr, enStr] : []
|
|
101
|
-
this.$emit('dateType', this.selectType)
|
|
101
|
+
this.$emit('update:dateType', this.selectType)
|
|
102
102
|
this.$emit('update:startDate', startStr)
|
|
103
103
|
this.$emit('update:endDate', enStr)
|
|
104
104
|
this.$emit('change', { startDate: startStr, endDate: enStr })
|
|
@@ -107,7 +107,7 @@ export default {
|
|
|
107
107
|
const [startDate, endDate] = value
|
|
108
108
|
if (!startDate || !endDate) {
|
|
109
109
|
this.selectType = 5
|
|
110
|
-
this.$emit('dateType', this.selectType)
|
|
110
|
+
this.$emit('update:dateType', this.selectType)
|
|
111
111
|
}
|
|
112
112
|
this.$emit('update:startDate', startDate || '')
|
|
113
113
|
this.$emit('update:endDate', endDate || '')
|
|
@@ -3,7 +3,10 @@
|
|
|
3
3
|
<view v-if="visible" class="ml-modal-warpper" @tap.stop.prevent>
|
|
4
4
|
<view v-if="showHeader" class="ml-modal-header">
|
|
5
5
|
<slot name="header">
|
|
6
|
-
<view
|
|
6
|
+
<view class="ml-modal-header-title">{{ title }}</view>
|
|
7
|
+
<view v-if="showClose" class="ml-modal-header-close" @click="closeEvent">
|
|
8
|
+
<ml-icon name="close" />
|
|
9
|
+
</view>
|
|
7
10
|
</slot>
|
|
8
11
|
</view>
|
|
9
12
|
<view class="ml-modal-body" :style="bodyStyles">
|
|
@@ -34,6 +37,10 @@ export default {
|
|
|
34
37
|
default: true
|
|
35
38
|
},
|
|
36
39
|
showFooter: Boolean,
|
|
40
|
+
showClose: {
|
|
41
|
+
type: Boolean,
|
|
42
|
+
default: true
|
|
43
|
+
},
|
|
37
44
|
maskClosable: {
|
|
38
45
|
type: Boolean,
|
|
39
46
|
default: true
|
|
@@ -101,6 +108,9 @@ export default {
|
|
|
101
108
|
this.close()
|
|
102
109
|
}
|
|
103
110
|
},
|
|
111
|
+
closeEvent () {
|
|
112
|
+
this.close()
|
|
113
|
+
},
|
|
104
114
|
cancelEvent () {
|
|
105
115
|
if (this.cancelClosable) {
|
|
106
116
|
this.close()
|
|
@@ -150,14 +160,25 @@ export default {
|
|
|
150
160
|
font-size: $uni-font-size-lg;
|
|
151
161
|
}
|
|
152
162
|
.ml-modal-header-title {
|
|
163
|
+
flex-grow: 1;
|
|
153
164
|
text-align: center;
|
|
154
165
|
overflow: hidden;
|
|
155
166
|
text-overflow: ellipsis;
|
|
156
167
|
white-space: nowrap;
|
|
157
168
|
}
|
|
169
|
+
.ml-modal-header-close {
|
|
170
|
+
flex-shrink: 0;
|
|
171
|
+
padding-left: 10rpx;
|
|
172
|
+
font-size: 36rpx;
|
|
173
|
+
}
|
|
158
174
|
.ml-modal-body {
|
|
159
175
|
padding: 20rpx;
|
|
176
|
+
// #ifdef MP
|
|
160
177
|
width: 600rpx;
|
|
178
|
+
// #endif
|
|
179
|
+
// #ifdef H5
|
|
180
|
+
min-width: 600rpx;
|
|
181
|
+
// #endif
|
|
161
182
|
overflow: auto;
|
|
162
183
|
max-height: 600rpx;
|
|
163
184
|
}
|