bkui-vue 2.0.1-beta.11 → 2.0.1-beta.111

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__ = {};
 /******/ 
@@ -40,38 +41,38 @@ var x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
 var y = x => () => x
 const shared_namespaceObject = x({ ["PropTypes"]: () => __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_shared_edbdfb03__.PropTypes, ["bkZIndexManager"]: () => __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_shared_edbdfb03__.bkZIndexManager, ["renderDirectiveType"]: () => __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_shared_edbdfb03__.renderDirectiveType, ["withInstallProps"]: () => __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_shared_edbdfb03__.withInstallProps });
 ;// CONCATENATED MODULE: ../../node_modules/@babel/runtime/helpers/esm/typeof.js
-function _typeof(o) {
+function _typeof(obj) {
   "@babel/helpers - typeof";
 
-  return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) {
-    return typeof o;
-  } : function (o) {
-    return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o;
-  }, _typeof(o);
+  return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) {
+    return typeof obj;
+  } : function (obj) {
+    return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
+  }, _typeof(obj);
 }
 ;// CONCATENATED MODULE: ../../node_modules/@babel/runtime/helpers/esm/toPrimitive.js
 
-function toPrimitive(t, r) {
-  if ("object" != _typeof(t) || !t) return t;
-  var e = t[Symbol.toPrimitive];
-  if (void 0 !== e) {
-    var i = e.call(t, r || "default");
-    if ("object" != _typeof(i)) return i;
+function _toPrimitive(input, hint) {
+  if (_typeof(input) !== "object" || input === null) return input;
+  var prim = input[Symbol.toPrimitive];
+  if (prim !== undefined) {
+    var res = prim.call(input, hint || "default");
+    if (_typeof(res) !== "object") return res;
     throw new TypeError("@@toPrimitive must return a primitive value.");
   }
-  return ("string" === r ? String : Number)(t);
+  return (hint === "string" ? String : Number)(input);
 }
 ;// CONCATENATED MODULE: ../../node_modules/@babel/runtime/helpers/esm/toPropertyKey.js
 
 
-function toPropertyKey(t) {
-  var i = toPrimitive(t, "string");
-  return "symbol" == _typeof(i) ? i : String(i);
+function _toPropertyKey(arg) {
+  var key = _toPrimitive(arg, "string");
+  return _typeof(key) === "symbol" ? key : String(key);
 }
 ;// CONCATENATED MODULE: ../../node_modules/@babel/runtime/helpers/esm/defineProperty.js
 
 function _defineProperty(obj, key, value) {
-  key = toPropertyKey(key);
+  key = _toPropertyKey(key);
   if (key in obj) {
     Object.defineProperty(obj, key, {
       value: value,
@@ -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,60 +438,69 @@ 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;
+        var _slots$header, _slots$default, _ref2, _slots$footer, _slots$close;
         // v-if 模式渲染，如果 isShow 为 false 销毁 DOM
         if (props.renderDirective === 'if' && !localShow.value) {
           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", {
           "ref": resizeTargetRef,
           "style": "position: absolute; top: 0; bottom: 0;"
         }, null)])]), (0,external_vue_namespaceObject.createVNode)("div", {
-          "class": _defineProperty(_defineProperty({}, resolveClassName('modal-footer'), true), 'is-fixed', isContentScroll.value)
+          "class": (_ref2 = {}, _defineProperty(_ref2, resolveClassName('modal-footer'), true), _defineProperty(_ref2, 'is-fixed', isContentScroll.value), _ref2)
         }, [(_slots$footer = slots.footer) === null || _slots$footer === void 0 ? void 0 : _slots$footer.call(slots)]), props.closeIcon && (0,external_vue_namespaceObject.createVNode)("div", {
           "class": resolveClassName('modal-close'),
           "onClick": handleClose
         }, [(_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.d.ts

@@ -42,10 +42,12 @@ declare const _default: import("vue").DefineComponent<{
     } & {
         default: string;
     };
-    renderDirective: import("vue-types").VueTypeValidableDef<"show" | "if"> & {
-        default: "show" | "if";
+    renderDirective: import("vue-types").VueTypeValidableDef<"if" | "show"> & {
+        default: "if" | "show";
+    };
+    beforeClose: import("vue-types").VueTypeValidableDef<() => boolean | Promise<boolean>> & {
+        default: () => boolean | Promise<boolean>;
     };
-    beforeClose: import("vue-types").VueTypeDef<unknown>;
     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;
@@ -96,10 +103,12 @@ declare const _default: import("vue").DefineComponent<{
     } & {
         default: string;
     };
-    renderDirective: import("vue-types").VueTypeValidableDef<"show" | "if"> & {
-        default: "show" | "if";
+    renderDirective: import("vue-types").VueTypeValidableDef<"if" | "show"> & {
+        default: "if" | "show";
+    };
+    beforeClose: import("vue-types").VueTypeValidableDef<() => boolean | Promise<boolean>> & {
+        default: () => boolean | Promise<boolean>;
     };
-    beforeClose: import("vue-types").VueTypeDef<unknown>;
     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,16 +130,18 @@ declare const _default: import("vue").DefineComponent<{
     "onQuick-close"?: (...args: any[]) => any;
 }, {
     extCls: string;
-    top: string;
     left: string;
+    top: string;
     isShow: boolean;
+    renderDirective: "if" | "show";
+    backgroundColor: string;
     transfer: string | boolean | HTMLElement;
-    renderDirective: "show" | "if";
     fullscreen: boolean;
     showMask: boolean;
     closeIcon: boolean;
     escClose: boolean;
     quickClose: boolean;
     animateType: string;
+    beforeClose: () => boolean | Promise<boolean>;
 }, {}>;
 export default _default;

package/lib/modal/modal.variable.css

@@ -109,6 +109,7 @@
   --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;

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

@@ -39,10 +39,12 @@ export declare const propsMixin: {
     } & {
         default: string;
     };
-    renderDirective: import("vue-types").VueTypeValidableDef<"show" | "if"> & {
-        default: "show" | "if";
+    renderDirective: import("vue-types").VueTypeValidableDef<"if" | "show"> & {
+        default: "if" | "show";
+    };
+    beforeClose: import("vue-types").VueTypeValidableDef<() => Promise<boolean> | boolean> & {
+        default: () => Promise<boolean> | boolean;
     };
-    beforeClose: import("vue-types").VueTypeDef<unknown>;
     left: import("vue-types").VueTypeValidableDef<string> & {
         default: string;
     };
@@ -52,4 +54,9 @@ export declare const propsMixin: {
     extCls: import("vue-types").VueTypeValidableDef<string> & {
         default: string;
     };
+    backgroundColor: import("vue-types").VueTypeValidableDef<string> & {
+        default: string;
+    } & {
+        default: string;
+    };
 };