冲突问题恢复

This commit is contained in:
fit2-zhao 2021-04-15 14:50:54 +08:00
parent 58593b4337
commit 63e9e0d5cf
1 changed files with 4 additions and 1 deletions

View File

@ -99,8 +99,11 @@
this.isActive = !this.isActive; this.isActive = !this.isActive;
}, },
getName(name) { getName(name) {
if (name && name.indexOf("^@~@^") !== -1) { if (name && name.indexOf("^@~@^") != -1) {
let arr = name.split("^@~@^"); let arr = name.split("^@~@^");
if (arr[arr.length - 1].indexOf("UUID=")) {
return arr[arr.length - 1].split("UUID=")[0];
}
return arr[arr.length - 1]; return arr[arr.length - 1];
} }
return name; return name;