bkui-vue 1.0.3-beta.65.dialog.1 → 1.0.3-beta.66.dialog.1

package/lib/sideslider/sideslider.css

@@ -4,79 +4,48 @@
 .bk-sideslider.is-position-left .bk-modal-wrapper {
   left: 0;
 }
+.bk-sideslider.is-position-left .bk-sideslider-header {
+  flex-direction: row-reverse;
+}
 .bk-sideslider .bk-modal-wrapper {
   position: fixed;
   top: 0;
   bottom: 0;
 }
 .bk-sideslider .bk-modal-footer.is-fixed .bk-sideslider-footer {
-  height: 54px;
   margin: 0;
-  border-top: 1px solid transparent;
+  background: #fafbfd;
+  box-shadow: 0 -1px 0 0 #dcdee5;
   box-shadow: rgba(0, 0, 0, 0.06) 0 -2px 4px 0;
 }
 .bk-sideslider-header {
-  width: 100%;
+  display: flex;
   height: 52px;
   background: #fff;
   border-bottom: 1px solid #dcdee5;
 }
 .bk-sideslider-close {
-  position: absolute;
-  top: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
   width: 30px;
-  height: 52px;
-  font-size: 24px;
-  line-height: 52px;
+  font-size: 26px;
   color: #fff;
-  text-align: center;
   cursor: pointer;
   background-color: #3a84ff;
 }
-.bk-sideslider-close.right {
-  left: 0;
-}
-.bk-sideslider-close.right::before {
-  top: 50%;
-  left: 50%;
-  display: inline-block;
-  width: 8px;
-  height: 8px;
-  border-top: solid 2px #fff;
-  border-right: solid 2px #fff;
-  content: '';
-  transform: translate(-50%, -50%) rotate(45deg);
-}
-.bk-sideslider-close.left {
-  right: 0;
-}
-.bk-sideslider-close.left::before {
-  top: 50%;
-  left: 50%;
-  display: inline-block;
-  width: 8px;
-  height: 8px;
-  border-top: solid 2px #fff;
-  border-left: solid 2px #fff;
-  content: '';
-  transform: translate(50%, -50%) rotate(-45deg);
-}
 .bk-sideslider-title {
   display: flex;
-  height: 52px;
-  padding-left: 30px;
+  padding-left: 16px;
   font-size: 16px;
   color: #313238;
   align-items: center;
-}
-.bk-sideslider-title.right {
-  width: 100%;
-  padding: 0 0 0 46px;
+  flex: 1;
 }
 .bk-sideslider-footer {
   display: flex;
   width: 100%;
-  height: 54px;
+  height: 48px;
   padding: 0 24px;
   margin-top: 24px;
   background: #fff;

package/lib/sideslider/sideslider.less

@@ -11,6 +11,10 @@
     .@{bk-prefix}-modal-wrapper {
       left: 0;
     }
+
+    .@{bk-prefix}-sideslider-header {
+      flex-direction: row-reverse;
+    }
   }
 
   .@{bk-prefix}-modal-wrapper {
@@ -22,9 +26,9 @@
   .@{bk-prefix}-modal-footer {
     &.is-fixed {
       .@{bk-prefix}-sideslider-footer {
-        height: 54px;
         margin: 0;
-        border-top: 1px solid transparent;
+        background: #fafbfd;
+        box-shadow: 0 -1px 0 0 #dcdee5;
         box-shadow: rgb(0 0 0 / 6%) 0 -2px 4px 0;
       }
     }
@@ -32,75 +36,36 @@
 }
 
 .@{bk-prefix}-sideslider-header {
-  width: 100%;
+  display: flex;
   height: 52px;
   background: #fff;
   border-bottom: 1px solid #dcdee5;
 }
 
 .@{bk-prefix}-sideslider-close {
-  position: absolute;
-  top: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
   width: 30px;
-  height: 52px;
-  font-size: 24px;
-  line-height: 52px;
+  font-size: 26px;
   color: #fff;
-  text-align: center;
   cursor: pointer;
   background-color: @primary-color;
-
-  &.right {
-    left: 0;
-
-    &::before {
-      top: 50%;
-      left: 50%;
-      display: inline-block;
-      width: 8px;
-      height: 8px;
-      border-top: solid 2px #fff;
-      border-right: solid 2px #fff;
-      content: '';
-      transform: translate(-50%, -50%) rotate(45deg);
-    }
-  }
-
-  &.left {
-    right: 0;
-
-    &::before {
-      top: 50%;
-      left: 50%;
-      display: inline-block;
-      width: 8px;
-      height: 8px;
-      border-top: solid 2px #fff;
-      border-left: solid 2px #fff;
-      content: '';
-      transform: translate(50%, -50%) rotate(-45deg);
-    }
-  }
 }
 
 .@{bk-prefix}-sideslider-title {
   display: flex;
-  height: 52px;
-  padding-left: 30px;
+  padding-left: 16px;
   font-size: 16px;
   color: #313238;
   align-items: center;
-
-  &.right {
-    width: 100%;
-    padding: 0 0 0 30+16px;
-  }
+  flex: 1;
 }
 
 .@{bk-prefix}-sideslider-footer {
   display: flex;
   width: 100%;
-  height: 54px;
+  height: 48px;
   padding: 0 24px;
   margin-top: 24px;
   background: #fff;

package/lib/sideslider/sideslider.variable.css

@@ -133,79 +133,48 @@
 .bk-sideslider.is-position-left .bk-modal-wrapper {
   left: 0;
 }
+.bk-sideslider.is-position-left .bk-sideslider-header {
+  flex-direction: row-reverse;
+}
 .bk-sideslider .bk-modal-wrapper {
   position: fixed;
   top: 0;
   bottom: 0;
 }
 .bk-sideslider .bk-modal-footer.is-fixed .bk-sideslider-footer {
-  height: 54px;
   margin: 0;
-  border-top: 1px solid transparent;
+  background: #fafbfd;
+  box-shadow: 0 -1px 0 0 #dcdee5;
   box-shadow: rgba(0, 0, 0, 0.06) 0 -2px 4px 0;
 }
 .bk-sideslider-header {
-  width: 100%;
+  display: flex;
   height: 52px;
   background: #fff;
   border-bottom: 1px solid #dcdee5;
 }
 .bk-sideslider-close {
-  position: absolute;
-  top: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
   width: 30px;
-  height: 52px;
-  font-size: 24px;
-  line-height: 52px;
+  font-size: 26px;
   color: #fff;
-  text-align: center;
   cursor: pointer;
   background-color: var(--primary-color);
 }
-.bk-sideslider-close.right {
-  left: 0;
-}
-.bk-sideslider-close.right::before {
-  top: 50%;
-  left: 50%;
-  display: inline-block;
-  width: 8px;
-  height: 8px;
-  border-top: solid 2px #fff;
-  border-right: solid 2px #fff;
-  content: '';
-  transform: translate(-50%, -50%) rotate(45deg);
-}
-.bk-sideslider-close.left {
-  right: 0;
-}
-.bk-sideslider-close.left::before {
-  top: 50%;
-  left: 50%;
-  display: inline-block;
-  width: 8px;
-  height: 8px;
-  border-top: solid 2px #fff;
-  border-left: solid 2px #fff;
-  content: '';
-  transform: translate(50%, -50%) rotate(-45deg);
-}
 .bk-sideslider-title {
   display: flex;
-  height: 52px;
-  padding-left: 30px;
+  padding-left: 16px;
   font-size: 16px;
   color: #313238;
   align-items: center;
-}
-.bk-sideslider-title.right {
-  width: 100%;
-  padding: 0 0 0 46px;
+  flex: 1;
 }
 .bk-sideslider-footer {
   display: flex;
   width: 100%;
-  height: 54px;
+  height: 48px;
   padding: 0 24px;
   margin-top: 24px;
   background: #fff;

package/lib/table/index.js

@@ -6392,11 +6392,17 @@ function use_render_isSlot(s) {
     context.emit(EMIT_EVENTS.PAGE_LIMIT_CHANGE, limit);
   };
   var handlePageChange = function handlePageChange(current) {
-    Object.assign(props.pagination, {
-      current: current,
-      value: current
-    });
-    context.emit(EMIT_EVENTS.PAGE_VALUE_CHANGE, current);
+    if (typeof_typeof(props.pagination) === 'object' && current !== props.pagination.current) {
+      Object.assign(props.pagination, {
+        current: current,
+        value: current
+      });
+      context.emit(EMIT_EVENTS.PAGE_VALUE_CHANGE, current);
+      return;
+    }
+    if (typeof props.pagination === 'boolean' && props.pagination !== false) {
+      context.emit(EMIT_EVENTS.PAGE_VALUE_CHANGE, current);
+    }
   };
   /**
    * 渲染Table Header

package/lib/virtual-render/index.js

@@ -380,6 +380,10 @@ const scrollbar_namespaceObject = scrollbar_x({ ["default"]: () => __WEBPACK_EXT
     instance = new scrollbar_namespaceObject["default"](target.value, {
       classNames: classNames,
       wrapperNode: target.value,
+      scrollDelegate: {
+        scrollHeight: null,
+        scrollWidth: null
+      },
       useSystemScrollYBehavior: !props.enabled,
       useSystemScrollXBehavior: true,
       delegateXContent: delegateXContent,
@@ -398,11 +402,22 @@ const scrollbar_namespaceObject = scrollbar_x({ ["default"]: () => __WEBPACK_EXT
     }
     target.value.scrollTo(x, y);
   };
+  var updateScrollHeight = function updateScrollHeight(height) {
+    var _instance, _instance2;
+    (_instance = instance) === null || _instance === void 0 || _instance.setOptions({
+      scrollDelegate: {
+        scrollHeight: height,
+        scrollWidth: null
+      }
+    });
+    (_instance2 = instance) === null || _instance2 === void 0 || _instance2.recalculate();
+  };
   return {
     init: init,
     instance: instance,
     scrollTo: scrollTo,
-    classNames: classNames
+    classNames: classNames,
+    updateScrollHeight: updateScrollHeight
   };
 });
 ;// CONCATENATED MODULE: ../../node_modules/@babel/runtime/helpers/esm/classCallCheck.js
@@ -853,12 +868,12 @@ function virtual_render_objectSpread(e) { for (var r = 1; r < arguments.length;
       };
     });
     var refRoot = (0,external_vue_namespaceObject.ref)(null);
-    var refVirtualSection = (0,external_vue_namespaceObject.ref)(null);
     var refContent = (0,external_vue_namespaceObject.ref)(null);
     var _useScrollbar = use_scrollbar(refRoot, props),
       init = _useScrollbar.init,
       scrollTo = _useScrollbar.scrollTo,
-      classNames = _useScrollbar.classNames;
+      classNames = _useScrollbar.classNames,
+      updateScrollHeight = _useScrollbar.updateScrollHeight;
     var instance = null;
     var pagination = (0,external_vue_namespaceObject.reactive)({
       startIndex: 0,
@@ -903,7 +918,8 @@ function virtual_render_objectSpread(e) { for (var r = 1; r < arguments.length;
       var _props$scrollbar;
       instance = new VisibleRender(binding, refRoot.value);
       if ((_props$scrollbar = props.scrollbar) !== null && _props$scrollbar !== void 0 && _props$scrollbar.enabled) {
-        init(instance.executeThrottledRender.bind(instance), null, refVirtualSection.value);
+        init(instance.executeThrottledRender.bind(instance));
+        updateScrollHeight(contentHeight.value);
         instance.executeThrottledRender.call(instance, {
           offset: {
             x: 0,
@@ -988,13 +1004,8 @@ function virtual_render_objectSpread(e) { for (var r = 1; r < arguments.length;
         maxHeight: (_props$maxHeight = props.maxHeight) !== null && _props$maxHeight !== void 0 ? _props$maxHeight : height
       }, props.scrollPosition === 'container' ? innerContentStyle.value : {}), props.wrapperStyle);
     });
-    /** 虚拟渲染区域内置占位区域样式，用来撑起总高度，出现滚动条 */
-    var innerStyle = (0,external_vue_namespaceObject.computed)(function () {
-      var isHidden = typeof props.abosuteHeight === 'number' && props.abosuteHeight === 0;
-      return {
-        height: "".concat(innerHeight.value < props.minHeight ? props.minHeight : innerHeight.value, "px"),
-        display: isHidden ? 'none' : 'block'
-      };
+    var contentHeight = (0,external_vue_namespaceObject.computed)(function () {
+      return innerHeight.value < props.minHeight ? props.minHeight : innerHeight.value;
     });
     var _usePrefix = (0,config_provider_namespaceObject.usePrefix)(),
       resolveClassName = _usePrefix.resolveClassName;
@@ -1027,6 +1038,7 @@ function virtual_render_objectSpread(e) { for (var r = 1; r < arguments.length;
       var _instance3;
       (_instance3 = instance) === null || _instance3 === void 0 || _instance3.setBinding(binding);
       handleChangeListConfig();
+      updateScrollHeight(contentHeight.value);
       (0,external_vue_namespaceObject.nextTick)(function () {
         var _instance4;
         afterListDataReset();
@@ -1057,11 +1069,7 @@ function virtual_render_objectSpread(e) { for (var r = 1; r < arguments.length;
         style: virtual_render_objectSpread(virtual_render_objectSpread({}, innerContentStyle.value), props.contentStyle)
       }, [(_ctx$slots$default = (_ctx$slots$default2 = (_ctx$slots2 = ctx.slots)["default"]) === null || _ctx$slots$default2 === void 0 ? void 0 : _ctx$slots$default2.call(_ctx$slots2, {
         data: calcList.value
-      })) !== null && _ctx$slots$default !== void 0 ? _ctx$slots$default : '']), (_ctx$slots$afterConte = (_ctx$slots$afterConte2 = (_ctx$slots3 = ctx.slots).afterContent) === null || _ctx$slots$afterConte2 === void 0 ? void 0 : _ctx$slots$afterConte2.call(_ctx$slots3)) !== null && _ctx$slots$afterConte !== void 0 ? _ctx$slots$afterConte : '', (0,external_vue_namespaceObject.h)('div', {
-        ref: refVirtualSection,
-        "class": [resolveClassName('virtual-section')],
-        style: innerStyle.value
-      }), (_ctx$slots$afterSecti = (_ctx$slots$afterSecti2 = (_ctx$slots4 = ctx.slots).afterSection) === null || _ctx$slots$afterSecti2 === void 0 ? void 0 : _ctx$slots$afterSecti2.call(_ctx$slots4)) !== null && _ctx$slots$afterSecti !== void 0 ? _ctx$slots$afterSecti : '']);
+      })) !== null && _ctx$slots$default !== void 0 ? _ctx$slots$default : '']), (_ctx$slots$afterConte = (_ctx$slots$afterConte2 = (_ctx$slots3 = ctx.slots).afterContent) === null || _ctx$slots$afterConte2 === void 0 ? void 0 : _ctx$slots$afterConte2.call(_ctx$slots3)) !== null && _ctx$slots$afterConte !== void 0 ? _ctx$slots$afterConte : '', (_ctx$slots$afterSecti = (_ctx$slots$afterSecti2 = (_ctx$slots4 = ctx.slots).afterSection) === null || _ctx$slots$afterSecti2 === void 0 ? void 0 : _ctx$slots$afterSecti2.call(_ctx$slots4)) !== null && _ctx$slots$afterSecti !== void 0 ? _ctx$slots$afterSecti : '']);
     };
   }
 }));

package/lib/virtual-render/use-scrollbar.d.ts

@@ -19,5 +19,6 @@ declare const _default: (target: Ref<HTMLElement>, props: VirtualRenderProps) =>
         scrollable: string;
         mouseEntered: string;
     };
+    updateScrollHeight: (height: number) => void;
 };
 export default _default;

package/package.json

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