releases 4.1.27

x-extends · Sep 12, 2024 · 6f6aed5 · 6f6aed5
1 parent 5753ab0
commit 6f6aed5
Show file tree

Hide file tree

Showing 5 changed files with 89 additions and 83 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vxe-pc-ui",
-  "version": "4.1.26",
+  "version": "4.1.27",
   "description": "A vue based PC component library",
   "scripts": {
     "update": "npm install --legacy-peer-deps",

diff --git a/packages/date-picker/src/date-picker.ts b/packages/date-picker/src/date-picker.ts
@@ -329,9 +329,8 @@ export default defineComponent({
     const computeDateLabelFormat = computed(() => {
       const { labelFormat } = props
       const isDatePickerType = computeIsDatePickerType.value
-      const dateValueFormat = computeDateValueFormat.value
       if (isDatePickerType) {
-        return labelFormat || dateValueFormat || getI18n(`vxe.input.date.labelFormat.${props.type}`)
+        return labelFormat || getI18n(`vxe.input.date.labelFormat.${props.type}`)
       }
       return null
     })
@@ -1520,6 +1519,38 @@ export default defineComponent({
       }
     }
 
+    const dispatchEvent = (type: ValueOf<VxeDatePickerEmits>, params: Record<string, any>, evnt: Event | null) => {
+      emit(type, createEvent(evnt, { $datePicker: $xeDatePicker }, params))
+    }
+
+    datePickerMethods = {
+      dispatchEvent,
+
+      focus () {
+        const inputElem = refInputTarget.value
+        reactData.isActivated = true
+        inputElem.focus()
+        return nextTick()
+      },
+      blur () {
+        const inputElem = refInputTarget.value
+        inputElem.blur()
+        reactData.isActivated = false
+        return nextTick()
+      },
+      select () {
+        const inputElem = refInputTarget.value
+        inputElem.select()
+        reactData.isActivated = false
+        return nextTick()
+      },
+      showPanel,
+      hidePanel,
+      updatePlacement
+    }
+
+    Object.assign($xeDatePicker, datePickerMethods)
+
     const renderDateLabel = (item: VxeDatePickerDefines.DateYearItem | VxeDatePickerDefines.DateQuarterItem | VxeDatePickerDefines.DateMonthItem | VxeDatePickerDefines.DateDayItem, label: string | number) => {
       const { festivalMethod } = props
       if (festivalMethod) {
@@ -2044,81 +2075,6 @@ export default defineComponent({
       ])
     }
 
-    const dispatchEvent = (type: ValueOf<VxeDatePickerEmits>, params: Record<string, any>, evnt: Event | null) => {
-      emit(type, createEvent(evnt, { $datePicker: $xeDatePicker }, params))
-    }
-
-    datePickerMethods = {
-      dispatchEvent,
-
-      focus () {
-        const inputElem = refInputTarget.value
-        reactData.isActivated = true
-        inputElem.focus()
-        return nextTick()
-      },
-      blur () {
-        const inputElem = refInputTarget.value
-        inputElem.blur()
-        reactData.isActivated = false
-        return nextTick()
-      },
-      select () {
-        const inputElem = refInputTarget.value
-        inputElem.select()
-        reactData.isActivated = false
-        return nextTick()
-      },
-      showPanel,
-      hidePanel,
-      updatePlacement
-    }
-
-    Object.assign($xeDatePicker, datePickerMethods)
-
-    watch(() => props.modelValue, (val) => {
-      reactData.inputValue = val
-      changeValue()
-    })
-
-    watch(() => props.type, () => {
-      // 切换类型是重置内置变量
-      Object.assign(reactData, {
-        inputValue: props.modelValue,
-        datetimePanelValue: null,
-        datePanelValue: null,
-        datePanelLabel: '',
-        datePanelType: 'day',
-        selectMonth: null,
-        currentDate: null
-      })
-      initValue()
-    })
-
-    watch(computeDateLabelFormat, () => {
-      const isDatePickerType = computeIsDatePickerType.value
-      if (isDatePickerType) {
-        dateParseValue(reactData.datePanelValue)
-        reactData.inputValue = props.multiple ? computeDateMultipleLabel.value : reactData.datePanelLabel
-      }
-    })
-
-    nextTick(() => {
-      globalEvents.on($xeDatePicker, 'mousewheel', handleGlobalMousewheelEvent)
-      globalEvents.on($xeDatePicker, 'mousedown', handleGlobalMousedownEvent)
-      globalEvents.on($xeDatePicker, 'keydown', handleGlobalKeydownEvent)
-      globalEvents.on($xeDatePicker, 'blur', handleGlobalBlurEvent)
-    })
-
-    onUnmounted(() => {
-      globalEvents.off($xeDatePicker, 'mousewheel')
-      globalEvents.off($xeDatePicker, 'mousedown')
-      globalEvents.off($xeDatePicker, 'keydown')
-      globalEvents.off($xeDatePicker, 'blur')
-    })
-
-    initValue()
-
     const renderVN = () => {
       const { className, type, align, name, autocomplete, autoComplete } = props
       const { inputValue, visiblePanel, isActivated } = reactData
@@ -2181,6 +2137,49 @@ export default defineComponent({
       ])
     }
 
+    watch(() => props.modelValue, (val) => {
+      reactData.inputValue = val
+      changeValue()
+    })
+
+    watch(() => props.type, () => {
+      // 切换类型是重置内置变量
+      Object.assign(reactData, {
+        inputValue: props.modelValue,
+        datetimePanelValue: null,
+        datePanelValue: null,
+        datePanelLabel: '',
+        datePanelType: 'day',
+        selectMonth: null,
+        currentDate: null
+      })
+      initValue()
+    })
+
+    watch(computeDateLabelFormat, () => {
+      const isDatePickerType = computeIsDatePickerType.value
+      if (isDatePickerType) {
+        dateParseValue(reactData.datePanelValue)
+        reactData.inputValue = props.multiple ? computeDateMultipleLabel.value : reactData.datePanelLabel
+      }
+    })
+
+    nextTick(() => {
+      globalEvents.on($xeDatePicker, 'mousewheel', handleGlobalMousewheelEvent)
+      globalEvents.on($xeDatePicker, 'mousedown', handleGlobalMousedownEvent)
+      globalEvents.on($xeDatePicker, 'keydown', handleGlobalKeydownEvent)
+      globalEvents.on($xeDatePicker, 'blur', handleGlobalBlurEvent)
+    })
+
+    onUnmounted(() => {
+      globalEvents.off($xeDatePicker, 'mousewheel')
+      globalEvents.off($xeDatePicker, 'mousedown')
+      globalEvents.off($xeDatePicker, 'keydown')
+      globalEvents.off($xeDatePicker, 'blur')
+    })
+
+    initValue()
+
     $xeDatePicker.renderVN = renderVN
 
     return $xeDatePicker

diff --git a/packages/form/render/index.ts b/packages/form/render/index.ts
@@ -47,7 +47,7 @@ function getComponentFormItemProps (renderOpts: any, params: any, value: any, de
  * @param modelFunc
  * @param changeFunc
  */
-function getElementOns (renderOpts: any, params: any, modelFunc?: any, changeFunc?: any) {
+function getNativeElementOns (renderOpts: any, params: any, modelFunc?: any, changeFunc?: any) {
   const { events } = renderOpts
   const modelEvent = getModelEvent(renderOpts.name)
   const changeEvent = getChangeEvent(renderOpts.name)
@@ -136,7 +136,7 @@ function getItemOns (renderOpts: any, params: any) {
 
 function getNativeItemOns (renderOpts: any, params: any) {
   const { $form, data, field } = params
-  return getElementOns(renderOpts, params, (evnt: any) => {
+  return getNativeElementOns(renderOpts, params, (evnt: any) => {
     // 处理 model 值双向绑定
     const itemValue = evnt.target.value
     XEUtils.set(data, field, itemValue)

diff --git a/packages/input/src/input.ts b/packages/input/src/input.ts
@@ -372,7 +372,13 @@ export default defineComponent({
       if (valueFormat) {
         return valueFormat
       }
-      return type === 'time' ? 'HH:mm:ss' : (type === 'datetime' ? 'yyyy-MM-dd HH:mm:ss' : 'yyyy-MM-dd')
+      if (type === 'time') {
+        return 'HH:mm:ss'
+      }
+      if (type === 'datetime') {
+        return 'yyyy-MM-dd HH:mm:ss'
+      }
+      return 'yyyy-MM-dd'
     })
 
     const computeDateValue = computed(() => {
@@ -425,9 +431,8 @@ export default defineComponent({
     const computeDateLabelFormat = computed(() => {
       const { labelFormat } = props
       const isDatePickerType = computeIsDatePickerType.value
-      const dateValueFormat = computeDateValueFormat.value
       if (isDatePickerType) {
-        return labelFormat || dateValueFormat || getI18n(`vxe.input.date.labelFormat.${props.type}`)
+        return labelFormat || getI18n(`vxe.input.date.labelFormat.${props.type}`)
       }
       return ''
     })

diff --git a/packages/ui/src/vn.ts b/packages/ui/src/vn.ts
@@ -10,6 +10,8 @@ export function getModelEvent (name: string) {
     case 'input':
     case 'textarea':
       return 'input'
+    case 'select':
+      return 'change'
   }
   return 'update:modelValue'
 }