diff --git a/_server/css/editor.css b/_server/css/editor.css index b878cc2f..190607a1 100644 --- a/_server/css/editor.css +++ b/_server/css/editor.css @@ -210,12 +210,14 @@ body{ color: #D50000; font-weight: 700; font-size: 14px; + line-height: 1.2em; } .infoText{ color: #2196F3; } .successText{ - color: #00897B + color: #00897B; + line-height: 1.2em; } table, td { diff --git a/_server/editor_mode.js b/_server/editor_mode.js index 6fffe579..83c51823 100644 --- a/_server/editor_mode.js +++ b/_server/editor_mode.js @@ -203,11 +203,7 @@ editor_mode.prototype.showMode = function (mode) { editor_mode.dom[mode].style=''; if(editor_mode[mode])editor_mode[mode](); document.getElementById('editModeSelect').value=mode; - var tips = [ - '涉及图片的更改需要F5刷新浏览器来生效', - '文本域可以通过双击,在文本编辑器或事件编辑器中编辑', - '事件编辑器中的显示文本和自定义脚本的方块也可以双击', - ]; + var tips = tip_in_showMode; if(!selectBox.isSelected)printf('tips: '+tips[~~(tips.length*Math.random())]); } diff --git a/_server/editor_multi.js b/_server/editor_multi.js index 289a5971..556096f7 100644 --- a/_server/editor_multi.js +++ b/_server/editor_multi.js @@ -29,7 +29,13 @@ editor_multi.import = function(id_){ editor_multi.isString=true; codeEditor.setValue(JSON.parse(input.value)||''); } else { - codeEditor.setValue(input.value||''); + eval('var tobj='+input.value); + var tmap={}; + var tstr = JSON.stringify(tobj,function(k,v){if(typeof(v)===typeof('') && v.slice(0,8)==='function'){var id_ = editor.guid();tmap[id_]=v.toString();return id_;}else return v},4); + for(var id_ in tmap){ + tstr = tstr.replace('"'+id_+'"',tmap[id_]) + } + codeEditor.setValue(tstr||''); } editor_multi.show(); return true; @@ -58,7 +64,13 @@ editor_multi.confirm = function (){ if(editor_multi.isString){ input.value = JSON.stringify(value); } else { - input.value = value; + eval('var tobj='+value); + var tmap={}; + var tstr = JSON.stringify(tobj,function(k,v){if(v instanceof Function){var id_ = editor.guid();tmap[id_]=v.toString();return id_;}else return v},4); + for(var id_ in tmap){ + tstr = tstr.replace('"'+id_+'"',JSON.stringify(tmap[id_])) + } + input.value = tstr; } editor_multi.hide(); input.onchange(); diff --git a/_server/vm.js b/_server/vm.js index c5b1286e..97d3602d 100644 --- a/_server/vm.js +++ b/_server/vm.js @@ -215,6 +215,11 @@ printf = function(str_,type) { },1); } printe = function(str_){printf(str_,'error')} +tip_in_showMode = [ + '涉及图片的更改需要F5刷新浏览器来生效', + '文本域可以通过双击,在文本编辑器或事件编辑器中编辑', + '事件编辑器中的显示文本和自定义脚本的方块也可以双击', +]; var tip = new Vue({ el: '#tip', data: {