Merge branch 'next' into feat/picker

jdf2e · Dec 5, 2024 · 31ccb51 · 31ccb51
2 parents b8f79ae + 402e32f
commit 31ccb51
Show file tree

Hide file tree

Showing 7 changed files with 257 additions and 88 deletions.
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -3,6 +3,7 @@
   "extends": [
     "config:base", "schedule:weekly", "group:allNonMajor"
   ],
+  "baseBranches": ["feat_v3.x"],
   "rangeStrategy": "bump",
   "labels": ["dependencies"],
   "ignorePaths": [

diff --git a/packages/nutui-optimize-css/package.json b/packages/nutui-optimize-css/package.json
@@ -16,7 +16,7 @@
     "@types/postcss-css-variables": "^0.18.3",
     "ts-node": "^10.9.2",
     "unbuild": "^2.0.0",
-    "vitest": "^1.5.0"
+    "vitest": "^2.1.7"
   },
   "dependencies": {
     "lodash": "^4.17.21",

diff --git a/packages/nutui-replace-icons/package.json b/packages/nutui-replace-icons/package.json
@@ -43,7 +43,7 @@
     "@babel/preset-react": "^7.25.7",
     "@types/babel__core": "^7.20.5",
     "@types/babel__generator": "^7.6.8",
-    "vitest": "^1.5.0"
+    "vitest": "^2.1.7"
   },
   "devDependencies": {
     "@types/lodash.kebabcase": "^4.1.9",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/packages/uploader/uploader.scss b/src/packages/uploader/uploader.scss
@@ -178,7 +178,8 @@
         display: flex;
         justify-content: center;
         align-items: center;
-        height: 100%;
+        width: $uploader-image-width;
+        height: $uploader-image-height;
         position: initial;
         border-radius: $uploader-image-border-radius;
       }

diff --git a/src/packages/uploader/uploader.taro.tsx b/src/packages/uploader/uploader.taro.tsx
@@ -387,6 +387,7 @@ const InternalUploader: ForwardRefRenderFunction<
   }
 
   const readFile = <T extends TFileType>(files: T[]) => {
+    const results: FileItem[] = []
     files.forEach((file: T, index: number) => {
       let fileType = file.type
       const filepath = (file.tempFilePath || file.path) as string
@@ -428,8 +429,9 @@ const InternalUploader: ForwardRefRenderFunction<
         fileItem.url = fileType === 'video' ? file.thumbTempFilePath : filepath
       }
       executeUpload(fileItem, index)
-      setFileList([...fileList, fileItem])
+      results.push(fileItem)
     })
+    setFileList([...fileList, ...results])
   }
 
   const filterFiles = <T extends TFileType>(files: T[]) => {

diff --git a/src/packages/uploader/uploader.tsx b/src/packages/uploader/uploader.tsx
@@ -288,6 +288,7 @@ const InternalUploader: ForwardRefRenderFunction<
   }
 
   const readFile = (files: File[]) => {
+    const results: FileItem[] = []
     files.forEach((file: File, index: number) => {
       const formData = new FormData()
       formData.append(name, file)
@@ -306,13 +307,15 @@ const InternalUploader: ForwardRefRenderFunction<
         const reader = new FileReader()
         reader.onload = (event: ProgressEvent<FileReader>) => {
           fileItem.url = (event.target as FileReader).result as string
-          setFileList([...fileList, fileItem])
+          // setFileList([...fileList, fileItem])
+          results.push(fileItem)
         }
         reader.readAsDataURL(file)
       } else {
-        setFileList([...fileList, fileItem])
+        results.push(fileItem)
       }
     })
+    setFileList([...fileList, ...results])
   }
 
   const filterFiles = (files: File[]) => {