fix: 🐛 修复DateTimePicker区域选择极值计算错误的问题

Author: xuqingkai

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

@@ -26,7 +26,7 @@ export default {
 
 <script lang="ts" setup>
 import { getCurrentInstance, onBeforeMount, ref, watch } from 'vue'
-import { debounce, getType, isDef, padZero, range } from '../common/util'
+import { debounce, isFunction, isDef, padZero, range } from '../common/util'
 import {
   getPickerValue,
   datetimePickerViewProps,
@@ -78,6 +78,15 @@ const created = ref<boolean>(false)
 
 const { proxy } = getCurrentInstance() as any
 
+defineExpose<DatetimePickerViewExpose>({
+  updateColumns,
+  setColumns,
+  getSelects,
+  correctValue,
+  getPickerValue,
+  getOriginColumns,
+  ...props
+})
 /**
  * @description updateValue 防抖函数的占位符
  */
@@ -120,7 +129,7 @@ watch(
 watch(
   () => props.filter,
   (fn) => {
-    if (fn && getType(fn) !== 'function') {
+    if (fn && !isFunction(fn)) {
       console.error('The type of filter must be Function')
     }
     updateValue()
@@ -131,7 +140,7 @@ watch(
 watch(
   () => props.formatter,
   (fn) => {
-    if (fn && getType(fn) !== 'function') {
+    if (fn && !isFunction(fn)) {
       console.error('The type of formatter must be Function')
     }
     updateValue()
@@ -142,7 +151,7 @@ watch(
 watch(
   () => props.columnFormatter,
   (fn) => {
-    if (fn && getType(fn) !== 'function') {
+    if (fn && !isFunction(fn)) {
       console.error('The type of columnFormatter must be Function')
     }
     updateValue()
@@ -488,15 +497,6 @@ function onPickEnd() {
 function getSelects() {
   return datePickerview.value && datePickerview.value.getSelects ? datePickerview.value.getSelects() : undefined
 }
-
-defineExpose<DatetimePickerViewExpose>({
-  updateColumns,
-  setColumns,
-  getSelects,
-  correctValue,
-  getPickerValue,
-  getOriginColumns
-})
 </script>
 
 <style lang="scss" scoped>

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

@@ -93,7 +93,7 @@
             :label-key="labelKey"
             :formatter="formatter"
             :filter="filter"
-            :column-formatter="getType(modelValue) === 'array' ? customColumnFormatter : undefined"
+            :column-formatter="isArray(modelValue) ? customColumnFormatter : undefined"
             :max-hour="maxHour"
             :min-hour="minHour"
             :max-date="maxDate"
@@ -119,7 +119,7 @@
             :label-key="labelKey"
             :formatter="formatter"
             :filter="filter"
-            :column-formatter="getType(modelValue) === 'array' ? customColumnFormatter : undefined"
+            :column-formatter="isArray(modelValue) ? customColumnFormatter : undefined"
             :max-hour="maxHour"
             :min-hour="minHour"
             :max-date="maxDate"
@@ -150,7 +150,7 @@ export default {
 
 <script lang="ts" setup>
 import { computed, getCurrentInstance, nextTick, onBeforeMount, onMounted, ref, watch } from 'vue'
-import { deepClone, getType, isArray, isDef, isEqual, padZero } from '../common/util'
+import { deepClone, isArray, isDef, isEqual, isFunction, padZero } from '../common/util'
 import { useCell } from '../composables/useCell'
 import {
   getPickerValue,
@@ -191,7 +191,7 @@ watch(
   (val, oldVal) => {
     if (isEqual(val, oldVal)) return
 
-    if (getType(val) === 'array') {
+    if (isArray(val)) {
       region.value = true
       innerValue.value = deepClone(getDefaultInnerValue(true))
       endInnerValue.value = deepClone(getDefaultInnerValue(true, true))
@@ -212,7 +212,7 @@ watch(
 watch(
   () => props.displayFormat,
   (fn) => {
-    if (fn && getType(fn) !== 'function') {
+    if (fn && !isFunction(fn)) {
       console.error('The type of displayFormat must be Function')
     }
   },
@@ -224,7 +224,7 @@ watch(
 watch(
   () => props.filter,
   (fn) => {
-    if (fn && getType(fn) !== 'function') {
+    if (fn && !isFunction(fn)) {
       console.error('The type of filter must be Function')
     }
   },
@@ -236,7 +236,7 @@ watch(
 watch(
   () => props.formatter,
   (fn) => {
-    if (fn && getType(fn) !== 'function') {
+    if (fn && !isFunction(fn)) {
       console.error('The type of formatter must be Function')
     }
   },
@@ -248,7 +248,7 @@ watch(
 watch(
   () => props.beforeConfirm,
   (fn) => {
-    if (fn && getType(fn) !== 'function') {
+    if (fn && !isFunction(fn)) {
       console.error('The type of beforeConfirm must be Function')
     }
   },
@@ -260,7 +260,7 @@ watch(
 watch(
   () => props.displayFormatTabLabel,
   (fn) => {
-    if (fn && getType(fn) !== 'function') {
+    if (fn && !isFunction(fn)) {
       console.error('The type of displayFormatTabLabel must be Function')
     }
   },
@@ -273,7 +273,7 @@ watch(
 watch(
   () => props.defaultValue,
   (val) => {
-    if (getType(val) === 'array' || region.value) {
+    if (isArray(val) || region.value) {
       innerValue.value = deepClone(getDefaultInnerValue(true))
       endInnerValue.value = deepClone(getDefaultInnerValue(true, true))
     } else {
@@ -327,6 +327,7 @@ const customColumnFormatter: DatetimePickerViewColumnFormatter = (picker) => {
   // 校准上下方picker的value值，与内部innerValue对应
   const start = picker.correctValue(innerValue.value)
   const end = picker.correctValue(endInnerValue.value)
+
   /**
    * 如果是上方picekr 那么将下方picker的值作为下边界
    * 如果是下方picekr 那么将上方picker的值作为上边界
@@ -351,7 +352,7 @@ const customColumnFormatter: DatetimePickerViewColumnFormatter = (picker) => {
 
 onBeforeMount(() => {
   const { modelValue: value } = props
-  if (getType(value) === 'array') {
+  if (isArray(value)) {
     region.value = true
     innerValue.value = deepClone(getDefaultInnerValue(true))
     endInnerValue.value = deepClone(getDefaultInnerValue(true, true))
@@ -453,7 +454,6 @@ function onChangeStart({ value }: { value: number | string }) {
     datetimePickerView.value && datetimePickerView.value.setColumns(datetimePickerView.value.updateColumns())
     datetimePickerView1.value && datetimePickerView1.value.setColumns(datetimePickerView1.value.updateColumns())
   } else {
-    // emit('update:modelValue', innerValue.value)
     emit('change', {
       value: innerValue.value
     })
@@ -465,9 +465,7 @@ function onChangeStart({ value }: { value: number | string }) {
  */
 function onChangeEnd({ value }: { value: number | string }) {
   endInnerValue.value = deepClone(value)
-
   showTabLabel.value = [deepClone(showTabLabel.value[0]), setTabLabel(1)]
-  // emit('update:modelValue', [innerValue.value, value])
   emit('change', {
     value: [innerValue.value, value]
   })

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

@@ -117,7 +117,7 @@ export default {
 <script lang="ts" setup>
 import { getCurrentInstance, onBeforeMount, ref, watch, nextTick, computed } from 'vue'
 import { useCell } from '../composables/useCell'
-import { getRect, getType, isArray, isDef, requestAnimationFrame } from '../common/util'
+import { getRect, isArray, isDef, isFunction, requestAnimationFrame } from '../common/util'
 import { useParent } from '../composables/useParent'
 import { FORM_KEY, type FormItemRule } from '../wd-form/types'
 import { useTranslate } from '../composables/useTranslate'
@@ -194,7 +194,7 @@ watch(
 watch(
   () => props.displayFormat,
   (fn) => {
-    if (fn && getType(fn) !== 'function') {
+    if (fn && !isFunction(fn)) {
       console.error('The type of displayFormat must be Function')
     }
   },
@@ -207,7 +207,7 @@ watch(
 watch(
   () => props.beforeConfirm,
   (fn) => {
-    if (fn && getType(fn) !== 'function') {
+    if (fn && !isFunction(fn)) {
       console.error('The type of beforeConfirm must be Function')
     }
   },