Skip to content

Commit 65343e6

Browse files
aleelockaleelock
authored
Merge pull request #55 from aliyun/dev
Dev
2 parents 26a0de7 + 1231957 commit 65343e6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+29921
-15662
lines changed

‎Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
ELECTRON_MIRROR=http://npm.taobao.org/mirrors/electron/
2-
ELECTRON_VERSION=1.7.5
3-
BUILD=ELECTRON_MIRROR=$(ELECTRON_MIRROR) electron-packager ./dist --asar --overwrite --out=build --version $(ELECTRON_VERSION)
1+
# ELECTRON_MIRROR=http://npm.taobao.org/mirrors/electron/
2+
# ELECTRON_VERSION=1.6.5
3+
# BUILD=ELECTRON_MIRROR=$(ELECTRON_MIRROR) electron-packager ./dist --asar --overwrite --out=build --version $(ELECTRON_VERSION)
44

5-
VERSION=1.3.1
5+
VERSION=1.3.2
66
NAME=oss-browser
77

88
i:

‎Readme.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ OSS Browser 提供类似windows资源管理器功能。用户可以很方便的
1010

1111
## 1. 客户端下载：
1212

13-
最新版本`1.3.1`，下载地址如下，解压即可使用。
13+
最新版本`1.3.2`，下载地址如下，解压即可使用。
1414

15-
> [<h4>Window x32版下载</h4>](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.1/oss-browser-win32-ia32.zip)
15+
> [<h4>Window x32版下载</h4>](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.2/oss-browser-win32-ia32.zip)
1616
1717

18-
> [<h4>Window x64版下载</h4>](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.1/oss-browser-win32-x64.zip)
18+
> [<h4>Window x64版下载</h4>](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.2/oss-browser-win32-x64.zip)
1919
20-
> [<h4>Mac 版下载</h4>](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.1/oss-browser.dmg)
20+
> [<h4>Mac 版下载</h4>](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.2/oss-browser.dmg)
2121
22-
> [<h4>Ubuntu x64版</h4>](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.1/oss-browser-linux-x64.zip)
22+
> [<h4>Ubuntu x64版</h4>](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.2/oss-browser-linux-x64.zip)
2323
2424
其他版本暂不提供，可以自行build。
2525

‎all-releases.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ All Releases for [ OSS Browser ]
22

33
||Windows ia32|Windows x64| Mac |Linux x64|
44
|-----|-----|-----|---------|--------|
5+
|1.3.2|[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.2/oss-browser-win32-ia32.zip) |[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.2/oss-browser-win32-x64.zip) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.2/oss-browser.dmg) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.2/oss-browser-linux-x64.zip) |
56
|1.3.1|[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.1/oss-browser-win32-ia32.zip) |[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.1/oss-browser-win32-x64.zip) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.1/oss-browser.dmg) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.1/oss-browser-linux-x64.zip) |
67
|1.3.0|[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.0/oss-browser-win32-ia32.zip) |[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.0/oss-browser-win32-x64.zip) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.0/oss-browser.dmg) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.3.0/oss-browser-linux-x64.zip) |
78
|1.2.5|[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.2.5/oss-browser-win32-ia32.zip) |[Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.2.5/oss-browser-win32-x64.zip) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.2.5/oss-browser.dmg) | [Download](https://luogc.oss-cn-hangzhou.aliyuncs.com/oss-browser-publish/1.2.5/oss-browser-linux-x64.zip) |

‎app/app.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ angular.module('web', ['ui.router',
33
'ui.codemirror',
44
'pascalprecht.translate',
55
'ngSanitize',
6-
'templates'
6+
'templates',
7+
'ui.bootstrap.contextMenu'
78
])
89
.config(['$stateProvider', '$urlRouterProvider', '$translateProvider',
910
function ($stateProvider, $urlRouterProvider, $translateProvider) {

‎app/components/services/auth.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ angular.module('web')
99

1010
function login(data) {
1111
var df = $q.defer();
12-
data.httpOptions={timeout:3000};
12+
data.httpOptions={timeout:5000};
1313

1414
if (data.osspath) {
1515

‎app/components/services/oss-download-manager.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ angular.module('web')
290290
});
291291
//console.log('save:', t);
292292

293-
fs.writeFileSync(getDownProgFilePath(), JSON.stringify(t, ' ', 2));
293+
fs.writeFileSync(getDownProgFilePath(), JSON.stringify(t));
294294
$scope.calcTotalProg();
295295
},20);
296296
}
@@ -301,10 +301,11 @@ angular.module('web')
301301
function loadProg() {
302302
try {
303303
var data = fs.readFileSync(getDownProgFilePath());
304+
return JSON.parse(data ? data.toString() : '[]');
304305
} catch (e) {
305306

306307
}
307-
return JSON.parse(data ? data.toString() : '[]');
308+
return [];
308309
}
309310

310311
//下载进度保存路径

‎app/components/services/oss-upload-manager.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ angular.module('web')
329329
//console.log('request save upload:', t);
330330

331331
//console.log('-save')
332-
fs.writeFileSync(getUpProgFilePath(), JSON.stringify(t, ' ', 2));
332+
fs.writeFileSync(getUpProgFilePath(), JSON.stringify(t));
333333
$scope.calcTotalProg();
334334
}, 20);
335335
}
@@ -340,10 +340,11 @@ angular.module('web')
340340
function loadProg() {
341341
try {
342342
var data = fs.readFileSync(getUpProgFilePath());
343+
return JSON.parse(data ? data.toString() : '[]');
343344
} catch (e) {
344345

345346
}
346-
return JSON.parse(data ? data.toString() : '[]');
347+
return [];
347348
}
348349

349350
//上传进度保存路径

‎app/components/services/oss2.js

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1142,8 +1142,9 @@ angular.module('web')
11421142
_dig();
11431143

11441144
function _dig() {
1145-
1145+
//opt.MaxKeys=50
11461146
client.listBuckets(opt, function (err, result) {
1147+
//console.log(opt, err, result)
11471148
if (err) {
11481149
handleError(err);
11491150
reject(err);
@@ -1166,6 +1167,8 @@ angular.module('web')
11661167
});
11671168
t = t.concat(result['Buckets']);
11681169
}
1170+
// resolve(t);
1171+
// console.log(result)
11691172

11701173
if (result.NextMarker) {
11711174
opt.Marker = result.NextMarker;
@@ -1218,6 +1221,14 @@ angular.module('web')
12181221
* object = {id, secret, region, bucket}
12191222
*/
12201223
function getClient(opt) {
1224+
1225+
var options = prepaireOptions(opt)
1226+
//console.log(options)
1227+
var client = new ALY.OSS(options);
1228+
return client;
1229+
}
1230+
1231+
function prepaireOptions(opt){
12211232
var authInfo = AuthInfo.get();
12221233

12231234
var bucket;
@@ -1230,6 +1241,7 @@ angular.module('web')
12301241

12311242
var endpoint = getOssEndpoint(authInfo.region || 'oss-cn-beijing', bucket, authInfo.eptpl);
12321243
var options = {
1244+
region: authInfo.region,
12331245
accessKeyId: authInfo.id || 'a',
12341246
secretAccessKey: authInfo.secret || 'a',
12351247
endpoint: endpoint,
@@ -1243,9 +1255,7 @@ angular.module('web')
12431255
if(authInfo.id && authInfo.id.indexOf('STS.')==0){
12441256
options.securityToken= authInfo.stoken || null;
12451257
}
1246-
//console.log(options)
1247-
var client = new ALY.OSS(options);
1248-
return client;
1258+
return options;
12491259
}
12501260

12511261
function parseOSSPath(ossPath) {

‎app/main/auth/login.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ angular.module('web')
4343
$scope.eptplType = (v==DEF_EP_TPL)?'default':'customize';
4444
});
4545

46-
46+
4747
function eptplChange(t){
4848
$scope.eptplType=t;
4949
console.log(t);
50-
if(t=='default'){
50+
if(t=='default'){
5151
$scope.item.eptpl = DEF_EP_TPL;
5252
}else{
5353
$scope.item.eptpl ='';
@@ -103,7 +103,7 @@ angular.module('web')
103103
$scope.flags.showHis = localStorage.getItem(SHOW_HIS) || 'NO';
104104
angular.extend($scope.item , AuthInfo.getRemember());
105105

106-
106+
107107
//临时token
108108
$scope.item.authToken = localStorage.getItem(KEY_AUTHTOKEN) || '';
109109
authTokenChange();
@@ -166,6 +166,9 @@ angular.module('web')
166166
localStorage.setItem(KEY_REMEMBER,$scope.flags.remember);
167167

168168
var data = angular.copy($scope.item);
169+
//trim password
170+
if(data.secret) data.secret = data.secret.trim();
171+
169172
delete data.authToken;
170173
delete data.securityToken;
171174

@@ -176,6 +179,7 @@ angular.module('web')
176179
Toast.info('正在登录中...', 1000);
177180

178181

182+
179183
Auth.login(data).then(function(){
180184
if($scope.flags.remember=='YES') AuthInfo.addToHistories(data);
181185
Toast.success('登录成功，正在跳转...', 1000);

‎app/main/files/_/bucket-list.html

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<div ng-if="!isLoading && (!buckets || buckets.length==0)" no-data></div>
22

3-
<div ng-if="!isLoading && buckets.length>0" style="height:100%" ng-click="toggleTransVisible(false);">
3+
<div ng-if="!isLoading && buckets.length>0"
4+
context-menu="bucketSpacerMenuOptions"
5+
style="height:100%" ng-click="toggleTransVisible(false);">
46
<table class="table table-condensed table-hover table-striped" ng-if="ref.isListView">
57
<tr>
68
<th>-</th>
@@ -23,9 +25,10 @@
2325
</tr>
2426

2527
<tr ng-repeat="item in buckets|filter:sch.bucketName"
28+
context-menu="bucketMenuOptions"
2629
ng-dblclick="goIn(item.name)"
2730
ng-click="selectBucket(item);"
28-
ng-class="{'info':bucket_sel.item==item}">
31+
ng-class="{'info':bucket_sel.item.name==item.name}">
2932
<td class="text-muted">&nbsp;{{$index+1}}.</td>
3033
<td>
3134
<div class="text-overflow">
@@ -55,7 +58,8 @@
5558
<div ng-repeat="item in buckets|filter:sch.bucketName"
5659
ng-dblclick="goIn(item.name);$event.stopPropagation()"
5760
ng-click="selectBucket(item);$event.stopPropagation()"
58-
class="item-block" ng-class={'active':bucket_sel.item==item}>
61+
context-menu="bucketMenuOptions"
62+
class="item-block" ng-class={'active':bucket_sel.item.name==item.name}>
5963
<i class="fa fa-database" ng-class="{'text-warning':item.storageClass!='Archive'}"></i>
6064
<div class="item-block-name" uib-tooltip-html="'<div class=\'break\'>'+item.name+'</div>'" tooltip-append-to-body="true">{{item.name}}</div>
6165
<div class="item-block-desc">{{item.region}}</div>

0 commit comments

Comments
 (0)