bkui-vue 1.0.3-beta.40 → 1.0.3-beta.42

package/lib/modal/modal.d.ts

@@ -1,3 +1,6 @@
+import { type ExtractPropTypes } from 'vue';
+import { propsMixin } from './props.mixin';
+export type ModalProps = Readonly<ExtractPropTypes<typeof propsMixin>>;
 declare const _default: import("vue").DefineComponent<{
     isShow: import("vue-types").VueTypeValidableDef<boolean> & {
         default: boolean;
@@ -60,6 +63,8 @@ declare const _default: import("vue").DefineComponent<{
     };
     direction: import("vue-types").VueTypeValidableDef<string> & {
         default: string;
+    } & {
+        default: string;
     };
     title: import("vue-types").VueTypeValidableDef<string> & {
         default: string;
@@ -94,26 +99,18 @@ declare const _default: import("vue").DefineComponent<{
         default: string;
     };
 }, {
+    zIndex: import("vue").Ref<string | number>;
     visible: import("vue").Ref<boolean>;
-    compStyle: import("vue").ComputedRef<{
-        [x: string]: string | number;
-        width: string | number;
-        height: string | number;
-        minHeigth: string;
+    contentStyles: import("vue").Ref<{}>;
+    isContentScroll: import("vue").Ref<boolean>;
+    modalWrapperStyles: import("vue").ComputedRef<{
         display: string;
-        zIndex: string | number;
-        left: string;
-        top: string;
-    }>;
-    fullscreenStyle: import("vue").ComputedRef<{
-        width: string;
-        height: string;
     }>;
     handleClickOutSide: (e: MouseEvent) => void;
     refRoot: import("vue").Ref<HTMLElement>;
     refMask: import("vue").Ref<HTMLElement>;
-    showMask: boolean;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("close" | "hidden" | "shown" | "quick-close" | "quickClose")[], "close" | "hidden" | "shown" | "quick-close" | "quickClose", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    resolveClassName: (cls: string) => string;
+}, 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;
     } & {
@@ -175,6 +172,8 @@ declare const _default: import("vue").DefineComponent<{
     };
     direction: import("vue-types").VueTypeValidableDef<string> & {
         default: string;
+    } & {
+        default: string;
     };
     title: import("vue-types").VueTypeValidableDef<string> & {
         default: string;
@@ -212,8 +211,8 @@ declare const _default: import("vue").DefineComponent<{
     onClose?: (...args: any[]) => any;
     onHidden?: (...args: any[]) => any;
     onShown?: (...args: any[]) => any;
-    "onQuick-close"?: (...args: any[]) => any;
     onQuickClose?: (...args: any[]) => any;
+    "onQuick-close"?: (...args: any[]) => any;
 }, {
     title: string;
     width: string | number;
@@ -227,12 +226,12 @@ declare const _default: import("vue").DefineComponent<{
     transfer: string | boolean | HTMLElement;
     direction: string;
     renderDirective: "show" | "if";
-    quickClose: boolean;
     scrollable: boolean;
     showMask: boolean;
     closeIcon: boolean;
     escClose: boolean;
     fullscreen: boolean;
+    quickClose: boolean;
     animateType: string;
     multiInstance: boolean;
     bodyClass: string | unknown[];

package/lib/modal/modal.less

@@ -4,78 +4,78 @@
 .@{bk-prefix}-modal-ctx {
   top: 0px;
   left: 0px;
-
   width: 100%;
   height: 100%;
   pointer-events: auto;
 
   &.--show {
     position: fixed;
+    .@{bk-prefix}-modal-ctx-mask {
+      display: block;
+    }
   }
 
   &.--hide {
     display: none;
   }
-
-  .@{bk-prefix}-modal-ctx-mask {
-    top: 0;
-    left: 0;
-    display: none;
-    width: 100%;
-    height: 100%;
-    background-color: rgba(0,0,0,.6);
-
-    &.--show {
-      position: fixed;
-      display: inherit;
-    }
-  }
 }
 
-
+.@{bk-prefix}-modal-ctx-mask {
+  top: 0;
+  left: 0;
+  display: none;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(0,0,0,.6);
+}
 
 .@{bk-prefix}-modal-wrapper {
   position: absolute;
   top: 50%;
   left: 50%;
-  width: 480px;
   border-radius: 2px;
-  // background: #fff;
   transform: translate(-50%, -50%);
 
-  .@{bk-prefix}-modal-outside {
-    position: fixed;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    left: 0;
-  }
 
-  &.normal {
-    width: 480px;
-    height: 240px;
-  }
+}
 
-  &.small {
-    width: 400px;
-    height: 200px;
-  }
+.@{bk-prefix}-modal-outside {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+}
 
-  &.medium {
-    width: 640px;
-    height: 400px;
-  }
+.@{bk-prefix}-modal-body {
+  height: 100%;
+  overflow: hidden;
+  background: #fff;
+  border-radius: 2px;
+  box-shadow: 0 4px 12px rgba(0,0,0,.15);
+}
 
-  &.large {
-    width: 960px;
-    height: 720px;
-  }
+.@{bk-prefix}-modal-body {
+  overflow: auto;
+}
 
-  .@{bk-prefix}-modal-body {
-    height: 100%;
-    overflow: hidden;
-    background: #fff;
-    box-shadow: 0 4px 12px rgba(0,0,0,.15);
+.@{bk-prefix}-modal-close {
+  position: absolute;
+  top: 6px;
+  right: 6px;
+  display: flex;
+  width: 32px;
+  height: 32px;
+  font-size: 18px;
+  color: #979ba5;
+  cursor: pointer;
+  align-items: center;
+  justify-content: center;
+  border-radius: 50%;
+  transition: .15s;
+
+  &:hover {
+    background: #f0f1f5;
   }
 }
 

package/lib/modal/modal.variable.css

@@ -127,40 +127,19 @@
   --select-active-color: #e1ecff;
   --select-hover-color: #f5f7fa;
 }
-.bk-modal-ctx.bk-info-wrapper .bk-modal-wrapper {
+.bk-info-wrapper .bk-modal-wrapper {
   width: 440px;
 }
-.bk-modal-ctx.bk-info-wrapper .bk-modal-wrapper.normal {
-  width: 440px;
-}
-.bk-modal-ctx.bk-info-wrapper .bk-modal-wrapper.small {
-  width: 400px;
-}
-.bk-modal-ctx.bk-info-wrapper .bk-modal-wrapper .bk-modal-body {
-  border-radius: 2px;
-}
-.bk-modal-ctx.bk-info-wrapper .bk-modal-wrapper .bk-dialog-header .bk-dialog-title {
+.bk-info-wrapper .bk-modal-wrapper .bk-dialog-header .bk-dialog-title {
   margin-top: 16px;
 }
-.bk-modal-ctx.bk-info-wrapper .bk-modal-wrapper .bk-modal-content {
-  height: initial;
-  max-height: initial;
-  min-height: initial;
-  word-break: break-all;
+.bk-info-wrapper .bk-dialog-footer button {
+  min-width: 88px;
 }
-.bk-modal-ctx.bk-info-wrapper .bk-modal-wrapper .bk-modal-content .bk-info-sub-title {
+.bk-info-sub-title {
   text-align: center;
   word-break: break-all;
 }
-.bk-modal-ctx.bk-info-wrapper .bk-modal-wrapper .bk-modal-footer {
-  height: initial;
-  margin-top: 24px;
-  background-color: #fff;
-  border-top: none;
-}
-.bk-modal-ctx.bk-info-wrapper .bk-modal-wrapper .bk-modal-footer .bk-dialog-footer button {
-  min-width: 88px;
-}
 .bk-modal-ctx {
   top: 0px;
   left: 0px;
@@ -171,10 +150,13 @@
 .bk-modal-ctx.--show {
   position: fixed;
 }
+.bk-modal-ctx.--show .bk-modal-ctx-mask {
+  display: block;
+}
 .bk-modal-ctx.--hide {
   display: none;
 }
-.bk-modal-ctx .bk-modal-ctx-mask {
+.bk-modal-ctx-mask {
   top: 0;
   left: 0;
   display: none;
@@ -182,44 +164,45 @@
   height: 100%;
   background-color: rgba(0, 0, 0, 0.6);
 }
-.bk-modal-ctx .bk-modal-ctx-mask.--show {
-  position: fixed;
-  display: inherit;
-}
 .bk-modal-wrapper {
   position: absolute;
   top: 50%;
   left: 50%;
-  width: 480px;
   border-radius: 2px;
   transform: translate(-50%, -50%);
 }
-.bk-modal-wrapper .bk-modal-outside {
+.bk-modal-outside {
   position: fixed;
   top: 0;
   right: 0;
   bottom: 0;
   left: 0;
 }
-.bk-modal-wrapper.normal {
-  width: 480px;
-  height: 240px;
-}
-.bk-modal-wrapper.small {
-  width: 400px;
-  height: 200px;
-}
-.bk-modal-wrapper.medium {
-  width: 640px;
-  height: 400px;
-}
-.bk-modal-wrapper.large {
-  width: 960px;
-  height: 720px;
-}
-.bk-modal-wrapper .bk-modal-body {
+.bk-modal-body {
   height: 100%;
   overflow: hidden;
   background: #fff;
+  border-radius: 2px;
   box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
 }
+.bk-modal-body {
+  overflow: auto;
+}
+.bk-modal-close {
+  position: absolute;
+  top: 6px;
+  right: 6px;
+  display: flex;
+  width: 32px;
+  height: 32px;
+  font-size: 18px;
+  color: #979ba5;
+  cursor: pointer;
+  align-items: center;
+  justify-content: center;
+  border-radius: 50%;
+  transition: 0.15s;
+}
+.bk-modal-close:hover {
+  background: #f0f1f5;
+}

package/lib/modal/props.mixin.d.ts

@@ -60,6 +60,8 @@ export declare const propsMixin: {
     };
     direction: import("vue-types").VueTypeValidableDef<string> & {
         default: string;
+    } & {
+        default: string;
     };
     title: import("vue-types").VueTypeValidableDef<string> & {
         default: string;

package/lib/search-select/index.js

@@ -1527,7 +1527,6 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
         var hasKeyword = text && ((_usingItem$value7 = usingItem.value) === null || _usingItem$value7 === void 0 ? void 0 : _usingItem$value7.keyInnerText) && text.replace("\xA0", " ").includes(usingItem.value.keyInnerText.replace("\xA0", " ").trim());
         if (hasKeyword && outerText && (_usingItem$value$valu = usingItem.value.values) !== null && _usingItem$value$valu !== void 0 && _usingItem$value$valu.length) {
           keyword.value = outerText;
-          console.info('outerText', outerText);
           debounceSetMenuList();
           return;
         }

package/lib/sideslider/index.d.ts

@@ -218,12 +218,12 @@ declare const BkSideslider: {
         transfer: string | boolean | HTMLElement;
         direction: string;
         renderDirective: "show" | "if";
-        quickClose: boolean;
         scrollable: boolean;
         showMask: boolean;
         closeIcon: boolean;
         escClose: boolean;
         fullscreen: boolean;
+        quickClose: boolean;
         animateType: string;
         multiInstance: boolean;
         bodyClass: string | unknown[];
@@ -350,12 +350,12 @@ declare const BkSideslider: {
         transfer: string | boolean | HTMLElement;
         direction: string;
         renderDirective: "show" | "if";
-        quickClose: boolean;
         scrollable: boolean;
         showMask: boolean;
         closeIcon: boolean;
         escClose: boolean;
         fullscreen: boolean;
+        quickClose: boolean;
         animateType: string;
         multiInstance: boolean;
         bodyClass: string | unknown[];
@@ -479,12 +479,12 @@ declare const BkSideslider: {
     transfer: string | boolean | HTMLElement;
     direction: string;
     renderDirective: "show" | "if";
-    quickClose: boolean;
     scrollable: boolean;
     showMask: boolean;
     closeIcon: boolean;
     escClose: boolean;
     fullscreen: boolean;
+    quickClose: boolean;
     animateType: string;
     multiInstance: boolean;
     bodyClass: string | unknown[];

package/lib/sideslider/index.js

@@ -589,18 +589,12 @@ sliderPops.height["default"] = '100%';
           while (1) switch (_context.prev = _context.next) {
             case 0:
               // 这里无需处理 beforeClose，在 modal 中会处理
-              // let shouldClose = true;
-              // if (typeof props.beforeClose === 'function') {
-              //   shouldClose = await props.beforeClose();
-              // }
-              // if (shouldClose) {
               emit('update:isShow', false);
               emit('closed');
               setTimeout(function () {
                 // 有动画，推迟发布事件
                 emit('animation-end');
               }, 250);
-              // }
             case 3:
             case "end":
               return _context.stop();
@@ -634,15 +628,17 @@ sliderPops.height["default"] = '100%';
           }, [(0,external_vue_namespaceObject.createVNode)("div", {
             "class": "".concat(resolveClassName('sideslider-close'), " ").concat(props.direction),
             "onClick": function onClick() {
-              handleClose();
+              return handleClose();
             }
           }, null), (0,external_vue_namespaceObject.createVNode)("div", {
             "class": "".concat(resolveClassName('sideslider-title'), " ").concat(props.direction)
           }, [(_slots$header = (_slots$header2 = slots.header) === null || _slots$header2 === void 0 ? void 0 : _slots$header2.call(slots)) !== null && _slots$header !== void 0 ? _slots$header : props.title])])]);
         },
         "default": function _default() {
-          var _slots$default, _slots$default2;
-          return (_slots$default = (_slots$default2 = slots["default"]) === null || _slots$default2 === void 0 ? void 0 : _slots$default2.call(slots)) !== null && _slots$default !== void 0 ? _slots$default : 'Content';
+          var _slots$default;
+          return (0,external_vue_namespaceObject.createVNode)("div", {
+            "class": "".concat(resolveClassName('sideslider-content'))
+          }, [(_slots$default = slots["default"]) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots)]);
         },
         footer: function footer() {
           if (slots.footer) {
@@ -653,14 +649,9 @@ sliderPops.height["default"] = '100%';
           return null;
         }
       };
-      var className = resolveClassName('sideslider-wrapper');
-      var bodyClass = props.scrollable ? 'scroll-able' : '';
-      var maxHeight = slots.footer ? 'calc(100vh - 106px)' : 'calc(100vh - 52px)';
       return (0,external_vue_namespaceObject.createVNode)(modal_namespaceObject["default"], (0,external_vue_namespaceObject.mergeProps)(props, {
-        "class": className,
-        "maxHeight": maxHeight,
-        "extCls": props.extCls,
-        "bodyClass": bodyClass,
+        "class": _defineProperty(_defineProperty({}, resolveClassName('sideslider'), true), resolveClassName('sideslider-wrapper'), true),
+        "closeIcon": false,
         "onHidden": handleHidden,
         "onShown": handleShown,
         "onClose": handleClose

package/lib/sideslider/sideslider.css

@@ -5,56 +5,29 @@
   bottom: 0;
   left: 0;
 }
-/* fade-center */
-/* slide过渡动画 */
-.slide-enter-active,
-.slide-leave-active,
-.bk-modal-body {
-  transform: translateX(0);
-  transition: transform 0.25s;
-}
-.slide-enter-active {
-  animation: slider-fade-in 0.25s;
-}
-.slide-leave-active {
-  animation: slider-fade-in 0.25s reverse;
-}
-.slide-enter-from.left,
-.slide-leave-to.left {
-  transform: translateX(-100%);
-  transition: transform 0.25s;
-}
-.slide-enter-from.right,
-.slide-leave-to.right {
-  transform: translateX(100%);
-  transition: transform 0.25s;
-}
-@keyframes slider-fade-in {
-  0% {
-    opacity: 0;
-  }
-  100% {
-    opacity: 1;
-  }
-}
-.bk-modal-ctx.bk-sideslider-wrapper .bk-modal-wrapper {
+.bk-sideslider .bk-modal-wrapper {
   position: absolute;
   top: 0;
   bottom: 0;
   left: auto;
   transform: initial;
 }
-.bk-modal-ctx.bk-sideslider-wrapper .bk-modal-wrapper.scroll-able .bk-modal-content {
+.bk-sideslider .bk-modal-wrapper.scroll-able .bk-modal-content {
   overflow: auto;
-  height: 100%;
 }
-.bk-modal-ctx.bk-sideslider-wrapper .bk-modal-wrapper .bk-sideslider-header {
+.bk-sideslider .bk-modal-footer.is-fixed .bk-sideslider-footer {
+  height: 54px;
+  margin: 0;
+  border-top: 1px solid transparent;
+  box-shadow: rgba(0, 0, 0, 0.06) 0 -2px 4px 0;
+}
+.bk-sideslider-header {
   width: 100%;
   height: 52px;
   background: #fff;
   border-bottom: 1px solid #dcdee5;
 }
-.bk-modal-ctx.bk-sideslider-wrapper .bk-modal-wrapper .bk-sideslider-header .bk-sideslider-close {
+.bk-sideslider-close {
   position: absolute;
   top: 0;
   width: 30px;
@@ -66,10 +39,10 @@
   cursor: pointer;
   background-color: #3a84ff;
 }
-.bk-modal-ctx.bk-sideslider-wrapper .bk-modal-wrapper .bk-sideslider-header .bk-sideslider-close.right {
+.bk-sideslider-close.right {
   left: 0;
 }
-.bk-modal-ctx.bk-sideslider-wrapper .bk-modal-wrapper .bk-sideslider-header .bk-sideslider-close.right::before {
+.bk-sideslider-close.right::before {
   top: 50%;
   left: 50%;
   display: inline-block;
@@ -80,10 +53,10 @@
   content: '';
   transform: translate(-50%, -50%) rotate(45deg);
 }
-.bk-modal-ctx.bk-sideslider-wrapper .bk-modal-wrapper .bk-sideslider-header .bk-sideslider-close.left {
+.bk-sideslider-close.left {
   right: 0;
 }
-.bk-modal-ctx.bk-sideslider-wrapper .bk-modal-wrapper .bk-sideslider-header .bk-sideslider-close.left::before {
+.bk-sideslider-close.left::before {
   top: 50%;
   left: 50%;
   display: inline-block;
@@ -94,7 +67,7 @@
   content: '';
   transform: translate(50%, -50%) rotate(-45deg);
 }
-.bk-modal-ctx.bk-sideslider-wrapper .bk-modal-wrapper .bk-sideslider-header .bk-sideslider-title {
+.bk-sideslider-title {
   display: flex;
   height: 52px;
   padding-left: 30px;
@@ -102,16 +75,53 @@
   color: #313238;
   align-items: center;
 }
-.bk-modal-ctx.bk-sideslider-wrapper .bk-modal-wrapper .bk-sideslider-header .bk-sideslider-title.right {
+.bk-sideslider-title.right {
   width: 100%;
   padding: 0 0 0 46px;
 }
-.bk-modal-ctx.bk-sideslider-wrapper .bk-modal-wrapper .bk-sideslider-footer {
+.bk-sideslider-content {
+  padding-right: 24px;
+  padding-left: 24px;
+  overflow-y: scroll;
+}
+.bk-sideslider-footer {
   display: flex;
   width: 100%;
   height: 54px;
+  padding: 0 24px;
+  margin-top: 24px;
   background: #fff;
-  border-top: 1px solid transparent;
   align-items: center;
-  box-shadow: rgba(0, 0, 0, 0.06) 0 -2px 4px 0;
+}
+/* fade-center */
+/* slide过渡动画 */
+.slide-enter-active,
+.slide-leave-active,
+.bk-modal-body {
+  transform: translateX(0);
+  transition: transform 0.25s;
+}
+.slide-enter-active {
+  animation: slider-fade-in 0.25s;
+}
+.slide-leave-active {
+  animation: slider-fade-in 0.25s reverse;
+}
+.slide-enter-from.left,
+.slide-leave-to.left {
+  transform: translateX(-100%);
+  transition: transform 0.25s;
+}
+.slide-enter-from.right,
+.slide-leave-to.right {
+  transform: translateX(100%);
+  transition: transform 0.25s;
+}
+@keyframes slider-fade-in {
+  0% {
+    opacity: 0;
+  }
+  100% {
+    opacity: 1;
+  }
 }

package/lib/sideslider/sideslider.d.ts

@@ -211,12 +211,12 @@ declare const _default: import("vue").DefineComponent<{
     transfer: string | boolean | HTMLElement;
     direction: string;
     renderDirective: "show" | "if";
-    quickClose: boolean;
     scrollable: boolean;
     showMask: boolean;
     closeIcon: boolean;
     escClose: boolean;
     fullscreen: boolean;
+    quickClose: boolean;
     animateType: string;
     multiInstance: boolean;
     bodyClass: string | unknown[];