vxe-pc-ui 3.20.0 → 3.20.2

package/packages/scrollbar/src/scrollbar.ts

@@ -4,6 +4,8 @@ import XEUtils from 'xe-utils'
 import { VxeUI } from '../../ui'
 import { toCssUnit } from '../../ui/src/dom'
 import { getThumbOffsetSize, getThumbSize, getScrollFromClick, getScrollFromDrag } from './util'
+import { getDefaultConfig } from '../../ui/src/utils'
+
 import VxeLoadingComponent from '../../loading'
 
 import type { ScrollbarReactData, ScrollbarInternalData, VxeScrollbarEmits, ValueOf, VxeScrollbarPropTypes, VxeComponentStyleType } from '../../../types'
@@ -33,6 +35,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
   name: 'VxeScrollbar',
   props: {
     id: [String, Number] as PropType<VxeScrollbarPropTypes.Id>,
+    viewId: [String, Number] as PropType<VxeScrollbarPropTypes.ViewId>,
     width: [String, Number] as PropType<VxeScrollbarPropTypes.Width>,
     height: [String, Number] as PropType<VxeScrollbarPropTypes.Height>,
     minWidth: [String, Number] as PropType<VxeScrollbarPropTypes.MinWidth>,
@@ -48,6 +51,14 @@ export default /* define-vxe-component start */ defineVxeComponent({
       type: Boolean as PropType<VxeScrollbarPropTypes.Padding>,
       default: () => getConfig().scrollbar.padding
     },
+    autoHide: {
+      type: Boolean as PropType<VxeScrollbarPropTypes.AutoHide>,
+      default: () => getConfig().scrollbar.autoHide
+    },
+    visible: {
+      type: Boolean as PropType<VxeScrollbarPropTypes.Visible>,
+      default: () => getConfig().scrollbar.visible
+    },
     xConfig: Object as PropType<VxeScrollbarPropTypes.XConfig>,
     yConfig: Object as PropType<VxeScrollbarPropTypes.YConfig>,
     className: {
@@ -92,8 +103,8 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const props = $xeScrollbar
 
       const { width, height, minWidth, minHeight, maxWidth, maxHeight } = props
-      const xOpts = $xeScrollbar.computeXOpts
-      const yOpts = $xeScrollbar.computeYOpts
+      const barWidth = $xeScrollbar.computeYWidth
+      const barHeight = $xeScrollbar.computeXHeight
       const stys: VxeComponentStyleType = {}
       if (width) {
         stys.width = toCssUnit(width)
@@ -113,14 +124,56 @@ export default /* define-vxe-component start */ defineVxeComponent({
       if (maxHeight) {
         stys.maxHeight = toCssUnit(maxHeight)
       }
-      if (yOpts.width) {
-        stys['--vxe-ui-scrollbar-y-width'] = toCssUnit(yOpts.width)
-      }
-      if (xOpts.height) {
-        stys['--vxe-ui-scrollbar-x-height'] = toCssUnit(xOpts.height)
+      if (barWidth || barHeight) {
+        stys['--vxe-ui-scrollbar-y-width'] = toCssUnit(barWidth || barHeight)
+        stys['--vxe-ui-scrollbar-x-height'] = toCssUnit(barHeight || barWidth)
       }
       return stys
     },
+    computeXHeight () {
+      const $xeScrollbar = this
+
+      const xOpts = ($xeScrollbar as any).computeXOpts as VxeScrollbarPropTypes.XConfig
+      return xOpts.height
+    },
+    computeYWidth () {
+      const $xeScrollbar = this
+
+      const yOpts = ($xeScrollbar as any).computeYOpts as VxeScrollbarPropTypes.YConfig
+      return yOpts.width
+    },
+    computeXVisible () {
+      const $xeScrollbar = this
+      const props = $xeScrollbar
+
+      const { visible } = props
+      const xOpts = ($xeScrollbar as any).computeXOpts as VxeScrollbarPropTypes.XConfig
+      return getDefaultConfig(xOpts.visible, visible)
+    },
+    computeYVisible () {
+      const $xeScrollbar = this
+      const props = $xeScrollbar
+
+      const { visible } = props
+      const yOpts = ($xeScrollbar as any).computeYOpts as VxeScrollbarPropTypes.YConfig
+      return getDefaultConfig(yOpts.visible, visible)
+    },
+    computeXAutoHide () {
+      const $xeScrollbar = this
+      const props = $xeScrollbar
+
+      const { autoHide } = props
+      const xOpts = ($xeScrollbar as any).computeXOpts as VxeScrollbarPropTypes.XConfig
+      return getDefaultConfig(xOpts.autoHide, autoHide)
+    },
+    computeYAutoHide () {
+      const $xeScrollbar = this
+      const props = $xeScrollbar
+
+      const { autoHide } = props
+      const yOpts = ($xeScrollbar as any).computeYOpts as VxeScrollbarPropTypes.YConfig
+      return getDefaultConfig(yOpts.autoHide, autoHide)
+    },
     computeWrapperClss () {
       const $xeScrollbar = this
       const props = $xeScrollbar
@@ -128,22 +181,24 @@ export default /* define-vxe-component start */ defineVxeComponent({
 
       const { native, className, padding } = props
       const { yThumbHeight, xThumbWidth } = reactData
-      const xOpts = ($xeScrollbar as any).computeXOpts as VxeScrollbarPropTypes.XConfig
-      const yOpts = ($xeScrollbar as any).computeYOpts as VxeScrollbarPropTypes.YConfig
       const xToTop = ($xeScrollbar as any).computeXToTop as boolean
       const yToLeft = ($xeScrollbar as any).computeYToLeft as boolean
+      const xVisible = ($xeScrollbar as any).computeXVisible
+      const yVisible = ($xeScrollbar as any).computeYVisible
+      const xAutoHide = ($xeScrollbar as any).computeXAutoHide
+      const yAutoHide = ($xeScrollbar as any).computeYAutoHide
       return domUtils.buildClass([
         'vxe-scrollbar',
-        `ov-x--${xOpts.visible || 'visible'}`,
-        `ov-y--${yOpts.visible || 'visible'}`,
+        `ov-x--${xVisible === false ? 'hidden' : 'visible'}`,
+        `ov-y--${yVisible === false ? 'hidden' : 'visible'}`,
         `sx-pos--${xToTop ? 'top' : 'bottom'}`,
         `sy-pos--${yToLeft ? 'left' : 'right'}`,
         native ? 'is--native' : 'is--virtual',
         className
       ], {
         'is--padding': padding,
-        'ov-x--auto-hide': xOpts.autoHide,
-        'ov-y--auto-hide': yOpts.autoHide,
+        'ov-x--auto-hide': xAutoHide,
+        'ov-y--auto-hide': yAutoHide,
         'overflow-y': yThumbHeight,
         'overflow-x': xThumbWidth
       })
@@ -540,13 +595,13 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const props = $xeScrollbar
       const slots = $xeScrollbar.$scopedSlots
 
-      const { id, native, loading, viewAttrs } = props
+      const { id, native, loading, viewId, viewAttrs } = props
       const wrapperStyle = $xeScrollbar.computeWrapperStyle
       const wrapperClss = $xeScrollbar.computeWrapperClss
       const viewClss = $xeScrollbar.computeViewClss
       const viewInnerClss = $xeScrollbar.computeViewInnerClss
-      const xOpts = $xeScrollbar.computeXOpts
-      const yOpts = $xeScrollbar.computeYOpts
+      const xVisible = $xeScrollbar.computeXVisible
+      const yVisible = $xeScrollbar.computeYVisible
       const defaultSlot = slots.default
       return h('div', {
         ref: 'refElem',
@@ -559,7 +614,10 @@ export default /* define-vxe-component start */ defineVxeComponent({
         h('div', {
           ref: 'refViewElem',
           class: viewClss,
-          attrs: viewAttrs,
+          attrs: {
+            id: viewId || null,
+            ...viewAttrs
+          },
           on: {
             scroll: $xeScrollbar.scrollEvent
           }
@@ -570,7 +628,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
             class: viewInnerClss
           }, defaultSlot ? defaultSlot({}) : [])
         ]),
-        native || xOpts.visible === 'hidden'
+        native || xVisible === false
           ? renderEmptyElement($xeScrollbar)
           : h('div', {
             ref: 'refTrackXElem',
@@ -591,7 +649,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
               }
             })
           ]),
-        native || yOpts.visible === 'hidden'
+        native || yVisible === false
           ? renderEmptyElement($xeScrollbar)
           : h('div', {
             ref: 'refTrackYElem',
@@ -662,6 +720,30 @@ export default /* define-vxe-component start */ defineVxeComponent({
 
       $xeScrollbar.reFlag++
     },
+    computeYWidth () {
+      const $xeScrollbar = this
+
+      $xeScrollbar.reFlag++
+    },
+    computeXHeight () {
+      const $xeScrollbar = this
+
+      $xeScrollbar.reFlag++
+    },
+    computeXVisible () {
+      const $xeScrollbar = this
+
+      $xeScrollbar.$nextTick(() => {
+        $xeScrollbar.reFlag++
+      })
+    },
+    computeYVisible () {
+      const $xeScrollbar = this
+
+      $xeScrollbar.$nextTick(() => {
+        $xeScrollbar.reFlag++
+      })
+    },
     reFlag () {
       const $xeScrollbar = this
 

package/packages/tabs/src/tabs.ts

@@ -4,7 +4,7 @@ import XEUtils from 'xe-utils'
 import { createEvent, getConfig, getIcon, globalEvents, globalMixins, permission, renderEmptyElement } from '../../ui'
 import { getSlotVNs } from '../../ui/src/vn'
 import { toCssUnit, addClass, removeClass } from '../../ui/src/dom'
-import { isEnableConf } from '../../ui/src/utils'
+import { getDefaultConfig, isEnableConf } from '../../ui/src/utils'
 import { createComponentLog } from '../../ui/src/log'
 import VxeLoadingComponent from '../../loading'
 import VxeScrollbarComponent from '../../scrollbar'
@@ -58,7 +58,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
     },
     useScrollbar: {
       type: Boolean as PropType<VxeTabsPropTypes.UseScrollbar>,
-      default: () => getConfig().tabs.useScrollbar
+      default: () => getDefaultConfig(getConfig().tabs.useScrollbar, getConfig().useScrollbar)
     },
     scrollbarConfig: Object as PropType<VxeTabsPropTypes.ScrollbarConfig>,
     // 已废弃
@@ -193,6 +193,24 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const props = $xeTabs
 
       return Object.assign({}, getConfig().tabs.scrollbarConfig, props.scrollbarConfig)
+    },
+    computeScrollbarProps () {
+      const $xeTabs = this
+
+      const scrollbarOpts = $xeTabs.computeScrollbarOpts as VxeTabsPropTypes.ScrollbarConfig
+      const { viewClassName, viewInnerClassName } = scrollbarOpts
+      return {
+        width: scrollbarOpts.width,
+        height: scrollbarOpts.height,
+        autoHide: scrollbarOpts.autoHide,
+        visible: scrollbarOpts.visible,
+        xConfig: scrollbarOpts.xConfig,
+        yConfig: scrollbarOpts.yConfig,
+        className: scrollbarOpts.className,
+        viewAttrs: scrollbarOpts.viewAttrs,
+        viewClassName: 'vxe-tabs-pane--scrollbar-item-view' + (viewClassName ? (' ' + viewClassName) : ''),
+        viewInnerClassName: 'vxe-tabs-pane--scrollbar-item-inner' + (viewClassName ? (' ' + viewInnerClassName) : '')
+      }
     }
   },
   methods: {
@@ -840,8 +858,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const { initNames, activeName } = reactData
       const { name, slots } = item
       const defaultSlot = slots ? slots.default : null
-      const scrollbarOpts = $xeTabs.computeScrollbarOpts
-      const { viewClassName, viewInnerClassName } = scrollbarOpts
+      const scrollbarProps = $xeTabs.computeScrollbarProps
       if (name && initNames.includes(name)) {
         return useScrollbar
           ? h(VxeScrollbarComponent, {
@@ -849,11 +866,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
             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) : '')
-            },
+            props: scrollbarProps,
             scopedSlots: {
               default: () => defaultSlot ? $xeTabs.callSlot(defaultSlot, { name }, h) : []
             }