monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 930a4fb787d08c73e0dda7a9556231887bab1b8d 2 parents f7da58c2 cd692c05

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

【无】增加扩展字段，防止重复增加



See merge request !929
Inline Side-by-side
Showing 3 changed files with 190 additions and 120 deletions
... ... @@ -128,27 +128,34 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
, done: function (res) {
if (res && res.data ) {
let arr=res.data;
let colsArr=[];
cols.map(item=>{
colsArr.push(item.field)
})
if(fieldExpandArr.indexOf(resType)!=-1){
}else{
fieldExpandArr.push(resType);
if(arr.length>0){
arr.map(item=>{
let listStr='';
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>
if(colsArr.indexOf(item.field)==-1){
let listStr='';
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" `+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>`})
}
})
}
}
... ... @@ -268,27 +275,34 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
, done: function (res) {
if (res && res.data ) {
let arr=res.data;
let colsArr=[];
cols.map(item=>{
colsArr.push(item.field)
})
if(fieldExpandArr.indexOf(resType)!=-1){
}else{
fieldExpandArr.push(resType);
if(arr.length>0){
arr.map(item=>{
let listStr='';
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>
if(colsArr.indexOf(item.field)==-1){
let listStr='';
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" `+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>`})
}
})
}
}
... ...
... ... @@ -447,27 +447,34 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
, done: function (res) {
if (res && res.data ) {
let arr=res.data;
let colsArr=[];
cols.map(item=>{
colsArr.push(item.field)
})
if(fieldExpandArr.indexOf('OperatingSystem')!=-1){
}else{
fieldExpandArr.push('OperatingSystem');
if(arr.length>0){
arr.map(item=>{
let listStr='';
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>
if(colsArr.indexOf(item.field)==-1){
let listStr='';
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" `+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>`})
}
})
}
}
... ... @@ -592,27 +599,34 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
, done: function (res) {
if (res && res.data ) {
let arr=res.data;
let colsArr=[];
cols.map(item=>{
colsArr.push(item.field)
})
if(fieldExpandArr.indexOf(resType)!=-1){
}else{
fieldExpandArr.push(resType);
if(arr.length>0){
arr.map(item=>{
let listStr='';
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>
if(colsArr.indexOf(item.field)==-1){
let listStr='';
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" `+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>`})
}
})
}
}
... ... @@ -712,27 +726,34 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
, done: function (res) {
if (res && res.data ) {
let arr=res.data;
let colsArr=[];
cols.map(item=>{
colsArr.push(item.field)
})
if(fieldExpandArr.indexOf(resType)!=-1){
}else{
fieldExpandArr.push(resType);
if(arr.length>0){
arr.map(item=>{
let listStr='';
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>
if(colsArr.indexOf(item.field)==-1){
let listStr='';
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" `+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>`})
}
})
}
}
... ... @@ -845,27 +866,34 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
, done: function (res) {
if (res && res.data ) {
let arr=res.data;
let colsArr=[];
cols.map(item=>{
colsArr.push(item.field)
})
if(fieldExpandArr.indexOf(resType)!=-1){
}else{
fieldExpandArr.push(resType);
if(arr.length>0){
arr.map(item=>{
let listStr='';
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>
if(colsArr.indexOf(item.field)==-1){
let listStr='';
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" `+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>`})
}
})
}
}
... ...
... ... @@ -211,27 +211,34 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
, done: function (res) {
if (res && res.data ) {
let arr=res.data;
let colsArr=[];
cols.map(item=>{
colsArr.push(item.field)
})
if(fieldExpandArr.indexOf(resType)!=-1){
}else{
fieldExpandArr.push(resType);
if(arr.length>0){
arr.map(item=>{
let listStr='';
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>
if(colsArr.indexOf(item.field)==-1){
let listStr='';
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" `+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>`})
}
})
}
}
... ... @@ -839,27 +846,34 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
, done: function (res) {
if (res && res.data ) {
let arr=res.data;
let colsArr=[];
cols.map(item=>{
colsArr.push(item.field)
})
if(fieldExpandArr.indexOf(resType)!=-1){
}else{
fieldExpandArr.push(resType);
if(arr.length>0){
arr.map(item=>{
let listStr='';
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>
if(colsArr.indexOf(item.field)==-1){
let listStr='';
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" `+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>`})
}
})
}
}
... ... @@ -1076,27 +1090,34 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
, done: function (res) {
if (res && res.data ) {
let arr=res.data;
let colsArr=[];
cols.map(item=>{
colsArr.push(item.field)
})
if(fieldExpandArr.indexOf(resType)!=-1){
}else{
fieldExpandArr.push(resType);
if(arr.length>0){
arr.map(item=>{
let listStr='';
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>
if(colsArr.indexOf(item.field)==-1){
let listStr='';
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" `+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>`})
}
})
}
}
... ... @@ -1240,27 +1261,34 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
, done: function (res) {
if (res && res.data ) {
let arr=res.data;
let colsArr=[];
cols.map(item=>{
colsArr.push(item.field)
})
if(fieldExpandArr.indexOf(resType)!=-1){
}else{
fieldExpandArr.push(resType);
if(arr.length>0){
arr.map(item=>{
let listStr='';
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>
if(colsArr.indexOf(item.field)==-1){
let listStr='';
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" `+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>`})
}
})
}
}
... ...