bkui-vue 1.0.3-beta.41 → 1.0.3-beta.43

package/lib/sideslider/index.js

@@ -504,7 +504,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({ ["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 });
+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 });
 // EXTERNAL MODULE: ../../node_modules/@babel/runtime/regenerator/index.js
 var regenerator = __webpack_require__(2841);
 var regenerator_default = /*#__PURE__*/__webpack_require__.n(regenerator);
@@ -583,24 +583,21 @@ sliderPops.height["default"] = '100%';
   setup: function setup(props, _ref) {
     var slots = _ref.slots,
       emit = _ref.emit;
+    var refRoot = (0,external_vue_namespaceObject.ref)(null);
     var handleClose = /*#__PURE__*/function () {
       var _ref2 = _asyncToGenerator( /*#__PURE__*/regenerator_default().mark(function _callee() {
         return regenerator_default().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               // 这里无需处理 beforeClose，在 modal 中会处理
-              // let shouldClose = true;
-              // if (typeof props.beforeClose === 'function') {
-              //   shouldClose = await props.beforeClose();
-              // }
-              // if (shouldClose) {
               emit('update:isShow', false);
               emit('closed');
               setTimeout(function () {
+                var _refRoot$value, _refRoot$value$close;
                 // 有动画，推迟发布事件
                 emit('animation-end');
-              }, 250);
-              // }
+                (_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 "end":
               return _context.stop();
@@ -634,15 +631,17 @@ sliderPops.height["default"] = '100%';
           }, [(0,external_vue_namespaceObject.createVNode)("div", {
             "class": "".concat(resolveClassName('sideslider-close'), " ").concat(props.direction),
             "onClick": function onClick() {
-              handleClose();
+              return handleClose();
             }
           }, null), (0,external_vue_namespaceObject.createVNode)("div", {
             "class": "".concat(resolveClassName('sideslider-title'), " ").concat(props.direction)
           }, [(_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() {
-          var _slots$default, _slots$default2;
-          return (_slots$default = (_slots$default2 = slots["default"]) === null || _slots$default2 === void 0 ? void 0 : _slots$default2.call(slots)) !== null && _slots$default !== void 0 ? _slots$default : 'Content';
+          var _slots$default;
+          return (0,external_vue_namespaceObject.createVNode)("div", {
+            "class": "".concat(resolveClassName('sideslider-content'))
+          }, [(_slots$default = slots["default"]) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots)]);
         },
         footer: function footer() {
           if (slots.footer) {
@@ -653,14 +652,11 @@ sliderPops.height["default"] = '100%';
           return null;
         }
       };
-      var className = resolveClassName('sideslider-wrapper');
-      var bodyClass = props.scrollable ? 'scroll-able' : '';
-      var maxHeight = slots.footer ? 'calc(100vh - 106px)' : 'calc(100vh - 52px)';
-      return (0,external_vue_namespaceObject.createVNode)(modal_namespaceObject["default"], (0,external_vue_namespaceObject.mergeProps)(props, {
-        "class": className,
-        "maxHeight": maxHeight,
-        "extCls": props.extCls,
-        "bodyClass": bodyClass,
+      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),
+        "closeIcon": false,
         "onHidden": handleHidden,
         "onShown": handleShown,
         "onClose": handleClose

package/lib/sideslider/sideslider.css

@@ -5,56 +5,29 @@
   bottom: 0;
   left: 0;
 }
-/* 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;
-  }
-}
-.bk-modal-ctx.bk-sideslider-wrapper .bk-modal-wrapper {
+.bk-sideslider .bk-modal-wrapper {
   position: absolute;
   top: 0;
   bottom: 0;
   left: auto;
   transform: initial;
 }
-.bk-modal-ctx.bk-sideslider-wrapper .bk-modal-wrapper.scroll-able .bk-modal-content {
+.bk-sideslider .bk-modal-wrapper.scroll-able .bk-modal-content {
   overflow: auto;
-  height: 100%;
 }
-.bk-modal-ctx.bk-sideslider-wrapper .bk-modal-wrapper .bk-sideslider-header {
+.bk-sideslider .bk-modal-footer.is-fixed .bk-sideslider-footer {
+  height: 54px;
+  margin: 0;
+  border-top: 1px solid transparent;
+  box-shadow: rgba(0, 0, 0, 0.06) 0 -2px 4px 0;
+}
+.bk-sideslider-header {
   width: 100%;
   height: 52px;
   background: #fff;
   border-bottom: 1px solid #dcdee5;
 }
-.bk-modal-ctx.bk-sideslider-wrapper .bk-modal-wrapper .bk-sideslider-header .bk-sideslider-close {
+.bk-sideslider-close {
   position: absolute;
   top: 0;
   width: 30px;
@@ -66,10 +39,10 @@
   cursor: pointer;
   background-color: #3a84ff;
 }
-.bk-modal-ctx.bk-sideslider-wrapper .bk-modal-wrapper .bk-sideslider-header .bk-sideslider-close.right {
+.bk-sideslider-close.right {
   left: 0;
 }
-.bk-modal-ctx.bk-sideslider-wrapper .bk-modal-wrapper .bk-sideslider-header .bk-sideslider-close.right::before {
+.bk-sideslider-close.right::before {
   top: 50%;
   left: 50%;
   display: inline-block;
@@ -80,10 +53,10 @@
   content: '';
   transform: translate(-50%, -50%) rotate(45deg);
 }
-.bk-modal-ctx.bk-sideslider-wrapper .bk-modal-wrapper .bk-sideslider-header .bk-sideslider-close.left {
+.bk-sideslider-close.left {
   right: 0;
 }
-.bk-modal-ctx.bk-sideslider-wrapper .bk-modal-wrapper .bk-sideslider-header .bk-sideslider-close.left::before {
+.bk-sideslider-close.left::before {
   top: 50%;
   left: 50%;
   display: inline-block;
@@ -94,7 +67,7 @@
   content: '';
   transform: translate(50%, -50%) rotate(-45deg);
 }
-.bk-modal-ctx.bk-sideslider-wrapper .bk-modal-wrapper .bk-sideslider-header .bk-sideslider-title {
+.bk-sideslider-title {
   display: flex;
   height: 52px;
   padding-left: 30px;
@@ -102,16 +75,53 @@
   color: #313238;
   align-items: center;
 }
-.bk-modal-ctx.bk-sideslider-wrapper .bk-modal-wrapper .bk-sideslider-header .bk-sideslider-title.right {
+.bk-sideslider-title.right {
   width: 100%;
   padding: 0 0 0 46px;
 }
-.bk-modal-ctx.bk-sideslider-wrapper .bk-modal-wrapper .bk-sideslider-footer {
+.bk-sideslider-content {
+  padding-right: 24px;
+  padding-left: 24px;
+  overflow-y: scroll;
+}
+.bk-sideslider-footer {
   display: flex;
   width: 100%;
   height: 54px;
+  padding: 0 24px;
+  margin-top: 24px;
   background: #fff;
-  border-top: 1px solid transparent;
   align-items: center;
-  box-shadow: rgba(0, 0, 0, 0.06) 0 -2px 4px 0;
+}
+/* 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

@@ -95,6 +95,11 @@ declare const _default: import("vue").DefineComponent<{
     top: import("vue-types").VueTypeValidableDef<string> & {
         default: string;
     };
+    hiddenDelay: import("vue-types").VueTypeValidableDef<number> & {
+        default: 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<{
     direction: {
         type: StringConstructor;
@@ -192,6 +197,11 @@ declare const _default: import("vue").DefineComponent<{
     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;
@@ -211,14 +221,15 @@ declare const _default: import("vue").DefineComponent<{
     transfer: string | boolean | HTMLElement;
     direction: string;
     renderDirective: "show" | "if";
-    quickClose: boolean;
     scrollable: boolean;
     showMask: boolean;
     closeIcon: boolean;
     escClose: boolean;
     fullscreen: boolean;
+    quickClose: boolean;
     animateType: string;
     multiInstance: boolean;
     bodyClass: string | unknown[];
+    hiddenDelay: number;
 }, {}>;
 export default _default;

package/lib/sideslider/sideslider.less

@@ -6,6 +6,112 @@
   right: 0;
   bottom: 0;
   left: 0;
+
+  .@{bk-prefix}-modal-wrapper {
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: auto;
+    transform: initial;
+
+    &.scroll-able {
+      .@{bk-prefix}-modal-content {
+        overflow: auto;
+      }
+    }
+  }
+  .@{bk-prefix}-modal-footer {
+    &.is-fixed {
+      .@{bk-prefix}-sideslider-footer {
+        height: 54px;
+        margin: 0;;
+        border-top: 1px solid transparent;
+        box-shadow: rgb(0 0 0 / 6%) 0 -2px 4px 0;
+      }
+    }
+  }
+}
+
+.@{bk-prefix}-sideslider-header {
+  width: 100%;
+  height: 52px;
+  background: #fff;
+  border-bottom: 1px solid #dcdee5;
+}
+
+.@{bk-prefix}-sideslider-close {
+  position: absolute;
+  top: 0;
+  width: 30px;
+  height: 52px;
+  font-size: 24px;
+  line-height: 52px;
+  color: #fff;
+  text-align: center;
+  cursor: pointer;
+  background-color: @primary-color;
+
+  &.right {
+    left: 0;
+
+    &::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);
+    }
+  }
+
+  &.left {
+    right: 0;
+
+    &::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-prefix}-sideslider-title {
+  display: flex;
+  height: 52px;
+  padding-left: 30px;
+  font-size: 16px;
+  color: #313238;
+  align-items: center;
+
+  &.right {
+    width: 100%;
+    padding: 0 0 0 30+16px;
+  }
+}
+
+.@{bk-prefix}-sideslider-content {
+  padding-right: 24px;
+  padding-left: 24px;
+  overflow-y: scroll;
+}
+
+.@{bk-prefix}-sideslider-footer {
+  display: flex;
+  width: 100%;
+  height: 54px;
+  padding: 0 24px;
+  margin-top: 24px;
+  background: #fff;
+  align-items: center;
 }
 
 /* fade-center */
@@ -49,101 +155,5 @@
   }
 }
 
-.@{bk-prefix}-modal-ctx {
-  &.@{bk-prefix}-sideslider-wrapper {
-    .@{bk-prefix}-modal-wrapper {
-      position: absolute;
-      top: 0;
-      bottom: 0;
-      left: auto;
-      transform: initial;
-
-      &.scroll-able {
-        .@{bk-prefix}-modal-content {
-          overflow: auto;
-          height: 100%;
-        }
-      }
 
-      .@{bk-prefix}-sideslider-header {
-        width: 100%;
-        height: 52px;
-        background: #fff;
-        border-bottom: 1px solid #dcdee5;
-
-        .@{bk-prefix}-sideslider-close {
-          position: absolute;
-          top: 0;
-          width: 30px;
-          height: 52px;
-          font-size: 24px;
-          line-height: 52px;
-          color: #fff;
-          text-align: center;
-          cursor: pointer;
-          background-color: @primary-color;
-
-          &.right {
-            left: 0;
-
-            &::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);
-            }
-          }
-
-          &.left {
-            right: 0;
-
-            &::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-prefix}-sideslider-title {
-          display: flex;
-          height: 52px;
-          padding-left: 30px;
-          font-size: 16px;
-          color: #313238;
-          align-items: center;
-
-          &.right {
-            width: 100%;
-            padding: 0 0 0 30+16px;
-          }
-        }
-      }
-
-      .@{bk-prefix}-sideslider-footer {
-        display: flex;
-        width: 100%;
-        height: 54px;
-        background: #fff;
-        border-top: 1px solid transparent;
-        align-items: center;
-        box-shadow: rgb(0 0 0 / 6%) 0 -2px 4px 0;
-      }
-    }
-
-  }
-}
 

package/lib/sideslider/sideslider.variable.css

@@ -134,56 +134,29 @@
   bottom: 0;
   left: 0;
 }
-/* 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;
-  }
-}
-.bk-modal-ctx.bk-sideslider-wrapper .bk-modal-wrapper {
+.bk-sideslider .bk-modal-wrapper {
   position: absolute;
   top: 0;
   bottom: 0;
   left: auto;
   transform: initial;
 }
-.bk-modal-ctx.bk-sideslider-wrapper .bk-modal-wrapper.scroll-able .bk-modal-content {
+.bk-sideslider .bk-modal-wrapper.scroll-able .bk-modal-content {
   overflow: auto;
-  height: 100%;
 }
-.bk-modal-ctx.bk-sideslider-wrapper .bk-modal-wrapper .bk-sideslider-header {
+.bk-sideslider .bk-modal-footer.is-fixed .bk-sideslider-footer {
+  height: 54px;
+  margin: 0;
+  border-top: 1px solid transparent;
+  box-shadow: rgba(0, 0, 0, 0.06) 0 -2px 4px 0;
+}
+.bk-sideslider-header {
   width: 100%;
   height: 52px;
   background: #fff;
   border-bottom: 1px solid #dcdee5;
 }
-.bk-modal-ctx.bk-sideslider-wrapper .bk-modal-wrapper .bk-sideslider-header .bk-sideslider-close {
+.bk-sideslider-close {
   position: absolute;
   top: 0;
   width: 30px;
@@ -195,10 +168,10 @@
   cursor: pointer;
   background-color: var(--primary-color);
 }
-.bk-modal-ctx.bk-sideslider-wrapper .bk-modal-wrapper .bk-sideslider-header .bk-sideslider-close.right {
+.bk-sideslider-close.right {
   left: 0;
 }
-.bk-modal-ctx.bk-sideslider-wrapper .bk-modal-wrapper .bk-sideslider-header .bk-sideslider-close.right::before {
+.bk-sideslider-close.right::before {
   top: 50%;
   left: 50%;
   display: inline-block;
@@ -209,10 +182,10 @@
   content: '';
   transform: translate(-50%, -50%) rotate(45deg);
 }
-.bk-modal-ctx.bk-sideslider-wrapper .bk-modal-wrapper .bk-sideslider-header .bk-sideslider-close.left {
+.bk-sideslider-close.left {
   right: 0;
 }
-.bk-modal-ctx.bk-sideslider-wrapper .bk-modal-wrapper .bk-sideslider-header .bk-sideslider-close.left::before {
+.bk-sideslider-close.left::before {
   top: 50%;
   left: 50%;
   display: inline-block;
@@ -223,7 +196,7 @@
   content: '';
   transform: translate(50%, -50%) rotate(-45deg);
 }
-.bk-modal-ctx.bk-sideslider-wrapper .bk-modal-wrapper .bk-sideslider-header .bk-sideslider-title {
+.bk-sideslider-title {
   display: flex;
   height: 52px;
   padding-left: 30px;
@@ -231,16 +204,53 @@
   color: #313238;
   align-items: center;
 }
-.bk-modal-ctx.bk-sideslider-wrapper .bk-modal-wrapper .bk-sideslider-header .bk-sideslider-title.right {
+.bk-sideslider-title.right {
   width: 100%;
   padding: 0 0 0 46px;
 }
-.bk-modal-ctx.bk-sideslider-wrapper .bk-modal-wrapper .bk-sideslider-footer {
+.bk-sideslider-content {
+  padding-right: 24px;
+  padding-left: 24px;
+  overflow-y: scroll;
+}
+.bk-sideslider-footer {
   display: flex;
   width: 100%;
   height: 54px;
+  padding: 0 24px;
+  margin-top: 24px;
   background: #fff;
-  border-top: 1px solid transparent;
   align-items: center;
-  box-shadow: rgba(0, 0, 0, 0.06) 0 -2px 4px 0;
+}
+/* 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/table/components/table-column.d.ts

@@ -271,7 +271,7 @@ declare const _default: import("vue").DefineComponent<{
     }): {};
     rsolveIndexedColumn(): boolean;
     setNodeUid(): void;
-    getNodeUid(ctx: any): any;
+    getNodeCtxUid(ctx: any): any;
     updateColumnDefineByParent(): void;
     unmountColumn(): void;
 }, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<ExtractPropTypes<{

package/lib/table/index.d.ts

@@ -1484,7 +1484,7 @@ declare const BkTable: {
         }): {};
         rsolveIndexedColumn(): boolean;
         setNodeUid(): void;
-        getNodeUid(ctx: any): any;
+        getNodeCtxUid(ctx: any): any;
         updateColumnDefineByParent(): void;
         unmountColumn(): void;
     }, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<ExtractPropTypes<{