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

package/lib/sideslider/index.js

@@ -2,7 +2,9 @@ import "../styles/reset.css";
 import "./sideslider.less";
 import * as __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_shared_edbdfb03__ from "../shared";
 import * as __WEBPACK_EXTERNAL_MODULE_vue__ from "vue";
+import * as __WEBPACK_EXTERNAL_MODULE_lodash_cloneDeep_13f2b125__ from "lodash/cloneDeep";
 import * as __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_config_provider_fe8577a3__ from "../config-provider";
+import * as __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_icon_a97c79c3__ from "../icon";
 import * as __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_modal_d1344388__ from "../modal";
 import "../modal/modal.less";
 /******/ var __webpack_modules__ = ({
@@ -424,7 +426,7 @@ __webpack_require__.d(__webpack_exports__, {
 ;// CONCATENATED MODULE: external "../shared"
 var x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
 var y = x => () => x
-const shared_namespaceObject = x({ ["withInstall"]: () => __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_shared_edbdfb03__.withInstall });
+const shared_namespaceObject = x({ ["PropTypes"]: () => __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_shared_edbdfb03__.PropTypes, ["withInstall"]: () => __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_shared_edbdfb03__.withInstall });
 ;// CONCATENATED MODULE: ../../node_modules/@babel/runtime/helpers/esm/asyncToGenerator.js
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
   try {
@@ -504,18 +506,26 @@ 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({ ["Fragment"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.Fragment, ["createVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.createVNode, ["defineComponent"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent, ["isVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.isVNode, ["mergeProps"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.mergeProps, ["ref"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.ref });
+const external_vue_namespaceObject = external_vue_x({ ["Fragment"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.Fragment, ["createVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.createVNode, ["defineComponent"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent, ["getCurrentInstance"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.getCurrentInstance, ["isVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.isVNode, ["mergeProps"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.mergeProps, ["useAttrs"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.useAttrs, ["useSlots"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.useSlots });
 // EXTERNAL MODULE: ../../node_modules/@babel/runtime/regenerator/index.js
 var regenerator = __webpack_require__(2841);
 var regenerator_default = /*#__PURE__*/__webpack_require__.n(regenerator);
+;// CONCATENATED MODULE: external "lodash/cloneDeep"
+var cloneDeep_x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
+var cloneDeep_y = x => () => x
+const cloneDeep_namespaceObject = cloneDeep_x({ ["default"]: () => __WEBPACK_EXTERNAL_MODULE_lodash_cloneDeep_13f2b125__["default"] });
 ;// 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
 const config_provider_namespaceObject = config_provider_x({ ["usePrefix"]: () => __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_config_provider_fe8577a3__.usePrefix });
+;// CONCATENATED MODULE: external "../icon"
+var icon_x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
+var icon_y = x => () => x
+const icon_namespaceObject = icon_x({ ["AngleLeft"]: () => __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_icon_a97c79c3__.AngleLeft, ["AngleRight"]: () => __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_icon_a97c79c3__.AngleRight });
 ;// CONCATENATED MODULE: external "../modal"
 var modal_x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
 var modal_y = x => () => x
-const modal_namespaceObject = modal_x({ ["default"]: () => __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_modal_d1344388__["default"] });
+const modal_namespaceObject = modal_x({ ["default"]: () => __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_modal_d1344388__["default"], ["propsMixin"]: () => __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_modal_d1344388__.propsMixin });
 ;// CONCATENATED MODULE: external "../modal/modal.less"
 var modal_less_x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
 var modal_less_y = x => () => x
@@ -556,16 +566,20 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 
 
 
+
+
+
+
 function _isSlot(s) {
   return typeof s === 'function' || Object.prototype.toString.call(s) === '[object Object]' && !(0,external_vue_namespaceObject.isVNode)(s);
 }
-var propsMixin = modal_namespaceObject["default"].propsMixin;
-var sliderPops = Object.assign({}, propsMixin);
-sliderPops.width["default"] = '400';
-sliderPops.height["default"] = '100%';
+var sliderProps = (0,cloneDeep_namespaceObject["default"])(modal_namespaceObject.propsMixin);
+sliderProps.width["default"] = '400';
 /* harmony default export */ const sideslider = ((0,external_vue_namespaceObject.defineComponent)({
   name: 'Sideslider',
-  props: _objectSpread(_objectSpread({}, sliderPops), {}, {
+  inheritAttrs: false,
+  props: _objectSpread(_objectSpread({}, sliderProps), {}, {
+    title: shared_namespaceObject.PropTypes.string.def(''),
     direction: {
       type: String,
       "default": 'right',
@@ -581,24 +595,34 @@ sliderPops.height["default"] = '100%';
   }),
   emits: ['closed', 'update:isShow', 'shown', 'hidden', 'animation-end'],
   setup: function setup(props, _ref) {
-    var slots = _ref.slots,
-      emit = _ref.emit;
-    var refRoot = (0,external_vue_namespaceObject.ref)(null);
+    var emit = _ref.emit;
+    var attrs = (0,external_vue_namespaceObject.useAttrs)();
+    var slots = (0,external_vue_namespaceObject.useSlots)();
+    var instance = (0,external_vue_namespaceObject.getCurrentInstance)();
+    var _usePrefix = (0,config_provider_namespaceObject.usePrefix)(),
+      resolveClassName = _usePrefix.resolveClassName;
     var handleClose = /*#__PURE__*/function () {
       var _ref2 = _asyncToGenerator( /*#__PURE__*/regenerator_default().mark(function _callee() {
+        var shouldClose;
         return regenerator_default().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              // 这里无需处理 beforeClose，在 modal 中会处理
-              emit('update:isShow', false);
-              emit('closed');
-              setTimeout(function () {
-                var _refRoot$value, _refRoot$value$close;
-                // 有动画，推迟发布事件
+              shouldClose = true;
+              if (!(typeof props.beforeClose === 'function')) {
+                _context.next = 5;
+                break;
+              }
+              _context.next = 4;
+              return props.beforeClose();
+            case 4:
+              shouldClose = _context.sent;
+            case 5:
+              if (shouldClose) {
+                emit('update:isShow', false);
+                emit('closed');
                 emit('animation-end');
-                (_refRoot$value = refRoot.value) === null || _refRoot$value === void 0 || (_refRoot$value$close = _refRoot$value.close) === null || _refRoot$value$close === void 0 || _refRoot$value$close.call(_refRoot$value);
-              }, props.hiddenDelay);
-            case 3:
+              }
+            case 6:
             case "end":
               return _context.stop();
           }
@@ -609,19 +633,11 @@ sliderPops.height["default"] = '100%';
       };
     }();
     var handleShown = function handleShown() {
-      // 有动画，推迟发布事件
-      setTimeout(function () {
-        emit('shown');
-      }, 200);
+      emit('shown');
     };
     var handleHidden = function handleHidden() {
-      // 有动画，推迟发布事件
-      setTimeout(function () {
-        emit('hidden');
-      }, 200);
+      emit('hidden');
     };
-    var _usePrefix = (0,config_provider_namespaceObject.usePrefix)(),
-      resolveClassName = _usePrefix.resolveClassName;
     return function () {
       var modelSlot = {
         header: function header() {
@@ -629,12 +645,10 @@ sliderPops.height["default"] = '100%';
           return (0,external_vue_namespaceObject.createVNode)(external_vue_namespaceObject.Fragment, null, [(0,external_vue_namespaceObject.createVNode)("div", {
             "class": "".concat(resolveClassName('sideslider-header'))
           }, [(0,external_vue_namespaceObject.createVNode)("div", {
-            "class": "".concat(resolveClassName('sideslider-close'), " ").concat(props.direction),
-            "onClick": function onClick() {
-              return handleClose();
-            }
-          }, null), (0,external_vue_namespaceObject.createVNode)("div", {
-            "class": "".concat(resolveClassName('sideslider-title'), " ").concat(props.direction)
+            "class": "".concat(resolveClassName('sideslider-close')),
+            "onClick": handleClose
+          }, [props.direction === 'left' ? (0,external_vue_namespaceObject.createVNode)(icon_namespaceObject.AngleLeft, null, null) : (0,external_vue_namespaceObject.createVNode)(icon_namespaceObject.AngleRight, null, null)]), (0,external_vue_namespaceObject.createVNode)("div", {
+            "class": "".concat(resolveClassName('sideslider-title'))
           }, [(_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() {
@@ -653,11 +667,22 @@ sliderPops.height["default"] = '100%';
           }
         });
       }
-      return (0,external_vue_namespaceObject.createVNode)(modal_namespaceObject["default"], (0,external_vue_namespaceObject.mergeProps)({
-        "ref": refRoot
-      }, props, {
-        "class": _defineProperty(_defineProperty({}, resolveClassName('sideslider'), true), resolveClassName('sideslider-wrapper'), true),
+      var inheritAttrs = _objectSpread({}, attrs);
+      if (instance.vnode.scopeId) {
+        inheritAttrs[instance.vnode.scopeId] = '';
+      }
+      return (0,external_vue_namespaceObject.createVNode)(modal_namespaceObject["default"], (0,external_vue_namespaceObject.mergeProps)(inheritAttrs, {
+        "class": _defineProperty(_defineProperty({}, resolveClassName('sideslider'), true), "is-position-".concat(props.direction), props.direction),
+        "isShow": props.isShow,
+        "width": props.width,
+        "animateType": props.direction,
         "closeIcon": false,
+        "escClose": props.escClose,
+        "quickClose": props.quickClose,
+        "showMask": props.showMask,
+        "transfer": props.transfer,
+        "renderDirective": props.renderDirective,
+        "zIndex": props.zIndex,
         "onHidden": handleHidden,
         "onShown": handleShown,
         "onClose": handleClose

package/lib/sideslider/sideslider.css

@@ -1,122 +1,53 @@
-.bk-sideslider {
-  position: fixed;
-  top: 0;
+.bk-sideslider.is-position-right .bk-modal-wrapper {
   right: 0;
-  bottom: 0;
+}
+.bk-sideslider.is-position-left .bk-modal-wrapper {
   left: 0;
 }
+.bk-sideslider.is-position-left .bk-sideslider-header {
+  flex-direction: row-reverse;
+}
 .bk-sideslider .bk-modal-wrapper {
-  position: absolute;
+  position: fixed;
   top: 0;
   bottom: 0;
-  left: auto;
-  transform: initial;
-}
-.bk-sideslider .bk-modal-wrapper.scroll-able .bk-modal-content {
-  overflow: auto;
 }
 .bk-sideslider .bk-modal-footer.is-fixed .bk-sideslider-footer {
-  height: 54px;
   margin: 0;
-  border-top: 1px solid transparent;
+  background: #fafbfd;
+  box-shadow: 0 -1px 0 0 #dcdee5;
   box-shadow: rgba(0, 0, 0, 0.06) 0 -2px 4px 0;
 }
 .bk-sideslider-header {
-  width: 100%;
+  display: flex;
   height: 52px;
   background: #fff;
   border-bottom: 1px solid #dcdee5;
 }
 .bk-sideslider-close {
-  position: absolute;
-  top: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
   width: 30px;
-  height: 52px;
-  font-size: 24px;
-  line-height: 52px;
+  font-size: 26px;
   color: #fff;
-  text-align: center;
   cursor: pointer;
   background-color: #3a84ff;
 }
-.bk-sideslider-close.right {
-  left: 0;
-}
-.bk-sideslider-close.right::before {
-  top: 50%;
-  left: 50%;
-  display: inline-block;
-  width: 8px;
-  height: 8px;
-  border-top: solid 2px #fff;
-  border-right: solid 2px #fff;
-  content: '';
-  transform: translate(-50%, -50%) rotate(45deg);
-}
-.bk-sideslider-close.left {
-  right: 0;
-}
-.bk-sideslider-close.left::before {
-  top: 50%;
-  left: 50%;
-  display: inline-block;
-  width: 8px;
-  height: 8px;
-  border-top: solid 2px #fff;
-  border-left: solid 2px #fff;
-  content: '';
-  transform: translate(50%, -50%) rotate(-45deg);
-}
 .bk-sideslider-title {
   display: flex;
-  height: 52px;
-  padding-left: 30px;
+  padding-left: 16px;
   font-size: 16px;
   color: #313238;
   align-items: center;
-}
-.bk-sideslider-title.right {
-  width: 100%;
-  padding: 0 0 0 46px;
+  flex: 1;
 }
 .bk-sideslider-footer {
   display: flex;
   width: 100%;
-  height: 54px;
+  height: 48px;
   padding: 0 24px;
   margin-top: 24px;
   background: #fff;
   align-items: center;
 }
-/* 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

@@ -1,4 +1,9 @@
 declare const _default: import("vue").DefineComponent<{
+    title: import("vue-types").VueTypeValidableDef<string> & {
+        default: string;
+    } & {
+        default: string;
+    };
     direction: {
         type: StringConstructor;
         default: string;
@@ -9,18 +14,8 @@ declare const _default: import("vue").DefineComponent<{
     } & {
         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;
@@ -40,17 +35,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;
     } & {
@@ -60,14 +44,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;
-    };
-    title: import("vue-types").VueTypeValidableDef<string> & {
-        default: string;
-    } & {
-        default: string;
-    };
     animateType: import("vue-types").VueTypeValidableDef<string> & {
         default: string;
     } & {
@@ -77,30 +53,18 @@ 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">;
-    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;
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("hidden" | "shown" | "closed" | "update:isShow" | "animation-end")[], "hidden" | "shown" | "closed" | "update:isShow" | "animation-end", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    title: import("vue-types").VueTypeValidableDef<string> & {
+        default: string;
     } & {
-        default: number;
+        default: string;
     };
-}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("hidden" | "shown" | "closed" | "update:isShow" | "animation-end")[], "hidden" | "shown" | "closed" | "update:isShow" | "animation-end", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     direction: {
         type: StringConstructor;
         default: string;
@@ -111,18 +75,8 @@ declare const _default: import("vue").DefineComponent<{
     } & {
         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;
@@ -142,17 +96,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;
     } & {
@@ -162,14 +105,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;
-    };
-    title: import("vue-types").VueTypeValidableDef<string> & {
-        default: string;
-    } & {
-        default: string;
-    };
     animateType: import("vue-types").VueTypeValidableDef<string> & {
         default: string;
     } & {
@@ -179,29 +114,12 @@ 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">;
-    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?: (...args: any[]) => any;
     onShown?: (...args: any[]) => any;
@@ -210,26 +128,17 @@ declare const _default: import("vue").DefineComponent<{
     "onAnimation-end"?: (...args: any[]) => any;
 }, {
     title: string;
-    width: string | number;
-    height: string | number;
-    maxHeight: string;
-    extCls: string | unknown[];
     top: string;
     left: string;
     isShow: boolean;
-    draggable: boolean;
     transfer: string | boolean | HTMLElement;
     direction: string;
     renderDirective: "show" | "if";
-    scrollable: boolean;
+    fullscreen: boolean;
     showMask: boolean;
     closeIcon: boolean;
     escClose: boolean;
-    fullscreen: boolean;
     quickClose: boolean;
     animateType: string;
-    multiInstance: boolean;
-    bodyClass: string | unknown[];
-    hiddenDelay: number;
 }, {}>;
 export default _default;