diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md index 48e42d89f..425220c96 100644 --- a/CHANGELOG.zh_CN.md +++ b/CHANGELOG.zh_CN.md @@ -14,6 +14,7 @@ - **Modal** 修复全屏高度计算错误 - **PageWrapper** 修复高度计算问题 +- **FlowChart** 修复拖放菜单丢失 - 修复后台模式下,Iframe 路由错误 ## 2.4.2(2021-06-10) diff --git a/package.json b/package.json index 9b32301e4..9df4545b4 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "devDependencies": { "@commitlint/cli": "^12.1.4", "@commitlint/config-conventional": "^12.1.4", - "@iconify/json": "^1.1.354", + "@iconify/json": "^1.1.355", "@purge-icons/generated": "^0.7.0", "@types/codemirror": "^5.60.0", "@types/crypto-js": "^4.0.1", @@ -91,7 +91,7 @@ "eslint-config-prettier": "^8.3.0", "eslint-define-config": "^1.0.8", "eslint-plugin-prettier": "^3.4.0", - "eslint-plugin-vue": "^7.10.0", + "eslint-plugin-vue": "^7.11.0", "esno": "^0.7.1", "fs-extra": "^10.0.0", "http-server": "^0.12.3", @@ -100,7 +100,7 @@ "is-ci": "^3.0.0", "less": "^4.1.1", "lint-staged": "^11.0.0", - "postcss": "^8.3.1", + "postcss": "^8.3.2", "prettier": "^2.3.1", "pretty-quick": "^3.1.0", "rimraf": "^3.0.2", @@ -128,7 +128,7 @@ "resolutions": { "//": "Used to install imagemin dependencies, because imagemin may not be installed in China. If it is abroad, you can delete it", "bin-wrapper": "npm:bin-wrapper-china", - "rollup": "^2.51.1" + "rollup": "^2.51.2" }, "repository": { "type": "git", diff --git a/src/components/Drawer/src/BasicDrawer.vue b/src/components/Drawer/src/BasicDrawer.vue index cf68d2916..fe658ef4b 100644 --- a/src/components/Drawer/src/BasicDrawer.vue +++ b/src/components/Drawer/src/BasicDrawer.vue @@ -163,7 +163,7 @@ function setDrawerProps(props: Partial): void { // Keep the last setDrawerProps - propsRef.value = deepMerge(unref(propsRef), props); + propsRef.value = deepMerge(unref(propsRef) || ({} as any), props); if (Reflect.has(props, 'visible')) { visibleRef.value = !!props.visible; diff --git a/src/components/FlowChart/src/FlowChart.vue b/src/components/FlowChart/src/FlowChart.vue index 5739cf9ba..8629b2607 100644 --- a/src/components/FlowChart/src/FlowChart.vue +++ b/src/components/FlowChart/src/FlowChart.vue @@ -9,23 +9,20 @@