From dc5c6650372558ecf87e2e7a2c19235f1b282741 Mon Sep 17 00:00:00 2001 From: YouWei Zhao Date: Fri, 11 Jan 2019 11:36:28 -0500 Subject: [PATCH] order --- _server/editor.js | 2 +- _server/editor_mode.js | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/_server/editor.js b/_server/editor.js index 48338d0c..66731a6d 100644 --- a/_server/editor.js +++ b/_server/editor.js @@ -62,7 +62,7 @@ editor.prototype.init = function (callback) { editor.mode.floor(); editor.mode.tower(); editor.mode.functions(); - editor.mode.showMode('floor'); + editor.mode.showMode('tower'); editor_multi = editor_multi(); editor_blockly = editor_blockly(); diff --git a/_server/editor_mode.js b/_server/editor_mode.js index cb223751..60b3c884 100644 --- a/_server/editor_mode.js +++ b/_server/editor_mode.js @@ -91,7 +91,17 @@ editor_mode = function (editor) { * @param {Object} pcobj */ var recursionParse = function (pfield, pcfield, pvobj, pcobj) { - for (var ii in pvobj) { + var keysForTableOrder={}; + var voidMark={}; + if (pcobj && pcobj['_data']){ + for (var ii in pcobj['_data']) keysForTableOrder[ii]=voidMark; + } + keysForTableOrder=Object.assign(keysForTableOrder,pvobj) + for (var ii in keysForTableOrder) { + if(keysForTableOrder[ii]===voidMark){ + alert('comment和data不匹配,请把工程打包发至 HTML5造塔技术交流群 959329661') + throw Error('comment和data不匹配,请把工程打包发至 HTML5造塔技术交流群 959329661') + } var field = pfield + "['" + ii + "']"; var cfield = pcfield + "['_data']['" + ii + "']"; var vobj = pvobj[ii];