z-song /
laravel-admin
| @@ 115-126 (lines=12) @@ | ||
| 112 | }, array_keys($columns), array_values($columns)); |
|
| 113 | ||
| 114 | $fieldRules = is_array($fieldRules) ? implode('|', $fieldRules) : $fieldRules; |
|
| 115 | $newRules = array_map(function ($v) use ($fieldRules, $availInput) { |
|
| 116 | list($k, $c) = explode('.', $v); |
|
| 117 | //Fix ResetInput Function! A Headache Implementation! |
|
| 118 | $col = explode(':', $c)[0]; |
|
| 119 | ||
| 120 | if (array_key_exists($col, $availInput[$k]) && is_array($availInput[$k][$col])) { |
|
| 121 | return $array_key_attach_str(preg_replace('/./', $fieldRules, $availInput[$k][$col]), $v, ':'); |
|
| 122 | } |
|
| 123 | ||
| 124 | //May Have Problem in Dealing with File Upload in Edit Mode |
|
| 125 | return [$v => $fieldRules]; |
|
| 126 | }, $newColumn); |
|
| 127 | $rules = $array_clean_merge($rules, $newRules); |
|
| 128 | } |
|
| 129 | ||
| @@ 205-215 (lines=11) @@ | ||
| 202 | $messages = $array_clean_merge($messages, array_filter($newMessages)); |
|
| 203 | } else { |
|
| 204 | $fieldRules = is_array($fieldRules) ? implode('|', $fieldRules) : $fieldRules; |
|
| 205 | $newRules = array_map(function ($v) use ($fieldRules, $availInput, $array_key_attach_str) { |
|
| 206 | list($r, $k, $c) = explode('.', $v); |
|
| 207 | //Fix ResetInput Function! A Headache Implementation! |
|
| 208 | $col = explode(':', $c)[0]; |
|
| 209 | if (array_key_exists($col, $availInput[$k]) && is_array($availInput[$k][$col])) { |
|
| 210 | return $array_key_attach_str(preg_replace('/.+/', $fieldRules, $availInput[$k][$col]), $v, ':'); |
|
| 211 | } |
|
| 212 | ||
| 213 | return [$v => $fieldRules]; |
|
| 214 | }, $newColumn); |
|
| 215 | $rules = $array_clean_merge($rules, $newRules); |
|
| 216 | ||
| 217 | $newInput = array_map(function ($v) use ($availInput, $array_key_attach_str) { |
|
| 218 | list($r, $k, $c) = explode('.', $v); |
|
