molong/sentcms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、解决看板组件的bug

Browse Source 
2、模型表单字段分组bug
This commit is contained in:
tensent
2020-04-18 11:37:28 +08:00
parent 8ab0ff15bb
commit abc1fac1b9
5 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/http/form/template/kanban.html
View File

@@ -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'] : '';

2
app/model/Attribute.php
View File

@@ -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();

2
app/model/Model.php
View File

@@ -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;
}
}

5
public/static/common/js/require-form.js
View File

@@ -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 + '][]')
}
})
})

2
view/admin/model/edit.html
View File

@@ -56,7 +56,7 @@
<div class="board panel panel-info">
<div class="panel-heading">{$field_group[$key]}</div>
<div class="panel-body">
<div class="board-list" data-group="{$key}">
<div class="board-list" data-group="{$key}" data-name="attribute_sort">
{foreach name="field" item="item" key="k"}
<div class="board-item">
<span data="{$item['id']}">{$item['title']} [{$item['name']}]</span>