@gm-pc/react 1.12.1 → 1.13.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gm-pc/react",
-  "version": "1.12.1",
+  "version": "1.13.0-beta.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.12.1",
+    "@gm-pc/locales": "^1.13.0-beta.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": "9d0ca9956bfdeee6bb4775ab56e8c15d5b4f5e94"
+  "gitHead": "6ffc615100cddda694c5827a76c491df87f7f9c5"
 }

package/src/component/price/price.tsx

@@ -101,7 +101,10 @@ class Price extends Component<PriceProps> {
     keepZero: boolean,
     isFenUnit: boolean
   ): string => {
-    if (isNaN(value)) return ''
+    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.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]

package/yarn-error.log

@@ -1,267 +0,0 @@
-Arguments: 
-  /usr/local/bin/node /usr/local/bin/yarn add react-router-dom^5.2.0 --peer
-
-PATH: 
-  /opt/intel/openvino_2021/deployment_tools/model_optimizer:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Applications/VMware Fusion.app/Contents/Public:/usr/local/go/bin:/opt/X11/bin:/Library/Apple/usr/bin:/Users/jawei/google-cloud-sdk/bin:/Users/jawei/opt/anaconda3/bin:/Users/jawei/opt/anaconda3/condabin:/Library/Frameworks/Python.framework/Versions/3.8/bin:/Users/jawei/flutter/bin:/Users/yuanzhiying/Library/flutter/bin:/usr/local/go/bin
-
-Yarn version: 
-  1.22.10
-
-Node version: 
-  14.15.1
-
-Platform: 
-  darwin x64
-
-Trace: 
-  Error: https://registry.npm.taobao.org/react-router-dom%5E5.2.0: [NOT_FOUND] react-router-dom^5.2.0 not found
-      at Request.params.callback [as _callback] (/usr/local/lib/node_modules/yarn/lib/cli.js:66988:18)
-      at Request.self.callback (/usr/local/lib/node_modules/yarn/lib/cli.js:140662:22)
-      at Request.emit (events.js:315:20)
-      at Request.<anonymous> (/usr/local/lib/node_modules/yarn/lib/cli.js:141634:10)
-      at Request.emit (events.js:315:20)
-      at Gunzip.<anonymous> (/usr/local/lib/node_modules/yarn/lib/cli.js:141556:12)
-      at Object.onceWrapper (events.js:421:28)
-      at Gunzip.emit (events.js:315:20)
-      at endReadableNT (_stream_readable.js:1327:12)
-      at processTicksAndRejections (internal/process/task_queues.js:80:21)
-
-npm manifest: 
-  {
-    "name": "@gm-pc/react",
-    "version": "1.7.4-alpha.0",
-    "description": "观麦前端基础组件库",
-    "author": "liyatang <liyatang@qq.com>",
-    "homepage": "https://github.com/gmfe/gm-pc#readme",
-    "license": "ISC",
-    "publishConfig": {
-      "access": "public"
-    },
-    "main": "src/index.ts",
-    "module": "src/index.ts",
-    "types": "src/index.ts",
-    "repository": {
-      "type": "git",
-      "url": "git+https://github.com/gmfe/gm-pc.git"
-    },
-    "scripts": {
-      "test": "echo \"Error: run tests from root\" && exit 1"
-    },
-    "bugs": {
-      "url": "https://github.com/gmfe/gm-pc/issues"
-    },
-    "dependencies": {
-      "@gm-common/hooks": "^2.10.0",
-      "@gm-common/tool": "^2.10.0",
-      "@gm-pc/locales": "^1.7.4-alpha.0",
-      "big.js": "^6.0.1",
-      "classnames": "^2.2.5",
-      "lodash": "^4.17.19",
-      "modern-normalize": "^1.0.0",
-      "moment": "^2.29.1",
-      "react-window": "^1.8.5"
-    },
-    "devDependencies": {
-      "@types/react-router-dom": "^5.3.3",
-      "react": "^16.14.0",
-      "react-dom": "^16.14.0"
-    },
-    "peerDependencies": {
-      "big.js": "^6.0.1",
-      "classnames": "^2.2.5",
-      "lodash": "^4.17.19",
-      "modern-normalize": "^1.0.0",
-      "moment": "^2.29.1",
-      "react": "^16.14.0",
-      "react-dom": "^16.14.0",
-      "react-router-dom": "^5.2.0",
-      "react-window": "^1.8.5"
-    }
-  }
-
-yarn manifest: 
-  No manifest
-
-Lockfile: 
-  # THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-  # yarn lockfile v1
-  
-  
-  "@babel/runtime@^7.0.0":
-    version "7.12.1"
-    resolved "https://registry.npm.taobao.org/@babel/runtime/download/@babel/runtime-7.12.1.tgz?cache=0&sync_timestamp=1602799933339&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fruntime%2Fdownload%2F%40babel%2Fruntime-7.12.1.tgz#b4116a6b6711d010b2dad3b7b6e43bf1b9954740"
-    integrity sha1-tBFqa2cR0BCy2tO3tuQ78bmVR0A=
-    dependencies:
-      regenerator-runtime "^0.13.4"
-  
-  "@gm-common/hooks@^2.10.0":
-    version "2.10.0"
-    resolved "https://registry.npmmirror.com/@gm-common/hooks/download/@gm-common/hooks-2.10.0.tgz#c67e02875b4d266ef911e7828257d957e923826b"
-    integrity sha1-xn4Ch1tNJm75EeeCglfZV+kjgms=
-    dependencies:
-      "@gm-common/tool" "^2.10.0"
-      ts-config-gm-react-app "^3.4.5"
-  
-  "@gm-common/tool@^2.10.0":
-    version "2.10.0"
-    resolved "https://registry.npmmirror.com/@gm-common/tool/download/@gm-common/tool-2.10.0.tgz#f4f512233ff1118eff8bbdeca9762f0e65ce26bd"
-    integrity sha1-9PUSIz/xEY7/i73sqXYvDmXOJr0=
-    dependencies:
-      lodash "^4.17.20"
-  
-  "@gm-pc/locales@^1.7.4-alpha.0":
-    version "1.8.6-alpha.0"
-    resolved "https://registry.npmmirror.com/@gm-pc/locales/-/locales-1.8.6-alpha.0.tgz#9fc9918454ee774c0d61ff41f5b33343411dd3c3"
-    integrity sha512-iNAdAuu8bg7F3xB7Vr0DgvY+jpJ1lxkOTAOw+2BK3ljI1eRTbIYkqvazX9ImrdcaB+7R0sbDGUMeR8Ca7iRY3w==
-  
-  "@types/history@^4.7.11":
-    version "4.7.11"
-    resolved "https://registry.npmmirror.com/@types/history/-/history-4.7.11.tgz#56588b17ae8f50c53983a524fc3cc47437969d64"
-    integrity sha512-qjDJRrmvBMiTx+jyLxvLfJU7UznFuokDv4f3WRuriHKERccVpFU+8XMQUAbDzoiJCsmexxRExQeMwwCdamSKDA==
-  
-  "@types/prop-types@*":
-    version "15.7.4"
-    resolved "https://registry.npmmirror.com/@types/prop-types/-/prop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11"
-    integrity sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ==
-  
-  "@types/react-router-dom@^5.3.3":
-    version "5.3.3"
-    resolved "https://registry.npmmirror.com/@types/react-router-dom/-/react-router-dom-5.3.3.tgz#e9d6b4a66fcdbd651a5f106c2656a30088cc1e83"
-    integrity sha512-kpqnYK4wcdm5UaWI3fLcELopqLrHgLqNsdpHauzlQktfkHL3npOSwtj1Uz9oKBAzs7lFtVkV8j83voAz2D8fhw==
-    dependencies:
-      "@types/history" "^4.7.11"
-      "@types/react" "*"
-      "@types/react-router" "*"
-  
-  "@types/react-router@*":
-    version "5.1.18"
-    resolved "https://registry.npmmirror.com/@types/react-router/-/react-router-5.1.18.tgz#c8851884b60bc23733500d86c1266e1cfbbd9ef3"
-    integrity sha512-YYknwy0D0iOwKQgz9v8nOzt2J6l4gouBmDnWqUUznltOTaon+r8US8ky8HvN0tXvc38U9m6z/t2RsVsnd1zM0g==
-    dependencies:
-      "@types/history" "^4.7.11"
-      "@types/react" "*"
-  
-  "@types/react@*":
-    version "17.0.39"
-    resolved "https://registry.npmmirror.com/@types/react/-/react-17.0.39.tgz#d0f4cde092502a6db00a1cded6e6bf2abb7633ce"
-    integrity sha512-UVavlfAxDd/AgAacMa60Azl7ygyQNRwC/DsHZmKgNvPmRR5p70AJ5Q9EAmL2NWOJmeV+vVUI4IAP7GZrN8h8Ug==
-    dependencies:
-      "@types/prop-types" "*"
-      "@types/scheduler" "*"
-      csstype "^3.0.2"
-  
-  "@types/scheduler@*":
-    version "0.16.2"
-    resolved "https://registry.npmmirror.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39"
-    integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==
-  
-  big.js@^6.0.1:
-    version "6.0.1"
-    resolved "https://registry.npm.taobao.org/big.js/download/big.js-6.0.1.tgz#9e0a2e8b1825ce006cd4a096d6f294738cd5cff6"
-    integrity sha1-ngouixglzgBs1KCW1vKUc4zVz/Y=
-  
-  classnames@^2.2.5:
-    version "2.2.6"
-    resolved "https://registry.npm.taobao.org/classnames/download/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce"
-    integrity sha1-Q5Nb/90pHzJtrQogUwmzjQD2UM4=
-  
-  csstype@^3.0.2:
-    version "3.0.10"
-    resolved "https://registry.npmmirror.com/csstype/-/csstype-3.0.10.tgz#2ad3a7bed70f35b965707c092e5f30b327c290e5"
-    integrity sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA==
-  
-  "js-tokens@^3.0.0 || ^4.0.0":
-    version "4.0.0"
-    resolved "https://registry.npm.taobao.org/js-tokens/download/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
-    integrity sha1-GSA/tZmR35jjoocFDUZHzerzJJk=
-  
-  lodash@^4.17.19, lodash@^4.17.20:
-    version "4.17.20"
-    resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
-    integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
-  
-  loose-envify@^1.1.0, loose-envify@^1.4.0:
-    version "1.4.0"
-    resolved "https://registry.npm.taobao.org/loose-envify/download/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
-    integrity sha1-ce5R+nvkyuwaY4OffmgtgTLTDK8=
-    dependencies:
-      js-tokens "^3.0.0 || ^4.0.0"
-  
-  "memoize-one@>=3.1.1 <6":
-    version "5.1.1"
-    resolved "https://registry.npm.taobao.org/memoize-one/download/memoize-one-5.1.1.tgz#047b6e3199b508eaec03504de71229b8eb1d75c0"
-    integrity sha1-BHtuMZm1COrsA1BN5xIpuOsddcA=
-  
-  modern-normalize@^1.0.0:
-    version "1.0.0"
-    resolved "https://registry.npm.taobao.org/modern-normalize/download/modern-normalize-1.0.0.tgz#539d84a1e141338b01b346f3e27396d0ed17601e"
-    integrity sha1-U52EoeFBM4sBs0bz4nOW0O0XYB4=
-  
-  moment@^2.29.1:
-    version "2.29.1"
-    resolved "https://registry.npm.taobao.org/moment/download/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
-    integrity sha1-sr52n6MZQL6e7qZGnAdeNQBvo9M=
-  
-  object-assign@^4.1.1:
-    version "4.1.1"
-    resolved "https://registry.npm.taobao.org/object-assign/download/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-    integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
-  
-  prop-types@^15.6.2:
-    version "15.7.2"
-    resolved "https://registry.npm.taobao.org/prop-types/download/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
-    integrity sha1-UsQedbjIfnK52TYOAga5ncv/psU=
-    dependencies:
-      loose-envify "^1.4.0"
-      object-assign "^4.1.1"
-      react-is "^16.8.1"
-  
-  react-dom@^16.14.0:
-    version "16.14.0"
-    resolved "https://registry.npm.taobao.org/react-dom/download/react-dom-16.14.0.tgz?cache=0&sync_timestamp=1603367590403&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Freact-dom%2Fdownload%2Freact-dom-16.14.0.tgz#7ad838ec29a777fb3c75c3a190f661cf92ab8b89"
-    integrity sha1-etg47Cmnd/s8dcOhkPZhz5Kri4k=
-    dependencies:
-      loose-envify "^1.1.0"
-      object-assign "^4.1.1"
-      prop-types "^15.6.2"
-      scheduler "^0.19.1"
-  
-  react-is@^16.8.1:
-    version "16.13.1"
-    resolved "https://registry.npm.taobao.org/react-is/download/react-is-16.13.1.tgz?cache=0&sync_timestamp=1603367576715&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Freact-is%2Fdownload%2Freact-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
-    integrity sha1-eJcppNw23imZ3BVt1sHZwYzqVqQ=
-  
-  react-window@^1.8.5:
-    version "1.8.6"
-    resolved "https://registry.npm.taobao.org/react-window/download/react-window-1.8.6.tgz#d011950ac643a994118632665aad0c6382e2a112"
-    integrity sha1-0BGVCsZDqZQRhjJmWq0MY4LioRI=
-    dependencies:
-      "@babel/runtime" "^7.0.0"
-      memoize-one ">=3.1.1 <6"
-  
-  react@^16.14.0:
-    version "16.14.0"
-    resolved "https://registry.npm.taobao.org/react/download/react-16.14.0.tgz?cache=0&sync_timestamp=1603367592109&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Freact%2Fdownload%2Freact-16.14.0.tgz#94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d"
-    integrity sha1-lNd23dCqo32j7aj8W2sYpMmjEU0=
-    dependencies:
-      loose-envify "^1.1.0"
-      object-assign "^4.1.1"
-      prop-types "^15.6.2"
-  
-  regenerator-runtime@^0.13.4:
-    version "0.13.7"
-    resolved "https://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.13.7.tgz?cache=0&sync_timestamp=1595456311465&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fregenerator-runtime%2Fdownload%2Fregenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55"
-    integrity sha1-ysLazIoepnX+qrrriugziYrkb1U=
-  
-  scheduler@^0.19.1:
-    version "0.19.1"
-    resolved "https://registry.npm.taobao.org/scheduler/download/scheduler-0.19.1.tgz?cache=0&sync_timestamp=1603367591660&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fscheduler%2Fdownload%2Fscheduler-0.19.1.tgz#4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196"
-    integrity sha1-Tz4u0sGn1laB9MhU+oxaHMtA8ZY=
-    dependencies:
-      loose-envify "^1.1.0"
-      object-assign "^4.1.1"
-  
-  ts-config-gm-react-app@^3.4.5:
-    version "3.4.7"
-    resolved "https://registry.npmjs.org/ts-config-gm-react-app/-/ts-config-gm-react-app-3.4.7.tgz#51decbf847c991ae8e3bd950f3f84cfb0523ba4b"
-    integrity sha512-1XOMmAIEiUr2R0JTasF30zj5ZRZgVTOx/ycZJOh2xusQCYC4n1/wGbXfEzm8Dzhv2YSWHEWPVHpytAM3mYsu9Q==