.
This commit is contained in:
@@ -80,7 +80,7 @@
|
||||
<thead>
|
||||
<tr>
|
||||
<!-- 'sort':field.order>0 -->
|
||||
<!--<th>操作</th>-->
|
||||
<th>操作</th>
|
||||
<th v-for="field in cfg.shows"
|
||||
v-if="field.inType != 'HIDDEN'"
|
||||
v-text="field.label || getFieldLabel(field.col)"
|
||||
@@ -93,11 +93,11 @@
|
||||
<!--
|
||||
<td v-for="field in cfg.shows" v-title="dealFieldFmt(row, field.col)" v-text="dealFieldFmt(row, field.col)"></td>
|
||||
-->
|
||||
<!--<td>
|
||||
<td v-if="cfg.details.length">
|
||||
<a href="javascript:;" @click="detailData=row; detail()">详情</a>
|
||||
<a href="javascript:;" @click="detailData=row; edit()">编辑</a>
|
||||
<a href="javascript:;" @click="detailData=row; del()">删除</a>
|
||||
</td>-->
|
||||
<a href="javascript:;" disabled @click="detailData=row; edit()">编辑</a>
|
||||
<a href="javascript:;" disabled @click="detailData=row; del()">删除</a>
|
||||
</td>
|
||||
<td v-for="field in cfg.shows"
|
||||
v-if="field.inType != 'HIDDEN'"
|
||||
v-title="dealFieldFmt(row, field)"
|
||||
@@ -141,7 +141,7 @@
|
||||
<button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span class="sr-only">关闭</span></button>
|
||||
<h4 class="modal-title" v-text="cfg.title + ' - [详情]'"> </h4>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<div class="modal-body" style="width: auto">
|
||||
<table class="table table-bordered table-hover">
|
||||
<tr v-for="i in parseInt(cfg.details.length/2)">
|
||||
|
||||
@@ -306,6 +306,9 @@
|
||||
for (i in res["filters"]) {
|
||||
res["filters"][i]['type'] = res["filters"][i]['filterType'][0]['name']
|
||||
}
|
||||
if (!res.details || res.details.length === 0) {
|
||||
res.details = res.shows
|
||||
}
|
||||
this.cfg = res
|
||||
});
|
||||
},
|
||||
|
||||
@@ -66,14 +66,14 @@
|
||||
<select class="form-control" v-model="linkItem.f1">
|
||||
<option></option>
|
||||
<option v-for="item in tableInfoA.items"
|
||||
:value="aliasA + '.' +item.name" v-text="aliasA + '.' +item.name + ' --- '+ item.label"></option>
|
||||
:value="aliasA + '.' +item.name" v-text="strJoin(aliasA + '.' +item.name,item.label, '---')"></option>
|
||||
</select>
|
||||
</td>
|
||||
<td>
|
||||
<select class="form-control" v-model="linkItem.f2">
|
||||
<option></option>
|
||||
<option v-for="item in tableInfoB.items"
|
||||
:value="aliasB + '.' +item.name" v-text="aliasB + '.' +item.name + ' --- '+ item.label">
|
||||
:value="aliasB + '.' +item.name" v-text="strJoin(aliasB + '.' +item.name, item.label, '---')">
|
||||
</option>
|
||||
</select>
|
||||
</td>
|
||||
@@ -103,7 +103,7 @@
|
||||
</div>
|
||||
<div class="modal-body" style="text-align: center">
|
||||
<select class="form-control" v-model="newLinkTable">
|
||||
<option v-for="x in tables" :value="x" v-text="x.name + ' --- ' + x.comment" v-show="!isDisable(x)"></option>
|
||||
<option v-for="x in tables" :value="x" v-text="strJoin(x.name, x.comment, '---')" v-show="!isDisable(x)"></option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
@@ -299,6 +299,12 @@
|
||||
},
|
||||
showInfo() {
|
||||
$('#f-info').modal({moveable: true})
|
||||
},
|
||||
strJoin(a,b,c) {
|
||||
if (a && b) {
|
||||
return a + ' ' + c + ' ' + b
|
||||
}
|
||||
return a + b
|
||||
}
|
||||
},
|
||||
mounted: function () {
|
||||
|
||||
Reference in New Issue
Block a user