bkui-vue 1.0.3-beta.60.scrollbar.5 → 1.0.3-beta.61

package/lib/components.d.ts

@@ -51,6 +51,7 @@ export { default as Cascader } from './cascader';
 export { default as Slider } from './slider';
 export { default as ResizeLayout } from './resize-layout';
 export { default as TimeLine } from './timeline';
+export { default as Timeline } from './timeline';
 export { default as Process } from './process';
 export { default as Upload } from './upload';
 export { default as CodeDiff } from './code-diff';

package/lib/components.js

@@ -72,7 +72,8 @@ export { default as Dropdown } from './dropdown';
 export { default as Cascader } from './cascader';
 export { default as Slider } from './slider';
 export { default as ResizeLayout } from './resize-layout';
-export { default as TimeLine } from './timeline';
+export { default as TimeLine } from './timeline'; // 兼容以往版本
+export { default as Timeline } from './timeline';
 export { default as Process } from './process';
 export { default as Upload } from './upload';
 export { default as CodeDiff } from './code-diff';

package/lib/date-picker/index.js

@@ -1676,7 +1676,7 @@ var monthTableProps = {
         cell.text = tCell(i + 1);
         var day = clearHours(cell.date);
         var time = cell.date && clearHours(cell.date);
-        cell.disabled = typeof props.disabledDate === 'function' && props.disabledDate(cell.date) && props.selectionMode === 'month';
+        cell.disabled = typeof props.disabledDate === 'function' && props.disabledDate(cell.date);
         cell.selected = selectedDays.includes(day);
         cell.range = isRange && isInRange(time, rangeStart, rangeEnd);
         cell.start = isRange && time === minDay;

package/lib/dialog/dialog.css

@@ -12,25 +12,21 @@
   word-break: break-all;
 }
 .bk-modal-ctx {
+  position: fixed;
   top: 0px;
   left: 0px;
+  display: none;
   width: 100%;
   height: 100%;
   pointer-events: auto;
 }
-.bk-modal-ctx.--show {
-  position: fixed;
-}
-.bk-modal-ctx.--show .bk-modal-ctx-mask {
+.bk-modal-ctx.is-show {
   display: block;
 }
-.bk-modal-ctx.--hide {
-  display: none;
-}
 .bk-modal-ctx-mask {
+  position: fixed;
   top: 0;
   left: 0;
-  display: none;
   width: 100%;
   height: 100%;
   background-color: rgba(0, 0, 0, 0.6);
@@ -56,8 +52,10 @@
   border-radius: 2px;
   box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
 }
-.bk-modal-body {
+.bk-modal-content {
+  max-height: 100vh;
   overflow: auto;
+  scrollbar-gutter: stable;
 }
 .bk-modal-close {
   position: absolute;

package/lib/dialog/dialog.variable.css

@@ -141,25 +141,21 @@
   word-break: break-all;
 }
 .bk-modal-ctx {
+  position: fixed;
   top: 0px;
   left: 0px;
+  display: none;
   width: 100%;
   height: 100%;
   pointer-events: auto;
 }
-.bk-modal-ctx.--show {
-  position: fixed;
-}
-.bk-modal-ctx.--show .bk-modal-ctx-mask {
+.bk-modal-ctx.is-show {
   display: block;
 }
-.bk-modal-ctx.--hide {
-  display: none;
-}
 .bk-modal-ctx-mask {
+  position: fixed;
   top: 0;
   left: 0;
-  display: none;
   width: 100%;
   height: 100%;
   background-color: rgba(0, 0, 0, 0.6);
@@ -185,8 +181,10 @@
   border-radius: 2px;
   box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
 }
-.bk-modal-body {
+.bk-modal-content {
+  max-height: 100vh;
   overflow: auto;
+  scrollbar-gutter: stable;
 }
 .bk-modal-close {
   position: absolute;

package/lib/info-box/index.js

@@ -688,6 +688,7 @@ var InfoBox = function InfoBox(config) {
         }, modalFuncProps.value), {}, {
           isShow: isShow.value,
           transfer: false,
+          quickClose: false,
           onClosed: onClosed,
           onConfirm: onConfirm,
           onHidden: onHidden

package/lib/modal/hooks.d.ts

@@ -1,6 +1,6 @@
 import { type Ref } from 'vue';
 import type { ModalProps } from './modal';
-export declare const useContentResize: (root: Ref<HTMLElement>, props: ModalProps) => {
+export declare const useContentResize: (root: Ref<HTMLElement>, resizeTarget: Ref<HTMLElement>, props: ModalProps) => {
     contentStyles: Ref<{}>;
     isContentScroll: Ref<boolean>;
 };

package/lib/modal/index.d.ts

@@ -121,6 +121,7 @@ declare const BkModal: {
         refMask: import("vue").Ref<HTMLElement>;
         resolveClassName: (cls: string) => string;
         close: () => void;
+        resizeTargetRef: import("vue").Ref<HTMLElement>;
     }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("close" | "hidden" | "shown" | "quickClose" | "quick-close")[], import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps & Readonly<import("vue").ExtractPropTypes<{
         isShow: import("vue-types").VueTypeValidableDef<boolean> & {
             default: boolean;
@@ -380,6 +381,7 @@ declare const BkModal: {
         refMask: import("vue").Ref<HTMLElement>;
         resolveClassName: (cls: string) => string;
         close: () => void;
+        resizeTargetRef: import("vue").Ref<HTMLElement>;
     }, {}, {}, {}, {
         title: string;
         width: string | number;
@@ -528,6 +530,7 @@ declare const BkModal: {
     refMask: import("vue").Ref<HTMLElement>;
     resolveClassName: (cls: string) => string;
     close: () => void;
+    resizeTargetRef: import("vue").Ref<HTMLElement>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("close" | "hidden" | "shown" | "quickClose" | "quick-close")[], "close" | "hidden" | "shown" | "quickClose" | "quick-close", {
     title: string;
     width: string | number;

package/lib/modal/index.js

@@ -506,7 +506,7 @@ function _defineProperty(obj, key, value) {
 ;// CONCATENATED MODULE: external "vue"
 var external_vue_x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
 var external_vue_y = x => () => x
-const external_vue_namespaceObject = external_vue_x({ ["Transition"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.Transition, ["computed"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.computed, ["createVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.createVNode, ["defineComponent"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent, ["nextTick"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.nextTick, ["onBeforeUnmount"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.onBeforeUnmount, ["ref"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.ref, ["useSlots"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.useSlots, ["watch"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.watch });
+const external_vue_namespaceObject = external_vue_x({ ["Transition"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.Transition, ["computed"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.computed, ["createVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.createVNode, ["defineComponent"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent, ["nextTick"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.nextTick, ["onBeforeUnmount"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.onBeforeUnmount, ["ref"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.ref, ["watch"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.watch });
 // EXTERNAL MODULE: ../../node_modules/@babel/runtime/regenerator/index.js
 var regenerator = __webpack_require__(2841);
 var regenerator_default = /*#__PURE__*/__webpack_require__.n(regenerator);
@@ -547,43 +547,36 @@ const throttle_namespaceObject = throttle_x({ ["default"]: () => __WEBPACK_EXTER
 
 
 
-var useContentResize = function useContentResize(root, props) {
+var useContentResize = function useContentResize(root, resizeTarget, props) {
   var _usePrefix = (0,config_provider_namespaceObject.usePrefix)(),
     resolveClassName = _usePrefix.resolveClassName;
-  var slots = (0,external_vue_namespaceObject.useSlots)();
   var isContentScroll = (0,external_vue_namespaceObject.ref)(false);
   var contentStyles = (0,external_vue_namespaceObject.ref)({});
   var observer;
   var handleContentBoxChange = function handleContentBoxChange() {
-    if (!slots.footer) {
-      return;
-    }
     var calcContentScroll = (0,throttle_namespaceObject["default"])(function () {
       var _root$value$querySele = root.value.querySelector(".".concat(resolveClassName('modal-header'))).getBoundingClientRect(),
         headerHeight = _root$value$querySele.height;
-      var _root$value$querySele2 = root.value.querySelector(".".concat(resolveClassName('modal-content'))).getBoundingClientRect(),
+      var _root$value$querySele2 = root.value.querySelector(".".concat(resolveClassName('modal-content'), " div")).getBoundingClientRect(),
         contentHeight = _root$value$querySele2.height;
       var _root$value$querySele3 = root.value.querySelector(".".concat(resolveClassName('modal-footer'))).getBoundingClientRect(),
         footerHeight = _root$value$querySele3.height;
       var windowInnerHeight = window.innerHeight;
-      isContentScroll.value = windowInnerHeight < headerHeight + contentHeight + footerHeight;
+      isContentScroll.value = windowInnerHeight < headerHeight + contentHeight + footerHeight + 20;
       if (isContentScroll.value || props.fullscreen) {
         contentStyles.value = {
-          height: "".concat(windowInnerHeight - headerHeight - footerHeight, "px"),
-          overflow: 'scroll'
+          height: "".concat(windowInnerHeight - headerHeight - footerHeight, "px")
         };
+        // fullscreen 时默认为 true
+        isContentScroll.value = true;
       } else {
         contentStyles.value = {};
       }
-    }, 100);
-    observer = new MutationObserver(function () {
+    }, 30);
+    observer = new ResizeObserver(function () {
       calcContentScroll();
     });
-    observer.observe(root.value.querySelector(".".concat(resolveClassName('modal-content'), " div")), {
-      subtree: true,
-      attributes: true,
-      childList: true
-    });
+    observer.observe(resizeTarget.value);
     calcContentScroll();
   };
   (0,external_vue_namespaceObject.watch)(function () {
@@ -595,7 +588,6 @@ var useContentResize = function useContentResize(root, props) {
       }, 100);
     } else {
       if (observer) {
-        observer.takeRecords();
         observer.disconnect();
         observer = null;
       }
@@ -743,13 +735,14 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
   setup: function setup(props, ctx) {
     var refRoot = (0,external_vue_namespaceObject.ref)();
     var refMask = (0,external_vue_namespaceObject.ref)();
+    var resizeTargetRef = (0,external_vue_namespaceObject.ref)();
     var teleportTo = (0,external_vue_namespaceObject.ref)('body');
     var visible = (0,external_vue_namespaceObject.ref)(false);
     var zIndex = (0,external_vue_namespaceObject.ref)(props.zIndex);
     var enableTeleport = (0,external_vue_namespaceObject.ref)(!!props.transfer);
     var backgroundColor = (0,external_vue_namespaceObject.ref)('rgba(0,0,0,0.6)');
     var closeTimer;
-    var _useContentResize = useContentResize(refRoot, props),
+    var _useContentResize = useContentResize(refRoot, resizeTargetRef, props),
       contentStyles = _useContentResize.contentStyles,
       isContentScroll = _useContentResize.isContentScroll;
     var modalWrapperStyles = (0,external_vue_namespaceObject.computed)(function () {
@@ -925,7 +918,8 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
       refRoot: refRoot,
       refMask: refMask,
       resolveClassName: resolveClassName,
-      close: close
+      close: close,
+      resizeTargetRef: resizeTargetRef
     };
   },
   render: function render() {
@@ -940,7 +934,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
       _this = this;
     return (0,external_vue_namespaceObject.createVNode)("div", {
       "ref": "refRoot",
-      "class": _defineProperty(_defineProperty(_defineProperty({}, this.resolveClassName('modal-ctx'), true), '--show', this.visible), '--hide', !this.visible),
+      "class": _defineProperty(_defineProperty({}, this.resolveClassName('modal-ctx'), true), 'is-show', this.visible),
       "style": {
         zIndex: this.zIndex
       }
@@ -962,7 +956,12 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
         }, [(_this$$slots$header = (_this$$slots = _this.$slots).header) === null || _this$$slots$header === void 0 ? void 0 : _this$$slots$header.call(_this$$slots)]), (0,external_vue_namespaceObject.createVNode)("div", {
           "class": _this.resolveClassName('modal-content'),
           "style": _this.contentStyles
-        }, [(0,external_vue_namespaceObject.createVNode)("div", null, [(_this$$slots$default = (_this$$slots2 = _this.$slots)["default"]) === null || _this$$slots$default === void 0 ? void 0 : _this$$slots$default.call(_this$$slots2)])]), (0,external_vue_namespaceObject.createVNode)("div", {
+        }, [(0,external_vue_namespaceObject.createVNode)("div", {
+          "style": "position: relative; display: inline-block; width: 100%;"
+        }, [(_this$$slots$default = (_this$$slots2 = _this.$slots)["default"]) === null || _this$$slots$default === void 0 ? void 0 : _this$$slots$default.call(_this$$slots2), (0,external_vue_namespaceObject.createVNode)("div", {
+          "ref": "resizeTargetRef",
+          "style": "position: absolute; top: 0; bottom: 0;"
+        }, null)])]), (0,external_vue_namespaceObject.createVNode)("div", {
           "class": _defineProperty(_defineProperty({}, _this.resolveClassName('modal-footer'), true), 'is-fixed', _this.isContentScroll)
         }, [(_this$$slots$footer = (_this$$slots3 = _this.$slots).footer) === null || _this$$slots$footer === void 0 ? void 0 : _this$$slots$footer.call(_this$$slots3)]), _this.closeIcon && (0,external_vue_namespaceObject.createVNode)("div", {
           "class": _this.resolveClassName('modal-close')

package/lib/modal/modal.css

@@ -12,25 +12,21 @@
   word-break: break-all;
 }
 .bk-modal-ctx {
+  position: fixed;
   top: 0px;
   left: 0px;
+  display: none;
   width: 100%;
   height: 100%;
   pointer-events: auto;
 }
-.bk-modal-ctx.--show {
-  position: fixed;
-}
-.bk-modal-ctx.--show .bk-modal-ctx-mask {
+.bk-modal-ctx.is-show {
   display: block;
 }
-.bk-modal-ctx.--hide {
-  display: none;
-}
 .bk-modal-ctx-mask {
+  position: fixed;
   top: 0;
   left: 0;
-  display: none;
   width: 100%;
   height: 100%;
   background-color: rgba(0, 0, 0, 0.6);
@@ -56,8 +52,10 @@
   border-radius: 2px;
   box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
 }
-.bk-modal-body {
+.bk-modal-content {
+  max-height: 100vh;
   overflow: auto;
+  scrollbar-gutter: stable;
 }
 .bk-modal-close {
   position: absolute;

package/lib/modal/modal.d.ts

@@ -116,6 +116,7 @@ declare const _default: import("vue").DefineComponent<{
     refMask: import("vue").Ref<HTMLElement>;
     resolveClassName: (cls: string) => string;
     close: () => void;
+    resizeTargetRef: import("vue").Ref<HTMLElement>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("close" | "hidden" | "shown" | "quickClose" | "quick-close")[], "close" | "hidden" | "shown" | "quickClose" | "quick-close", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<ExtractPropTypes<{
     isShow: import("vue-types").VueTypeValidableDef<boolean> & {
         default: boolean;

package/lib/modal/modal.less

@@ -2,31 +2,26 @@
 @import '../info-box/info-box.less';
 
 .@{bk-prefix}-modal-ctx {
+  position: fixed;
   top: 0px;
   left: 0px;
+  display: none;
   width: 100%;
   height: 100%;
   pointer-events: auto;
 
-  &.--show {
-    position: fixed;
-    .@{bk-prefix}-modal-ctx-mask {
-      display: block;
-    }
-  }
-
-  &.--hide {
-    display: none;
+  &.is-show {
+    display: block;
   }
 }
 
 .@{bk-prefix}-modal-ctx-mask {
+  position: fixed;
   top: 0;
   left: 0;
-  display: none;
   width: 100%;
   height: 100%;
-  background-color: rgba(0,0,0,.6);
+  background-color: rgba(0, 0, 0, 0.6);
 }
 
 .@{bk-prefix}-modal-wrapper {
@@ -35,8 +30,6 @@
   left: 50%;
   border-radius: 2px;
   transform: translate(-50%, -50%);
-
-
 }
 
 .@{bk-prefix}-modal-outside {
@@ -52,11 +45,13 @@
   overflow: hidden;
   background: #fff;
   border-radius: 2px;
-  box-shadow: 0 4px 12px rgba(0,0,0,.15);
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
 }
 
-.@{bk-prefix}-modal-body {
+.@{bk-prefix}-modal-content {
+  max-height: 100vh;
   overflow: auto;
+  scrollbar-gutter: stable;
 }
 
 .@{bk-prefix}-modal-close {
@@ -72,11 +67,9 @@
   align-items: center;
   justify-content: center;
   border-radius: 50%;
-  transition: .15s;
+  transition: 0.15s;
 
   &:hover {
     background: #f0f1f5;
   }
 }
-
-

package/lib/modal/modal.variable.css

@@ -141,25 +141,21 @@
   word-break: break-all;
 }
 .bk-modal-ctx {
+  position: fixed;
   top: 0px;
   left: 0px;
+  display: none;
   width: 100%;
   height: 100%;
   pointer-events: auto;
 }
-.bk-modal-ctx.--show {
-  position: fixed;
-}
-.bk-modal-ctx.--show .bk-modal-ctx-mask {
+.bk-modal-ctx.is-show {
   display: block;
 }
-.bk-modal-ctx.--hide {
-  display: none;
-}
 .bk-modal-ctx-mask {
+  position: fixed;
   top: 0;
   left: 0;
-  display: none;
   width: 100%;
   height: 100%;
   background-color: rgba(0, 0, 0, 0.6);
@@ -185,8 +181,10 @@
   border-radius: 2px;
   box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
 }
-.bk-modal-body {
+.bk-modal-content {
+  max-height: 100vh;
   overflow: auto;
+  scrollbar-gutter: stable;
 }
 .bk-modal-close {
   position: absolute;