+2. Group number:21985509
+
+## Links
+
+[ossbrowser](https://www.alibabacloud.com/help/doc-detail/61872.htm)
+
+## LICENSE
+
+[Apache License 2.0](LICENSE)
diff --git a/Readme.md b/Readme.md
deleted file mode 100644
index 8827e187..00000000
--- a/Readme.md
+++ /dev/null
@@ -1,164 +0,0 @@
-
-# OSS Browser
-
-OSS Browser 鎻愪緵绫讳技windows璧勬簮绠＄悊鍣ㄥ姛鑳姐傜敤鎴峰彲浠ュ緢鏂逛究鐨勬祻瑙堟枃浠讹紝涓婁紶涓嬭浇鏂囦欢锛屾敮鎸佹柇鐐圭画浼犵瓑銆
-
-鏈伐鍏蜂娇鐢ㄥ紑婧愭鏋 Angular 1.x + [Electron](http://electron.atom.io/)鍒朵綔銆
-
-> Electron 妗嗘灦鍙互璁╀綘浣跨敤 JavaScript锛孒TML 鍜 CSS 鏋勫缓璺ㄥ钩鍙扮殑妗岄潰搴旂敤绋嬪簭銆傚畠鏄熀浜巒ode.js 鍜 Chromium 寮婧愰」鐩侲lectron 鍙互鎵撳寘鍑鸿法骞冲彴鐨勭▼搴忥紝杩愯鍦 Mac锛學indows 鍜 Linux 涓娿
-
-
-## 1. 瀹㈡埛绔笅杞斤細
-
-鏈鏂扮増鏈琡1.2.5`锛屼笅杞藉湴鍧濡備笅锛岃В鍘嬪嵆鍙娇鐢ㄣ
-
-> [
+
-
-
-
-
-
-
-
-
-
+
diff --git a/app/main/files/modals/preview/media-modal.js b/app/main/files/modals/preview/media-modal.js
index f5377cd4..33c7af87 100644
--- a/app/main/files/modals/preview/media-modal.js
+++ b/app/main/files/modals/preview/media-modal.js
@@ -1,51 +1,74 @@
-angular.module('web')
- .controller('mediaModalCtrl', ['$scope', '$uibModalInstance', '$timeout','$sce', '$uibModal', 'ossSvs2', 'safeApply', 'showFn', 'bucketInfo', 'objectInfo', 'fileType',
- function ($scope, $modalInstance, $timeout, $sce, $modal, ossSvs2, safeApply, showFn, bucketInfo, objectInfo, fileType) {
+angular.module("web").controller("mediaModalCtrl", [
+ "$scope",
+ "$uibModalInstance",
+ "$timeout",
+ "$sce",
+ "$uibModal",
+ "ossSvs2",
+ "safeApply",
+ "showFn",
+ "bucketInfo",
+ "objectInfo",
+ "fileType",
+ function (
+ $scope,
+ $modalInstance,
+ $timeout,
+ $sce,
+ $modal,
+ ossSvs2,
+ safeApply,
+ showFn,
+ bucketInfo,
+ objectInfo,
+ fileType
+ ) {
+ angular.extend($scope, {
+ bucketInfo: bucketInfo,
+ objectInfo: objectInfo,
+ fileType: fileType,
+ afterCheckSuccess: afterCheckSuccess,
+ afterRestoreSubmit: afterRestoreSubmit,
- angular.extend($scope, {
- bucketInfo: bucketInfo,
- objectInfo: objectInfo,
- fileType: fileType,
- afterCheckSuccess: afterCheckSuccess,
- afterRestoreSubmit: afterRestoreSubmit,
+ previewBarVisible: false,
+ showFn: showFn,
+ cancel: cancel,
- previewBarVisible: false,
- showFn: showFn,
- cancel: cancel,
+ MAX_SIZE: 5 * 1024 * 1024, //5MB
+ });
- MAX_SIZE: 5 * 1024 * 1024 //5MB
- });
+ function afterRestoreSubmit() {
+ showFn.callback(true);
+ }
- function afterRestoreSubmit() {
- showFn.callback(true);
- }
+ function afterCheckSuccess() {
+ $scope.previewBarVisible = true;
+ genURL();
+ }
- function afterCheckSuccess() {
- $scope.previewBarVisible = true;
- genURL();
- }
+ function cancel() {
+ $modalInstance.dismiss("close");
+ }
- function cancel() {
- $modalInstance.dismiss('close');
- }
+ function genURL() {
+ var url = ossSvs2.signatureUrl2(
+ bucketInfo.region,
+ bucketInfo.bucket,
+ objectInfo.path,
+ 3600
+ );
+ $timeout(function () {
+ $scope.src_origin = url;
+ $scope.src = $sce.trustAsResourceUrl(url);
- function genURL() {
- var url = ossSvs2.signatureUrl(bucketInfo.region, bucketInfo.bucket, objectInfo.path, 3600);
$timeout(function () {
-
- $scope.src_origin = url;
- $scope.src = $sce.trustAsResourceUrl(url);
-
- $timeout(function(){
- var ele = $('#video-player');
- if( parseInt(ele.css('height')) > parseInt(ele.css('width')) ){
- ele.css('height', $(document).height()-240);
- ele.css('width', 'auto');
- }
- },1000);
- }, 300);
- }
-
-
+ var ele = $("#video-player");
+ if (parseInt(ele.css("height")) > parseInt(ele.css("width"))) {
+ ele.css("height", $(document).height() - 240);
+ ele.css("width", "auto");
+ }
+ }, 1000);
+ }, 300);
}
- ]);
+ },
+]);
diff --git a/app/main/files/modals/preview/others-modal.html b/app/main/files/modals/preview/others-modal.html
index d4eac6ff..fcb82f63 100644
--- a/app/main/files/modals/preview/others-modal.html
+++ b/app/main/files/modals/preview/others-modal.html
@@ -1,19 +1,25 @@
Content-Language:
@@ -62,16 +84,27 @@
+
+
- - {{'preview'|translate}} - ({{objectInfo.size|sizeFormat}})
+ + {{'preview'|translate}} + ({{objectInfo.size|sizeFormat}}) +
-
- oss://{{bucketInfo.bucket}}/{{objectInfo.path}}
-
-
-
+
+ oss://{{bucketInfo.bucket}}/{{objectInfo.path}}
+
+
+
Content-Disposition:
@@ -53,7 +70,12 @@
{{'cannot.preview.this.file'|translate}}
@@ -21,7 +27,13 @@
-
-
-
-
+
+ oss://{{bucketInfo.bucket}}/{{objectInfo.path}}
+
- oss://{{bucketInfo.bucket}}/{{objectInfo.path}}
-
-
-
-
+
+
- ![{{'cannot.preview'|translate}}]()
+ ![{{'cannot.preview'|translate}}]()
-
-
-
- oss://{{moveTo.bucket}}/{{moveTo.key}}
+
+ oss://{{moveTo.bucket}}/{{moveTo.key}}
+
-
-
-
+
-
+
-
-
- oss://{{currentInfo.bucket}}/{{currentInfo.key}}{{item.name}}
+
+ oss://{{currentInfo.bucket}}/{{currentInfo.key}}{{item.name}}
+
@@ -25,30 +26,47 @@
{{'restore.onprogress'|translate}}
-
-
- {{'restore.message2'|translate}}:
- {{info['expiry_date']}}
-
-
+
+
+ {{'restore.message2'|translate}}: {{info['expiry_date']}}
+
+
-
+
-
-
-
-
-
+
@@ -37,13 +38,12 @@
鍏叡璇诲啓锛氭墍鏈変汉閮藉彲浠ュobject杩涜璇诲啓鎿嶄綔
-->
- {{'aclType.private.message'|translate}}
- {{'aclType.public-read.message'|translate}}
- {{'aclType.public-read-write.message'|translate}}
+ {{'aclType.private.message'|translate}}
+ {{'aclType.public-read.message'|translate}}
+ {{'aclType.public-read-write.message'|translate}}
-
-
-
+
@@ -28,8 +35,16 @@
-
+
@@ -39,13 +54,18 @@
-
+
-
-
-
-
+
+
-
-
- ![{{'cannot.preview'|translate}}]()
+ ![{{'cannot.preview'|translate}}]()
-
-
-
- oss://{{moveTo.bucket}}/{{moveTo.key}}
+
+ oss://{{moveTo.bucket}}/{{moveTo.key}}
+
-
+
-
-
+
-
-
-
@@ -25,30 +26,47 @@ oss://{{currentInfo.bucket}}/{{currentInfo.key}}{{item.name}}
+
+ oss://{{currentInfo.bucket}}/{{currentInfo.key}}{{item.name}}
+
{{'restore.onprogress'|translate}}
-
- {{'restore.message2'|translate}}:
- {{info['expiry_date']}}
-
-
+
-
+
+ {{'restore.message2'|translate}}: {{info['expiry_date']}}
+
+
-
+
-
@@ -37,13 +38,12 @@
鍏叡璇诲啓锛氭墍鏈変汉閮藉彲浠ュobject杩涜璇诲啓鎿嶄綔
-->
-
-
-
+
- {{'aclType.private.message'|translate}}
- {{'aclType.public-read.message'|translate}}
- {{'aclType.public-read-write.message'|translate}}
+ {{'aclType.private.message'|translate}}
+ {{'aclType.public-read.message'|translate}}
+ {{'aclType.public-read-write.message'|translate}}
-
-
@@ -28,8 +35,16 @@
@@ -39,13 +54,18 @@
-
+
-
+
-
+
-
-
@@ -35,7 +42,12 @@
Cache-Control:
@@ -44,7 +56,12 @@
-
+
-
+