z-song /
laravel-admin
| @@ 340-353 (lines=14) @@ | ||
| 337 | return !$k ? "{$rel}.{$v}" : "{$rel}.{$v}:{$k}"; |
|
| 338 | }, array_keys($columns), array_values($columns)); |
|
| 339 | ||
| 340 | $newInput = array_map(function ($v) use ($availInput) { |
|
| 341 | list($k, $c) = explode('.', $v); |
|
| 342 | //Fix ResetInput Function! A Headache Implementation! |
|
| 343 | $col = explode(':', $c)[0]; |
|
| 344 | if (!array_key_exists($col, $availInput[$k])) { |
|
| 345 | return [$v => null]; |
|
| 346 | } |
|
| 347 | ||
| 348 | if (array_key_exists($col, $availInput[$k]) && is_array($availInput[$k][$col])) { |
|
| 349 | return array_key_attach_str($availInput[$k][$col], $v, ':'); |
|
| 350 | } |
|
| 351 | ||
| 352 | return [$v => $availInput[$k][$col]]; |
|
| 353 | }, $newColumn); |
|
| 354 | $newInputs = array_clean_merge($newInputs, $newInput); |
|
| 355 | } |
|
| 356 | ||
| @@ 238-251 (lines=14) @@ | ||
| 235 | }, $newColumn); |
|
| 236 | $rules = array_clean_merge($rules, $newRules); |
|
| 237 | ||
| 238 | $newInput = array_map(function ($v) use ($availInput) { |
|
| 239 | list($r, $k, $c) = explode('.', $v); |
|
| 240 | //Fix ResetInput Function! A Headache Implementation! |
|
| 241 | $col = explode(':', $c)[0]; |
|
| 242 | if (!array_key_exists($col, $availInput[$k])) { |
|
| 243 | return [$v => null]; |
|
| 244 | } |
|
| 245 | ||
| 246 | if (is_array($availInput[$k][$col])) { |
|
| 247 | return array_key_attach_str($availInput[$k][$col], $v, ':'); |
|
| 248 | } |
|
| 249 | ||
| 250 | return [$v => $availInput[$k][$col]]; |
|
| 251 | }, $newColumn); |
|
| 252 | $newInputs = array_clean_merge($newInputs, $newInput); |
|
| 253 | ||
| 254 | $newAttributes = array_map(function ($v) use ($field, $availInput) { |
|
