From d176bdc95a3509c8676ff77f56e03531fe8c7d36 Mon Sep 17 00:00:00 2001 From: jmal Date: Sat, 24 Apr 2021 10:29:08 +0800 Subject: [PATCH 1/4] =?UTF-8?q?revert(*):=20=E5=9B=9E=E6=BB=9A=E5=88=B0=20?= =?UTF-8?q?#c78e20e2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 10 +++++----- src/styles/home-index.scss | 34 +++++++++++++++++----------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index 779debd..d43a6d9 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,6 @@ "vue-aplayer": "^1.6.1", "vue-runtime-helpers": "^1.1.2", "vue-simple-uploader": "^0.7.4", - "vue-template-compiler": "^2.6.12", "vue-video-player": "^5.0.2", "vue-wechat-title": "^2.0.5", "vuedraggable": "^2.23.2", @@ -59,13 +58,13 @@ "@babel/register": "7.0.0", "@vue/cli-plugin-babel": "3.6.0", "@vue/cli-plugin-eslint": "^3.9.1", - "@vue/cli-plugin-unit-jest": "^4.5.12", - "@vue/cli-service": "^4.5.12", + "@vue/cli-plugin-unit-jest": "3.6.3", + "@vue/cli-service": "3.6.0", "@vue/test-utils": "1.0.0-beta.29", "autoprefixer": "^9.5.1", "babel-core": "7.0.0-bridge.0", "babel-eslint": "10.0.1", - "babel-jest": "^26.6.3", + "babel-jest": "23.6.0", "babel-plugin-import": "^1.13.0", "chalk": "2.4.2", "connect": "3.6.6", @@ -79,7 +78,8 @@ "script-loader": "0.7.2", "serve-static": "^1.13.2", "svg-sprite-loader": "4.1.3", - "svgo": "1.2.2" + "svgo": "1.2.2", + "vue-template-compiler": "2.6.10" }, "engines": { "node": ">=8.9", diff --git a/src/styles/home-index.scss b/src/styles/home-index.scss index 8f17a76..46efaf5 100644 --- a/src/styles/home-index.scss +++ b/src/styles/home-index.scss @@ -10,7 +10,7 @@ } >>>.svg-icon { - margin-top: 0.05em; + margin-top: 0.05em; // vertical-align: unset; } @@ -70,7 +70,6 @@ .newFileMenu li > .menuitem > .text { cursor: pointer; font-weight: normal; - margin-left: 15px; } .newFileMenu li > .menuitem > .svg-icon { cursor: pointer; @@ -294,6 +293,7 @@ color: #606266; font-size: smaller; word-wrap: break-word; + width: -webkit-fill-available; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; @@ -336,7 +336,7 @@ .grid-item-icon-image { width: 100%; height: 100%; - top: 0; + top: 0px; border-radius: 5px; margin: 0; -webkit-backdrop-filter: contrast(0.5); @@ -346,21 +346,21 @@ /deep/ .grid-time:hover { background-color: #e0f3fc; } - .checkbox-group-header { +.checkbox-group-header { margin: 10px 0 0; - .grid-all-checkbox { - height: 50px; - width: fit-content; - margin-left: 25px; - font-size: 14px; - padding: 10px; - } - .el-divider--horizontal { - display: block; - height: 1px; - width: 100%; - margin: 0; - } + .grid-all-checkbox { + height: 50px; + width: fit-content; + margin-left: 25px; + font-size: 14px; + padding: 10px; + } + .el-divider--horizontal { + display: block; + height: 1px; + width: 100%; + margin: 0; + } } /deep/ .grid-divider { display: block; From 3881a69eab4f9b36ca45cc62956c3934c9ac2904 Mon Sep 17 00:00:00 2001 From: jmal Date: Sat, 24 Apr 2021 10:34:46 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix(file=20management):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E9=87=8D=E5=90=8D=E6=97=B6=E4=B8=8D=E8=83=BD=E6=8B=96?= =?UTF-8?q?=E5=8A=A8=E9=80=89=E4=B8=AD=E6=96=87=E5=AD=97=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ShowFile/ShowFile.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/ShowFile/ShowFile.vue b/src/components/ShowFile/ShowFile.vue index e9ee1bf..7b7af68 100644 --- a/src/components/ShowFile/ShowFile.vue +++ b/src/components/ShowFile/ShowFile.vue @@ -1374,7 +1374,6 @@ export default { } // 开始拖拽 container.ondragstart = (e) => { - e.target.style.cursor = 'no-drop' // 正在选区获取按住关键键时禁止拖拽 if (_this.drawFlag || _this.isCmd || _this.selectPin) { e.preventDefault() @@ -1387,8 +1386,11 @@ export default { } // 该文件正在重命名 if (e.target.rowIndex === _this.editingIndex){ + e.preventDefault() + e.stopPropagation() return } + e.target.style.cursor = 'no-drop' // 当滚动条滚动后禁止拖拽 if (_this.fileListScrollTop === 0) { // 复制被拖拽dom的title, 拖拽过程中移除, 拖拽完后还原 From 56282cd545fecf47cc899c41d33298c6418f969f Mon Sep 17 00:00:00 2001 From: jmal Date: Sat, 24 Apr 2021 17:54:10 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=F0=9F=90=9Bfix(audio):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E9=9F=B3=E4=B9=90=E6=92=AD=E6=94=BE=E6=97=B6=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E6=8B=96=E5=8A=A8=E8=BF=9B=E5=BA=A6=E6=9D=A1=E5=92=8C?= =?UTF-8?q?=E9=9F=B3=E9=87=8F=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + public/index.html | 10 ++-- src/components/preview/AudioPreview.vue | 66 +++++++++++++------------ src/main.js | 9 ++-- 4 files changed, 45 insertions(+), 41 deletions(-) diff --git a/package.json b/package.json index d43a6d9..27d2aae 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml" }, "dependencies": { + "@moefe/vue-aplayer": "^2.0.0-beta.5", "ant-design-vue": "^1.6.5", "clipboard": "^2.0.6", "cropperjs": "^1.5.6", diff --git a/public/index.html b/public/index.html index 5bc5a10..158c25e 100644 --- a/public/index.html +++ b/public/index.html @@ -18,20 +18,20 @@ - - + + - - + + <%= webpackConfig.name %> - +