|
|
@@ -225,12 +225,12 @@ if (!function_exists('addtion')) {
|
|
|
}
|
|
|
foreach ($fieldsArr as $k => &$v) {
|
|
|
$v = is_array($v) ? $v : ['field' => $v];
|
|
|
- $v['display'] = isset($v['display']) ? $v['display'] : str_replace(['_ids', '_id'], ['_names', '_name'], $v['field']);
|
|
|
- $v['primary'] = isset($v['primary']) ? $v['primary'] : '';
|
|
|
- $v['column'] = isset($v['column']) ? $v['column'] : 'name';
|
|
|
- $v['model'] = isset($v['model']) ? $v['model'] : '';
|
|
|
- $v['table'] = isset($v['table']) ? $v['table'] : '';
|
|
|
- $v['name'] = isset($v['name']) ? $v['name'] : str_replace(['_ids', '_id'], '', $v['field']);
|
|
|
+ $v['display'] = $v['display'] ?? str_replace(['_ids', '_id'], ['_names', '_name'], $v['field']);
|
|
|
+ $v['primary'] = $v['primary'] ?? '';
|
|
|
+ $v['column'] = $v['column'] ?? 'name';
|
|
|
+ $v['model'] = $v['model'] ?? '';
|
|
|
+ $v['table'] = $v['table'] ?? '';
|
|
|
+ $v['name'] = $v['name'] ?? str_replace(['_ids', '_id'], '', $v['field']);
|
|
|
}
|
|
|
unset($v);
|
|
|
$ids = [];
|