monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit dafb56ef58bdf9ac7d05517e6d4f6520aaa88de3 2 parents b629784f adb38031

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

【1037】 【首页-资源类型下探--资源列表】字段配置，增加列宽度配置



See merge request !940
Inline Side-by-side
Showing 4 changed files with 11 additions and 11 deletions
... ... @@ -148,7 +148,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
}else{
layTips='lay-tips="点击修改/删除"'
}
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: item.width?item.width:100, sort: true,
templet:` <div>
<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}}">
... ... @@ -295,7 +295,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
}else{
layTips='lay-tips="点击修改/删除"'
}
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: item.width?item.width:100, sort: true,
templet:` <div>
<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}}">
... ...
... ... @@ -858,7 +858,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
}else{
layTips='lay-tips="点击修改/删除"'
}
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: item.width?item.width:100, sort: true,
templet:` <div>
<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}}">
... ...
... ... @@ -467,7 +467,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
}else{
layTips='lay-tips="点击修改/删除"'
}
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: item.width?item.width:100, sort: true,
templet:` <div>
<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}}">
... ... @@ -619,7 +619,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
}else{
layTips='lay-tips="点击修改/删除"'
}
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: item.width?item.width:100, sort: true,
templet:` <div>
<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}}">
... ... @@ -746,7 +746,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
}else{
layTips='lay-tips="点击修改/删除"'
}
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: item.width?item.width:100, sort: true,
templet:` <div>
<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}}">
... ... @@ -886,7 +886,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
}else{
layTips='lay-tips="点击修改/删除"'
}
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: item.width?item.width:100, sort: true,
templet:` <div>
<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}}">
... ...
... ... @@ -231,7 +231,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
}else{
layTips='lay-tips="点击修改/删除"'
}
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: item.width?item.width:100, sort: true,
templet:` <div>
<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}}">
... ... @@ -872,7 +872,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
}else{
layTips='lay-tips="点击修改/删除"'
}
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: item.width?item.width:100, sort: true,
templet:` <div>
<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}}">
... ... @@ -1121,7 +1121,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
}else{
layTips='lay-tips="点击修改/删除"'
}
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: item.width?item.width:100, sort: true,
templet:` <div>
<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}}">
... ... @@ -1292,7 +1292,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
}else{
layTips='lay-tips="点击修改/删除"'
}
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true,
cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: item.width?item.width:100, sort: true,
templet:` <div>
<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}}">
... ...