bkui-vue 1.0.3-beta.67.dialog.5 → 1.0.3-beta.68.dialog.1

package/lib/scrollbar/index.js

@@ -17783,7 +17783,8 @@ var BkScrollbarCore = /*#__PURE__*/function () {
     _defineProperty(this, "mouseX", 0);
     _defineProperty(this, "mouseY", 0);
     _defineProperty(this, "mouseWheelInstance", null);
-    _defineProperty(this, "wheelOffset", 0);
+    _defineProperty(this, "wheelOffsetY", 0);
+    _defineProperty(this, "wheelOffsetX", 0);
     /**
      * 最外层滚动容器滚动实际位置缓存器
      */
@@ -17988,7 +17989,10 @@ var BkScrollbarCore = /*#__PURE__*/function () {
         });
       }
       if (axisValue === 'y') {
-        _this.wheelOffset = resolvedValue;
+        _this.wheelOffsetY = resolvedValue;
+      }
+      if (axisValue === 'x') {
+        _this.wheelOffsetX = resolvedValue;
       }
       (_this$options = _this.options) === null || _this$options === void 0 || (_this$options$onScrol = _this$options.onScrollCallback) === null || _this$options$onScrol === void 0 || _this$options$onScrol.call(_this$options, {
         x: _this.wrapperScrollValue.scrollLeft,
@@ -18026,18 +18030,21 @@ var BkScrollbarCore = /*#__PURE__*/function () {
       e.stopPropagation();
     });
     _defineProperty(this, "mOnMouseWheel", function (args) {
-      var nextPostiion = _this.wheelOffset + args.y;
-      if (_this.scrollToAxisPosition(nextPostiion, 'y')) {
+      var nextY = _this.wheelOffsetY + args.y;
+      var nextX = _this.wheelOffsetX + args.x;
+      if (_this.scrollToAxisPosition(nextY, 'y') || _this.scrollToAxisPosition(nextX, 'x')) {
         args.evt.stopPropagation();
         args.evt.preventDefault();
         args.evt.stopImmediatePropagation();
         _this.showScrollbar('y');
+        _this.showScrollbar('x');
         if (_this.mouseWeelTimer) {
           clearTimeout(_this.mouseWeelTimer);
           _this.mouseWeelTimer = null;
         }
         _this.mouseWeelTimer = setTimeout(function () {
           _this.hideScrollbar('y');
+          _this.showScrollbar('x');
         }, 200);
       }
     });

package/lib/scrollbar/scrollbar-core/index.d.ts

@@ -146,7 +146,8 @@ export default class BkScrollbarCore {
     mouseX: number;
     mouseY: number;
     mouseWheelInstance: MouseWheelInstance;
-    wheelOffset: number;
+    wheelOffsetY: number;
+    wheelOffsetX: number;
     mouseWeelTimer: any;
     /**
      * 最外层滚动容器滚动实际位置缓存器

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bkui-vue",
-  "version": "1.0.3-beta.67.dialog.5",
+  "version": "1.0.3-beta.68.dialog.1",
   "workspaces": {
     "packages": [
       "packages/!(**.bak)*",