Merge branch 'master-500-dev-lushangqing' into 'master-500-dev'
【1037】 【首页-资源类型下探--资源列表】字段配置，增加列宽度配置 See merge request !940
Showing
4 changed files
with
11 additions
and
11 deletions
| @@ -148,7 +148,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm | @@ -148,7 +148,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm | ||
| 148 | }else{ | 148 | }else{ |
| 149 | layTips='lay-tips="点击修改/删除"' | 149 | layTips='lay-tips="点击修改/删除"' |
| 150 | } | 150 | } |
| 151 | - cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true, | 151 | + cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: item.width?item.width:100, sort: true, |
| 152 | templet:` <div> | 152 | templet:` <div> |
| 153 | <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`" | 153 | <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`" |
| 154 | data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}"> | 154 | 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 | @@ -295,7 +295,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm | ||
| 295 | }else{ | 295 | }else{ |
| 296 | layTips='lay-tips="点击修改/删除"' | 296 | layTips='lay-tips="点击修改/删除"' |
| 297 | } | 297 | } |
| 298 | - cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true, | 298 | + cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: item.width?item.width:100, sort: true, |
| 299 | templet:` <div> | 299 | templet:` <div> |
| 300 | <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`" | 300 | <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`" |
| 301 | data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}"> | 301 | 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', | @@ -858,7 +858,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form', | ||
| 858 | }else{ | 858 | }else{ |
| 859 | layTips='lay-tips="点击修改/删除"' | 859 | layTips='lay-tips="点击修改/删除"' |
| 860 | } | 860 | } |
| 861 | - cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true, | 861 | + cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: item.width?item.width:100, sort: true, |
| 862 | templet:` <div> | 862 | templet:` <div> |
| 863 | <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`" | 863 | <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`" |
| 864 | data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}"> | 864 | 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 | @@ -467,7 +467,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols | ||
| 467 | }else{ | 467 | }else{ |
| 468 | layTips='lay-tips="点击修改/删除"' | 468 | layTips='lay-tips="点击修改/删除"' |
| 469 | } | 469 | } |
| 470 | - cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true, | 470 | + cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: item.width?item.width:100, sort: true, |
| 471 | templet:` <div> | 471 | templet:` <div> |
| 472 | <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`" | 472 | <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`" |
| 473 | data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}"> | 473 | 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 | @@ -619,7 +619,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols | ||
| 619 | }else{ | 619 | }else{ |
| 620 | layTips='lay-tips="点击修改/删除"' | 620 | layTips='lay-tips="点击修改/删除"' |
| 621 | } | 621 | } |
| 622 | - cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true, | 622 | + cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: item.width?item.width:100, sort: true, |
| 623 | templet:` <div> | 623 | templet:` <div> |
| 624 | <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`" | 624 | <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`" |
| 625 | data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}"> | 625 | 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 | @@ -746,7 +746,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols | ||
| 746 | }else{ | 746 | }else{ |
| 747 | layTips='lay-tips="点击修改/删除"' | 747 | layTips='lay-tips="点击修改/删除"' |
| 748 | } | 748 | } |
| 749 | - cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true, | 749 | + cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: item.width?item.width:100, sort: true, |
| 750 | templet:` <div> | 750 | templet:` <div> |
| 751 | <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`" | 751 | <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`" |
| 752 | data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}"> | 752 | 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 | @@ -886,7 +886,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols | ||
| 886 | }else{ | 886 | }else{ |
| 887 | layTips='lay-tips="点击修改/删除"' | 887 | layTips='lay-tips="点击修改/删除"' |
| 888 | } | 888 | } |
| 889 | - cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true, | 889 | + cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: item.width?item.width:100, sort: true, |
| 890 | templet:` <div> | 890 | templet:` <div> |
| 891 | <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`" | 891 | <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`" |
| 892 | data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}"> | 892 | 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', ' | @@ -231,7 +231,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', ' | ||
| 231 | }else{ | 231 | }else{ |
| 232 | layTips='lay-tips="点击修改/删除"' | 232 | layTips='lay-tips="点击修改/删除"' |
| 233 | } | 233 | } |
| 234 | - cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true, | 234 | + cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: item.width?item.width:100, sort: true, |
| 235 | templet:` <div> | 235 | templet:` <div> |
| 236 | <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`" | 236 | <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`" |
| 237 | data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}"> | 237 | 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', ' | @@ -872,7 +872,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', ' | ||
| 872 | }else{ | 872 | }else{ |
| 873 | layTips='lay-tips="点击修改/删除"' | 873 | layTips='lay-tips="点击修改/删除"' |
| 874 | } | 874 | } |
| 875 | - cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true, | 875 | + cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: item.width?item.width:100, sort: true, |
| 876 | templet:` <div> | 876 | templet:` <div> |
| 877 | <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`" | 877 | <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`" |
| 878 | data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}"> | 878 | 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', ' | @@ -1121,7 +1121,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', ' | ||
| 1121 | }else{ | 1121 | }else{ |
| 1122 | layTips='lay-tips="点击修改/删除"' | 1122 | layTips='lay-tips="点击修改/删除"' |
| 1123 | } | 1123 | } |
| 1124 | - cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true, | 1124 | + cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: item.width?item.width:100, sort: true, |
| 1125 | templet:` <div> | 1125 | templet:` <div> |
| 1126 | <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`" | 1126 | <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`" |
| 1127 | data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}"> | 1127 | 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', ' | @@ -1292,7 +1292,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', ' | ||
| 1292 | }else{ | 1292 | }else{ |
| 1293 | layTips='lay-tips="点击修改/删除"' | 1293 | layTips='lay-tips="点击修改/删除"' |
| 1294 | } | 1294 | } |
| 1295 | - cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: 100, sort: true, | 1295 | + cols.splice(item.fieldSort,0,{field: item.field, title: item.fieldName, align: 'center', width: item.width?item.width:100, sort: true, |
| 1296 | templet:` <div> | 1296 | templet:` <div> |
| 1297 | <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`" | 1297 | <div class="edit-delete-tpl T-edit-delete-tpl" `+layTips+` data-fieldsourcetype="`+item.fieldSourceType+`" |
| 1298 | data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}"> | 1298 | data-expandid="`+item.id+`" data-list="`+listStr+`" data-tpltype="`+item.field+`" data-resid="{{d.resId}}"> |
-
Please register or login to post a comment