vxe-pc-ui 3.15.4 → 3.15.6

package/packages/collapse/src/collapse.ts

@@ -1,10 +1,26 @@
 import { CreateElement, PropType, VNode } from 'vue'
 import { defineVxeComponent } from '../../ui/src/comp'
 import { getConfig, getIcon, createEvent, permission, renderEmptyElement, globalMixins } from '../../ui'
+import { toCssUnit } from '../../ui/src/dom'
 import { getSlotVNs } from '../../ui/src/vn'
 import XEUtils from 'xe-utils'
 
-import type { CollapseReactData, VxeCollapseEmits, VxeCollapsePropTypes, VxeCollapsePanePropTypes, VxeCollapsePaneProps, VxeCollapsePaneDefines, VxeComponentSizeType, ValueOf } from '../../../types'
+import type { CollapseReactData, VxeCollapseEmits, CollapseInternalData, VxeCollapsePropTypes, VxeCollapsePanePropTypes, VxeCollapsePaneProps, VxeCollapsePaneDefines, VxeCollapseDefines, VxeComponentSizeType, ValueOf } from '../../../types'
+
+function createReactData (): CollapseReactData {
+  return {
+    staticPanes: [],
+    activeNames: [],
+    initNames: [],
+    cachePaneMaps: {}
+  }
+}
+
+function createInternalData (): CollapseInternalData {
+  return {
+    // esTime: null
+  }
+}
 
 export default /* define-vxe-component start */ defineVxeComponent({
   name: 'VxeCollapse',
@@ -13,12 +29,16 @@ export default /* define-vxe-component start */ defineVxeComponent({
     globalMixins.permissionMixin
   ],
   props: {
-    modelValue: Array as PropType<VxeCollapsePropTypes.ModelValue>,
+    value: Array as PropType<VxeCollapsePropTypes.ModelValue>,
     options: Array as PropType<VxeCollapsePropTypes.Options>,
     padding: {
       type: Boolean as PropType<VxeCollapsePropTypes.Padding>,
       default: () => getConfig().collapse.padding
     },
+    border: {
+      type: Boolean as PropType<VxeCollapsePropTypes.Border>,
+      default: () => getConfig().collapse.border
+    },
     expandConfig: Object as PropType<VxeCollapsePropTypes.ExpandConfig>,
     size: {
       type: String as PropType<VxeCollapsePropTypes.Size>,
@@ -34,13 +54,11 @@ export default /* define-vxe-component start */ defineVxeComponent({
   },
   data () {
     const xID = XEUtils.uniqueId()
-    const reactData: CollapseReactData = {
-      staticPanes: [],
-      activeNames: [],
-      initNames: [],
-      cachePaneMaps: {}
-    }
+    const reactData = createReactData()
     return {
+      ...({} as {
+        internalData: CollapseInternalData
+      }),
       xID,
       reactData
     }
@@ -58,16 +76,22 @@ export default /* define-vxe-component start */ defineVxeComponent({
     },
     computeItemStaticOptions (this: any) {
       const $xeCollapse = this
-      const reactData = $xeCollapse.reactData
+      const reactData = $xeCollapse.reactData as CollapseReactData
 
       const { staticPanes } = reactData
-      return staticPanes.filter((item: any) => $xeCollapse.handleFilterItem(item))
+      return staticPanes.filter((item) => $xeCollapse.handleFilterItem(item))
     },
     computeExpandOpts () {
       const $xeCollapse = this
       const props = $xeCollapse
 
       return Object.assign({}, getConfig().collapse.expandConfig, props.expandConfig)
+    },
+    computeSpFlag () {
+      const $xeCollapse = this
+      const reactData = $xeCollapse.reactData as CollapseReactData
+
+      return reactData.staticPanes
     }
   },
   methods: {
@@ -104,15 +128,14 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const reactData = $xeCollapse.reactData
 
       const { activeNames } = reactData
-      const nameMaps: Record<string, {
-        loading: boolean
-      }> = {}
+      const nameMaps: Record<string, VxeCollapseDefines.CacheItemObj> = {}
       if (list && list.length) {
         list.forEach((item) => {
           const { name, preload } = item || {}
           if (name) {
             const isActive = activeNames.includes(name)
             nameMaps[`${name}`] = {
+              height: 0,
               loading: false
             }
             if (isActive) {
@@ -146,10 +169,13 @@ export default /* define-vxe-component start */ defineVxeComponent({
     handleClickEvent (evnt: MouseEvent, item: VxeCollapsePaneDefines.CollapseConfig | VxeCollapsePaneProps) {
       const $xeCollapse = this
       const reactData = $xeCollapse.reactData
+      const internalData = $xeCollapse.internalData
 
       const { activeNames } = reactData
       const { name } = item
       if (name) {
+        const headEl = evnt.currentTarget as HTMLDivElement
+        const bodyEl = headEl.nextElementSibling as HTMLDivElement
         const aIndex = activeNames.indexOf(name)
         let expanded = false
         if (aIndex === -1) {
@@ -158,6 +184,33 @@ export default /* define-vxe-component start */ defineVxeComponent({
         } else {
           activeNames.splice(aIndex, 1)
         }
+        const startAnimation = () => {
+          const itemEl = bodyEl.firstElementChild as HTMLDivElement
+          if (itemEl) {
+            bodyEl.style.height = toCssUnit(itemEl.scrollHeight)
+            if (expanded) {
+              internalData.esTime = setTimeout(() => {
+                bodyEl.style.height = ''
+                internalData.esTime = undefined
+              }, 200)
+            } else {
+              $xeCollapse.$nextTick(() => {
+                requestAnimationFrame(() => {
+                  bodyEl.style.height = ''
+                })
+              })
+            }
+          }
+        }
+        if (bodyEl) {
+          const itemEl = bodyEl.firstElementChild as HTMLDivElement
+          if (itemEl) {
+            startAnimation()
+          } else {
+            bodyEl.style.height = '0'
+            $xeCollapse.$nextTick(startAnimation)
+          }
+        }
         $xeCollapse.addInitName(name)
         $xeCollapse.dispatchEvent('change', { value: activeNames, name }, evnt)
         $xeCollapse.dispatchEvent('toggle-expand', { value: activeNames, name, expanded }, evnt)
@@ -213,7 +266,8 @@ export default /* define-vxe-component start */ defineVxeComponent({
           ]),
           h('div', {
             class: ['vxe-collapse--item-content', {
-              'is--visible': isActive
+              'is--visible': isActive,
+              'is--hidden': !isActive
             }]
           }, [
             name && initNames.includes(name)
@@ -232,7 +286,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const props = $xeCollapse
       const slots = $xeCollapse.$scopedSlots
 
-      const { padding } = props
+      const { padding, border } = props
       const vSize = $xeCollapse.computeSize
       const itemOptions = $xeCollapse.computeItemOptions
       const itemStaticOptions = $xeCollapse.computeItemStaticOptions
@@ -243,7 +297,8 @@ export default /* define-vxe-component start */ defineVxeComponent({
         ref: 'refElem',
         class: ['vxe-collapse', {
           [`size--${vSize}`]: vSize,
-          'is--padding': padding
+          'is--padding': padding,
+          'is--border': border
         }]
       }, [
         h('div', {
@@ -253,6 +308,47 @@ export default /* define-vxe-component start */ defineVxeComponent({
       ])
     }
   },
+  watch: {
+    value (val) {
+      const $xeCollapse = this
+      const reactData = $xeCollapse.reactData
+
+      reactData.activeNames = val || []
+    },
+    options () {
+      const $xeCollapse = this
+      const props = $xeCollapse
+
+      $xeCollapse.initDefaultName(props.options)
+    },
+    computeSpFlag () {
+      const $xeCollapse = this
+      const reactData = $xeCollapse.reactData
+
+      $xeCollapse.initDefaultName(reactData.staticPanes)
+    }
+  },
+  created () {
+    const $xeCollapse = this
+    const props = $xeCollapse
+    const reactData = $xeCollapse.reactData
+
+    $xeCollapse.internalData = createInternalData()
+    reactData.activeNames = props.value || []
+    $xeCollapse.initDefaultName(reactData.staticPanes.length ? reactData.staticPanes : props.options)
+  },
+  destroyed () {
+    const $xeCollapse = this
+    const reactData = $xeCollapse.reactData
+    const internalData = $xeCollapse.internalData
+
+    const { esTime } = internalData
+    if (esTime) {
+      clearTimeout(esTime)
+    }
+    XEUtils.assign(reactData, createReactData())
+    XEUtils.assign(internalData, createInternalData())
+  },
   render (this: any, h) {
     return this.renderVN(h)
   }

package/packages/date-panel/src/util.ts

@@ -267,3 +267,21 @@ export function isAllSameChar (str: string, char: string) {
   }
   return true
 }
+
+export function checkDateFormat (numStr:number, formatKey: string) {
+  const numVal = XEUtils.toNumber(numStr)
+  switch (formatKey) {
+    case 'yyyy':
+      return (numVal >= 9999 ? 9999 : (numVal < 1 ? 1 : numVal))
+    case 'MM':
+      return (numVal >= 12 ? 12 : (numVal < 1 ? 1 : numVal))
+    case 'dd':
+      return (numVal >= 31 ? 31 : (numVal < 1 ? 1 : numVal))
+
+    case 'HH':
+    case 'mm':
+    case 'ss':
+      return (numVal >= 59 ? 59 : (numVal <= 0 ? 0 : numVal))
+  }
+  return numVal
+}

package/packages/date-picker/src/date-picker.ts

@@ -5,7 +5,7 @@ import { getConfig, getIcon, getI18n, commands, createEvent, globalEvents, GLOBA
 import { getFuncText, getLastZIndex, nextZIndex, isEnableConf } from '../../ui/src/utils'
 import { updatePanelPlacement, getEventTargetNode, hasControlKey } from '../../ui/src/dom'
 import { getSlotVNs } from '../../ui/src/vn'
-import { parseDateObj, parseDateValue, getDateByCode, handleValueFormat, hasDateValueType, hasTimestampValueType, isAllSameChar, getChunkDefaultNum } from '../../date-panel/src/util'
+import { parseDateObj, parseDateValue, getDateByCode, handleValueFormat, hasDateValueType, hasTimestampValueType, isAllSameChar, getChunkDefaultNum, checkDateFormat } from '../../date-panel/src/util'
 import { createComponentLog } from '../../ui/src/log'
 import VxeDatePanelComponent from '../../date-panel/src/date-panel'
 import VxeButtonComponent from '../../button/src/button'
@@ -306,6 +306,18 @@ export default /* define-vxe-component start */ defineVxeComponent({
       }
       return []
     },
+    computeDateStartDate  () {
+      const $xeDatePicker = this
+      const props = $xeDatePicker
+
+      return props.startDate ? XEUtils.toStringDate(props.startDate) : null
+    },
+    computeDateEndDate  () {
+      const $xeDatePicker = this
+      const props = $xeDatePicker
+
+      return props.endDate ? XEUtils.toStringDate(props.endDate) : null
+    },
     computeLimitMaxCount () {
       const $xeDatePicker = this
       const props = $xeDatePicker
@@ -653,13 +665,34 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const reactData = $xeDatePicker.reactData
       const internalData = $xeDatePicker.internalData
 
-      const { type } = props
+      const { type, editable, multiple, maskedConfig } = props
       const { inputLabel } = internalData
       const dateLabelFormat = $xeDatePicker.computeDateLabelFormat
+      const maskedOpts = $xeDatePicker.computeMaskedOpts
       if (!inpVal) {
         $xeDatePicker.handleChange('', { type: 'check' })
         return
       }
+
+      // 掩码格式处理
+      if (editable && !multiple && (isEnableConf(maskedConfig) || maskedOpts.enabled)) {
+        const allMaskedKeys = dateLabelFormat.match(new RegExp(`(${inputMaskedKeys.join('|')})+`, 'g'))
+        if (allMaskedKeys) {
+          allMaskedKeys.forEach(formatKey => {
+            const fkIndex = dateLabelFormat.indexOf(formatKey)
+            if (fkIndex > -1) {
+              const val = XEUtils.toNumber(inpVal.slice(fkIndex, formatKey.length).replace(/\D/g, ''))
+              inpVal = inpVal.slice(0, fkIndex) + XEUtils.padStart(checkDateFormat(val, formatKey), formatKey.length, '0') + inpVal.slice(fkIndex + formatKey.length)
+            }
+          })
+        }
+      }
+
+      const $datePanel = $xeDatePicker.$refs.refDatePanel as VxeDatePanelConstructor
+      if ($datePanel) {
+        return $datePanel.checkValue(inpVal)
+      }
+
       let inpDateVal: VxeDatePickerPropTypes.ModelValue = parseDateValue(inpVal, type, {
         valueFormat: dateLabelFormat
       })
@@ -711,6 +744,18 @@ export default /* define-vxe-component start */ defineVxeComponent({
         $xeDatePicker.dispatchEvent('suffix-click', { value: inputValue }, evnt)
       }
     },
+    checkMaskedInputValue (numStr: string | number, chunkFormat: string, isFull: boolean) {
+      const $xeDatePicker = this
+
+      const maskedOpts = $xeDatePicker.computeMaskedOpts
+      const { align } = maskedOpts
+      const maskChar = $xeDatePicker.computeMaskChar
+      const restVal = checkDateFormat(XEUtils.toNumber(numStr), chunkFormat)
+      if (isFull) {
+        return XEUtils.padStart(restVal, chunkFormat.length, '0')
+      }
+      return XEUtils[align === 'right' ? 'padStart' : 'padEnd'](restVal, chunkFormat.length, maskChar)
+    },
     handleArrowInputDate (evnt: KeyboardEvent, isUpArrow: boolean, isDwArrow: boolean, isLtArrow: boolean, isRtArrow: boolean) {
       const $xeDatePicker = this
       const props = $xeDatePicker
@@ -748,7 +793,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
         const chunkValue = inpValue.slice(chunkStartIndex, chunkEndIndex)
         if (parseInputKayMaps[selectKey]) {
           const chunkNum = (isAllSameChar(chunkValue, maskChar) ? getChunkDefaultNum(selectKey) : XEUtils.toNumber(chunkValue)) + (isUpArrow ? 1 : -1)
-          const restValue = inpValue.slice(0, chunkStartIndex) + XEUtils.padStart(chunkNum, chunkFormat.length, '0') + inpValue.slice(chunkEndIndex)
+          const restValue = inpValue.slice(0, chunkStartIndex) + $xeDatePicker.checkMaskedInputValue(chunkNum, chunkFormat, true) + inpValue.slice(chunkEndIndex)
           evnt.preventDefault()
           if (restValue.indexOf(maskChar) === -1) {
             // 解析日期
@@ -812,6 +857,8 @@ export default /* define-vxe-component start */ defineVxeComponent({
         return
       }
       const { isTriggerMasked } = internalData
+      const maskedOpts = $xeDatePicker.computeMaskedOpts
+      const { align } = maskedOpts
       const dateMaskedFormat = $xeDatePicker.computeDateMaskedFormat
       const maskChar = $xeDatePicker.computeMaskChar
       let inpValue = targetElem.value || dateMaskedFormat
@@ -831,7 +878,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const chunkEndIndex = chunkStartIndex + chunkFormat.length
       const currKeyIndex = allMaskedKeys.indexOf(selectKey)
       // 全选 | 如果无效字符
-      const isAllSelected = !selectionStart && selectionEnd === inpValue.length
+      const isAllSelected = !selectionStart && selectionEnd === inpValue.length && allMaskedKeys.length > 1
       const isNotMasked = inpValue && inpValue.length !== dateMaskedFormat.length
       if (isAllSelected || isNotMasked) {
         inpValue = dateMaskedFormat
@@ -842,10 +889,11 @@ export default /* define-vxe-component start */ defineVxeComponent({
 
       if (isNumKey) {
         chunkNumList.push(numKey)
+        chunkValue = $xeDatePicker.checkMaskedInputValue(chunkNumList.join(''), chunkFormat, false)
       } else if (isBackspaceKey) {
         chunkNumList.pop()
+        chunkValue = XEUtils[align === 'right' ? 'padStart' : 'padEnd'](chunkNumList.join(''), chunkFormat.length, maskChar)
       }
-      chunkValue = chunkNumList.join('').padEnd(chunkFormat.length, maskChar)
       let restValue = inpValue.slice(0, chunkStartIndex) + chunkValue + inpValue.slice(chunkEndIndex)
       restValue = restValue.replace(new RegExp(`(${inputMaskedKeys.join('|')})`, 'g'), maskChar)
 
@@ -878,7 +926,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
               const prveChunkNums = (prveChunkValue.match(/\d/g) || [])
               if (prveChunkNums.length) {
                 prveChunkNums.pop()
-                prveChunkValue = prveChunkNums.join('').padEnd(prveChunkFormat.length, maskChar)
+                prveChunkValue = XEUtils[align === 'right' ? 'padStart' : 'padEnd'](prveChunkNums.join(''), prveChunkFormat.length, maskChar)
                 restValue = restValue.slice(0, prveChunkStartIndex) + prveChunkValue + restValue.slice(prveChunkEndIndex)
 
                 targetElem.value = restValue
@@ -977,7 +1025,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
       }
 
       // 全选 | 如果无效字符
-      const isAllSelected = !selectionStart && selectionEnd === inpValue.length
+      const isAllSelected = !selectionStart && selectionEnd === inpValue.length && allMaskedKeys.length > 1
       const isNotMasked = inpValue && inpValue.length !== dateMaskedFormat.length
       if (isAllSelected || isNotMasked) {
         let restValue = ''
@@ -1028,7 +1076,6 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const $xeForm = $xeDatePicker.$xeForm
       const formItemInfo = $xeDatePicker.formItemInfo
 
-      const $datePanel = $xeDatePicker.$refs.refDatePanel as VxeDatePanelConstructor
       const { inputValue } = reactData
       const inpImmediate = $xeDatePicker.computeInpImmediate
       const value = inputValue
@@ -1039,11 +1086,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
         const { inputLabel } = internalData
         reactData.isActivated = false
         // 未打开面板时才校验
-        if ($datePanel) {
-          $datePanel.checkValue(inputLabel)
-        } else {
-          $xeDatePicker.afterCheckValue(inputLabel)
-        }
+        $xeDatePicker.afterCheckValue(inputLabel)
       }
       $xeDatePicker.dispatchEvent('blur', { value }, evnt)
       // 自动更新校验状态
@@ -1109,17 +1152,12 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const isEnter = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ENTER)
       if (editable) {
         if (isEnter) {
-          const $datePanel = $xeDatePicker.$refs.refDatePanel as VxeDatePanelConstructor
           const { inputLabel } = internalData
           const targetElem = $xeDatePicker.$refs.refInputTarget as HTMLInputElement
           if (visiblePanel) {
             $xeDatePicker.hidePanel()
           }
-          if ($datePanel) {
-            $datePanel.checkValue(inputLabel)
-          } else {
-            $xeDatePicker.afterCheckValue(inputLabel)
-          }
+          $xeDatePicker.afterCheckValue(inputLabel)
           if (targetElem) {
             targetElem.blur()
           }
@@ -1179,7 +1217,6 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const reactData = $xeDatePicker.reactData
       const internalData = $xeDatePicker.internalData
 
-      const $datePanel = $xeDatePicker.$refs.refDatePanel as VxeDatePanelConstructor
       const { visiblePanel, isActivated } = reactData
       const el = $xeDatePicker.$refs.refElem as HTMLDivElement
       const panelWrapperElem = $xeDatePicker.$refs.refPanelWrapper as HTMLDivElement
@@ -1193,11 +1230,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
           if (visiblePanel) {
             $xeDatePicker.hidePanel()
             const { inputLabel } = internalData
-            if ($datePanel) {
-              $datePanel.checkValue(inputLabel)
-            } else {
-              $xeDatePicker.afterCheckValue(inputLabel)
-            }
+            $xeDatePicker.afterCheckValue(inputLabel)
           }
         }
       }
@@ -1243,7 +1276,6 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const reactData = $xeDatePicker.reactData
       const internalData = $xeDatePicker.internalData
 
-      const $datePanel = $xeDatePicker.$refs.refDatePanel as VxeDatePanelConstructor
       const { isActivated, visiblePanel } = reactData
       if (visiblePanel) {
         $xeDatePicker.hidePanel()
@@ -1252,9 +1284,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
         reactData.isActivated = false
       }
       if (visiblePanel || isActivated) {
-        if ($datePanel) {
-          $datePanel.checkValue(internalData.inputLabel)
-        }
+        $xeDatePicker.afterCheckValue(internalData.inputLabel)
         const targetElem = $xeDatePicker.$refs.refInputTarget as HTMLInputElement
         if (targetElem) {
           targetElem.blur()
@@ -1512,6 +1542,8 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const isDateTimeType = $xeDatePicker.computeIsDateTimeType
       const shortcutList = $xeDatePicker.computeShortcutList
       const timeOpts = $xeDatePicker.computeTimeOpts
+      const dateStartDate = $xeDatePicker.computeDateStartDate
+      const dateEndDate = $xeDatePicker.computeDateEndDate
       const { position } = shortcutOpts
       const headerSlot = slots.header
       const footerSlot = slots.footer
@@ -1579,8 +1611,8 @@ export default /* define-vxe-component start */ defineVxeComponent({
                         className: props.className,
                         multiple: props.multiple,
                         limitCount: props.limitCount,
-                        startDate: props.startDate,
-                        endDate: props.endDate,
+                        startDate: dateStartDate,
+                        endDate: dateEndDate,
                         defaultDate: props.defaultDate,
                         defaultTime: props.defaultTime,
                         minDate: props.minDate,

package/packages/pulldown/src/pulldown.ts

@@ -28,7 +28,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
      */
     trigger: {
       type: String as PropType<VxePulldownPropTypes.Trigger>,
-      default: getConfig().pulldown.trigger
+      default: () => getConfig().pulldown.trigger
     },
     /**
      * 已废弃，请使用 popupConfig.zIndex
@@ -42,7 +42,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
     options: Array as PropType<VxePulldownPropTypes.Options>,
     className: {
       type: [String, Function] as PropType<VxePulldownPropTypes.ClassName>,
-      default: getConfig().pulldown.className
+      default: () => getConfig().pulldown.className
     },
     /**
      * 已废弃，请使用 popupConfig.className
@@ -53,7 +53,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
     popupConfig: Object as PropType<VxePulldownPropTypes.PopupConfig>,
     destroyOnClose: {
       type: Boolean as PropType<VxePulldownPropTypes.DestroyOnClose>,
-      default: getConfig().pulldown.destroyOnClose
+      default: () => getConfig().pulldown.destroyOnClose
     },
     transfer: {
       type: Boolean as PropType<VxePulldownPropTypes.Transfer>,

package/packages/table-select/src/table-select.ts

@@ -54,7 +54,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
     value: [String, Number, Array] as PropType<VxeTableSelectPropTypes.ModelValue>,
     clearable: {
       type: Boolean as PropType<VxeTableSelectPropTypes.Clearable>,
-      default: getConfig().tableSelect.clearable
+      default: () => getConfig().tableSelect.clearable
     },
     placeholder: {
       type: String as PropType<VxeTableSelectPropTypes.Placeholder>,

package/packages/tree-select/src/tree-select.ts

@@ -59,7 +59,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
     value: [String, Number, Array] as PropType<VxeTreeSelectPropTypes.ModelValue>,
     clearable: {
       type: Boolean as PropType<VxeTreeSelectPropTypes.Clearable>,
-      default: getConfig().treeSelect.clearable
+      default: () => getConfig().treeSelect.clearable
     },
     placeholder: {
       type: String as PropType<VxeTreeSelectPropTypes.Placeholder>,
@@ -76,11 +76,11 @@ export default /* define-vxe-component start */ defineVxeComponent({
     },
     showFullLabel: {
       type: Boolean as PropType<VxeTreeSelectPropTypes.ShowFullLabel>,
-      default: getConfig().treeSelect.showFullLabel
+      default: () => getConfig().treeSelect.showFullLabel
     },
     separator: {
       type: String as PropType<VxeTreeSelectPropTypes.Separator>,
-      default: getConfig().treeSelect.separator
+      default: () => getConfig().treeSelect.separator
     },
     filterable: Boolean as PropType<VxeTreeSelectPropTypes.Filterable>,
     filterConfig: Object as PropType<VxeTreeSelectPropTypes.FilterConfig>,

package/packages/ui/index.ts

@@ -113,6 +113,8 @@ setConfig({
   datePicker: {
     // size: null,
     // transfer: false,
+    startDate: new Date(1900, 0, 1),
+    endDate: new Date(2100, 0, 1),
     shortcutConfig: {
       // position: 'left',
       align: 'left',

package/styles/components/collapse.scss

@@ -1,12 +1,28 @@
 @use '../helpers/baseMixin.scss';
 
 .vxe-collapse {
-  font-size: var(--vxe-ui-font-size-default);
+  font-size: var(--vxe-ui-collapse-font-size);
   color: var(--vxe-ui-font-color);
   font-family: var(--vxe-ui-font-family);
   &.is--padding {
+    .vxe-collapse--item-header {
+      padding: 0 var(--vxe-ui-collapse-scope-padding);
+    }
     .vxe-collapse--item-inner {
-      padding: var(--vxe-ui-layout-padding-default);
+      padding: var(--vxe-ui-collapse-scope-padding);
+    }
+  }
+  &.is--border {
+    & > .vxe-collapse-item {
+      border-top: 1px solid var(--vxe-ui-collapse-border-color);
+      &:last-child {
+        border-bottom: 1px solid var(--vxe-ui-collapse-border-color);
+      }
+      & > .vxe-collapse--item-content {
+        & > .vxe-collapse--item-inner {
+          border-top: 1px solid var(--vxe-ui-collapse-border-color);
+        }
+      }
     }
   }
 }
@@ -14,20 +30,20 @@
   display: none;
 }
 .vxe-collapse--item-content {
-  &.is--visible {
-    .vxe-collapse--item-inner {
-      display: block;
-    }
+  overflow: hidden;
+  @include baseMixin.createAnimationTransition(height, .2s);
+  &.is--hidden {
+    height: 0;
   }
 }
 .vxe-collapse--item-inner {
-  display: none;
+  position: relative;
 }
 .vxe-collapse--item-header {
   display: flex;
   flex-direction: row;
   align-items: center;
-  height: 1.8em;
+  min-height: var(--vxe-ui-collapse-scope-min-height);
   cursor: pointer;
 }
 .vxe-collapse--item-switch,
@@ -45,13 +61,22 @@
 }
 
 .vxe-collapse {
+  --vxe-ui-collapse-font-size: var(--vxe-ui-font-size-default);
+  --vxe-ui-collapse-scope-min-height: var(--vxe-ui-collapse-min-height-default);
+  --vxe-ui-collapse-scope-padding: var(--vxe-ui-layout-padding-double);
   &.size--medium {
-    font-size: var(--vxe-ui-font-size-medium);
+    --vxe-ui-collapse-font-size:var(--vxe-ui-font-size-medium);
+    --vxe-ui-collapse-scope-min-height: var(--vxe-ui-collapse-min-height-medium);
+    --vxe-ui-collapse-scope-padding: calc(var(--vxe-ui-layout-padding-double) - 4px);
   }
   &.size--small {
-    font-size: var(--vxe-ui-font-size-small);
+    --vxe-ui-collapse-font-size:var(--vxe-ui-font-size-small);
+    --vxe-ui-collapse-scope-min-height: var(--vxe-ui-collapse-min-height-small);
+    --vxe-ui-collapse-scope-padding: calc(var(--vxe-ui-layout-padding-double) - 6px);
   }
   &.size--mini {
-    font-size: var(--vxe-ui-font-size-mini);
+    --vxe-ui-collapse-font-size:var(--vxe-ui-font-size-mini);
+    --vxe-ui-collapse-scope-min-height: var(--vxe-ui-collapse-min-height-mini);
+    --vxe-ui-collapse-scope-padding: calc(var(--vxe-ui-layout-padding-double) - 8px);
   }
 }

package/styles/components/date-panel.scss

@@ -215,7 +215,7 @@
   }
   &.is--hover {
     .vxe-date-panel--view-item-inner {
-      background-color: var(--vxe-ui-font-primary-tinge-color);
+      background-color: var(--vxe-ui-base-hover-background-color);
     }
   }
   &.is--selected {