vxe-pc-ui 3.20.0 → 3.20.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (91) hide show
  1. package/es/card/src/card.js +18 -3
  2. package/es/icon/style.css +1 -1
  3. package/es/language/fr-FR.js +29 -29
  4. package/es/layout-aside/src/layout-aside.js +8 -5
  5. package/es/layout-body/src/layout-body.js +22 -11
  6. package/es/list/src/list.js +86 -35
  7. package/es/list/style.css +25 -8
  8. package/es/list/style.min.css +1 -1
  9. package/es/scrollbar/src/scrollbar.js +69 -17
  10. package/es/style.css +1 -1
  11. package/es/style.min.css +1 -1
  12. package/es/tabs/src/tabs.js +19 -3
  13. package/es/tree/src/tree.js +439 -56
  14. package/es/tree/style.css +43 -0
  15. package/es/tree/style.min.css +1 -1
  16. package/es/ui/index.js +1 -1
  17. package/es/ui/src/log.js +1 -1
  18. package/es/ui/src/utils.js +3 -0
  19. package/es/vxe-list/style.css +25 -8
  20. package/es/vxe-list/style.min.css +1 -1
  21. package/es/vxe-tree/style.css +43 -0
  22. package/es/vxe-tree/style.min.css +1 -1
  23. package/lib/card/src/card.js +18 -3
  24. package/lib/card/src/card.min.js +1 -1
  25. package/lib/icon/style/style.css +1 -1
  26. package/lib/icon/style/style.min.css +1 -1
  27. package/lib/index.umd.js +640 -139
  28. package/lib/index.umd.min.js +1 -1
  29. package/lib/language/fr-FR.js +29 -29
  30. package/lib/language/fr-FR.min.js +1 -1
  31. package/lib/language/fr-FR.umd.js +29 -29
  32. package/lib/layout-aside/src/layout-aside.js +8 -8
  33. package/lib/layout-aside/src/layout-aside.min.js +1 -1
  34. package/lib/layout-body/src/layout-body.js +26 -19
  35. package/lib/layout-body/src/layout-body.min.js +1 -1
  36. package/lib/list/src/list.js +73 -32
  37. package/lib/list/src/list.min.js +1 -1
  38. package/lib/list/style/style.css +25 -8
  39. package/lib/list/style/style.min.css +1 -1
  40. package/lib/scrollbar/src/scrollbar.js +74 -15
  41. package/lib/scrollbar/src/scrollbar.min.js +1 -1
  42. package/lib/style.css +1 -1
  43. package/lib/style.min.css +1 -1
  44. package/lib/tabs/src/tabs.js +20 -7
  45. package/lib/tabs/src/tabs.min.js +1 -1
  46. package/lib/tree/src/tree.js +416 -53
  47. package/lib/tree/src/tree.min.js +1 -1
  48. package/lib/tree/style/style.css +43 -0
  49. package/lib/tree/style/style.min.css +1 -1
  50. package/lib/ui/index.js +1 -1
  51. package/lib/ui/index.min.js +1 -1
  52. package/lib/ui/src/log.js +1 -1
  53. package/lib/ui/src/log.min.js +1 -1
  54. package/lib/ui/src/utils.js +4 -0
  55. package/lib/ui/src/utils.min.js +1 -1
  56. package/lib/vxe-list/style/style.css +25 -8
  57. package/lib/vxe-list/style/style.min.css +1 -1
  58. package/lib/vxe-tree/style/style.css +43 -0
  59. package/lib/vxe-tree/style/style.min.css +1 -1
  60. package/package.json +1 -1
  61. package/packages/card/src/card.ts +19 -3
  62. package/packages/language/fr-FR.ts +903 -903
  63. package/packages/layout-aside/src/layout-aside.ts +8 -5
  64. package/packages/layout-body/src/layout-body.ts +26 -14
  65. package/packages/list/src/list.ts +97 -41
  66. package/packages/scrollbar/src/scrollbar.ts +79 -17
  67. package/packages/tabs/src/tabs.ts +20 -7
  68. package/packages/tree/src/tree.ts +482 -67
  69. package/packages/ui/src/utils.ts +4 -0
  70. package/styles/components/list.scss +35 -10
  71. package/styles/components/tree.scss +76 -0
  72. package/types/components/card.d.ts +10 -1
  73. package/types/components/layout-aside.d.ts +10 -1
  74. package/types/components/layout-body.d.ts +10 -1
  75. package/types/components/list.d.ts +10 -1
  76. package/types/components/scrollbar.d.ts +16 -2
  77. package/types/components/table.d.ts +47 -4
  78. package/types/components/tabs.d.ts +10 -1
  79. package/types/components/tree.d.ts +33 -2
  80. /package/es/icon/{iconfont.1791880407207.ttf → iconfont.1791950618327.ttf} +0 -0
  81. /package/es/icon/{iconfont.1791880407207.woff → iconfont.1791950618327.woff} +0 -0
  82. /package/es/icon/{iconfont.1791880407207.woff2 → iconfont.1791950618327.woff2} +0 -0
  83. /package/es/{iconfont.1791880407207.ttf → iconfont.1791950618327.ttf} +0 -0
  84. /package/es/{iconfont.1791880407207.woff → iconfont.1791950618327.woff} +0 -0
  85. /package/es/{iconfont.1791880407207.woff2 → iconfont.1791950618327.woff2} +0 -0
  86. /package/lib/icon/style/{iconfont.1791880407207.ttf → iconfont.1791950618327.ttf} +0 -0
  87. /package/lib/icon/style/{iconfont.1791880407207.woff → iconfont.1791950618327.woff} +0 -0
  88. /package/lib/icon/style/{iconfont.1791880407207.woff2 → iconfont.1791950618327.woff2} +0 -0
  89. /package/lib/{iconfont.1791880407207.ttf → iconfont.1791950618327.ttf} +0 -0
  90. /package/lib/{iconfont.1791880407207.woff → iconfont.1791950618327.woff} +0 -0
  91. /package/lib/{iconfont.1791880407207.woff2 → iconfont.1791950618327.woff2} +0 -0
package/lib/index.umd.js CHANGED
@@ -13347,7 +13347,7 @@ var es_array_filter = __webpack_require__(2008);
13347
13347
 
13348
13348
 
13349
13349
  var log_log = VxeUI.log;
13350
- var uiVersion = "ui v".concat("3.20.0");
13350
+ var uiVersion = "ui v".concat("3.20.1");
13351
13351
  function createComponentLog(name) {
13352
13352
  var tableVersion = VxeUI.tableVersion ? "table v".concat(VxeUI.tableVersion) : '';
13353
13353
  var ganttVersion = VxeUI.ganttVersion ? "gantt v".concat(VxeUI.ganttVersion) : '';
@@ -13367,7 +13367,7 @@ var errLog = log_log.create('error', uiVersion);
13367
13367
 
13368
13368
 
13369
13369
 
13370
- var ui_version = "3.20.0";
13370
+ var ui_version = "3.20.1";
13371
13371
  VxeUI.uiVersion = ui_version;
13372
13372
  VxeUI.dynamicApp = dynamicApp;
13373
13373
  function config(options) {
@@ -16243,6 +16243,9 @@ function enModelValue(nodeid) {
16243
16243
  function deModelValue(nodeid) {
16244
16244
  return nodeid ? decodeURIComponent("".concat(nodeid)) : nodeid;
16245
16245
  }
16246
+ function getDefaultConfig(val1, def1) {
16247
+ return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(val1) ? def1 : val1;
16248
+ }
16246
16249
  // EXTERNAL MODULE: ./node_modules/core-js/modules/es.promise.js
16247
16250
  var es_promise = __webpack_require__(3362);
16248
16251
  ;// ./node_modules/@babel/runtime/helpers/esm/arrayLikeToArray.js
@@ -20887,6 +20890,7 @@ function getScrollFromDrag(pointerPosition, dragOffset, viewportSize, contentSiz
20887
20890
 
20888
20891
 
20889
20892
 
20893
+
20890
20894
  var scrollbar_getConfig = VxeUI.getConfig,
20891
20895
  scrollbar_createEvent = VxeUI.createEvent,
20892
20896
  scrollbar_domUtils = VxeUI.domUtils,
@@ -20914,6 +20918,7 @@ function scrollbar_createInternalData() {
20914
20918
  name: 'VxeScrollbar',
20915
20919
  props: {
20916
20920
  id: [String, Number],
20921
+ viewId: [String, Number],
20917
20922
  width: [String, Number],
20918
20923
  height: [String, Number],
20919
20924
  minWidth: [String, Number],
@@ -20933,6 +20938,18 @@ function scrollbar_createInternalData() {
20933
20938
  return scrollbar_getConfig().scrollbar.padding;
20934
20939
  }
20935
20940
  },
20941
+ autoHide: {
20942
+ type: Boolean,
20943
+ default: function _default() {
20944
+ return scrollbar_getConfig().scrollbar.autoHide;
20945
+ }
20946
+ },
20947
+ visible: {
20948
+ type: Boolean,
20949
+ default: function _default() {
20950
+ return scrollbar_getConfig().scrollbar.visible;
20951
+ }
20952
+ },
20936
20953
  xConfig: Object,
20937
20954
  yConfig: Object,
20938
20955
  className: {
@@ -20988,6 +21005,8 @@ function scrollbar_createInternalData() {
20988
21005
  maxHeight = props.maxHeight;
20989
21006
  var xOpts = $xeScrollbar.computeXOpts;
20990
21007
  var yOpts = $xeScrollbar.computeYOpts;
21008
+ var barWidth = yOpts.width;
21009
+ var barHeight = xOpts.height;
20991
21010
  var stys = {};
20992
21011
  if (width) {
20993
21012
  stys.width = toCssUnit(width);
@@ -21007,14 +21026,40 @@ function scrollbar_createInternalData() {
21007
21026
  if (maxHeight) {
21008
21027
  stys.maxHeight = toCssUnit(maxHeight);
21009
21028
  }
21010
- if (yOpts.width) {
21011
- stys['--vxe-ui-scrollbar-y-width'] = toCssUnit(yOpts.width);
21012
- }
21013
- if (xOpts.height) {
21014
- stys['--vxe-ui-scrollbar-x-height'] = toCssUnit(xOpts.height);
21029
+ if (barWidth || barHeight) {
21030
+ stys['--vxe-ui-scrollbar-y-width'] = toCssUnit(barWidth || barHeight);
21031
+ stys['--vxe-ui-scrollbar-x-height'] = toCssUnit(barHeight || barWidth);
21015
21032
  }
21016
21033
  return stys;
21017
21034
  },
21035
+ computeXVisible: function computeXVisible() {
21036
+ var $xeScrollbar = this;
21037
+ var props = $xeScrollbar;
21038
+ var visible = props.visible;
21039
+ var xOpts = $xeScrollbar.computeXOpts;
21040
+ return getDefaultConfig(xOpts.visible, visible);
21041
+ },
21042
+ computeYVisible: function computeYVisible() {
21043
+ var $xeScrollbar = this;
21044
+ var props = $xeScrollbar;
21045
+ var visible = props.visible;
21046
+ var yOpts = $xeScrollbar.computeYOpts;
21047
+ return getDefaultConfig(yOpts.visible, visible);
21048
+ },
21049
+ computeXAutoHide: function computeXAutoHide() {
21050
+ var $xeScrollbar = this;
21051
+ var props = $xeScrollbar;
21052
+ var autoHide = props.autoHide;
21053
+ var xOpts = $xeScrollbar.computeXOpts;
21054
+ return getDefaultConfig(xOpts.autoHide, autoHide);
21055
+ },
21056
+ computeYAutoHide: function computeYAutoHide() {
21057
+ var $xeScrollbar = this;
21058
+ var props = $xeScrollbar;
21059
+ var autoHide = props.autoHide;
21060
+ var yOpts = $xeScrollbar.computeYOpts;
21061
+ return getDefaultConfig(yOpts.autoHide, autoHide);
21062
+ },
21018
21063
  computeWrapperClss: function computeWrapperClss() {
21019
21064
  var $xeScrollbar = this;
21020
21065
  var props = $xeScrollbar;
@@ -21024,14 +21069,16 @@ function scrollbar_createInternalData() {
21024
21069
  padding = props.padding;
21025
21070
  var yThumbHeight = reactData.yThumbHeight,
21026
21071
  xThumbWidth = reactData.xThumbWidth;
21027
- var xOpts = $xeScrollbar.computeXOpts;
21028
- var yOpts = $xeScrollbar.computeYOpts;
21029
21072
  var xToTop = $xeScrollbar.computeXToTop;
21030
21073
  var yToLeft = $xeScrollbar.computeYToLeft;
21031
- return scrollbar_domUtils.buildClass(['vxe-scrollbar', "ov-x--".concat(xOpts.visible || 'visible'), "ov-y--".concat(yOpts.visible || 'visible'), "sx-pos--".concat(xToTop ? 'top' : 'bottom'), "sy-pos--".concat(yToLeft ? 'left' : 'right'), native ? 'is--native' : 'is--virtual', className], {
21074
+ var xVisible = $xeScrollbar.computeXVisible;
21075
+ var yVisible = $xeScrollbar.computeYVisible;
21076
+ var xAutoHide = $xeScrollbar.computeXAutoHide;
21077
+ var yAutoHide = $xeScrollbar.computeYAutoHide;
21078
+ return scrollbar_domUtils.buildClass(['vxe-scrollbar', "ov-x--".concat(xVisible === false ? 'hidden' : 'visible'), "ov-y--".concat(yVisible === false ? 'hidden' : 'visible'), "sx-pos--".concat(xToTop ? 'top' : 'bottom'), "sy-pos--".concat(yToLeft ? 'left' : 'right'), native ? 'is--native' : 'is--virtual', className], {
21032
21079
  'is--padding': padding,
21033
- 'ov-x--auto-hide': xOpts.autoHide,
21034
- 'ov-y--auto-hide': yOpts.autoHide,
21080
+ 'ov-x--auto-hide': xAutoHide,
21081
+ 'ov-y--auto-hide': yAutoHide,
21035
21082
  'overflow-y': yThumbHeight,
21036
21083
  'overflow-x': xThumbWidth
21037
21084
  });
@@ -21406,13 +21453,14 @@ function scrollbar_createInternalData() {
21406
21453
  var id = props.id,
21407
21454
  native = props.native,
21408
21455
  loading = props.loading,
21456
+ viewId = props.viewId,
21409
21457
  viewAttrs = props.viewAttrs;
21410
21458
  var wrapperStyle = $xeScrollbar.computeWrapperStyle;
21411
21459
  var wrapperClss = $xeScrollbar.computeWrapperClss;
21412
21460
  var viewClss = $xeScrollbar.computeViewClss;
21413
21461
  var viewInnerClss = $xeScrollbar.computeViewInnerClss;
21414
- var xOpts = $xeScrollbar.computeXOpts;
21415
- var yOpts = $xeScrollbar.computeYOpts;
21462
+ var xVisible = $xeScrollbar.computeXVisible;
21463
+ var yVisible = $xeScrollbar.computeYVisible;
21416
21464
  var defaultSlot = slots.default;
21417
21465
  return h('div', {
21418
21466
  ref: 'refElem',
@@ -21424,7 +21472,9 @@ function scrollbar_createInternalData() {
21424
21472
  }, [h('div', {
21425
21473
  ref: 'refViewElem',
21426
21474
  class: viewClss,
21427
- attrs: viewAttrs,
21475
+ attrs: _objectSpread2({
21476
+ id: viewId || null
21477
+ }, viewAttrs),
21428
21478
  on: {
21429
21479
  scroll: $xeScrollbar.scrollEvent
21430
21480
  }
@@ -21432,7 +21482,7 @@ function scrollbar_createInternalData() {
21432
21482
  key: 'vi',
21433
21483
  ref: 'refViewInnerElem',
21434
21484
  class: viewInnerClss
21435
- }, defaultSlot ? defaultSlot({}) : [])]), native || xOpts.visible === 'hidden' ? scrollbar_renderEmptyElement($xeScrollbar) : h('div', {
21485
+ }, defaultSlot ? defaultSlot({}) : [])]), native || xVisible === false ? scrollbar_renderEmptyElement($xeScrollbar) : h('div', {
21436
21486
  ref: 'refTrackXElem',
21437
21487
  class: 'vxe-scrollbar--track-x',
21438
21488
  on: {
@@ -21448,7 +21498,7 @@ function scrollbar_createInternalData() {
21448
21498
  pointercancel: $xeScrollbar.cleatPointerThumbEvent,
21449
21499
  lostpointercapture: $xeScrollbar.cleatPointerThumbEvent
21450
21500
  }
21451
- })]), native || yOpts.visible === 'hidden' ? scrollbar_renderEmptyElement($xeScrollbar) : h('div', {
21501
+ })]), native || yVisible === false ? scrollbar_renderEmptyElement($xeScrollbar) : h('div', {
21452
21502
  ref: 'refTrackYElem',
21453
21503
  class: 'vxe-scrollbar--track-y',
21454
21504
  on: {
@@ -21505,6 +21555,18 @@ function scrollbar_createInternalData() {
21505
21555
  var $xeScrollbar = this;
21506
21556
  $xeScrollbar.reFlag++;
21507
21557
  },
21558
+ computeXVisible: function computeXVisible() {
21559
+ var $xeScrollbar = this;
21560
+ $xeScrollbar.$nextTick(function () {
21561
+ $xeScrollbar.reFlag++;
21562
+ });
21563
+ },
21564
+ computeYVisible: function computeYVisible() {
21565
+ var $xeScrollbar = this;
21566
+ $xeScrollbar.$nextTick(function () {
21567
+ $xeScrollbar.reFlag++;
21568
+ });
21569
+ },
21508
21570
  reFlag: function reFlag() {
21509
21571
  var $xeScrollbar = this;
21510
21572
  $xeScrollbar.recalculate().then(function () {
@@ -21662,6 +21724,20 @@ var Scrollbar = VxeScrollbar;
21662
21724
  var $xeCard = this;
21663
21725
  var props = $xeCard;
21664
21726
  return Object.assign({}, getConfig().card.scrollbarConfig, props.scrollbarConfig);
21727
+ },
21728
+ computeScrollbarProps: function computeScrollbarProps() {
21729
+ var $xeCard = this;
21730
+ var scrollbarOpts = $xeCard.computeScrollbarOpts;
21731
+ return {
21732
+ width: scrollbarOpts.width,
21733
+ height: scrollbarOpts.height,
21734
+ autoHide: scrollbarOpts.autoHide,
21735
+ visible: scrollbarOpts.visible,
21736
+ xConfig: scrollbarOpts.xConfig,
21737
+ yConfig: scrollbarOpts.yConfig,
21738
+ className: scrollbarOpts.className,
21739
+ viewAttrs: scrollbarOpts.viewAttrs
21740
+ };
21665
21741
  }
21666
21742
  }),
21667
21743
  methods: {
@@ -21698,6 +21774,7 @@ var Scrollbar = VxeScrollbar;
21698
21774
  var vSize = $xeCard.computeSize;
21699
21775
  var cardStyle = $xeCard.computeCardStyle;
21700
21776
  var scrollbarOpts = $xeCard.computeScrollbarOpts;
21777
+ var scrollbarProps = $xeCard.computeScrollbarProps;
21701
21778
  var viewClassName = scrollbarOpts.viewClassName,
21702
21779
  viewInnerClassName = scrollbarOpts.viewInnerClassName;
21703
21780
  return h('div', {
@@ -21716,7 +21793,7 @@ var Scrollbar = VxeScrollbar;
21716
21793
  class: 'vxe-card--body'
21717
21794
  }, [leftSlot ? useScrollbar ? h(packages_scrollbar, {
21718
21795
  class: 'vxe-card--body-scrollbar-left',
21719
- props: _objectSpread2(_objectSpread2({}, scrollbarOpts), {}, {
21796
+ props: _objectSpread2(_objectSpread2({}, scrollbarProps), {}, {
21720
21797
  viewClassName: 'vxe-card--body-scrollbar-left-view',
21721
21798
  viewInnerClassName: 'vxe-card--body-scrollbar-left-inner'
21722
21799
  }),
@@ -21729,7 +21806,7 @@ var Scrollbar = VxeScrollbar;
21729
21806
  class: 'vxe-card--body-left'
21730
21807
  }, vn_getSlotVNs(leftSlot({}))) : renderEmptyElement($xeCard), useScrollbar ? h(packages_scrollbar, {
21731
21808
  class: 'vxe-card--body-scrollbar-content',
21732
- props: _objectSpread2(_objectSpread2({}, scrollbarOpts), {}, {
21809
+ props: _objectSpread2(_objectSpread2({}, scrollbarProps), {}, {
21733
21810
  viewClassName: 'vxe-card--body-scrollbar-content-view' + (viewClassName ? ' ' + viewClassName : ''),
21734
21811
  viewInnerClassName: 'vxe-card--body-scrollbar-content-inner' + (viewClassName ? ' ' + viewInnerClassName : '')
21735
21812
  }),
@@ -21742,7 +21819,7 @@ var Scrollbar = VxeScrollbar;
21742
21819
  class: 'vxe-card--body-content'
21743
21820
  }, defaultSlot ? vn_getSlotVNs(defaultSlot({})) : []), rightSlot ? useScrollbar ? h(packages_scrollbar, {
21744
21821
  class: 'vxe-card--body-scrollbar-right',
21745
- props: _objectSpread2(_objectSpread2({}, scrollbarOpts), {}, {
21822
+ props: _objectSpread2(_objectSpread2({}, scrollbarProps), {}, {
21746
21823
  viewClassName: 'vxe-card--body-scrollbar-right-view',
21747
21824
  viewInnerClassName: 'vxe-card--body-scrollbar-right-inner'
21748
21825
  }),
@@ -22780,17 +22857,18 @@ function list_createInternalData() {
22780
22857
  computeWrapperStyles: function computeWrapperStyles() {
22781
22858
  var $xeList = this;
22782
22859
  var rowHeight = $xeList.computeRowHeight;
22860
+ var scrollbarOpts = $xeList.computeScrollbarOpts;
22783
22861
  var scrollbarXOpts = $xeList.computeScrollbarXOpts;
22784
22862
  var scrollbarYOpts = $xeList.computeScrollbarYOpts;
22863
+ var barWidth = getDefaultConfig(getDefaultConfig(scrollbarYOpts.width, scrollbarOpts.width), getConfig().scrollbar.width);
22864
+ var barHeight = getDefaultConfig(getDefaultConfig(scrollbarXOpts.height, scrollbarOpts.height), getConfig().scrollbar.height);
22785
22865
  var stys = {};
22786
22866
  if (rowHeight) {
22787
22867
  stys['--vxe-ui-list-row-height'] = toCssUnit(rowHeight);
22788
22868
  }
22789
- if (scrollbarYOpts.width) {
22790
- stys['--vxe-ui-scrollbar-y-width'] = toCssUnit(scrollbarYOpts.width);
22791
- }
22792
- if (scrollbarXOpts.height) {
22793
- stys['--vxe-ui-scrollbar-x-height'] = toCssUnit(scrollbarXOpts.height);
22869
+ if (barWidth || barHeight) {
22870
+ stys['--vxe-ui-scrollbar-y-width'] = toCssUnit(barWidth || barHeight);
22871
+ stys['--vxe-ui-scrollbar-x-height'] = toCssUnit(barHeight || barWidth);
22794
22872
  }
22795
22873
  return stys;
22796
22874
  },
@@ -22828,6 +22906,30 @@ function list_createInternalData() {
22828
22906
  var scrollbarOpts = $xeList.computeScrollbarOpts;
22829
22907
  return Object.assign({}, getConfig().scrollbar.yConfig, scrollbarOpts.yConfig);
22830
22908
  },
22909
+ computeScrollXVisible: function computeScrollXVisible() {
22910
+ var $xeList = this;
22911
+ var scrollbarOpts = $xeList.computeScrollbarOpts;
22912
+ var scrollbarXOpts = $xeList.computeScrollbarXOpts;
22913
+ return getDefaultConfig(scrollbarXOpts.visible, scrollbarOpts.visible);
22914
+ },
22915
+ computeScrollYVisible: function computeScrollYVisible() {
22916
+ var $xeList = this;
22917
+ var scrollbarOpts = $xeList.computeScrollbarOpts;
22918
+ var scrollbarYOpts = $xeList.computeScrollbarYOpts;
22919
+ return getDefaultConfig(scrollbarYOpts.visible, scrollbarOpts.visible);
22920
+ },
22921
+ computeScrollXAutoHide: function computeScrollXAutoHide() {
22922
+ var $xeList = this;
22923
+ var scrollbarOpts = $xeList.computeScrollbarOpts;
22924
+ var scrollbarXOpts = $xeList.computeScrollbarXOpts;
22925
+ return getDefaultConfig(getDefaultConfig(scrollbarXOpts.autoHide, scrollbarOpts.autoHide), getConfig().scrollbar.autoHide);
22926
+ },
22927
+ computeScrollYAutoHide: function computeScrollYAutoHide() {
22928
+ var $xeList = this;
22929
+ var scrollbarOpts = $xeList.computeScrollbarOpts;
22930
+ var scrollbarYOpts = $xeList.computeScrollbarYOpts;
22931
+ return getDefaultConfig(getDefaultConfig(scrollbarYOpts.autoHide, scrollbarOpts.autoHide), getConfig().scrollbar.autoHide);
22932
+ },
22831
22933
  computeScrollbarWrapperClss: function computeScrollbarWrapperClss() {
22832
22934
  var $xeList = this;
22833
22935
  var reactData = $xeList.reactData;
@@ -22835,14 +22937,16 @@ function list_createInternalData() {
22835
22937
  var padding = scrollbarOpts.padding;
22836
22938
  var yThumbHeight = reactData.yThumbHeight,
22837
22939
  xThumbWidth = reactData.xThumbWidth;
22838
- var scrollbarXOpts = $xeList.computeScrollbarXOpts;
22839
- var scrollbarYOpts = $xeList.computeScrollbarYOpts;
22840
22940
  var scrollbarXToTop = $xeList.computeScrollbarXToTop;
22841
22941
  var scrollbarYToLeft = $xeList.computeScrollbarYToLeft;
22842
- return domUtils.buildClass(['vxe-scrollbar is--virtual', "ov-x--".concat(scrollbarXOpts.visible || 'visible'), "ov-y--".concat(scrollbarYOpts.visible || 'visible'), "sx-pos--".concat(scrollbarXToTop ? 'top' : 'bottom'), "sy-pos--".concat(scrollbarYToLeft ? 'left' : 'right')], {
22942
+ var scrollXVisible = $xeList.computeScrollXVisible;
22943
+ var scrollYVisible = $xeList.computeScrollYVisible;
22944
+ var scrollXAutoHide = $xeList.computeScrollXAutoHide;
22945
+ var scrollYAutoHide = $xeList.computeScrollYAutoHide;
22946
+ return domUtils.buildClass(['vxe-scrollbar is--virtual', "ov-x--".concat(scrollXVisible === false ? 'hidden' : 'visible'), "ov-y--".concat(scrollYVisible === false ? 'hidden' : 'visible'), "sx-pos--".concat(scrollbarXToTop ? 'top' : 'bottom'), "sy-pos--".concat(scrollbarYToLeft ? 'left' : 'right')], {
22843
22947
  'is--padding': padding,
22844
- 'ov-x--auto-hide': scrollbarXOpts.autoHide,
22845
- 'ov-y--auto-hide': scrollbarYOpts.autoHide,
22948
+ 'ov-x--auto-hide': scrollXAutoHide,
22949
+ 'ov-y--auto-hide': scrollYAutoHide,
22846
22950
  'overflow-y': yThumbHeight,
22847
22951
  'overflow-x': xThumbWidth
22848
22952
  });
@@ -25042,7 +25146,9 @@ function list_createInternalData() {
25042
25146
  topSpaceHeight = reactData.topSpaceHeight,
25043
25147
  rowList = reactData.rowList,
25044
25148
  isAllChecked = reactData.isAllChecked,
25045
- isAllIndeterminate = reactData.isAllIndeterminate;
25149
+ isAllIndeterminate = reactData.isAllIndeterminate,
25150
+ xThumbWidth = reactData.xThumbWidth,
25151
+ yThumbHeight = reactData.yThumbHeight;
25046
25152
  var defaultSlot = slots.default;
25047
25153
  var headerSlot = slots.header;
25048
25154
  var footerSlot = slots.footer;
@@ -25058,8 +25164,13 @@ function list_createInternalData() {
25058
25164
  var isHover = rowOpts.isHover,
25059
25165
  padding = rowOpts.padding;
25060
25166
  var isDrag = $xeList.computeIsDrag;
25061
- var scrollbarXOpts = $xeList.computeScrollbarXOpts;
25062
- var scrollbarYOpts = $xeList.computeScrollbarYOpts;
25167
+ var scrollbarOpts = $xeList.computeScrollbarOpts;
25168
+ var scrollXVisible = $xeList.computeScrollXVisible;
25169
+ var scrollYVisible = $xeList.computeScrollYVisible;
25170
+ var scrollbarXToTop = $xeList.computeScrollbarXToTop;
25171
+ var scrollbarYToLeft = $xeList.computeScrollbarYToLeft;
25172
+ var scrollXAutoHide = $xeList.computeScrollXAutoHide;
25173
+ var scrollYAutoHide = $xeList.computeScrollYAutoHide;
25063
25174
  var scrollbarWrapperClss = $xeList.computeScrollbarWrapperClss;
25064
25175
  var showDefChekboxHead = showCheckbox && checkboxOpts.showHeader !== false;
25065
25176
  var leOns = {};
@@ -25068,9 +25179,9 @@ function list_createInternalData() {
25068
25179
  }
25069
25180
  return h('div', {
25070
25181
  ref: 'refElem',
25071
- class: ['vxe-list', className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(className) ? className({
25182
+ class: ['vxe-list', useScrollbar ? "ov-x--".concat(scrollXVisible === false ? 'hidden' : 'visible') : '', useScrollbar ? "ov-y--".concat(scrollYVisible === false ? 'hidden' : 'visible') : '', useScrollbar ? "sx-pos--".concat(scrollbarXToTop ? 'top' : 'bottom') : '', useScrollbar ? "sy-pos--".concat(scrollbarYToLeft ? 'left' : 'right') : '', className ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(className) ? className({
25072
25183
  $list: $xeList
25073
- }) : className : '', _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--virtual-scrollbar', useScrollbar), 'ov-x--auto-hide', useScrollbar && scrollbarXOpts.autoHide), 'ov-y--auto-hide', useScrollbar && scrollbarYOpts.autoHide), 'is--drag', isDrag), 'is--loading', loading)],
25184
+ }) : className : '', _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--virtual-scrollbar', useScrollbar), 'ov-padding', useScrollbar && scrollbarOpts.padding), 'ov-x--auto-hide', useScrollbar && scrollXAutoHide), 'ov-y--auto-hide', useScrollbar && scrollYAutoHide), 'overflow-y', yThumbHeight), 'overflow-x', xThumbWidth), 'is--drag', isDrag), 'is--loading', loading)],
25074
25185
  on: leOns,
25075
25186
  style: wrapperStyles
25076
25187
  }, [headerSlot || showDefChekboxHead ? h('div', {
@@ -25117,21 +25228,12 @@ function list_createInternalData() {
25117
25228
  style: {
25118
25229
  marginTop: topSpaceHeight ? "".concat(topSpaceHeight, "px") : ''
25119
25230
  }
25120
- }, useScrollbar ? defaultSlot ? defaultSlot({
25121
- items: rowList,
25122
- $list: $xeList
25123
- }) : rowList.map(function (row, i) {
25124
- return $xeList.renderRow(h, row, i);
25125
- }) : [h('div', {
25126
- key: 'vi',
25127
- ref: 'refViewInnerElem',
25128
- class: 'vxe-scrollbar--view-inner'
25129
25231
  }, defaultSlot ? defaultSlot({
25130
25232
  items: rowList,
25131
25233
  $list: $xeList
25132
25234
  }) : rowList.map(function (row, i) {
25133
25235
  return $xeList.renderRow(h, row, i);
25134
- }))])]), footerSlot ? h('div', {
25236
+ }))]), footerSlot ? h('div', {
25135
25237
  ref: 'refFooterElem',
25136
25238
  class: 'vxe-list--footer-wrapper'
25137
25239
  }, footerSlot({
@@ -25143,7 +25245,7 @@ function list_createInternalData() {
25143
25245
  */
25144
25246
  useScrollbar ? h('div', {
25145
25247
  class: scrollbarWrapperClss
25146
- }, [scrollbarXOpts.visible === 'hidden' ? renderEmptyElement($xeList) : h('div', {
25248
+ }, [scrollXVisible === false ? renderEmptyElement($xeList) : h('div', {
25147
25249
  ref: 'refTrackXElem',
25148
25250
  class: 'vxe-scrollbar--track-x',
25149
25251
  on: {
@@ -25159,7 +25261,7 @@ function list_createInternalData() {
25159
25261
  pointercancel: $xeList.cleatPointerThumbEvent,
25160
25262
  lostpointercapture: $xeList.cleatPointerThumbEvent
25161
25263
  }
25162
- })]), scrollbarYOpts.visible === 'hidden' ? renderEmptyElement($xeList) : h('div', {
25264
+ })]), scrollYVisible === false ? renderEmptyElement($xeList) : h('div', {
25163
25265
  ref: 'refTrackYElem',
25164
25266
  class: 'vxe-scrollbar--track-y',
25165
25267
  on: {
@@ -25209,13 +25311,29 @@ function list_createInternalData() {
25209
25311
  var $xeList = this;
25210
25312
  $xeList.reFlag++;
25211
25313
  },
25314
+ useScrollbar: function useScrollbar() {
25315
+ var $xeList = this;
25316
+ $xeList.reFlag++;
25317
+ },
25212
25318
  computeRowHeight: function computeRowHeight() {
25213
25319
  var $xeList = this;
25214
25320
  $xeList.reFlag++;
25215
25321
  },
25216
- reFlag: function reFlag() {
25322
+ computeScrollXVisible: function computeScrollXVisible() {
25217
25323
  var $xeList = this;
25218
25324
  $xeList.$nextTick(function () {
25325
+ $xeList.reFlag++;
25326
+ });
25327
+ },
25328
+ computeScrollYVisible: function computeScrollYVisible() {
25329
+ var $xeList = this;
25330
+ $xeList.$nextTick(function () {
25331
+ $xeList.reFlag++;
25332
+ });
25333
+ },
25334
+ reFlag: function reFlag() {
25335
+ var $xeList = this;
25336
+ $xeList.recalculate().then(function () {
25219
25337
  $xeList.recalculate();
25220
25338
  });
25221
25339
  },
@@ -25267,13 +25385,13 @@ function list_createInternalData() {
25267
25385
  }
25268
25386
  if (useScrollbar || autoResize) {
25269
25387
  var el = $xeList.$refs.refElem;
25270
- var viewInnerEl = $xeList.$refs.refViewInnerElem;
25388
+ var viewInnerEl = $xeList.$refs.refVirtualBody;
25271
25389
  var resizeObserver = globalResize.create(function () {
25272
25390
  $xeList.reFlag++;
25273
25391
  });
25274
- resizeObserver.observe(el);
25275
- if (autoResize) {
25276
- if (el) {
25392
+ if (el) {
25393
+ resizeObserver.observe(el);
25394
+ if (autoResize) {
25277
25395
  resizeObserver.observe(el.parentElement);
25278
25396
  }
25279
25397
  }
@@ -48879,10 +48997,7 @@ var ImagePreview = VxeImagePreview;
48879
48997
  var vSize = $xeLayoutAside.computeSize;
48880
48998
  var collapseOpts = $xeLayoutAside.computeCollapseOpts;
48881
48999
  var scrollbarOpts = $xeLayoutAside.computeScrollbarOpts;
48882
- var native = scrollbarOpts.native,
48883
- yConfig = scrollbarOpts.yConfig,
48884
- className = scrollbarOpts.className,
48885
- viewAttrs = scrollbarOpts.viewAttrs,
49000
+ var className = scrollbarOpts.className,
48886
49001
  viewClassName = scrollbarOpts.viewClassName,
48887
49002
  viewInnerClassName = scrollbarOpts.viewInnerClassName;
48888
49003
  var defaultSlot = slots.default;
@@ -48891,13 +49006,16 @@ var ImagePreview = VxeImagePreview;
48891
49006
  style: varStyle
48892
49007
  }, [useScrollbar ? h(packages_scrollbar, {
48893
49008
  props: {
48894
- native: native,
49009
+ width: scrollbarOpts.width,
49010
+ height: scrollbarOpts.height,
49011
+ autoHide: scrollbarOpts.autoHide,
49012
+ visible: scrollbarOpts.visible,
48895
49013
  xConfig: {
48896
- visible: 'hidden'
49014
+ visible: false
48897
49015
  },
48898
- yConfig: yConfig,
49016
+ yConfig: scrollbarOpts.yConfig,
48899
49017
  className: 'vxe-layout-aside--scrollbar' + (className ? ' ' + className : ''),
48900
- viewAttrs: viewAttrs,
49018
+ viewAttrs: scrollbarOpts.viewAttrs,
48901
49019
  viewClassName: 'vxe-layout-aside--scrollbar-view' + (viewClassName ? ' ' + viewClassName : ''),
48902
49020
  viewInnerClassName: 'vxe-layout-aside--scrollbar-inner' + (viewInnerClassName ? ' ' + viewInnerClassName : '')
48903
49021
  },
@@ -49005,6 +49123,30 @@ function layout_body_createReactData() {
49005
49123
  var $xeLayoutBody = this;
49006
49124
  var props = $xeLayoutBody;
49007
49125
  return Object.assign({}, getConfig().layoutBody.scrollbarConfig, props.scrollbarConfig);
49126
+ },
49127
+ computeScrollbarProps: function computeScrollbarProps() {
49128
+ var $xeLayoutBody = this;
49129
+ var props = $xeLayoutBody;
49130
+ var backtopId = $xeLayoutBody.backtopId;
49131
+ var showBacktop = props.showBacktop;
49132
+ var scrollbarOpts = $xeLayoutBody.computeScrollbarOpts;
49133
+ var className = scrollbarOpts.className,
49134
+ viewClassName = scrollbarOpts.viewClassName,
49135
+ viewInnerClassName = scrollbarOpts.viewInnerClassName;
49136
+ return {
49137
+ width: scrollbarOpts.width,
49138
+ height: scrollbarOpts.height,
49139
+ autoHide: scrollbarOpts.autoHide,
49140
+ visible: scrollbarOpts.visible,
49141
+ xConfig: scrollbarOpts.xConfig,
49142
+ yConfig: scrollbarOpts.yConfig,
49143
+ className: 'vxe-layout-body--scrollbar' + (className ? ' ' + className : ''),
49144
+ viewAttrs: _objectSpread2(_objectSpread2({}, scrollbarOpts.viewAttrs), {}, {
49145
+ id: showBacktop ? backtopId || null : null
49146
+ }),
49147
+ viewClassName: 'vxe-layout-body--scrollbar-view' + (viewClassName ? ' ' + viewClassName : ''),
49148
+ viewInnerClassName: 'vxe-layout-body--scrollbar-inner' + (viewInnerClassName ? ' ' + viewInnerClassName : '')
49149
+ };
49008
49150
  }
49009
49151
  }),
49010
49152
  methods: {
@@ -49030,14 +49172,7 @@ function layout_body_createReactData() {
49030
49172
  showBacktop = props.showBacktop,
49031
49173
  useScrollbar = props.useScrollbar;
49032
49174
  var backtopOpts = $xeLayoutBody.computeBacktopOpts;
49033
- var scrollbarOpts = $xeLayoutBody.computeScrollbarOpts;
49034
- var native = scrollbarOpts.native,
49035
- xConfig = scrollbarOpts.xConfig,
49036
- yConfig = scrollbarOpts.yConfig,
49037
- className = scrollbarOpts.className,
49038
- viewAttrs = scrollbarOpts.viewAttrs,
49039
- viewClassName = scrollbarOpts.viewClassName,
49040
- viewInnerClassName = scrollbarOpts.viewInnerClassName;
49175
+ var scrollbarProps = $xeLayoutBody.computeScrollbarProps;
49041
49176
  var vSize = $xeLayoutBody.computeSize;
49042
49177
  var defaultSlot = slots.default;
49043
49178
  var backtopSlot = slots.backtop;
@@ -49056,17 +49191,7 @@ function layout_body_createReactData() {
49056
49191
  return h('div', {
49057
49192
  class: ['vxe-layout-body', _defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--loading', loading), 'is--padding', padding)]
49058
49193
  }, [useScrollbar ? h(packages_scrollbar, {
49059
- props: {
49060
- native: native,
49061
- xConfig: xConfig,
49062
- yConfig: yConfig,
49063
- className: 'vxe-layout-body--scrollbar' + (className ? ' ' + className : ''),
49064
- viewAttrs: _objectSpread2(_objectSpread2({}, viewAttrs), {}, {
49065
- id: showBacktop ? backtopId || null : null
49066
- }),
49067
- viewClassName: 'vxe-layout-body--scrollbar-view' + (viewClassName ? ' ' + viewClassName : ''),
49068
- viewInnerClassName: 'vxe-layout-body--scrollbar-inner' + (viewInnerClassName ? ' ' + viewInnerClassName : '')
49069
- },
49194
+ props: scrollbarProps,
49070
49195
  scopedSlots: {
49071
49196
  default: function _default() {
49072
49197
  return defaultSlot ? defaultSlot({}) : [];
@@ -63103,6 +63228,24 @@ var scrollbarOffsetSize = 20;
63103
63228
  var $xeTabs = this;
63104
63229
  var props = $xeTabs;
63105
63230
  return Object.assign({}, getConfig().tabs.scrollbarConfig, props.scrollbarConfig);
63231
+ },
63232
+ computeScrollbarProps: function computeScrollbarProps() {
63233
+ var $xeTabs = this;
63234
+ var scrollbarOpts = $xeTabs.computeScrollbarOpts;
63235
+ var viewClassName = scrollbarOpts.viewClassName,
63236
+ viewInnerClassName = scrollbarOpts.viewInnerClassName;
63237
+ return {
63238
+ width: scrollbarOpts.width,
63239
+ height: scrollbarOpts.height,
63240
+ autoHide: scrollbarOpts.autoHide,
63241
+ visible: scrollbarOpts.visible,
63242
+ xConfig: scrollbarOpts.xConfig,
63243
+ yConfig: scrollbarOpts.yConfig,
63244
+ className: scrollbarOpts.className,
63245
+ viewAttrs: scrollbarOpts.viewAttrs,
63246
+ viewClassName: 'vxe-tabs-pane--scrollbar-item-view' + (viewClassName ? ' ' + viewClassName : ''),
63247
+ viewInnerClassName: 'vxe-tabs-pane--scrollbar-item-inner' + (viewClassName ? ' ' + viewInnerClassName : '')
63248
+ };
63106
63249
  }
63107
63250
  }),
63108
63251
  methods: {
@@ -63786,19 +63929,14 @@ var scrollbarOffsetSize = 20;
63786
63929
  var name = item.name,
63787
63930
  slots = item.slots;
63788
63931
  var defaultSlot = slots ? slots.default : null;
63789
- var scrollbarOpts = $xeTabs.computeScrollbarOpts;
63790
- var viewClassName = scrollbarOpts.viewClassName,
63791
- viewInnerClassName = scrollbarOpts.viewInnerClassName;
63932
+ var scrollbarProps = $xeTabs.computeScrollbarProps;
63792
63933
  if (name && initNames.includes(name)) {
63793
63934
  return useScrollbar ? h(packages_scrollbar, {
63794
63935
  key: "".concat(name),
63795
63936
  class: ['vxe-tabs-pane--scrollbar-item', {
63796
63937
  'is--visible': activeName === name
63797
63938
  }],
63798
- props: _objectSpread2(_objectSpread2({}, scrollbarOpts), {}, {
63799
- viewClassName: 'vxe-tabs-pane--scrollbar-item-view' + (viewClassName ? ' ' + viewClassName : ''),
63800
- viewInnerClassName: 'vxe-tabs-pane--scrollbar-item-inner' + (viewClassName ? ' ' + viewInnerClassName : '')
63801
- }),
63939
+ props: scrollbarProps,
63802
63940
  scopedSlots: {
63803
63941
  default: function _default() {
63804
63942
  return defaultSlot ? $xeTabs.callSlot(defaultSlot, {
@@ -65498,6 +65636,7 @@ function getCrossTreeDragNodeInfo($xeTree) {
65498
65636
 
65499
65637
 
65500
65638
 
65639
+
65501
65640
 
65502
65641
 
65503
65642
  var tree_createComponentLog = createComponentLog('tree'),
@@ -65995,6 +66134,34 @@ function insertTreeNode($xeTree, newRecords, isAppend) {
65995
66134
  nodeMaps[nodeid] = itemRest;
65996
66135
  });
65997
66136
  }
66137
+ function tree_createReactData() {
66138
+ return {
66139
+ parentHeight: 0,
66140
+ customHeight: 0,
66141
+ customMinHeight: 0,
66142
+ customMaxHeight: 0,
66143
+ currentNode: null,
66144
+ scrollYLoad: false,
66145
+ bodyHeight: 0,
66146
+ topSpaceHeight: 0,
66147
+ selectRadioKey: null,
66148
+ treeList: [],
66149
+ updateExpandedFlag: 1,
66150
+ updateCheckboxFlag: 1,
66151
+ // 滚动条
66152
+ yThumbHeight: 0,
66153
+ xThumbWidth: 0,
66154
+ insertNodeFlag: 1,
66155
+ removeNodeFlag: 1,
66156
+ dragNode: null,
66157
+ dragTipText: '',
66158
+ isCrossDragNode: false,
66159
+ tooltipStore: {
66160
+ visible: false,
66161
+ node: null
66162
+ }
66163
+ };
66164
+ }
65998
66165
  function tree_createInternalData() {
65999
66166
  return {
66000
66167
  // initialized: false,
@@ -66007,8 +66174,14 @@ function tree_createInternalData() {
66007
66174
  indeterminateNodeMaps: {},
66008
66175
  treeExpandedMaps: {},
66009
66176
  treeExpandLazyLoadedMaps: {},
66010
- lastScrollLeft: 0,
66177
+ // 滚动条
66178
+ // resizeObserver: undefined,
66179
+ // isThumbDrag: false,
66180
+ thumbDragOffset: 0,
66181
+ yThumbTop: 0,
66182
+ xThumbLeft: 0,
66011
66183
  lastScrollTop: 0,
66184
+ lastScrollLeft: 0,
66012
66185
  scrollYStore: {
66013
66186
  startIndex: 0,
66014
66187
  endIndex: 0,
@@ -66025,31 +66198,6 @@ function tree_createInternalData() {
66025
66198
  // hpTimeout: undefined
66026
66199
  };
66027
66200
  }
66028
- function tree_createReactData() {
66029
- return {
66030
- parentHeight: 0,
66031
- customHeight: 0,
66032
- customMinHeight: 0,
66033
- customMaxHeight: 0,
66034
- currentNode: null,
66035
- scrollYLoad: false,
66036
- bodyHeight: 0,
66037
- topSpaceHeight: 0,
66038
- selectRadioKey: null,
66039
- treeList: [],
66040
- updateExpandedFlag: 1,
66041
- updateCheckboxFlag: 1,
66042
- insertNodeFlag: 1,
66043
- removeNodeFlag: 1,
66044
- dragNode: null,
66045
- dragTipText: '',
66046
- isCrossDragNode: false,
66047
- tooltipStore: {
66048
- visible: false,
66049
- node: null
66050
- }
66051
- };
66052
- }
66053
66201
  /* harmony default export */ var tree = (/* define-vxe-component start */defineVxeComponent({
66054
66202
  name: 'VxeTree',
66055
66203
  mixins: [globalMixins.sizeMixin],
@@ -66228,7 +66376,14 @@ function tree_createReactData() {
66228
66376
  return tree_getConfig().tree.size || tree_getConfig().size;
66229
66377
  }
66230
66378
  },
66231
- virtualYConfig: Object
66379
+ virtualYConfig: Object,
66380
+ useScrollbar: {
66381
+ type: Boolean,
66382
+ default: function _default() {
66383
+ return tree_getConfig().tree.useScrollbar;
66384
+ }
66385
+ },
66386
+ scrollbarConfig: Object
66232
66387
  },
66233
66388
  provide: function provide() {
66234
66389
  var $xeTree = this;
@@ -66243,7 +66398,7 @@ function tree_createReactData() {
66243
66398
  xID: xID,
66244
66399
  reactData: reactData,
66245
66400
  crossTreeDragNodeInfo: crossTreeDragNodeGlobal,
66246
- hFlag: 0,
66401
+ reFlag: 0,
66247
66402
  dataFlag: 0
66248
66403
  });
66249
66404
  },
@@ -66348,6 +66503,20 @@ function tree_createReactData() {
66348
66503
  var props = $xeTree;
66349
66504
  return Object.assign({}, tree_getConfig().tree.menuConfig, props.menuConfig);
66350
66505
  },
66506
+ computeWrapperStyles: function computeWrapperStyles() {
66507
+ var $xeTree = this;
66508
+ var scrollbarOpts = $xeTree.computeScrollbarOpts;
66509
+ var scrollbarXOpts = $xeTree.computeScrollbarXOpts;
66510
+ var scrollbarYOpts = $xeTree.computeScrollbarYOpts;
66511
+ var barWidth = getDefaultConfig(getDefaultConfig(scrollbarYOpts.width, scrollbarOpts.width), tree_getConfig().scrollbar.width);
66512
+ var barHeight = getDefaultConfig(getDefaultConfig(scrollbarXOpts.height, scrollbarOpts.height), tree_getConfig().scrollbar.height);
66513
+ var stys = {};
66514
+ if (barWidth || barHeight) {
66515
+ stys['--vxe-ui-scrollbar-y-width'] = toCssUnit(barWidth || barHeight);
66516
+ stys['--vxe-ui-scrollbar-x-height'] = toCssUnit(barHeight || barWidth);
66517
+ }
66518
+ return stys;
66519
+ },
66351
66520
  computeTreeStyle: function computeTreeStyle() {
66352
66521
  var $xeTree = this;
66353
66522
  var props = $xeTree;
@@ -66387,6 +66556,78 @@ function tree_createReactData() {
66387
66556
  var $xeTree = this;
66388
66557
  var props = $xeTree;
66389
66558
  return Object.assign({}, tree_getConfig().tree.filterConfig, props.filterConfig);
66559
+ },
66560
+ computeScrollbarOpts: function computeScrollbarOpts() {
66561
+ var $xeTree = this;
66562
+ var props = $xeTree;
66563
+ return Object.assign({}, tree_getConfig().tree.scrollbarConfig, props.scrollbarConfig);
66564
+ },
66565
+ computeScrollbarXOpts: function computeScrollbarXOpts() {
66566
+ var $xeTree = this;
66567
+ var scrollbarOpts = $xeTree.computeScrollbarOpts;
66568
+ return Object.assign({}, tree_getConfig().scrollbar.xConfig, scrollbarOpts.xConfig, {
66569
+ visible: false
66570
+ });
66571
+ },
66572
+ computeScrollbarYOpts: function computeScrollbarYOpts() {
66573
+ var $xeTree = this;
66574
+ var scrollbarOpts = $xeTree.computeScrollbarOpts;
66575
+ return Object.assign({}, tree_getConfig().scrollbar.yConfig, scrollbarOpts.yConfig);
66576
+ },
66577
+ computeScrollXVisible: function computeScrollXVisible() {
66578
+ var $xeTree = this;
66579
+ var scrollbarOpts = $xeTree.computeScrollbarOpts;
66580
+ var scrollbarXOpts = $xeTree.computeScrollbarXOpts;
66581
+ return getDefaultConfig(scrollbarXOpts.visible, scrollbarOpts.visible);
66582
+ },
66583
+ computeScrollYVisible: function computeScrollYVisible() {
66584
+ var $xeTree = this;
66585
+ var scrollbarOpts = $xeTree.computeScrollbarOpts;
66586
+ var scrollbarYOpts = $xeTree.computeScrollbarYOpts;
66587
+ return getDefaultConfig(scrollbarYOpts.visible, scrollbarOpts.visible);
66588
+ },
66589
+ computeScrollXAutoHide: function computeScrollXAutoHide() {
66590
+ var $xeTree = this;
66591
+ var scrollbarOpts = $xeTree.computeScrollbarOpts;
66592
+ var scrollbarXOpts = $xeTree.computeScrollbarXOpts;
66593
+ return getDefaultConfig(getDefaultConfig(scrollbarXOpts.autoHide, scrollbarOpts.autoHide), tree_getConfig().scrollbar.autoHide);
66594
+ },
66595
+ computeScrollYAutoHide: function computeScrollYAutoHide() {
66596
+ var $xeTree = this;
66597
+ var scrollbarOpts = $xeTree.computeScrollbarOpts;
66598
+ var scrollbarYOpts = $xeTree.computeScrollbarYOpts;
66599
+ return getDefaultConfig(getDefaultConfig(scrollbarYOpts.autoHide, scrollbarOpts.autoHide), tree_getConfig().scrollbar.autoHide);
66600
+ },
66601
+ computeScrollbarWrapperClss: function computeScrollbarWrapperClss() {
66602
+ var $xeTree = this;
66603
+ var reactData = $xeTree.reactData;
66604
+ var scrollbarOpts = $xeTree.computeScrollbarOpts;
66605
+ var padding = scrollbarOpts.padding;
66606
+ var yThumbHeight = reactData.yThumbHeight,
66607
+ xThumbWidth = reactData.xThumbWidth;
66608
+ var scrollbarXToTop = $xeTree.computeScrollbarXToTop;
66609
+ var scrollbarYToLeft = $xeTree.computeScrollbarYToLeft;
66610
+ var scrollXVisible = $xeTree.computeScrollXVisible;
66611
+ var scrollYVisible = $xeTree.computeScrollYVisible;
66612
+ var scrollXAutoHide = $xeTree.computeScrollXAutoHide;
66613
+ var scrollYAutoHide = $xeTree.computeScrollYAutoHide;
66614
+ return domUtils.buildClass(['vxe-scrollbar is--virtual', "ov-x--".concat(scrollXVisible === false ? 'hidden' : 'visible'), "ov-y--".concat(scrollYVisible === false ? 'hidden' : 'visible'), "sx-pos--".concat(scrollbarXToTop ? 'top' : 'bottom'), "sy-pos--".concat(scrollbarYToLeft ? 'left' : 'right')], {
66615
+ 'is--padding': padding,
66616
+ 'ov-x--auto-hide': scrollXAutoHide,
66617
+ 'ov-y--auto-hide': scrollYAutoHide,
66618
+ 'overflow-y': yThumbHeight,
66619
+ 'overflow-x': xThumbWidth
66620
+ });
66621
+ },
66622
+ computeScrollbarXToTop: function computeScrollbarXToTop() {
66623
+ var $xeTree = this;
66624
+ var scrollbarXOpts = $xeTree.computeScrollbarXOpts;
66625
+ return scrollbarXOpts.position === 'top';
66626
+ },
66627
+ computeScrollbarYToLeft: function computeScrollbarYToLeft() {
66628
+ var $xeTree = this;
66629
+ var scrollbarYOpts = $xeTree.computeScrollbarYOpts;
66630
+ return scrollbarYOpts.position === 'left';
66390
66631
  }
66391
66632
  }),
66392
66633
  methods: {
@@ -67036,6 +67277,11 @@ function tree_createReactData() {
67036
67277
  }
67037
67278
  });
67038
67279
  },
67280
+ updateScrollbar: function updateScrollbar() {
67281
+ var $xeTree = this;
67282
+ $xeTree.updateThumbSize();
67283
+ $xeTree.updateThumbOffset();
67284
+ },
67039
67285
  /**
67040
67286
  * 重新计算列表
67041
67287
  */
@@ -67060,6 +67306,7 @@ function tree_createReactData() {
67060
67306
  var parentPaddingSize = getPaddingTopBottomSize(parentEl);
67061
67307
  reactData.parentHeight = Math.max(headHeight + footHeight + rowHeight, parentEl.clientHeight - parentPaddingSize - headHeight - footHeight);
67062
67308
  }
67309
+ $xeTree.updateScrollbar();
67063
67310
  $xeTree.updateHeight();
67064
67311
  return $xeTree.computeScrollLoad().then(function () {
67065
67312
  $xeTree.updateHeight();
@@ -67108,6 +67355,7 @@ function tree_createReactData() {
67108
67355
  var scrollLeft = scrollBodyElem.scrollLeft;
67109
67356
  var isX = scrollLeft !== internalData.lastScrollLeft;
67110
67357
  var isY = scrollTop !== internalData.lastScrollTop;
67358
+ $xeTree.updateThumbOffset();
67111
67359
  internalData.lastScrollTop = scrollTop;
67112
67360
  internalData.lastScrollLeft = scrollLeft;
67113
67361
  if (reactData.scrollYLoad) {
@@ -68096,14 +68344,6 @@ function tree_createReactData() {
68096
68344
  checked: isChecked
68097
68345
  }, evnt);
68098
68346
  },
68099
- handleGlobalResizeEvent: function handleGlobalResizeEvent() {
68100
- var $xeTree = this;
68101
- var el = $xeTree.$refs.refElem;
68102
- if (!el || !el.clientWidth) {
68103
- return;
68104
- }
68105
- $xeTree.recalculate();
68106
- },
68107
68347
  reloadData: function reloadData(data) {
68108
68348
  var $xeTree = this;
68109
68349
  return $xeTree.loadData(data || []);
@@ -68902,6 +69142,189 @@ function tree_createReactData() {
68902
69142
  }, evnt);
68903
69143
  }
68904
69144
  },
69145
+ // 滚动条
69146
+ updateThumbSize: function updateThumbSize() {
69147
+ var $xeTree = this;
69148
+ var reactData = $xeTree.reactData;
69149
+ var viewEl = $xeTree.$refs.refVirtualWrapper;
69150
+ if (!viewEl) {
69151
+ return;
69152
+ }
69153
+ if (!viewEl.clientHeight || !viewEl.clientHeight) {
69154
+ return;
69155
+ }
69156
+ var trackXEl = $xeTree.$refs.refTrackXElem;
69157
+ var xThumbWidth = trackXEl ? getThumbSize(viewEl.clientWidth, viewEl.scrollWidth, trackXEl.clientWidth) : 0;
69158
+ var thumbXElem = $xeTree.$refs.refThumbXElem;
69159
+ if (thumbXElem) {
69160
+ thumbXElem.style.width = xThumbWidth + 'px';
69161
+ }
69162
+ reactData.xThumbWidth = xThumbWidth;
69163
+ var trackYEl = $xeTree.$refs.refTrackYElem;
69164
+ var yThumbHeight = trackYEl ? getThumbSize(viewEl.clientHeight, viewEl.scrollHeight, trackYEl.clientHeight) : 0;
69165
+ var thumbYElem = $xeTree.$refs.refThumbYElem;
69166
+ if (thumbYElem) {
69167
+ thumbYElem.style.height = yThumbHeight + 'px';
69168
+ }
69169
+ reactData.yThumbHeight = yThumbHeight;
69170
+ },
69171
+ updateThumbOffset: function updateThumbOffset() {
69172
+ var $xeTree = this;
69173
+ var reactData = $xeTree.reactData;
69174
+ var internalData = $xeTree.internalData;
69175
+ var viewEl = $xeTree.$refs.refVirtualWrapper;
69176
+ if (!viewEl) {
69177
+ return;
69178
+ }
69179
+ if (!viewEl.clientHeight || !viewEl.clientHeight) {
69180
+ return;
69181
+ }
69182
+ var xThumbWidth = reactData.xThumbWidth,
69183
+ yThumbHeight = reactData.yThumbHeight;
69184
+ var trackXEl = $xeTree.$refs.refTrackXElem;
69185
+ var thumbXElem = $xeTree.$refs.refThumbXElem;
69186
+ var xThumbLeft = trackXEl && xThumbWidth ? getThumbOffsetSize(viewEl.scrollLeft, viewEl.clientWidth, viewEl.scrollWidth, trackXEl.clientWidth, xThumbWidth) : 0;
69187
+ internalData.xThumbLeft = xThumbLeft;
69188
+ if (thumbXElem && xThumbWidth) {
69189
+ thumbXElem.style.width = xThumbWidth + 'px';
69190
+ thumbXElem.style.transform = "translateX(".concat(xThumbLeft, "px)");
69191
+ }
69192
+ var trackYEl = $xeTree.$refs.refTrackYElem;
69193
+ var thumbYElem = $xeTree.$refs.refThumbYElem;
69194
+ var yThumbTop = trackYEl && yThumbHeight ? getThumbOffsetSize(viewEl.scrollTop, viewEl.clientHeight, viewEl.scrollHeight, trackYEl.clientHeight, yThumbHeight) : 0;
69195
+ internalData.yThumbTop = yThumbTop;
69196
+ if (thumbYElem && yThumbHeight) {
69197
+ thumbYElem.style.height = yThumbHeight + 'px';
69198
+ thumbYElem.style.transform = "translateY(".concat(yThumbTop, "px)");
69199
+ }
69200
+ },
69201
+ clickTrackXEvent: function clickTrackXEvent(evnt) {
69202
+ var $xeTree = this;
69203
+ var reactData = $xeTree.reactData;
69204
+ var trackEl = evnt.currentTarget;
69205
+ if (trackEl !== evnt.target) {
69206
+ return;
69207
+ }
69208
+ var viewEl = $xeTree.$refs.refVirtualWrapper;
69209
+ if (!viewEl) {
69210
+ return;
69211
+ }
69212
+ var xThumbWidth = reactData.xThumbWidth;
69213
+ var trackRect = trackEl.getBoundingClientRect();
69214
+ viewEl.scrollTo({
69215
+ left: getScrollFromClick(evnt.clientX - trackRect.left, viewEl.clientWidth, viewEl.scrollWidth, trackEl.clientWidth, xThumbWidth),
69216
+ behavior: 'auto'
69217
+ });
69218
+ },
69219
+ clickTrackYEvent: function clickTrackYEvent(evnt) {
69220
+ var $xeTree = this;
69221
+ var reactData = $xeTree.reactData;
69222
+ var trackEl = evnt.currentTarget;
69223
+ if (trackEl !== evnt.target) {
69224
+ return;
69225
+ }
69226
+ var viewEl = $xeTree.$refs.refVirtualWrapper;
69227
+ if (!viewEl) {
69228
+ return;
69229
+ }
69230
+ var yThumbHeight = reactData.yThumbHeight;
69231
+ var trackRect = trackEl.getBoundingClientRect();
69232
+ viewEl.scrollTo({
69233
+ top: getScrollFromClick(evnt.clientY - trackRect.top, viewEl.clientHeight, viewEl.scrollHeight, trackEl.clientHeight, yThumbHeight),
69234
+ behavior: 'auto'
69235
+ });
69236
+ },
69237
+ pointerdownThumbXEvent: function pointerdownThumbXEvent(evnt) {
69238
+ var $xeTree = this;
69239
+ var reactData = $xeTree.reactData;
69240
+ var internalData = $xeTree.internalData;
69241
+ var thumbEl = evnt.currentTarget;
69242
+ internalData.isThumbDrag = true;
69243
+ thumbEl.setPointerCapture(evnt.pointerId);
69244
+ var viewEl = $xeTree.$refs.refVirtualWrapper;
69245
+ if (!viewEl) {
69246
+ return;
69247
+ }
69248
+ var xThumbWidth = reactData.xThumbWidth;
69249
+ var trackEl = thumbEl.parentElement;
69250
+ var trackRect = trackEl.getBoundingClientRect();
69251
+ var pointerPosition = evnt.clientX - trackRect.left;
69252
+ // 记录 thumb 的偏移
69253
+ var thumbOffset = getThumbOffsetSize(viewEl.scrollLeft, viewEl.clientWidth, viewEl.scrollWidth, trackEl.clientWidth, xThumbWidth);
69254
+ internalData.thumbDragOffset = pointerPosition - thumbOffset;
69255
+ },
69256
+ pointermoveThumbXEvent: function pointermoveThumbXEvent(evnt) {
69257
+ var $xeTree = this;
69258
+ var reactData = $xeTree.reactData;
69259
+ var internalData = $xeTree.internalData;
69260
+ var thumbEl = evnt.currentTarget;
69261
+ if (!thumbEl.hasPointerCapture(evnt.pointerId)) {
69262
+ return;
69263
+ }
69264
+ var isThumbDrag = internalData.isThumbDrag,
69265
+ thumbDragOffset = internalData.thumbDragOffset;
69266
+ if (isThumbDrag) {
69267
+ var viewEl = $xeTree.$refs.refVirtualWrapper;
69268
+ if (!viewEl) {
69269
+ return;
69270
+ }
69271
+ var xThumbWidth = reactData.xThumbWidth;
69272
+ var _thumbEl = evnt.currentTarget;
69273
+ var trackEl = _thumbEl.parentElement;
69274
+ var trackRect = trackEl.getBoundingClientRect();
69275
+ // 更新偏移
69276
+ viewEl.scrollLeft = getScrollFromDrag(evnt.clientX - trackRect.left, thumbDragOffset, viewEl.clientWidth, viewEl.scrollWidth, trackEl.clientWidth, xThumbWidth);
69277
+ }
69278
+ },
69279
+ cleatPointerThumbEvent: function cleatPointerThumbEvent(evnt) {
69280
+ var $xeTree = this;
69281
+ var internalData = $xeTree.internalData;
69282
+ var thumbEl = evnt.currentTarget;
69283
+ thumbEl.releasePointerCapture(evnt.pointerId);
69284
+ internalData.isThumbDrag = false;
69285
+ },
69286
+ pointerdownThumbYEvent: function pointerdownThumbYEvent(evnt) {
69287
+ var $xeTree = this;
69288
+ var reactData = $xeTree.reactData;
69289
+ var internalData = $xeTree.internalData;
69290
+ var thumbEl = evnt.currentTarget;
69291
+ internalData.isThumbDrag = true;
69292
+ thumbEl.setPointerCapture(evnt.pointerId);
69293
+ var viewEl = $xeTree.$refs.refVirtualWrapper;
69294
+ if (!viewEl) {
69295
+ return;
69296
+ }
69297
+ var yThumbHeight = reactData.yThumbHeight;
69298
+ var trackEl = thumbEl.parentElement;
69299
+ var trackRect = trackEl.getBoundingClientRect();
69300
+ var pointerPosition = evnt.clientY - trackRect.top;
69301
+ // 记录 thumb 的偏移
69302
+ var thumbOffset = getThumbOffsetSize(viewEl.scrollTop, viewEl.clientHeight, viewEl.scrollHeight, trackEl.clientHeight, yThumbHeight);
69303
+ internalData.thumbDragOffset = pointerPosition - thumbOffset;
69304
+ },
69305
+ pointermoveThumbYEvent: function pointermoveThumbYEvent(evnt) {
69306
+ var $xeTree = this;
69307
+ var reactData = $xeTree.reactData;
69308
+ var internalData = $xeTree.internalData;
69309
+ var thumbEl = evnt.currentTarget;
69310
+ if (!thumbEl.hasPointerCapture(evnt.pointerId)) {
69311
+ return;
69312
+ }
69313
+ var isThumbDrag = internalData.isThumbDrag,
69314
+ thumbDragOffset = internalData.thumbDragOffset;
69315
+ if (isThumbDrag) {
69316
+ var viewEl = $xeTree.$refs.refVirtualWrapper;
69317
+ if (!viewEl) {
69318
+ return;
69319
+ }
69320
+ var yThumbHeight = reactData.yThumbHeight;
69321
+ var _thumbEl2 = evnt.currentTarget;
69322
+ var trackEl = _thumbEl2.parentElement;
69323
+ var trackRect = trackEl.getBoundingClientRect();
69324
+ // 更新偏移
69325
+ viewEl.scrollTop = getScrollFromDrag(evnt.clientY - trackRect.top, thumbDragOffset, viewEl.clientHeight, viewEl.scrollHeight, trackEl.clientHeight, yThumbHeight);
69326
+ }
69327
+ },
68905
69328
  //
68906
69329
  // Render
68907
69330
  //
@@ -69229,22 +69652,27 @@ function tree_createReactData() {
69229
69652
  return renderEmptyElement($xeTree);
69230
69653
  },
69231
69654
  renderVN: function renderVN(h) {
69655
+ var _ref;
69232
69656
  var $xeTree = this;
69233
69657
  var props = $xeTree;
69234
69658
  var slots = $xeTree.$scopedSlots;
69235
69659
  var reactData = $xeTree.reactData;
69236
69660
  var loading = props.loading,
69237
69661
  trigger = props.trigger,
69238
- showLine = props.showLine;
69662
+ showLine = props.showLine,
69663
+ useScrollbar = props.useScrollbar;
69239
69664
  var bodyHeight = reactData.bodyHeight,
69240
69665
  topSpaceHeight = reactData.topSpaceHeight,
69241
69666
  treeList = reactData.treeList,
69242
- tooltipStore = reactData.tooltipStore;
69667
+ tooltipStore = reactData.tooltipStore,
69668
+ xThumbWidth = reactData.xThumbWidth,
69669
+ yThumbHeight = reactData.yThumbHeight;
69243
69670
  var vSize = $xeTree.computeSize;
69244
69671
  var radioOpts = $xeTree.computeRadioOpts;
69245
69672
  var checkboxOpts = $xeTree.computeCheckboxOpts;
69246
69673
  var loadingOpts = $xeTree.computeLoadingOpts;
69247
69674
  var isNodeHover = $xeTree.computeIsNodeHover;
69675
+ var wrapperStyles = $xeTree.computeWrapperStyles;
69248
69676
  var treeStyle = $xeTree.computeTreeStyle;
69249
69677
  var dragOpts = $xeTree.computeDragOpts;
69250
69678
  var tooltipOpts = $xeTree.computeTooltipOpts;
@@ -69252,13 +69680,22 @@ function tree_createReactData() {
69252
69680
  var headerSlot = slots.header;
69253
69681
  var footerSlot = slots.footer;
69254
69682
  var tooltipSlot = slots.tooltip;
69683
+ var scrollbarOpts = $xeTree.computeScrollbarOpts;
69684
+ var scrollXVisible = $xeTree.computeScrollXVisible;
69685
+ var scrollYVisible = $xeTree.computeScrollYVisible;
69686
+ var scrollbarXToTop = $xeTree.computeScrollbarXToTop;
69687
+ var scrollbarYToLeft = $xeTree.computeScrollbarYToLeft;
69688
+ var scrollXAutoHide = $xeTree.computeScrollXAutoHide;
69689
+ var scrollYAutoHide = $xeTree.computeScrollYAutoHide;
69690
+ var scrollbarWrapperClss = $xeTree.computeScrollbarWrapperClss;
69255
69691
  var teOns = {};
69256
69692
  if (dragOpts.isCrossTreeDrag && !treeList.length) {
69257
69693
  teOns.dragover = $xeTree.handleCrossTreeNodeDragoverEmptyEvent;
69258
69694
  }
69259
69695
  return h('div', {
69260
69696
  ref: 'refElem',
69261
- class: ['vxe-tree', _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'show--line', showLine), 'checkbox--highlight', checkboxOpts.highlight), 'radio--highlight', radioOpts.highlight), 'node--hover', isNodeHover), 'node--trigger', trigger === 'node'), 'is--loading', loading)],
69697
+ class: ['vxe-tree', useScrollbar ? "ov-x--".concat(scrollXVisible === false ? 'hidden' : 'visible') : '', useScrollbar ? "ov-y--".concat(scrollYVisible === false ? 'hidden' : 'visible') : '', useScrollbar ? "sx-pos--".concat(scrollbarXToTop ? 'top' : 'bottom') : '', useScrollbar ? "sy-pos--".concat(scrollbarYToLeft ? 'left' : 'right') : '', (_ref = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_ref, "size--".concat(vSize), vSize), 'show--line', showLine), 'is--virtual-scrollbar', useScrollbar), 'ov-padding', useScrollbar && scrollbarOpts.padding), 'ov-x--auto-hide', useScrollbar && scrollXAutoHide), 'ov-y--auto-hide', useScrollbar && scrollYAutoHide), 'overflow-y', yThumbHeight), 'overflow-x', xThumbWidth), 'checkbox--highlight', checkboxOpts.highlight), 'radio--highlight', radioOpts.highlight), _defineProperty(_defineProperty(_defineProperty(_ref, 'node--hover', isNodeHover), 'node--trigger', trigger === 'node'), 'is--loading', loading))],
69698
+ style: wrapperStyles,
69262
69699
  on: teOns
69263
69700
  }, [headerSlot ? h('div', {
69264
69701
  ref: 'refHeaderWrapperElem',
@@ -69289,6 +69726,44 @@ function tree_createReactData() {
69289
69726
  }, footerSlot({
69290
69727
  $tree: $xeTree
69291
69728
  })) : renderEmptyElement($xeTree),
69729
+ /**
69730
+ * 滚动条
69731
+ */
69732
+ useScrollbar ? h('div', {
69733
+ class: scrollbarWrapperClss
69734
+ }, [scrollXVisible === false ? renderEmptyElement($xeTree) : h('div', {
69735
+ ref: 'refTrackXElem',
69736
+ class: 'vxe-scrollbar--track-x',
69737
+ on: {
69738
+ click: $xeTree.clickTrackXEvent
69739
+ }
69740
+ }, [h('div', {
69741
+ ref: 'refThumbXElem',
69742
+ class: 'vxe-scrollbar--thumb-x',
69743
+ on: {
69744
+ pointerdown: $xeTree.pointerdownThumbXEvent,
69745
+ pointermove: $xeTree.pointermoveThumbXEvent,
69746
+ pointerup: $xeTree.cleatPointerThumbEvent,
69747
+ pointercancel: $xeTree.cleatPointerThumbEvent,
69748
+ lostpointercapture: $xeTree.cleatPointerThumbEvent
69749
+ }
69750
+ })]), scrollYVisible === false ? renderEmptyElement($xeTree) : h('div', {
69751
+ ref: 'refTrackYElem',
69752
+ class: 'vxe-scrollbar--track-y',
69753
+ on: {
69754
+ click: $xeTree.clickTrackYEvent
69755
+ }
69756
+ }, [h('div', {
69757
+ ref: 'refThumbYElem',
69758
+ class: 'vxe-scrollbar--thumb-y',
69759
+ on: {
69760
+ pointerdown: $xeTree.pointerdownThumbYEvent,
69761
+ pointermove: $xeTree.pointermoveThumbYEvent,
69762
+ pointerup: $xeTree.cleatPointerThumbEvent,
69763
+ pointercancel: $xeTree.cleatPointerThumbEvent,
69764
+ lostpointercapture: $xeTree.cleatPointerThumbEvent
69765
+ }
69766
+ })])]) : renderEmptyElement($xeTree),
69292
69767
  /**
69293
69768
  * 拖拽提示
69294
69769
  */
@@ -69378,19 +69853,37 @@ function tree_createReactData() {
69378
69853
  },
69379
69854
  height: function height() {
69380
69855
  var $xeTree = this;
69381
- $xeTree.hFlag++;
69856
+ $xeTree.reFlag++;
69382
69857
  },
69383
69858
  minHeight: function minHeight() {
69384
69859
  var $xeTree = this;
69385
- $xeTree.hFlag++;
69860
+ $xeTree.reFlag++;
69386
69861
  },
69387
69862
  maxHeight: function maxHeight() {
69388
69863
  var $xeTree = this;
69389
- $xeTree.hFlag++;
69864
+ $xeTree.reFlag++;
69865
+ },
69866
+ useScrollbar: function useScrollbar() {
69867
+ var $xeTree = this;
69868
+ $xeTree.reFlag++;
69869
+ },
69870
+ computeScrollXVisible: function computeScrollXVisible() {
69871
+ var $xeTree = this;
69872
+ $xeTree.$nextTick(function () {
69873
+ $xeTree.reFlag++;
69874
+ });
69875
+ },
69876
+ computeScrollYVisible: function computeScrollYVisible() {
69877
+ var $xeTree = this;
69878
+ $xeTree.$nextTick(function () {
69879
+ $xeTree.reFlag++;
69880
+ });
69390
69881
  },
69391
- hFlag: function hFlag() {
69882
+ reFlag: function reFlag() {
69392
69883
  var $xeTree = this;
69393
- $xeTree.recalculate();
69884
+ $xeTree.recalculate().then(function () {
69885
+ $xeTree.recalculate();
69886
+ });
69394
69887
  }
69395
69888
  },
69396
69889
  created: function created() {
@@ -69410,7 +69903,9 @@ function tree_createReactData() {
69410
69903
  menuConfig = props.menuConfig,
69411
69904
  showOverflow = props.showOverflow,
69412
69905
  lazy = props.lazy,
69413
- loadMethod = props.loadMethod;
69906
+ loadMethod = props.loadMethod,
69907
+ autoResize = props.autoResize,
69908
+ useScrollbar = props.useScrollbar;
69414
69909
  var dragOpts = $xeTree.computeDragOpts;
69415
69910
  if (!showOverflow) {
69416
69911
  tree_errLog('vxe.error.errProp', ['show-overflow=false', 'show-overflow=true']);
@@ -69431,24 +69926,30 @@ function tree_createReactData() {
69431
69926
  if (menuConfig && !VxeUIContextMenu) {
69432
69927
  tree_errLog('vxe.error.reqComp', ['vxe-context-menu']);
69433
69928
  }
69434
- if (props.autoResize) {
69929
+ if (useScrollbar || autoResize) {
69435
69930
  var el = $xeTree.$refs.refElem;
69931
+ var viewInnerEl = $xeTree.$refs.refVirtualBody;
69436
69932
  var parentEl = $xeTree.getParentElem();
69437
69933
  var resizeObserver = globalResize.create(function () {
69438
- if (props.autoResize) {
69439
- $xeTree.recalculate();
69440
- }
69934
+ $xeTree.reFlag++;
69441
69935
  });
69442
69936
  if (el) {
69443
69937
  resizeObserver.observe(el);
69938
+ if (autoResize) {
69939
+ if (parentEl) {
69940
+ resizeObserver.observe(parentEl);
69941
+ }
69942
+ }
69444
69943
  }
69445
- if (parentEl) {
69446
- resizeObserver.observe(parentEl);
69944
+ if (viewInnerEl) {
69945
+ resizeObserver.observe(viewInnerEl);
69447
69946
  }
69448
69947
  internalData.resizeObserver = resizeObserver;
69449
69948
  }
69450
- $xeTree.recalculate();
69451
- globalEvents.on($xeTree, 'resize', $xeTree.handleGlobalResizeEvent);
69949
+ $xeTree.reFlag++;
69950
+ globalEvents.on($xeTree, 'resize', function () {
69951
+ $xeTree.reFlag++;
69952
+ });
69452
69953
  },
69453
69954
  beforeDestroy: function beforeDestroy() {
69454
69955
  var $xeTree = this;