Compare commits

..

No commits in common. "db3aa8f529f6a92e1768041336b8db210e40ae88" and "12c9b7960140faa4deb6136ff40bd498275630c6" have entirely different histories.

5 changed files with 9 additions and 8 deletions

View File

@ -72,6 +72,7 @@ class Menu extends Controller
if ($vo['url'] !== '#' && !preg_match('/^(https?:)?(\/\/|\\\\)/i', $vo['url'])) {
$vo['url'] = trim(url($vo['url']) . ($vo['params'] ? "?{$vo['params']}" : ''), '\\/');
}
$vo['ids'] = arr2str(DataExtend::getArrSubIds($data, $vo['id']));
}
}

View File

@ -42,7 +42,7 @@
});
},
cols: [[
{checkbox: true, field: 'sps'},
{checkbox: true, field: 'ids'},
{field: 'sort', title: '排序权重', width: 100, align: 'center', sort: true, templet: '#SortInputTpl'},
{
field: 'icon', title: '图标', width: 80, align: 'center', templet: function (d) {
@ -81,7 +81,7 @@
<script type="text/html" id="StatusSwitchTpl">
<!--{if auth("state")}-->
{{# if( "{$type|default='index'}"==='index' || (d.spc<1 || d.status<1)){ }}
<input type="checkbox" value="{{d.sps}}" data-path="{{d.path}}" lay-skin="switch" lay-text="已激活|已禁用" lay-filter="StatusSwitch" {{d.status>0?'checked':''}}>
<input type="checkbox" value="{{d.ids}}" data-path="{{d.path}}" lay-skin="switch" lay-text="已激活|已禁用" lay-filter="StatusSwitch" {{d.status>0?'checked':''}}>
{{# }else{ }}
{{d.status ? '<b class="color-green">已激活</b>' : '<b class="color-red">已禁用</b>'}}
{{# } }}
@ -113,7 +113,7 @@
{if auth('remove')}
{{# if( (d.spc<1 || d.status<1)){ }}
<a class="layui-btn layui-btn-sm layui-btn-danger" data-confirm="确定要删除菜单吗?" data-action="{:url('remove')}" data-value="id#{{d.sps}}"> </a>
<a class="layui-btn layui-btn-sm layui-btn-danger" data-confirm="确定要删除菜单吗?" data-action="{:url('remove')}" data-value="id#{{d.ids}}"> </a>
{{# }else{ }}
<a class="layui-btn layui-btn-disabled layui-btn-sm"> </a>

View File

@ -74,9 +74,9 @@
}
}
//.help-label b {
// color: @mainActiveBack
//}
.help-label b {
color: @mainActiveBack
}
.layui-btn-group {
border-color: @mainActiveBack;

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long