bkui-vue 1.0.3-beta.67.dialog.2 → 1.0.3-beta.67.dialog.4

package/lib/info-box/index.js

@@ -432,7 +432,7 @@ const shared_namespaceObject = x({ ["withInstall"]: () => __WEBPACK_EXTERNAL_MOD
 ;// 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({ ["createApp"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.createApp, ["createVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.createVNode, ["defineComponent"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent, ["h"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.h, ["reactive"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.reactive, ["ref"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.ref });
+const external_vue_namespaceObject = external_vue_x({ ["Fragment"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.Fragment, ["createApp"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.createApp, ["createVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.createVNode, ["defineComponent"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent, ["h"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.h, ["reactive"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.reactive, ["ref"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.ref });
 ;// CONCATENATED MODULE: ../../node_modules/@babel/runtime/helpers/esm/typeof.js
 function _typeof(o) {
   "@babel/helpers - typeof";
@@ -589,6 +589,7 @@ var genDefaultState = function genDefaultState() {
     title: undefined,
     subTitle: undefined,
     content: undefined,
+    footer: undefined,
     headerAlign: 'center',
     contentAlign: 'center',
     footerAlign: 'center',
@@ -597,7 +598,7 @@ var genDefaultState = function genDefaultState() {
     escClose: false,
     closeIcon: true,
     confirmText: '确定',
-    theme: 'primary',
+    theme: undefined,
     confirmButtonTheme: 'primary',
     cancelText: '',
     beforeClose: function beforeClose() {
@@ -749,6 +750,29 @@ var genDefaultState = function genDefaultState() {
         }
         return state.content;
       };
+      var renderFooter = function renderFooter() {
+        if ((0,isFunction_namespaceObject["default"])(state.footer)) {
+          return state.footer();
+        }
+        if (state.footer) {
+          return state.footer;
+        }
+        return (0,external_vue_namespaceObject.createVNode)(external_vue_namespaceObject.Fragment, null, [state.confirmText && (0,external_vue_namespaceObject.createVNode)(button_namespaceObject["default"], {
+          "loading": isLoading.value,
+          "theme": state.confirmButtonTheme,
+          "onClick": handleConfirm
+        }, {
+          "default": function _default() {
+            return [state.confirmText];
+          }
+        }), state.cancelText && (0,external_vue_namespaceObject.createVNode)(button_namespaceObject["default"], {
+          "onClick": handleCancel
+        }, {
+          "default": function _default() {
+            return [state.cancelText];
+          }
+        })]);
+      };
       return (0,external_vue_namespaceObject.createVNode)(modal_namespaceObject["default"], {
         "class": [resolveClassName('infobox'), state["class"]],
         "isShow": isShow.value,
@@ -779,21 +803,7 @@ var genDefaultState = function genDefaultState() {
         footer: function footer() {
           return (0,external_vue_namespaceObject.createVNode)("div", {
             "class": _defineProperty(_defineProperty({}, resolveClassName('infobox-footer'), true), "is-position-".concat(state.footerAlign), state.footerAlign)
-          }, [state.confirmText && (0,external_vue_namespaceObject.createVNode)(button_namespaceObject["default"], {
-            "loading": isLoading.value,
-            "theme": state.confirmButtonTheme,
-            "onClick": handleConfirm
-          }, {
-            "default": function _default() {
-              return [state.confirmText];
-            }
-          }), state.cancelText && (0,external_vue_namespaceObject.createVNode)(button_namespaceObject["default"], {
-            "onClick": handleCancel
-          }, {
-            "default": function _default() {
-              return [state.cancelText];
-            }
-          })]);
+          }, [renderFooter()]);
         },
         close: function close() {
           return (0,external_vue_namespaceObject.createVNode)(icon_namespaceObject.Error, {

package/lib/info-box/info-box.d.ts

@@ -9,6 +9,7 @@ export interface Props {
     title?: string | (() => VNode | string) | VNode;
     subTitle?: string | (() => VNode) | VNode;
     content?: string | (() => VNode) | VNode;
+    footer?: string | (() => VNode) | VNode;
     headerAlign?: 'left' | 'center' | 'right';
     footerAlign?: 'left' | 'center' | 'right';
     contentAlign?: 'left' | 'center' | 'right';

package/lib/modal/index.js

@@ -87,7 +87,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, ["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, ["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 });
 ;// 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
@@ -130,41 +130,38 @@ var useContentResize = function useContentResize(root, resizeTarget, props) {
     resolveClassName = _usePrefix.resolveClassName;
   var isContentScroll = (0,external_vue_namespaceObject.ref)(false);
   var contentStyles = (0,external_vue_namespaceObject.ref)({});
-  var observer;
-  var handleContentBoxChange = function handleContentBoxChange() {
-    var calcContentScroll = (0,throttle_namespaceObject["default"])(function () {
-      var _root$value$querySele = root.value.querySelector(".".concat(resolveClassName('modal-header'))).getBoundingClientRect(),
-        headerHeight = _root$value$querySele.height;
-      var _root$value$querySele2 = root.value.querySelector(".".concat(resolveClassName('modal-content'), " div")).getBoundingClientRect(),
-        contentHeight = _root$value$querySele2.height;
-      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;
-      if (isContentScroll.value || props.fullscreen) {
-        contentStyles.value = {
-          height: "".concat(windowInnerHeight - headerHeight - footerHeight, "px"),
-          overflow: 'auto',
-          'scrollbar-gutter': 'stable'
-        };
-        // fullscreen 时默认为 true
-        isContentScroll.value = true;
-      } else {
-        contentStyles.value = {};
-      }
-    }, 30);
-    observer = new ResizeObserver(function () {
-      calcContentScroll();
-    });
-    observer.observe(resizeTarget.value);
-    calcContentScroll();
-  };
+  var calcContentScroll = (0,throttle_namespaceObject["default"])(function () {
+    var _root$value$querySele = root.value.querySelector(".".concat(resolveClassName('modal-header'))).getBoundingClientRect(),
+      headerHeight = _root$value$querySele.height;
+    var _root$value$querySele2 = root.value.querySelector(".".concat(resolveClassName('modal-content'), " div")).getBoundingClientRect(),
+      contentHeight = _root$value$querySele2.height;
+    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;
+    if (isContentScroll.value || props.fullscreen) {
+      contentStyles.value = {
+        height: "".concat(windowInnerHeight - headerHeight - footerHeight, "px"),
+        overflow: 'auto',
+        'scrollbar-gutter': 'stable'
+      };
+      // fullscreen 时默认为 true
+      isContentScroll.value = true;
+    } else {
+      contentStyles.value = {};
+    }
+  }, 30);
   (0,external_vue_namespaceObject.watch)(function () {
     return props.isShow;
   }, function () {
+    var observer;
     if (props.isShow) {
-      setTimeout(function () {
-        handleContentBoxChange();
+      (0,external_vue_namespaceObject.nextTick)(function () {
+        observer = new ResizeObserver(function () {
+          calcContentScroll();
+        });
+        observer.observe(resizeTarget.value);
+        calcContentScroll();
       });
     } else {
       if (observer) {
@@ -175,6 +172,12 @@ var useContentResize = function useContentResize(root, resizeTarget, props) {
   }, {
     immediate: true
   });
+  (0,external_vue_namespaceObject.onMounted)(function () {
+    window.addEventListener('resize', calcContentScroll);
+  });
+  (0,external_vue_namespaceObject.onBeforeUnmount)(function () {
+    window.removeEventListener('resize', calcContentScroll);
+  });
   return {
     contentStyles: contentStyles,
     isContentScroll: isContentScroll

package/lib/slider/index.d.ts

@@ -98,6 +98,10 @@ declare const Slider: {
             type: FunctionConstructor;
             default: (value: number) => number;
         };
+        labelClick: {
+            type: (BooleanConstructor | FunctionConstructor)[];
+            default: boolean;
+        };
     }>> & {
         onChange?: (...args: any[]) => any;
         "onUpdate:modelValue"?: (...args: any[]) => any;
@@ -177,6 +181,10 @@ declare const Slider: {
             type: FunctionConstructor;
             default: (value: number) => number;
         };
+        labelClick: {
+            type: (BooleanConstructor | FunctionConstructor)[];
+            default: boolean;
+        };
     }>> & {
         onChange?: (...args: any[]) => any;
         "onUpdate:modelValue"?: (...args: any[]) => any;
@@ -199,6 +207,7 @@ declare const Slider: {
         formatterLabel: Function;
         formatterButtonLabel: Function;
         formatterTipLabel: Function;
+        labelClick: boolean | Function;
     }, true, {}, {}, {
         P: {};
         B: {};
@@ -280,6 +289,10 @@ declare const Slider: {
             type: FunctionConstructor;
             default: (value: number) => number;
         };
+        labelClick: {
+            type: (BooleanConstructor | FunctionConstructor)[];
+            default: boolean;
+        };
     }>> & {
         onChange?: (...args: any[]) => any;
         "onUpdate:modelValue"?: (...args: any[]) => any;
@@ -304,6 +317,7 @@ declare const Slider: {
         formatterLabel: Function;
         formatterButtonLabel: Function;
         formatterTipLabel: Function;
+        labelClick: boolean | Function;
     }>;
     __isFragment?: never;
     __isTeleport?: never;
@@ -382,6 +396,10 @@ declare const Slider: {
         type: FunctionConstructor;
         default: (value: number) => number;
     };
+    labelClick: {
+        type: (BooleanConstructor | FunctionConstructor)[];
+        default: boolean;
+    };
 }>> & {
     onChange?: (...args: any[]) => any;
     "onUpdate:modelValue"?: (...args: any[]) => any;
@@ -406,5 +424,6 @@ declare const Slider: {
     formatterLabel: Function;
     formatterButtonLabel: Function;
     formatterTipLabel: Function;
+    labelClick: boolean | Function;
 }, {}, string, {}> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps & import("vue").Plugin<any[]>;
 export default Slider;

package/lib/slider/index.js

@@ -817,7 +817,11 @@ var off = function off(element, event, handler) {
       "default": function _default(value) {
         return value;
       }
-    } // 自定义tip格式
+    },
+    labelClick: {
+      type: [Boolean, Function],
+      "default": false
+    }
   },
   emits: ['update:modelValue', 'change'],
   setup: function setup(props, _ref) {
@@ -1155,6 +1159,30 @@ var off = function off(element, event, handler) {
     };
     var _usePrefix = (0,config_provider_namespaceObject.usePrefix)(),
       resolveClassName = _usePrefix.resolveClassName;
+    var handleStepLabelClick = function handleStepLabelClick(e, step) {
+      var _ref3, _step$stepWidth;
+      var percent = (_ref3 = (_step$stepWidth = step.stepWidth) !== null && _step$stepWidth !== void 0 ? _step$stepWidth : step.percent) !== null && _ref3 !== void 0 ? _ref3 : step;
+      if (props.labelClick) {
+        e.stopPropagation();
+        e.stopImmediatePropagation();
+        e.preventDefault();
+        var fnResult;
+        if (typeof props.labelClick === 'function') {
+          var args = {
+            percent: percent,
+            step: step
+          };
+          fnResult = props.labelClick(e, args);
+          if (fnResult === false) {
+            return;
+          }
+        }
+        percent = typeof fnResult === 'number' ? fnResult : percent;
+        console.log('handleStepLabelClick', percent);
+        setPosition(percent);
+        return;
+      }
+    };
     var renderDom = function renderDom() {
       var _slots$start, _slots$end;
       return (0,external_vue_namespaceObject.createVNode)("div", {
@@ -1178,7 +1206,10 @@ var off = function off(element, event, handler) {
           "class": ["".concat(resolveClassName('slider-interval')), {
             vertical: props.vertical
           }],
-          "style": getIntervalStyle(interval)
+          "style": getIntervalStyle(interval),
+          "onClick": function onClick(e) {
+            return handleStepLabelClick(e, interval);
+          }
         }, null);
       }) : null, props.customContent ? customList.value.map(function (custom, index) {
         if (index === 0 || index === customList.value.length - 1) {
@@ -1189,7 +1220,10 @@ var off = function off(element, event, handler) {
           "class": ["".concat(resolveClassName('slider-interval')), {
             vertical: props.vertical
           }],
-          "style": getIntervalStyle(custom.percent)
+          "style": getIntervalStyle(custom.percent),
+          "onClick": function onClick(e) {
+            return handleStepLabelClick(e, custom);
+          }
         }, null);
       }) : undefined, props.showBetweenLabel || props.showIntervalLabel || props.customContent ? (0,external_vue_namespaceObject.createVNode)("div", {
         "class": ["".concat(resolveClassName('slider-labels')), props.vertical ? 'vertical' : 'horizontal']
@@ -1212,7 +1246,10 @@ var off = function off(element, event, handler) {
             return (0,external_vue_namespaceObject.createVNode)("div", {
               "class": ["".concat(resolveClassName('slider-label')), props.vertical ? 'vertical' : 'horizontal'],
               "key": index,
-              "style": getIntervalStyle(intervalLabel.stepWidth)
+              "style": getIntervalStyle(intervalLabel.stepWidth),
+              "onClick": function onClick(e) {
+                return handleStepLabelClick(e, intervalLabel);
+              }
             }, [intervalLabel.stepLabel]);
           });
         }
@@ -1221,7 +1258,10 @@ var off = function off(element, event, handler) {
             return (0,external_vue_namespaceObject.createVNode)("div", {
               "class": ["".concat(resolveClassName('slider-label')), props.vertical ? 'vertical' : 'horizontal'],
               "key": index,
-              "style": getIntervalStyle(item.percent)
+              "style": getIntervalStyle(item.percent),
+              "onClick": function onClick(e) {
+                return handleStepLabelClick(e, item);
+              }
             }, [item.label]);
           });
         }

package/lib/slider/slider.css

@@ -76,6 +76,20 @@
   border-radius: 100%;
   transform: translateX(-50%);
 }
+.bk-slider .bk-slider-interval:hover {
+  cursor: pointer;
+}
+.bk-slider .bk-slider-interval:hover::after {
+  content: '';
+  position: absolute;
+  left: -5px;
+  top: -4px;
+  width: 10px;
+  height: 10px;
+  border-radius: 50%;
+  background-color: #fff;
+  border: solid 1px #3a84ff;
+}
 .bk-slider .bk-slider-interval.vertical {
   left: 2px;
 }

package/lib/slider/slider.d.ts

@@ -99,6 +99,10 @@ declare const _default: import("vue").DefineComponent<{
         type: FunctionConstructor;
         default: (value: number) => number;
     };
+    labelClick: {
+        type: (BooleanConstructor | FunctionConstructor)[];
+        default: boolean;
+    };
 }, {
     renderDom: () => JSX.Element;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("change" | "update:modelValue")[], "change" | "update:modelValue", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
@@ -175,6 +179,10 @@ declare const _default: import("vue").DefineComponent<{
         type: FunctionConstructor;
         default: (value: number) => number;
     };
+    labelClick: {
+        type: (BooleanConstructor | FunctionConstructor)[];
+        default: boolean;
+    };
 }>> & {
     onChange?: (...args: any[]) => any;
     "onUpdate:modelValue"?: (...args: any[]) => any;
@@ -197,5 +205,6 @@ declare const _default: import("vue").DefineComponent<{
     formatterLabel: Function;
     formatterButtonLabel: Function;
     formatterTipLabel: Function;
+    labelClick: boolean | Function;
 }, {}>;
 export default _default;

package/lib/slider/slider.less

@@ -89,6 +89,21 @@
     border-radius: 100%;
     transform: translateX(-50%);
 
+    &:hover {
+      cursor: pointer;
+      &::after {
+        content: '';
+        position: absolute;
+        left: -5px;
+        top: -4px;
+        width: 10px;
+        height: 10px;
+        border-radius: 50%;
+        background-color: #fff;
+        border: solid 1px @primary-color;
+      }
+    }
+
     &.vertical {
       left: 2px;
     }

package/lib/slider/slider.variable.css

@@ -205,6 +205,20 @@
   border-radius: 100%;
   transform: translateX(-50%);
 }
+.bk-slider .bk-slider-interval:hover {
+  cursor: pointer;
+}
+.bk-slider .bk-slider-interval:hover::after {
+  content: '';
+  position: absolute;
+  left: -5px;
+  top: -4px;
+  width: 10px;
+  height: 10px;
+  border-radius: 50%;
+  background-color: #fff;
+  border: solid 1px var(--primary-color);
+}
 .bk-slider .bk-slider-interval.vertical {
   left: 2px;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bkui-vue",
-  "version": "1.0.3-beta.67.dialog.2",
+  "version": "1.0.3-beta.67.dialog.4",
   "workspaces": {
     "packages": [
       "packages/!(**.bak)*",