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

Merge pull request #256 from zhaouv/fix-switch

Browse Source 
fix switch
This commit is contained in:
Zhang Chen 2018-11-15 17:19:59 +08:00 committed by GitHub
commit e3766c811b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
_server/blockly/MotaAction.g4
View File

@ -1238,7 +1238,7 @@ return code;
*/; */;
switch_s switch_s
: '多重分歧 条件判定' ':' expression BGNL? Newline switchCase_s+ BEND Newline : '多重分歧 条件判定' ':' expression BGNL? Newline switchCase+ BEND Newline
/* switch_s /* switch_s
@ -1247,16 +1247,16 @@ helpUrl : https://ckcz123.github.io/mota-js/#/event?id=switch%EF%BC%9A%E5%A4%9A%
default : ["判别值"] default : ["判别值"]
colour : this.eventColor colour : this.eventColor
var code = ['{"type": "switch", "condition": "',expression_0,'", "caseList": [\n', var code = ['{"type": "switch", "condition": "',expression_0,'", "caseList": [\n',
switchCase_s_0, switchCase_0,
'], },\n'].join(''); '], },\n'].join('');
return code; return code;
*/; */;
switchCase_s switchCase
: '如果是' expression '的场合' BGNL? Newline action+ : '如果是' expression '的场合' BGNL? Newline action+
/* switchCase_s /* switchCase
tooltip : 选项的选择 tooltip : 选项的选择
helpUrl : https://ckcz123.github.io/mota-js/#/event?id=switch%EF%BC%9A%E5%A4%9A%E9%87%8D%E6%9D%A1%E4%BB%B6%E5%88%86%E6%AD%A7 helpUrl : https://ckcz123.github.io/mota-js/#/event?id=switch%EF%BC%9A%E5%A4%9A%E9%87%8D%E6%9D%A1%E4%BB%B6%E5%88%86%E6%AD%A7
colour : this.subColor colour : this.subColor
@ -2014,7 +2014,7 @@ ActionParser.prototype.parseAction = function() {
case "switch": // 多重条件分歧 case "switch": // 多重条件分歧
var case_caseList = null; var case_caseList = null;
for(var ii=data.caseList.length-1,caseNow;caseNow=data.caseList[ii];ii--) { for(var ii=data.caseList.length-1,caseNow;caseNow=data.caseList[ii];ii--) {
case_caseList=MotaActionBlocks['switchCase_s'].xmlText([ case_caseList=MotaActionBlocks['switchCase'].xmlText([
this.isset(caseNow.case)?MotaActionBlocks['evalString_e'].xmlText([caseNow.case]):"值",this.insertActionList(caseNow.action),case_caseList]); this.isset(caseNow.case)?MotaActionBlocks['evalString_e'].xmlText([caseNow.case]):"值",this.insertActionList(caseNow.action),case_caseList]);
} }
this.next = MotaActionBlocks['switch_s'].xmlText([ this.next = MotaActionBlocks['switch_s'].xmlText([

2
_server/editor_blockly.js
View File

@ -111,7 +111,7 @@ editor_blockly = function () {
MotaActionFunctions.actionParser.parseList({"type": "switch", "condition": "判别量", "caseList": [ MotaActionFunctions.actionParser.parseList({"type": "switch", "condition": "判别量", "caseList": [
{"action": [{"type": "comment", "text": "当判别值是值的场合执行此事件"}]}, {"action": [{"type": "comment", "text": "当判别值是值的场合执行此事件"}]},
{"action": []}, {"action": []},
{"case": "'default'", "action": [{"type": "comment", "text": "当没有符合的值的场合执行此事件"}]}, {"case": "default", "action": [{"type": "comment", "text": "当没有符合的值的场合执行此事件"}]},
]}), ]}),
MotaActionBlocks['while_s'].xmlText(), MotaActionBlocks['while_s'].xmlText(),
MotaActionBlocks['break_s'].xmlText(), MotaActionBlocks['break_s'].xmlText(),