bkui-vue 1.0.3-beta.68.dialog.2 → 1.0.3-beta.69

package/lib/components.d.ts

@@ -62,4 +62,3 @@ export { default as OverflowTitle } from './overflow-title';
 export { default as $bkPopover } from './plugin-popover';
 export { default as ConfigProvider } from './config-provider';
 export { default as PopConfirm } from './pop-confirm';
-export { default as scrollbar } from './scrollbar';

package/lib/components.js

@@ -84,4 +84,3 @@ export { default as OverflowTitle } from './overflow-title';
 export { default as $bkPopover } from './plugin-popover';
 export { default as ConfigProvider } from './config-provider';
 export { default as PopConfirm } from './pop-confirm';
-export { default as scrollbar } from './scrollbar';

package/lib/dialog/dialog.css

@@ -1,73 +1,29 @@
-.bk-infobox {
-  font-size: 12px;
+.bk-info-wrapper .bk-modal-wrapper {
+  width: 440px;
 }
-.bk-infobox .bk-modal-wrapper {
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-}
-.bk-infobox-header {
-  padding-top: 24px;
-}
-.bk-infobox-type {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-.bk-infobox-icon {
-  width: 42px;
-  height: 42px;
-  font-size: 42px;
-}
-.bk-infobox-icon.success {
-  color: #2dcb56;
-}
-.bk-infobox-icon.warning {
-  color: #ff9c01;
-}
-.bk-infobox-icon.danger {
-  color: #ea3636;
-}
-.bk-infobox-icon.loading {
-  color: #3a84ff;
-}
-.bk-infobox-title {
-  padding-right: 24px;
-  padding-left: 24px;
-  margin-top: 24px;
-  font-size: 20px;
-  line-height: 32px;
-  color: #313238;
-}
-.bk-infobox-content {
-  padding-right: 24px;
-  padding-left: 24px;
+.bk-info-wrapper .bk-modal-wrapper .bk-dialog-header .bk-dialog-title {
   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-info-wrapper .bk-dialog-footer button {
+  min-width: 88px;
 }
-.bk-infobox-footer.is-position-left {
-  justify-content: left;
+.bk-info-sub-title {
+  text-align: center;
+  word-break: break-all;
 }
-.bk-infobox-footer .bk-button {
-  min-width: 88px;
+.bk-modal-ctx {
+  position: fixed;
+  top: 0px;
+  left: 0px;
+  display: none;
+  width: 100%;
+  height: 100%;
+  pointer-events: auto;
 }
-.bk-infobox-footer .bk-button ~ .bk-button {
-  margin-left: 8px;
+.bk-modal-ctx.is-show {
+  display: block;
 }
-.bk-modal-mask {
+.bk-modal-ctx-mask {
   position: fixed;
   top: 0;
   left: 0;
@@ -76,7 +32,18 @@
   background-color: rgba(0, 0, 0, 0.6);
 }
 .bk-modal-wrapper {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  border-radius: 2px;
+  transform: translate(-50%, -50%);
+}
+.bk-modal-outside {
   position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
 }
 .bk-modal-body {
   height: 100%;
@@ -86,15 +53,9 @@
   box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
 }
 .bk-modal-content {
-  position: relative;
   max-height: 100vh;
-  font-size: 0;
-}
-.bk-modal-content div {
-  font-size: 12px;
-}
-.bk-modal-footer {
-  position: relative;
+  overflow: auto;
+  scrollbar-gutter: stable;
 }
 .bk-modal-close {
   position: absolute;
@@ -114,94 +75,73 @@
 .bk-modal-close:hover {
   background: #f0f1f5;
 }
-.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;
+.bk-dialog {
+  font-size: 14px;
 }
-.modal-fadein-enter-active .bk-modal-body,
-.modal-fadein-leave-active .bk-modal-body {
-  transition: transform 0.08s linear;
+.bk-dialog.is-fullscreen {
+  top: 0;
+  right: 0 ;
+  bottom: 0;
+  left: 0;
+  transform: translate(0, 0);
 }
-.modal-right-enter-from {
-  transform: translateX(100%);
+.bk-dialog.is-fullscreen .bk-modal-wrapper {
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  transform: translate(0, 0);
 }
-.modal-right-enter-to {
-  transform: translateX(0);
+.bk-dialog-wrapper .bk-modal-wrapper {
+  position: relative;
 }
-.modal-right-leave-from {
-  transform: translateX(0);
+.bk-dialog-wrapper .bk-modal-wrapper * {
+  box-sizing: border-box;
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
 }
-.modal-right-leave-to {
-  transform: translateX(100%);
+.bk-dialog-wrapper .bk-modal-wrapper.scroll-able .bk-modal-content {
+  overflow: auto;
 }
-.modal-right-enter-active,
-.modal-right-leave-active {
-  transition: transform 0.15s ease;
+.bk-dialog-wrapper .bk-modal-wrapper.multi-instance {
+  position: absolute;
 }
-.modal-left-enter-from {
-  transform: translateX(-100%);
+.bk-dialog-wrapper .bk-modal-wrapper.fullscreen .bk-modal-content {
+  max-height: calc(100vh - 137px);
 }
-.modal-left-enter-to {
-  transform: translateX(0);
+.bk-dialog-wrapper .bk-modal-wrapper.fullscreen.no-footer {
+  max-height: calc(100vh - 79px);
 }
-.modal-left-leave-from {
-  transform: translateX(0);
+.bk-dialog-wrapper .bk-modal-wrapper.no-footer .bk-modal-body {
+  padding-bottom: 0;
 }
-.modal-left-leave-to {
-  transform: translateX(-100%);
+.bk-dialog-header {
+  padding: 16px 24px 0;
+  font-size: 20px;
+  line-height: 1;
 }
-.modal-left-enter-active,
-.modal-left-leave-active {
-  transition: transform 0.15s ease;
+.bk-dialog-header-icon {
+  display: flex;
+  justify-content: center;
 }
-.bk-dialog {
-  font-size: 14px;
+.bk-dialog-header-icon .bk-info-icon {
+  font-size: 48px;
 }
-.bk-dialog.is-fullscreen .bk-modal-wrapper {
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  border-radius: 0;
-  transform: translate(0, 0);
+.bk-dialog-header-icon .bk-info-icon.success {
+  color: #2dcb56;
 }
-.bk-dialog .bk-modal-wrapper {
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
+.bk-dialog-header-icon .bk-info-icon.warning {
+  color: #ff9c01;
 }
-.bk-dialog-header {
-  padding: 16px 24px 0;
-  font-size: 20px;
+.bk-dialog-header-icon .bk-info-icon.danger {
+  color: #ea3636;
 }
 .bk-dialog-title {
   display: inline-block;
   width: 100%;
+  overflow: hidden;
   color: #313238;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 .bk-dialog-tool {
   position: absolute;
@@ -209,10 +149,15 @@
   right: 0;
   left: 0;
   height: 18px;
+}
+.bk-dialog-tool.move {
   cursor: move;
+}
+.bk-dialog-tool.content-dragging {
   user-select: none;
 }
 .bk-dialog-content {
+  max-height: calc(100vh - 300px);
   padding: 0 24px;
   margin-top: 16px;
   margin-bottom: 24px;

package/lib/dialog/dialog.d.ts

@@ -1,9 +1,4 @@
 declare const _default: import("vue").DefineComponent<{
-    draggable: import("vue-types").VueTypeValidableDef<boolean> & {
-        default: boolean;
-    } & {
-        default: boolean;
-    };
     confirmText: import("vue-types").VueTypeValidableDef<string> & {
         default: string;
     };
@@ -35,7 +30,7 @@ declare const _default: import("vue").DefineComponent<{
     footerAlign: import("vue-types").VueTypeValidableDef<"right" | "left" | "center"> & {
         default: "right" | "left" | "center";
     };
-    confirmButtonTheme: import("vue-types").VueTypeDef<"success" | "warning" | "danger" | "primary"> & {
+    theme: import("vue-types").VueTypeDef<"success" | "warning" | "danger" | "primary"> & {
         default: "success" | "warning" | "danger" | "primary";
     };
     dialogType: import("vue-types").VueTypeDef<"show" | "process" | "operation" | "confirm">;
@@ -49,8 +44,18 @@ declare const _default: import("vue").DefineComponent<{
     } & {
         default: boolean;
     };
-    width: import("vue-types").VueTypeDef<string | number>;
-    fullscreen: import("vue-types").VueTypeValidableDef<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> & {
         default: boolean;
     } & {
         default: boolean;
@@ -70,6 +75,17 @@ 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;
     } & {
@@ -79,6 +95,14 @@ 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;
+    } & {
+        default: string;
+    };
     animateType: import("vue-types").VueTypeValidableDef<string> & {
         default: string;
     } & {
@@ -88,26 +112,50 @@ declare const _default: import("vue").DefineComponent<{
         default: "show" | "if";
     };
     beforeClose: import("vue-types").VueTypeDef<unknown>;
+    multiInstance: import("vue-types").VueTypeValidableDef<boolean> & {
+        default: boolean;
+    } & {
+        default: boolean;
+    };
+    infoType: import("vue-types").VueTypeDef<"success" | "warning" | "danger" | "primary">;
+    bodyClass: (import("vue-types").VueTypeValidableDef<string> & {
+        default: string;
+    }) | (import("vue-types").VueTypeValidableDef<unknown[]> & {
+        default: () => unknown[];
+    });
     left: import("vue-types").VueTypeValidableDef<string> & {
         default: string;
     };
     top: import("vue-types").VueTypeValidableDef<string> & {
         default: string;
     };
-}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
-    closed: () => true;
-    shown: () => true;
-    hidden: () => true;
-    'update:isShow': (value: boolean) => boolean;
-    confirm: () => true;
-    prev: () => true;
-    next: () => true;
-}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
-    draggable: import("vue-types").VueTypeValidableDef<boolean> & {
-        default: boolean;
+    hiddenDelay: import("vue-types").VueTypeValidableDef<number> & {
+        default: number;
     } & {
-        default: boolean;
+        default: number;
     };
+}, {
+    data: {
+        positionX: number;
+        positionY: number;
+        moveStyle: {
+            top: string;
+            left: string;
+        };
+    };
+    handleClose: () => Promise<void>;
+    handleConfirm: () => void;
+    escCloseHandler: (e: any) => void;
+    moveHandler: (e: any) => boolean;
+    handlePrevStep: () => void;
+    handleNextStep: () => void;
+    isModalShow: import("vue").Ref<boolean>;
+    localConfirmText: import("vue").ComputedRef<string>;
+    localCancelText: import("vue").ComputedRef<string>;
+    localPrevText: import("vue").ComputedRef<string>;
+    localNextText: import("vue").ComputedRef<string>;
+    resolveClassName: (cls: string) => string;
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("prev" | "next" | "confirm" | "closed" | "update:isShow" | "value-change")[], "prev" | "next" | "confirm" | "closed" | "update:isShow" | "value-change", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     confirmText: import("vue-types").VueTypeValidableDef<string> & {
         default: string;
     };
@@ -139,7 +187,7 @@ declare const _default: import("vue").DefineComponent<{
     footerAlign: import("vue-types").VueTypeValidableDef<"right" | "left" | "center"> & {
         default: "right" | "left" | "center";
     };
-    confirmButtonTheme: import("vue-types").VueTypeDef<"success" | "warning" | "danger" | "primary"> & {
+    theme: import("vue-types").VueTypeDef<"success" | "warning" | "danger" | "primary"> & {
         default: "success" | "warning" | "danger" | "primary";
     };
     dialogType: import("vue-types").VueTypeDef<"show" | "process" | "operation" | "confirm">;
@@ -153,8 +201,18 @@ declare const _default: import("vue").DefineComponent<{
     } & {
         default: boolean;
     };
-    width: import("vue-types").VueTypeDef<string | number>;
-    fullscreen: import("vue-types").VueTypeValidableDef<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> & {
         default: boolean;
     } & {
         default: boolean;
@@ -174,6 +232,17 @@ 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;
     } & {
@@ -183,6 +252,14 @@ 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;
+    } & {
+        default: string;
+    };
     animateType: import("vue-types").VueTypeValidableDef<string> & {
         default: string;
     } & {
@@ -192,34 +269,59 @@ declare const _default: import("vue").DefineComponent<{
         default: "show" | "if";
     };
     beforeClose: import("vue-types").VueTypeDef<unknown>;
+    multiInstance: import("vue-types").VueTypeValidableDef<boolean> & {
+        default: boolean;
+    } & {
+        default: boolean;
+    };
+    infoType: import("vue-types").VueTypeDef<"success" | "warning" | "danger" | "primary">;
+    bodyClass: (import("vue-types").VueTypeValidableDef<string> & {
+        default: string;
+    }) | (import("vue-types").VueTypeValidableDef<unknown[]> & {
+        default: () => unknown[];
+    });
     left: import("vue-types").VueTypeValidableDef<string> & {
         default: string;
     };
     top: import("vue-types").VueTypeValidableDef<string> & {
         default: string;
     };
+    hiddenDelay: import("vue-types").VueTypeValidableDef<number> & {
+        default: number;
+    } & {
+        default: number;
+    };
 }>> & {
-    onHidden?: () => any;
-    onShown?: () => any;
-    onConfirm?: () => any;
-    onPrev?: () => any;
-    onNext?: () => any;
-    onClosed?: () => any;
-    "onUpdate:isShow"?: (value: boolean) => any;
+    onConfirm?: (...args: any[]) => any;
+    onPrev?: (...args: any[]) => any;
+    onNext?: (...args: any[]) => any;
+    onClosed?: (...args: any[]) => any;
+    "onUpdate:isShow"?: (...args: any[]) => any;
+    "onValue-change"?: (...args: any[]) => any;
 }, {
     title: string;
+    width: string | number;
+    height: string | number;
+    maxHeight: string;
+    extCls: string | unknown[];
     top: string;
     left: string;
     isShow: boolean;
+    theme: "success" | "warning" | "danger" | "primary";
     draggable: boolean;
     transfer: string | boolean | HTMLElement;
+    direction: string;
     renderDirective: "show" | "if";
-    fullscreen: boolean;
+    scrollable: boolean;
     showMask: boolean;
     closeIcon: boolean;
     escClose: boolean;
+    fullscreen: boolean;
     quickClose: boolean;
     animateType: string;
+    multiInstance: boolean;
+    bodyClass: string | unknown[];
+    hiddenDelay: number;
     confirmText: string;
     cancelText: string;
     prevText: string;
@@ -228,7 +330,6 @@ declare const _default: import("vue").DefineComponent<{
     totalStep: number;
     headerAlign: "right" | "left" | "center";
     footerAlign: "right" | "left" | "center";
-    confirmButtonTheme: "success" | "warning" | "danger" | "primary";
     isLoading: boolean;
 }, {}>;
 export default _default;

package/lib/dialog/dialog.less

@@ -5,32 +5,92 @@
   font-size: 14px;
 
   &.is-fullscreen {
-    .@{bk-prefix}-modal-wrapper {
+    top: 0;
+    right: 0 ;
+    bottom: 0;
+    left: 0;
+    transform: translate(0 , 0);
+
+    .bk-modal-wrapper {
       top: 0;
       right: 0;
       bottom: 0;
       left: 0;
-      border-radius: 0;
-      transform: translate(0, 0);
+      transform: translate(0 , 0);
     }
   }
-
+}
+.@{bk-prefix}-dialog-wrapper {
   .@{bk-prefix}-modal-wrapper {
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
+    position: relative;
+
+    * {
+      box-sizing: border-box;
+      -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+    }
+
+    &.scroll-able {
+      .@{bk-prefix}-modal-content {
+        overflow: auto;
+      }
+    }
+
+    &.multi-instance {
+      position: absolute;
+    }
+
+    &.fullscreen {
+      .@{bk-prefix}-modal-content {
+        max-height: calc(100vh - 137px);
+      }
+
+      &.no-footer {
+        max-height: calc(100vh - 79px);
+      }
+    }
+
+    &.no-footer {
+      .@{bk-prefix}-modal-body {
+        padding-bottom: 0;
+      }
+    }
   }
 }
 
 .@{bk-prefix}-dialog-header {
   padding: 16px 24px 0;
   font-size: 20px;
+  line-height: 1;
+}
+
+.@{bk-prefix}-dialog-header-icon {
+  display: flex;
+  justify-content: center;
+
+  .@{bk-prefix}-info-icon {
+    font-size: 48px;
+
+    &.success {
+      color: @success-color;
+    }
+
+    &.warning {
+      color: @warning-color;
+    }
+
+    &.danger {
+      color: @danger-color;
+    }
+  }
 }
 
 .@{bk-prefix}-dialog-title {
   display: inline-block;
   width: 100%;
+  overflow: hidden;
   color: @table-head-font-color;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
 .@{bk-prefix}-dialog-tool {
@@ -39,11 +99,18 @@
   right: 0;
   left: 0;
   height: 18px;
-  cursor: move;
-  user-select: none;
+
+  &.move {
+    cursor: move;
+  }
+
+  &.content-dragging {
+    user-select: none;
+  }
 }
 
 .@{bk-prefix}-dialog-content {
+  max-height: calc(100vh - 300px);
   padding: 0 24px;
   margin-top: 16px;
   margin-bottom: 24px;