Merge pull request #32 from LHRUN/dev

Dev
LHRUN · Jan 14, 2024 · f4906e0 · f4906e0
2 parents cebebd5 + a87c760
commit f4906e0
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 1.2.1
+
+### Fix
+
+- fix bottom operation tooltip display
+
 # 1.2.0
 
 ### Feat

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "paint-board",
   "private": true,
-  "version": "1.2.0",
+  "version": "1.2.1",
   "type": "module",
   "scripts": {
     "dev": "vite",

diff --git a/src/components/boardOperation/index.tsx b/src/components/boardOperation/index.tsx
@@ -77,7 +77,7 @@ const BoardOperation = () => {
 
   return (
     <>
-      <div className="fixed bottom-5 left-2/4 -translate-x-2/4 flex items-center bg-[#eef1ff] rounded-full xs:flex-col xs:right-5 xs:left-auto xs:translate-x-0 xs:justify-normal xs:max-h-[70vh] overflow-y-auto noScrollbar">
+      <div className="fixed bottom-5 left-2/4 -translate-x-2/4 flex items-center bg-[#eef1ff] rounded-full xs:flex-col xs:right-5 xs:left-auto xs:translate-x-0 xs:justify-normal xs:max-h-[70vh] xs:overflow-y-auto xs:noScrollbar">
         {showOperation && (
           <>
             <div
@@ -149,7 +149,8 @@ const BoardOperation = () => {
             </div>
             <label
               htmlFor="my-drawer-4"
-              className="cursor-pointer py-1.5 pl-2 pr-3 rounded-r-full hover:bg-slate-200 xs:pr-2 xs:rounded-r-none xs:rounded-b-full"
+              className="min-xs:tooltip cursor-pointer py-1.5 pl-2 pr-3 rounded-r-full hover:bg-slate-200 xs:pr-2 xs:rounded-r-none xs:rounded-b-full"
+              data-tip={t('operate.fileList')}
               onClick={() => updateShowFile(true)}
             >
               <FileListIcon />

diff --git a/src/i18n/en.json b/src/i18n/en.json
@@ -27,7 +27,8 @@
     "text": "add text",
     "image": "upload image",
     "clean": "clean",
-    "save": "Save as image"
+    "save": "Save as image",
+    "fileList": "File List"
   },
   "info": {
     "welecome": "Welcome to star",

diff --git a/src/i18n/zh.json b/src/i18n/zh.json
@@ -27,7 +27,8 @@
     "text": "添加文字",
     "image": "上传图片",
     "clean": "清除画板",
-    "save": "保存为图片"
+    "save": "保存为图片",
+    "fileList": "文件列表"
   },
   "info": {
     "welecome": "欢迎Star",

diff --git a/src/store/files.ts b/src/store/files.ts
@@ -49,7 +49,7 @@ interface FileAction {
 }
 
 const initId = uuidv4()
-export const BOARD_VERSION = '1.2.0'
+export const BOARD_VERSION = '1.2.1'
 
 const useFileStore = create<FileState & FileAction>()(
   persist(