Merge pull request #252 from aliyun/luozhang_CZM

Luozhang czm

Author: luozhang002

Makefile

@@ -1,5 +1,5 @@
 
-VERSION=1.9.4
+VERSION=1.9.5
 NAME=oss-browser
 CUSTOM=./custom
 

README-CN.md

@@ -12,17 +12,17 @@ Windows7 above, Linux and Mac,不建议使用windows XP平台和windows Server
 
 ## 2. 客户端下载：
 
-最新版本`1.9.4`，下载地址如下，解压即可使用。
+最新版本`1.9.5`，下载地址如下，解压即可使用。
 
-> [<h4>Window x32 版下载</h4>](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.4/oss-browser-win32-ia32.zip)
+> [<h4>Window x32 版下载</h4>](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.5/oss-browser-win32-ia32.zip)
 
-> [<h4>Window x64 版下载</h4>](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.4/oss-browser-win32-x64.zip)
+> [<h4>Window x64 版下载</h4>](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.5/oss-browser-win32-x64.zip)
 
-> [<h4>Mac zip 版下载</h4>](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.4/oss-browser-darwin-x64.zip)
+> [<h4>Mac zip 版下载</h4>](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.5/oss-browser-darwin-x64.zip)
 
-> [<h4>Ubuntu x64 版</h4>](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.4/oss-browser-linux-x64.zip)
+> [<h4>Ubuntu x64 版</h4>](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.5/oss-browser-linux-x64.zip)
 
-> [<h4>Ubuntu x32 版</h4>](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.4/oss-browser-linux-ia32.zip)
+> [<h4>Ubuntu x32 版</h4>](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.5/oss-browser-linux-ia32.zip)
 
 其他版本暂不提供，可以自行 build。
 

all-releases.md

@@ -4,6 +4,7 @@
 
 ||Windows ia32|Windows x64| Mac(zip) |Linux ia32|Linux x64|Release note|
   |-----|-----|-----|-----|--------|--------|---|
+|1.9.5|[Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.5/oss-browser-win32-ia32.zip) |[Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.5/oss-browser-win32-x64.zip) |  [Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.5/oss-browser-darwin-x64.zip) | [Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.5/oss-browser-linux-ia32.zip) | [Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.5/oss-browser-linux-x64.zip)|[1.9.5.md](release-notes/1.9.5.en-US.md)|
 |1.9.4|[Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.4/oss-browser-win32-ia32.zip) |[Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.4/oss-browser-win32-x64.zip) |  [Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.4/oss-browser-darwin-x64.zip) | [Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.4/oss-browser-linux-ia32.zip) | [Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.4/oss-browser-linux-x64.zip)|[1.9.4.md](release-notes/1.9.4.en-US.md)|
 |1.9.3|[Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.3/oss-browser-win32-ia32.zip) |[Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.3/oss-browser-win32-x64.zip) |  [Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.3/oss-browser-darwin-x64.zip) | [Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.3/oss-browser-linux-ia32.zip) | [Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.3/oss-browser-linux-x64.zip)|[1.9.3.md](release-notes/1.9.3.en-US.md)|
 |1.9.2|[Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.2/oss-browser-win32-ia32.zip) |[Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.2/oss-browser-win32-x64.zip) |  [Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.2/oss-browser-darwin-x64.zip) | [Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.2/oss-browser-linux-ia32.zip) | [Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.2/oss-browser-linux-x64.zip)|[1.9.2.md](release-notes/1.9.2.en-US.md)|

app/main/files/files.js

@@ -982,6 +982,8 @@ angular.module('web')
         //   return;
         // }
         var keyword = $scope.keepMoveOptions.isCopy ? T('copy'): T('move');
+        var keepmove = $scope.keepMoveOptions.currentInfo;
+        var current = $scope.currentInfo;
 
         if($scope.keepMoveOptions.items.length==1 && $scope.currentInfo.bucket==$scope.keepMoveOptions.currentInfo.bucket){
            //1个支持重命名
@@ -1015,7 +1017,7 @@ angular.module('web')
            return;
 
         }
-        if ($scope.keepMoveOptions.currentInfo.key === $scope.currentInfo.key && keyword !== T('copy')) {
+        if (current.key === keepmove.key && keyword === T('move') && current.bucket === keepmove.bucket) {
           Toast.warn(T('forbidden'));
         } else {
           var msg = T('paste.message1', {name: $scope.keepMoveOptions.items[0].name, action: keyword});

app/main/files/modals/preview/doc-modal.html

@@ -20,7 +20,7 @@ <h4 class="modal-title">
   <restore-checker bucket-info="bucketInfo" object-info='objectInfo' file-type="fileType"
   after-check-success="afterCheckSuccess()" after-restore-submit="afterRestoreSubmit()">
 
-    <div style="overflow:auto;min-height:100px;" class="text-center"> 
+    <!-- <div style="overflow:auto;min-height:100px;" class="text-center"> 
       <div ng-if="!prevUrl">
           <div ng-if="!error" is-loading></div>
           <div ng-if="error" class="alert alert-danger text-left">
@@ -32,6 +32,22 @@ <h4 class="modal-title">
       <iframe ng-if="prevUrl" ng-src="{{prevUrl|trustAsResourceUrl}}" style="width:100%;height:500px;margin-bottom:-5px" frameborder="0">
           <div>{{'cannot.preview'|translate}}</div>
       </iframe>
+    </div> -->
+    <div class="text-center alert alert-warning">
+      {{'cannot.preview.this.file'|translate}}
+      <!-- 该文件类型无法预览。 -->
+    </div>
+    
+    <div class="text-center">
+      <div class="btn-group">
+        <button ng-if="showAsCodeBtn" type="button" class="btn btn-default" ng-click="showAs('code');cancel()"><i class="fa fa-file-code-o"></i>
+          <!-- 尝试作为文本文件打开 -->
+          {{'tryto.open.as.textfile'|translate}}
+        </button>
+        <!-- <button type="button" class="btn btn-default" ng-click="showFn.download();cancel()"><i class="fa fa-download text-success"></i> 直接下载</button> -->
+      </div>
+    
+      <div class="clearfix">&nbsp;</div>
     </div>
   </restore-checker>
 

app/main/modals/users.html

@@ -20,7 +20,7 @@ <h4 class="modal-title">
     <header class="form-group">
       <div class="col-sm-9">
        <div class="input-group input-group-sm">
-          <input type="text" ng-model="sch.txt" class="form-control" cleanable-input placeholder="search"/>
+          <input type="text" ng-model="sch.txt" class="form-control" cleanable-input placeholder="{{'ram.search.placeholder'|translate}}"/>
           <span class="input-group-btn">
             <a class="btn btn-info"><i class="fa fa-search"></i></a>
           </span>

node/i18n/en-US.js

@@ -102,7 +102,8 @@ module.exports = {
   'main.upgration': 'Release Notes',
   'tempCert': 'Temp Cert',
   'setup.success': 'Set up successfully',
-  'forbidden': 'You cannot move the selected objects to the current path or across buckets',
+  'forbidden': 'You cannot move the selected objects to the current path or across region',
+  'settings.log': 'Log Settings',
   'settings.console': 'Debug panel',
   'settings.console.msg': 'Open debug',
   'settings.file': "Local log",
@@ -324,6 +325,7 @@ module.exports = {
   'upload.addtolist.success': 'All added',
 
   'transframe.search.placeholder': 'Filter by name or status',
+  'ram.search.placeholder': 'Search by name or modified time',
 
   'start.all': 'Start All',
   'pause.all': 'Stop All',

node/i18n/ja-JP.js

@@ -101,7 +101,7 @@ module.exports = {
   'main.upgration': 'リリースノート',
   'tempCert': '一時認証',
   'setup.success': 'セットアップを完了しました',
-  'forbidden': '選択したオブジェクトを現在のフォルダーまたはバケット間で移動することはできません',
+  'forbidden': '選択したオブジェクトを現在のフォルダーまたは Region 間で移動することはできません',
 
   //address bar
   'backward': '戻る',
@@ -189,6 +189,7 @@ module.exports = {
   'settings.success': '保存を完了しました',
   'settings.autoUpgrade': '自動更新',
   'settings.autoUpgrade.msg': 'アップデートパッケージを自動的にダウンロードします',
+  'settings.log': 'ログ設定',
   'settings.console': '試用パネル',
   'settings.console.msg': '調査を開く',
   'settings.file': "ローカルログファイル",
@@ -323,6 +324,7 @@ module.exports = {
   'upload.addtolist.success': 'すべて追加されました',
 
   'transframe.search.placeholder': '名前またはステータスによるフィルタリング',
+  'ram.search.placeholder': '名前や修正時間によって検索する',
 
   'start.all': 'すべて開始',
   'pause.all': 'すべて停止',

node/i18n/zh-CN.js

@@ -102,7 +102,7 @@ module.exports = {
   'main.upgration': '主要更新',
   'tempCert': '临时凭证',
   'setup.success': '已经设置成功',
-  'forbidden': '不支持在当前路径或者跨Bucket移动',
+  'forbidden': '不支持在当前路径或者跨Region移动',
 
   //address bar
   'backward': '后退',
@@ -190,6 +190,7 @@ module.exports = {
   'settings.success': '已经保存设置',
   'settings.autoUpgrade': '自动更新',
   'settings.autoUpgrade.msg': '自动下载更新包',
+  'settings.log': '日志设置',
   'settings.console': '调试面板',
   'settings.console.msg': '开启调试',
   'settings.file': "本地日志文件",
@@ -323,6 +324,7 @@ module.exports = {
   'upload.addtolist.success': '已全部添加到上传队列',
 
   'transframe.search.placeholder': '根据名称或状态搜索',
+  'ram.search.placeholder': '根据名称或修改时间搜索',
 
   'start.all': '启动全部',
   'pause.all': '暂停全部',

package.json

@@ -1,6 +1,6 @@
 {
   "name": "oss-browser",
-  "version": "1.9.4",
+  "version": "1.9.5",
   "main": "dist/main.js",
   "scripts": {
     "test": "ava test",

release-notes/1.9.5.en-US.md

@@ -0,0 +1,2 @@
+1. Turn off the preview PDF file function
+2. Update log Settings and sub-user managed search for placeholder copywriting

release-notes/1.9.5.ja-JP.md

@@ -0,0 +1,2 @@
+1. PDFファイルのプレビュー機能を停止します
+2. 更新履歴設定、サブユーザ管理検索placeholder文案

release-notes/1.9.5.md

@@ -0,0 +1,2 @@
+1. 关闭预览 PDF 文件功能
+2. 更新日志设置、子用户管理搜索 placeholder 文案

release-notes/1.9.5.zh-CN.md

@@ -0,0 +1,2 @@
+1. 关闭预览 PDF 文件功能
+2. 更新日志设置、子用户管理搜索 placeholder 文案

upgrade.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.9.4",
+  "version": "1.9.5",
   "package_url": "https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/",
   "package_urls": [
     "https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/"