Merge pull request #182 from willnewii/dev

Dev
willnewii · Jan 25, 2021 · c95e925 · c95e925
2 parents bb728ee + c0ddc54
commit c95e925
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 23 deletions.
diff --git a/.electron-vue/fix.js b/.electron-vue/fix.js
@@ -10,7 +10,8 @@ let packagePaths = [
     path.join(__dirname, "..", "node_modules/upyun/node_modules/axios/package.json"),
     path.join(__dirname, "..", "node_modules/ali-oss/package.json"),
     path.join(__dirname, "..", "node_modules/agentkeepalive/package.json"),
-    path.join(__dirname, "..", "node_modules/ali-oss/node_modules/agentkeepalive/package.json")
+    path.join(__dirname, "..", "node_modules/ali-oss/node_modules/agentkeepalive/package.json"),
+    path.join(__dirname, "..", "node_modules/aws-sdk/package.json")
 ]
 
 packagePaths.forEach((path) => {

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
-# 云存储管理客户端 v0.5.1
+# 云存储管理客户端 v0.5.3
 
-![](http://blog-res.mayday5.me/file/icon.png?imageView2/1/w/80/h/80/q/75|imageslim) 朋友给做的新图标
+![](http://blog-res.mayday5.me/file/icon.png?imageView2/1/w/80/h/80/q/75|imageslim) 我老婆(2020.12.03 👩‍❤️‍👨)给做的新图标
 > 云存储管理客户端。支持七牛云、腾讯云、青云、阿里云、又拍云、亚马逊S3、京东云。仿文件夹式管理、图片预览、拖拽上传、文件夹上传、同步、批量导出URL等功能
 
 ## 效果图
@@ -14,6 +14,10 @@
 ![屏幕快照 2018-12-25 下午4.28.47.png](http://blog-res.mayday5.me/img/%E5%B1%8F%E5%B9%95%E5%BF%AB%E7%85%A7%202018-12-25%20%E4%B8%8B%E5%8D%884.28.47.png)
 
 ## 更新说明
+2021.01.25
+***
+- fix aws 文件上传失败
+
 2020.07.13
 ***
 - 使用indexDB缓存数据,对读取几千条数据的存储桶更友好(上万的条的没测试过，不好说).
@@ -115,7 +119,7 @@ old
 
 ## 下载
 
-- [云存储管理客户端-0.5.1-mac.dmg](http://blog-res.mayday5.me/file/%E4%BA%91%E5%AD%98%E5%82%A8%E7%AE%A1%E7%90%86%E5%AE%A2%E6%88%B7%E7%AB%AF-0.5.1-mac.dmg)
+- [云存储管理客户端-0.5.3-mac.dmg](http://blog-res.mayday5.me/file/%E4%BA%91%E5%AD%98%E5%82%A8%E7%AE%A1%E7%90%86%E5%AE%A2%E6%88%B7%E7%AB%AF-0.5.3-mac.dmg)
 - [云存储管理客户端-0.5.1-win.exe](http://blog-res.mayday5.me/file/%E4%BA%91%E5%AD%98%E5%82%A8%E7%AE%A1%E7%90%86%E5%AE%A2%E6%88%B7%E7%AB%AF-0.5.1-win.exe)
 
 ## Build Setup

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "qiniuclient",
     "cnname": "云存储管理客户端",
     "cdnPath": "",
-    "version": "0.5.1",
+    "version": "0.5.3",
     "description": "云存储管理客户端。仿文件夹式管理、图片预览、拖拽上传、文件夹上传、同步、批量导出URL等功能",
     "author": "诗人的咸鱼 <willnewii@163.com>",
     "license": "MIT",

diff --git a/src/main/index.dev.js b/src/main/index.dev.js
@@ -11,24 +11,25 @@
 // process.env.NODE_ENV = 'development';
 // process.env.BABEL_ENV = 'main';
 
-require('babel-register')({
+require("babel-register")({
     ignore: /node_modules/
-});
+})
 
 // Install `electron-debug` with `devtron`
-require('electron-debug')({showDevTools: true});
+require("electron-debug")({ showDevTools: true })
 
 // Install `vue-devtools`
-require('electron').app.on('ready', () => {
-    let installExtension = require('electron-devtools-installer');
-    installExtension.default(installExtension.VUEJS_DEVTOOLS)
+require("electron").app.on("ready", () => {
+    let installExtension = require("electron-devtools-installer")
+    installExtension
+        .default(installExtension.VUEJS_DEVTOOLS)
         .then((name) => {
-            console.log(`install:${name}`);
+            console.log(`install:${name}`)
         })
-        .catch(err => {
-            console.log('Unable to install `vue-devtools`: \n', err);
-        });
-});
+        .catch((err) => {
+            console.log("Unable to install `vue-devtools`: \n", err)
+        })
+})
 
 // Require `main` process to boot app
-require('./index');
+require("./index")
diff --git a/src/main/index.js b/src/main/index.js
@@ -248,7 +248,7 @@ const getMenuData = function () {
                         //
                         if (mainWindow) {
                             //console.log(path.join(app.getPath('userData'), 'Cache'));
-                            mainWindow.webContents.session.clearCache(function () {
+                            mainWindow.webContents.session.clearCache().then(()=>{
                                 mainWindow.loadURL(util.mainURL);
                             });
                         }

diff --git a/src/renderer/components/ResourceList.vue b/src/renderer/components/ResourceList.vue
@@ -62,7 +62,7 @@
                     >
                         <template v-if="file._directory">
                             <Icon class="file" :type="file._icon" size="50"></Icon>
-                            <span class="name">{{ file._name }}</span>
+                            <span class="name" :title="file._name">{{ file._name }}</span>
                         </template>
                         <template v-else>
                             <img
@@ -71,7 +71,7 @@
                                 v-lazy="file.imgObj"
                             />
                             <Icon v-else class="file" :type="file._icon" size="50"></Icon>
-                            <span class="name">{{ file.displayName }}</span>
+                            <span class="name" :title="file.displayName">{{ file.displayName }}</span>
                             <div class="btn">
                                 <Button
                                     shape="circle"
@@ -112,11 +112,11 @@
             >
                 <template v-if="file._directory">
                     <Icon :type="file._icon" size="15"></Icon>
-                    <span class="name">{{ file._name }}</span>
+                    <span class="name" :title="file._name">{{ file._name }}</span>
                 </template>
                 <template v-else>
                     <Icon :type="file._icon" size="15"></Icon>
-                    <span class="name">{{ file.displayName }}</span>
+                    <span class="name" :title="file.displayName">{{ file.displayName }}</span>
                     <span class="date">{{ file.putTime | formatDate }}</span>
                     <span class="size">{{ file.fsize | formatFileSize }}</span>
                 </template>

diff --git a/src/renderer/pages/Main.vue b/src/renderer/pages/Main.vue
@@ -12,7 +12,7 @@
                             <template v-if="menuState">
                                 <Icon :size="item.size ? item.icon : 25"
                                       :type="item.permission === 1 ? 'md-lock' : (bucketInfo.name === item.name ? 'md-folder-open' : 'md-folder')"></Icon>
-                                <span class="layout-text">{{item.name}}</span>
+                                <span class="layout-text" :title="item.name" >{{item.name}}</span>
                             </template>
                             <template v-else>
                                 <span class="layout-icon">{{item.name.substring(0,1)}}</span>