Skip to content

Commit ad28c88

Browse files
committed
1.0.5
1.修复了个别情况下不能显示项目列表的bug 2.修复了在观察者状态下可以通过项目列表修改项目信息的bug 3.修复了在火狐下拖动会打开新标签的bug 4.修改了首页的顶部样式
1 parent aaaa49f commit ad28c88

File tree

9 files changed

+16
-11
lines changed

9 files changed

+16
-11
lines changed

SBDoc/routes/project/project.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ function list(req,res) {
267267
role:1
268268
}
269269
}
270-
},"name dis",{
270+
},"name dis users",{
271271
sort:"-createdAt"
272272
}))
273273
arr.forEach(function (obj) {

SBDocClient/dist/run.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

SBDocClient/dist/vendor.bundle.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

SBDocClient/dist/vendor.bundle.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

SBDocClient/web/common/common.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ if(Vue)
66
window.Vue=Vue;
77
}
88
Vue.use(Vuex);
9+
document.body.ondrop = function (event) {
10+
event.preventDefault();
11+
event.stopPropagation();
12+
}
913
var $={};
1014
$.ready = function (callback) {
1115
if (document.addEventListener) {

SBDocClient/web/component/mainNav.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<el-row id="navBar" class="row" :style="transparent?{height:'60px','backgroundColor':'transparent',left:0,top:0,position:'absolute'}:{height:'60px','backgroundColor':'white'}">
2+
<el-row id="navBar" class="row" :style="transparent?{height:'60px','backgroundColor':'rgba(0,0,0,0.3)',left:0,top:0,position:'absolute'}:{height:'60px','backgroundColor':'white'}">
33
<slot name="other"></slot>
44
<el-col class="col" :span="3" style="text-align: left;line-height: 60px;color:#20A0FF ;font-size: 30px;padding-left: 20px">
55
<a style="text-decoration: none;cursor: pointer;color: inherit" href="/">SBDoc</a>
@@ -123,7 +123,7 @@
123123
else
124124
{
125125
ele.style.top=0;
126-
ele.style.backgroundColor="transparent"
126+
ele.style.backgroundColor="rgba(0,0,0,0.3)"
127127
ele.style.position="absolute";
128128
}
129129
})

SBDocClient/web/component/outParam.vue

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -236,15 +236,15 @@
236236
$.tip("名字为空的元素不允许拖动!",0);
237237
}
238238
ele.style.backgroundColor="white";
239-
return;
239+
return false;
240240
}
241241
if(ele.style.backgroundColor=="orange")
242242
{
243243
if(this.arr.indexOf(dragItem)>-1)
244244
{
245245
$.tip("已经是顶部元素了!",0);
246246
ele.style.backgroundColor="white";
247-
return;
247+
return false;
248248
}
249249
dragArr.splice(obj.index,1);
250250
this.arr.push(obj.item);
@@ -255,7 +255,7 @@
255255
{
256256
$.tip("已经是直接父子元素关系了!",0);
257257
ele.style.backgroundColor="white";
258-
return;
258+
return false;
259259
}
260260
var objFind={
261261
find:false
@@ -279,6 +279,7 @@
279279
}
280280
ele.style.backgroundColor="white";
281281
}
282+
return false;
282283
},
283284
dragEnd:function () {
284285
dragArr=null;

SBDocClient/web/component/projectList.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<el-row class="row" style="height: 30px;line-height:30px;font-size: 15px;color: gray;position: absolute;left: 0;bottom: 0;text-align: left;background-color: rgba(215,215,215,0.51)">
1111
&nbsp;{{"成员:"+arr[(n-1)*4+(index-1)].userCount}}&nbsp;
1212
{{"接口:"+arr[(n-1)*4+(index-1)].interfaceCount}}
13-
<el-button type="text" icon="setting" style="position:absolute;width: 30px;height: 30px;right: 2px;top:0px;color: gray;font-size: 17px" title="设置" @click.stop="setting(arr[(n-1)*4+(index-1)])"></el-button>
13+
<el-button type="text" icon="setting" style="position:absolute;width: 30px;height: 30px;right: 2px;top:0px;color: gray;font-size: 17px" title="设置" @click.stop="setting(arr[(n-1)*4+(index-1)])" v-if="arr[(n-1)*4+(index-1)].role==0"></el-button>
1414
</el-row>
1515
</div>
1616
</td>

config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
"imgPath":"/Users/Shared/SBDoc/img",
55
"tempPath":"/Users/Shared/SBDoc/temp",
66
"port":10000,
7-
"version":"1.0.3"
7+
"version":"1.0.5"
88
}

0 commit comments

Comments
 (0)