@gm-pc/react 1.12.0 → 1.12.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gm-pc/react",
-  "version": "1.12.0",
+  "version": "1.12.3",
   "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.12.0",
+    "@gm-pc/locales": "^1.12.3",
     "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": "e9f2e0b300a3ee5354e8078781e6a9db34c19adb"
+  "gitHead": "6d41c2327367cc74256512fdf7bc247419ad0afa"
 }

package/src/component/price/price.tsx

@@ -101,6 +101,10 @@ class Price extends Component<PriceProps> {
     keepZero: boolean,
     isFenUnit: boolean
   ): string => {
+    if (isNaN(value)) {
+      console.trace('value can not be NaN')
+      return ''
+    }
     const divRatio = isFenUnit ? 100 : 1
     const result = Big(Math.abs(value)).div(divRatio).toFixed(precision)
     return keepZero ? result : `${parseFloat(result)}`

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

@@ -169,7 +169,7 @@ const VBrowserContainer: FC<{ className?: string }> = observer(
 
           <div
             className={classNames('v-browser-tabs-right tw-font-sm tw-px-2.5', {
-              disabled: state.scrollWidth - state.width - state.scrollLeft === 0,
+              disabled: state.scrollWidth - state.width - state.scrollLeft < 1,
               'tw-hidden': state.width === state.scrollWidth,
             })}
             // onClick={(e) => {

package/src/component/v_browser/ui/style.less

@@ -105,6 +105,7 @@
         );
       overflow: auto;
       background-color: white;
+      position: relative;
     }
 
     &.hiding-tabs {

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

@@ -2,6 +2,7 @@
 import { get } from 'lodash'
 import { observer } from 'mobx-react'
 import React, { createRef, FC, useContext, useEffect } from 'react'
+import { NProgress } from '../../n_progress'
 import BrowserContext from '../context/browser'
 import { CacheItem } from '../types'
 import { pages } from '../v_browser'
@@ -32,21 +33,28 @@ const WindowWrapper: FC<WindowWrapperProps> = ({ path }) => {
       // 创建缓存
       const page = pages.find((p) => p.path === path)
       if (!page) throw new Error('[VBrowser] page not found: ' + path)
-      page.loader().then((module) => {
-        const Component = module.default
-        const vNode = (
-          <div
-            className='v-browser-window-content'
-            data-vbrowser-window={path}
-            ref={createRef()}
-          >
-            <Component />
-          </div>
-        ) as CacheItem['vNode']
-        browser['_setCache'](path, { vNode })
-        browser['_fire']('show', w!)
-        return null
-      })
+
+      NProgress.start()
+      page
+        .loader()
+        .then((module) => {
+          const Component = module.default
+          const vNode = (
+            <div
+              className='v-browser-window-content'
+              data-vbrowser-window={path}
+              ref={createRef()}
+            >
+              <Component />
+            </div>
+          ) as CacheItem['vNode']
+          browser['_setCache'](path, { vNode })
+          browser['_fire']('show', w!)
+          return null
+        })
+        .finally(() => {
+          NProgress.done()
+        })
       return
     }
 

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

@@ -34,6 +34,8 @@ const vbrowser = new VBrowser({
   onError?: (error: { code: number; message: string }) => void
   /** 打开窗口如果没有传入标题，则使用此方法取标题 */
   autoTitle?: (path: string) => string
+  /** 不以子窗口形式展示的页面名单（视觉上）, 这些页面会子窗口形式打开，但是视觉上会隐藏子窗口标签栏，且在离开页面时自动close掉，以达到子页面不在vbrowser中的视觉效果 */
+  ignoredPath?: Array<string | RegExp>
 })
 ```
 
@@ -43,7 +45,7 @@ vbrowser 暴露了以下属性和方法，详细信息见类型声明/代码提
 
 - `props`
 
-  实例化传入的参数，可以更改；
+  实例化传入的参数；
 
 - `windows`
 
@@ -65,10 +67,6 @@ vbrowser 暴露了以下属性和方法，详细信息见类型声明/代码提
 
   `ui`是否已挂载；
 
-- `ignoredPath`
-
-  不以子窗口形式展示的页面名单（视觉上）, 这些页面会子窗口形式打开，但是视觉上会隐藏子窗口标签栏，且在离开页面时自动 close 掉，以达到子页面不在 vbrowser 中的视觉效果
-
 方法
 
 - `open`

package/src/component/v_browser/v_browser.tsx

@@ -172,7 +172,7 @@ class VBrowser implements VBrowser {
     const originWindows = this.windows.slice()
     const activeWindow = this.activeWindow
     this.windows.splice(i, 1)
-    delete this._cache[i]
+    delete this._cache[originWindows[i].path]
     if (this.activeIndex === i) {
       const left = originWindows.slice(0, i).reverse()[0]
       const right = originWindows.slice(i + 1, originWindows.length)[0]