bkui-vue 1.0.3-beta.9 → 2.0.1-beta.2

package/lib/modal/mask.d.ts

@@ -0,0 +1,6 @@
+export declare const mask: {
+    showMask: (maskEle: HTMLElement) => void;
+    hideMask: (maskEle: HTMLElement) => void;
+    destroyMask: (maskEle: HTMLElement) => void;
+    getMaskCount: () => number;
+};

package/lib/modal/modal.css

@@ -1,101 +1,180 @@
-.bk-modal-ctx.bk-info-wrapper .bk-modal-wrapper {
-  width: 440px;
+.bk-infobox {
+  font-size: 12px;
 }
-.bk-modal-ctx.bk-info-wrapper .bk-modal-wrapper.normal {
-  width: 440px;
+.bk-infobox .bk-modal-wrapper {
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
 }
-.bk-modal-ctx.bk-info-wrapper .bk-modal-wrapper.small {
-  width: 400px;
+.bk-infobox-header {
+  padding-top: 24px;
 }
-.bk-modal-ctx.bk-info-wrapper .bk-modal-wrapper .bk-modal-body {
-  border-radius: 2px;
+.bk-infobox-type {
+  display: flex;
+  justify-content: center;
+  align-items: center;
 }
-.bk-modal-ctx.bk-info-wrapper .bk-modal-wrapper .bk-dialog-header {
-  padding: 24px 24px 0;
+.bk-infobox-icon {
+  width: 42px;
+  height: 42px;
+  font-size: 42px;
 }
-.bk-modal-ctx.bk-info-wrapper .bk-modal-wrapper .bk-dialog-header .bk-dialog-title {
-  height: 27px;
-  margin: 15px 0 10px;
+.bk-infobox-icon.success {
+  color: #2dcb56;
 }
-.bk-modal-ctx.bk-info-wrapper .bk-modal-wrapper .bk-modal-content {
-  height: 100%;
-  max-height: 100%;
-  min-height: 100%;
-  padding: 0 50px 10px;
-  word-break: break-all;
-}
-.bk-modal-ctx.bk-info-wrapper .bk-modal-wrapper .bk-modal-content .bk-info-sub-title {
-  margin-bottom: 10px;
-  text-align: center;
-  word-break: break-all;
-}
-.bk-modal-ctx.bk-info-wrapper .bk-modal-wrapper .bk-modal-footer {
-  padding: 0 65px 33px;
-  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-infobox-icon.warning {
+  color: #ff9c01;
 }
-.bk-modal-ctx {
-  pointer-events: auto;
-  top: 0px;
-  left: 0px;
-  width: 100%;
-  height: 100%;
+.bk-infobox-icon.danger {
+  color: #ea3636;
 }
-.bk-modal-ctx.--show {
-  position: fixed;
+.bk-infobox-icon.loading {
+  color: #3a84ff;
 }
-.bk-modal-ctx.--hide {
-  display: none;
+.bk-infobox-title {
+  padding-right: 24px;
+  padding-left: 24px;
+  margin-top: 24px;
+  font-size: 20px;
+  line-height: 32px;
+  color: #313238;
 }
-.bk-modal-ctx .bk-modal-ctx-mask {
-  display: none;
-  left: 0;
+.bk-infobox-content {
+  padding-right: 24px;
+  padding-left: 24px;
+  margin-top: 16px;
+}
+.bk-infobox-footer {
+  display: flex;
+  padding-right: 24px;
+  padding-bottom: 24px;
+  padding-left: 24px;
+  margin-top: 24px;
+  align-content: center;
+}
+.bk-infobox-footer.is-position-right {
+  justify-content: right;
+}
+.bk-infobox-footer.is-position-center {
+  justify-content: center;
+}
+.bk-infobox-footer.is-position-left {
+  justify-content: left;
+}
+.bk-infobox-footer .bk-button {
+  min-width: 88px;
+}
+.bk-infobox-footer .bk-button ~ .bk-button {
+  margin-left: 8px;
+}
+.bk-modal-mask {
+  position: fixed;
   top: 0;
+  left: 0;
   width: 100%;
   height: 100%;
   background-color: rgba(0, 0, 0, 0.6);
 }
-.bk-modal-ctx .bk-modal-ctx-mask.--show {
+.bk-modal-wrapper {
   position: fixed;
-  display: inherit;
 }
-.bk-modal-wrapper {
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  width: 480px;
+.bk-modal-body {
+  height: 100%;
+  overflow: hidden;
+  background: #fff;
   border-radius: 2px;
-  transform: translate(-50%, -50%);
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
 }
-.bk-modal-wrapper .bk-modal-outside {
-  position: fixed;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
+.bk-modal-content {
+  position: relative;
+  max-height: 100vh;
+  font-size: 0;
 }
-.bk-modal-wrapper.normal {
-  width: 480px;
-  height: 240px;
+.bk-modal-content div {
+  font-size: 12px;
 }
-.bk-modal-wrapper.small {
-  width: 400px;
-  height: 200px;
+.bk-modal-footer {
+  position: relative;
 }
-.bk-modal-wrapper.medium {
-  width: 640px;
-  height: 400px;
+.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-wrapper.large {
-  width: 960px;
-  height: 720px;
+.bk-modal-close:hover {
+  background: #f0f1f5;
 }
-.bk-modal-wrapper .bk-modal-body {
-  height: 100%;
-  width: 100%;
-  background: #fff;
-  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
+.modal-fadein-enter-from {
+  opacity: 0;
+}
+.modal-fadein-enter-from .bk-modal-body {
+  transform: translateY(-20px);
+}
+.modal-fadein-enter-to {
+  opacity: 1;
+}
+.modal-fadein-enter-to .bk-modal-body {
+  transform: translateY(0);
+}
+.modal-fadein-leave-from {
+  opacity: 1;
+}
+.modal-fadein-leave-from .bk-modal-body {
+  transform: translateY(0);
+}
+.modal-fadein-leave-to {
+  opacity: 0;
+}
+.modal-fadein-leave-to .bk-modal-body {
+  transform: translateY(-20px);
+}
+.modal-fadein-enter-active,
+.modal-fadein-leave-active {
+  transition: opacity 0.15s linear;
+}
+.modal-fadein-enter-active .bk-modal-body,
+.modal-fadein-leave-active .bk-modal-body {
+  transition: transform 0.08s linear;
+}
+.modal-right-enter-from {
+  transform: translateX(100%);
+}
+.modal-right-enter-to {
+  transform: translateX(0);
+}
+.modal-right-leave-from {
+  transform: translateX(0);
+}
+.modal-right-leave-to {
+  transform: translateX(100%);
+}
+.modal-right-enter-active,
+.modal-right-leave-active {
+  transition: transform 0.15s ease;
+}
+.modal-left-enter-from {
+  transform: translateX(-100%);
+}
+.modal-left-enter-to {
+  transform: translateX(0);
+}
+.modal-left-leave-from {
+  transform: translateX(0);
+}
+.modal-left-leave-to {
+  transform: translateX(-100%);
+}
+.modal-left-enter-active,
+.modal-left-leave-active {
+  transition: transform 0.15s ease;
 }

package/lib/modal/modal.d.ts

@@ -1,21 +1,14 @@
+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;
     } & {
         default: boolean;
     };
-    width: import("vue-types").VueTypeDef<string | number> & {
-        default: string | number;
-    };
-    height: import("vue-types").VueTypeDef<string | number> & {
-        default: string | number;
-    };
-    extCls: (import("vue-types").VueTypeValidableDef<string> & {
-        default: string;
-    }) | (import("vue-types").VueTypeValidableDef<unknown[]> & {
-        default: () => unknown[];
-    });
-    scrollable: import("vue-types").VueTypeValidableDef<boolean> & {
+    width: import("vue-types").VueTypeDef<string | number>;
+    fullscreen: import("vue-types").VueTypeValidableDef<boolean> & {
         default: boolean;
     } & {
         default: boolean;
@@ -35,17 +28,6 @@ declare const _default: import("vue").DefineComponent<{
     } & {
         default: boolean;
     };
-    fullscreen: import("vue-types").VueTypeValidableDef<boolean> & {
-        default: boolean;
-    } & {
-        default: boolean;
-    };
-    size: import("vue-types").VueTypeDef<"small" | "medium" | "large" | "normal">;
-    draggable: import("vue-types").VueTypeValidableDef<boolean> & {
-        default: boolean;
-    } & {
-        default: boolean;
-    };
     quickClose: import("vue-types").VueTypeValidableDef<boolean> & {
         default: boolean;
     } & {
@@ -55,17 +37,6 @@ declare const _default: import("vue").DefineComponent<{
         default: string | boolean | (() => HTMLElement);
     };
     zIndex: import("vue-types").VueTypeDef<string | number>;
-    maxHeight: import("vue-types").VueTypeValidableDef<string> & {
-        default: string;
-    };
-    direction: import("vue-types").VueTypeValidableDef<string> & {
-        default: string;
-    };
-    title: import("vue-types").VueTypeValidableDef<string> & {
-        default: string;
-    } & {
-        default: string;
-    };
     animateType: import("vue-types").VueTypeValidableDef<string> & {
         default: string;
     } & {
@@ -75,57 +46,23 @@ declare const _default: import("vue").DefineComponent<{
         default: "show" | "if";
     };
     beforeClose: import("vue-types").VueTypeDef<unknown>;
-    dialogType: import("vue-types").VueTypeDef<"show" | "process" | "operation" | "confirm">;
-    multiInstance: import("vue-types").VueTypeValidableDef<boolean> & {
-        default: boolean;
-    } & {
-        default: boolean;
-    };
-    infoType: import("vue-types").VueTypeDef<"success" | "warning" | "danger" | "primary">;
     left: import("vue-types").VueTypeValidableDef<string> & {
         default: string;
     };
     top: import("vue-types").VueTypeValidableDef<string> & {
         default: string;
     };
-}, {
-    visible: import("vue").Ref<boolean>;
-    compStyle: import("vue").ComputedRef<{
-        [x: string]: string | number;
-        width: string | number;
-        height: string | number;
-        minHeigth: string;
-        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" | "shown" | "hidden" | "quick-close" | "quickClose")[], "close" | "shown" | "hidden" | "quick-close" | "quickClose", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    extCls: import("vue-types").VueTypeValidableDef<string> & {
+        default: string;
+    };
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("close" | "hidden" | "shown" | "quick-close")[], "close" | "hidden" | "shown" | "quick-close", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<ExtractPropTypes<{
     isShow: import("vue-types").VueTypeValidableDef<boolean> & {
         default: boolean;
     } & {
         default: boolean;
     };
-    width: import("vue-types").VueTypeDef<string | number> & {
-        default: string | number;
-    };
-    height: import("vue-types").VueTypeDef<string | number> & {
-        default: string | number;
-    };
-    extCls: (import("vue-types").VueTypeValidableDef<string> & {
-        default: string;
-    }) | (import("vue-types").VueTypeValidableDef<unknown[]> & {
-        default: () => unknown[];
-    });
-    scrollable: import("vue-types").VueTypeValidableDef<boolean> & {
+    width: import("vue-types").VueTypeDef<string | number>;
+    fullscreen: import("vue-types").VueTypeValidableDef<boolean> & {
         default: boolean;
     } & {
         default: boolean;
@@ -145,17 +82,6 @@ declare const _default: import("vue").DefineComponent<{
     } & {
         default: boolean;
     };
-    fullscreen: import("vue-types").VueTypeValidableDef<boolean> & {
-        default: boolean;
-    } & {
-        default: boolean;
-    };
-    size: import("vue-types").VueTypeDef<"small" | "medium" | "large" | "normal">;
-    draggable: import("vue-types").VueTypeValidableDef<boolean> & {
-        default: boolean;
-    } & {
-        default: boolean;
-    };
     quickClose: import("vue-types").VueTypeValidableDef<boolean> & {
         default: boolean;
     } & {
@@ -165,17 +91,6 @@ declare const _default: import("vue").DefineComponent<{
         default: string | boolean | (() => HTMLElement);
     };
     zIndex: import("vue-types").VueTypeDef<string | number>;
-    maxHeight: import("vue-types").VueTypeValidableDef<string> & {
-        default: string;
-    };
-    direction: import("vue-types").VueTypeValidableDef<string> & {
-        default: string;
-    };
-    title: import("vue-types").VueTypeValidableDef<string> & {
-        default: string;
-    } & {
-        default: string;
-    };
     animateType: import("vue-types").VueTypeValidableDef<string> & {
         default: string;
     } & {
@@ -185,45 +100,32 @@ declare const _default: import("vue").DefineComponent<{
         default: "show" | "if";
     };
     beforeClose: import("vue-types").VueTypeDef<unknown>;
-    dialogType: import("vue-types").VueTypeDef<"show" | "process" | "operation" | "confirm">;
-    multiInstance: import("vue-types").VueTypeValidableDef<boolean> & {
-        default: boolean;
-    } & {
-        default: boolean;
-    };
-    infoType: import("vue-types").VueTypeDef<"success" | "warning" | "danger" | "primary">;
     left: import("vue-types").VueTypeValidableDef<string> & {
         default: string;
     };
     top: import("vue-types").VueTypeValidableDef<string> & {
         default: string;
     };
+    extCls: import("vue-types").VueTypeValidableDef<string> & {
+        default: string;
+    };
 }>> & {
     onClose?: (...args: any[]) => any;
-    onShown?: (...args: any[]) => any;
     onHidden?: (...args: any[]) => any;
+    onShown?: (...args: any[]) => any;
     "onQuick-close"?: (...args: any[]) => any;
-    onQuickClose?: (...args: any[]) => any;
 }, {
-    title: string;
-    width: string | number;
-    height: string | number;
-    maxHeight: string;
-    extCls: string | unknown[];
+    extCls: string;
     top: string;
     left: string;
     isShow: boolean;
-    draggable: boolean;
     transfer: string | boolean | HTMLElement;
-    direction: string;
     renderDirective: "show" | "if";
-    quickClose: boolean;
-    scrollable: boolean;
+    fullscreen: boolean;
     showMask: boolean;
     closeIcon: boolean;
     escClose: boolean;
-    fullscreen: boolean;
+    quickClose: boolean;
     animateType: string;
-    multiInstance: boolean;
 }, {}>;
 export default _default;

package/lib/modal/modal.less

@@ -1,82 +1,134 @@
 @import '../styles/themes/themes.less';
 @import '../info-box/info-box.less';
 
-.@{bk-prefix}-modal-ctx {
-  pointer-events: auto;
-  top: 0px;
-  left: 0px;
-
+.@{bk-prefix}-modal-mask {
+  position: fixed;
+  top: 0;
+  left: 0;
   width: 100%;
   height: 100%;
+  background-color: rgba(0, 0, 0, 0.6);
+}
 
-  &.--show {
-    position: fixed;
-  }
-
-  &.--hide {
-    display: none;
-  }
+.@{bk-prefix}-modal-wrapper {
+  position: fixed;
+}
 
-  .@{bk-prefix}-modal-ctx-mask {
-    display: none;
-    left: 0;
-    top: 0;
-    width: 100%;
-    height: 100%;
-    background-color: rgba(0,0,0,0.6);
-
-    &.--show {
-      position: fixed;
-      display: inherit;
-    }
-  }
+.@{bk-prefix}-modal-body {
+  height: 100%;
+  overflow: hidden;
+  background: #fff;
+  border-radius: 2px;
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
 }
 
+.@{bk-prefix}-modal-content {
+  position: relative;
+  max-height: 100vh;
+  font-size: 0;
 
+  div {
+    font-size: 12px;
+  }
+}
+.@{bk-prefix}-modal-footer {
+  position: relative;
+}
 
-.@{bk-prefix}-modal-wrapper {
+.@{bk-prefix}-modal-close {
   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;
+  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;
+
+  &:hover {
+    background: #f0f1f5;
   }
+}
 
-  &.normal {
-    width: 480px;
-    height: 240px;
+.modal-fadein-enter-from {
+  opacity: 0;
+  .@{bk-prefix}-modal-body {
+    transform: translateY(-20px);
   }
+}
 
-  &.small {
-    width: 400px;
-    height: 200px;
+.modal-fadein-enter-to {
+  opacity: 1;
+  .@{bk-prefix}-modal-body {
+    transform: translateY(0);
   }
+}
 
-  &.medium {
-    width: 640px;
-    height: 400px;
+.modal-fadein-leave-from {
+  opacity: 1;
+  .@{bk-prefix}-modal-body {
+    transform: translateY(0);
   }
+}
 
-  &.large {
-    width: 960px;
-    height: 720px;
+.modal-fadein-leave-to {
+  opacity: 0;
+  .@{bk-prefix}-modal-body {
+    transform: translateY(-20px);
   }
+}
 
+.modal-fadein-enter-active,
+.modal-fadein-leave-active {
+  transition: opacity 0.15s linear;
   .@{bk-prefix}-modal-body {
-    height: 100%;
-    width: 100%;
-    background: #fff;
-    box-shadow: 0 4px 12px rgba(0,0,0,.15);
+    transition: transform 0.08s linear;
   }
 }
 
+.modal-right-enter-from {
+  transform: translateX(100%);
+}
+
+.modal-right-enter-to {
+  transform: translateX(0);
+}
 
+.modal-right-leave-from {
+  transform: translateX(0);
+}
+
+.modal-right-leave-to {
+  transform: translateX(100%);
+}
+
+.modal-right-enter-active,
+.modal-right-leave-active {
+  transition: transform 0.15s ease;
+}
+
+.modal-left-enter-from {
+  transform: translateX(-100%);
+}
+
+.modal-left-enter-to {
+  transform: translateX(0);
+}
+
+.modal-left-leave-from {
+  transform: translateX(0);
+}
+
+.modal-left-leave-to {
+  transform: translateX(-100%);
+}
+
+.modal-left-enter-active,
+.modal-left-leave-active {
+  transition: transform 0.15s ease;
+}