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

Merge pull request #306 from zhaouv/editor-table-order

Browse Source 
order
This commit is contained in:
Zhang Chen 2019-01-12 00:39:10 +08:00 committed by GitHub
commit 4279761a00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_server/editor.js
View File

@ -62,7 +62,7 @@ editor.prototype.init = function (callback) {
editor.mode.floor(); editor.mode.floor();
editor.mode.tower(); editor.mode.tower();
editor.mode.functions(); editor.mode.functions();
editor.mode.showMode('floor'); editor.mode.showMode('tower');
editor_multi = editor_multi(); editor_multi = editor_multi();
editor_blockly = editor_blockly(); editor_blockly = editor_blockly();

12
_server/editor_mode.js
View File

@ -91,7 +91,17 @@ editor_mode = function (editor) {
* @param {Object} pcobj * @param {Object} pcobj
*/ */
var recursionParse = function (pfield, pcfield, pvobj, 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 field = pfield + "['" + ii + "']";
var cfield = pcfield + "['_data']['" + ii + "']"; var cfield = pcfield + "['_data']['" + ii + "']";
var vobj = pvobj[ii]; var vobj = pvobj[ii];