jianghe2nd/mota-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge branch 'v2.x' of https://github.com/ckcz123/mota-js into v2.x

Browse Source
This commit is contained in:
ckcz123 2020-11-14 22:40:59 +08:00
commit aa337df21b
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
_server/editor_datapanel.js
View File

@ -138,8 +138,12 @@ editor_datapanel_wrapper = function (editor) {
var newFileName = document.getElementById('newFileName');
newMap.onclick = function () {
if (!newFileName.value) return;
if (core.floorIds.indexOf(newFileName.value) >= 0) {
printe("该楼层已存在！");
var findFunc = function (id) {
var re = new RegExp(newFileName.value, 'i');
return re.test(id);
}
if (core.floorIds.find(findFunc) != null) {
printe("同名楼层已存在！(不区分大小写)");
return;
}
if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(newFileName.value)) {
@ -200,8 +204,12 @@ editor_datapanel_wrapper = function (editor) {
var floorId = floorIds.replace(/\${(.*?)}/g, function (word, value) {
return eval(value);
});
if (core.floorIds.indexOf(floorId) >= 0) {
printe("要创建的楼层 " + floorId + " 已存在！");
var findFunc = function (id) {
var re = new RegExp(floorId, 'i');
return re.test(id);
}
if (core.floorIds.find(findFunc) != null) {
printe("同名楼层已存在！(不区分大小写)");
return;
}
if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(floorId)) {
@ -1100,4 +1108,4 @@ editor_datapanel_wrapper = function (editor) {
}
}