1、解决看板组件的bug
2、模型表单字段分组bug
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
<div class="panel-heading">{$vo['name']|default=''}</div>
|
||||
<div class="panel-body">
|
||||
{if !empty($vo['list'])}
|
||||
<div class="board-list" data-group="{$key}">
|
||||
<div class="board-list" data-group="{$key}" data-name="{$name}">
|
||||
{foreach name="vo['list']" item="item" key="k"}
|
||||
{php}
|
||||
$item['group'] = isset($item['group']) ? $item['group'] : '';
|
||||
|
||||
@@ -149,7 +149,7 @@ class Attribute extends \think\Model {
|
||||
$map[] = ['is_show', 'IN', [1, 3]];
|
||||
}
|
||||
|
||||
$row = self::where($map)->order('sort asc, id desc')
|
||||
$row = self::where($map)->order('group_id asc, sort asc, id desc')
|
||||
->select()
|
||||
->append(['option'])
|
||||
->toArray();
|
||||
|
||||
+1
-1
@@ -78,7 +78,7 @@ class Model extends \think\Model{
|
||||
foreach ($attribute_sort as $key => $value) {
|
||||
$attr[$key] = Attribute::where('id', 'IN', $value)->column('*', 'id');
|
||||
foreach ($value as $k => $v) {
|
||||
$attr[$key][$v]['group'] = $key;
|
||||
$attr[$key][$v]['group_id'] = $key;
|
||||
$attr[$key][$v]['sort'] = $k;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user