冲突问题恢复
This commit is contained in:
parent
58593b4337
commit
63e9e0d5cf
|
@ -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;
|
||||||
|
|
Loading…
Reference in New Issue