提交 63e9e0d5 编写于 作者: F fit2-zhao

冲突问题恢复

上级 58593b43
......@@ -99,8 +99,11 @@
this.isActive = !this.isActive;
},
getName(name) {
if (name && name.indexOf("^@~@^") !== -1) {
if (name && name.indexOf("^@~@^") != -1) {
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 name;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册