Skip to content

Commit 2d271be

Browse files
committed
3.0.10
1.修复了导入json不能导入多层array的bug 2.接口编辑页全局标签对观察者开放
1 parent 660691b commit 2d271be

File tree

11 files changed

+21
-17
lines changed

11 files changed

+21
-17
lines changed

Client/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.

Client/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.
Binary file not shown.

Client/web/component/article.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<el-button type="primary" @click="edit=1" v-else>
2121
编辑
2222
</el-button>
23-
<el-button type="primary" @click="save" :laoding="savePending">
23+
<el-button type="primary" @click="save" :laoding="savePending" v-if="session.role==0">
2424
保存
2525
</el-button>
2626
</el-row>
@@ -34,6 +34,7 @@
3434
props:["propObj"],
3535
data:function () {
3636
return {
37+
session:$.clone(session.raw()),
3738
obj:this.propObj?this.propObj:{
3839
title:"",
3940
content:"",

Client/web/component/global.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
<h4 style="margin-left: 10px;color: gray;float: left">
2929
状态码
3030
</h4>
31-
<el-button type="text" style="float: right;margin-top: 15px;margin-right: 10px" @click="createStatus">新建状态码</el-button>
32-
<el-button type="text" style="float: right;margin-top: 15px;margin-right: 10px" @click="importJSON">导入</el-button>
31+
<el-button type="text" style="float: right;margin-top: 15px;margin-right: 10px" @click="createStatus" v-if="session.role==0">新建状态码</el-button>
32+
<el-button type="text" style="float: right;margin-top: 15px;margin-right: 10px" @click="importJSON" v-if="session.role==0">导入</el-button>
3333
</el-row>
3434
<el-row class="row">
3535
<table class="table-hover" border="1" style="width: 100%;border-collapse: collapse" bordercolor="#ddd">
@@ -41,7 +41,7 @@
4141
</el-button>
4242
</td>
4343
<td style="width: 10%">
44-
<el-button type="text" size="small" style="color: red;font-size: 15px;" icon="close" @click="remove(item,index)" title="删除"></el-button>
44+
<el-button type="text" size="small" style="color: red;font-size: 15px;" icon="close" @click="remove(item,index)" title="删除" v-if="session.role==0"></el-button>
4545
</td>
4646
</tr>
4747
</template>
@@ -73,7 +73,7 @@
7373
</el-row>
7474
<el-row class="row" style="color: gray">
7575
{{item.updatedAt}}&nbsp;&nbsp;&nbsp;
76-
<el-button type="text" size="small" style="color:#FF4949" icon="delete2" @click.stop="removeArticle(item,index)" titile="删除">
76+
<el-button type="text" size="small" style="color:#FF4949" icon="delete2" @click.stop="removeArticle(item,index)" titile="删除" v-if="session.role==0">
7777
</el-button>
7878
</el-row>
7979
</el-row>

Client/web/component/globalInject.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
</el-input>
2121
</el-row>
2222
<el-row class="row" style="text-align: center;">
23-
<el-button type="primary" style="width: 200px;margin: 20px 0 20px 0" @click="save" :loading="savePending">保存</el-button>
23+
<el-button type="primary" style="width: 200px;margin: 20px 0 20px 0" @click="save" :loading="savePending" v-if="session.role==0">保存</el-button>
2424
</el-row>
2525
</el-row>
2626
</template>
@@ -31,6 +31,7 @@
3131
props:["before","after"],
3232
data:function () {
3333
return {
34+
session:$.clone(session.raw()),
3435
type:0,
3536
beforeEdit:this.before,
3637
afterEdit:this.after,

Client/web/component/statusEdit.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</table>
3030
</el-row>
3131
<el-row class="dialog-footer" slot="footer">
32-
<el-button type="primary" @click="save" :loading="savePending">
32+
<el-button type="primary" @click="save" :loading="savePending" v-if="session.role==0">
3333
保存
3434
</el-button>
3535
</el-row>
@@ -41,6 +41,7 @@
4141
props:["source"],
4242
data:function () {
4343
return {
44+
session:$.clone(session.raw()),
4445
obj:function () {
4546
if(this.source)
4647
{

Client/web/component/urlList.vue

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@
1010
<el-input style="width: 90%;margin: 0 auto" placeholder="请填写备注" v-model="item.remark"></el-input>
1111
</td>
1212
<td style="width: 10%">
13-
<el-button type="text" size="small" style="color: red;font-size: 15px;" @click="remove(index)" icon="close"></el-button>
13+
<el-button type="text" size="small" style="color: red;font-size: 15px;" @click="remove(index)" icon="close" v-if="session.role==0"></el-button>
1414
</td>
1515
<td style="width: 10%">
16-
<el-button style="font-size: 15px" v-if="index==arr.length-1" @click="arr.push({url:'',remark:''})" size="small" type="text" icon="plus"></el-button>
16+
<el-button style="font-size: 15px" v-if="index==arr.length-1 && session.role==0" @click="arr.push({url:'',remark:''})" size="small" type="text" icon="plus"></el-button>
1717
</td>
1818
</tr>
1919
</template>
2020
<tfoot>
2121
<tr>
2222
<td style="text-align: center;vertical-align: middle;width: 100%;padding: 20px" colspan="3">
23-
<el-button type="primary" style="width: 60%" @click="save" :loading="savePending">
23+
<el-button type="primary" style="width: 60%" @click="save" :loading="savePending" v-if="session.role==0">
2424
保存
2525
</el-button>
2626
</td>
@@ -35,6 +35,7 @@
3535
props:["source"],
3636
data:function () {
3737
return {
38+
session:$.clone(session.raw()),
3839
arr:function () {
3940
if(this.source.length>0)
4041
{

Client/web/projectinfo/projectinfo.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<span class="fa fa-bolt" style="display: inline-block;height: 30px;width: 30px;margin-top: 25px;font-size: 30px"></span><br>
2929
测试
3030
</div>
31-
<div style="width: 100%;height: 100px;text-align: center;cursor: pointer" :style="type==2?{backgroundColor:'white',color:'#20A0FF'}:{backgroundColor:'',color:'white'}" @click="type=2" v-if="session.role==0">
31+
<div style="width: 100%;height: 100px;text-align: center;cursor: pointer" :style="type==2?{backgroundColor:'white',color:'#20A0FF'}:{backgroundColor:'',color:'white'}" @click="type=2">
3232
<span class="fa fa-globe" style="display: inline-block;height: 30px;width: 30px;margin-top: 25px;font-size: 30px"></span><br>
3333
全局
3434
</div>

Client/web/util/helper.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -922,13 +922,13 @@ helper.handleResultData=function (name,data,result,originObj,show,input,bArr) {
922922
for(var i=0;i<data.length;i++)
923923
{
924924
var resultObj=originObj?((originObj.data && originObj.data.length>0)?originObj.data[i]:null):null;
925-
arguments.callee(null,data[i],obj.data,resultObj,show,input)
925+
arguments.callee(null,data[i],obj.data,resultObj,show,input,bArr)
926926
}
927927
}
928928
else
929929
{
930930
var resultObj=originObj?((originObj.data && originObj.data.length>0)?originObj.data[0]:null):null;
931-
arguments.callee(null,data[0],obj.data,resultObj,show,input)
931+
arguments.callee(null,data[0],obj.data,resultObj,show,input,bArr)
932932
}
933933
}
934934
}
@@ -978,7 +978,7 @@ helper.handleResultData=function (name,data,result,originObj,show,input,bArr) {
978978
for(var key in data)
979979
{
980980
var resultObj=helper.findObj(originObj?originObj.data:null,key);
981-
arguments.callee(key,data[key],obj.data,resultObj,show,input)
981+
arguments.callee(key,data[key],obj.data,resultObj,show,input,bArr)
982982
}
983983
}
984984
else

0 commit comments

Comments
 (0)