@gm-pc/react 1.13.3-alpha.1 → 1.13.3-alpha.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gm-pc/react",
-  "version": "1.13.3-alpha.1",
+  "version": "1.13.3-alpha.2",
   "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.13.3-alpha.1",
+    "@gm-pc/locales": "^1.13.3-alpha.2",
     "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": "4605da606ef3651da81968ad6802fae8806a10d6"
+  "gitHead": "bdd278fe8bf983b735b760af20581ab580972632"
 }

package/src/component/v_browser/types.ts

@@ -28,7 +28,13 @@ export interface VBrowserProps {
   auth?: (from?: VBrowserWindow, to?: VBrowserWindow) => Promise<boolean> | boolean
   /**
    * 错误码参考
+   *
    * code: 0, message: '超过最大允许的窗口数量'
+   *
+   * code: 1, message: '鉴权失败'
+   *
+   * code: 2, message: '路由不存在‘
+   *
    */
   onError?: (error: { code: number; message: string }) => void
   /** 打开窗口如果没有传入标题，则使用此方法取标题 */

package/src/component/v_browser/ui/window_wrapper.tsx

@@ -48,11 +48,9 @@ const WindowWrapper: FC<WindowWrapperProps> = ({ path }) => {
           data-vbrowser-window={path}
           ref={createRef()}
         >
-          {/* <BrowserWindowContext.Provider value={page.path}> */}
           <Suspense fallback={loading}>
             <Component />
           </Suspense>
-          {/* </BrowserWindowContext.Provider> */}
         </div>
       ) as CacheItem['vNode']
       browser['_setCache'](path, { vNode })

package/src/component/v_browser/v_browser.tsx

@@ -65,7 +65,7 @@ class VBrowser implements VBrowser {
     if (ignored) {
       const i = this.windows.indexOf(oldWindow!)
       this.windows.splice(i, 1)
-      delete this._cache[i]
+      delete this._cache[oldWindow?.path!]
     }
 
     if (typeof w === 'number') {
@@ -110,9 +110,16 @@ class VBrowser implements VBrowser {
     } else {
       pass = (auth(this.activeWindow, w as VBrowserWindow) as boolean) ?? false
     }
-    if (!pass) return this._fire('error', new Error('鉴权失败'))
+    if (!pass) {
+      this._fire('error', { code: 1, message: '鉴权失败' })
+      return
+    }
     if (!pages.find((p) => p.path === (w as VBrowserWindow).path)) {
-      console.error(w.path, '页面不存在')
+      this._fire('error', {
+        code: 2,
+        message: `无法找到页面 ${w.path}, 可用路径：${pages.map((p) => p.path)}`,
+      })
+      return
     }
     // #endregion
 
@@ -123,8 +130,7 @@ class VBrowser implements VBrowser {
       )
       if (index === -1) {
         if (this.props.maxLength && this.windows.length >= this.props.maxLength) {
-          this.props.onError &&
-            this.props.onError({ code: 0, message: '超过最大允许的窗口数量' })
+          this._fire('error', { code: 0, message: '超过最大允许的窗口数量' })
           return
         }
 
@@ -271,6 +277,9 @@ class VBrowser implements VBrowser {
   private _fire(eventName: EventName, ...args: any[]) {
     const events = this._events[eventName] || []
     events.forEach((item) => item.event(...args))
+    if (eventName === 'error') {
+      this.props.onError && this.props.onError(args?.[0])
+    }
   }
 }