diff --git a/src/assets/img/emptyfile_intro.jpeg b/src/assets/img/emptyfile_intro.jpeg new file mode 100644 index 0000000..615a3a4 Binary files /dev/null and b/src/assets/img/emptyfile_intro.jpeg differ diff --git a/src/assets/img/emptyfile_intro.png b/src/assets/img/emptyfile_intro.png deleted file mode 100644 index ac17b9c..0000000 Binary files a/src/assets/img/emptyfile_intro.png and /dev/null differ diff --git a/src/components/EmptyFile/index.vue b/src/components/EmptyFile/index.vue index e6fbb5c..1e10d2b 100644 --- a/src/components/EmptyFile/index.vue +++ b/src/components/EmptyFile/index.vue @@ -3,7 +3,7 @@
- +

{{emptyStatus}} diff --git a/src/components/ShowFile/ShowFile.vue b/src/components/ShowFile/ShowFile.vue index 276b61e..4a481ad 100644 --- a/src/components/ShowFile/ShowFile.vue +++ b/src/components/ShowFile/ShowFile.vue @@ -82,7 +82,7 @@ - + @@ -2818,6 +2818,9 @@ /*overflow: hidden;*/ /*white-space: nowrap;*/ /*text-overflow: ellipsis;*/ + .dashboard-container { + min-width: 900px; + } /deep/.app-wrapper { overflow-y: hidden; } diff --git a/src/components/button/ButtonUpload.vue b/src/components/button/ButtonUpload.vue index 0e99194..f270e39 100644 --- a/src/components/button/ButtonUpload.vue +++ b/src/components/button/ButtonUpload.vue @@ -124,7 +124,7 @@ cursor: pointer; border: 0; padding: 8px 20px 8px 20px; - border-radius: 9px; + border-radius: 4px; line-height: 24px; font-family: inherit; font-weight: 600; diff --git a/src/components/popover/MenuPopover.vue b/src/components/popover/MenuPopover.vue index 4e2583f..d64792f 100644 --- a/src/components/popover/MenuPopover.vue +++ b/src/components/popover/MenuPopover.vue @@ -95,7 +95,7 @@ export default { } .newFileMenu li:hover { cursor: pointer; - border-radius: 5px; + border-radius: 4px; background-color: #409eff14; } .newFileMenu li > .menuitem { diff --git a/src/components/preview/SimTextPreview.vue b/src/components/preview/SimTextPreview.vue index c5782b0..ea6ff46 100644 --- a/src/components/preview/SimTextPreview.vue +++ b/src/components/preview/SimTextPreview.vue @@ -399,6 +399,7 @@ that.dialogWidth = dialogWidth + moveX that.editorWidth = editorWidth + moveX that.editorHieght = editorHieght + (endY - startY) + that.loadConterSize() } } // 鼠标松开事件 @@ -547,7 +548,6 @@ this.loadEditorSize() }, checkReadOnly(fileUserId){ - console.log('readOnly',this.options.readOnly) if(this.$store.state.user.token && this.$store.state.user.userId === fileUserId){ this.options.readOnly = false } @@ -555,6 +555,7 @@ this.editorWidth += this.contentsWidth this.contentsHide = true } + console.log('readOnly',this.options.readOnly) }, loadEditorSize(){ this.dialogWidth = document.body.clientWidth * this.dialogWidthPercent @@ -564,6 +565,14 @@ this.editorWidth = this.dialogWidth - this.contentsWidth } this.editorHieght = document.body.clientHeight * this.dialogWidthPercent - 76 + this.loadConterSize() + }, + loadConterSize(){ + let conter = document.querySelector('.editor-resize .editor-resize-conter'); + if(conter){ + console.log() + conter.style.marginTop = ((this.editorHieght+26)/2 - conter.clientHeight/2) + 'px' + } }, handleClose(done) { if(this.isShowUpdateBtn){ @@ -920,6 +929,13 @@ border-top: unset!important; display: inline-flex; + .monaco-editor .minimap-shadow-visible { + position: absolute; + left: 0px; + width: 6px; + box-shadow: -2px 0px 5px #dddddd; + } + .el-tabs__header { margin: 0 0 0; .el-tabs__item { @@ -1042,6 +1058,10 @@ .el-button--small { padding: 9px 10px; } + .el-button-group { + display: unset; + vertical-align: middle; + } } } @@ -1060,7 +1080,7 @@ width: 14px; position: absolute; z-index: 999; - top: 48%; + // top: 48%; background: #e2e2e2; border-top-right-radius: 15px; border-bottom-right-radius: 15px; @@ -1099,6 +1119,10 @@ background: #202020; + .monaco-editor .minimap-shadow-visible { + box-shadow: -2px 0px 5px #000000; + } + .editor-resize { background-color: #181818; .editor-resize-conter{ diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue index 34bb731..372efd4 100644 --- a/src/layout/components/Sidebar/Logo.vue +++ b/src/layout/components/Sidebar/Logo.vue @@ -72,7 +72,6 @@ export default { & .sidebar-title { display: inline-block; margin: 0; - color: #fff; font-weight: 600; line-height: 50px; font-size: 14px; diff --git a/src/layout/index.vue b/src/layout/index.vue index 876201b..d40d208 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -124,4 +124,7 @@ export default { .mobile .fixed-header { width: 100%; } + >>> .sidebar-logo-container { + background-color:unset; + } diff --git a/src/router/index.js b/src/router/index.js index a46912a..a4e564e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -73,6 +73,32 @@ export const constantRoutes = [ ] }, + { + path: '/favorite', + component: Layout, + children: [ + { + path: 'index', + name: 'Form', + component: () => import('@/views/favorite/index'), + meta: { title: '收藏', icon: 'Favoritestarrate' } + } + ] + }, + + { + path: '/share', + component: Layout, + children: [ + { + path: '', + name: 'share', + component: () => import('@/views/share/index'), + meta: { title: '分享', icon: 'gongxiangzhongxin' } + } + ] + }, + { path: '/audio', component: Layout, @@ -126,19 +152,6 @@ export const constantRoutes = [ ] }, - { - path: '/favorite', - component: Layout, - children: [ - { - path: 'index', - name: 'Form', - component: () => import('@/views/favorite/index'), - meta: { title: '收藏', icon: 'Favoritestarrate' } - } - ] - }, - { path: '/setting', component: Layout, @@ -153,19 +166,6 @@ export const constantRoutes = [ ] }, - { - path: '/share', - component: Layout, - children: [ - { - path: '', - name: 'share', - component: () => import('@/views/share/index'), - meta: { title: '分享', icon: 'gongxiangzhongxin' } - } - ] - }, - // { // path: '/demo', // component: Layout, diff --git a/src/styles/home-index.scss b/src/styles/home-index.scss index 4f200c9..dc0da24 100644 --- a/src/styles/home-index.scss +++ b/src/styles/home-index.scss @@ -9,6 +9,11 @@ } } +>>>.svg-icon { + margin-top: 0.05em; + // vertical-align: unset; +} + .redirect { color: #97a8be; } @@ -78,9 +83,11 @@ top: 0; margin-top: 0.54rem; } -/deep/ .cell /deep/ .el-button { - padding: 8px 16px; - margin-left: 10px; +/deep/ .cell { + .el-button { + padding: 6px 10px; + margin-left: 20px; + } } /deep/ .el-checkbox { cursor: default; @@ -190,7 +197,7 @@ display: flex; justify-content: flex-end; .el-input { - width: 60%; + width: 235px; } .vmode{ padding: 5px 10px; diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss index 3dad4c3..d411af9 100644 --- a/src/styles/sidebar.scss +++ b/src/styles/sidebar.scss @@ -66,11 +66,23 @@ // menu hover .submenu-title-noDropdown, .el-submenu__title { + margin: 2px 5px; + height: 42px; + line-height: 42px; &:hover { background-color: $menuHover !important; + border-radius: 4px; + margin: 2px 5px 2px 5px; } } + .el-menu-item.is-active { + color: #409EFF; + background-color: #d9d9d9 !important; + border-radius: 4px; + margin: 2px 5px 2px 5px; + } + .is-active>.el-submenu__title { color: $subMenuActiveText !important; } @@ -103,7 +115,7 @@ padding: 0 !important; .svg-icon { - margin-left: 20px; + margin-left: 15px; } } } diff --git a/src/styles/variables.scss b/src/styles/variables.scss index be55772..7f7c3e6 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -1,10 +1,10 @@ // sidebar -$menuText:#bfcbd9; +$menuText:#434343; $menuActiveText:#409EFF; $subMenuActiveText:#f4f4f5; //https://github.com/ElemeFE/element/issues/12951 -$menuBg:#304156; -$menuHover:#263445; +$menuBg:#f5f5f5; +$menuHover:#d9d9d9; $subMenuBg:#1f2d3d; $subMenuHover:#001528; diff --git a/src/views/fileType/video.vue b/src/views/fileType/video.vue index 0acb074..8d9d82c 100644 --- a/src/views/fileType/video.vue +++ b/src/views/fileType/video.vue @@ -6,7 +6,7 @@ :defaultGrid="false" :sortable="sortable" :queryCondition="queryCondition" - emptyStatus="还没有视频文件呢~" + emptyStatus="还没有视频呢~" >

diff --git a/src/views/public/share/shareList.vue b/src/views/public/share/shareList.vue index d99aa8c..3c73fa5 100644 --- a/src/views/public/share/shareList.vue +++ b/src/views/public/share/shareList.vue @@ -100,7 +100,17 @@ - +