monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 2cb53cb829dca22550206b528d70f8730740a666 2 parents b494228d 77653c90

Merge branch 'master-500-dev-lushangqing' into 'master-500-dev' 

【无】扩展字段如果是text类型就不弹出提示及弹框



See merge request !918
Inline Side-by-side
Showing 5 changed files with 81 additions and 11 deletions
... ... @@ -132,9 +132,15 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
if(item.list && item.list.length>0){
listStr=item.list.join(',')
}
let layTips='';
if(item.fieldSourceType == 'text'){
layTips=''
}else{
layTips='lay-tips="点击修改/删除"'
}
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
templet:` <div>
<div class="edit-delete-tpl T-edit-delete-tpl" lay-tips="点击修改/删除" data-fieldsourcetype="`+item.fieldSourceType+`"
<div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`"
data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}">
{{d.`+item.field+` ? d.`+item.field+` : ''}}
</div></div>`})
... ... @@ -266,9 +272,15 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
if(item.list && item.list.length>0){
listStr=item.list.join(',')
}
let layTips='';
if(item.fieldSourceType == 'text'){
layTips=''
}else{
layTips='lay-tips="点击修改/删除"'
}
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
templet:` <div>
<div class="edit-delete-tpl T-edit-delete-tpl" lay-tips="点击修改/删除" data-fieldsourcetype="`+item.fieldSourceType+`"
<div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`"
data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}">
{{d.`+item.field+` ? d.`+item.field+` : ''}}
</div></div>`})
... ...
... ... @@ -5286,6 +5286,7 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
promptHtml=`<span style="border: 1px solid #d2d2d2;flex: 1;padding: 10px;" id="promptInput">`+old_T3Dom+`</span>`
}
let html_tpl=`<div class="T3-IOP-prompt">`+promptHtml+`</div>`;
if(fieldSourceType != 'text'){
layer.open({
title: [titleName+tplType, 'font-size:14px;'],
type: 1,
... ... @@ -5355,6 +5356,7 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
}
},
});
}
})
//end lsq T3和IOP点击修改/删除 2022-08-04
function showTips(id, message, state) {
... ...
... ... @@ -852,9 +852,15 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
if(item.list && item.list.length>0){
listStr=item.list.join(',')
}
let layTips='';
if(item.fieldSourceType == 'text'){
layTips=''
}else{
layTips='lay-tips="点击修改/删除"'
}
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
templet:` <div>
<div class="edit-delete-tpl T-edit-delete-tpl" lay-tips="点击修改/删除" data-fieldsourcetype="`+item.fieldSourceType+`"
<div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`"
data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}">
{{d.`+item.field+` ? d.`+item.field+` : ''}}
</div></div>`})
... ... @@ -1205,6 +1211,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
promptHtml=`<span style="border: 1px solid #d2d2d2;flex: 1;padding: 10px;" id="promptInput">`+old_T3Dom+`</span>`
}
let html_tpl=`<div class="T3-IOP-prompt">`+promptHtml+`</div>`;
if(fieldSourceType != 'text'){
layer.open({
title: [titleName+tplType, 'font-size:14px;'],
type: 1,
... ... @@ -1275,6 +1282,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
},
});
}
}
})
//end lsq T3和IOP点击修改/删除 2022-08-04
}
... ...
... ... @@ -456,9 +456,15 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
if(item.list && item.list.length>0){
listStr=item.list.join(',')
}
let layTips='';
if(item.fieldSourceType == 'text'){
layTips=''
}else{
layTips='lay-tips="点击修改/删除"'
}
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
templet:` <div>
<div class="edit-delete-tpl T-edit-delete-tpl" lay-tips="点击修改/删除" data-fieldsourcetype="`+item.fieldSourceType+`"
<div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`"
data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}">
{{d.`+item.field+` ? d.`+item.field+` : ''}}
</div></div>`})
... ... @@ -595,9 +601,15 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
if(item.list && item.list.length>0){
listStr=item.list.join(',')
}
let layTips='';
if(item.fieldSourceType == 'text'){
layTips=''
}else{
layTips='lay-tips="点击修改/删除"'
}
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
templet:` <div>
<div class="edit-delete-tpl T-edit-delete-tpl" lay-tips="点击修改/删除" data-fieldsourcetype="`+item.fieldSourceType+`"
<div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`"
data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}">
{{d.`+item.field+` ? d.`+item.field+` : ''}}
</div></div>`})
... ... @@ -709,9 +721,15 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
if(item.list && item.list.length>0){
listStr=item.list.join(',')
}
let layTips='';
if(item.fieldSourceType == 'text'){
layTips=''
}else{
layTips='lay-tips="点击修改/删除"'
}
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
templet:` <div>
<div class="edit-delete-tpl T-edit-delete-tpl" lay-tips="点击修改/删除" data-fieldsourcetype="`+item.fieldSourceType+`"
<div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`"
data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}">
{{d.`+item.field+` ? d.`+item.field+` : ''}}
</div></div>`})
... ... @@ -836,9 +854,15 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
if(item.list && item.list.length>0){
listStr=item.list.join(',')
}
let layTips='';
if(item.fieldSourceType == 'text'){
layTips=''
}else{
layTips='lay-tips="点击修改/删除"'
}
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
templet:` <div>
<div class="edit-delete-tpl T-edit-delete-tpl" lay-tips="点击修改/删除" data-fieldsourcetype="`+item.fieldSourceType+`"
<div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`"
data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}">
{{d.`+item.field+` ? d.`+item.field+` : ''}}
</div></div>`})
... ...
... ... @@ -220,9 +220,15 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
if(item.list && item.list.length>0){
listStr=item.list.join(',')
}
let layTips='';
if(item.fieldSourceType == 'text'){
layTips=''
}else{
layTips='lay-tips="点击修改/删除"'
}
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
templet:` <div>
<div class="edit-delete-tpl T-edit-delete-tpl" lay-tips="点击修改/删除" data-fieldsourcetype="`+item.fieldSourceType+`"
<div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`"
data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}">
{{d.`+item.field+` ? d.`+item.field+` : ''}}
</div></div>`})
... ... @@ -842,9 +848,15 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
if(item.list && item.list.length>0){
listStr=item.list.join(',')
}
let layTips='';
if(item.fieldSourceType == 'text'){
layTips=''
}else{
layTips='lay-tips="点击修改/删除"'
}
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
templet:` <div>
<div class="edit-delete-tpl T-edit-delete-tpl" lay-tips="点击修改/删除" data-fieldsourcetype="`+item.fieldSourceType+`"
<div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`"
data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}">
{{d.`+item.field+` ? d.`+item.field+` : ''}}
</div></div>`})
... ... @@ -1073,9 +1085,15 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
if(item.list && item.list.length>0){
listStr=item.list.join(',')
}
let layTips='';
if(item.fieldSourceType == 'text'){
layTips=''
}else{
layTips='lay-tips="点击修改/删除"'
}
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
templet:` <div>
<div class="edit-delete-tpl T-edit-delete-tpl" lay-tips="点击修改/删除" data-fieldsourcetype="`+item.fieldSourceType+`"
<div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`"
data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}">
{{d.`+item.field+` ? d.`+item.field+` : ''}}
</div></div>`})
... ... @@ -1231,9 +1249,15 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
if(item.list && item.list.length>0){
listStr=item.list.join(',')
}
let layTips='';
if(item.fieldSourceType == 'text'){
layTips=''
}else{
layTips='lay-tips="点击修改/删除"'
}
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
templet:` <div>
<div class="edit-delete-tpl T-edit-delete-tpl" lay-tips="点击修改/删除" data-fieldsourcetype="`+item.fieldSourceType+`"
<div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`"
data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}">
{{d.`+item.field+` ? d.`+item.field+` : ''}}
</div></div>`})
... ...