merge from master

This commit is contained in:
echo committed 2018-01-09 21:13:05 +08:00
commit 4db9583e41
43 files changed
+3249 -1301

No files matched your search

+28 -81
View File
@@ -24,73 +24,23 @@ body{
width: 435px;
height: 630px;
}
.nav {
width: 100%;
height: 40px;
margin-top: 5px;
box-sizing: border-box;
}
.nav a{
display: block;
float: left;
line-height: 30px;
font-size: 14px;
text-align: center;
color: #424242;
margin: 0 10px;
padding: 0 3px ;
list-style: none;
box-sizing: border-box;
cursor: pointer;
/* border-bottom: 3px solid #009688; */
}
.is-selected {
border-bottom: 3px solid #009688;
}
#left .tabs{
position: absolute;
top: 50px;
left: 0;
width: 435px;
height: 535px;
}
#left .card{
width: 100%;
height: 535px;
position: absolute;
left: 0;
top: 10px;
border-top: 1px solid #ccc;
}
#arrEditor{
z-index: 8;
}
.card .lineTitle {
position: absolute;
top: -12px;
left: 20px;
padding: 0 5px;
font-size: 14px;
color: #03A9F4;
background-color: #F5F5F5;
z-index: 10;
}
#editArea{
position: absolute;
width: 100%;
height: 70%;
left: 0;
top: 0;
/* padding: 10px 5px; */
box-sizing: border-box;
margin-top: 15px;
}
#pout{
position: absolute;
left: 22px;
top: 37px;
display: block;
width: 410px;
height: 300px;
height: 100%;
box-sizing: border-box;
margin-left: 22px;
margin-top: 23px;
line-height: 20px;
font-size: 12.3px;
font-family: 'Lucida Console', Monaco, monospace;
@@ -118,26 +68,6 @@ body{
margin-right: 20px;
margin-top: 5px;
}
.files {
width: 100%;
height: 120px;
/* padding: 10px; */
margin-top: 15px;
}
.files .input{
display: block;
max-width: 150px;
height: 20px;
padding: 6px 12px;
font-size: 14px;
margin-top: 10px;
color: #555;
background-color: #fff;
border: 1px solid #ccc;
border-radius: 3px;
box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
}
/* ==================================== */
#mid{
position: absolute;
left: 448px;
@@ -175,13 +105,32 @@ body{
font-size: 15px;
line-height: 14px;
}
.files {
width: 50%;
height: 120px;
/* padding: 10px; */
margin-top: 15px;
}
.input{
display: block;
max-width: 150px;
height: 20px;
padding: 6px 12px;
font-size: 14px;
margin-top: 10px;
color: #555;
background-color: #fff;
border: 1px solid #ccc;
border-radius: 3px;
box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
}
#bgSelect{
width: 50%;
height: 100px;
margin-top: 10px;
}
#bgSelect span{
display: block;
/* display: block; */
font-size: 14px;
line-height: 30px;
}
@@ -198,7 +147,7 @@ body{
min-width: 50px;
padding: 0 5px;
display: inline-block;
margin-top: 5px;
font-size: 14px;
font-weight: 400;
/* text-transform: uppercase; */
@@ -218,8 +167,6 @@ body{
background-color: #009688;
box-shadow: 0 2px 2px 0 rgba(0,0,0,.14), 0 3px 1px -2px rgba(0,0,0,.2), 0 1px 5px 0 rgba(0,0,0,.12);
}
/* =========================== */
#right{
position: absolute;
left: 900px;
+21 -48
View File
@@ -187,7 +187,7 @@ var tip = new Vue({
isClearBlock: false,
geneMapSuccess: false,
timer: null,
msgs: [ //分别编号1,2,3,4,5,6,7,8;奇数警告,偶数成功
msgs: [ //分别编号1,2,3,4,5,6,7,8,9,10;奇数警告,偶数成功
"当前未选择任何图块,请先在右边选择要画的图块!",
"生成地图成功!可点击复制按钮复制地图数组到剪切板",
"生成失败! 地图中有未定义的图块,建议先用其他有效图块覆盖或点击清除地图!",
@@ -195,7 +195,9 @@ var tip = new Vue({
"复制失败!",
"复制成功!可直接粘贴到楼层文件的地图数组中。",
"复制失败!当前还没有数据",
"修改成功!可点击复制按钮复制地图数组到剪切板"
"修改成功!可点击复制按钮复制地图数组到剪切板",
"选择背景图片失败!文件名格式错误或图片不存在!",
"更新背景图片成功!",
],
mapMsg: '',
whichShow: 0,
@@ -255,60 +257,31 @@ var bgSelect = new Vue({
el: '#bgSelect',
data: {
bgs: {},
selectedBg: 'ground'
selectedBg: 'ground',
imgname: ''
},
watch:{
selectedBg: function(){
editor.bgY = this.bgs.indexOf(this.selectedBg);
editor.drawMapBg();
}
}
})
var editFile4map = new Vue({
el: '#editFile4map',
data: {
selected: 'untitle',
options:[],
filelist: [],
},
watch: {
filelist: function(val){
if(val){
var oval = val.length ? JSON.parse(JSON.stringify(val)) : [];
// for(var i=0; i<oval.length; i++)
// this.$set("options", i, oval[i]);
}
},
}
})
var modSeletNav = new Vue({
el: '#modSeletNav',
data: {
currTabnum: 1,
tabs:[
{num: 1, title: "地图数组"},
{num: 2, title: "对象属性"},
{num: 3, title: "选点事件"},
{num: 4, title: "楼层事件"},
]
},
watch: {
currTabnum(val){
this.$emit('on-change', val)
this.$emit('input', val)
}
},
methods: {
selectTab(num){
this.currTabnum = num;
tabSelection.showTab = num;
updatebg: function(){
tip.whichShow = 0;
var regx = /\S+\.(png|bmp|jpg|jpeg|gif)$/i;
if(regx.test(this.imgname)){
var url = 'images/'+this.imgname;
editor.loadImg(url).then(function(img){
editor.drawMapBg(img);
tip.whichShow = 10;
}).catch(function(err){
console.log(err);
tip.whichShow = 9;
});
}else{
tip.whichShow = 9;
}
}
}
})
var tabSelection = new Vue({
el: '#tabSelection',
data: {
showTab: 1,
},
})