bkui-vue 2.0.2-beta.51 → 2.0.2-beta.53

package/lib/cascader/index.js

@@ -14,6 +14,7 @@ import * as __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_select_1a0d1ad7__ from "../se
 import * as __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_tag_d74826be__ from "../tag";
 import "../tag/tag.less";
 import * as __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_tag_input_bee9f515__ from "../tag-input";
+import * as __WEBPACK_EXTERNAL_MODULE_lodash_merge_cf99375a__ from "lodash/merge";
 import * as __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_checkbox_13b1cb4a__ from "../checkbox";
 import "../checkbox/checkbox.less";
 /******/ var __webpack_modules__ = ({
@@ -1571,6 +1572,10 @@ const tag_less_namespaceObject = tag_less_x({  });
 var tag_input_x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
 var tag_input_y = x => () => x
 const tag_input_namespaceObject = tag_input_x({ ["useTagsOverflow"]: () => __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_tag_input_bee9f515__.useTagsOverflow });
+;// CONCATENATED MODULE: external "lodash/merge"
+var merge_x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
+var merge_y = x => () => x
+const merge_namespaceObject = merge_x({ ["default"]: () => __WEBPACK_EXTERNAL_MODULE_lodash_merge_cf99375a__["default"] });
 ;// CONCATENATED MODULE: external "../checkbox"
 var checkbox_x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
 var checkbox_y = x => () => x
@@ -1941,15 +1946,20 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
     };
     return (0,external_vue_.createVNode)("div", {
       "class": this.resolveClassName('cascader-panel-wrapper')
-    }, [this.isFiltering ? searchPanelRender() : this.menus.list.map(function (menu) {
+    }, [this.isFiltering ? searchPanelRender() : this.menus.list.map(function (menu, index) {
+      var _this$$slots$panel, _this$$slots;
       return (0,external_vue_.createVNode)("ul", {
         "style": {
           height: _this.panelHeight,
           width: _this.panelWidth
         },
         "class": [_this.resolveClassName('cascader-panel'), _this.resolveClassName('scroll-y')]
-      }, [menu.length ? menu.map(function (node) {
-        var _this$$slots$default, _this$$slots;
+      }, [(_this$$slots$panel = (_this$$slots = _this.$slots).panel) === null || _this$$slots$panel === void 0 ? void 0 : _this$$slots$panel.call(_this$$slots, {
+        nodes: menu,
+        level: index,
+        activePath: _this.activePath
+      }), menu.length ? menu.map(function (node) {
+        var _this$$slots$default, _this$$slots2;
         return (0,external_vue_.createVNode)("li", (0,external_vue_.mergeProps)({
           "class": [_this.resolveClassName('cascader-node'), {
             'is-selected': _this.isNodeInPath(node)
@@ -1969,7 +1979,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
           "onChange": function onChange(val) {
             return _this.checkNode(node, !!val);
           }
-        }, null), (_this$$slots$default = (_this$$slots = _this.$slots)["default"]) === null || _this$$slots$default === void 0 ? void 0 : _this$$slots$default.call(_this$$slots, {
+        }, null), (_this$$slots$default = (_this$$slots2 = _this.$slots)["default"]) === null || _this$$slots$default === void 0 ? void 0 : _this$$slots$default.call(_this$$slots2, {
           node: node,
           data: node.data
         }), !node.isLeaf ? _this.iconRender(node) : '']);
@@ -2398,6 +2408,7 @@ var Store = /*#__PURE__*/function () {
 
 
 
+
 /**
  * Cascader 组件
  * 用于展示级联选择器，支持多选、单选、搜索、远程加载等功能。
@@ -2426,6 +2437,7 @@ var Store = /*#__PURE__*/function () {
     childrenKey: shared_.PropTypes.string.def('children'),
     separator: shared_.PropTypes.string.def('/'),
     limitOneLine: shared_.PropTypes.bool.def(false),
+    popoverOptions: Object,
     extCls: shared_.PropTypes.string.def(''),
     filterMethod: shared_.PropTypes.func,
     scrollHeight: shared_.PropTypes.oneOfType([shared_.PropTypes.number, shared_.PropTypes.string]).def(216),
@@ -2787,24 +2799,27 @@ var Store = /*#__PURE__*/function () {
         _this.multiple ? null : (0,external_vue_.createVNode)("span", null, [_this.displayText])
       );
     };
+    /** popover 基础配置 */
+    var basePopoverOptions = (0,merge_namespaceObject["default"])({
+      always: this.isAlways,
+      arrow: false,
+      boundary: 'body',
+      disabled: this.disabled,
+      hideIgnoreReference: true,
+      offset: 4,
+      placement: 'bottom-start',
+      referenceCls: this.resolveClassName('cascader-popover-reference'),
+      theme: "light ".concat(this.resolveClassName('cascader-popover')),
+      trigger: 'click'
+    }, this.popoverOptions);
     // 定义popoverRender函数，用于渲染弹出框
     var popoverRender = function popoverRender() {
-      return (0,external_vue_.createVNode)(popover_["default"], {
+      return (0,external_vue_.createVNode)(popover_["default"], (0,external_vue_.mergeProps)({
         "ref": "popover",
         "class": _this.resolveClassName('cascader-popover-wrapper'),
-        "always": _this.isAlways,
-        "arrow": false,
-        "boundary": "body",
-        "disabled": _this.disabled,
-        "hideIgnoreReference": true,
-        "offset": 4,
-        "placement": "bottom-start",
-        "referenceCls": _this.resolveClassName('cascader-popover-reference'),
-        "theme": "light ".concat(_this.resolveClassName('cascader-popover')),
-        "trigger": "click",
         "onAfterHidden": _this.popoverChangeEmitter,
         "onAfterShow": _this.popoverChangeEmitter
-      }, {
+      }, basePopoverOptions), {
         "default": function _default() {
           return _this.$slots.trigger ? _this.$slots.trigger({
             selected: _this.modelValue,
@@ -2846,6 +2861,9 @@ var Store = /*#__PURE__*/function () {
               return _this.$slots["default"] ? _this.$slots["default"](scope) : (0,external_vue_.createVNode)("span", {
                 "class": _this.resolveClassName('cascader-node-name')
               }, [scope.node.name]);
+            },
+            panel: function panel(scope) {
+              return _this.$slots.panel ? _this.$slots.panel(scope) : null;
             }
           }), (_this$$slots$extensio = (_this$$slots = _this.$slots).extension) === null || _this$$slots$extensio === void 0 ? void 0 : _this$$slots$extensio.call(_this$$slots)]);
         }

package/lib/index.js

@@ -3,5 +3,5 @@ export * from './hooks';
 export { default } from './preset';
 export * from './config-provider';
 export * from './directives';
-export const version = "2.0.2-beta.51";
+export const version = "2.0.2-beta.53";
 window.__bkui_vue_version__ = version;

package/lib/modal/index.js

@@ -388,6 +388,13 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
         top: props.top
       };
     });
+    (0,external_vue_namespaceObject.watch)(function () {
+      return [props.zIndex];
+    }, function () {
+      if (/\d+/.test("".concat(props.zIndex))) {
+        zIndex.value = props.zIndex;
+      }
+    });
     (0,external_vue_namespaceObject.watch)(function () {
       return props.isShow;
     }, function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bkui-vue",
-  "version": "2.0.2-beta.51",
+  "version": "2.0.2-beta.53",
   "workspaces": [
     "packages/**",
     "scripts/cli",