vxe-pc-ui 3.19.6 → 3.19.8

package/packages/row/src/row.ts

@@ -3,15 +3,22 @@ import { defineVxeComponent } from '../../ui/src/comp'
 import XEUtils from 'xe-utils'
 import { getConfig, createEvent, globalMixins } from '../../ui'
 import { toCssUnit } from '../../ui/src/dom'
+import { createComponentLog } from '../../ui/src/log'
 
 import type { VxeRowPropTypes, RowReactData, VxeRowEmits, ValueOf } from '../../../types'
 
+const { warnLog } = createComponentLog('row')
+
 export default /* define-vxe-component start */ defineVxeComponent({
   name: 'VxeRow',
   mixins: [
     globalMixins.sizeMixin
   ],
   props: {
+    gridLayout: {
+      type: Boolean as PropType<VxeRowPropTypes.GridLayout>,
+      default: () => getConfig().row.gridLayout
+    },
     gutter: [Number, String, Array] as PropType<VxeRowPropTypes.Gutter>,
     wrap: {
       type: Boolean as PropType<VxeRowPropTypes.Wrap>,
@@ -42,23 +49,28 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const $xeRow = this
       const props = $xeRow
 
-      const { gutter, vertical } = props
+      const { gridLayout, gutter, vertical } = props
       const style: Record<string, string | number> = {}
       if (gutter) {
         let [lrGutter, tbGutter] = XEUtils.isArray(gutter) ? gutter : [gutter]
-        if (vertical) {
-          tbGutter = lrGutter
-          lrGutter = ''
-        }
-        if (lrGutter) {
-          const offsetSize = XEUtils.isNumber(lrGutter) ? toCssUnit(-(lrGutter / 2)) : `calc(${toCssUnit(lrGutter)} / 2 * -1)`
-          style.marginLeft = offsetSize
-          style.marginRight = offsetSize
-        }
-        if (tbGutter) {
-          const offsetSize = XEUtils.isNumber(tbGutter) ? toCssUnit(-(tbGutter / 2)) : `calc(${toCssUnit(tbGutter)} / 2 * -1)`
-          style.marginTop = offsetSize
-          style.marginBottom = offsetSize
+        if (gridLayout) {
+          style.columnGap = toCssUnit(lrGutter)
+          style.rowGap = toCssUnit(tbGutter || lrGutter)
+        } else {
+          if (vertical) {
+            tbGutter = lrGutter
+            lrGutter = ''
+          }
+          if (lrGutter) {
+            const offsetSize = XEUtils.isNumber(lrGutter) ? toCssUnit(-(lrGutter / 2)) : `calc(${toCssUnit(lrGutter)} / 2 * -1)`
+            style.marginLeft = offsetSize
+            style.marginRight = offsetSize
+          }
+          if (tbGutter) {
+            const offsetSize = XEUtils.isNumber(tbGutter) ? toCssUnit(-(tbGutter / 2)) : `calc(${toCssUnit(tbGutter)} / 2 * -1)`
+            style.marginTop = offsetSize
+            style.marginBottom = offsetSize
+          }
         }
       }
       return style
@@ -84,12 +96,12 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const props = $xeRow
       const slots = $xeRow.$scopedSlots
 
-      const { vertical, wrap } = props
+      const { gridLayout, vertical, wrap } = props
       const rowStyle = $xeRow.computeRowStyle
       const defaultSlot = slots.default
       return h('div', {
         ref: 'refElem',
-        class: ['vxe-row', {
+        class: ['vxe-row', gridLayout ? 'grid--layout' : 'def--layout', {
           'is--vertical': vertical,
           'is--wrap': wrap
         }],
@@ -100,6 +112,15 @@ export default /* define-vxe-component start */ defineVxeComponent({
       }, defaultSlot ? defaultSlot({}) : [])
     }
   },
+  mounted () {
+    const $xeRow = this
+    const props = $xeRow
+
+    const { gridLayout, wrap } = props
+    if (gridLayout && !wrap) {
+      warnLog('vxe.error.notSupportProp', ['grid-layout', 'wrap=false', 'wrap=true'])
+    }
+  },
   render (this: any, h) {
     return this.renderVN(h)
   }

package/packages/scrollbar/src/scrollbar.ts

@@ -8,7 +8,7 @@ import VxeLoadingComponent from '../../loading'
 
 import type { ScrollbarReactData, ScrollbarInternalData, VxeScrollbarEmits, ValueOf, VxeScrollbarPropTypes, VxeComponentStyleType } from '../../../types'
 
-const { getConfig, createEvent, domUtils, globalResize, renderEmptyElement } = VxeUI
+const { getConfig, createEvent, domUtils, globalResize, globalEvents, renderEmptyElement } = VxeUI
 
 function createReactData (): ScrollbarReactData {
   return {
@@ -279,6 +279,9 @@ export default /* define-vxe-component start */ defineVxeComponent({
       if (!viewEl) {
         return
       }
+      if (!viewEl.clientHeight || !viewEl.clientHeight) {
+        return
+      }
       const trackXEl = $xeScrollbar.$refs.refTrackXElem as HTMLDivElement
       const xThumbWidth = trackXEl ? getThumbSize(viewEl.clientWidth, viewEl.scrollWidth, trackXEl.clientWidth) : 0
       const thumbXElem = $xeScrollbar.$refs.refThumbXElem as HTMLDivElement
@@ -303,6 +306,9 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const viewEl = $xeScrollbar.$refs.refViewElem as HTMLDivElement
       if (!viewEl) {
         return
+        if (!viewEl.clientHeight || !viewEl.clientHeight) {
+          return
+        }
       }
       const { xThumbWidth, yThumbHeight } = reactData
       const trackXEl = $xeScrollbar.$refs.refTrackXElem as HTMLDivElement
@@ -693,6 +699,9 @@ export default /* define-vxe-component start */ defineVxeComponent({
     }
 
     $xeScrollbar.reFlag++
+    globalEvents.on($xeScrollbar, 'resize', () => {
+      $xeScrollbar.reFlag++
+    })
   },
   beforeDestroy () {
     const $xeScrollbar = this
@@ -702,6 +711,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
     if (resizeObserver) {
       resizeObserver.disconnect()
     }
+    globalEvents.off($xeScrollbar, 'resize')
   },
   destroyed () {
     const $xeScrollbar = this

package/packages/tabs/src/tabs.ts

@@ -7,6 +7,7 @@ import { toCssUnit, addClass, removeClass } from '../../ui/src/dom'
 import { isEnableConf } from '../../ui/src/utils'
 import { createComponentLog } from '../../ui/src/log'
 import VxeLoadingComponent from '../../loading'
+import VxeScrollbarComponent from '../../scrollbar'
 
 import type { VxeTabsPropTypes, VxeTabPaneProps, VxeTabsEmits, TabsInternalData, TabsReactData, VxeComponentSizeType, VxeTabsConstructor, VxeTabsPrivateMethods, VxeTabPaneDefines, ValueOf, VxeComponentStyleType } from '../../../types'
 
@@ -55,6 +56,11 @@ export default /* define-vxe-component start */ defineVxeComponent({
       type: String as PropType<VxeTabsPropTypes.Size>,
       default: () => getConfig().tabs.size || getConfig().size
     },
+    useScrollbar: {
+      type: Boolean as PropType<VxeTabsPropTypes.UseScrollbar>,
+      default: () => getConfig().tabs.useScrollbar
+    },
+    scrollbarConfig: Object as PropType<VxeTabsPropTypes.ScrollbarConfig>,
     // 已废弃
     beforeCloseMethod: Function as PropType<VxeTabsPropTypes.BeforeCloseMethod>
   },
@@ -181,6 +187,12 @@ export default /* define-vxe-component start */ defineVxeComponent({
 
       const staticTabs = reactData.staticTabs as VxeTabPaneDefines.TabConfig[]
       return staticTabs.filter((item) => $xeTabs.handleFilterTab(item))
+    },
+    computeScrollbarOpts () {
+      const $xeTabs = this
+      const props = $xeTabs
+
+      return Object.assign({}, getConfig().tabs.scrollbarConfig, props.scrollbarConfig)
     }
   },
   methods: {
@@ -821,19 +833,39 @@ export default /* define-vxe-component start */ defineVxeComponent({
     },
     renderTabPane (h: CreateElement, item: VxeTabPaneProps | VxeTabPaneDefines.TabConfig) {
       const $xeTabs = this
+      const props = $xeTabs
       const reactData = $xeTabs.reactData
 
+      const { useScrollbar } = props
       const { initNames, activeName } = reactData
       const { name, slots } = item
       const defaultSlot = slots ? slots.default : null
-      return name && initNames.includes(name)
-        ? h('div', {
-          key: `${name}`,
-          class: ['vxe-tabs-pane--item', {
-            'is--visible': activeName === name
-          }]
-        }, defaultSlot ? $xeTabs.callSlot(defaultSlot, { name }, h) : [])
-        : renderEmptyElement($xeTabs)
+      const scrollbarOpts = $xeTabs.computeScrollbarOpts
+      const { viewClassName, viewInnerClassName } = scrollbarOpts
+      if (name && initNames.includes(name)) {
+        return useScrollbar
+          ? h(VxeScrollbarComponent, {
+            key: `${name}`,
+            class: ['vxe-tabs-pane--scrollbar-item', {
+              'is--visible': activeName === name
+            }],
+            props: {
+              ...scrollbarOpts,
+              viewClassName: 'vxe-tabs-pane--scrollbar-item-view' + (viewClassName ? (' ' + viewClassName) : ''),
+              viewInnerClassName: 'vxe-tabs-pane--scrollbar-item-inner' + (viewClassName ? (' ' + viewInnerClassName) : '')
+            },
+            scopedSlots: {
+              default: () => defaultSlot ? $xeTabs.callSlot(defaultSlot, { name }, h) : []
+            }
+          })
+          : h('div', {
+            key: `${name}`,
+            class: ['vxe-tabs-pane--item', {
+              'is--visible': activeName === name
+            }]
+          }, defaultSlot ? $xeTabs.callSlot(defaultSlot, { name }, h) : [])
+      }
+      return renderEmptyElement($xeTabs)
     },
     renderTabContent  (h: CreateElement, tabList: VxeTabsPropTypes.Options | VxeTabPaneDefines.TabConfig[]) {
       const $xeTabs = this

package/packages/tree/src/tree.ts

@@ -6,7 +6,7 @@ import { calcTreeLine, getItemCacheObj } from './util'
 import { createComponentLog } from '../../ui/src/log'
 import { getSlotVNs } from '../../ui/src/vn'
 import { crossTreeDragNodeGlobal, getCrossTreeDragNodeInfo } from './store'
-import { toCssUnit, isScale, getPaddingTopBottomSize, addClass, removeClass, getTpImg, hasControlKey, getEventTargetNode } from '../../ui/src/dom'
+import { toCssUnit, isScale, getPaddingTopBottomSize, addClass, removeClass, getTpImg, hasControlKey, getEventTargetNode, hasClass } from '../../ui/src/dom'
 import { isEnableConf, enModelValue, deModelValue, getText } from '../../ui/src/utils'
 import { moveRowAnimateToTb, clearRowAnimate } from '../../ui/src/anime'
 import VxeLoadingComponent from '../../loading'
@@ -1574,11 +1574,15 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const { rowHeight } = scrollYStore
       const el = $xeTree.$refs.refElem as HTMLDivElement
       if (el && el.clientWidth && el.clientHeight) {
-        const parentEl = $xeTree.getParentElem()
+        let parentEl = $xeTree.getParentElem()
         const headerWrapperEl = $xeTree.$refs.refHeaderWrapperElem as HTMLDivElement
         const footerWrapperEl = $xeTree.$refs.refFooterWrapperElem as HTMLDivElement
         const headHeight = headerWrapperEl ? headerWrapperEl.clientHeight : 0
         const footHeight = footerWrapperEl ? footerWrapperEl.clientHeight : 0
+        // 如果是虚拟滚动条
+        if (parentEl && hasClass(parentEl, 'vxe-scrollbar--view-inner')) {
+          parentEl = parentEl.parentElement
+        }
         if (parentEl) {
           const parentPaddingSize = getPaddingTopBottomSize(parentEl)
           reactData.parentHeight = Math.max(headHeight + footHeight + rowHeight, parentEl.clientHeight - parentPaddingSize - headHeight - footHeight)

package/styles/components/card.scss

@@ -1,8 +1,34 @@
+// 局部变量
+.vxe-card {
+  --vxe-ui-card-current-font-size: var(--vxe-ui-font-size-default);
+  --vxe-ui-card-current-padding: var(--vxe-ui-card-padding-default);
+  &.size--xlarge {
+    --vxe-ui-card-current-font-size: var(--vxe-ui-font-size-xlarge);
+    --vxe-ui-card-current-padding: var(--vxe-ui-card-padding-xlarge);
+  }
+  &.size--large {
+    --vxe-ui-card-current-font-size: var(--vxe-ui-font-size-large);
+    --vxe-ui-card-current-padding: var(--vxe-ui-card-padding-large);
+  }
+  &.size--medium {
+    --vxe-ui-card-current-font-size: var(--vxe-ui-font-size-medium);
+    --vxe-ui-card-current-padding: var(--vxe-ui-card-padding-medium);
+  }
+  &.size--small {
+    --vxe-ui-card-current-font-size: var(--vxe-ui-font-size-small);
+    --vxe-ui-card-current-padding: var(--vxe-ui-card-padding-small);
+  }
+  &.size--mini {
+    --vxe-ui-card-current-font-size: var(--vxe-ui-font-size-mini);
+    --vxe-ui-card-current-padding: var(--vxe-ui-card-padding-mini);
+  }
+}
+
 .vxe-card {
   position: relative;
   display: inline-flex;
   flex-direction: column;
-  font-size: var(--vxe-ui-font-size-default);
+  font-size: var(--vxe-ui-card-current-font-size);
   color: var(--vxe-ui-font-color);
   font-family: var(--vxe-ui-font-family);
   background-color: var(--vxe-ui-layout-background-color);
@@ -33,19 +59,25 @@
   flex-grow: 1;
 }
 .vxe-card--body-left,
+.vxe-card--body-scrollbar-left,
 .vxe-card--body-right,
-.vxe-card--body-content {
+.vxe-card--body-scrollbar-right,
+.vxe-card--body-content,
+.vxe-card--body-scrollbar-content {
   overflow: auto;
 }
 .vxe-card--header,
 .vxe-card--header-extra,
 .vxe-card--footer,
 .vxe-card--body-left,
-.vxe-card--body-right {
+.vxe-card--body-scrollbar-left,
+.vxe-card--body-right,
+.vxe-card--body-scrollbar-right {
   flex-shrink: 0;
 }
 .vxe-card--header-title,
-.vxe-card--body-content {
+.vxe-card--body-content,
+.vxe-card--body-scrollbar-content {
   flex-grow: 1;
 }
 .vxe-card--header-title {
@@ -57,66 +89,20 @@
 }
 
 .vxe-card {
-  font-size: var(--vxe-ui-font-size-default);
   & > .vxe-card--header,
   & > .vxe-card--footer {
-    padding: var(--vxe-ui-card-padding-default);
+    padding: var(--vxe-ui-card-current-padding);
   }
   &.is--padding {
     & > .vxe-card--body {
-      .vxe-card--body-content,
       .vxe-card--body-left,
-      .vxe-card--body-right {
-        padding: var(--vxe-ui-card-padding-default);
-      }
-    }
-  }
-  &.size--medium {
-    font-size: var(--vxe-ui-font-size-medium);
-    & > .vxe-card--header,
-    & > .vxe-card--footer {
-      padding: var(--vxe-ui-card-padding-medium);
-    }
-    &.is--padding {
-      & > .vxe-card--body {
-        .vxe-card--body-content,
-        .vxe-card--body-left,
-        .vxe-card--body-right {
-          padding: var(--vxe-ui-card-padding-medium);
-        }
-      }
-    }
-  }
-  &.size--small {
-    font-size: var(--vxe-ui-font-size-small);
-    & > .vxe-card--header,
-    & > .vxe-card--footer {
-      padding: var(--vxe-ui-card-padding-small);
-    }
-    &.is--padding {
-      & > .vxe-card--body {
-        .vxe-card--body-content,
-        .vxe-card--body-left,
-        .vxe-card--body-right {
-          padding: var(--vxe-ui-card-padding-small);
-        }
-      }
-    }
-  }
-  &.size--mini {
-    font-size: var(--vxe-ui-font-size-mini);
-    & > .vxe-card--header,
-    & > .vxe-card--footer {
-      padding: var(--vxe-ui-card-padding-mini);
-    }
-    &.is--padding {
-      & > .vxe-card--body {
-        .vxe-card--body-content,
-        .vxe-card--body-left,
-        .vxe-card--body-right {
-          padding: var(--vxe-ui-card-padding-mini);
-        }
+      .vxe-card--body-scrollbar-left-view,
+      .vxe-card--body-right,
+      .vxe-card--body-scrollbar-right-view,
+      .vxe-card--body-content,
+      .vxe-card--body-scrollbar-content-view {
+        padding: var(--vxe-ui-card-current-padding);
       }
     }
   }
-}
+}

package/styles/components/row.scss

@@ -36,9 +36,27 @@
   &.align--right {
     text-align: right;
   }
-  @for $i from 0 to list.length(base_var.$colSpanList) {
-    &.span#{$i + 1} {
-      width: list.nth(base_var.$colSpanList, $i + 1);
+}
+
+.vxe-row {
+  &.def--layout {
+    & > .vxe-col {
+      @for $i from 0 to list.length(base_var.$colSpanList) {
+        &.span#{$i + 1} {
+          width: list.nth(base_var.$colSpanList, $i + 1);
+        }
+      }
+    }
+  }
+  &.grid--layout {
+    display: grid;
+    grid-template-columns: repeat(24, minmax(0, 1fr));
+    & > .vxe-col {
+      @for $i from 0 to list.length(base_var.$colSpanList) {
+        &.span#{$i + 1} {
+          grid-column: span $i + 1;
+        }
+      }
     }
   }
 }

package/styles/components/scrollbar.scss

@@ -1,7 +1,6 @@
 @use '../helpers/baseMixin.scss';
 
 .vxe-scrollbar {
-  width: 100%;
   position: relative;
   &.is--virtual {
     & > .vxe-scrollbar--view {
@@ -74,6 +73,7 @@
   display: none;
   position: absolute;
   background-color: var(--vxe-ui-scrollbar-track-background-color);
+  overflow: hidden;
   user-select: none;
 }
 .vxe-scrollbar {
@@ -152,17 +152,21 @@
 
 .vxe-scrollbar {
   &.is--padding {
-    &.sx-pos--top {
-      padding-top: var(--vxe-ui-scrollbar-x-height);
-    }
-    &.sx-pos--bottom {
-      padding-bottom: var(--vxe-ui-scrollbar-x-height);
-    }
-    &.sy-pos--left {
-      padding-left: var(--vxe-ui-scrollbar-y-width);
+    &.overflow-x {
+      &.sx-pos--top {
+        padding-top: var(--vxe-ui-scrollbar-x-height);
+      }
+      &.sx-pos--bottom {
+        padding-bottom: var(--vxe-ui-scrollbar-x-height);
+      }
     }
-    &.sy-pos--right {
-      padding-right: var(--vxe-ui-scrollbar-y-width);
+    &.overflow-y {
+      &.sy-pos--left {
+        padding-left: var(--vxe-ui-scrollbar-y-width);
+      }
+      &.sy-pos--right {
+        padding-right: var(--vxe-ui-scrollbar-y-width);
+      }
     }
   }
 }

package/styles/components/space.scss

@@ -38,6 +38,7 @@
   &.is--fill {
     & > .vxe-space--item {
       flex-grow: 1;
+      min-width: 100%;
     }
   }
 }

package/styles/components/tabs.scss

@@ -470,7 +470,8 @@ $scrollbarOffsetSize: 20px;
   overflow: auto;
 }
 
-.vxe-tabs-pane--item {
+.vxe-tabs-pane--item,
+.vxe-tabs-pane--scrollbar-item {
   display: none;
   height: 100%;
   overflow: auto;

package/types/components/card.d.ts

@@ -1,4 +1,5 @@
 import { DefineVxeComponentApp, DefineVxeComponentOptions, DefineVxeComponentInstance, VxeComponentEventParams, ValueOf, VxeComponentSizeType } from '@vxe-ui/core'
+import { VxeScrollbarProps } from './scrollbar'
 
 /* eslint-disable @typescript-eslint/no-empty-interface,no-use-before-define,@typescript-eslint/ban-types */
 
@@ -25,6 +26,8 @@ export namespace VxeCardPropTypes {
   export type Shadow = boolean
   export type Padding = boolean
   export type Size = VxeComponentSizeType
+  export type UseScrollbar = boolean
+  export interface ScrollbarConfig extends Pick<VxeScrollbarProps, 'native' | 'yConfig' | 'className' | 'viewAttrs' | 'viewClassName' | 'viewInnerClassName'> {}
 }
 
 export type VxeCardProps = {
@@ -37,6 +40,14 @@ export type VxeCardProps = {
   shadow?: VxeCardPropTypes.Shadow
   padding?: VxeCardPropTypes.Padding
   size?: VxeCardPropTypes.Size
+  /**
+   * 使用虚拟滚动条
+   */
+  useScrollbar?: VxeCardPropTypes.UseScrollbar
+  /**
+   * 滚动条配置项
+   */
+  scrollbarConfig?: VxeCardPropTypes.ScrollbarConfig
 }
 
 export interface CardPrivateComputed {

package/types/components/grid.d.ts

@@ -659,13 +659,50 @@ export interface GridMethods<D = any> {
 export interface VxeGridMethods<D = any> extends GridMethods<D>, Omit<TableMethods<D>, 'dispatchEvent'> { }
 
 export interface GridPrivateMethods<D = any> {
+  /**
+   * 内部方法
+   * @private
+   */
   callSlot<T = any>(slotFunc: NormalizedScopedSlot | ((params: T) => VxeComponentSlotType | VxeComponentSlotType[]) | string | null, params: T, h: CreateElement): VxeComponentSlotType[]
+  /**
+   * 内部方法
+   * @private
+   */
   extendTableMethods<T>(methodKeys: T[]): any
+  /**
+   * 内部方法
+   * @private
+   */
   triggerToolbarCommitEvent(params: VxeToolbarPropTypes.ButtonConfig | VxeToolbarPropTypes.ToolConfig, evnt: Event): Promise<any>
+  /**
+   * 内部方法
+   * @private
+   */
   triggerToolbarBtnEvent(button: VxeToolbarPropTypes.ButtonConfig, evnt: Event): void
+  /**
+   * 内部方法
+   * @private
+   */
   triggerToolbarTolEvent(button: VxeToolbarPropTypes.ToolConfig, evnt: Event): void
+  /**
+   * 内部方法
+   * @private
+   */
   triggerZoomEvent(evnt: Event): void
+  /**
+   * 内部方法
+   * @private
+   */
+  getParentElem(): HTMLElement | null
+  /**
+   * 内部方法
+   * @private
+   */
   getParentHeight(): number
+  /**
+   * 内部方法
+   * @private
+   */
   getExcludeHeight(): number
 }
 export interface VxeGridPrivateMethods<D = any> extends GridPrivateMethods<D> { }

package/types/components/layout-aside.d.ts

@@ -41,7 +41,13 @@ export interface VxeLayoutAsideProps {
   padding?: VxeLayoutAsidePropTypes.Padding
   size?: VxeLayoutAsidePropTypes.Size
   collapseConfig?: VxeLayoutAsidePropTypes.CollapseConfig
+  /**
+   * 使用虚拟滚动条
+   */
   useScrollbar?: VxeLayoutAsidePropTypes.UseScrollbar
+  /**
+   * 滚动条配置项
+   */
   scrollbarConfig?: VxeLayoutAsidePropTypes.ScrollbarConfig
 }
 

package/types/components/layout-body.d.ts

@@ -33,7 +33,13 @@ export interface VxeLayoutBodyProps {
   padding?: VxeLayoutBodyPropTypes.Padding
   showBacktop?: VxeLayoutBodyPropTypes.ShowBacktop
   backtopConfig?: VxeLayoutBodyPropTypes.BacktopConfig
+  /**
+   * 使用虚拟滚动条
+   */
   useScrollbar?: VxeLayoutBodyPropTypes.UseScrollbar
+  /**
+   * 滚动条配置项
+   */
   scrollbarConfig?: VxeLayoutBodyPropTypes.ScrollbarConfig
 }
 

package/types/components/menu.d.ts

@@ -103,7 +103,13 @@ export interface VxeMenuProps {
   expandKeys?: VxeMenuPropTypes.ExpandKeys
   options?: VxeMenuPropTypes.Options
   menuConfig?: VxeMenuPropTypes.MenuConfig
+  /**
+   * 使用虚拟滚动条
+   */
   useScrollbar?: VxeMenuPropTypes.UseScrollbar
+  /**
+   * 滚动条配置项
+   */
   scrollbarConfig?: VxeMenuPropTypes.ScrollbarConfig
   /**
    * 挂载到指定元素下

package/types/components/row.d.ts

@@ -16,13 +16,15 @@ export interface RowPrivateRef {
 export interface VxeRowPrivateRef extends RowPrivateRef { }
 
 export namespace VxeRowPropTypes {
+  export type GridLayout = boolean
   export type Gutter = string | number | (string | number)[]
   export type Wrap = boolean
   export type Vertical = boolean
   export type Size = VxeComponentSizeType
 }
 
-export interface VxeRowProps {
+export type VxeRowProps = {
+  gridLayout?: VxeRowPropTypes.GridLayout
   gutter?: VxeRowPropTypes.Gutter
   wrap?: VxeRowPropTypes.Wrap
   vertical?: VxeRowPropTypes.Vertical

package/types/components/table.d.ts

@@ -3,7 +3,7 @@ import { NormalizedScopedSlot } from 'vue/types/vnode'
 import { DefineVxeComponentApp, DefineVxeComponentOptions, DefineVxeComponentInstance, VxeComponentEventParams, VxeComponentSizeType, ValueOf, VxeGlobalConfig, VxeComponentStyleType, VxeComponentSlotType, VxeGlobalRendererOptions } from '@vxe-ui/core'
 import { VxeColumnPropTypes, VxeColumnProps, VxeColumnSlotTypes } from './column'
 import { VxeTableExtendCellAreaDefines, VxeTableExtendCellAreaEmits } from './table-plugins'
-import { VxeGridConstructor } from './grid'
+import { VxeGridConstructor, VxeGridPrivateMethods } from './grid'
 import { VxeTooltipPropTypes } from './tooltip'
 import { VxeModalConstructor, VxeModalPrivateMethods, VxeModalPropTypes } from './modal'
 import { VxeDrawerPropTypes } from './drawer'
@@ -30,7 +30,7 @@ export type VxeTableInstance<D = any> = DefineVxeComponentInstance<{
    */
   internalData: TableInternalData<D>
   $xeParentTable: (VxeTableConstructor<D> & VxeTablePrivateMethods) | null | undefined
-  $xeGrid: VxeGridConstructor<D> | null | undefined
+  $xeGrid: (VxeGridConstructor<D> & VxeGridPrivateMethods)| null | undefined
   $xeGantt: VxeTableDefines.InjectGanttType | null | undefined
   $xeTabs: (VxeTabsConstructor & VxeTabsPrivateMethods) | null
   $xeModal: (VxeModalConstructor & VxeModalPrivateMethods) | null
@@ -5530,12 +5530,11 @@ export interface TablePrivateMethods<D = any> {
    * @private
    */
   callSlot<T>(slotFunc: NormalizedScopedSlot | ((params: T) => VxeComponentSlotType | VxeComponentSlotType[]) | string | null, params: T, h: CreateElement): VxeComponentSlotType[]
-
   /**
    * 内部方法
    * @private
    */
-  getParentElem(): Element | null
+  getParentElem(): HTMLElement | null
   /**
    * 内部方法
    * @private