From 4c840328cc4edc1f4eb45f60464b7937e97a5309 Mon Sep 17 00:00:00 2001 From: wb-czm552128 Date: Thu, 29 Aug 2019 15:24:00 +0800 Subject: [PATCH] =?UTF-8?q?FIX:=20=E5=85=B3=E9=97=AD=E9=A2=84=E8=A7=88PDF?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=9B=B4=E6=96=B0=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E3=80=81=E5=AD=90=E7=94=A8=E6=88=B7=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=90=9C=E7=B4=A2=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 2 +- README-CN.md | 12 ++++++------ all-releases.md | 1 + app/main/files/files.js | 4 +++- app/main/files/modals/preview/doc-modal.html | 18 +++++++++++++++++- app/main/modals/users.html | 2 +- node/i18n/en-US.js | 4 +++- node/i18n/ja-JP.js | 4 +++- node/i18n/zh-CN.js | 4 +++- package.json | 2 +- release-notes/1.9.5.en-US.md | 2 ++ release-notes/1.9.5.ja-JP.md | 2 ++ release-notes/1.9.5.md | 2 ++ release-notes/1.9.5.zh-CN.md | 2 ++ upgrade.json | 2 +- 15 files changed, 48 insertions(+), 15 deletions(-) create mode 100644 release-notes/1.9.5.en-US.md create mode 100644 release-notes/1.9.5.ja-JP.md create mode 100644 release-notes/1.9.5.md create mode 100644 release-notes/1.9.5.zh-CN.md diff --git a/Makefile b/Makefile index 59cbe3e3..64e003fb 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -VERSION=1.9.4 +VERSION=1.9.5 NAME=oss-browser CUSTOM=./custom diff --git a/README-CN.md b/README-CN.md index c0f9e353..c69c9812 100644 --- a/README-CN.md +++ b/README-CN.md @@ -12,17 +12,17 @@ Windows7 above, Linux and Mac,不建议使用windows XP平台和windows Server ## 2. 客户端下载： -最新版本`1.9.4`，下载地址如下，解压即可使用。 +最新版本`1.9.5`，下载地址如下，解压即可使用。 -> [

Window x32 版下载

](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.4/oss-browser-win32-ia32.zip) +> [

Window x32 版下载

](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.5/oss-browser-win32-ia32.zip) -> [

Window x64 版下载

](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.4/oss-browser-win32-x64.zip) +> [

Window x64 版下载

](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.5/oss-browser-win32-x64.zip) -> [

Mac zip 版下载

](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.4/oss-browser-darwin-x64.zip) +> [

Mac zip 版下载

](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.5/oss-browser-darwin-x64.zip) -> [

Ubuntu x64 版

](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.4/oss-browser-linux-x64.zip) +> [

Ubuntu x64 版

](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.5/oss-browser-linux-x64.zip) -> [

Ubuntu x32 版

](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.4/oss-browser-linux-ia32.zip) +> [

Ubuntu x32 版

](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.5/oss-browser-linux-ia32.zip) 其他版本暂不提供，可以自行 build。 diff --git a/all-releases.md b/all-releases.md index 2e49a366..48a70515 100644 --- a/all-releases.md +++ b/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)| diff --git a/app/main/files/files.js b/app/main/files/files.js index f4b4a790..93da6434 100644 --- a/app/main/files/files.js +++ b/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}); diff --git a/app/main/files/modals/preview/doc-modal.html b/app/main/files/modals/preview/doc-modal.html index 955e4a36..1d0d270f 100644 --- a/app/main/files/modals/preview/doc-modal.html +++ b/app/main/files/modals/preview/doc-modal.html @@ -20,7 +20,7 @@

-
+ +
+ {{'cannot.preview.this.file'|translate}} + +
+ +
+
+ + +
+ +
 
diff --git a/app/main/modals/users.html b/app/main/modals/users.html index 02c4c9b7..cdd29137 100644 --- a/app/main/modals/users.html +++ b/app/main/modals/users.html @@ -20,7 +20,7 @@

- + diff --git a/node/i18n/en-US.js b/node/i18n/en-US.js index 087b2df6..4187118d 100644 --- a/node/i18n/en-US.js +++ b/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', diff --git a/node/i18n/ja-JP.js b/node/i18n/ja-JP.js index 3db1d496..de3b0523 100644 --- a/node/i18n/ja-JP.js +++ b/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': 'すべて停止', diff --git a/node/i18n/zh-CN.js b/node/i18n/zh-CN.js index 0cfaa82a..b394f0d1 100644 --- a/node/i18n/zh-CN.js +++ b/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': '暂停全部', diff --git a/package.json b/package.json index a04d3ed9..21929d0a 100644 --- a/package.json +++ b/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", diff --git a/release-notes/1.9.5.en-US.md b/release-notes/1.9.5.en-US.md new file mode 100644 index 00000000..8a6a4f58 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/release-notes/1.9.5.ja-JP.md b/release-notes/1.9.5.ja-JP.md new file mode 100644 index 00000000..1c002e2a --- /dev/null +++ b/release-notes/1.9.5.ja-JP.md @@ -0,0 +1,2 @@ +1. PDFファイルのプレビュー機能を停止します +2. 更新履歴設定、サブユーザ管理検索placeholder文案 \ No newline at end of file diff --git a/release-notes/1.9.5.md b/release-notes/1.9.5.md new file mode 100644 index 00000000..75e6f389 --- /dev/null +++ b/release-notes/1.9.5.md @@ -0,0 +1,2 @@ +1. 关闭预览 PDF 文件功能 +2. 更新日志设置、子用户管理搜索 placeholder 文案 \ No newline at end of file diff --git a/release-notes/1.9.5.zh-CN.md b/release-notes/1.9.5.zh-CN.md new file mode 100644 index 00000000..75e6f389 --- /dev/null +++ b/release-notes/1.9.5.zh-CN.md @@ -0,0 +1,2 @@ +1. 关闭预览 PDF 文件功能 +2. 更新日志设置、子用户管理搜索 placeholder 文案 \ No newline at end of file diff --git a/upgrade.json b/upgrade.json index fe06b665..5b7e764e 100644 --- a/upgrade.json +++ b/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/"