hawind/gdoo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

重构联查功能

Browse Source 
尝试把列表构建改成由前端渲染
This commit is contained in:
hawind
2021-03-12 07:56:51 +08:00
parent 8ad68e938e
commit d795809fb3
19 changed files with 515 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Gdoo/Model/Form.php
+13 -8
View File
@@ -53,7 +53,7 @@ class Form
$_table = $data_link.'_'.$data_type;
if ($field['type']) {
$join[$_table] = [$data_type.' as '.$_table, $_table.'.id', '=', $table.'.'.$data_link];
$join[$_table] = [$data_type.' as '.$_table, $_table.'.id', '=', $table.'.'.$data_link, $table, 1];
}
$links[$data_link][$data_link] = 'id';
@@ -76,7 +76,7 @@ class Form
$_table = $field['field'].'_'.$_t1;
}
$join[$_table] = [$_t1.' as '.$_table, $_table.'.id', '=', $data_link.'_'.$data_type.'.'.$_v2];
$join[$_table] = [$_t1.' as '.$_table, $_table.'.id', '=', $data_link.'_'.$data_type.'.'.$_v2, $data_link.'_'.$data_type, 1];
$index = $_table.'.'.$_t2;
if ($field['field'] == $data_link) {
@@ -141,6 +141,7 @@ class Form
foreach($fields as $field) {
static::fieldRelated($table, $field, $join, $select, $links);
}
$join = Grid::sortJoin($join);
$q = DB::table($table)
->where($table.'.id', (int)$options['id']);
@@ -1986,13 +1987,13 @@ class Form
return hash_equals($sessionToken, $token);
}
public static function dataFilter($table, $fields, $permissions, $master, $values)
public static function dataFilter($table, $fields, $permissions, $master, $values, &$dataFiles)
{
$permission = $permissions[$table];
foreach ($values as $key => $value) {
foreach ($fields as $field) {
$field = $fields[$key];
$key = $field['field'];
$setting = $field['setting'];
$value = $values[$key];
$row = $permission[$key];
@@ -2042,7 +2043,11 @@ class Form
}
break;
case 'checkbox':
$value = intval($value);
if (is_array($value)) {
$value = join(",", (array)$value);
} else {
$value = intval($value);
}
break;
}
$values[$key] = $value;
@@ -2103,7 +2108,7 @@ class Form
// 格式化子表数据格式
foreach ($rows as $i => $row) {
$rows[$i] = static::dataFilter($table, $fields, $permissions, $master, $row);
$rows[$i] = static::dataFilter($table, $fields, $permissions, $master, $row, $dataFiles);
}
$datas[] = [
@@ -2115,7 +2120,7 @@ class Form
];
} else {
// 处理主表的字段格式
$gets[$t] = static::dataFilter($table, $fields, $permissions, $master, $gets[$t]);
$gets[$t] = static::dataFilter($table, $fields, $permissions, $master, $gets[$t], $dataFiles);
}
}
app/Gdoo/Model/Grid.php
+36 -10
View File
@@ -44,6 +44,7 @@ class Grid
}
}
}
if ($item['province_id']) {
$region_ids[$item['province_id']] = $item['province_id'];
$region_ids[$item['city_id']] = $item['city_id'];
@@ -96,6 +97,15 @@ class Grid
}
}
$_header = $header;
unset($_header['columns']);
unset($_header['dialogs']);
unset($_header['join']);
unset($_header['js']);
unset($_header['raw_select']);
unset($_header['search']);
unset($_header['select']);
$header['runs'] = $runs;
$header['dialogs'] = $dialogs;
$header['regions'] = $regions;
@@ -111,7 +121,7 @@ class Grid
} else {
$ret = collect(['data' => $rows]);
}
$ret['header'] = $header;
$ret['header'] = $_header;
return $ret;
}
@@ -290,6 +300,25 @@ class Grid
return $rows;
}
// 重新排序join
public static function sortJoin($joins)
{
foreach ($joins as $k => $join) {
static::recursiveJoin($joins, $k);
}
array_multisort(array_column($joins, 5), SORT_ASC, $joins);
return $joins;
}
public static function recursiveJoin(&$joins, $parent_id = 0) {
foreach($joins as $k => &$join) {
if ($join[4] == $parent_id) {
$join[5] = $joins[$parent_id][5] + 1;
static::recursiveJoin($joins, $k);
}
}
}
public static function fieldRelated($table, $row, &$join, &$select, &$index, &$column, &$search, $setting)
{
if ($row['data_type']) {
@@ -299,7 +328,7 @@ class Grid
$_table = $data_link.'_'.$data_type;
if ($row['type']) {
$join[$_table] = [$data_type.' as '.$_table, $_table.'.id', '=', $table.'.'.$data_link];
$join[$_table] = [$data_type.' as '.$_table, $_table.'.id', '=', $table.'.'.$data_link, $table, 1];
}
$field_count = mb_substr_count($data_field, ':');
@@ -314,8 +343,8 @@ class Grid
} else {
$_table = $row['field'].'_'.$_t1;
}
$join[$_table] = [$_t1.' as '.$_table, $_table.'.id', '=', $data_link.'_'.$data_type.'.'.$_v2];
$join[$_table] = [$_t1.' as '.$_table, $_table.'.id', '=', $data_link.'_'.$data_type.'.'.$_v2, $data_link.'_'.$data_type, 1];
$index = $_table.'.'.$_t2;
@@ -461,7 +490,7 @@ class Grid
if ($_model['parent_id'] > 0) {
$select[$_model['table'].'.id'] = [];
}
$join[] = [$_model['table'], $_model['table'].'.'.$_model['relation'], '=', $master['table'].'.id'];
$join[] = [$_model['table'], $_model['table'].'.'.$_model['relation'], '=', $master['table'].'.id', $master['table'], 0];
}
} else {
@@ -549,7 +578,7 @@ class Grid
}
static::fieldRelated($_table, $row, $join, $select, $index, $column, $_search, $setting);
if ($row['is_link']) {
if (isset($left_fields[$field])) {
continue;
}
@@ -842,11 +871,8 @@ class Grid
$res['select'] = $src_select;
$res['raw_select'] = $raw_select;
$res['join'] = static::sortJoin($join);
//print_r($join);
//print_r($select);
$res['join'] = $join;
$res['search'] = $search;
$res['search_form'] = $search_form;
app/Gdoo/Model/Services/FieldService.php
+57 -43
View File
@@ -1243,7 +1243,6 @@ class FieldService
if ($field['is_print']) {
foreach ($select as $t) {
$attribute = $field['attribute'];
$n = $v = '';
list($n, $v) = explode('|', $t);
$v = is_null($v) ? trim($n) : trim($v);
@@ -1260,7 +1259,6 @@ class FieldService
$name = $attribute['name'];
foreach ($select as $i => $t) {
$n = $v = '';
list($n, $v) = explode('|', $t);
$v = is_null($v) ? trim($n) : trim($v);
@@ -1278,55 +1276,71 @@ class FieldService
public static function content_checkbox($field, $content = '', $row = [], $permission = [])
{
$field = static::content_field($field);
// 配置
$setting = $field['setting'];
$default = $setting['default'];
$content = is_null($content) ? $default : $content;
$str = [];
$checkeds = [];
$items = [];
$values = explode(",", $content);
$attribute = $field['attribute'];
$id = $attribute['id'];
$name = $attribute['name'];
$_select = explode("\n", $setting['content']);
if ($field['is_print']) {
foreach ($_select as $t) {
$n = $v = '';
list($n, $v) = explode('|', $t);
$v = is_null($v) ? trim($n) : trim($v);
if ($row[$v] == 1) {
$str[] = $n;
}
if ($v == $content) {
$str[] = $n;
}
}
return join(',', $str);
}
if ($field['type']) {
$checked = $content == 1 ? 'checked="checked"' : '';
if ($field['is_show']) {
$str[] = '<label class="i-checks i-checks-sm m-b-none" style="font-weight:normal;"><input type="checkbox" disabled="disabled" '.$checked.'><i></i>'.$field['name'].'</label>';
} else {
$str[] = '<label class="i-checks i-checks-sm m-t-xs m-b-none" style="font-weight:normal;"><input type="checkbox" id="'. $id .'" name="'. $name . '" value="1" '.$checked.'><i></i>'.$field['name'].'</label>';
}
if ($setting['type']) {
$items = DB::table($setting['type'])->where('status', 1)->orderBy('sort', 'asc')->get();
} else {
foreach ($_select as $t) {
$n = $v = '';
list($n, $v) = explode('|', $t);
$v = is_null($v) ? trim($n) : trim($v);
$checked = $row[$v] == 1 ? 'checked="checked"' : '';
if ($field['is_show']) {
$str[] = '<label class="i-checks i-checks-sm m-b-none" style="font-weight:normal;"><input type="checkbox" disabled="disabled" '.$checked.'><i></i>'.$n.'</label>';
} else {
$w = $permission[$v]['w'] == 1 ? '' : 'disabled="disabled"';
$disabled = $permission[$v]['w'] == 1 ? '' : 'i-checks-disabled';
$str[] = '<label class="i-checks '.$disabled.' i-checks-sm m-t-xs m-b-none" style="font-weight:normal;"><input type="checkbox" '.$w.' id="'. $field['table'] . '_'.$v.'" name="'. $field['table'] . '['.$v.']" value="1" '.$checked.'><i></i>'.$n.'</label>';
if (not_empty($setting['content'])) {
$selects = explode("\n", $setting['content']);
foreach ($selects as $select) {
$n = $v = '';
list($n, $v) = explode('|', $select);
$v = is_null($v) ? trim($n) : trim($v);
$items[] = ['id' => $v, 'name' => $n];
}
} else {
$items[] = ['id' => 1, 'name' => $field['name']];
}
}
return join('&nbsp;&nbsp;', $str);
// 打印模式直接返回选中的值名称
if ($field['is_print']) {
foreach ($items as $item) {
if ($field['type']) {
if (in_array($item['id'], $values)) {
$checkeds[] = $item['name'];
}
} else {
if ($row[$item['id']] == 1) {
$checkeds[] = $item['name'];
}
}
}
return join(',', $checkeds);
}
$str = [];
foreach ($items as $item) {
// 存在字段
if ($field['type']) {
$value = $v;
$checked = in_array($v, $values) ? 'checked="checked"' : '';
$name = $field['table'].'['.$field['field'].']['.$v.']';
$key = $field['field'];
} else {
$value = 1;
$checked = $row[$item['id']] == $value ? 'checked="checked"' : '';
$name = $field['table'].'['.$item['id'].']';
$key = $item['id'];
}
if ($field['is_show']) {
$str[] = '<label class="i-checks i-checks-sm m-r-xs m-b-none"><input type="checkbox" id="'. $field['table'].'_'.$item['id'].'" disabled="disabled" '.$checked.'><i></i>'.$item['name'].'</label>';
} else {
$w = $permission[$key]['w'] == 1 ? '' : 'disabled="disabled"';
$disabled = $permission[$key]['w'] == 1 ? '' : 'i-checks-disabled';
$str[] = '<label class="i-checks '.$disabled.' i-checks-sm m-t-xs m-r-xs m-b-none"><input type="checkbox" '.$w.' id="'. $field['table'].'_'.$item['id'].'" name="'.$name.'" value="'.$value.'" '.$checked.'><i></i>'.$item['name'].'</label>';
}
}
return join(' ', $str);
}
public static function content_image($field, $content = '')