vxe-pc-ui 3.3.67 → 3.3.69

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

@@ -2,12 +2,13 @@ import { CreateElement, PropType, VNode } from 'vue'
 import { defineVxeComponent } from '../../ui/src/comp'
 import XEUtils from 'xe-utils'
 import { getConfig, getIcon, getI18n, globalEvents, GLOBAL_EVENT_KEYS, createEvent, globalMixins, renderEmptyElement } from '../../ui'
-import { getFuncText, getLastZIndex, nextZIndex } from '../../ui/src/utils'
+import { getFuncText, getLastZIndex, nextZIndex, isEnableConf } from '../../ui/src/utils'
 import { getAbsolutePos, getEventTargetNode } from '../../ui/src/dom'
 import { toStringTimeDate, getDateQuarter } from './util'
 import { getSlotVNs } from '../..//ui/src/vn'
+import VxeButtonGroupComponent from '../../button/src/button-group'
 
-import type { VxeDatePickerConstructor, DatePickerInternalData, VxeDatePickerEmits, DatePickerReactData, VxeDatePickerPropTypes, VxeComponentStyleType, VxeFormConstructor, VxeFormPrivateMethods, VxeFormDefines, VxeDrawerConstructor, VxeDrawerMethods, VxeModalConstructor, VxeModalMethods, VxeDatePickerDefines, VxeComponentSizeType, ValueOf } from '../../../types'
+import type { VxeDatePickerConstructor, DatePickerInternalData, VxeDatePickerEmits, DatePickerReactData, VxeDatePickerPropTypes, VxeComponentStyleType, VxeFormConstructor, VxeFormPrivateMethods, VxeFormDefines, VxeDrawerConstructor, VxeDrawerMethods, VxeModalConstructor, VxeModalMethods, VxeDatePickerDefines, VxeComponentSizeType, ValueOf, VxeButtonGroupDefines } from '../../../types'
 import type { VxeTableConstructor, VxeTablePrivateMethods } from '../../../types/components/table'
 
 export default defineVxeComponent({
@@ -101,6 +102,8 @@ export default defineVxeComponent({
       default: null
     },
 
+    shortcutConfig: Object as PropType<VxeDatePickerPropTypes.ShortcutConfig>,
+
     // 已废弃 startWeek，被 startDay 替换
     startWeek: Number as PropType<VxeDatePickerPropTypes.StartDay>,
     // 已废弃
@@ -688,6 +691,12 @@ export default defineVxeComponent({
 
       const { immediate } = props
       return immediate
+    },
+    computeShortcutOpts () {
+      const $xeDatePicker = this
+      const props = $xeDatePicker
+
+      return Object.assign({}, getConfig().datePicker.shortcutConfig, props.shortcutConfig)
     }
   },
   methods: {
@@ -757,10 +766,16 @@ export default defineVxeComponent({
       const $xeDatePicker = this
       const props = $xeDatePicker
 
-      const { type } = props
+      const { type, multiple } = props
       if (type === 'time') {
         return toStringTimeDate(value)
       }
+      if (XEUtils.isArray(value)) {
+        return XEUtils.toStringDate(value[0], format)
+      }
+      if (XEUtils.isString(value)) {
+        return XEUtils.toStringDate(multiple ? XEUtils.last(value.split(',')) : value, format)
+      }
       return XEUtils.toStringDate(value, format)
     },
     triggerEvent  (evnt: Event & { type: 'input' | 'change' | 'keydown' | 'keyup' | 'wheel' | 'click' | 'focus' | 'blur' }) {
@@ -952,7 +967,7 @@ export default defineVxeComponent({
         reactData.selectMonth = month
       }
     },
-    dateChange  (date: Date) {
+    dateChange  (date: Date, isReload?: boolean) {
       const $xeDatePicker = this
       const props = $xeDatePicker
       const reactData = $xeDatePicker.reactData
@@ -976,10 +991,9 @@ export default defineVxeComponent({
       $xeDatePicker.dateCheckMonth(date)
       if (multiple) {
         // 如果为多选
-        const dateMultipleValue = $xeDatePicker.computeDateMultipleValue
         if (isDateTimeType) {
           // 如果是datetime特殊类型
-          const dateListValue = [...$xeDatePicker.computeDateListValue]
+          const dateListValue = isReload ? [] : [...$xeDatePicker.computeDateListValue]
           const datetimeRest: Date[] = []
           const eqIndex = XEUtils.findIndexOf(dateListValue, val => XEUtils.isDateSame(date, val, 'yyyyMMdd'))
           if (eqIndex === -1) {
@@ -999,6 +1013,7 @@ export default defineVxeComponent({
           })
           $xeDatePicker.handleChange(datetimeRest.map(date => XEUtils.toDateString(date, dateValueFormat)).join(','), { type: 'update' })
         } else {
+          const dateMultipleValue = isReload ? [] : $xeDatePicker.computeDateMultipleValue
           // 如果是日期类型
           if (dateMultipleValue.some(val => XEUtils.isEqual(val, inpVal))) {
             $xeDatePicker.handleChange(dateMultipleValue.filter(val => !XEUtils.isEqual(val, inpVal)).join(','), { type: 'update' })
@@ -1114,9 +1129,24 @@ export default defineVxeComponent({
     },
     dateNowHandle  () {
       const $xeDatePicker = this
+      const props = $xeDatePicker
       const reactData = $xeDatePicker.reactData
 
-      const currentDate = XEUtils.getWhatDay(Date.now(), 0, 'first')
+      const { type } = props
+      const firstDayOfWeek = $xeDatePicker.computeFirstDayOfWeek
+      let currentDate = new Date()
+      switch (type) {
+        case 'week':
+          currentDate = XEUtils.getWhatWeek(currentDate, 0, firstDayOfWeek)
+          break
+        case 'datetime':
+          currentDate = new Date()
+          reactData.datetimePanelValue = new Date()
+          break
+        default:
+          currentDate = XEUtils.getWhatDay(Date.now(), 0, 'first')
+          break
+      }
       reactData.currentDate = currentDate
       $xeDatePicker.dateMonthHandle(currentDate, 0)
     },
@@ -1172,8 +1202,8 @@ export default defineVxeComponent({
       const reactData = $xeDatePicker.reactData
 
       $xeDatePicker.dateNowHandle()
+      $xeDatePicker.dateChange(reactData.currentDate, true)
       if (!props.multiple) {
-        $xeDatePicker.dateChange(reactData.currentDate)
         $xeDatePicker.hidePanel()
       }
       $xeDatePicker.dispatchEvent('date-today', { type: props.type }, evnt)
@@ -1483,17 +1513,25 @@ export default defineVxeComponent({
             offsetMonth = XEUtils.getWhatMonth(offsetMonth, 4)
           }
           $xeDatePicker.dateMoveMonth(offsetMonth)
-        } else {
+        } else if (datePanelType === 'week') {
           let offsetDay = datePanelValue || XEUtils.getWhatDay(Date.now(), 0, 'first')
           const firstDayOfWeek = $xeDatePicker.computeFirstDayOfWeek
+          if (isUpArrow) {
+            offsetDay = XEUtils.getWhatWeek(offsetDay, -1, firstDayOfWeek)
+          } else if (isDwArrow) {
+            offsetDay = XEUtils.getWhatWeek(offsetDay, 1, firstDayOfWeek)
+          }
+          $xeDatePicker.dateMoveDay(offsetDay)
+        } else {
+          let offsetDay = datePanelValue || XEUtils.getWhatDay(Date.now(), 0, 'first')
           if (isLeftArrow) {
             offsetDay = XEUtils.getWhatDay(offsetDay, -1)
           } else if (isUpArrow) {
-            offsetDay = XEUtils.getWhatWeek(offsetDay, -1, firstDayOfWeek)
+            offsetDay = XEUtils.getWhatWeek(offsetDay, -1, offsetDay.getDay() as VxeDatePickerPropTypes.StartDay)
           } else if (isRightArrow) {
             offsetDay = XEUtils.getWhatDay(offsetDay, 1)
           } else if (isDwArrow) {
-            offsetDay = XEUtils.getWhatWeek(offsetDay, 1, firstDayOfWeek)
+            offsetDay = XEUtils.getWhatWeek(offsetDay, 1, offsetDay.getDay() as VxeDatePickerPropTypes.StartDay)
           }
           $xeDatePicker.dateMoveDay(offsetDay)
         }
@@ -1679,6 +1717,24 @@ export default defineVxeComponent({
 
       $xeDatePicker.triggerEvent(evnt)
     },
+    handleShortcutEvent ({ option, $event }: VxeButtonGroupDefines.ClickEventParams) {
+      const $xeDatePicker = this
+
+      const shortcutOpts = $xeDatePicker.computeShortcutOpts
+      const { autoClose } = shortcutOpts
+      const clickMethod = (option as VxeDatePickerDefines.ShortcutOption).clickMethod || shortcutOpts.clickMethod
+      const shortcutParams = {
+        $datePicker: $xeDatePicker as VxeDatePickerConstructor,
+        option: option as VxeDatePickerDefines.ShortcutOption
+      }
+      if (clickMethod) {
+        clickMethod(shortcutParams)
+      }
+      if (autoClose) {
+        $xeDatePicker.hidePanel()
+      }
+      $xeDatePicker.dispatchEvent('shortcut-click', shortcutParams, $event)
+    },
     // 全局事件
     handleGlobalMousedownEvent  (evnt: Event) {
       const $xeDatePicker = this
@@ -2267,6 +2323,30 @@ export default defineVxeComponent({
         ])
       ]
     },
+    renderShortcutBtn (h: CreateElement, pos: 'top' | 'bottom' | 'left' | 'right' | 'header' | 'footer', isVertical?: boolean) {
+      const $xeDatePicker = this
+
+      const shortcutOpts = $xeDatePicker.computeShortcutOpts
+      const { options, position, align, mode } = shortcutOpts
+      if (isEnableConf(shortcutOpts) && options && options.length && (position || 'left') === pos) {
+        return h('div', {
+          class: `vxe-date-picker--panel-${pos}-wrapper`
+        }, [
+          h(VxeButtonGroupComponent, {
+            props: {
+              options: options,
+              mode,
+              align,
+              vertical: isVertical
+            },
+            on: {
+              click: $xeDatePicker.handleShortcutEvent
+            }
+          })
+        ])
+      }
+      return renderEmptyElement($xeDatePicker)
+    },
     renderPanel (h: CreateElement) {
       const $xeDatePicker = this
       const props = $xeDatePicker
@@ -2277,12 +2357,15 @@ export default defineVxeComponent({
       const { initialized, isAniVisible, visiblePanel, panelPlacement, panelStyle } = reactData
       const vSize = $xeDatePicker.computeSize
       const btnTransfer = $xeDatePicker.computeBtnTransfer
+      const shortcutOpts = $xeDatePicker.computeShortcutOpts
+      const { options, position } = shortcutOpts
       const headerSlot = slots.header
       const footerSlot = slots.footer
       const topSlot = slots.top
       const bottomSlot = slots.bottom
       const leftSlot = slots.left
       const rightSlot = slots.right
+      const hasShortcutBtn = options && options.length
       const renders = []
       if (type === 'datetime') {
         renders.push(
@@ -2323,10 +2406,10 @@ export default defineVxeComponent({
           'is--transfer': btnTransfer,
           'ani--leave': isAniVisible,
           'ani--enter': visiblePanel,
-          'show--top': !!(topSlot || headerSlot),
-          'show--bottom': !!(bottomSlot || footerSlot),
-          'show--left': !!leftSlot,
-          'show--right': !!rightSlot
+          'show--top': !!(topSlot || headerSlot || (hasShortcutBtn && (position === 'top' || position === 'header'))),
+          'show--bottom': !!(bottomSlot || footerSlot || (hasShortcutBtn && (position === 'bottom' || position === 'footer'))),
+          'show--left': !!(leftSlot || (hasShortcutBtn && position === 'left')),
+          'show--right': !!(rightSlot || (hasShortcutBtn && position === 'right'))
         }],
         attrs: {
           placement: panelPlacement
@@ -2341,7 +2424,7 @@ export default defineVxeComponent({
                 ? h('div', {
                   class: 'vxe-date-picker--panel-top-wrapper'
                 }, topSlot({}))
-                : renderEmptyElement($xeDatePicker),
+                : $xeDatePicker.renderShortcutBtn(h, 'top'),
               h('div', {
                 class: 'vxe-date-picker--panel-body-layout-wrapper'
               }, [
@@ -2349,7 +2432,7 @@ export default defineVxeComponent({
                   ? h('div', {
                     class: 'vxe-date-picker--panel-left-wrapper'
                   }, leftSlot({}))
-                  : renderEmptyElement($xeDatePicker),
+                  : $xeDatePicker.renderShortcutBtn(h, 'left', true),
                 h('div', {
                   class: 'vxe-date-picker--panel-body-content-wrapper'
                 }, [
@@ -2357,7 +2440,7 @@ export default defineVxeComponent({
                     ? h('div', {
                       class: 'vxe-date-picker--panel-header-wrapper'
                     }, headerSlot({}))
-                    : renderEmptyElement($xeDatePicker),
+                    : $xeDatePicker.renderShortcutBtn(h, 'header'),
                   h('div', {
                     class: 'vxe-date-picker--panel-body-wrapper'
                   }, renders),
@@ -2365,19 +2448,19 @@ export default defineVxeComponent({
                     ? h('div', {
                       class: 'vxe-date-picker--panel-footer-wrapper'
                     }, footerSlot({}))
-                    : renderEmptyElement($xeDatePicker)
+                    : $xeDatePicker.renderShortcutBtn(h, 'footer')
                 ]),
                 rightSlot
                   ? h('div', {
                     class: 'vxe-date-picker--panel-right-wrapper'
                   }, rightSlot({}))
-                  : renderEmptyElement($xeDatePicker)
+                  : $xeDatePicker.renderShortcutBtn(h, 'right', true)
               ]),
               bottomSlot
                 ? h('div', {
                   class: 'vxe-date-picker--panel-bottom-wrapper'
                 }, bottomSlot({}))
-                : renderEmptyElement($xeDatePicker)
+                : $xeDatePicker.renderShortcutBtn(h, 'bottom')
             ])
           ]
         : [])

package/packages/language/ar-EG.ts

@@ -11,6 +11,7 @@ export default {
     },
     error: {
       downErr: '下载失败',
+      errLargeData: '当绑定的数据量过大时，应该请使用 {0}，否则可能会出现卡顿',
       groupFixed: '如果使用分组表头，冻结列必须按组设置',
       groupMouseRange: '分组表头与 "{0}" 不能同时使用，这可能会出现错误',
       groupTag: '分组列头应该使用 "{0}" 而不是 "{1}"，这可能会出现错误',

package/packages/language/de-DE.ts

@@ -12,6 +12,7 @@ export default
     },
     error: {
       downErr: 'Der Download ist fehlgeschlagen',
+      errLargeData: '当绑定的数据量过大时，应该请使用 {0}，否则可能会出现卡顿',
       groupFixed: 'Bei Verwendung von Gruppenköpfen müssen eingefrorene Spalten nach Gruppe festgelegt werden',
       groupMouseRange: 'Der Gruppenheader und „{0}“ können nicht gleichzeitig verwendet werden, was zu einem Fehler führen kann.',
       groupTag: 'Bei der Gruppierung von Spaltenüberschriften sollte „{0}“ anstelle von „{1}“ verwendet werden, was zu Fehlern führen kann',

package/packages/language/en-US.ts

@@ -11,6 +11,7 @@ export default {
     },
     error: {
       downErr: 'Download failed',
+      errLargeData: '当绑定的数据量过大时，应该请使用 {0}，否则可能会出现卡顿',
       groupFixed: 'If using group headers, frozen columns must be set by group',
       groupMouseRange: 'The group header and "{0}" cannot be used at the same time, which may cause an error.',
       groupTag: 'Grouping column headers should use "{0}" instead of "{1}", which may cause errors',

package/packages/language/es-ES.ts

@@ -11,6 +11,7 @@ export default {
     },
     error: {
       downErr: 'Download failed.',
+      errLargeData: '当绑定的数据量过大时，应该请使用 {0}，否则可能会出现卡顿',
       groupFixed: 'If you use group headers, the freeze columns must be set by group.',
       groupMouseRange: 'Los encabezados de agrupación y "{0}" no pueden ser utilizados al mismo tiempo, lo que puede causar errores.',
       groupTag: 'El encabezado de columna de agrupación debería utilizar "{0}" en lugar de "{1}", lo que puede causar errores.',

package/packages/language/fr-FR.ts

@@ -11,6 +11,7 @@ export default {
     },
     error: {
       downErr: '下载失败',
+      errLargeData: '当绑定的数据量过大时，应该请使用 {0}，否则可能会出现卡顿',
       groupFixed: '如果使用分组表头，冻结列必须按组设置',
       groupMouseRange: '分组表头与 "{0}" 不能同时使用，这可能会出现错误',
       groupTag: '分组列头应该使用 "{0}" 而不是 "{1}"，这可能会出现错误',

package/packages/language/hu-HU.ts

@@ -11,6 +11,7 @@ export default {
     },
     error: {
       downErr: 'Letöltés sikertelen',
+      errLargeData: '当绑定的数据量过大时，应该请使用 {0}，否则可能会出现卡顿',
       groupFixed: 'Csoportfejlécek használata esetén a rögzített oszlopokat csoportonként kell beállítani',
       groupMouseRange: 'A csoportfejléc és a „{0}” nem használhatók egyszerre, ami hibát okozhat.',
       groupTag: 'A csoportosító oszlopfejlécben a „{0}” értéket kell használni a „{1}” helyett, ami hibákat okozhat',

package/packages/language/hy-AM.ts

@@ -11,6 +11,7 @@ export default {
     },
     error: {
       downErr: '下载失败',
+      errLargeData: '当绑定的数据量过大时，应该请使用 {0}，否则可能会出现卡顿',
       groupFixed: '如果使用分组表头，冻结列必须按组设置',
       groupMouseRange: '分组表头与 "{0}" 不能同时使用，这可能会出现错误',
       groupTag: '分组列头应该使用 "{0}" 而不是 "{1}"，这可能会出现错误',

package/packages/language/it-IT.ts

@@ -11,6 +11,7 @@ export default {
     },
     error: {
       downErr: 'Download non riuscito',
+      errLargeData: '当绑定的数据量过大时，应该请使用 {0}，否则可能会出现卡顿',
       groupFixed: 'Se si utilizzano intestazioni di gruppo, le colonne bloccate devono essere impostate per gruppo',
       groupMouseRange: "L'intestazione del gruppo e \"{0}\" non possono essere utilizzate contemporaneamente, il che potrebbe causare un errore.",
       groupTag: 'Le intestazioni delle colonne di raggruppamento devono utilizzare "{0}" anziché "{1}", il che potrebbe causare errori',

package/packages/language/ja-JP.ts

@@ -11,6 +11,7 @@ export default {
     },
     error: {
       downErr: '下载失败',
+      errLargeData: '当绑定的数据量过大时，应该请使用 {0}，否则可能会出现卡顿',
       groupFixed: 'ヘッダー結合を使用する場合、固定列はグループで設定しなければなりません',
       groupMouseRange: 'ヘッダー結合と「{0}」は同時に使用できません。これによりエラーが発生する可能性があります',
       groupTag: 'ヘッダー結合は "{0}" を使ってください。 "{1}" はエラーが発生する可能性があります',

package/packages/language/ko-KR.ts

@@ -11,6 +11,7 @@ export default {
     },
     error: {
       downErr: '下载失败',
+      errLargeData: '当绑定的数据量过大时，应该请使用 {0}，否则可能会出现卡顿',
       groupFixed: '如果使用分组表头，冻结列必须按组设置',
       groupMouseRange: '分组表头与 "{0}" 不能同时使用，这可能会出现错误',
       groupTag: '分组列头应该使用 "{0}" 而不是 "{1}"，这可能会出现错误',

package/packages/language/nb-NO.ts

@@ -11,6 +11,7 @@ export default {
     },
     error: {
       downErr: '下载失败',
+      errLargeData: '当绑定的数据量过大时，应该请使用 {0}，否则可能会出现卡顿',
       groupFixed: '如果使用分组表头，冻结列必须按组设置',
       groupMouseRange: '分组表头与 "{0}" 不能同时使用，这可能会出现错误',
       groupTag: '分组列头应该使用 "{0}" 而不是 "{1}"，这可能会出现错误',

package/packages/language/pt-BR.ts

@@ -11,6 +11,7 @@ export default {
     },
     error: {
       downErr: '下载失败',
+      errLargeData: '当绑定的数据量过大时，应该请使用 {0}，否则可能会出现卡顿',
       groupFixed: 'If you use group headers, the freeze columns must be set by group.',
       groupMouseRange: 'Agrupar cabeçalhos e "{0}" não podem ser usados ao mesmo tempo, o que pode causar erros.',
       groupTag: 'O cabeçalho da coluna de agrupamento deve usar "{0}" em vez de "{1}", o que pode causar erros.',

package/packages/language/ru-RU.ts

@@ -11,6 +11,7 @@ export default {
     },
     error: {
       downErr: 'Загрузка не удалась',
+      errLargeData: '当绑定的数据量过大时，应该请使用 {0}，否则可能会出现卡顿',
       groupFixed: 'При использовании заголовков групп замороженные столбцы должны быть установлены по группам.',
       groupMouseRange: 'Заголовок группы и "{0}" нельзя использовать одновременно, что может привести к ошибке.',
       groupTag: 'При группировке заголовков столбцов следует использовать "{0}" вместо "{1}", что может привести к ошибкам.',

package/packages/language/th-TH.ts

@@ -11,6 +11,7 @@ export default {
     },
     error: {
       downErr: 'การดาวน์โหลดล้มเหลว',
+      errLargeData: '当绑定的数据量过大时，应该请使用 {0}，否则可能会出现卡顿',
       groupFixed: 'หากใช้ส่วนหัวของกลุ่ม คอลัมน์ที่ตรึงจะต้องตั้งค่าตามกลุ่ม',
       groupMouseRange: 'ส่วนหัวของกลุ่มและ "{0}" ไม่สามารถนำมาใช้พร้อมกันได้ ซึ่งอาจทำให้เกิดข้อผิดพลาดได้',
       groupTag: 'การจัดกลุ่มส่วนหัวคอลัมน์ควรใช้ "{0}" แทน "{1}" ซึ่งอาจทำให้เกิดข้อผิดพลาด',

package/packages/language/ug-CN.ts

@@ -11,6 +11,7 @@ export default {
     },
     error: {
       downErr: 'چۈشۈرۈش مەغلۇپ بولدى',
+      errLargeData: '当绑定的数据量过大时，应该请使用 {0}，否则可能会出现卡顿',
       groupFixed: 'ئەگەر گۇرۇپپا ئۇچۇر بىشىنى ئىشلەتكەن بولسىڭىز،توڭلاتماقچى بولغان قۇر چوقۇم گۇرۇپپا بويىچە تەڭشىلىشى كىرەك',
       groupMouseRange: 'گۇرۇپپا بىشى بىلەن "{0}" نى بىللە ئىشلىتىشكە بولمايدۇ，بۇ بەلكىم خاتالىق كەلتۈرۈپ چىقىرىشى مومكىن',
       groupTag: 'گۇرۇپپا قۇر بىشىغا چوقۇم  "{0}" نى ئىشلىتىشىڭىز كىرەك،ھەرگىزمۇ "{1}"نى ئەمەس ،بولمىسا بۇ بەلكىم خاتالىق كەلتۈرۈپ چىقىرىشى مومكىن',

package/packages/language/uk-UA.ts

@@ -11,6 +11,7 @@ export default {
     },
     error: {
       downErr: '下载失败',
+      errLargeData: '当绑定的数据量过大时，应该请使用 {0}，否则可能会出现卡顿',
       groupFixed: '如果使用分组表头，冻结列必须按组设置',
       groupMouseRange: '分组表头与 "{0}" 不能同时使用，这可能会出现错误',
       groupTag: '分组列头应该使用 "{0}" 而不是 "{1}"，这可能会出现错误',

package/packages/language/vi-VN.ts

@@ -11,6 +11,7 @@ export default {
     },
     error: {
       downErr: '下载失败',
+      errLargeData: '当绑定的数据量过大时，应该请使用 {0}，否则可能会出现卡顿',
       groupFixed: '如果使用分组表头，冻结列必须按组设置',
       groupMouseRange: '分组表头与 "{0}" 不能同时使用，这可能会出现错误',
       groupTag: '分组列头应该使用 "{0}" 而不是 "{1}"，这可能会出现错误',

package/packages/language/zh-CHT.ts

@@ -11,6 +11,7 @@ export default {
     },
     error: {
       downErr: '下載失敗',
+      errLargeData: '当绑定的数据量过大时，应该请使用 {0}，否则可能会出现卡顿',
       groupFixed: '如果使用分組表頭，凍結列必須按群組設定',
       groupMouseRange: '分組表頭與 "{0}" 不能同時使用，這可能會出現錯誤',
       groupTag: '分組列頭應該使用 "{0}" 而不是 "{1}"，這可能會出現錯誤',

package/packages/language/zh-CN.ts

@@ -11,6 +11,7 @@ export default {
     },
     error: {
       downErr: '下载失败',
+      errLargeData: '当绑定的数据量过大时，应该请使用 {0}，否则可能会出现卡顿',
       groupFixed: '如果使用分组表头，冻结列必须按组设置',
       groupMouseRange: '分组表头与 "{0}" 不能同时使用，这可能会出现错误',
       groupTag: '分组列头应该使用 "{0}" 而不是 "{1}"，这可能会出现错误',

package/packages/ui/index.ts

@@ -91,7 +91,13 @@ setConfig({
     startDate: new Date(1900, 0, 1),
     endDate: new Date(2100, 0, 1),
     startDay: 1,
-    selectDay: 1
+    selectDay: 1,
+    shortcutConfig: {
+      // position: 'left',
+      align: 'left',
+      mode: 'text',
+      autoClose: true
+    }
   },
   drawer: {
     // size: null,

package/styles/components/button-group.scss

@@ -2,8 +2,20 @@
   display: inline-flex;
   &.is--vertical {
     flex-direction: column;
-    .vxe-button {
-      margin: 0;
+    .vxe-button,
+    .vxe-button-wrapper {
+      &+.vxe-button-wrapper,
+      &+.vxe-button,
+      &+.vxe-button--dropdown {
+        margin-top: 0.5em;
+      }
+    }
+    .vxe-button--dropdown {
+      &+.vxe-button-wrapper,
+      &+.vxe-button,
+      &+.vxe-button--dropdown {
+        margin-top: 0.5em;
+      }
     }
   }
 }

package/styles/components/button.scss

@@ -274,6 +274,13 @@ $btnThemeList: (
     margin-left: 0.72em;
   }
 }
+.vxe-button--dropdown {
+  &+.vxe-button-wrapper,
+  &+.vxe-button.type--button,
+  &+.vxe-button--dropdown {
+    margin-left: 0.72em;
+  }
+}
 .vxe-button--loading-icon,
 .vxe-button--icon {
   min-width: var(--vxe-ui-font-size-default);
@@ -300,11 +307,6 @@ $btnThemeList: (
 .vxe-button--dropdown {
   position: relative;
   outline: 0;
-  &+.vxe-button-wrapper,
-  &+.vxe-button.type--button,
-  &+.vxe-button--dropdown {
-    margin-left: 12px;
-  }
   & > .vxe-button {
     &.type--button {
       @for $index from 0 to list.length($btnThemeList) {

package/styles/components/date-picker.scss

@@ -418,6 +418,8 @@
     box-shadow: inset 0 -1px 0 0 var(--vxe-ui-base-popup-border-color);
   }
   td {
+    border: 1px solid transparent;
+    border-radius: 1em;
     &.is--prev,
     &.is--next {
       color: var(--vxe-ui-font-disabled-color);
@@ -427,7 +429,7 @@
       }
     }
     &.is--now {
-      box-shadow: inset 0 0 0 1px var(--vxe-ui-base-popup-border-color);
+      color: var(--vxe-ui-base-popup-border-color);
       &:not(.is--selected) {
         &.is--current {
           color: var(--vxe-ui-font-primary-color);
@@ -439,14 +441,21 @@
       }
     }
     &.is--hover {
-      background-color: var(--vxe-ui-input-date-picker-hover-background-color);
+      border-color: var(--vxe-ui-font-primary-color);
+      background-color: var(--vxe-ui-font-primary-tinge-color);
     }
     &.is--selected {
       color: var(--vxe-ui-input-date-picker-selected-color);
       background-color: var(--vxe-ui-font-primary-color);
+      &.is--hover {
+        box-shadow: 0 0px 6px 1px var(--vxe-ui-font-primary-color);
+      }
       &.is--prev,
       &.is--next {
-        background-color: var(--vxe-ui-font-primary-lighten-color);
+        .vxe-date-picker--date-label,
+        .vxe-date-picker--date-festival {
+          color: var(--vxe-ui-base-popup-border-color);
+        }
       }
       .vxe-date-picker--date-label,
       .vxe-date-picker--date-festival {
@@ -482,8 +491,23 @@
     }
   }
   td {
+    border-top-left-radius: 0;
+    border-top-right-radius: 0;
+    border-bottom-left-radius: 0;
+    border-bottom-right-radius: 0;
+    border-left-width: 0;
+    border-right-width: 0;
     &:first-child {
-      box-shadow: inset -1px 0 0 0 var(--vxe-ui-base-popup-border-color);
+      border-bottom-left-radius: 1em;
+      border-top-left-radius: 1em;
+      border-left-width: 1px;
+      border-right-width: 1px;
+      border-right-color: var(--vxe-ui-base-popup-border-color);
+    }
+    &:last-child {
+      border-top-right-radius: 1em;
+      border-bottom-right-radius: 1em;
+      border-right-width: 1px;
     }
   }
 }
@@ -514,9 +538,8 @@
   position: absolute;
   right: 0.1em;
   top: -0.2em;
-  font-size: 12px;
-  line-height: 12px;
-  transform: scale(0.7);
+  font-size: 0.86em;
+  transform: scale(0.85);
   color: var(--vxe-ui-input-date-extra-color);
   &.is-important {
     color: var(--vxe-ui-input-date-extra-important-color);
@@ -526,7 +549,6 @@
 .vxe-date-picker--date-festival {
   color: var(--vxe-ui-input-date-festival-color);
   height: 14px;
-  line-height: 1;
   overflow: hidden;
   &.is-important {
     color: var(--vxe-ui-input-date-festival-important-color);
@@ -534,8 +556,8 @@
 }
 .vxe-date-picker--date-festival--label {
   display: block;
-  font-size: 12px;
-  transform: scale(0.8);
+  font-size: 0.86em;
+  transform: scale(0.9);
 }
 
 @keyframes festivalOverlap2 {
@@ -561,7 +583,7 @@
 
 .vxe-date-picker--date-festival--overlap {
   display: block;
-  font-size: 12px;
+  font-size: 0.86em;
   &.overlap--2 {
     animation: festivalOverlap2 6s infinite ease-in-out;
   }

package/types/components/button-group.d.ts

@@ -1,4 +1,4 @@
-import { DefineVxeComponentApp, DefineVxeComponentOptions, DefineVxeComponentInstance, VxeComponentSizeType, VxeComponentEventParams, VxeComponentPermissionCodeType, ValueOf } from '@vxe-ui/core'
+import { DefineVxeComponentApp, DefineVxeComponentOptions, DefineVxeComponentInstance, VxeComponentSizeType, VxeComponentAlignType, VxeComponentEventParams, VxeComponentPermissionCodeType, ValueOf } from '@vxe-ui/core'
 import { VxeButtonProps, VxeButtonPropTypes } from './button'
 
 /* eslint-disable @typescript-eslint/no-empty-interface,no-use-before-define,@typescript-eslint/ban-types */
@@ -23,6 +23,7 @@ export namespace VxeButtonGroupPropTypes {
   export type Round = boolean
   export type Vertical = boolean
   export type Circle = boolean
+  export type Align = VxeComponentAlignType
   export type Disabled = boolean
   export type Mode = VxeButtonPropTypes.Mode
   export type Status = VxeButtonPropTypes.Status
@@ -36,6 +37,7 @@ export interface VxeButtonGroupProps {
   mode?: VxeButtonGroupPropTypes.Mode
   status?: VxeButtonGroupPropTypes.Status
   round?: VxeButtonGroupPropTypes.Round
+  align?: VxeButtonGroupPropTypes.Align
   vertical?: VxeButtonGroupPropTypes.Vertical
   circle?: VxeButtonGroupPropTypes.Circle
   /**