diff --git a/package.json b/package.json index d43a6d9..779debd 100644 --- a/package.json +++ b/package.json @@ -48,6 +48,7 @@ "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", @@ -58,13 +59,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": "3.6.3", - "@vue/cli-service": "3.6.0", + "@vue/cli-plugin-unit-jest": "^4.5.12", + "@vue/cli-service": "^4.5.12", "@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": "23.6.0", + "babel-jest": "^26.6.3", "babel-plugin-import": "^1.13.0", "chalk": "2.4.2", "connect": "3.6.6", @@ -78,8 +79,7 @@ "script-loader": "0.7.2", "serve-static": "^1.13.2", "svg-sprite-loader": "4.1.3", - "svgo": "1.2.2", - "vue-template-compiler": "2.6.10" + "svgo": "1.2.2" }, "engines": { "node": ">=8.9", diff --git a/src/components/ShowFile/ShowFile.vue b/src/components/ShowFile/ShowFile.vue index 7a25ba4..e9ee1bf 100644 --- a/src/components/ShowFile/ShowFile.vue +++ b/src/components/ShowFile/ShowFile.vue @@ -2274,6 +2274,9 @@ export default { }, // 重命名 rowRename(newFileName, row) { + //去掉回车换行 + newFileName = newFileName.replace(/[\r\n]/g,""); + console.log('newFileName', newFileName) if (newFileName) { if (/[\/\\"<>\?\*]/gi.test(newFileName)) { this.$message({ @@ -2931,7 +2934,7 @@ export default { setTimeout(() => { // 再执行移除 for (let i = 0; i < removeFileIndexList.length; i++) { - this.splice(removeFileIndexList[i], 1) + this.fileList.splice(removeFileIndexList[i], 1) } // 改变拖拽目标 this.rowDrop() diff --git a/src/styles/home-index.scss b/src/styles/home-index.scss index f56b654..8f17a76 100644 --- a/src/styles/home-index.scss +++ b/src/styles/home-index.scss @@ -1,7 +1,7 @@ .dashboard { &-container { min-width: 500px; - margin: 10px 0px 0px 0px; + margin: 10px 0 0 0; } &-text { font-size: 30px; @@ -45,7 +45,7 @@ .newFileMenu ul { list-style: none; - padding-inline-start: 0px; + padding-inline-start: 0; margin-top: 0; margin-bottom: 0; } @@ -70,6 +70,7 @@ .newFileMenu li > .menuitem > .text { cursor: pointer; font-weight: normal; + margin-left: 15px; } .newFileMenu li > .menuitem > .svg-icon { cursor: pointer; @@ -293,7 +294,6 @@ 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: 0px; + top: 0; border-radius: 5px; margin: 0; -webkit-backdrop-filter: contrast(0.5);