@@ -153,6 +153,24 @@ export default {
mounted() {
},
computed: {
+ videoImageHeight() {
+ if (this.details) {
+ return "110px"
+ }
+ if (this.item.video && this.item.video.width > this.item.video.height) {
+ return ""
+ }
+ return this.gridWidth - 35 + "px"
+ },
+ imageHeightStyle() {
+ if (this.details) {
+ return "height: 110px;"
+ }
+ if (this.item.w > this.item.h) {
+ return `max-height: ${this.gridWidth - 35}px`
+ }
+ return `height: ${this.gridWidth - 35}px;`
+ },
findIconClass() {
let suffix = this.item.suffix;
if (!suffix && this.item.fileName) {
diff --git a/src/components/ShowFile/ShowFile.vue b/src/components/ShowFile/ShowFile.vue
index 321e01f..1393588 100644
--- a/src/components/ShowFile/ShowFile.vue
+++ b/src/components/ShowFile/ShowFile.vue
@@ -89,6 +89,7 @@
@@ -1243,7 +1245,9 @@ export default {
if (item.isFolder || !this.grid) {
return filename;
}
- const singleLine = (item.contentType && item.contentType.startsWith('image')) || item.showCover
+ const verticalImage = item.w && item.h && (item.w / item.h < 1.6)
+ const verticalVideo = item.video && (item.video.width / item.video.height < 1.6)
+ const singleLine = verticalImage || verticalVideo || item.showCover
const gridFilenameLength = singleLine ? 13 : 28
// 分离文件名和后缀
let parts = filename.split('.');
@@ -2144,8 +2148,8 @@ export default {
node.firstChild.style.marginRight = '20px'
}
if (index === 2) {
- node.style.borderRadius = '0 5px 5px 0'
- node.style.borderRight = '1px solid #409eff'
+ node.style.borderRadius = '0 12px 12px 0'
+ node.style.borderRight = 'solid 1px var(--apple-shadow-color)'
node.firstChild.style.height = '44px'
node.firstChild.style.lineHeight = '44px'
node.firstChild.style.width = '80px'
@@ -3286,35 +3290,35 @@ export default {
if (columnIndex === 0) {
return {
backgroundColor: '#e0f3fc !important',
- borderRadius: '50px 0 0 50px',
- borderLeft: '1px solid #409eff',
- borderTop: '1px solid #409eff',
- borderBottom: '1px solid #409eff',
+ borderRadius: '12px 0 0 12px',
+ borderLeft: 'solid 1px var(--apple-shadow-color)',
+ borderTop: 'solid 1px var(--apple-shadow-color)',
+ borderBottom: 'solid 1px var(--apple-shadow-color)',
}
}
if (columnIndex === 3) {
return {
backgroundColor: '#e0f3fc !important',
- borderRadius: '0 50px 50px 0',
- borderRight: '1px solid #409eff',
- borderTop: '1px solid #409eff',
- borderBottom: '1px solid #409eff',
+ borderRadius: '0 12px 12px 0',
+ borderRight: 'solid 1px var(--apple-shadow-color)',
+ borderTop: 'solid 1px var(--apple-shadow-color)',
+ borderBottom: 'solid 1px var(--apple-shadow-color)',
}
}
return {
backgroundColor: '#e0f3fc !important',
- borderTop: '1px solid #409eff',
- borderBottom: '1px solid #409eff',
+ borderTop: 'solid 1px var(--apple-shadow-color)',
+ borderBottom: 'solid 1px var(--apple-shadow-color)',
}
} else {
if (columnIndex === 0) {
return {
- borderRadius: '50px 0 0 50px',
+ borderRadius: '12px 0 0 12px',
}
}
if (columnIndex === 3) {
return {
- borderRadius: '0 50px 50px 0',
+ borderRadius: '0 12px 12px 0',
}
}
}
@@ -4666,7 +4670,7 @@ export default {
.is-sortable:hover {
background-color: #e0f3fc;
- border-radius: 40px;
+ border-radius: 12px;
}
}
diff --git a/src/components/preview/FileDetails.vue b/src/components/preview/FileDetails.vue
index c8de3ee..e8e2f75 100644
--- a/src/components/preview/FileDetails.vue
+++ b/src/components/preview/FileDetails.vue
@@ -23,6 +23,7 @@
{{ formatSize(file.size) }}
- {{ filepath }}
+ {{ filepath }}
{{ file.uploadDate }}
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 677cd23..523ad91 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -445,6 +445,9 @@ $tagMenuBorderRadius: 8px;
padding: 0;
min-width: 110px;
}
+.tag-menu {
+ padding: 5px 5px;
+}
.tag-menu li:hover {
cursor: pointer;
border-radius: $tagMenuBorderRadius;
diff --git a/src/styles/home-index.scss b/src/styles/home-index.scss
index 09b3ce7..1bd4208 100644
--- a/src/styles/home-index.scss
+++ b/src/styles/home-index.scss
@@ -45,7 +45,6 @@
padding-inline-start: 0;
margin-top: 0;
margin-bottom: 0;
- padding: 0 5px;
}
.newFileMenu li {
cursor: pointer;
@@ -63,7 +62,6 @@
.newFileMenu li > .menuitem {
cursor: pointer;
line-height: 38px;
- margin-left: 10%;
}
.newFileMenu li > .menuitem > .text {
cursor: pointer;
@@ -137,6 +135,26 @@
border: 0 solid rgba(0, 0, 0, 0);
min-width: 160px;
border-radius: $dialogBorderRadius;
+ padding: 10px 10px;
+ box-shadow: 0 5px 12px #ccc;
+
+ .home-contextmenu {
+ padding: 0 10px;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+
+ .svg-icon {
+ margin-right: 10px;
+ }
+ }
+
+ .home-contextmenu-title {
+ width: 100%;
+ display: flex;
+ justify-content: space-between;
+ }
+
}
.menu-triangle-bottom {
diff --git a/src/styles/index.scss b/src/styles/index.scss
index ed19748..3bef28c 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -28,10 +28,18 @@ body {
border-radius: $popperBorderRadius;
}
- .el-message, .el-notification .el-popover, .el-tooltip__popper, .el-dropdown-menu, .el-select-dropdown, .el-picker-panel, .el-picker-panel__body, .el-picker-panel__sidebar {
+ .el-message, .el-notification, .el-popover, .el-tooltip__popper, .el-dropdown-menu, .el-select-dropdown, .el-picker-panel, .el-picker-panel__body, .el-picker-panel__sidebar {
border-radius: $popperBorderRadius;
}
+ .el-popover.el-popper.upload-file {
+ border-radius: 16px;
+ padding: 10px 10px;
+ li {
+ padding: 0 10px;
+ }
+ }
+
.v-contextmenu {
border-radius: 8px;
}