From 7156e47c1813ec01594d9dff4a1e7d593f3c17db Mon Sep 17 00:00:00 2001 From: Vben Date: Mon, 8 Mar 2021 21:31:16 +0800 Subject: [PATCH] fix(table): ensure that the value of the table action is updated correctly close #301 #313 --- CHANGELOG.zh_CN.md | 4 + package.json | 2 +- src/components/Drawer/src/useDrawer.ts | 6 +- src/components/Modal/src/hooks/useModal.ts | 6 +- src/components/Tree/src/TreeHeader.vue | 37 +++++-- src/components/Tree/src/index.vue | 3 +- src/components/Tree/src/props.ts | 1 + src/views/demo/system/account/index.vue | 2 +- yarn.lock | 123 ++++----------------- 9 files changed, 67 insertions(+), 117 deletions(-) diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md index faac421a..d99c64b5 100644 --- a/CHANGELOG.zh_CN.md +++ b/CHANGELOG.zh_CN.md @@ -4,6 +4,10 @@ - 重构项目以解决循环依赖项导致的热更新问题 +### 🐛 Bug Fixes + +- 确保 `table action` 的值被正确更新 + ## 2.0.3 (2021-03-07) ### ✨ Features diff --git a/package.json b/package.json index 6f9d5ab8..595d9451 100644 --- a/package.json +++ b/package.json @@ -112,7 +112,7 @@ "vite-plugin-style-import": "^0.8.1", "vite-plugin-svg-icons": "^0.3.3", "vite-plugin-theme": "^0.4.8", - "vite-plugin-windicss": "0.6.11", + "vite-plugin-windicss": "0.7.0", "vue-eslint-parser": "^7.6.0", "yargs": "^16.2.0" }, diff --git a/src/components/Drawer/src/useDrawer.ts b/src/components/Drawer/src/useDrawer.ts index 8d419ad0..a2a7eeac 100644 --- a/src/components/Drawer/src/useDrawer.ts +++ b/src/components/Drawer/src/useDrawer.ts @@ -82,12 +82,12 @@ export function useDrawer(): UseDrawerReturnType { if (openOnSet) { dataTransferRef[unref(uidRef)] = null; - dataTransferRef[unref(uidRef)] = data; + dataTransferRef[unref(uidRef)] = toRaw(data); return; } - const equal = isEqual(toRaw(dataTransferRef[unref(uidRef)]), data); + const equal = isEqual(toRaw(dataTransferRef[unref(uidRef)]), toRaw(data)); if (!equal) { - dataTransferRef[unref(uidRef)] = data; + dataTransferRef[unref(uidRef)] = toRaw(data); } }, }; diff --git a/src/components/Modal/src/hooks/useModal.ts b/src/components/Modal/src/hooks/useModal.ts index 68309fe0..ea906dec 100644 --- a/src/components/Modal/src/hooks/useModal.ts +++ b/src/components/Modal/src/hooks/useModal.ts @@ -82,12 +82,12 @@ export function useModal(): UseModalReturnType { if (openOnSet) { dataTransferRef[unref(uidRef)] = null; - dataTransferRef[unref(uidRef)] = data; + dataTransferRef[unref(uidRef)] = toRaw(data); return; } - const equal = isEqual(toRaw(dataTransferRef[unref(uidRef)]), data); + const equal = isEqual(toRaw(dataTransferRef[unref(uidRef)]), toRaw(data)); if (!equal) { - dataTransferRef[unref(uidRef)] = data; + dataTransferRef[unref(uidRef)] = toRaw(data); } }, }; diff --git a/src/components/Tree/src/TreeHeader.vue b/src/components/Tree/src/TreeHeader.vue index f8b9cabe..08d351ba 100644 --- a/src/components/Tree/src/TreeHeader.vue +++ b/src/components/Tree/src/TreeHeader.vue @@ -24,7 +24,7 @@