vxe-pc-ui 4.20.1 → 4.20.2

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 (96) hide show
  1. package/dist/all.esm.js +226 -83
  2. package/dist/style.css +1 -1
  3. package/dist/style.min.css +1 -1
  4. package/es/card/src/card.js +2 -1
  5. package/es/drawer/src/drawer.js +59 -15
  6. package/es/drawer/style.css +13 -6
  7. package/es/drawer/style.min.css +1 -1
  8. package/es/icon/style.css +1 -1
  9. package/es/layout-aside/src/layout-aside.js +2 -1
  10. package/es/layout-body/src/layout-body.js +2 -1
  11. package/es/list/src/list.js +49 -23
  12. package/es/menu/src/menu.js +2 -2
  13. package/es/modal/src/modal.js +56 -12
  14. package/es/modal/style.css +15 -4
  15. package/es/modal/style.min.css +1 -1
  16. package/es/scrollbar/src/scrollbar.js +16 -4
  17. package/es/style.css +1 -1
  18. package/es/style.min.css +1 -1
  19. package/es/tabs/src/tabs.js +2 -2
  20. package/es/tree/src/tree.js +43 -24
  21. package/es/ui/index.js +1 -1
  22. package/es/ui/src/log.js +1 -1
  23. package/es/vxe-drawer/style.css +13 -6
  24. package/es/vxe-drawer/style.min.css +1 -1
  25. package/es/vxe-modal/style.css +15 -4
  26. package/es/vxe-modal/style.min.css +1 -1
  27. package/lib/card/src/card.js +2 -1
  28. package/lib/card/src/card.min.js +1 -1
  29. package/lib/drawer/src/drawer.js +64 -11
  30. package/lib/drawer/src/drawer.min.js +1 -1
  31. package/lib/drawer/style/style.css +13 -6
  32. package/lib/drawer/style/style.min.css +1 -1
  33. package/lib/icon/style/style.css +1 -1
  34. package/lib/icon/style/style.min.css +1 -1
  35. package/lib/index.umd.js +318 -84
  36. package/lib/index.umd.min.js +1 -1
  37. package/lib/layout-aside/src/layout-aside.js +2 -1
  38. package/lib/layout-aside/src/layout-aside.min.js +1 -1
  39. package/lib/layout-body/src/layout-body.js +2 -1
  40. package/lib/layout-body/src/layout-body.min.js +1 -1
  41. package/lib/list/src/list.js +49 -24
  42. package/lib/list/src/list.min.js +1 -1
  43. package/lib/menu/src/menu.js +1 -1
  44. package/lib/menu/src/menu.min.js +1 -1
  45. package/lib/modal/src/modal.js +61 -10
  46. package/lib/modal/src/modal.min.js +1 -1
  47. package/lib/modal/style/style.css +15 -4
  48. package/lib/modal/style/style.min.css +1 -1
  49. package/lib/scrollbar/src/scrollbar.js +16 -4
  50. package/lib/scrollbar/src/scrollbar.min.js +1 -1
  51. package/lib/style.css +1 -1
  52. package/lib/style.min.css +1 -1
  53. package/lib/tabs/src/tabs.js +1 -1
  54. package/lib/tabs/src/tabs.min.js +1 -1
  55. package/lib/tree/src/tree.js +43 -25
  56. package/lib/tree/src/tree.min.js +1 -1
  57. package/lib/ui/index.js +1 -1
  58. package/lib/ui/index.min.js +1 -1
  59. package/lib/ui/src/log.js +1 -1
  60. package/lib/ui/src/log.min.js +1 -1
  61. package/lib/vxe-drawer/style/style.css +13 -6
  62. package/lib/vxe-drawer/style/style.min.css +1 -1
  63. package/lib/vxe-modal/style/style.css +15 -4
  64. package/lib/vxe-modal/style/style.min.css +1 -1
  65. package/package.json +2 -2
  66. package/packages/card/src/card.ts +2 -1
  67. package/packages/drawer/src/drawer.ts +73 -16
  68. package/packages/layout-aside/src/layout-aside.ts +2 -1
  69. package/packages/layout-body/src/layout-body.ts +2 -1
  70. package/packages/list/src/list.ts +53 -23
  71. package/packages/menu/src/menu.ts +2 -2
  72. package/packages/modal/src/modal.ts +71 -14
  73. package/packages/scrollbar/src/scrollbar.ts +18 -4
  74. package/packages/tabs/src/tabs.ts +2 -2
  75. package/packages/tree/src/tree.ts +46 -24
  76. package/styles/components/drawer.scss +13 -6
  77. package/styles/components/modal.scss +12 -4
  78. package/types/components/drawer.d.ts +20 -0
  79. package/types/components/gantt-module/gantt-view.d.ts +24 -1
  80. package/types/components/gantt.d.ts +2 -0
  81. package/types/components/list.d.ts +3 -1
  82. package/types/components/modal.d.ts +20 -0
  83. package/types/components/table.d.ts +33 -2
  84. package/types/components/tree.d.ts +3 -1
  85. /package/es/icon/{iconfont.1791950625324.ttf → iconfont.1792034967421.ttf} +0 -0
  86. /package/es/icon/{iconfont.1791950625324.woff → iconfont.1792034967421.woff} +0 -0
  87. /package/es/icon/{iconfont.1791950625324.woff2 → iconfont.1792034967421.woff2} +0 -0
  88. /package/es/{iconfont.1791950625324.ttf → iconfont.1792034967421.ttf} +0 -0
  89. /package/es/{iconfont.1791950625324.woff → iconfont.1792034967421.woff} +0 -0
  90. /package/es/{iconfont.1791950625324.woff2 → iconfont.1792034967421.woff2} +0 -0
  91. /package/lib/icon/style/{iconfont.1791950625324.ttf → iconfont.1792034967421.ttf} +0 -0
  92. /package/lib/icon/style/{iconfont.1791950625324.woff → iconfont.1792034967421.woff} +0 -0
  93. /package/lib/icon/style/{iconfont.1791950625324.woff2 → iconfont.1792034967421.woff2} +0 -0
  94. /package/lib/{iconfont.1791950625324.ttf → iconfont.1792034967421.ttf} +0 -0
  95. /package/lib/{iconfont.1791950625324.woff → iconfont.1792034967421.woff} +0 -0
  96. /package/lib/{iconfont.1791950625324.woff2 → iconfont.1792034967421.woff2} +0 -0
@@ -141,8 +141,8 @@
141
141
  cursor: move;
142
142
  transition: none;
143
143
  }
144
- .vxe-drawer--box.is--drag .vxe-modal--body:after,
145
- .vxe-drawer--box.is--drag .vxe-modal--footer:after {
144
+ .vxe-drawer--box.is--drag .vxe-drawer--body:after,
145
+ .vxe-drawer--box.is--drag .vxe-drawer--footer:after {
146
146
  content: "";
147
147
  position: absolute;
148
148
  top: 0;
@@ -150,10 +150,11 @@
150
150
  width: 100%;
151
151
  height: 100%;
152
152
  }
153
- .vxe-drawer--box.is--drag .vxe-modal--body {
153
+ .vxe-drawer--box.is--drag .vxe-drawer--body {
154
154
  overflow: hidden;
155
155
  }
156
- .vxe-drawer--box.is--drag .vxe-modal--body .vxe-modal--content {
156
+ .vxe-drawer--box.is--drag .vxe-drawer--body .vxe-drawer--content,
157
+ .vxe-drawer--box.is--drag .vxe-drawer--body .vxe-drawer--scrollbar-content {
157
158
  overflow: hidden;
158
159
  }
159
160
 
@@ -172,7 +173,8 @@
172
173
  outline: 0;
173
174
  }
174
175
 
175
- .vxe-drawer--content {
176
+ .vxe-drawer--content,
177
+ .vxe-drawer--scrollbar-content {
176
178
  flex-grow: 1;
177
179
  white-space: pre-line;
178
180
  }
@@ -189,7 +191,8 @@
189
191
  overflow: auto;
190
192
  outline: 0;
191
193
  }
192
- .vxe-drawer--body .vxe-drawer--content {
194
+ .vxe-drawer--body .vxe-drawer--content,
195
+ .vxe-drawer--body .vxe-drawer--scrollbar-content {
193
196
  overflow: auto;
194
197
  }
195
198
 
@@ -304,4 +307,8 @@
304
307
 
305
308
  .vxe-drawer--wrapper[data-effect] {
306
309
  overflow: hidden;
310
+ }
311
+
312
+ .vxe-drawer--scrollbar-content {
313
+ width: 100%;
307
314
  }
@@ -1 +1 @@
1
- .vxe-drawer--wrapper{--vxe-ui-drawer-current-font-size:var(--vxe-ui-font-size-default)}.vxe-drawer--wrapper.size--xlarge{--vxe-ui-drawer-current-font-size:var(--vxe-ui-font-size-xlarge)}.vxe-drawer--wrapper.size--large{--vxe-ui-drawer-current-font-size:var(--vxe-ui-font-size-large)}.vxe-drawer--wrapper.size--medium{--vxe-ui-drawer-current-font-size:var(--vxe-ui-font-size-medium)}.vxe-drawer--wrapper.size--small{--vxe-ui-drawer-current-font-size:var(--vxe-ui-font-size-small)}.vxe-drawer--wrapper.size--mini{--vxe-ui-drawer-current-font-size:var(--vxe-ui-font-size-mini)}.vxe-drawer--wrapper{display:none;top:0;left:0;line-height:1.5;color:var(--vxe-ui-font-color);font-size:var(--vxe-ui-drawer-current-font-size);font-family:var(--vxe-ui-font-family);outline:0}.vxe-drawer--wrapper.is--active{display:block}.vxe-drawer--wrapper.is--visible.is--mask:before{background-color:rgba(0,0,0,.5)}.vxe-drawer--wrapper.is--visible.pos--left .vxe-drawer--box{left:0}.vxe-drawer--wrapper.is--visible.pos--right .vxe-drawer--box{right:0}.vxe-drawer--wrapper.is--visible.pos--top .vxe-drawer--box{top:0}.vxe-drawer--wrapper.is--visible.pos--bottom .vxe-drawer--box{bottom:0}.vxe-drawer--wrapper.is--visible .vxe-drawer--box{opacity:1}.vxe-drawer--wrapper:not(.lock--view){pointer-events:none}.vxe-drawer--wrapper.lock--scroll{overflow:hidden}.vxe-drawer--wrapper:not(.lock--scroll){overflow:auto}.vxe-drawer--wrapper.is--mask:before,.vxe-drawer--wrapper.lock--view:before{content:"";top:0;left:0;width:100%;height:100%;z-index:-1;pointer-events:auto}.vxe-drawer--wrapper.is--mask:before{background-color:rgba(0,0,0,0);transition:background-color .2s ease-in-out}.vxe-drawer--wrapper.pos--left .vxe-drawer--box{top:0;left:-100%;box-shadow:2px 0 10px 0 rgba(0,0,0,.2)}.vxe-drawer--wrapper.pos--right .vxe-drawer--box{top:0;right:-100%;box-shadow:-2px 0 10px 0 rgba(0,0,0,.2)}.vxe-drawer--wrapper.pos--top .vxe-drawer--box{top:-100%;left:0;box-shadow:0 2px 10px 0 rgba(0,0,0,.2)}.vxe-drawer--wrapper.pos--bottom .vxe-drawer--box{bottom:-100%;left:0;box-shadow:0 -2px 10px 0 rgba(0,0,0,.2)}.vxe-drawer--wrapper.pos--left .vxe-drawer--box,.vxe-drawer--wrapper.pos--right .vxe-drawer--box{width:30%;height:100%}.vxe-drawer--wrapper.pos--bottom .vxe-drawer--box,.vxe-drawer--wrapper.pos--top .vxe-drawer--box{width:100%;height:30%}.vxe-drawer--wrapper.is--padding .vxe-drawer--body-default{padding:.8em .6em}.vxe-drawer--wrapper.is--padding .vxe-drawer--body-default .vxe-drawer--status-wrapper{padding-right:.6em}.vxe-drawer--wrapper.ctx--free{position:fixed;width:calc(100% + 18px);height:calc(100% + 18px)}.vxe-drawer--wrapper.ctx--free.is--mask:before,.vxe-drawer--wrapper.ctx--free.lock--view:before{position:fixed}.vxe-drawer--wrapper.ctx--free .vxe-drawer--box{position:fixed}.vxe-drawer--wrapper.ctx--within{position:absolute;width:100%;height:100%}.vxe-drawer--wrapper.ctx--within.is--mask:before,.vxe-drawer--wrapper.ctx--within.lock--view:before{position:absolute}.vxe-drawer--wrapper.ctx--within .vxe-drawer--box{position:absolute}.vxe-drawer--box{display:flex;flex-direction:row;background-color:var(--vxe-ui-layout-background-color);text-align:left;pointer-events:auto;opacity:0;transition:all .3s ease-in-out}.vxe-drawer--box.is--drag{cursor:move;transition:none}.vxe-drawer--box.is--drag .vxe-modal--body:after,.vxe-drawer--box.is--drag .vxe-modal--footer:after{content:"";position:absolute;top:0;left:0;width:100%;height:100%}.vxe-drawer--box.is--drag .vxe-modal--body{overflow:hidden}.vxe-drawer--box.is--drag .vxe-modal--body .vxe-modal--content{overflow:hidden}.vxe-drawer--aside{flex-shrink:0;overflow:auto;outline:0}.vxe-drawer--container{display:flex;flex-direction:column;width:100%;height:100%;overflow:auto;outline:0}.vxe-drawer--content{flex-grow:1;white-space:pre-line}.vxe-drawer--body,.vxe-drawer--footer,.vxe-drawer--header{position:relative}.vxe-drawer--body{display:flex;flex-grow:1;overflow:auto;outline:0}.vxe-drawer--body .vxe-drawer--content{overflow:auto}.vxe-drawer--body-left,.vxe-drawer--body-right{flex-shrink:0;overflow:auto;outline:0}.vxe-drawer--body-default{display:flex;flex-grow:1;overflow:auto;outline:0}.vxe-drawer--header{display:flex;flex-direction:row;flex-shrink:0;font-size:1.1em;font-weight:700}.vxe-drawer--header.is--ellipsis .vxe-drawer--header-title{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.vxe-drawer--wrapper.is--title-bg .vxe-drawer--header{background-color:var(--vxe-ui-drawer-header-background-color)}.vxe-drawer--wrapper.is--border .vxe-drawer--header{border-bottom:1px solid var(--vxe-ui-base-popup-border-color)}.vxe-drawer--wrapper.is--border .vxe-drawer--box{border:1px solid var(--vxe-ui-base-popup-border-color)}.vxe-drawer--header-title{flex-grow:1;padding:.6em 0 .6em 1em}.vxe-drawer--header-right{display:flex;flex-direction:row;flex-shrink:0;padding:.6em 1em .6em 0}.vxe-drawer--footer-wrapper{display:flex;flex-direction:row}.vxe-drawer--footer-wrapper .vxe-drawer--footer-left{flex-grow:1;text-align:left}.vxe-drawer--footer-wrapper .vxe-drawer--footer-right{flex-shrink:0}.vxe-drawer--close-btn{cursor:pointer;margin-left:.6em}.vxe-drawer--close-btn:hover{color:var(--vxe-ui-font-primary-color)}.vxe-drawer--footer{flex-shrink:0;text-align:right;padding:.4em 1em .8em 1em}.vxe-drawer--resize .sb-resize,.vxe-drawer--resize .st-resize,.vxe-drawer--resize .wl-resize,.vxe-drawer--resize .wr-resize{position:absolute;z-index:100}.vxe-drawer--resize .wl-resize,.vxe-drawer--resize .wr-resize{width:8px;height:100%;top:0;cursor:w-resize}.vxe-drawer--resize .wl-resize{left:-4px}.vxe-drawer--resize .wr-resize{right:-4px}.vxe-drawer--resize .sb-resize,.vxe-drawer--resize .st-resize{width:100%;height:8px;left:0;cursor:s-resize}.vxe-drawer--resize .st-resize{top:-4px}.vxe-drawer--resize .sb-resize{bottom:-4px}.vxe-drawer--wrapper[data-effect]{overflow:hidden}
1
+ .vxe-drawer--wrapper{--vxe-ui-drawer-current-font-size:var(--vxe-ui-font-size-default)}.vxe-drawer--wrapper.size--xlarge{--vxe-ui-drawer-current-font-size:var(--vxe-ui-font-size-xlarge)}.vxe-drawer--wrapper.size--large{--vxe-ui-drawer-current-font-size:var(--vxe-ui-font-size-large)}.vxe-drawer--wrapper.size--medium{--vxe-ui-drawer-current-font-size:var(--vxe-ui-font-size-medium)}.vxe-drawer--wrapper.size--small{--vxe-ui-drawer-current-font-size:var(--vxe-ui-font-size-small)}.vxe-drawer--wrapper.size--mini{--vxe-ui-drawer-current-font-size:var(--vxe-ui-font-size-mini)}.vxe-drawer--wrapper{display:none;top:0;left:0;line-height:1.5;color:var(--vxe-ui-font-color);font-size:var(--vxe-ui-drawer-current-font-size);font-family:var(--vxe-ui-font-family);outline:0}.vxe-drawer--wrapper.is--active{display:block}.vxe-drawer--wrapper.is--visible.is--mask:before{background-color:rgba(0,0,0,.5)}.vxe-drawer--wrapper.is--visible.pos--left .vxe-drawer--box{left:0}.vxe-drawer--wrapper.is--visible.pos--right .vxe-drawer--box{right:0}.vxe-drawer--wrapper.is--visible.pos--top .vxe-drawer--box{top:0}.vxe-drawer--wrapper.is--visible.pos--bottom .vxe-drawer--box{bottom:0}.vxe-drawer--wrapper.is--visible .vxe-drawer--box{opacity:1}.vxe-drawer--wrapper:not(.lock--view){pointer-events:none}.vxe-drawer--wrapper.lock--scroll{overflow:hidden}.vxe-drawer--wrapper:not(.lock--scroll){overflow:auto}.vxe-drawer--wrapper.is--mask:before,.vxe-drawer--wrapper.lock--view:before{content:"";top:0;left:0;width:100%;height:100%;z-index:-1;pointer-events:auto}.vxe-drawer--wrapper.is--mask:before{background-color:rgba(0,0,0,0);transition:background-color .2s ease-in-out}.vxe-drawer--wrapper.pos--left .vxe-drawer--box{top:0;left:-100%;box-shadow:2px 0 10px 0 rgba(0,0,0,.2)}.vxe-drawer--wrapper.pos--right .vxe-drawer--box{top:0;right:-100%;box-shadow:-2px 0 10px 0 rgba(0,0,0,.2)}.vxe-drawer--wrapper.pos--top .vxe-drawer--box{top:-100%;left:0;box-shadow:0 2px 10px 0 rgba(0,0,0,.2)}.vxe-drawer--wrapper.pos--bottom .vxe-drawer--box{bottom:-100%;left:0;box-shadow:0 -2px 10px 0 rgba(0,0,0,.2)}.vxe-drawer--wrapper.pos--left .vxe-drawer--box,.vxe-drawer--wrapper.pos--right .vxe-drawer--box{width:30%;height:100%}.vxe-drawer--wrapper.pos--bottom .vxe-drawer--box,.vxe-drawer--wrapper.pos--top .vxe-drawer--box{width:100%;height:30%}.vxe-drawer--wrapper.is--padding .vxe-drawer--body-default{padding:.8em .6em}.vxe-drawer--wrapper.is--padding .vxe-drawer--body-default .vxe-drawer--status-wrapper{padding-right:.6em}.vxe-drawer--wrapper.ctx--free{position:fixed;width:calc(100% + 18px);height:calc(100% + 18px)}.vxe-drawer--wrapper.ctx--free.is--mask:before,.vxe-drawer--wrapper.ctx--free.lock--view:before{position:fixed}.vxe-drawer--wrapper.ctx--free .vxe-drawer--box{position:fixed}.vxe-drawer--wrapper.ctx--within{position:absolute;width:100%;height:100%}.vxe-drawer--wrapper.ctx--within.is--mask:before,.vxe-drawer--wrapper.ctx--within.lock--view:before{position:absolute}.vxe-drawer--wrapper.ctx--within .vxe-drawer--box{position:absolute}.vxe-drawer--box{display:flex;flex-direction:row;background-color:var(--vxe-ui-layout-background-color);text-align:left;pointer-events:auto;opacity:0;transition:all .3s ease-in-out}.vxe-drawer--box.is--drag{cursor:move;transition:none}.vxe-drawer--box.is--drag .vxe-drawer--body:after,.vxe-drawer--box.is--drag .vxe-drawer--footer:after{content:"";position:absolute;top:0;left:0;width:100%;height:100%}.vxe-drawer--box.is--drag .vxe-drawer--body{overflow:hidden}.vxe-drawer--box.is--drag .vxe-drawer--body .vxe-drawer--content,.vxe-drawer--box.is--drag .vxe-drawer--body .vxe-drawer--scrollbar-content{overflow:hidden}.vxe-drawer--aside{flex-shrink:0;overflow:auto;outline:0}.vxe-drawer--container{display:flex;flex-direction:column;width:100%;height:100%;overflow:auto;outline:0}.vxe-drawer--content,.vxe-drawer--scrollbar-content{flex-grow:1;white-space:pre-line}.vxe-drawer--body,.vxe-drawer--footer,.vxe-drawer--header{position:relative}.vxe-drawer--body{display:flex;flex-grow:1;overflow:auto;outline:0}.vxe-drawer--body .vxe-drawer--content,.vxe-drawer--body .vxe-drawer--scrollbar-content{overflow:auto}.vxe-drawer--body-left,.vxe-drawer--body-right{flex-shrink:0;overflow:auto;outline:0}.vxe-drawer--body-default{display:flex;flex-grow:1;overflow:auto;outline:0}.vxe-drawer--header{display:flex;flex-direction:row;flex-shrink:0;font-size:1.1em;font-weight:700}.vxe-drawer--header.is--ellipsis .vxe-drawer--header-title{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.vxe-drawer--wrapper.is--title-bg .vxe-drawer--header{background-color:var(--vxe-ui-drawer-header-background-color)}.vxe-drawer--wrapper.is--border .vxe-drawer--header{border-bottom:1px solid var(--vxe-ui-base-popup-border-color)}.vxe-drawer--wrapper.is--border .vxe-drawer--box{border:1px solid var(--vxe-ui-base-popup-border-color)}.vxe-drawer--header-title{flex-grow:1;padding:.6em 0 .6em 1em}.vxe-drawer--header-right{display:flex;flex-direction:row;flex-shrink:0;padding:.6em 1em .6em 0}.vxe-drawer--footer-wrapper{display:flex;flex-direction:row}.vxe-drawer--footer-wrapper .vxe-drawer--footer-left{flex-grow:1;text-align:left}.vxe-drawer--footer-wrapper .vxe-drawer--footer-right{flex-shrink:0}.vxe-drawer--close-btn{cursor:pointer;margin-left:.6em}.vxe-drawer--close-btn:hover{color:var(--vxe-ui-font-primary-color)}.vxe-drawer--footer{flex-shrink:0;text-align:right;padding:.4em 1em .8em 1em}.vxe-drawer--resize .sb-resize,.vxe-drawer--resize .st-resize,.vxe-drawer--resize .wl-resize,.vxe-drawer--resize .wr-resize{position:absolute;z-index:100}.vxe-drawer--resize .wl-resize,.vxe-drawer--resize .wr-resize{width:8px;height:100%;top:0;cursor:w-resize}.vxe-drawer--resize .wl-resize{left:-4px}.vxe-drawer--resize .wr-resize{right:-4px}.vxe-drawer--resize .sb-resize,.vxe-drawer--resize .st-resize{width:100%;height:8px;left:0;cursor:s-resize}.vxe-drawer--resize .st-resize{top:-4px}.vxe-drawer--resize .sb-resize{bottom:-4px}.vxe-drawer--wrapper[data-effect]{overflow:hidden}.vxe-drawer--scrollbar-content{width:100%}
@@ -50,7 +50,8 @@ html[data-vxe-lock-scroll] body {
50
50
  .vxe-modal--box.is--drag .vxe-modal--body {
51
51
  overflow: hidden;
52
52
  }
53
- .vxe-modal--box.is--drag .vxe-modal--body .vxe-modal--content {
53
+ .vxe-modal--box.is--drag .vxe-modal--body .vxe-modal--content,
54
+ .vxe-modal--box.is--drag .vxe-modal--body .vxe-modal--scrollbar-content {
54
55
  overflow: hidden;
55
56
  }
56
57
 
@@ -73,7 +74,8 @@ html[data-vxe-lock-scroll] body {
73
74
  font-size: 1.6em;
74
75
  }
75
76
 
76
- .vxe-modal--content {
77
+ .vxe-modal--content,
78
+ .vxe-modal--scrollbar-content {
77
79
  flex-grow: 1;
78
80
  white-space: pre-line;
79
81
  }
@@ -390,7 +392,9 @@ html[data-vxe-lock-scroll] body {
390
392
  overflow: hidden;
391
393
  visibility: hidden;
392
394
  }
393
- .vxe-modal--wrapper.type--message .vxe-modal--box .vxe-modal--content, .vxe-modal--wrapper.type--notification .vxe-modal--box .vxe-modal--content {
395
+ .vxe-modal--wrapper.type--message .vxe-modal--box .vxe-modal--content,
396
+ .vxe-modal--wrapper.type--message .vxe-modal--box .vxe-modal--scrollbar-content, .vxe-modal--wrapper.type--notification .vxe-modal--box .vxe-modal--content,
397
+ .vxe-modal--wrapper.type--notification .vxe-modal--box .vxe-modal--scrollbar-content {
394
398
  max-width: 800px;
395
399
  float: left;
396
400
  }
@@ -413,7 +417,10 @@ html[data-vxe-lock-scroll] body {
413
417
  .vxe-modal--wrapper.type--modal .vxe-modal--body, .vxe-modal--wrapper.type--alert .vxe-modal--body, .vxe-modal--wrapper.type--confirm .vxe-modal--body {
414
418
  overflow: auto;
415
419
  }
416
- .vxe-modal--wrapper.type--modal .vxe-modal--body .vxe-modal--content, .vxe-modal--wrapper.type--alert .vxe-modal--body .vxe-modal--content, .vxe-modal--wrapper.type--confirm .vxe-modal--body .vxe-modal--content {
420
+ .vxe-modal--wrapper.type--modal .vxe-modal--body .vxe-modal--content,
421
+ .vxe-modal--wrapper.type--modal .vxe-modal--body .vxe-modal--scrollbar-content, .vxe-modal--wrapper.type--alert .vxe-modal--body .vxe-modal--content,
422
+ .vxe-modal--wrapper.type--alert .vxe-modal--body .vxe-modal--scrollbar-content, .vxe-modal--wrapper.type--confirm .vxe-modal--body .vxe-modal--content,
423
+ .vxe-modal--wrapper.type--confirm .vxe-modal--body .vxe-modal--scrollbar-content {
417
424
  overflow: auto;
418
425
  }
419
426
  .vxe-modal--wrapper.status--info .vxe-modal--status-wrapper {
@@ -449,4 +456,8 @@ html[data-vxe-lock-scroll] body {
449
456
 
450
457
  .vxe-modal--wrapper[data-effect] {
451
458
  overflow: hidden;
459
+ }
460
+
461
+ .vxe-modal--scrollbar-content {
462
+ width: 100%;
452
463
  }
@@ -1 +1 @@
1
- .vxe-modal--wrapper{--vxe-ui-modal-current-font-size:var(--vxe-ui-font-size-default)}.vxe-modal--wrapper.size--xlarge{--vxe-ui-modal-current-font-size:var(--vxe-ui-font-size-xlarge)}.vxe-modal--wrapper.size--large{--vxe-ui-modal-current-font-size:var(--vxe-ui-font-size-large)}.vxe-modal--wrapper.size--medium{--vxe-ui-modal-current-font-size:var(--vxe-ui-font-size-medium)}.vxe-modal--wrapper.size--small{--vxe-ui-modal-current-font-size:var(--vxe-ui-font-size-small)}.vxe-modal--wrapper.size--mini{--vxe-ui-modal-current-font-size:var(--vxe-ui-font-size-mini)}html[data-vxe-lock-scroll]{overflow:hidden}html[data-vxe-lock-scroll] body{overflow:hidden;width:var(--vxe-ui-modal-lock-scroll-view-width)}.vxe-modal--box{visibility:hidden;width:420px;background-color:var(--vxe-ui-layout-background-color);border-radius:var(--vxe-ui-base-border-radius);text-align:left;pointer-events:auto;opacity:0;outline:0}.vxe-modal--box.is--drag{cursor:move}.vxe-modal--box.is--drag .vxe-modal--body:after,.vxe-modal--box.is--drag .vxe-modal--footer:after{content:"";position:absolute;top:0;left:0;width:100%;height:100%}.vxe-modal--box.is--drag .vxe-modal--body{overflow:hidden}.vxe-modal--box.is--drag .vxe-modal--body .vxe-modal--content{overflow:hidden}.vxe-modal--aside{flex-shrink:0;overflow:auto}.vxe-modal--container{display:flex;flex-direction:column;flex-grow:1;overflow:hidden}.vxe-modal--status-wrapper{flex-shrink:0;display:flex;align-items:center;font-size:1.6em}.vxe-modal--content{flex-grow:1;white-space:pre-line}.vxe-modal--body,.vxe-modal--footer,.vxe-modal--header{position:relative}.vxe-modal--body{display:flex;flex-direction:row;flex-grow:1;outline:0}.vxe-modal--body-left,.vxe-modal--body-right{flex-shrink:0;overflow:auto;outline:0}.vxe-modal--body-default{display:flex;flex-grow:1;overflow:auto;outline:0}.vxe-modal--header{display:flex;flex-direction:row;align-items:center;height:2.8em;flex-shrink:0;font-size:1.1em;font-weight:700;border-radius:var(--vxe-ui-base-border-radius) var(--vxe-ui-base-border-radius) 0 0;-webkit-user-select:none;-moz-user-select:none;user-select:none}.vxe-modal--header.is--ellipsis .vxe-modal--header-title{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.vxe-modal--footer-wrapper{display:flex;flex-direction:row}.vxe-modal--footer-wrapper .vxe-modal--footer-left{flex-grow:1;text-align:left}.vxe-modal--footer-wrapper .vxe-modal--footer-right{flex-shrink:0}.vxe-modal--header-title{flex-grow:1;padding:.8em 0 .8em .6em}.vxe-modal--header-right{display:flex;flex-direction:row;flex-shrink:0;padding:0 .6em 0 0}.vxe-modal--close-btn,.vxe-modal--zoom-btn{display:inline-flex;align-items:center;justify-content:center;width:1.6em;height:1.6em;margin-left:.5em;cursor:pointer}.vxe-modal--close-btn:hover,.vxe-modal--zoom-btn:hover{color:var(--vxe-ui-font-primary-color)}.vxe-modal--footer{flex-shrink:0;text-align:right;padding:.4em 1em .8em 1em}.vxe-modal--resize .sb-resize,.vxe-modal--resize .selb-resize,.vxe-modal--resize .sest-resize,.vxe-modal--resize .st-resize,.vxe-modal--resize .swlb-resize,.vxe-modal--resize .swst-resize,.vxe-modal--resize .wl-resize,.vxe-modal--resize .wr-resize{position:absolute;z-index:100}.vxe-modal--resize .wl-resize,.vxe-modal--resize .wr-resize{width:8px;height:100%;top:0;cursor:w-resize}.vxe-modal--resize .wl-resize{left:-4px}.vxe-modal--resize .wr-resize{right:-4px}.vxe-modal--resize .selb-resize,.vxe-modal--resize .sest-resize,.vxe-modal--resize .swlb-resize,.vxe-modal--resize .swst-resize{width:10px;height:10px;z-index:101}.vxe-modal--resize .sest-resize,.vxe-modal--resize .swst-resize{top:-8px}.vxe-modal--resize .selb-resize,.vxe-modal--resize .swlb-resize{bottom:-8px}.vxe-modal--resize .sest-resize,.vxe-modal--resize .swlb-resize{cursor:sw-resize}.vxe-modal--resize .selb-resize,.vxe-modal--resize .swst-resize{cursor:se-resize}.vxe-modal--resize .swlb-resize,.vxe-modal--resize .swst-resize{left:-8px}.vxe-modal--resize .selb-resize,.vxe-modal--resize .sest-resize{right:-8px}.vxe-modal--resize .sb-resize,.vxe-modal--resize .st-resize{width:100%;height:8px;left:0;cursor:s-resize}.vxe-modal--resize .st-resize{top:-4px}.vxe-modal--resize .sb-resize{bottom:-4px}.vxe-modal--wrapper{display:none;top:0;left:0;line-height:1.5;font-size:var(--vxe-ui-modal-current-font-size);color:var(--vxe-ui-font-color);font-family:var(--vxe-ui-font-family);outline:0}.vxe-modal--wrapper.ctx--free{width:calc(100% + 18px);height:calc(100% + 18px);position:fixed}.vxe-modal--wrapper.ctx--free.is--mask:before,.vxe-modal--wrapper.ctx--free.lock--view:before{position:fixed}.vxe-modal--wrapper.ctx--free.type--alert .vxe-modal--box,.vxe-modal--wrapper.ctx--free.type--confirm .vxe-modal--box,.vxe-modal--wrapper.ctx--free.type--modal .vxe-modal--box{position:fixed}.vxe-modal--wrapper.ctx--within{width:100%;height:100%;position:absolute}.vxe-modal--wrapper.ctx--within.is--mask:before,.vxe-modal--wrapper.ctx--within.lock--view:before{position:absolute}.vxe-modal--wrapper.ctx--within.type--alert .vxe-modal--box,.vxe-modal--wrapper.ctx--within.type--confirm .vxe-modal--box,.vxe-modal--wrapper.ctx--within.type--modal .vxe-modal--box{position:absolute}.vxe-modal--wrapper.is--active{display:block}.vxe-modal--wrapper.is--visible.is--mask:before{background-color:rgba(0,0,0,.5)}.vxe-modal--wrapper.is--visible .vxe-modal--box{opacity:1;visibility:visible}.vxe-modal--wrapper:not(.lock--view){pointer-events:none}.vxe-modal--wrapper.is--draggable.zoom--minimize .vxe-modal--header-title,.vxe-modal--wrapper.is--draggable.zoom--revert .vxe-modal--header-title{cursor:move}.vxe-modal--wrapper.zoom--maximize>.vxe-modal--box>.vxe-modal--container>.vxe-modal--resize .sb-resize,.vxe-modal--wrapper.zoom--maximize>.vxe-modal--box>.vxe-modal--container>.vxe-modal--resize .selb-resize,.vxe-modal--wrapper.zoom--maximize>.vxe-modal--box>.vxe-modal--container>.vxe-modal--resize .sest-resize,.vxe-modal--wrapper.zoom--maximize>.vxe-modal--box>.vxe-modal--container>.vxe-modal--resize .st-resize,.vxe-modal--wrapper.zoom--maximize>.vxe-modal--box>.vxe-modal--container>.vxe-modal--resize .swlb-resize,.vxe-modal--wrapper.zoom--maximize>.vxe-modal--box>.vxe-modal--container>.vxe-modal--resize .swst-resize,.vxe-modal--wrapper.zoom--maximize>.vxe-modal--box>.vxe-modal--container>.vxe-modal--resize .wl-resize,.vxe-modal--wrapper.zoom--maximize>.vxe-modal--box>.vxe-modal--container>.vxe-modal--resize .wr-resize,.vxe-modal--wrapper.zoom--minimize>.vxe-modal--box>.vxe-modal--container>.vxe-modal--resize .sb-resize,.vxe-modal--wrapper.zoom--minimize>.vxe-modal--box>.vxe-modal--container>.vxe-modal--resize .selb-resize,.vxe-modal--wrapper.zoom--minimize>.vxe-modal--box>.vxe-modal--container>.vxe-modal--resize .sest-resize,.vxe-modal--wrapper.zoom--minimize>.vxe-modal--box>.vxe-modal--container>.vxe-modal--resize .st-resize,.vxe-modal--wrapper.zoom--minimize>.vxe-modal--box>.vxe-modal--container>.vxe-modal--resize .swlb-resize,.vxe-modal--wrapper.zoom--minimize>.vxe-modal--box>.vxe-modal--container>.vxe-modal--resize .swst-resize,.vxe-modal--wrapper.zoom--minimize>.vxe-modal--box>.vxe-modal--container>.vxe-modal--resize .wl-resize,.vxe-modal--wrapper.zoom--minimize>.vxe-modal--box>.vxe-modal--container>.vxe-modal--resize .wr-resize{display:none}.vxe-modal--wrapper.zoom--maximize>.vxe-modal--box{border-radius:0}.vxe-modal--wrapper.zoom--maximize>.vxe-modal--box>.vxe-modal--container>.vxe-modal--header{border-radius:0;cursor:default}.vxe-modal--wrapper.zoom--minimize>.vxe-modal--box>.vxe-modal--container>.vxe-modal--body,.vxe-modal--wrapper.zoom--minimize>.vxe-modal--box>.vxe-modal--container>.vxe-modal--footer{display:none}.vxe-modal--wrapper.type--alert.lock--scroll,.vxe-modal--wrapper.type--confirm.lock--scroll,.vxe-modal--wrapper.type--modal.lock--scroll{overflow:hidden}.vxe-modal--wrapper.type--alert:not(.lock--scroll),.vxe-modal--wrapper.type--confirm:not(.lock--scroll),.vxe-modal--wrapper.type--modal:not(.lock--scroll){overflow:auto}.vxe-modal--wrapper.is--mask:before,.vxe-modal--wrapper.lock--view:before{content:"";top:0;left:0;width:100%;height:100%;z-index:-1;pointer-events:auto}.vxe-modal--wrapper.is--mask:before{background-color:rgba(0,0,0,0)}.vxe-modal--wrapper.is--animat{pointer-events:none}.vxe-modal--wrapper.is--animat.is--mask:before{transition:background-color .2s ease-in-out}.vxe-modal--wrapper.zoom--minimize::before{display:none}.vxe-modal--wrapper.type--alert .vxe-modal--body,.vxe-modal--wrapper.type--confirm .vxe-modal--body,.vxe-modal--wrapper.type--message .vxe-modal--body,.vxe-modal--wrapper.type--notification .vxe-modal--body{white-space:normal;word-break:break-word}.vxe-modal--wrapper.type--message .vxe-modal--box{opacity:0;transform:translate(0,-100%)}.vxe-modal--wrapper.type--message.is--visible .vxe-modal--box{opacity:1;transform:translate(0,0)}.vxe-modal--wrapper.type--notification.pos--top-right .vxe-modal--box{opacity:0;transform:translate(100%,0)}.vxe-modal--wrapper.type--notification.pos--top-right.is--visible .vxe-modal--box{opacity:1;transform:translate(0,0)}.vxe-modal--wrapper.type--message,.vxe-modal--wrapper.type--notification{width:100%;height:100%;padding:0 var(--vxe-ui-layout-padding-double);text-align:center;transition:top .3s ease-in-out}.vxe-modal--wrapper.type--message.pos--top-left,.vxe-modal--wrapper.type--notification.pos--top-left{text-align:left}.vxe-modal--wrapper.type--message.pos--top-right,.vxe-modal--wrapper.type--notification.pos--top-right{text-align:right}.vxe-modal--wrapper.type--message .vxe-modal--box,.vxe-modal--wrapper.type--notification .vxe-modal--box{display:inline-flex;flex-direction:row;margin-top:0;width:auto;box-shadow:0 0 8px 0 rgba(0,0,0,.1);transition:all .3s ease-out}.vxe-modal--wrapper.type--message .vxe-modal--box .vxe-modal--body:after,.vxe-modal--wrapper.type--notification .vxe-modal--box .vxe-modal--body:after{content:"";display:block;clear:both;height:0;overflow:hidden;visibility:hidden}.vxe-modal--wrapper.type--message .vxe-modal--box .vxe-modal--content,.vxe-modal--wrapper.type--notification .vxe-modal--box .vxe-modal--content{max-width:800px;float:left}.vxe-modal--wrapper.type--alert.is--title-bg .vxe-modal--header,.vxe-modal--wrapper.type--confirm.is--title-bg .vxe-modal--header,.vxe-modal--wrapper.type--modal.is--title-bg .vxe-modal--header{background-color:var(--vxe-ui-modal-header-background-color)}.vxe-modal--wrapper.type--alert.is--border .vxe-modal--header,.vxe-modal--wrapper.type--confirm.is--border .vxe-modal--header,.vxe-modal--wrapper.type--modal.is--border .vxe-modal--header{border-bottom:1px solid var(--vxe-ui-input-border-color)}.vxe-modal--wrapper.type--alert.is--border .vxe-modal--box,.vxe-modal--wrapper.type--confirm.is--border .vxe-modal--box,.vxe-modal--wrapper.type--modal.is--border .vxe-modal--box{border:1px solid var(--vxe-ui-base-popup-border-color)}.vxe-modal--wrapper.type--alert .vxe-modal--box,.vxe-modal--wrapper.type--confirm .vxe-modal--box,.vxe-modal--wrapper.type--modal .vxe-modal--box{display:flex;flex-direction:row;left:50%;top:0;box-shadow:var(--vxe-ui-base-popup-box-shadow)}.vxe-modal--wrapper.type--alert .vxe-modal--body,.vxe-modal--wrapper.type--confirm .vxe-modal--body,.vxe-modal--wrapper.type--modal .vxe-modal--body{overflow:auto}.vxe-modal--wrapper.type--alert .vxe-modal--body .vxe-modal--content,.vxe-modal--wrapper.type--confirm .vxe-modal--body .vxe-modal--content,.vxe-modal--wrapper.type--modal .vxe-modal--body .vxe-modal--content{overflow:auto}.vxe-modal--wrapper.status--info .vxe-modal--status-wrapper{color:var(--vxe-ui-status-info-color)}.vxe-modal--wrapper.status--question .vxe-modal--status-wrapper,.vxe-modal--wrapper.status--warning .vxe-modal--status-wrapper{color:var(--vxe-ui-status-warning-color)}.vxe-modal--wrapper.status--success .vxe-modal--status-wrapper{color:var(--vxe-ui-status-success-color)}.vxe-modal--wrapper.status--error .vxe-modal--status-wrapper{color:var(--vxe-ui-status-danger-color)}.vxe-modal--wrapper.status--loading .vxe-modal--status-wrapper{color:var(--vxe-ui-font-disabled-color)}.vxe-modal--wrapper.is--padding .vxe-modal--aside{padding:.8em .6em}.vxe-modal--wrapper.is--padding .vxe-modal--body-default{padding:.8em .6em}.vxe-modal--wrapper.is--padding .vxe-modal--body-default .vxe-modal--status-wrapper{padding-right:.6em}.vxe-modal--wrapper.is--padding.type--notification .vxe-modal--body-default{padding-top:0}.vxe-modal--wrapper.type--message .vxe-modal--body-default{padding-right:1.2em}.vxe-modal--wrapper[data-effect]{overflow:hidden}
1
+ .vxe-modal--wrapper{--vxe-ui-modal-current-font-size:var(--vxe-ui-font-size-default)}.vxe-modal--wrapper.size--xlarge{--vxe-ui-modal-current-font-size:var(--vxe-ui-font-size-xlarge)}.vxe-modal--wrapper.size--large{--vxe-ui-modal-current-font-size:var(--vxe-ui-font-size-large)}.vxe-modal--wrapper.size--medium{--vxe-ui-modal-current-font-size:var(--vxe-ui-font-size-medium)}.vxe-modal--wrapper.size--small{--vxe-ui-modal-current-font-size:var(--vxe-ui-font-size-small)}.vxe-modal--wrapper.size--mini{--vxe-ui-modal-current-font-size:var(--vxe-ui-font-size-mini)}html[data-vxe-lock-scroll]{overflow:hidden}html[data-vxe-lock-scroll] body{overflow:hidden;width:var(--vxe-ui-modal-lock-scroll-view-width)}.vxe-modal--box{visibility:hidden;width:420px;background-color:var(--vxe-ui-layout-background-color);border-radius:var(--vxe-ui-base-border-radius);text-align:left;pointer-events:auto;opacity:0;outline:0}.vxe-modal--box.is--drag{cursor:move}.vxe-modal--box.is--drag .vxe-modal--body:after,.vxe-modal--box.is--drag .vxe-modal--footer:after{content:"";position:absolute;top:0;left:0;width:100%;height:100%}.vxe-modal--box.is--drag .vxe-modal--body{overflow:hidden}.vxe-modal--box.is--drag .vxe-modal--body .vxe-modal--content,.vxe-modal--box.is--drag .vxe-modal--body .vxe-modal--scrollbar-content{overflow:hidden}.vxe-modal--aside{flex-shrink:0;overflow:auto}.vxe-modal--container{display:flex;flex-direction:column;flex-grow:1;overflow:hidden}.vxe-modal--status-wrapper{flex-shrink:0;display:flex;align-items:center;font-size:1.6em}.vxe-modal--content,.vxe-modal--scrollbar-content{flex-grow:1;white-space:pre-line}.vxe-modal--body,.vxe-modal--footer,.vxe-modal--header{position:relative}.vxe-modal--body{display:flex;flex-direction:row;flex-grow:1;outline:0}.vxe-modal--body-left,.vxe-modal--body-right{flex-shrink:0;overflow:auto;outline:0}.vxe-modal--body-default{display:flex;flex-grow:1;overflow:auto;outline:0}.vxe-modal--header{display:flex;flex-direction:row;align-items:center;height:2.8em;flex-shrink:0;font-size:1.1em;font-weight:700;border-radius:var(--vxe-ui-base-border-radius) var(--vxe-ui-base-border-radius) 0 0;-webkit-user-select:none;-moz-user-select:none;user-select:none}.vxe-modal--header.is--ellipsis .vxe-modal--header-title{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.vxe-modal--footer-wrapper{display:flex;flex-direction:row}.vxe-modal--footer-wrapper .vxe-modal--footer-left{flex-grow:1;text-align:left}.vxe-modal--footer-wrapper .vxe-modal--footer-right{flex-shrink:0}.vxe-modal--header-title{flex-grow:1;padding:.8em 0 .8em .6em}.vxe-modal--header-right{display:flex;flex-direction:row;flex-shrink:0;padding:0 .6em 0 0}.vxe-modal--close-btn,.vxe-modal--zoom-btn{display:inline-flex;align-items:center;justify-content:center;width:1.6em;height:1.6em;margin-left:.5em;cursor:pointer}.vxe-modal--close-btn:hover,.vxe-modal--zoom-btn:hover{color:var(--vxe-ui-font-primary-color)}.vxe-modal--footer{flex-shrink:0;text-align:right;padding:.4em 1em .8em 1em}.vxe-modal--resize .sb-resize,.vxe-modal--resize .selb-resize,.vxe-modal--resize .sest-resize,.vxe-modal--resize .st-resize,.vxe-modal--resize .swlb-resize,.vxe-modal--resize .swst-resize,.vxe-modal--resize .wl-resize,.vxe-modal--resize .wr-resize{position:absolute;z-index:100}.vxe-modal--resize .wl-resize,.vxe-modal--resize .wr-resize{width:8px;height:100%;top:0;cursor:w-resize}.vxe-modal--resize .wl-resize{left:-4px}.vxe-modal--resize .wr-resize{right:-4px}.vxe-modal--resize .selb-resize,.vxe-modal--resize .sest-resize,.vxe-modal--resize .swlb-resize,.vxe-modal--resize .swst-resize{width:10px;height:10px;z-index:101}.vxe-modal--resize .sest-resize,.vxe-modal--resize .swst-resize{top:-8px}.vxe-modal--resize .selb-resize,.vxe-modal--resize .swlb-resize{bottom:-8px}.vxe-modal--resize .sest-resize,.vxe-modal--resize .swlb-resize{cursor:sw-resize}.vxe-modal--resize .selb-resize,.vxe-modal--resize .swst-resize{cursor:se-resize}.vxe-modal--resize .swlb-resize,.vxe-modal--resize .swst-resize{left:-8px}.vxe-modal--resize .selb-resize,.vxe-modal--resize .sest-resize{right:-8px}.vxe-modal--resize .sb-resize,.vxe-modal--resize .st-resize{width:100%;height:8px;left:0;cursor:s-resize}.vxe-modal--resize .st-resize{top:-4px}.vxe-modal--resize .sb-resize{bottom:-4px}.vxe-modal--wrapper{display:none;top:0;left:0;line-height:1.5;font-size:var(--vxe-ui-modal-current-font-size);color:var(--vxe-ui-font-color);font-family:var(--vxe-ui-font-family);outline:0}.vxe-modal--wrapper.ctx--free{width:calc(100% + 18px);height:calc(100% + 18px);position:fixed}.vxe-modal--wrapper.ctx--free.is--mask:before,.vxe-modal--wrapper.ctx--free.lock--view:before{position:fixed}.vxe-modal--wrapper.ctx--free.type--alert .vxe-modal--box,.vxe-modal--wrapper.ctx--free.type--confirm .vxe-modal--box,.vxe-modal--wrapper.ctx--free.type--modal .vxe-modal--box{position:fixed}.vxe-modal--wrapper.ctx--within{width:100%;height:100%;position:absolute}.vxe-modal--wrapper.ctx--within.is--mask:before,.vxe-modal--wrapper.ctx--within.lock--view:before{position:absolute}.vxe-modal--wrapper.ctx--within.type--alert .vxe-modal--box,.vxe-modal--wrapper.ctx--within.type--confirm .vxe-modal--box,.vxe-modal--wrapper.ctx--within.type--modal .vxe-modal--box{position:absolute}.vxe-modal--wrapper.is--active{display:block}.vxe-modal--wrapper.is--visible.is--mask:before{background-color:rgba(0,0,0,.5)}.vxe-modal--wrapper.is--visible .vxe-modal--box{opacity:1;visibility:visible}.vxe-modal--wrapper:not(.lock--view){pointer-events:none}.vxe-modal--wrapper.is--draggable.zoom--minimize .vxe-modal--header-title,.vxe-modal--wrapper.is--draggable.zoom--revert .vxe-modal--header-title{cursor:move}.vxe-modal--wrapper.zoom--maximize>.vxe-modal--box>.vxe-modal--container>.vxe-modal--resize .sb-resize,.vxe-modal--wrapper.zoom--maximize>.vxe-modal--box>.vxe-modal--container>.vxe-modal--resize .selb-resize,.vxe-modal--wrapper.zoom--maximize>.vxe-modal--box>.vxe-modal--container>.vxe-modal--resize .sest-resize,.vxe-modal--wrapper.zoom--maximize>.vxe-modal--box>.vxe-modal--container>.vxe-modal--resize .st-resize,.vxe-modal--wrapper.zoom--maximize>.vxe-modal--box>.vxe-modal--container>.vxe-modal--resize .swlb-resize,.vxe-modal--wrapper.zoom--maximize>.vxe-modal--box>.vxe-modal--container>.vxe-modal--resize .swst-resize,.vxe-modal--wrapper.zoom--maximize>.vxe-modal--box>.vxe-modal--container>.vxe-modal--resize .wl-resize,.vxe-modal--wrapper.zoom--maximize>.vxe-modal--box>.vxe-modal--container>.vxe-modal--resize .wr-resize,.vxe-modal--wrapper.zoom--minimize>.vxe-modal--box>.vxe-modal--container>.vxe-modal--resize .sb-resize,.vxe-modal--wrapper.zoom--minimize>.vxe-modal--box>.vxe-modal--container>.vxe-modal--resize .selb-resize,.vxe-modal--wrapper.zoom--minimize>.vxe-modal--box>.vxe-modal--container>.vxe-modal--resize .sest-resize,.vxe-modal--wrapper.zoom--minimize>.vxe-modal--box>.vxe-modal--container>.vxe-modal--resize .st-resize,.vxe-modal--wrapper.zoom--minimize>.vxe-modal--box>.vxe-modal--container>.vxe-modal--resize .swlb-resize,.vxe-modal--wrapper.zoom--minimize>.vxe-modal--box>.vxe-modal--container>.vxe-modal--resize .swst-resize,.vxe-modal--wrapper.zoom--minimize>.vxe-modal--box>.vxe-modal--container>.vxe-modal--resize .wl-resize,.vxe-modal--wrapper.zoom--minimize>.vxe-modal--box>.vxe-modal--container>.vxe-modal--resize .wr-resize{display:none}.vxe-modal--wrapper.zoom--maximize>.vxe-modal--box{border-radius:0}.vxe-modal--wrapper.zoom--maximize>.vxe-modal--box>.vxe-modal--container>.vxe-modal--header{border-radius:0;cursor:default}.vxe-modal--wrapper.zoom--minimize>.vxe-modal--box>.vxe-modal--container>.vxe-modal--body,.vxe-modal--wrapper.zoom--minimize>.vxe-modal--box>.vxe-modal--container>.vxe-modal--footer{display:none}.vxe-modal--wrapper.type--alert.lock--scroll,.vxe-modal--wrapper.type--confirm.lock--scroll,.vxe-modal--wrapper.type--modal.lock--scroll{overflow:hidden}.vxe-modal--wrapper.type--alert:not(.lock--scroll),.vxe-modal--wrapper.type--confirm:not(.lock--scroll),.vxe-modal--wrapper.type--modal:not(.lock--scroll){overflow:auto}.vxe-modal--wrapper.is--mask:before,.vxe-modal--wrapper.lock--view:before{content:"";top:0;left:0;width:100%;height:100%;z-index:-1;pointer-events:auto}.vxe-modal--wrapper.is--mask:before{background-color:rgba(0,0,0,0)}.vxe-modal--wrapper.is--animat{pointer-events:none}.vxe-modal--wrapper.is--animat.is--mask:before{transition:background-color .2s ease-in-out}.vxe-modal--wrapper.zoom--minimize::before{display:none}.vxe-modal--wrapper.type--alert .vxe-modal--body,.vxe-modal--wrapper.type--confirm .vxe-modal--body,.vxe-modal--wrapper.type--message .vxe-modal--body,.vxe-modal--wrapper.type--notification .vxe-modal--body{white-space:normal;word-break:break-word}.vxe-modal--wrapper.type--message .vxe-modal--box{opacity:0;transform:translate(0,-100%)}.vxe-modal--wrapper.type--message.is--visible .vxe-modal--box{opacity:1;transform:translate(0,0)}.vxe-modal--wrapper.type--notification.pos--top-right .vxe-modal--box{opacity:0;transform:translate(100%,0)}.vxe-modal--wrapper.type--notification.pos--top-right.is--visible .vxe-modal--box{opacity:1;transform:translate(0,0)}.vxe-modal--wrapper.type--message,.vxe-modal--wrapper.type--notification{width:100%;height:100%;padding:0 var(--vxe-ui-layout-padding-double);text-align:center;transition:top .3s ease-in-out}.vxe-modal--wrapper.type--message.pos--top-left,.vxe-modal--wrapper.type--notification.pos--top-left{text-align:left}.vxe-modal--wrapper.type--message.pos--top-right,.vxe-modal--wrapper.type--notification.pos--top-right{text-align:right}.vxe-modal--wrapper.type--message .vxe-modal--box,.vxe-modal--wrapper.type--notification .vxe-modal--box{display:inline-flex;flex-direction:row;margin-top:0;width:auto;box-shadow:0 0 8px 0 rgba(0,0,0,.1);transition:all .3s ease-out}.vxe-modal--wrapper.type--message .vxe-modal--box .vxe-modal--body:after,.vxe-modal--wrapper.type--notification .vxe-modal--box .vxe-modal--body:after{content:"";display:block;clear:both;height:0;overflow:hidden;visibility:hidden}.vxe-modal--wrapper.type--message .vxe-modal--box .vxe-modal--content,.vxe-modal--wrapper.type--message .vxe-modal--box .vxe-modal--scrollbar-content,.vxe-modal--wrapper.type--notification .vxe-modal--box .vxe-modal--content,.vxe-modal--wrapper.type--notification .vxe-modal--box .vxe-modal--scrollbar-content{max-width:800px;float:left}.vxe-modal--wrapper.type--alert.is--title-bg .vxe-modal--header,.vxe-modal--wrapper.type--confirm.is--title-bg .vxe-modal--header,.vxe-modal--wrapper.type--modal.is--title-bg .vxe-modal--header{background-color:var(--vxe-ui-modal-header-background-color)}.vxe-modal--wrapper.type--alert.is--border .vxe-modal--header,.vxe-modal--wrapper.type--confirm.is--border .vxe-modal--header,.vxe-modal--wrapper.type--modal.is--border .vxe-modal--header{border-bottom:1px solid var(--vxe-ui-input-border-color)}.vxe-modal--wrapper.type--alert.is--border .vxe-modal--box,.vxe-modal--wrapper.type--confirm.is--border .vxe-modal--box,.vxe-modal--wrapper.type--modal.is--border .vxe-modal--box{border:1px solid var(--vxe-ui-base-popup-border-color)}.vxe-modal--wrapper.type--alert .vxe-modal--box,.vxe-modal--wrapper.type--confirm .vxe-modal--box,.vxe-modal--wrapper.type--modal .vxe-modal--box{display:flex;flex-direction:row;left:50%;top:0;box-shadow:var(--vxe-ui-base-popup-box-shadow)}.vxe-modal--wrapper.type--alert .vxe-modal--body,.vxe-modal--wrapper.type--confirm .vxe-modal--body,.vxe-modal--wrapper.type--modal .vxe-modal--body{overflow:auto}.vxe-modal--wrapper.type--alert .vxe-modal--body .vxe-modal--content,.vxe-modal--wrapper.type--alert .vxe-modal--body .vxe-modal--scrollbar-content,.vxe-modal--wrapper.type--confirm .vxe-modal--body .vxe-modal--content,.vxe-modal--wrapper.type--confirm .vxe-modal--body .vxe-modal--scrollbar-content,.vxe-modal--wrapper.type--modal .vxe-modal--body .vxe-modal--content,.vxe-modal--wrapper.type--modal .vxe-modal--body .vxe-modal--scrollbar-content{overflow:auto}.vxe-modal--wrapper.status--info .vxe-modal--status-wrapper{color:var(--vxe-ui-status-info-color)}.vxe-modal--wrapper.status--question .vxe-modal--status-wrapper,.vxe-modal--wrapper.status--warning .vxe-modal--status-wrapper{color:var(--vxe-ui-status-warning-color)}.vxe-modal--wrapper.status--success .vxe-modal--status-wrapper{color:var(--vxe-ui-status-success-color)}.vxe-modal--wrapper.status--error .vxe-modal--status-wrapper{color:var(--vxe-ui-status-danger-color)}.vxe-modal--wrapper.status--loading .vxe-modal--status-wrapper{color:var(--vxe-ui-font-disabled-color)}.vxe-modal--wrapper.is--padding .vxe-modal--aside{padding:.8em .6em}.vxe-modal--wrapper.is--padding .vxe-modal--body-default{padding:.8em .6em}.vxe-modal--wrapper.is--padding .vxe-modal--body-default .vxe-modal--status-wrapper{padding-right:.6em}.vxe-modal--wrapper.is--padding.type--notification .vxe-modal--body-default{padding-top:0}.vxe-modal--wrapper.type--message .vxe-modal--body-default{padding-right:1.2em}.vxe-modal--wrapper[data-effect]{overflow:hidden}.vxe-modal--scrollbar-content{width:100%}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vxe-pc-ui",
3
- "version": "4.20.1",
3
+ "version": "4.20.2",
4
4
  "description": "A vue based PC component library",
5
5
  "scripts": {
6
6
  "update": "npm install --legacy-peer-deps",
@@ -27,7 +27,7 @@
27
27
  "style": "lib/style.css",
28
28
  "typings": "types/index.d.ts",
29
29
  "dependencies": {
30
- "@vxe-ui/core": "^4.4.28"
30
+ "@vxe-ui/core": "^4.4.31"
31
31
  },
32
32
  "devDependencies": {
33
33
  "@rollup/plugin-commonjs": "^29.0.0",
@@ -4,6 +4,7 @@ import XEUtils from 'xe-utils'
4
4
  import { getSlotVNs } from '../../ui/src/vn'
5
5
  import { getConfig, createEvent, useSize, renderEmptyElement } from '../../ui'
6
6
  import { toCssUnit } from '../../ui/src/dom'
7
+ import { getDefaultConfig } from '../../ui/src/utils'
7
8
  import VxeLoadingComponent from '../../loading'
8
9
  import VxeScrollbarComponent from '../../scrollbar'
9
10
 
@@ -38,7 +39,7 @@ export default defineVxeComponent({
38
39
  },
39
40
  useScrollbar: {
40
41
  type: Boolean as PropType<VxeCardPropTypes.UseScrollbar>,
41
- default: () => getConfig().card.useScrollbar
42
+ default: () => getDefaultConfig(getConfig().card.useScrollbar, getConfig().useScrollbar)
42
43
  },
43
44
  scrollbarConfig: Object as PropType<VxeCardPropTypes.ScrollbarConfig>
44
45
  },
@@ -1,13 +1,14 @@
1
- import { h, Teleport, ref, Ref, inject, reactive, nextTick, provide, watch, PropType, onMounted, onUnmounted, computed } from 'vue'
1
+ import { h, Teleport, ref, Ref, inject, reactive, nextTick, provide, watch, PropType, onMounted, onUnmounted, computed, VNode } from 'vue'
2
2
  import { defineVxeComponent } from '../../ui/src/comp'
3
3
  import XEUtils from 'xe-utils'
4
4
  import { useSize, getIcon, getConfig, getI18n, globalEvents, GLOBAL_EVENT_KEYS, createEvent, renderEmptyElement } from '../../ui'
5
- import { getLastZIndex, nextZIndex, getFuncText } from '../../ui/src/utils'
5
+ import { getLastZIndex, nextZIndex, getFuncText, getDefaultConfig } from '../../ui/src/utils'
6
6
  import { getPopupContainer, getPopupWrapperElement, toCssUnit } from '../../ui/src/dom'
7
7
  import { allActiveDrawers } from './store'
8
8
  import { getSlotVNs } from '../../ui/src/vn'
9
9
  import VxeButtonComponent from '../../button'
10
10
  import VxeLoadingComponent from '../../loading'
11
+ import VxeScrollbarComponent from '../../scrollbar'
11
12
 
12
13
  import type { VxeDrawerPropTypes, DrawerReactData, VxeDrawerEmits, DrawerPrivateRef, DrawerMethods, DrawerPrivateMethods, VxeDrawerPrivateComputed, VxeDrawerConstructor, VxeDrawerMethods, VxeButtonInstance, DrawerEventTypes, ValueOf, VxeModalConstructor, VxeModalMethods, VxeFormConstructor, VxeFormPrivateMethods } from '../../../types'
13
14
  import type { VxeTableConstructor, VxeTablePrivateMethods } from '../../../types/components/table'
@@ -144,7 +145,12 @@ export default defineVxeComponent({
144
145
  default: () => getConfig().drawer.size || getConfig().size
145
146
  },
146
147
  beforeHideMethod: Function as PropType<VxeDrawerPropTypes.BeforeHideMethod>,
147
- slots: Object as PropType<VxeDrawerPropTypes.Slots>
148
+ slots: Object as PropType<VxeDrawerPropTypes.Slots>,
149
+ useScrollbar: {
150
+ type: Boolean as PropType<VxeDrawerPropTypes.UseScrollbar>,
151
+ default: () => getDefaultConfig(getConfig().drawer.useScrollbar, getConfig().useScrollbar)
152
+ },
153
+ scrollbarConfig: Object as PropType<VxeDrawerPropTypes.ScrollbarConfig>
148
154
  },
149
155
  emits: [
150
156
  'update:modelValue',
@@ -215,6 +221,27 @@ export default defineVxeComponent({
215
221
  return 'wl'
216
222
  })
217
223
 
224
+ const computeScrollbarOpts = computed(() => {
225
+ return Object.assign({}, getConfig().modal.scrollbarConfig, props.scrollbarConfig)
226
+ })
227
+
228
+ const computeScrollbarProps = computed(() => {
229
+ const scrollbarOpts = computeScrollbarOpts.value
230
+ const { viewClassName, viewInnerClassName } = scrollbarOpts
231
+ return {
232
+ width: scrollbarOpts.width,
233
+ height: scrollbarOpts.height,
234
+ autoHide: scrollbarOpts.autoHide,
235
+ visible: scrollbarOpts.visible,
236
+ xConfig: scrollbarOpts.xConfig,
237
+ yConfig: scrollbarOpts.yConfig,
238
+ className: scrollbarOpts.className,
239
+ viewAttrs: scrollbarOpts.viewAttrs,
240
+ viewClassName: 'vxe-drawer--scrollbar-content-view' + (viewClassName ? (' ' + viewClassName) : ''),
241
+ viewInnerClassName: 'vxe-drawer--scrollbar-content-inner' + (viewClassName ? (' ' + viewInnerClassName) : '')
242
+ }
243
+ })
244
+
218
245
  const computeMaps: VxeDrawerPrivateComputed = {
219
246
  }
220
247
 
@@ -537,10 +564,51 @@ export default defineVxeComponent({
537
564
  }
538
565
 
539
566
  const renderBody = () => {
540
- const { slots: propSlots = {}, content, useHtml } = props
567
+ const { slots: propSlots = {}, content, useScrollbar, useHtml } = props
568
+ const scrollbarProps = computeScrollbarProps.value
541
569
  const defaultSlot = slots.default || propSlots.default
542
570
  const leftSlot = slots.left || propSlots.left
543
571
  const rightSlot = slots.right || propSlots.right
572
+ const contVNs: VNode[] = []
573
+ if (useHtml && !defaultSlot) {
574
+ contVNs.push(
575
+ useScrollbar
576
+ ? h(VxeScrollbarComponent, {
577
+ key: 'shc',
578
+ class: 'vxe-drawer--scrollbar-content',
579
+ ...scrollbarProps
580
+ }, {
581
+ default () {
582
+ return [
583
+ h('div', {
584
+ class: 'vxe-drawer--scrollbar-content-html',
585
+ innerHTML: getFuncText(content)
586
+ })
587
+ ]
588
+ }
589
+ })
590
+ : h('div', {
591
+ key: 'hc',
592
+ class: 'vxe-drawer--content',
593
+ innerHTML: getFuncText(content)
594
+ })
595
+ )
596
+ } else {
597
+ contVNs.push(
598
+ useScrollbar
599
+ ? h(VxeScrollbarComponent, {
600
+ key: 'sdc',
601
+ class: 'vxe-drawer--scrollbar-content',
602
+ ...scrollbarProps
603
+ }, {
604
+ default: () => defaultSlot ? getSlotVNs(defaultSlot({ $drawer: $xeDrawer })) : getFuncText(content)
605
+ })
606
+ : h('div', {
607
+ key: 'dc',
608
+ class: 'vxe-drawer--content'
609
+ }, defaultSlot ? getSlotVNs(defaultSlot({ $drawer: $xeDrawer })) : getFuncText(content))
610
+ )
611
+ }
544
612
  return h('div', {
545
613
  class: 'vxe-drawer--body'
546
614
  }, [
@@ -551,18 +619,7 @@ export default defineVxeComponent({
551
619
  : renderEmptyElement($xeDrawer),
552
620
  h('div', {
553
621
  class: 'vxe-drawer--body-default'
554
- }, [
555
- useHtml && !defaultSlot
556
- ? h('div', {
557
- key: 'hc',
558
- class: 'vxe-drawer--content',
559
- innerHTML: getFuncText(content)
560
- })
561
- : h('div', {
562
- key: 'dc',
563
- class: 'vxe-drawer--content'
564
- }, defaultSlot ? getSlotVNs(defaultSlot({ $drawer: $xeDrawer })) : getFuncText(content))
565
- ]),
622
+ }, contVNs),
566
623
  rightSlot
567
624
  ? h('div', {
568
625
  class: 'vxe-drawer--body-right'
@@ -2,6 +2,7 @@ import { ref, h, reactive, computed, provide, PropType } from 'vue'
2
2
  import { defineVxeComponent } from '../../ui/src/comp'
3
3
  import { toCssUnit } from '../../ui/src/dom'
4
4
  import { getConfig, useSize, createEvent } from '../../ui'
5
+ import { getDefaultConfig } from '../../ui/src/utils'
5
6
  import XEUtils from 'xe-utils'
6
7
  import VxeLoadingComponent from '../../loading'
7
8
  import VxeScrollbarComponent from '../../scrollbar'
@@ -19,7 +20,7 @@ export default defineVxeComponent({
19
20
  collapseConfig: Object as PropType<VxeLayoutAsidePropTypes.CollapseConfig>,
20
21
  useScrollbar: {
21
22
  type: Boolean as PropType<VxeLayoutAsidePropTypes.UseScrollbar>,
22
- default: () => getConfig().layoutAside.useScrollbar
23
+ default: () => getDefaultConfig(getConfig().layoutAside.useScrollbar, getConfig().useScrollbar)
23
24
  },
24
25
  scrollbarConfig: Object as PropType<VxeLayoutAsidePropTypes.ScrollbarConfig>,
25
26
  size: {
@@ -2,6 +2,7 @@ import { ref, h, reactive, PropType, computed } from 'vue'
2
2
  import { defineVxeComponent } from '../../ui/src/comp'
3
3
  import { getConfig, useSize, createEvent, renderEmptyElement } from '../../ui'
4
4
  import XEUtils from 'xe-utils'
5
+ import { getDefaultConfig } from '../../ui/src/utils'
5
6
  import VxeLoadingComponent from '../../loading'
6
7
  import VxeScrollbarComponent from '../../scrollbar'
7
8
  import VxeUIBacktopComponent from '../../backtop'
@@ -28,7 +29,7 @@ export default defineVxeComponent({
28
29
  backtopConfig: Object as PropType<VxeLayoutBodyPropTypes.BacktopConfig>,
29
30
  useScrollbar: {
30
31
  type: Boolean as PropType<VxeLayoutBodyPropTypes.UseScrollbar>,
31
- default: () => getConfig().layoutBody.useScrollbar
32
+ default: () => getDefaultConfig(getConfig().layoutBody.useScrollbar, getConfig().useScrollbar)
32
33
  },
33
34
  scrollbarConfig: Object as PropType<VxeLayoutBodyPropTypes.ScrollbarConfig>,
34
35
  size: {
@@ -63,8 +63,10 @@ function createInternalData (): ListInternalData {
63
63
  fullKeyMaps: {},
64
64
  rowMaps: {},
65
65
 
66
- // 滚动条
67
66
  // resizeObserver: undefined,
67
+
68
+ // 滚动条
69
+ // scrollObserver: undefined,
68
70
  // isThumbDrag: false,
69
71
  thumbDragOffset: 0,
70
72
  yThumbTop: 0,
@@ -133,7 +135,7 @@ export default defineVxeComponent({
133
135
  scrollY: Object as PropType<VxeListPropTypes.ScrollY>,
134
136
  useScrollbar: {
135
137
  type: Boolean as PropType<VxeListPropTypes.UseScrollbar>,
136
- default: () => getConfig().list.useScrollbar
138
+ default: () => getDefaultConfig(getConfig().list.useScrollbar, getConfig().useScrollbar)
137
139
  },
138
140
  scrollbarConfig: Object as PropType<VxeListPropTypes.ScrollbarConfig>
139
141
  },
@@ -241,11 +243,8 @@ export default defineVxeComponent({
241
243
 
242
244
  const computeWrapperStyles = computed(() => {
243
245
  const rowHeight = computeRowHeight.value
244
- const scrollbarOpts = computeScrollbarOpts.value
245
- const scrollbarXOpts = computeScrollbarXOpts.value
246
- const scrollbarYOpts = computeScrollbarYOpts.value
247
- const barWidth = getDefaultConfig(getDefaultConfig(scrollbarYOpts.width, scrollbarOpts.width), getConfig().scrollbar.width)
248
- const barHeight = getDefaultConfig(getDefaultConfig(scrollbarXOpts.height, scrollbarOpts.height), getConfig().scrollbar.height)
246
+ const barWidth = computeScrollYWidth.value
247
+ const barHeight = computeScrollXHeight.value
249
248
  const stys: VxeComponentStyleType = {}
250
249
  if (rowHeight) {
251
250
  stys['--vxe-ui-list-row-height'] = toCssUnit(rowHeight)
@@ -284,6 +283,18 @@ export default defineVxeComponent({
284
283
  return Object.assign({}, getConfig().scrollbar.yConfig, scrollbarOpts.yConfig)
285
284
  })
286
285
 
286
+ const computeScrollXHeight = computed(() => {
287
+ const scrollbarOpts = computeScrollbarOpts.value
288
+ const scrollbarXOpts = computeScrollbarXOpts.value
289
+ return getDefaultConfig(getDefaultConfig(scrollbarXOpts.height, scrollbarOpts.height), getConfig().scrollbar.height)
290
+ })
291
+
292
+ const computeScrollYWidth = computed(() => {
293
+ const scrollbarOpts = computeScrollbarOpts.value
294
+ const scrollbarYOpts = computeScrollbarYOpts.value
295
+ return getDefaultConfig(getDefaultConfig(scrollbarYOpts.width, scrollbarOpts.width), getConfig().scrollbar.width)
296
+ })
297
+
287
298
  const computeScrollXVisible = computed(() => {
288
299
  const scrollbarOpts = computeScrollbarOpts.value
289
300
  const scrollbarXOpts = computeScrollbarXOpts.value
@@ -309,15 +320,11 @@ export default defineVxeComponent({
309
320
  })
310
321
 
311
322
  const computeScrollbarWrapperClss = computed(() => {
312
- const scrollbarOpts = computeScrollbarOpts.value
313
- const { padding } = scrollbarOpts
314
323
  const { yThumbHeight, xThumbWidth } = reactData
315
324
  const scrollbarXToTop = computeScrollbarXToTop.value
316
325
  const scrollbarYToLeft = computeScrollbarYToLeft.value
317
326
  const scrollXVisible = computeScrollXVisible.value
318
327
  const scrollYVisible = computeScrollYVisible.value
319
- const scrollXAutoHide = computeScrollXAutoHide.value
320
- const scrollYAutoHide = computeScrollYAutoHide.value
321
328
  return domUtils.buildClass([
322
329
  'vxe-scrollbar is--virtual',
323
330
  `ov-x--${scrollXVisible === false ? 'hidden' : 'visible'}`,
@@ -325,9 +332,6 @@ export default defineVxeComponent({
325
332
  `sx-pos--${scrollbarXToTop ? 'top' : 'bottom'}`,
326
333
  `sy-pos--${scrollbarYToLeft ? 'left' : 'right'}`
327
334
  ], {
328
- 'is--padding': padding,
329
- 'ov-x--auto-hide': scrollXAutoHide,
330
- 'ov-y--auto-hide': scrollYAutoHide,
331
335
  'overflow-y': yThumbHeight,
332
336
  'overflow-x': xThumbWidth
333
337
  })
@@ -360,6 +364,11 @@ export default defineVxeComponent({
360
364
  return getRowIdByField(row, keyField)
361
365
  }
362
366
 
367
+ const getParentElem = () => {
368
+ const el = refElem.value
369
+ return el ? el.parentElement : null
370
+ }
371
+
363
372
  const calcTableHeight = (key: 'height' | 'maxHeight') => {
364
373
  const { parentHeight } = reactData
365
374
  const val = props[key]
@@ -2540,6 +2549,12 @@ export default defineVxeComponent({
2540
2549
  watch(computeRowHeight, () => {
2541
2550
  reFlag.value++
2542
2551
  })
2552
+ watch(computeScrollYWidth, () => {
2553
+ reFlag.value++
2554
+ })
2555
+ watch(computeScrollXHeight, () => {
2556
+ reFlag.value++
2557
+ })
2543
2558
  watch(computeScrollXVisible, () => {
2544
2559
  nextTick(() => {
2545
2560
  reFlag.value++
@@ -2605,20 +2620,32 @@ export default defineVxeComponent({
2605
2620
  if (useKey && !keyField) {
2606
2621
  errLog('vxe.error.reqSupportProp', ['row-config.useKey', 'row-config.keyField'])
2607
2622
  }
2608
- if (useScrollbar || autoResize) {
2609
- const el = refElem.value
2623
+ const el = refElem.value
2624
+ if (useScrollbar) {
2610
2625
  const viewInnerEl = refVirtualBody.value
2611
- const resizeObserver = globalResize.create(() => {
2626
+ const scrollObserver = globalResize.create(() => {
2612
2627
  reFlag.value++
2613
2628
  })
2614
2629
  if (el) {
2615
- resizeObserver.observe(el)
2616
- if (autoResize) {
2617
- resizeObserver.observe(el.parentElement as HTMLDivElement)
2618
- }
2630
+ scrollObserver.observe(el)
2619
2631
  }
2620
2632
  if (viewInnerEl) {
2621
- resizeObserver.observe(viewInnerEl)
2633
+ scrollObserver.observe(viewInnerEl)
2634
+ }
2635
+ internalData.scrollObserver = scrollObserver
2636
+ }
2637
+ if (autoResize) {
2638
+ const parentEl = getParentElem()
2639
+ const resizeObserver = globalResize.create(() => {
2640
+ if (props.autoResize) {
2641
+ reFlag.value++
2642
+ }
2643
+ })
2644
+ if (el) {
2645
+ resizeObserver.observe(el)
2646
+ }
2647
+ if (parentEl) {
2648
+ resizeObserver.observe(parentEl)
2622
2649
  }
2623
2650
  internalData.resizeObserver = resizeObserver
2624
2651
  }
@@ -2629,10 +2656,13 @@ export default defineVxeComponent({
2629
2656
  })
2630
2657
 
2631
2658
  onBeforeUnmount(() => {
2632
- const { resizeObserver } = internalData
2659
+ const { scrollObserver, resizeObserver } = internalData
2633
2660
  if (resizeObserver) {
2634
2661
  resizeObserver.disconnect()
2635
2662
  }
2663
+ if (scrollObserver) {
2664
+ scrollObserver.disconnect()
2665
+ }
2636
2666
  globalEvents.off($xeList, 'resize')
2637
2667
  XEUtils.assign(reactData, createReactData())
2638
2668
  XEUtils.assign(internalData, createInternalData())
@@ -3,7 +3,7 @@ import { defineVxeComponent } from '../../ui/src/comp'
3
3
  import XEUtils from 'xe-utils'
4
4
  import { VxeUI, createEvent, permission, useSize, globalEvents, renderEmptyElement } from '../../ui'
5
5
  import { getPopupContainer, scrollToView, toCssUnit } from '../../ui/src/dom'
6
- import { getLastZIndex, nextZIndex, isEnableConf } from '../../ui/src/utils'
6
+ import { getLastZIndex, nextZIndex, isEnableConf, getDefaultConfig } from '../../ui/src/utils'
7
7
  import { getSlotVNs } from '../../ui/src/vn'
8
8
  import { createComponentLog } from '../../ui/src/log'
9
9
  import VxeLoadingComponent from '../../loading'
@@ -74,7 +74,7 @@ export default defineVxeComponent({
74
74
  menuConfig: Object as PropType<VxeMenuPropTypes.MenuConfig>,
75
75
  useScrollbar: {
76
76
  type: Boolean as PropType<VxeMenuPropTypes.UseScrollbar>,
77
- default: () => getConfig().menu.useScrollbar
77
+ default: () => getDefaultConfig(getConfig().menu.useScrollbar, getConfig().useScrollbar)
78
78
  },
79
79
  scrollbarConfig: Object as PropType<VxeMenuPropTypes.ScrollbarConfig>,
80
80
  appendTo: {