xianniu-ui 0.8.53 → 0.8.54

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xianniu-ui",
-  "version": "0.8.53",
+  "version": "0.8.54",
   "private": false,
   "main": "lib/xianniu-ui.umd.min.js",
   "scripts": {

package/packages/upload/main.vue

@@ -367,10 +367,11 @@ export default {
         .then((res) => {
           this.successFiles.push(res);
 
-          this.realFileList.forEach((item, idx) => {
+          this.realFileList.forEach((item) => {
             if (item.uid === res.file.uid) {
-              delete res.file;
-              this.$set(this.realFileList, idx, res);
+              const obj = JSON.parse(JSON.stringify(res));
+              delete obj.file;
+              item = Object.assign(item, obj);
             }
           });
 
@@ -380,7 +381,7 @@ export default {
           this.$emit("on-uploaded", true);
           this.isUploading = false;
         })
-        .catch(({ fileName }) => {
+        .catch(({fileName}) => {
           this.$notify.error({
             title: "上传失败",
             dangerouslyUseHTMLString: true,

package/src/oss/index.js

@@ -11,12 +11,19 @@ class Client {
     }
 
     getToken() {
+        const _token = localStorage.getItem('xnToken');
+        if (!_token) return '';
+
+        const isQuotedString = /^".*"$/.test(_token);
         try {
-            const _token = localStorage.getItem('xnToken');
-            return _token ? JSON.parse(_token) : '';
+            if (isQuotedString) {
+                return _token.slice(1, -1);
+            } else {
+                return JSON.parse(_token);
+            }
         } catch (error) {
             console.error('Failed to parse token:', error);
-            return '';
+            return _token;
         }
     }
 
@@ -40,7 +47,7 @@ class Client {
         if (!this.stsUrl) {
             console.error('获取临时凭证地址不能为空');
             file.onError();
-            return;
+            return Promise.reject('获取临时凭证地址不能为空');
         }
 
         try {
@@ -55,9 +62,11 @@ class Client {
                 bucket,
                 region
             });
+            return this;
         } catch (err) {
             console.error('获取临时凭证失败:', err);
-            throw err;
+            file.onError();
+            return Promise.reject(err);
         }
     }
 
@@ -71,50 +80,57 @@ class Client {
                 },
                 body: JSON.stringify(params)
             });
+
+            if (!response.ok) {
+                throw new Error(`HTTP error! status: ${response.status}`);
+            }
+
             const { data } = await response.json();
             return data;
         } catch (err) {
             console.error('设置文件ID失败:', err);
-            throw err;
+            return Promise.reject(err);
         }
     }
 
-    async upload(file, headers = {}) {
-        const currentFile = file.file;
-        const fileName = currentFile.name;
-        const newFileName = this.getFileNameUUID() + '.' + this.getExt(currentFile);
-        const path = `accessory/${$dayjs().format('YYYY/MM/DD')}/`;
+    upload(file, headers = {}) {
+        // eslint-disable-next-line no-async-promise-executor
+        return new Promise(async (resolve, reject) => {
+            const currentFile = file.file;
+            const fileName = currentFile.name;
+            const newFileName = this.getFileNameUUID() + '.' + this.getExt(currentFile);
+            const path = `accessory/${$dayjs().format('YYYY/MM/DD')}/`;
 
-        try {
-            await this.getStsToken(file);
-
-            const res = await this.oss.multipartUpload(path + newFileName, currentFile, {
-                ...headers,
-                progress: (p) => {
-                    const _progress = parseFloat(p * 100);
-                    file.onProgress({ percent: _progress });
-                }
-            });
+            try {
+                await this.getStsToken(file);
+                const res = await this.oss.multipartUpload(path + newFileName, currentFile, {
+                    ...headers,
+                    progress: (p) => {
+                        const _progress = parseFloat(p * 100);
+                        file.onProgress({ percent: _progress });
+                    }
+                });
 
-            const obj = {
-                name: fileName,
-                size: currentFile.size,
-                ext: this.getExt(currentFile),
-                imgFlag: Number(this.isImg(currentFile)),
-                isAV: Number(this.isAV(currentFile)),
-                url: this.uploadHost + res.name,
-                accessoryName: fileName,
-                accessorySize: currentFile.size
-            };
-            
-            const fileIdResponse = await this.setFileId(obj);
-            file.onSuccess();
-            return { ...obj, fileId: fileIdResponse.fileId, file: currentFile };
-        } catch (err) {
-            file.onError();
-            console.error('上传文件失败:', err);
-            throw err;
-        }
+                const fileObj = {
+                    name: fileName,
+                    size: currentFile.size,
+                    ext: this.getExt(currentFile),
+                    imgFlag: Number(this.isImg(currentFile)),
+                    isAV: Number(this.isAV(currentFile)),
+                    url: this.uploadHost + res.name,
+                    accessoryName: fileName,
+                    accessorySize: currentFile.size
+                };
+
+                const fileIdResponse = await this.setFileId(fileObj);
+                file.onSuccess();
+                resolve({ ...fileObj, fileId: fileIdResponse.fileId, file: currentFile });
+            } catch (err) {
+                console.error('上传文件失败:', err);
+                file.onError();
+                reject({ file, fileName, err });
+            }
+        });
     }
 }