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