Merge branch 'v2.7' into v2.x

This commit is contained in:
ckcz123 2020-06-12 12:33:30 +08:00
commit dcef38ce61

View File

@ -1224,7 +1224,7 @@ helpUrl : /_docs/#/instruction
colour : this.mapColor
allFloorIds : ['IdString_0']
default : [null,"","",""]
selectPoint : ["EvalString_1", "EvalString_2", "IdString_0"]
selectPoint : ["EvalString_0", "EvalString_1", "IdString_0"]
var floorstr = '';
if (EvalString_0 && EvalString_1) {
var pattern1 = MotaActionFunctions.pattern.id;