Skip to content

Commit 1859294

Browse files
fix: 🐛 修复 RootPortal 及 Picker 相关组件 type-check 错误的问题
1 parent 44dec5a commit 1859294

6 files changed

Lines changed: 50 additions & 13 deletions

File tree

src/uni_modules/wot-design-uni/components/wd-calendar/wd-calendar.vue

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@
1313
:clickable="!disabled && !readonly"
1414
:value-align="alignRight ? 'right' : 'left'"
1515
:center="center"
16-
:custom-class="`wd-calendar__cell ${disabled && 'is-disabled'} ${readonly && 'is-readonly'} ${error && 'is-error'} ${
17-
!showValue ? 'wd-calendar__cell--placeholder' : ''
18-
}`"
16+
:custom-class="cellClass"
1917
:custom-style="customStyle"
2018
:custom-title-class="customLabelClass"
2119
:custom-value-class="customValueClass"
@@ -263,6 +261,15 @@ const showValue = computed(() => {
263261
}
264262
})
265263
264+
const cellClass = computed(() => {
265+
const classes = ['wd-calendar__cell']
266+
if (props.disabled) classes.push('is-disabled')
267+
if (props.readonly) classes.push('is-readonly')
268+
if (props.error) classes.push('is-error')
269+
if (!showValue.value) classes.push('wd-calendar__cell--placeholder')
270+
return classes.join(' ')
271+
})
272+
266273
watch(
267274
() => props.modelValue,
268275
(val, oldVal) => {

src/uni_modules/wot-design-uni/components/wd-col-picker/wd-col-picker.vue

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111
:rules="rules"
1212
:clickable="!disabled && !readonly"
1313
:value-align="alignRight ? 'right' : 'left'"
14-
:custom-class="`wd-col-picker__cell ${disabled && 'is-disabled'} ${readonly && 'is-readonly'} ${error && 'is-error'} ${
15-
!showValue ? 'wd-col-picker__cell--placeholder' : ''
16-
}`"
14+
:custom-class="cellClass"
1715
:custom-style="customStyle"
1816
:custom-title-class="customLabelClass"
1917
:custom-value-class="customValueClass"
@@ -158,6 +156,15 @@ const showValue = computed(() => {
158156
}
159157
})
160158
159+
const cellClass = computed(() => {
160+
const classes = ['wd-col-picker__cell']
161+
if (props.disabled) classes.push('is-disabled')
162+
if (props.readonly) classes.push('is-readonly')
163+
if (props.error) classes.push('is-error')
164+
if (!showValue.value) classes.push('wd-col-picker__cell--placeholder')
165+
return classes.join(' ')
166+
})
167+
161168
watch(
162169
() => props.modelValue,
163170
(newValue) => {

src/uni_modules/wot-design-uni/components/wd-datetime-picker/wd-datetime-picker.vue

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
:rules="rules"
1111
:clickable="!disabled && !readonly"
1212
:value-align="alignRight ? 'right' : 'left'"
13-
:custom-class="`wd-datetime-picker__cell ${disabled && 'is-disabled'} ${readonly && 'is-readonly'} ${error && 'is-error'}`"
13+
:custom-class="cellClass"
1414
:custom-style="customStyle"
1515
:custom-title-class="customLabelClass"
1616
:custom-value-class="customValueClass"
@@ -196,6 +196,14 @@ const hasConfirmed = ref<boolean>(false) // 判断用户是否点击了确认按
196196
const isLoading = ref<boolean>(false) // 加载
197197
const { proxy } = getCurrentInstance() as any
198198
199+
const cellClass = computed(() => {
200+
const classes = ['wd-datetime-picker__cell']
201+
if (props.disabled) classes.push('is-disabled')
202+
if (props.readonly) classes.push('is-readonly')
203+
if (props.error) classes.push('is-error')
204+
return classes.join(' ')
205+
})
206+
199207
watch(
200208
() => props.modelValue,
201209
(val, oldVal) => {

src/uni_modules/wot-design-uni/components/wd-picker/wd-picker.vue

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@
1616
:rules="rules"
1717
:clickable="!disabled && !readonly"
1818
:value-align="alignRight ? 'right' : 'left'"
19-
:custom-class="`wd-picker__cell ${disabled && 'is-disabled'} ${readonly && 'is-readonly'} ${error && 'is-error'} ${
20-
!showValue ? 'wd-picker__cell--placeholder' : ''
21-
}`"
19+
:custom-class="cellClass"
2220
:custom-style="customStyle"
2321
:custom-title-class="customLabelClass"
2422
:custom-value-class="customValueClass"
@@ -199,6 +197,15 @@ const showArrow = computed(() => {
199197
return !props.disabled && !props.readonly && !showClear.value
200198
})
201199
200+
const cellClass = computed(() => {
201+
const classes = ['wd-picker__cell']
202+
if (props.disabled) classes.push('is-disabled')
203+
if (props.readonly) classes.push('is-readonly')
204+
if (props.error) classes.push('is-error')
205+
if (!showValue.value) classes.push('wd-picker__cell--placeholder')
206+
return classes.join(' ')
207+
})
208+
202209
const { proxy } = getCurrentInstance() as any
203210
204211
onMounted(() => {

src/uni_modules/wot-design-uni/components/wd-root-portal/wd-root-portal.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ export default {
2929
}
3030
}
3131
</script>
32+
<script lang="ts" setup></script>
3233

3334
<!-- #ifdef APP-PLUS -->
3435
<script module="render" lang="renderjs">

src/uni_modules/wot-design-uni/components/wd-select-picker/wd-select-picker.vue

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212
:clickable="!disabled && !readonly"
1313
:value-align="alignRight ? 'right' : 'left'"
1414
:center="center"
15-
:custom-class="`wd-select-picker__cell ${disabled && 'is-disabled'} ${readonly && 'is-readonly'} ${error && 'is-error'} ${
16-
showValue ? '' : 'wd-select-picker__cell--placeholder'
17-
}`"
15+
:custom-class="cellClass"
1816
:custom-style="customStyle"
1917
:custom-title-class="customLabelClass"
2018
:custom-value-class="customValueClass"
@@ -173,6 +171,15 @@ const showValue = computed(() => {
173171
return showValueTemp
174172
})
175173
174+
const cellClass = computed(() => {
175+
const classes = ['wd-select-picker__cell']
176+
if (props.disabled) classes.push('is-disabled')
177+
if (props.readonly) classes.push('is-readonly')
178+
if (props.error) classes.push('is-error')
179+
if (!showValue.value) classes.push('wd-select-picker__cell--placeholder')
180+
return classes.join(' ')
181+
})
182+
176183
watch(
177184
() => props.modelValue,
178185
(newValue) => {

0 commit comments

Comments
 (0)