chore: bump 2.0.0-rc.3

wuyongfeng · Oct 19, 2020 · 8fd1994 · 8fd1994
1 parent 2f12556
commit 8fd1994
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 7 deletions.
diff --git a/CHANGELOG.en_US.md b/CHANGELOG.en_US.md
@@ -1,3 +1,26 @@
+# 2.0.0-rc.3 (2020-10-19)
+
+### ✨ Features
+
+- Added excel component and excel/xml/csv/html export example
+- Added excel import example
+- Added global error handling
+- Added markdown components and examples
+- The menu name can be displayed when adding a new folding menu
+
+### Docs
+
+- add project doc
+
+### 🎫 Chores
+
+- update deps
+
+### 🐛 Bug Fixes
+
+- Fix the adaptive problem of the top menu
+- Fix window system packaging error
+
 # 2.0.0-rc.2 (2020-10-17)
 
 ### ✨ Features

diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md
@@ -1,3 +1,27 @@
+# 2.0.0-rc.3 (2020-10-19)
+
+### ✨ Features
+
+- 新增 excel 组件及 excel/xml/csv/html 导出示例
+- 新增 excel 导入示例
+- 新增全局错误处理
+- 新增 markdown 组件及示例
+- 新增折叠菜单时可显示菜单名
+
+### Docs
+
+- 添加项目文档
+
+### 🎫 Chores
+
+- 升级依赖
+- 其他细节优化
+
+### 🐛 Bug Fixes
+
+- 修复顶部菜单自适应问题
+- 修复 window 系统打包报错问题
+
 # 2.0.0-rc.2 (2020-10-17)
 
 ### ✨ Features

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vben-admin-2.0",
-  "version": "2.0.0-rc.2",
+  "version": "2.0.0-rc.3",
   "scripts": {
     "bootstrap": "yarn install",
     "serve": "cross-env ts-node --files -P  ./build/tsconfig.json ./build/script/preserve && cross-env NODE_ENV=development vite",

diff --git a/src/hooks/event/useWindowSize.ts b/src/hooks/event/useWindowSize.ts
@@ -4,33 +4,40 @@ import { tryOnMounted, tryOnUnmounted } from '/@/utils/helper/vueHelper';
 import { ref } from 'vue';
 
 import { useDebounce } from '/@/hooks/core/useDebounce';
-import { CancelFn } from '../core/types';
 
 interface WindowSizeOptions {
   once?: boolean;
   immediate?: boolean;
   listenerOptions?: AddEventListenerOptions | boolean;
 }
 
-export function useWindowSizeFn<T>(fn: Fn<T>, wait = 150, options?: WindowSizeOptions): CancelFn {
+export function useWindowSizeFn<T>(fn: Fn<T>, wait = 150, options?: WindowSizeOptions) {
   let handler = () => {
     fn();
   };
   const [handleSize, cancel] = useDebounce(handler, wait, options);
   handler = handleSize;
 
-  tryOnMounted(() => {
+  const start = () => {
     if (options && options.immediate) {
       handler();
     }
     window.addEventListener('resize', handler);
-  });
+  };
 
-  tryOnUnmounted(() => {
+  const stop = () => {
     window.removeEventListener('resize', handler);
     cancel();
+  };
+
+  tryOnMounted(() => {
+    start();
+  });
+
+  tryOnUnmounted(() => {
+    stop();
   });
-  return cancel;
+  return [start, stop];
 }
 
 export const useWindowSize = (wait = 150, options?: WindowSizeOptions) => {