diff --git a/babel.config.js b/babel.config.js
index 2a7416a06..99ada074d 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -20,7 +20,7 @@ module.exports = function(api) {
// "debug": true
}],
"@babel/preset-typescript",
- // "@babel/preset-react"
+ "@babel/preset-react"
],
"plugins": [
["@babel/plugin-transform-runtime", {
diff --git a/components/cascader/index.ts b/components/cascader/index.ts
index 158abd937..7d05403d5 100644
--- a/components/cascader/index.ts
+++ b/components/cascader/index.ts
@@ -76,6 +76,7 @@ export class Cascader<
protected hasValue() {
const {value} = this.get();
const has = super.hasValue();
+
if (has && !(value as V[]).length) return false;
return has;
}
diff --git a/components/dropdown/demos/tooltip.md b/components/dropdown/demos/tooltip.md
index 6be67ac16..356c919bd 100644
--- a/components/dropdown/demos/tooltip.md
+++ b/components/dropdown/demos/tooltip.md
@@ -3,10 +3,7 @@ title: 菜单项添加Tooltip提示
order: 5
---
-使用`Tooltip`包裹需要提示的菜单项`DropdownItem`即可添加提示,需要注意的是:
-在Intact下,当用`Tooltip`包裹触发器时,需要使用另外的元素将它包裹起来,因为`Tooltip`实际
-返回的是两个元素,一个是它的触发器,一个是提示内容层。而`Dropdown`的触发器只能
-接受一个元素,所以需要另外再包起来(如本例中`item 4`)。
+使用`Tooltip`包裹需要提示的菜单项`DropdownItem`即可添加提示
```vdt
import {Dropdown, DropdownMenu, DropdownItem, Button, Tooltip} from 'kpc';
@@ -23,11 +20,9 @@ import {Dropdown, DropdownMenu, DropdownItem, Button, Tooltip} from 'kpc';
item 3
-
-
- item 4
-
-
+
+ item 4
+
item 1
diff --git a/components/dropdown/dropdown.ts b/components/dropdown/dropdown.ts
index 65084bbdf..9ff543817 100644
--- a/components/dropdown/dropdown.ts
+++ b/components/dropdown/dropdown.ts
@@ -231,7 +231,9 @@ export class Dropdown<
private callOriginalCallback(name: string, e: MouseEvent) {
const callback = this.triggerProps[name];
+ const callbackOnDropdown = this.get(name);
if (isFunction(callback)) callback(e);
+ if (isFunction(callbackOnDropdown)) callbackOnDropdown(e);
}
private normalizeTriggerProps(props: any) {
diff --git a/components/layout/demos/aside.md b/components/layout/demos/aside.md
index 2ef868db5..07da12298 100644
--- a/components/layout/demos/aside.md
+++ b/components/layout/demos/aside.md
@@ -33,7 +33,7 @@ import {