{foreach name="vo['list']" item="item" key="k"}
{php}
$item['group'] = isset($item['group']) ? $item['group'] : '';
diff --git a/app/model/Attribute.php b/app/model/Attribute.php
index f6cf5279..108fc2ef 100644
--- a/app/model/Attribute.php
+++ b/app/model/Attribute.php
@@ -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();
diff --git a/app/model/Model.php b/app/model/Model.php
index 5be30128..43a0af22 100644
--- a/app/model/Model.php
+++ b/app/model/Model.php
@@ -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;
}
}
diff --git a/public/static/common/js/require-form.js b/public/static/common/js/require-form.js
index 77bb51fa..00e00275 100644
--- a/public/static/common/js/require-form.js
+++ b/public/static/common/js/require-form.js
@@ -118,8 +118,9 @@ define(['jquery', 'bootstrap', 'validator'], function ($, undefined, Validator)
require(['board'], function(){
$('.boards', form).boards({
drop: function(e){
- var group = e.target.closest('.board').find('.board-list').attr('data-group');
- e.element.find('input').attr('name','addons[' + group + '][]')
+ var group = e.target.closest('.board').find('.board-list').data('group');
+ var name = e.target.closest('.board').find('.board-list').data('name');
+ e.element.find('input').attr('name',name+'[' + group + '][]')
}
})
})
diff --git a/view/admin/model/edit.html b/view/admin/model/edit.html
index 2d896281..c862c1d9 100644
--- a/view/admin/model/edit.html
+++ b/view/admin/model/edit.html
@@ -56,7 +56,7 @@
{$field_group[$key]}
-
+
{foreach name="field" item="item" key="k"}
{$item['title']} [{$item['name']}]