.
This commit is contained in:
@@ -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