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

replaceName

Browse Source
This commit is contained in:
ckcz123 2019-10-26 17:33:40 +08:00
parent 0f66a43eb9
commit c212991275
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
_server/MotaAction.g4
View File

@ -3684,6 +3684,9 @@ MotaActionFunctions.actionParser = new ActionParser();
MotaActionFunctions.workspace = function(){return workspace} MotaActionFunctions.workspace = function(){return workspace}
MotaActionFunctions.parse = function(obj,type) { MotaActionFunctions.parse = function(obj,type) {
try {
obj = JSON.parse(MotaActionFunctions.replaceToName(JSON.stringify(obj)));
} catch (e) {}
MotaActionFunctions.workspace().clear(); MotaActionFunctions.workspace().clear();
xml_text = MotaActionFunctions.actionParser.parse(obj,type||'event'); xml_text = MotaActionFunctions.actionParser.parse(obj,type||'event');
xml = Blockly.Xml.textToDom('<xml>'+xml_text+'</xml>'); xml = Blockly.Xml.textToDom('<xml>'+xml_text+'</xml>');
@ -3692,12 +3695,13 @@ MotaActionFunctions.parse = function(obj,type) {
MotaActionFunctions.EvalString_pre = function(EvalString){ MotaActionFunctions.EvalString_pre = function(EvalString){
if (EvalString.indexOf('__door__')!==-1) throw new Error('请修改开门变量__door__，如door1，door2，door3等依次向后。请勿存在两个门使用相同的开门变量。'); if (EvalString.indexOf('__door__')!==-1) throw new Error('请修改开门变量__door__，如door1，door2，door3等依次向后。请勿存在两个门使用相同的开门变量。');
console.log(EvalString); EvalString = MotaActionFunctions.replaceFromName(EvalString);
return EvalString.replace(/([^\\])"/g,'$1\\"').replace(/^"/g,'\\"').replace(/""/g,'"\\"'); return EvalString.replace(/([^\\])"/g,'$1\\"').replace(/^"/g,'\\"').replace(/""/g,'"\\"');
} }
MotaActionFunctions.IdString_pre = function(IdString){ MotaActionFunctions.IdString_pre = function(IdString){
if (IdString.indexOf('__door__')!==-1) throw new Error('请修改开门变量__door__，如door1，door2，door3等依次向后。请勿存在两个门使用相同的开门变量。'); if (IdString.indexOf('__door__')!==-1) throw new Error('请修改开门变量__door__，如door1，door2，door3等依次向后。请勿存在两个门使用相同的开门变量。');
IdString = MotaActionFunctions.replaceFromName(IdString);
if (IdString && !(MotaActionFunctions.pattern.id.test(IdString)) && !(MotaActionFunctions.pattern.idWithoutFlag.test(IdString))) if (IdString && !(MotaActionFunctions.pattern.id.test(IdString)) && !(MotaActionFunctions.pattern.idWithoutFlag.test(IdString)))
throw new Error('id: '+IdString+'中包含了0-9 a-z A-Z _ - :之外的字符'); throw new Error('id: '+IdString+'中包含了0-9 a-z A-Z _ - :之外的字符');
return IdString; return IdString;
@ -3706,7 +3710,7 @@ MotaActionFunctions.IdString_pre = function(IdString){
MotaActionFunctions.PosString_pre = function(PosString){ MotaActionFunctions.PosString_pre = function(PosString){
if (!PosString || /^-?\d+$/.test(PosString)) return PosString; if (!PosString || /^-?\d+$/.test(PosString)) return PosString;
//if (!(MotaActionFunctions.pattern.id.test(PosString)))throw new Error(PosString+'中包含了0-9 a-z A-Z _ 和中文之外的字符,或者是没有以flag: 开头'); //if (!(MotaActionFunctions.pattern.id.test(PosString)))throw new Error(PosString+'中包含了0-9 a-z A-Z _ 和中文之外的字符,或者是没有以flag: 开头');
return '"'+PosString+'"'; return '"'+MotaActionFunctions.replaceFromName(PosString)+'"';
} }
MotaActionFunctions.StepString_pre = function(StepString){ MotaActionFunctions.StepString_pre = function(StepString){
@ -3825,7 +3829,7 @@ MotaActionFunctions.pattern.replaceItemList = [
MotaActionFunctions.disableReplace = false; MotaActionFunctions.disableReplace = false;
MotaActionFunctions.replaceToName = function (str) { MotaActionFunctions.replaceToName = function (str) {
if (MotaActionFunctions.disableReplace) return str; if (!str || MotaActionFunctions.disableReplace) return str;
var map = {}, list = []; var map = {}, list = [];
MotaActionFunctions.pattern.replaceStatusList.forEach(function (v) { MotaActionFunctions.pattern.replaceStatusList.forEach(function (v) {
map[v[0]] = v[1]; list.push(v[0]); map[v[0]] = v[1]; list.push(v[0]);
@ -3845,7 +3849,7 @@ MotaActionFunctions.replaceToName = function (str) {
} }
MotaActionFunctions.replaceFromName = function (str) { MotaActionFunctions.replaceFromName = function (str) {
if (MotaActionFunctions.disableReplace) return str; if (!str || MotaActionFunctions.disableReplace) return str;
var map = {}, list = []; var map = {}, list = [];
MotaActionFunctions.pattern.replaceStatusList.forEach(function (v) { MotaActionFunctions.pattern.replaceStatusList.forEach(function (v) {
map[v[1]] = v[0]; list.push(v[1]); map[v[1]] = v[0]; list.push(v[1]);