diff --git a/src/components/ShowFile/ShowFile.vue b/src/components/ShowFile/ShowFile.vue
index 2313ef0..1332ad0 100644
--- a/src/components/ShowFile/ShowFile.vue
+++ b/src/components/ShowFile/ShowFile.vue
@@ -295,12 +295,13 @@
- {{ item.shortcut }}
+ {{ key }}
+
import SearchDialog from '@/components/SearchDialog/index.vue'
+import { fileOperations } from '@/utils/file-operations'
import { mapGetters, mapState } from 'vuex'
import { formatSize, formatTime } from '@/utils/number'
import { getElementToPageLeft } from '@/utils/dom'
@@ -905,20 +907,20 @@ export default {
type: Array,
default: function() {
return [
- { iconClass: 'menu-open', label: '打开', operation: 'open' },
+ fileOperations.open,
{ iconClass: 'share', label: '分享', operation: 'share' },
{ iconClass: 'tag', label: '标签', operation: 'tag' },
{ iconClass: 'menu-favorite', label: '收藏', operation: 'favorite' },
{
iconClass: 'menu-details',
label: '详情',
- shortcut: "space",
+ shortcut: ["space"],
operation: 'details',
},
- { iconClass: 'menu-rename', label: '重命名', operation: 'rename', shortcut: 'F2' },
- { iconClass: 'menu-copy', label: '移动或复制', operation: 'copy' },
- { iconClass: 'menu-download', label: '下载', operation: 'download' },
- { iconClass: 'menu-remove', label: '删除', operation: 'remove' },
+ fileOperations.rename,
+ fileOperations.copy,
+ fileOperations.download,
+ fileOperations.remove,
]
},
},
@@ -932,9 +934,9 @@ export default {
operation: 'deselect',
},
{ iconClass: 'tag', label: '标签', operation: 'tag' },
- { iconClass: 'menu-copy', label: '移动或复制', operation: 'copy' },
- { iconClass: 'menu-download', label: '下载', operation: 'download' },
- { iconClass: 'menu-remove', label: '删除', operation: 'remove' },
+ fileOperations.copy,
+ fileOperations.download,
+ fileOperations.remove,
]
},
},
@@ -3264,7 +3266,7 @@ export default {
)
}
if (!row.isFolder && this.queryFileType !== 'trash') {
- this.menus.splice(-2, 0, { iconClass: 'duplicate', label: '创建副本', operation: 'duplicate'})
+ this.menus.splice(-2, 0, fileOperations.duplicate)
}
if ((row.isShare && !row.shareBase) || row.ossFolder) {
// 删除分享选项
@@ -3311,18 +3313,18 @@ export default {
)
if (file.operationPermissionList && file.operationPermissionList.length > 0) {
if (file.operationPermissionList.indexOf('PUT') > -1) {
- this.menus.splice(this.menus.length - 1, 0, { iconClass: 'menu-rename', label: '重命名', operation: 'rename'})
+ this.menus.splice(this.menus.length - 1, 0, fileOperations.rename)
}
if (file.operationPermissionList.indexOf('UPLOAD') > -1) {
if (file.operationPermissionList.indexOf('DELETE') > -1) {
- this.menus.splice(this.menus.length - 1, 0, { iconClass: 'menu-copy',label: '移动或复制', operation: 'copy'})
+ this.menus.splice(this.menus.length - 1, 0, fileOperations.copy)
}
if (!file.isFolder) {
- this.menus.splice(this.menus.length - 1, 0, { iconClass: 'duplicate', label: '创建副本', operation: 'duplicate'})
+ this.menus.splice(this.menus.length - 1, 0, fileOperations.duplicate)
}
}
if (file.operationPermissionList.indexOf('DELETE') > -1) {
- this.menus.splice(this.menus.length, 0, { iconClass: 'menu-remove', label: '删除', operation: 'remove'})
+ this.menus.splice(this.menus.length, 0, fileOperations.remove)
}
}
this.setMenusCopyDownLoadLinks(file)
diff --git a/src/styles/home-index.scss b/src/styles/home-index.scss
index 9d40154..e1649ca 100644
--- a/src/styles/home-index.scss
+++ b/src/styles/home-index.scss
@@ -132,6 +132,7 @@
>>> .ctx-menu-container {
border: 0 solid rgba(0, 0, 0, 0);
+ min-width: 160px;
}
.menu-triangle-bottom {
diff --git a/src/styles/index.scss b/src/styles/index.scss
index f154cf4..1d46ae4 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -228,14 +228,15 @@ input {
}
kbd {
display: inline-block;
- padding: 5px 5px;
- font: 14px var(--fontStack-monospace, ui-monospace, SFMono-Regular, SF Mono, Menlo, Consolas, Liberation Mono, monospace);
+ margin-left: 3px;
+ padding: 4px 4px;
+ font: 12px var(--fontStack-monospace, ui-monospace, SFMono-Regular, SF Mono, Menlo, Consolas, Liberation Mono, monospace);
line-height: 10px;
color: #1f2328;
vertical-align: middle;
background-color: #f6f8fa;
border: solid 1px rgba(175, 184, 193, .2);
- border-radius: 6px;
+ border-radius: 3px;
-webkit-box-shadow: inset 0 -1px 0 rgba(175, 184, 193, .2);
box-shadow: inset 0 -1px 0 rgba(175, 184, 193, .2);
}
diff --git a/src/utils/file-operations.js b/src/utils/file-operations.js
new file mode 100644
index 0000000..b4e00d9
--- /dev/null
+++ b/src/utils/file-operations.js
@@ -0,0 +1,9 @@
+export const fileOperations = {
+ open: { iconClass: 'menu-open', label: '打开', operation: 'open' },
+ remove: { iconClass: 'menu-remove', label: '删除', operation: 'remove', shortcut: ['Del'] },
+ duplicate: { iconClass: 'duplicate', label: '创建副本', operation: 'duplicate' },
+ download: { iconClass: 'menu-download', label: '下载', operation: 'download' },
+ copy: { iconClass: 'menu-copy', label: '移动或复制', operation: 'copy' },
+ rename: { iconClass: 'menu-rename', label: '重命名', operation: 'rename', shortcut: ['F2'] },
+ //copyKey: { iconClass: 'menu-copy', label: '复制', operation: 'copyKey', shortcut: [navigator.platform.startsWith('Mac') ? '⌘' : 'Ctrl', 'C'] },
+}