refactor(utils): use stringz in cutFrom

Author: mydearxym

package-docker.json

@@ -89,6 +89,7 @@
     "sentry-testkit": "^2.1.0",
     "shortid": "^2.2.8",
     "store": "^2.0.12",
+    "stringz": "^2.0.0",
     "styled-components": "4.1.3",
     "timeago-react": "2.0.0",
     "uuid": "3.3.2"

package.json

@@ -120,6 +120,7 @@
     "sentry-testkit": "^2.1.0",
     "shortid": "^2.2.8",
     "store": "^2.0.12",
+    "stringz": "^2.0.0",
     "styled-components": "4.3.2",
     "timeago-react": "2.0.0",
     "uuid": "^3.3.2"

utils/functions.js

@@ -1,5 +1,6 @@
 import R from 'ramda'
 import PubSub from 'pubsub-js'
+import { limit, length } from 'stringz'
 
 import { TAG_COLOR_ORDER } from '@config'
 import { EVENT } from '@constant'
@@ -46,16 +47,7 @@ export const Rlog = (arg = 'Rlog: ') => R.tap(log(arg))
  * @param {*number} len 需要显示多少个汉字，两个英文字母相当于一个汉字
  */
 export const cutFrom = (str, len = 20) => {
-  const reg = /[\u4e00-\u9fa5]/g // 匹配中文
-  const slice = str && str.substring(0, len)
-  // eslint-disable-next-line no-bitwise
-  const chineseCharNum = ~~(
-    slice &&
-    slice.match(reg) &&
-    slice.match(reg).length
-  )
-  const realen = slice && slice.length * 2 - chineseCharNum
-  return str && str.substr(0, realen) + (realen < str.length ? '...' : '')
+  return len >= length(str) ? str : `${limit(str, len, '')}...`
 }
 
 // https://stackoverflow.com/questions/9461621/how-to-format-a-number-as-2-5k-if-a-thousand-or-more-otherwise-900-in-javascrip

yarn.lock

@@ -3430,12 +3430,13 @@ cosmiconfig@^5.0.0, cosmiconfig@^5.2.0, cosmiconfig@^5.2.1:
     js-yaml "^3.13.1"
     parse-json "^4.0.0"
 
-coveralls@3.0.3:
-  version "3.0.3"
-  resolved "https://registry.npmjs.org/coveralls/-/coveralls-3.0.3.tgz#83b1c64aea1c6afa69beaf50b55ac1bc4d13e2b8"
+coveralls@3.0.6:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/coveralls/-/coveralls-3.0.6.tgz#5c63b2759b6781118e7439bd870ba5e9ee428b25"
+  integrity sha512-Pgh4v3gCI4T/9VijVrm8Ym5v0OgjvGLKj3zTUwkvsCiwqae/p6VLzpsFNjQS2i6ewV7ef+DjFJ5TSKxYt/mCrA==
   dependencies:
     growl "~> 1.10.0"
-    js-yaml "^3.11.0"
+    js-yaml "^3.13.1"
     lcov-parse "^0.0.10"
     log-driver "^1.2.7"
     minimist "^1.2.0"
@@ -6846,7 +6847,7 @@ js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
 
-js-yaml@^3.11.0, js-yaml@^3.13.1, js-yaml@^3.7.0:
+js-yaml@^3.13.1, js-yaml@^3.7.0:
   version "3.13.1"
   resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
   dependencies:
@@ -10900,6 +10901,13 @@ stringify-package@1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/stringify-package/-/stringify-package-1.0.0.tgz#e02828089333d7d45cd8c287c30aa9a13375081b"
 
+stringz@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/stringz/-/stringz-2.0.0.tgz#0a092bc64ed9b42eff2936d0401d2398393d54e9"
+  integrity sha512-pRWc5RGpedKEDvQ/ukYs8kS8tKj+cKu5ayOoyOvsavbpiLBcm1dGX6p1o5IagaN11cbfN8tKGpgQ4fHdEq5LBA==
+  dependencies:
+    unicode-astral-regex "^1.0.1"
+
 strip-ansi@5.2.0, strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   version "5.2.0"
   resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
@@ -11388,6 +11396,11 @@ unfetch@4.1.0:
   version "4.1.0"
   resolved "https://registry.npmjs.org/unfetch/-/unfetch-4.1.0.tgz#6ec2dd0de887e58a4dee83a050ded80ffc4137db"
 
+unicode-astral-regex@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/unicode-astral-regex/-/unicode-astral-regex-1.0.1.tgz#2cab8529480646f9614ddbc7b62158ad05123feb"
+  integrity sha512-UP6cmDeiWi8bMDmkyXLRsDuVPTvPjh8Wsz+pHu1VkGgTBl4pUceYAdHXY0cdc6Q3+Z2q7QMzi/0E7L/S/yOvFw==
+
 unicode-canonical-property-names-ecmascript@^1.0.4:
   version "1.0.4"
   resolved "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"