bkui-vue 2.0.1-beta.8 → 2.0.1-beta.80

package/lib/modal/index.js

@@ -4,6 +4,7 @@ import * as __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_shared_edbdfb03__ from "../sh
 import * as __WEBPACK_EXTERNAL_MODULE_vue__ from "vue";
 import * as __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_config_provider_fe8577a3__ from "../config-provider";
 import * as __WEBPACK_EXTERNAL_MODULE_lodash_throttle_a7b7506a__ from "lodash/throttle";
+import * as __WEBPACK_EXTERNAL_MODULE_vue_types_22de060a__ from "vue-types";
 /******/ // The require scope
 /******/ var __webpack_require__ = {};
 /******/ 
@@ -87,7 +88,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({ ["Teleport"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.Teleport, ["Transition"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.Transition, ["computed"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.computed, ["createVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.createVNode, ["defineComponent"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent, ["mergeProps"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.mergeProps, ["nextTick"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.nextTick, ["onBeforeUnmount"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.onBeforeUnmount, ["onMounted"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.onMounted, ["ref"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.ref, ["useAttrs"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.useAttrs, ["useSlots"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.useSlots, ["vShow"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.vShow, ["watch"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.watch, ["withDirectives"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.withDirectives });
+const external_vue_namespaceObject = external_vue_x({ ["Teleport"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.Teleport, ["Transition"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.Transition, ["computed"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.computed, ["createVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.createVNode, ["defineComponent"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent, ["mergeProps"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.mergeProps, ["onBeforeUnmount"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.onBeforeUnmount, ["onMounted"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.onMounted, ["ref"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.ref, ["useAttrs"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.useAttrs, ["useSlots"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.useSlots, ["vShow"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.vShow, ["watch"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.watch, ["withDirectives"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.withDirectives });
 ;// CONCATENATED MODULE: external "../config-provider"
 var config_provider_x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
 var config_provider_y = x => () => x
@@ -142,10 +143,11 @@ var useContentResize = function useContentResize(root, resizeTarget, props) {
     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 + 20;
+    var footerMarginTop = 32;
+    isContentScroll.value = windowInnerHeight < headerHeight + contentHeight + footerHeight + footerMarginTop;
     if (isContentScroll.value || props.fullscreen) {
       contentStyles.value = {
-        height: "".concat(windowInnerHeight - headerHeight - footerHeight, "px"),
+        height: "".concat(windowInnerHeight - headerHeight - 48, "px"),
         overflow: 'auto',
         'scrollbar-gutter': 'stable'
       };
@@ -156,17 +158,21 @@ var useContentResize = function useContentResize(root, resizeTarget, props) {
     }
   }, 30);
   (0,external_vue_namespaceObject.watch)(function () {
-    return props.isShow;
+    return [props.isShow, resizeTarget];
   }, function () {
     var observer;
     if (props.isShow) {
-      (0,external_vue_namespaceObject.nextTick)(function () {
+      // 有动画效果导致 resizeTarget DOM 找不到
+      setTimeout(function () {
+        if (!resizeTarget.value) {
+          return;
+        }
         observer = new ResizeObserver(function () {
           calcContentScroll();
         });
         observer.observe(resizeTarget.value);
         calcContentScroll();
-      });
+      }, 100);
     } else {
       if (observer) {
         observer.disconnect();
@@ -256,6 +262,10 @@ var mask = {
   destroyMask: destroyMask,
   getMaskCount: getMaskCount
 };
+;// CONCATENATED MODULE: external "vue-types"
+var external_vue_types_x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
+var external_vue_types_y = x => () => x
+const external_vue_types_namespaceObject = external_vue_types_x({ ["func"]: () => __WEBPACK_EXTERNAL_MODULE_vue_types_22de060a__.func });
 ;// CONCATENATED MODULE: ../../packages/modal/src/props.mixin.ts
 /*
  * Tencent is pleased to support the open source community by making
@@ -283,6 +293,7 @@ var mask = {
  * IN THE SOFTWARE.
  */
 
+
 var propsMixin = {
   // 是否显示弹框
   isShow: shared_namespaceObject.PropTypes.bool.def(false),
@@ -306,12 +317,13 @@ var propsMixin = {
   // 弹框的渲染方式
   renderDirective: (0,shared_namespaceObject.renderDirectiveType)(),
   // 关闭前回调
-  beforeClose: shared_namespaceObject.PropTypes.custom(function () {
+  beforeClose: (0,external_vue_types_namespaceObject.func)().def(function () {
     return true;
   }),
   left: shared_namespaceObject.PropTypes.string,
   top: shared_namespaceObject.PropTypes.string,
-  extCls: shared_namespaceObject.PropTypes.string
+  extCls: shared_namespaceObject.PropTypes.string,
+  backgroundColor: shared_namespaceObject.PropTypes.string.def('')
 };
 ;// CONCATENATED MODULE: ../../packages/modal/src/modal.tsx
 
@@ -426,6 +438,25 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
       if (!initRendered.value) {
         return null;
       }
+      var renderMask = function renderMask() {
+        if (!props.showMask) {
+          return null;
+        }
+        return (0,external_vue_namespaceObject.createVNode)(external_vue_namespaceObject.Transition, {
+          "name": mask.getMaskCount() > 0 ? 'fadein' : ''
+        }, {
+          "default": function _default() {
+            return [(0,external_vue_namespaceObject.withDirectives)((0,external_vue_namespaceObject.createVNode)("div", {
+              "ref": maskRef,
+              "style": {
+                zIndex: zIndex.value
+              },
+              "class": _defineProperty({}, resolveClassName('modal-mask'), true),
+              "onClick": handleClickOutSide
+            }, null), [[external_vue_namespaceObject.vShow, localShow.value]])];
+          }
+        });
+      };
       var renderContent = function renderContent() {
         var _slots$header, _slots$default, _slots$footer, _slots$close;
         // v-if 模式渲染，如果 isShow 为 false 销毁 DOM
@@ -433,12 +464,15 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
           return null;
         }
         return (0,external_vue_namespaceObject.createVNode)("div", {
+          "style": {
+            backgroundColor: props.backgroundColor
+          },
           "class": resolveClassName('modal-body')
         }, [(0,external_vue_namespaceObject.createVNode)("div", {
           "class": resolveClassName('modal-header')
         }, [(_slots$header = slots.header) === null || _slots$header === void 0 ? void 0 : _slots$header.call(slots)]), (0,external_vue_namespaceObject.createVNode)("div", {
-          "class": resolveClassName('modal-content'),
-          "style": contentStyles.value
+          "style": contentStyles.value,
+          "class": resolveClassName('modal-content')
         }, [(0,external_vue_namespaceObject.createVNode)("div", {
           "style": "position: relative; display: inline-block; width: 100%;"
         }, [(_slots$default = slots["default"]) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots), (0,external_vue_namespaceObject.createVNode)("div", {
@@ -452,34 +486,21 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
         }, [(_slots$close = slots.close) === null || _slots$close === void 0 ? void 0 : _slots$close.call(slots)])]);
       };
       return (0,external_vue_namespaceObject.createVNode)(external_vue_namespaceObject.Teleport, {
-        "to": "body",
-        "disabled": !props.transfer
+        "disabled": !props.transfer,
+        "to": typeof props.transfer === 'string' && Boolean(props.transfer) ? props.transfer : 'body'
       }, {
         "default": function _default() {
           return [(0,external_vue_namespaceObject.createVNode)("div", (0,external_vue_namespaceObject.mergeProps)({
             "ref": rootRef
           }, attrs, {
             "class": [resolveClassName('modal'), props.extCls || '']
-          }), [props.showMask && (0,external_vue_namespaceObject.createVNode)(external_vue_namespaceObject.Transition, {
-            "name": mask.getMaskCount() > 0 ? 'fadein' : ''
-          }, {
-            "default": function _default() {
-              return [(0,external_vue_namespaceObject.withDirectives)((0,external_vue_namespaceObject.createVNode)("div", {
-                "ref": maskRef,
-                "class": _defineProperty({}, resolveClassName('modal-mask'), true),
-                "style": {
-                  zIndex: zIndex.value
-                },
-                "onClick": handleClickOutSide
-              }, null), [[external_vue_namespaceObject.vShow, localShow.value]])];
-            }
-          }), (0,external_vue_namespaceObject.createVNode)(external_vue_namespaceObject.Transition, {
+          }), [renderMask(), (0,external_vue_namespaceObject.createVNode)(external_vue_namespaceObject.Transition, {
             "name": "modal-".concat(props.animateType)
           }, {
             "default": function _default() {
               return [(0,external_vue_namespaceObject.withDirectives)((0,external_vue_namespaceObject.createVNode)("div", {
-                "class": resolveClassName('modal-wrapper'),
-                "style": modalWrapperStyles.value
+                "style": modalWrapperStyles.value,
+                "class": resolveClassName('modal-wrapper')
               }, [renderContent()]), [[external_vue_namespaceObject.vShow, localShow.value]])];
             }
           })])];

package/lib/modal/modal.css

@@ -1,3 +1,133 @@
+:root {
+  --bk-prefix: bk;
+  --popover-max-height: 216px;
+  --primary-color: #3a84ff;
+  --success-color: #2dcb56;
+  --warning-color: #ff9c01;
+  --danger-color: #ea3636;
+  --default-color: #63656e;
+  --gray-color: #979ba5;
+  --light-gray: #c4c6cc;
+  --white-color: white;
+  --whitesmoke-color: #fafbfd;
+  --disable-color: #dcdee5;
+  --disable-bg-color: #f9fafd;
+  --border-color: #dcdee5;
+  --font-size-base: 12px;
+  --font-size-medium: 14px;
+  --font-size-large: 16px;
+  --line-height-base: 16px;
+  --line-height-medium: 16px;
+  --line-height-large: 18px;
+  --component-size-small: 26px;
+  --component-size-base: 32px;
+  --component-size-large: 40px;
+  --component-size-small-padding: 0 12px;
+  --component-size-base-padding: 0 14px;
+  --component-size-large-padding: 0 16px;
+  --border-width-base: 1px;
+  --border-style-base: solid;
+  --border-radius-base: 2px;
+  --border-style-color: var(--light-gray);
+  --input-disabled-bg: #fafbfd;
+  --input-disabled-border: var(--disable-color);
+  --input-height-base: var(--component-size-base);
+  --input-color: var(--default-color);
+  --input-bg: white;
+  --input-border-color: var(--light-gray);
+  --input-broder-radius: 3px;
+  --input-shadow-color: #a3c5fd;
+  --input-horizontal-padding: 8px;
+  --input-block-color: #f5f7fa;
+  --input-block-hover-color: #eaebf0;
+  --input-icon-size: var(--font-size-medium);
+  --input-maxlength-color: #979ba5;
+  --button-primary-hover-color: #5594fa;
+  --button-danger-hover-color: #ff5656;
+  --button-success-hover-color: #45e35f;
+  --button-warning-hover-color: #ffb848;
+  --button-default-hover-border-color: #979ba5;
+  --button-primary-active-color: #2c77f4;
+  --button-danger-active-color: #db2626;
+  --button-success-active-color: #1ab943;
+  --button-warning-active-color: #eb9000;
+  --button-selected-bg-color: #e1ecff;
+  --button-disabled-selected-bg-color: #f0f1f5;
+  --radio-font-color: #63656e;
+  --radio-active-color: #3a84ff;
+  --radio-hover-border-color: #979ba5;
+  --radio-disabled-border: #dcdee5;
+  --radio-disabled-font-color: #c4c6cc;
+  --radio-disabled-checked-bg: #a3c5fd;
+  --radio-button-checked-bg: #e1ecff;
+  --radio-button-disabled-checked-bg: #fafbfd;
+  --checkbox-disabled-checked-bg: #a3c5fd;
+  --fixed-navbar-background: #fff;
+  --fixed-navbar-boxshadow-color: rgba(0, 0, 0, 0.1);
+  --switch-default-color: #fff;
+  --switch-grey-color: #c4c6cc;
+  --breadcrumb-black-color: #979ba5;
+  --breadcrumb-primary-hover-color: #0082ff;
+  --breadcrumb-fn-main-color: #63656e;
+  --link-default-hover-color: #979ba5;
+  --link-primary-hover-color: #699df4;
+  --link-success-hover-color: #45e35f;
+  --link-warning-hover-color: #ffb848;
+  --link-danger-hover-color: #ff5656;
+  --link-default-disabled-color: #dcdee5;
+  --link-primary-disabled-color: #a3c5fd;
+  --link-success-disabled-color: #94f5a4;
+  --link-warning-disabled-color: #ffd695;
+  --link-danger-disabled-color: #fd9c9c;
+  --message-color: var(--default-color);
+  --message-primary-bg-color: #f0f8ff;
+  --message-primary-border-color: #e1ecff;
+  --message-primary-shadow-color: #e1e8f4;
+  --message-warning-bg-color: #fff4e2;
+  --message-warning-border-color: #ffe8c3;
+  --message-warning-shadow-color: #ede6db;
+  --message-success-bg-color: #f2fff4;
+  --message-success-border-color: #dcffe2;
+  --message-success-shadow-color: #cef0d7;
+  --message-danger-bg-color: #ffeded;
+  --message-danger-border-color: #ffdddd;
+  --message-danger-shadow-color: #f6dada;
+  --slider-default-bg: #dcdee5;
+  --slider-disable-bar-bg: #979ba5;
+  --menu-bg-color: #182132;
+  --submenu-bg-color: #151d2c;
+  --menu-active-bg-color: linear-gradient(90deg, #3f87ff 0%, #3a84ff 100%);
+  --menu-color: #96a2b9;
+  --menu-group-color: var(--default-color);
+  --menu-width: 260px;
+  --menu-collapse-width: 60px;
+  --menu-active-color: white;
+  --nav-header-bg-color: #182132;
+  --nav-bg-color: #182132;
+  --date-picker-disabled-bg: #fafbfd;
+  --date-picker-dropdown-mb: 4px;
+  --date-picker-dropdown-bg: #fff;
+  --table-bg-color: var(--white-color);
+  --table-border-color: #dcdee5;
+  --table-strip-color: #fafbfd;
+  --table-head-bg-color: #fafbfd;
+  --table-head-font-color: #313238;
+  --table-body-font-color: #63656e;
+  --table-row-hover-bg-color: #f5f7fa;
+  --table-row-active-bg-color: #f0f1f5;
+  --cascader-panel-border-color: #dcdee5;
+  --cascader-panel-hover: #f5f7fa;
+  --cascader-panel-active: #e1ecff;
+  --cascader-panel-disabled-bg: #fff;
+  --search-select-focus-border-color: var(--primary-color);
+  --search-select-focus-color: #3c96ff;
+  --search-select-font-color: var(--default-color);
+  --search-select-placeholder-color: var(--light-gray);
+  --search-select-message-color: var(--danger-color);
+  --search-select-menu-border-color: var(--disable-color);
+  --select-active-color: #e1ecff;
+  --select-hover-color: #f5f7fa;
+}
 .bk-infobox {
   font-size: 12px;
 }
@@ -20,16 +150,16 @@
   font-size: 42px;
 }
 .bk-infobox-icon.success {
-  color: #2dcb56;
+  color: var(--success-color);
 }
 .bk-infobox-icon.warning {
-  color: #ff9c01;
+  color: var(--warning-color);
 }
 .bk-infobox-icon.danger {
-  color: #ea3636;
+  color: var(--danger-color);
 }
 .bk-infobox-icon.loading {
-  color: #3a84ff;
+  color: var(--primary-color);
 }
 .bk-infobox-title {
   padding-right: 24px;

package/lib/modal/modal.d.ts

@@ -45,7 +45,9 @@ declare const _default: import("vue").DefineComponent<{
     renderDirective: import("vue-types").VueTypeValidableDef<"show" | "if"> & {
         default: "show" | "if";
     };
-    beforeClose: import("vue-types").VueTypeDef<unknown>;
+    beforeClose: import("vue-types").VueTypeValidableDef<() => boolean | Promise<boolean>> & {
+        default: () => boolean | Promise<boolean>;
+    };
     left: import("vue-types").VueTypeValidableDef<string> & {
         default: string;
     };
@@ -55,6 +57,11 @@ declare const _default: import("vue").DefineComponent<{
     extCls: import("vue-types").VueTypeValidableDef<string> & {
         default: string;
     };
+    backgroundColor: import("vue-types").VueTypeValidableDef<string> & {
+        default: 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;
@@ -99,7 +106,9 @@ declare const _default: import("vue").DefineComponent<{
     renderDirective: import("vue-types").VueTypeValidableDef<"show" | "if"> & {
         default: "show" | "if";
     };
-    beforeClose: import("vue-types").VueTypeDef<unknown>;
+    beforeClose: import("vue-types").VueTypeValidableDef<() => boolean | Promise<boolean>> & {
+        default: () => boolean | Promise<boolean>;
+    };
     left: import("vue-types").VueTypeValidableDef<string> & {
         default: string;
     };
@@ -109,6 +118,11 @@ declare const _default: import("vue").DefineComponent<{
     extCls: import("vue-types").VueTypeValidableDef<string> & {
         default: string;
     };
+    backgroundColor: import("vue-types").VueTypeValidableDef<string> & {
+        default: string;
+    } & {
+        default: string;
+    };
 }>> & {
     onClose?: (...args: any[]) => any;
     onHidden?: (...args: any[]) => any;
@@ -116,9 +130,10 @@ declare const _default: import("vue").DefineComponent<{
     "onQuick-close"?: (...args: any[]) => any;
 }, {
     extCls: string;
-    top: string;
     left: string;
+    top: string;
     isShow: boolean;
+    backgroundColor: string;
     transfer: string | boolean | HTMLElement;
     renderDirective: "show" | "if";
     fullscreen: boolean;
@@ -127,5 +142,6 @@ declare const _default: import("vue").DefineComponent<{
     escClose: boolean;
     quickClose: boolean;
     animateType: string;
+    beforeClose: () => boolean | Promise<boolean>;
 }, {}>;
 export default _default;