vxe-pc-ui 4.5.25 → 4.5.27

package/packages/language/ko-KR.ts

@@ -81,7 +81,8 @@ export default {
       maxFixedCol: '최대 고정 열 수는 {0}을(를) 초과할 수 없습니다.',
       dragTip: '이동: {0}',
       resizeColTip: '宽：{0} 像素',
-      resizeRowTip: '高：{0} 像素'
+      resizeRowTip: '高：{0} 像素',
+      rowGroupContentTotal: '{0}（{1}）'
     },
     grid: {
       selectOneRecord: '최소한 하나의 레코드를 선택해주세요!',

package/packages/language/nb-NO.ts

@@ -81,7 +81,8 @@ export default {
       maxFixedCol: 'Maksimalt antall frosne kolonner kan ikke overstige {0}',
       dragTip: 'Flytt: {0}',
       resizeColTip: '宽：{0} 像素',
-      resizeRowTip: '高：{0} 像素'
+      resizeRowTip: '高：{0} 像素',
+      rowGroupContentTotal: '{0}（{1}）'
     },
     grid: {
       selectOneRecord: '请至少选择一条记录！',

package/packages/language/pt-BR.ts

@@ -81,7 +81,8 @@ export default {
       maxFixedCol: 'The maximum number of Freeze columns cannot exceed {0}',
       dragTip: '移动：{0}',
       resizeColTip: '宽：{0} 像素',
-      resizeRowTip: '高：{0} 像素'
+      resizeRowTip: '高：{0} 像素',
+      rowGroupContentTotal: '{0}（{1}）'
     },
     grid: {
       selectOneRecord: 'Por favor, selecione pelo menos um registro!',

package/packages/language/ru-RU.ts

@@ -81,7 +81,8 @@ export default {
       maxFixedCol: 'Максимальное количество замороженных столбцов не может превышать {0}.',
       dragTip: 'Переместить: {0}',
       resizeColTip: '宽：{0} 像素',
-      resizeRowTip: '高：{0} 像素'
+      resizeRowTip: '高：{0} 像素',
+      rowGroupContentTotal: '{0}（{1}）'
     },
     grid: {
       selectOneRecord: 'Пожалуйста, выберите хотя бы одну запись!',

package/packages/language/th-TH.ts

@@ -81,7 +81,8 @@ export default {
       maxFixedCol: 'จำนวนคอลัมน์ที่ตรึงไว้สูงสุดต้องไม่เกิน {0}',
       dragTip: 'ย้าย: {0}',
       resizeColTip: '宽：{0} 像素',
-      resizeRowTip: '高：{0} 像素'
+      resizeRowTip: '高：{0} 像素',
+      rowGroupContentTotal: '{0}（{1}）'
     },
     grid: {
       selectOneRecord: 'โปรดเลือกอย่างน้อยหนึ่งรายการ!',

package/packages/language/ug-CN.ts

@@ -81,7 +81,8 @@ export default {
       maxFixedCol: 'توڭلىتىشقا بولىدىغان ئەڭ چوڭ قۇر سانى  {0} دانە',
       dragTip: 'يۆتكەش：{0}',
       resizeColTip: '宽：{0} 像素',
-      resizeRowTip: '高：{0} 像素'
+      resizeRowTip: '高：{0} 像素',
+      rowGroupContentTotal: '{0}（{1}）'
     },
     grid: {
       selectOneRecord: 'كەم بولغاندا بىر تال ئۇچۇر تاللاڭ',

package/packages/language/uk-UA.ts

@@ -81,7 +81,8 @@ export default {
       maxFixedCol: 'Максимальна кількість зафіксованих стовпців не повинна перевищувати {0}',
       dragTip: 'Переміщення: {0}',
       resizeColTip: '宽：{0} 像素',
-      resizeRowTip: '高：{0} 像素'
+      resizeRowTip: '高：{0} 像素',
+      rowGroupContentTotal: '{0}（{1}）'
     },
     grid: {
       selectOneRecord: 'Будь ласка, виберіть хоча б один запис!',

package/packages/language/vi-VN.ts

@@ -81,7 +81,8 @@ export default {
       maxFixedCol: '最大冻结列的数量不能超过 {0} 个',
       dragTip: '移动：{0}',
       resizeColTip: '宽：{0} 像素',
-      resizeRowTip: '高：{0} 像素'
+      resizeRowTip: '高：{0} 像素',
+      rowGroupContentTotal: '{0}（{1}）'
     },
     grid: {
       selectOneRecord: '请至少选择一条记录！',

package/packages/language/zh-CHT.ts

@@ -81,7 +81,8 @@ export default {
       maxFixedCol: '最大凍結列的數量不能超過 {0} 個',
       dragTip: '移動：{0}',
       resizeColTip: '宽：{0} 像素',
-      resizeRowTip: '高：{0} 像素'
+      resizeRowTip: '高：{0} 像素',
+      rowGroupContentTotal: '{0}（{1}）'
     },
     grid: {
       selectOneRecord: '請至少選擇一筆記錄！',

package/packages/language/zh-CN.ts

@@ -81,7 +81,8 @@ export default {
       maxFixedCol: '最大冻结列的数量不能超过 {0} 个',
       dragTip: '移动：{0}',
       resizeColTip: '宽：{0} 像素',
-      resizeRowTip: '高：{0} 像素'
+      resizeRowTip: '高：{0} 像素',
+      rowGroupContentTotal: '{0}（{1}）'
     },
     grid: {
       selectOneRecord: '请至少选择一条记录！',

package/packages/number-input/src/number-input.ts

@@ -2,8 +2,8 @@ import { defineComponent, h, ref, Ref, computed, reactive, inject, nextTick, wat
 import XEUtils from 'xe-utils'
 import { getConfig, getIcon, getI18n, globalEvents, GLOBAL_EVENT_KEYS, createEvent, useSize } from '../../ui'
 import { getFuncText, eqEmptyValue } from '../../ui/src/utils'
-import { hasClass, getEventTargetNode } from '../../ui/src/dom'
-import { getSlotVNs } from '../..//ui/src/vn'
+import { hasClass, getEventTargetNode, hasControlKey } from '../../ui/src/dom'
+import { getSlotVNs } from '../../ui/src/vn'
 import { handleNumber, toFloatValueFixed } from './util'
 
 import type { VxeNumberInputConstructor, NumberInputInternalData, VxeNumberInputEmits, NumberInputReactData, NumberInputMethods, VxeNumberInputPropTypes, InputPrivateRef, VxeFormConstructor, VxeFormPrivateMethods, VxeFormDefines, ValueOf } from '../../../types'
@@ -579,15 +579,14 @@ export default defineComponent({
     const keydownEvent = (evnt: KeyboardEvent & { type: 'keydown' }) => {
       const { exponential, controls } = props
       const inputReadonly = computeInputReadonly.value
-      const isCtrlKey = evnt.ctrlKey
+      const isControlKey = hasControlKey(evnt)
       const isShiftKey = evnt.shiftKey
       const isAltKey = evnt.altKey
-      const isMetaKey = evnt.metaKey
       const keyCode = evnt.keyCode
       const isEsc = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ESCAPE)
       const isUpArrow = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ARROW_UP)
       const isDwArrow = globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ARROW_DOWN)
-      if (!isCtrlKey && !isShiftKey && !isAltKey && !isMetaKey && (globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.SPACEBAR) || ((!exponential || keyCode !== 69) && (keyCode >= 65 && keyCode <= 90)) || (keyCode >= 186 && keyCode <= 188) || keyCode >= 191)) {
+      if (!isControlKey && !isShiftKey && !isAltKey && (globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.SPACEBAR) || ((!exponential || keyCode !== 69) && (keyCode >= 65 && keyCode <= 90)) || (keyCode >= 186 && keyCode <= 188) || keyCode >= 191)) {
         evnt.preventDefault()
       }
       if (isEsc) {

package/packages/password-input/src/password-input.ts

@@ -2,7 +2,7 @@ import { defineComponent, h, ref, Ref, computed, reactive, inject, nextTick, wat
 import XEUtils from 'xe-utils'
 import { getConfig, getIcon, getI18n, createEvent, useSize } from '../../ui'
 import { getFuncText } from '../../ui/src/utils'
-import { getSlotVNs } from '../..//ui/src/vn'
+import { getSlotVNs } from '../../ui/src/vn'
 
 import type { VxePasswordInputConstructor, VxePasswordInputEmits, PasswordInputReactData, PasswordInputMethods, VxePasswordInputPropTypes, InputPrivateRef, VxeFormConstructor, VxeFormPrivateMethods, VxeFormDefines } from '../../../types'
 

package/packages/print/src/print.ts

@@ -2,7 +2,7 @@ import { defineComponent, ref, h, reactive, PropType, provide, createCommentVNod
 import XEUtils from 'xe-utils'
 import { getConfig, createEvent } from '../../ui'
 import { printHtml } from './util'
-import { getSlotVNs } from '../..//ui/src/vn'
+import { getSlotVNs } from '../../ui/src/vn'
 
 import type { VxePrintPropTypes, PrintReactData, PrintPrivateRef, VxePrintEmits, PrintPrivateMethods, ValueOf, VxePrintPrivateComputed, VxePrintConstructor, VxePrintPrivateMethods, PrintMethods } from '../../../types'
 

package/packages/tabs/src/tabs.ts

@@ -1,8 +1,8 @@
 import { defineComponent, ref, h, reactive, inject, PropType, provide, computed, onUnmounted, createCommentVNode, watch, nextTick, onMounted } from 'vue'
 import { createEvent, getConfig, getIcon, globalEvents, permission, renderEmptyElement } from '../../ui'
 import { getSlotVNs } from '../../ui/src/vn'
-import { toCssUnit } from '../..//ui/src/dom'
-import { isEnableConf } from '../..//ui/src/utils'
+import { toCssUnit } from '../../ui/src/dom'
+import { isEnableConf } from '../../ui/src/utils'
 import { warnLog, errLog } from '../../ui/src/log'
 import XEUtils from 'xe-utils'
 

package/packages/ui/src/dom.ts

@@ -67,6 +67,10 @@ export function addClass (elem: any, cls: string) {
   }
 }
 
+export function hasControlKey (evnt: KeyboardEvent | MouseEvent | DragEvent) {
+  return evnt.ctrlKey || evnt.metaKey
+}
+
 export function toCssUnit (val?: number | string, unit = 'px') {
   if (XEUtils.isNumber(val) || /^\d+$/.test(`${val}`)) {
     return `${val}${unit}`

package/packages/upload/src/upload.ts

@@ -1,7 +1,7 @@
 import { defineComponent, ref, h, reactive, watch, computed, TransitionGroup, PropType, inject, createCommentVNode, onUnmounted, onMounted } from 'vue'
 import XEUtils from 'xe-utils'
 import { VxeUI, getConfig, getI18n, getIcon, useSize, createEvent, globalEvents, renderEmptyElement } from '../../ui'
-import { getSlotVNs } from '../..//ui/src/vn'
+import { getSlotVNs } from '../../ui/src/vn'
 import { errLog, warnLog } from '../../ui/src/log'
 import { initTpImg, getTpImg, getEventTargetNode, toCssUnit } from '../../ui/src/dom'
 import { readLocalFile } from './util'

package/types/components/column.d.ts

@@ -140,6 +140,10 @@ export namespace VxeColumnPropTypes {
     cellType?: VxeColumnPropTypes.CellType
   }
 
+  /**
+   * 设置为分组节点
+   */
+  export type RowGroupNode = boolean
   /**
    * 设置为树节点
    */
@@ -170,8 +174,15 @@ export namespace VxeColumnPropTypes {
   export type HeaderExportMethod<D = any> = (params: HeaderExportParams<D>) => string | number
 
   interface FooterExportParams<D = any> {
-    $table: VxeTableConstructor<D>,
+    $table: VxeTableConstructor<D>
+    /**
+     * @deprecated
+     */
     items: any[]
+    /**
+     * @deprecated
+     */
+    itemIndex: number
     row: any
     column: VxeTableDefines.ColumnInfo<D>
     _columnIndex: number
@@ -490,6 +501,10 @@ export interface VxeColumnProps<D = any> {
    * 筛选模板配置项
    */
   filterRender?: VxeColumnPropTypes.FilterRender
+  /**
+   * 设置为分组节点
+   */
+  rowGroupNode?: VxeColumnPropTypes.RowGroupNode
   /**
    * 设置为树节点
    */

package/types/components/grid.d.ts

@@ -428,6 +428,7 @@ export namespace VxeGridDefines {
   export interface FilterChangeEventParams<D = any> extends GridEventParams<D>, VxeTableDefines.FilterChangeEventParams<D> { }
   export interface FilterVisibleEventParams<D = any> extends GridEventParams<D>, VxeTableDefines.FilterVisibleEventParams<D> { }
   export interface ResizableChangeEventParams<D = any> extends GridEventParams<D>, VxeTableDefines.ResizableChangeEventParams<D> { }
+  export interface ToggleRowGroupExpandEventParams<D = any> extends GridEventParams<D>, VxeTableDefines.ToggleRowGroupExpandEventParams<D> { }
   export interface ToggleRowExpandEventParams<D = any> extends GridEventParams<D>, VxeTableDefines.ToggleRowExpandEventParams<D> { }
   export interface ToggleTreeExpandEventParams<D = any> extends GridEventParams<D>, VxeTableDefines.ToggleTreeExpandEventParams<D> { }
   export interface MenuClickEventParams<D = any> extends GridEventParams<D>, VxeTableDefines.MenuClickEventParams<D> { }
@@ -513,6 +514,7 @@ export interface VxeGridEventProps<D = any> {
   onFilterChange?: VxeGridEvents.FilterChange<D>
   onFilterVisible?: VxeGridEvents.FilterVisible<D>
   onResizableChange?: VxeGridEvents.ResizableChange<D>
+  onToggleRowGroupExpand?: VxeGridEvents.ToggleRowGroupExpand<D>
   onToggleRowExpand?: VxeGridEvents.ToggleRowExpand<D>
   onToggleTreeExpand?: VxeGridEvents.ToggleTreeExpand<D>
   onMenuClick?: VxeGridEvents.MenuClick<D>
@@ -583,6 +585,7 @@ export interface VxeGridListeners<D = any> {
   filterChange?: VxeGridEvents.FilterChange<D>
   filterVisible?: VxeGridEvents.FilterVisible<D>
   resizableChange?: VxeGridEvents.ResizableChange<D>
+  toggleRowGroupExpand?: VxeGridEvents.ToggleRowGroupExpand<D>
   toggleRowExpand?: VxeGridEvents.ToggleRowExpand<D>
   toggleTreeExpand?: VxeGridEvents.ToggleTreeExpand<D>
   menuClick?: VxeGridEvents.MenuClick<D>
@@ -653,6 +656,7 @@ export namespace VxeGridEvents {
   export type FilterChange<D = any> = (params: VxeGridDefines.FilterChangeEventParams<D>) => void
   export type FilterVisible<D = any> = (params: VxeGridDefines.FilterVisibleEventParams<D>) => void
   export type ResizableChange<D = any> = (params: VxeGridDefines.ResizableChangeEventParams<D>) => void
+  export type ToggleRowGroupExpand<D = any> = (params: VxeGridDefines.ToggleRowGroupExpandEventParams<D>) => void
   export type ToggleRowExpand<D = any> = (params: VxeGridDefines.ToggleRowExpandEventParams<D>) => void
   export type ToggleTreeExpand<D = any> = (params: VxeGridDefines.ToggleTreeExpandEventParams<D>) => void
   export type MenuClick<D = any> = (params: VxeGridDefines.MenuClickEventParams<D>) => void