Merge branch 'feat_v3.x' of github.com:jdf2e/nutui-react into feat_v3.x

Author: irisSong

.gitignore

@@ -48,6 +48,7 @@ pnpm-lock.*.yaml
 .idea
 .vscode
 .omx
+.omc
 *.suo
 *.ntvs*
 *.njsproj

package.json

@@ -55,6 +55,7 @@
     "clone:jdharmony": "node ./scripts/harmony/clone-jdharmony.js",
     "dev": "vite --open --force",
     "dev:jmapp": "VITE_APP_PROJECT_ID=jmapp vite --open --force",
+    "dev:daojia": "VITE_APP_PROJECT_ID=daojia vite --open --force",
     "dev:rtl": "VITE_RTL=rtl vite --open --force",
     "dev:jrkf": "VITE_APP_PROJECT_ID=jrkf vite --open --force",
     "dev:taro:rn:dark": "THEME=dark pnpm dev:taro:rn",

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

@@ -3,6 +3,7 @@ import isEqual from 'react-fast-compare'
 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) {

src/locales/base.ts

@@ -9,6 +9,11 @@ export interface BaseLang {
   edit: string
   reset: string
   close: string
+  back: string
+  clear: string
+  image: {
+    errorTip: string
+  }
   video: {
     errorTip: string
     clickRetry: string
@@ -40,6 +45,8 @@ export interface BaseLang {
     today: string
     loadPreviousMonth: string
     noEarlierMonth: string
+    // eslint-disable-next-line @typescript-eslint/ban-types
+    dayAriaLabel?: Function
   }
   shortpassword: {
     title: string

src/locales/en-US.ts

@@ -11,6 +11,11 @@ const enUS: BaseLang = {
   edit: 'Edit',
   reset: 'Reset',
   close: 'Close',
+  back: 'Back',
+  clear: 'Clear',
+  image: {
+    errorTip: 'Image failed to load',
+  },
   video: {
     errorTip: 'Error Tip',
     clickRetry: 'Click Retry',
@@ -40,6 +45,24 @@ const enUS: BaseLang = {
     today: 'Today',
     loadPreviousMonth: 'Load Previous Month',
     noEarlierMonth: 'No Earlier Month',
+    dayAriaLabel: (
+      year: number,
+      month: number,
+      day: number,
+      today: boolean,
+      isActive: boolean,
+      isDisable: boolean
+    ) => {
+      const dateStr = `${year}-${month}-${day}`
+      let label = today ? `Today, ${dateStr}` : dateStr
+      if (isActive) {
+        label = `Selected ${label}`
+      }
+      if (isDisable) {
+        label = `${label} disabled`
+      }
+      return label
+    },
   },
   shortpassword: {
     title: 'Please input a password',

src/locales/id-ID.ts

@@ -11,6 +11,11 @@ const idID: BaseLang = {
   edit: 'Sunting',
   reset: 'Mengatur Ulang',
   close: 'Tutup',
+  back: 'Kembali',
+  clear: 'Bersihkan',
+  image: {
+    errorTip: 'Gambar gagal dimuat',
+  },
   video: {
     errorTip: 'Terjadi Kesalahan',
     clickRetry: 'Coba Lagi',
@@ -40,6 +45,24 @@ const idID: BaseLang = {
     today: 'Hari ini',
     loadPreviousMonth: 'Muat Bulan Sebelumnya',
     noEarlierMonth: 'Tidak Ada Bulan Sebelumnya',
+    dayAriaLabel: (
+      year: number,
+      month: number,
+      day: number,
+      today: boolean,
+      isActive: boolean,
+      isDisable: boolean
+    ) => {
+      const dateStr = `${year}-${month}-${day}`
+      let label = today ? `Hari ini, ${dateStr}` : dateStr
+      if (isActive) {
+        label = `Dipilih ${label}`
+      }
+      if (isDisable) {
+        label = `${label} dinonaktifkan`
+      }
+      return label
+    },
   },
   shortpassword: {
     title: 'SIlakan masukan kata sandi',

src/locales/ja-JP.ts

@@ -10,6 +10,12 @@ const jaJP: BaseLang = {
   select: '選択してください',
   edit: '編集',
   reset: 'リセット',
+  close: '閉じる',
+  back: '戻る',
+  clear: 'クリア',
+  image: {
+    errorTip: '画像の読み込みに失敗しました',
+  },
   video: {
     errorTip: '動画の読み込みに失敗しました',
     clickRetry: 'クリックして再試行',
@@ -41,6 +47,26 @@ const jaJP: BaseLang = {
     today: '今日',
     loadPreviousMonth: '前の月を読み込む',
     noEarlierMonth: 'これより前の月はありません',
+    dayAriaLabel: (
+      year: number,
+      month: number,
+      day: number,
+      today: boolean,
+      isActive: boolean,
+      isDisable: boolean
+    ) => {
+      if (isActive) {
+        return today
+          ? `今日${month}月${day}日を選択しました`
+          : `${month}月${day}日を選択しました`
+      }
+      if (isDisable) {
+        return today
+          ? `今日${month}月${day}日は無効です`
+          : `${month}月${day}日は無効です`
+      }
+      return today ? `今日${month}月${day}日` : `${month}月${day}日`
+    },
   },
   shortpassword: {
     title: 'パスワードを入力してください',
@@ -142,7 +168,6 @@ const jaJP: BaseLang = {
     errorCanvasTips: '現在の環境はCanvasをサポートしていません',
   },
   mask: 'マスク',
-  close: '閉じる',
   quickenter: {
     title: 'クイックアクセス',
   },

src/locales/tr-TR.ts

@@ -11,6 +11,11 @@ const trTR: BaseLang = {
   edit: 'düzenlemek',
   reset: 'sıfırlama',
   close: 'Kapat',
+  back: 'Geri',
+  clear: 'Temizle',
+  image: {
+    errorTip: 'Resim yüklenemedi',
+  },
   video: {
     errorTip: 'Video yüklenemedi',
     clickRetry: 'Yeniden Tıklayın',
@@ -48,6 +53,24 @@ const trTR: BaseLang = {
     today: 'Bugün',
     loadPreviousMonth: 'Önceki ayı yükle',
     noEarlierMonth: 'Önceki ay yok',
+    dayAriaLabel: (
+      year: number,
+      month: number,
+      day: number,
+      today: boolean,
+      isActive: boolean,
+      isDisable: boolean
+    ) => {
+      const dateStr = `${year}-${month}-${day}`
+      let label = today ? `Bugün, ${dateStr}` : dateStr
+      if (isActive) {
+        label = `Seçili ${label}`
+      }
+      if (isDisable) {
+        label = `${label} devre dışı`
+      }
+      return label
+    },
   },
   shortpassword: {
     title: 'Lütfen şifrenizi girin',

src/locales/vi-VN.ts

@@ -11,6 +11,11 @@ const viVN: BaseLang = {
   edit: 'Chỉnh sửa',
   reset: 'Đặt lại',
   close: 'Đóng',
+  back: 'Quay lại',
+  clear: 'Xóa',
+  image: {
+    errorTip: 'Tải ảnh không thành công',
+  },
   video: {
     errorTip: 'Tải video không thành công',
     clickRetry: 'Nhấn để thử lại',
@@ -41,6 +46,24 @@ const viVN: BaseLang = {
     today: 'Hôm nay',
     loadPreviousMonth: 'Tải dữ liệu của tháng trước',
     noEarlierMonth: 'Không có tháng nào sớm hơn',
+    dayAriaLabel: (
+      year: number,
+      month: number,
+      day: number,
+      today: boolean,
+      isActive: boolean,
+      isDisable: boolean
+    ) => {
+      const dateStr = `${year}-${month}-${day}`
+      let label = today ? `Hôm nay, ${dateStr}` : dateStr
+      if (isActive) {
+        label = `Đã chọn ${label}`
+      }
+      if (isDisable) {
+        label = `${label} bị vô hiệu`
+      }
+      return label
+    },
   },
   shortpassword: {
     title: 'Vui lòng nhập mật khẩu',

src/locales/zh-CN.ts

@@ -11,6 +11,11 @@ const zhCN: BaseLang = {
   edit: '编辑',
   reset: '重置',
   close: '关闭',
+  back: '返回',
+  clear: '清除',
+  image: {
+    errorTip: '图片加载失败',
+  },
   video: {
     errorTip: '视频加载失败',
     clickRetry: '点击重试',
@@ -42,6 +47,26 @@ const zhCN: BaseLang = {
     today: '今天',
     loadPreviousMonth: '加载上一个月',
     noEarlierMonth: '没有更早月份',
+    dayAriaLabel: (
+      year: number,
+      month: number,
+      day: number,
+      today: boolean,
+      isActive: boolean,
+      isDisable: boolean
+    ) => {
+      if (isActive) {
+        return today
+          ? `已选定今日${month}月${day}号`
+          : `已选定${month}月${day}号`
+      }
+      if (isDisable) {
+        return today
+          ? `${month}月${day}号今日按钮变暗`
+          : `${month}月${day}号按钮变暗`
+      }
+      return today ? `${month}月${day}号今日` : `${month}月${day}号`
+    },
   },
   shortpassword: {
     title: '请输入密码',