@@ -123,7 +123,7 @@ watch(
123123 console .error (' The type of displayFormat must be Function' )
124124 }
125125 if (pickerViewWd .value && pickerViewWd .value .selectedIndex && pickerViewWd .value .selectedIndex .length !== 0 ) {
126- if (isDef (props .modelValue )) {
126+ if (isDef (props .modelValue ) && props . modelValue !== ' ' ) {
127127 setShowValue (pickerViewWd .value .getSelects ())
128128 } else {
129129 showValue .value = ' '
@@ -141,13 +141,13 @@ watch(
141141 (newValue ) => {
142142 pickerValue .value = newValue
143143 // 获取初始选中项,并展示初始选中文案
144- if (isDef (newValue )) {
144+ if (isDef (newValue ) && newValue !== ' ' ) {
145145 if (pickerViewWd .value && pickerViewWd .value .getSelects ) {
146146 nextTick (() => {
147147 setShowValue (pickerViewWd .value ! .getSelects ())
148148 })
149149 } else {
150- setShowValue (getSelects (props . modelValue )! )
150+ setShowValue (getSelects (newValue )! )
151151 }
152152 } else {
153153 showValue .value = ' '
@@ -165,7 +165,7 @@ watch(
165165 displayColumns .value = newValue
166166 resetColumns .value = newValue
167167 // 获取初始选中项,并展示初始选中文案
168- if (isDef (props .modelValue )) {
168+ if (isDef (props .modelValue ) && props . modelValue !== ' ' ) {
169169 if (pickerViewWd .value && pickerViewWd .value .getSelects ) {
170170 nextTick (() => {
171171 setShowValue (pickerViewWd .value ! .getSelects ())
@@ -226,8 +226,8 @@ const { proxy } = getCurrentInstance() as any
226226const emit = defineEmits ([' confirm' , ' open' , ' cancel' , ' update:modelValue' ])
227227
228228onMounted (() => {
229- isDef (props .modelValue ) && setShowValue (getSelects (props .modelValue )! )
230- if (isDef (props .modelValue ) && pickerViewWd .value && pickerViewWd .value .getSelects ) {
229+ isDef (props .modelValue ) && props . modelValue !== ' ' && setShowValue (getSelects (props .modelValue )! )
230+ if (isDef (props .modelValue ) && props . modelValue !== ' ' && pickerViewWd .value && pickerViewWd .value .getSelects ) {
231231 setShowValue (pickerViewWd .value ! .getSelects ())
232232 }
233233})
@@ -246,10 +246,8 @@ function getSelects(value: string | number | Array<string | number | Array<any>>
246246 if (props .columns .length === 0 ) return
247247
248248 // 使其默认选中首项
249- if (value === ' ' || value === null || value === undefined || (isArray (value ) && value .length === 0 )) {
250- value = formatColumns .map ((col ) => {
251- return col [0 ][props .valueKey ]
252- })
249+ if (value === ' ' || ! isDef (value ) || (isArray (value ) && value .length === 0 )) {
250+ return
253251 }
254252 const valueType = getType (value )
255253 const type = [' string' , ' number' , ' boolean' , ' array' ]
0 commit comments