diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md index f101cea2a67..8aeeb88b1ab 100644 --- a/CHANGELOG.zh_CN.md +++ b/CHANGELOG.zh_CN.md @@ -1,3 +1,10 @@ +## Wip + +### 🐛 Bug Fixes + +- 修复 `TableAction`图标问题 +- 修复菜单折叠按钮丢失问题 + ## 2.0.0-rc.16 (2020-01-12) ### ✨ Refactor diff --git a/package.json b/package.json index 974aa5db37b..89583640ff6 100644 --- a/package.json +++ b/package.json @@ -96,7 +96,7 @@ "stylelint-order": "^4.1.0", "ts-node": "^9.1.0", "typescript": "^4.1.3", - "vite": "^2.0.0-beta.26", + "vite": "^2.0.0-beta.27", "vite-plugin-html": "^2.0.0-beta.5", "vite-plugin-mock": "^2.0.0-beta.3", "vite-plugin-purge-icons": "^0.5.1", diff --git a/src/components/Button/src/PopConfirmButton.vue b/src/components/Button/src/PopConfirmButton.vue index 2a9f633fd41..e1f15d70e8a 100644 --- a/src/components/Button/src/PopConfirmButton.vue +++ b/src/components/Button/src/PopConfirmButton.vue @@ -32,12 +32,13 @@ return popValues; }); return () => { - const Button = h(BasicButton, unref(getBindValues), extendSlots(slots)); + const values = omit(unref(getBindValues), 'icon'); + const Button = h(BasicButton, values, extendSlots(slots)); if (!props.enable) { return Button; } - return h(Popconfirm, omit(unref(getBindValues), 'icon'), { default: () => Button }); + return h(Popconfirm, values, { default: () => Button }); }; }, }); diff --git a/yarn.lock b/yarn.lock index d0a1bf9e731..65207f29e19 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7850,10 +7850,10 @@ vite-plugin-pwa@^0.3.6: pretty-bytes "^5.5.0" workbox-build "^6.0.2" -vite@^2.0.0-beta.26: - version "2.0.0-beta.26" - resolved "https://registry.npmjs.org/vite/-/vite-2.0.0-beta.26.tgz#70e2277003de609b218ddb33d740f76d01f01dc2" - integrity sha512-/OZ5X5nq9xV3UKO2x3Xl83RQM0DsRWsa4htaRyzZ6e+G5Z+SfMiUlveJctSoPJ3JjoIBm4bbDAe0rXM5Mt2tlw== +vite@^2.0.0-beta.27: + version "2.0.0-beta.27" + resolved "https://registry.npmjs.org/vite/-/vite-2.0.0-beta.27.tgz#a2e4b3a698e67c89fd963ff51ee5283ec564c65c" + integrity sha512-1fGPjSVE4MmCGVguFy7pPurCLnvHu4fJSzVjejd9GoFqCNie+JKCpe3KGsxIb9B8ot/aDd4ISCB0+fH1/01FUA== dependencies: esbuild "^0.8.26" postcss "^8.2.1"