fix: 修订导入方式,兼容五端处理 (#3419)

Co-authored-by: tongen <tongen@jd.com>

Author: xiaoyatong

src/hooks/taro/use-custom-event.ts

@@ -1,9 +1,9 @@
 import { useEffect, useRef } from 'react'
 import isEqual from 'react-fast-compare'
-import { Events, getCurrentInstance } from '@tarojs/taro'
+import { eventCenter, getCurrentInstance } from '@tarojs/taro'
 import { useForceUpdate } from '@/hooks/use-force-update'
 
-export const customEvents = new Events()
+export const customEvents = eventCenter
 
 export function useCustomEventsPath(selector?: string) {
   selector = selector || ''

src/locales/base.ts

@@ -8,6 +8,7 @@ export interface BaseLang {
   select: string
   edit: string
   reset: string
+  close: string
   video: {
     errorTip: string
     clickRetry: string
@@ -140,4 +141,5 @@ export interface BaseLang {
   watermark: {
     errorCanvasTips: string
   }
+  mask: string
 }

src/locales/en-US.ts

@@ -10,6 +10,7 @@ const enUS: BaseLang = {
   select: 'Select',
   edit: 'Edit',
   reset: 'Reset',
+  close: 'Close',
   video: {
     errorTip: 'Error Tip',
     clickRetry: 'Click Retry',
@@ -139,5 +140,6 @@ const enUS: BaseLang = {
   watermark: {
     errorCanvasTips: 'Canvas is not supported in the current environment',
   },
+  mask: 'Mask',
 }
 export default enUS

src/locales/id-ID.ts

@@ -10,6 +10,7 @@ const idID: BaseLang = {
   select: 'Pilih',
   edit: 'Sunting',
   reset: 'Mengatur Ulang',
+  close: 'Tutup',
   video: {
     errorTip: 'Terjadi Kesalahan',
     clickRetry: 'Coba Lagi',
@@ -140,5 +141,6 @@ const idID: BaseLang = {
   watermark: {
     errorCanvasTips: 'Canvas is not supported in the current environment',
   },
+  mask: 'Masker',
 }
 export default idID

src/locales/ja-JP.ts

@@ -141,5 +141,7 @@ const jaJP: BaseLang = {
   watermark: {
     errorCanvasTips: '現在の環境はCanvasをサポートしていません',
   },
+  mask: 'マスク',
+  close: '閉じる',
 }
 export default jaJP

src/locales/tr-TR.ts

@@ -10,6 +10,7 @@ const trTR: BaseLang = {
   select: 'Seçiniz',
   edit: 'düzenlemek',
   reset: 'sıfırlama',
+  close: 'Kapat',
   video: {
     errorTip: 'Video yüklenemedi',
     clickRetry: 'Yeniden Tıklayın',
@@ -148,5 +149,6 @@ const trTR: BaseLang = {
   watermark: {
     errorCanvasTips: 'Geçerli ortam Canvası desteklemiyor',
   },
+  mask: 'Maske',
 }
 export default trTR

src/locales/zh-CN.ts

@@ -10,6 +10,7 @@ const zhCN: BaseLang = {
   select: '请选择',
   edit: '编辑',
   reset: '重置',
+  close: '关闭',
   video: {
     errorTip: '视频加载失败',
     clickRetry: '点击重试',
@@ -140,5 +141,6 @@ const zhCN: BaseLang = {
   watermark: {
     errorCanvasTips: '当前环境不支持Canvas',
   },
+  mask: '蒙层',
 }
 export default zhCN

src/locales/zh-TW.ts

@@ -10,6 +10,7 @@ const zhCN: BaseLang = {
   select: '請選擇',
   edit: '編輯',
   reset: '重置',
+  close: '關閉',
   video: {
     errorTip: '視頻加載失敗',
     clickRetry: '點擊重試',
@@ -140,5 +141,6 @@ const zhCN: BaseLang = {
   watermark: {
     errorCanvasTips: '當前環境不支持Canvas',
   },
+  mask: '蒙層',
 }
 export default zhCN

src/locales/zh-UG.ts

@@ -10,6 +10,7 @@ const zhUG: BaseLang = {
   select: 'تاللاڭ',
   edit: 'يحرر',
   reset: 'إعادة ضبط',
+  close: 'تاقاش',
   video: {
     errorTip: 'فىلىمنى قويۇش مەغلۇپ بولدى',
     clickRetry: 'قايتا سىناش',
@@ -138,5 +139,6 @@ const zhUG: BaseLang = {
   watermark: {
     errorCanvasTips: 'Canvas نى قوللىمايدۇ',
   },
+  mask: 'mask',
 }
 export default zhUG

src/utils/taro/get-rect-by-id.ts

@@ -1,8 +1,21 @@
 import Taro, { createSelectorQuery } from '@tarojs/taro'
 
+const ENV_TYPE = {
+  WEAPP: 'WEAPP',
+  SWAN: 'SWAN',
+  ALIPAY: 'ALIPAY',
+  TT: 'TT',
+  QQ: 'QQ',
+  JD: 'JD',
+  WEB: 'WEB',
+  RN: 'RN',
+  HARMONY: 'HARMONY',
+  QUICKAPP: 'QUICKAPP',
+}
+
 export const getRectById = (id: string) => {
   return new Promise((resolve, reject) => {
-    if (Taro.getEnv() === Taro.ENV_TYPE.WEB) {
+    if (Taro.getEnv() === ENV_TYPE.WEB) {
       const t = document ? document.querySelector(`#${id}`) : ''
       if (t) {
         resolve(t?.getBoundingClientRect())