@gm-pc/react 1.15.0-alpha.2 → 1.16.0-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gm-pc/react",
-  "version": "1.15.0-alpha.2",
+  "version": "1.16.0-alpha.0",
   "description": "观麦前端基础组件库",
   "author": "liyatang <liyatang@qq.com>",
   "homepage": "https://github.com/gmfe/gm-pc#readme",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@gm-common/hooks": "^2.10.0",
     "@gm-common/tool": "^2.10.0",
-    "@gm-pc/locales": "^1.15.0-alpha.2",
+    "@gm-pc/locales": "^1.16.0-alpha.0",
     "big.js": "^6.0.1",
     "classnames": "^2.2.5",
     "lodash": "^4.17.19",
@@ -48,5 +48,5 @@
     "react-router-dom": "^5.2.0",
     "react-window": "^1.8.5"
   },
-  "gitHead": "70f95993acf3fb8bd31602d7cd46d4bfceede291"
+  "gitHead": "c4060bd47a903111e49c5d7185599d43c175e6f9"
 }

package/src/component/v_browser/hooks/useWindowEffect.ts

@@ -10,7 +10,7 @@ type Noop = () => void
  * 根据情况可以考虑使用useWindowEffect来替换useEffect，功能： 窗口激活时、deps更新时，触发fn执行； 窗口失活时执行fn返回的销毁函数； 如果子窗口为失活状态，不观察deps的更新；
  *
  */
-export default function useWindowEffect(fn: () => Noop | void, deps: Array<any>) {
+export default function useWindowEffect(fn: () => Noop | void, deps: Array<any> = []) {
   const browser = useContext(BrowserContext)
   /** hook所在窗口 */
   const browserWindow = useContext(BrowserWindowContext)
@@ -37,19 +37,15 @@ export default function useWindowEffect(fn: () => Noop | void, deps: Array<any>)
         const deactivate = pre?.path === browserWindow.path
         if (activate) {
           cb.current = fn()
-          console.log('activate', browserWindow.path)
         }
         if (deactivate) {
           cb.current && cb.current()
-          console.log('deactivate', browserWindow.path)
         }
       }
       // { fireImmediately: true }
     )
     cb.current = fn()
-    console.log('effect', browserWindow.path, deps)
     return () => {
-      console.log('dispose', browserWindow.path)
       dispose()
       cb.current && cb.current()
     }

package/src/component/v_browser/v_browser.stories.mdx

@@ -39,7 +39,7 @@ const vbrowser = new VBrowser({
 })
 ```
 
-vbrowser 暴露了以下属性和方法，详细信息见类型声明/代码提示：
+vbrowser 暴露了以下属性和方法，详细信息类型声明/代码提示：
 
 属性
 

package/src/component/v_browser/v_browser.tsx

@@ -55,6 +55,12 @@ class VBrowser implements VBrowser {
     return this.windows[this.activeIndex] as VBrowserWindow | undefined
   }
 
+  private _histories: VBrowserWindow[] = []
+  /** 窗口打开/切换记录，最多10, 不包含当前 */
+  get histories() {
+    return this._histories
+  }
+
   /** 切换已打开窗口 */
   switchWindow(w: number | VBrowserWindow) {
     const oldWindow = this.activeWindow
@@ -79,6 +85,9 @@ class VBrowser implements VBrowser {
     }
     setTimeout(() => this._scrollToActiveTab(), 100)
 
+    if (oldWindow) {
+      this._histories = [...[...this._histories, oldWindow].slice(-10)]
+    }
     this.props.onChange &&
       this.props.onChange(oldWindow, this.windows[this.activeIndex], this.windows)
     this._stash()
@@ -165,8 +174,11 @@ class VBrowser implements VBrowser {
     // #endregion
   }
 
-  /** 关闭子窗口  */
-  close(i: number | VBrowserWindow) {
+  /** 关闭子窗口, 不指定则关闭当前窗口  */
+  close(i?: number | VBrowserWindow) {
+    if (i === undefined) {
+      i = this.activeIndex
+    }
     if (typeof i !== 'number') {
       i = this.windows.findIndex((item) => item.path === (i as VBrowserWindow).path)
     }
@@ -233,6 +245,11 @@ class VBrowser implements VBrowser {
     this.open(windows[activeIndex])
   }
 
+  /** 清除后重新进入无法恢复已开窗口 */
+  deleteStash() {
+    sessionStorage.removeItem(STORAGE_KEY)
+  }
+
   /** 隐藏标签栏  */
   hideTabs() {
     this._hidingTabs = true