Dev

Makefile

@@ -1,5 +1,5 @@
 
-VERSION=1.4.5
+VERSION=1.5.0
 NAME=oss-browser
 CUSTOM=./custom
 
@@ -31,23 +31,28 @@ build:
 	node gen.js
 
 win64:
-	$(BUILD) --platform=win32 --arch=x64
+	$(BUILD) --platform=win32 --arch=x64 --icon=$(CUSTOM)/icon.ico
+	cp -rf $(CUSTOM) build/$(NAME)-win32-x64/resources
 	rm -rf releases/$(VERSION)/$(NAME)-win32-x64.zip && mkdir -p releases/$(VERSION)
 	cd build && $(ZIP) ../releases/$(VERSION)/$(NAME)-win32-x64.zip $(NAME)-win32-x64/
 win32:
-	$(BUILD) --platform=win32 --arch=ia32
+	$(BUILD) --platform=win32 --arch=ia32 --icon=$(CUSTOM)/icon.ico
+	cp -rf $(CUSTOM) build/$(NAME)-win32-ia32/resources
 	rm -rf releases/$(VERSION)/$(NAME)-win32-ia32.zip && mkdir -p releases/$(VERSION)
 	cd build && $(ZIP) ../releases/$(VERSION)/$(NAME)-win32-ia32.zip $(NAME)-win32-ia32/
 linux64:
 	$(BUILD) --platform=linux --arch=x64
+	cp -rf $(CUSTOM) build/$(NAME)-linux-x64/resources
 	rm -rf releases/$(VERSION)/$(NAME)-linux-x64.zip && mkdir -p releases/$(VERSION)
 	cd build && $(ZIP) ../releases/$(VERSION)/$(NAME)-linux-x64.zip $(NAME)-linux-x64/
 linux32:
 	$(BUILD) --platform=linux --arch=ia32
+	cp -rf $(CUSTOM) build/$(NAME)-linux-ia32/resources
 	rm -rf releases/$(VERSION)/$(NAME)-linux-ia32.zip && mkdir -p releases/$(VERSION)
 	cd build && $(ZIP) ../releases/$(VERSION)/$(NAME)-linux-ia32.zip $(NAME)-linux-ia32/
 mac:
 	$(BUILD) --platform=darwin --arch=x64 --icon=$(CUSTOM)/icon.icns
+	cp -rf $(CUSTOM) build/$(NAME)-darwin-x64/$(NAME).app/Contents/Resources
 	rm -rf releases/$(VERSION)/$(NAME)-darwin-x64.zip && mkdir -p releases/$(VERSION)
 	cd build && $(ZIP) ../releases/$(VERSION)/$(NAME)-darwin-x64.zip $(NAME)-darwin-x64/
 dmg:
@@ -61,5 +66,4 @@ dmg:
 all:win32 win64 linux32 linux64 mac
 	@echo 'Done'
 
-
 .PHONY:build

Readme.md

@@ -10,21 +10,20 @@ OSS Browser 提供类似windows资源管理器功能。用户可以很方便的
 
 ## 1. 客户端下载：
 
-最新版本`1.4.5`，下载地址如下，解压即可使用。
+最新版本`1.5.0`，下载地址如下，解压即可使用。
 
-> [<h4>Window x32版下载</h4>](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.4.5/oss-browser-win32-ia32.zip)
+> [<h4>Window x32版下载</h4>](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.5.0/oss-browser-win32-ia32.zip)
 
 
-> [<h4>Window x64版下载</h4>](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.4.5/oss-browser-win32-x64.zip)
+> [<h4>Window x64版下载</h4>](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.5.0/oss-browser-win32-x64.zip)
 
-> [<h4>Mac dmg版下载</h4>](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.4.5/oss-browser.dmg)
 
-> [<h4>Mac zip版下载</h4>](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.4.5/oss-browser-darwin-x64.zip)
+> [<h4>Mac zip版下载</h4>](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.5.0/oss-browser-darwin-x64.zip)
 
 
-> [<h4>Ubuntu x64版</h4>](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.4.5/oss-browser-linux-x64.zip)
+> [<h4>Ubuntu x64版</h4>](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.5.0/oss-browser-linux-x64.zip)
 
-> [<h4>Ubuntu x32版</h4>](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.4.5/oss-browser-linux-ia32.zip)
+> [<h4>Ubuntu x32版</h4>](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.5.0/oss-browser-linux-ia32.zip)
 
 
 其他版本暂不提供，可以自行build。

app/app.css

@@ -107,3 +107,69 @@ html, body {
 .truncate{
   white-space: nowrap; overflow: hidden; text-overflow: ellipsis;
 }
+
+
+
+
+.loadEffect {
+  width: 100px;
+  height: 100px;
+  margin: 0 auto;
+  margin-top:100px;
+  position: relative;
+}
+.loadEffect div{
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  -webkit-animation: load 2.08s linear infinite;
+}
+.loadEffect div span{
+  display: inline-block;
+  width: 20px;
+  height: 20px;
+  border-radius: 50%;
+  background: lightgreen;
+  position: absolute;
+  left: 50%;
+  margin-top: -10px;
+  margin-left: -10px;
+}
+@-webkit-keyframes load{
+  0%{
+      -webkit-transform: rotate(0deg);
+  }
+  10%{
+      -webkit-transform: rotate(45deg);
+  }
+  50%{
+      opacity: 1;
+      -webkit-transform: rotate(160deg);
+  }
+  62%{
+      opacity: 0;
+  }
+  65%{
+      opacity: 0;
+      -webkit-transform: rotate(200deg);
+  }
+  90%{
+      -webkit-transform: rotate(340deg);
+  }
+  100%{
+      -webkit-transform: rotate(360deg);
+  }
+
+}
+.loadEffect div:nth-child(1){
+  -webkit-animation-delay:0.2s;
+}
+.loadEffect div:nth-child(2){
+  -webkit-animation-delay:0.4s;
+}
+.loadEffect div:nth-child(3){
+  -webkit-animation-delay:0.6s;
+}
+.loadEffect div:nth-child(4){
+  -webkit-animation-delay:0.8s;
+}

app/components/filters/formater.js

@@ -73,7 +73,7 @@ angular.module('web')
 
     return function (n, ex) {
       if (n == 0)return 0;
-      if(!n)return '';
+      if(!n)return '0';
 
       var t = [];
       var left = n;

app/components/services/auth.js

@@ -18,6 +18,8 @@ angular.module('web')
           var info = ossSvs2.parseOSSPath(data.osspath);
           data.bucket = info.bucket;
 
+          console.log(data)
+
           ossSvs2.getClient(data).listObjects({Bucket: info.bucket, Prefix: info.key, Marker:'',MaxKeys:1}, function(err, result){
 
             if(err){