diff --git a/openRenamerBackend/service/RenamerService.ts b/openRenamerBackend/service/RenamerService.ts index e665ce8..c9771f8 100644 --- a/openRenamerBackend/service/RenamerService.ts +++ b/openRenamerBackend/service/RenamerService.ts @@ -14,7 +14,7 @@ class RenamerService { for (let i in fileList) { let obj = fileList[i]; ruleObjs.forEach(item => (item.data as RuleInterface).deal(obj)); - if (newNameSet.has(obj.name)) { + if (newNameSet.has(obj.path + obj.name)) { obj.errorMessage = "重名"; } newNameSet.add(obj.path + obj.name); diff --git a/openRenamerFront/src/App.vue b/openRenamerFront/src/App.vue index b31ca64..49fa838 100644 --- a/openRenamerFront/src/App.vue +++ b/openRenamerFront/src/App.vue @@ -42,7 +42,7 @@ export default { name: "Home", data() { return { - version: "1.6", + version: "1.6.1", latestVersion: null, activeIndex: location.pathname, showNewVersion: false diff --git a/openRenamerFront/src/views/home/Home.vue b/openRenamerFront/src/views/home/Home.vue index 26e2006..f894617 100644 --- a/openRenamerFront/src/views/home/Home.vue +++ b/openRenamerFront/src/views/home/Home.vue @@ -59,16 +59,24 @@
-
+
- {{ item.name }} + + + {{ item.name }} + +
-
+
-
{{ item.name }}
-
{{ item.errorMessage }}
+
+ + {{ item.name }} + +
+
{{ item.errorMessage }}
@@ -355,15 +363,28 @@ function readChar(a, i, n) { margin-top: 20px; display: flex; + .el-checkbox__label { + width: 95%; + } + + .oneLine { display: flex; - justify-content: space-between; align-items: center; border-top: 1px solid rgb(214, 212, 212); height: 1.5em; padding-top: 0.1em; padding-bottom: 0.1em; padding-right: 0.2em; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + } + + .oneLineText { + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; } .oneFileName {