z-song /
laravel-admin
| @@ 165-176 (lines=12) @@ | ||
| 162 | }, array_keys($columns), array_values($columns)); |
|
| 163 | ||
| 164 | $fieldRules = is_array($fieldRules) ? implode('|', $fieldRules) : $fieldRules; |
|
| 165 | $newRules = array_map(function ($v) use ($fieldRules, $availInput) { |
|
| 166 | list($k, $c) = explode('.', $v); |
|
| 167 | //Fix ResetInput Function! A Headache Implementation! |
|
| 168 | $col = explode(':', $c)[0]; |
|
| 169 | ||
| 170 | if (array_key_exists($col, $availInput[$k]) && is_array($availInput[$k][$col])) { |
|
| 171 | return array_key_attach_str(preg_replace('/./', $fieldRules, $availInput[$k][$col]), $v, ':'); |
|
| 172 | } |
|
| 173 | ||
| 174 | //May Have Problem in Dealing with File Upload in Edit Mode |
|
| 175 | return [$v => $fieldRules]; |
|
| 176 | }, $newColumn); |
|
| 177 | $rules = array_clean_merge($rules, $newRules); |
|
| 178 | } |
|
| 179 | ||
| @@ 227-236 (lines=10) @@ | ||
| 224 | $messages = array_clean_merge($messages, array_filter($newMessages)); |
|
| 225 | } else { |
|
| 226 | $fieldRules = is_array($fieldRules) ? implode('|', $fieldRules) : $fieldRules; |
|
| 227 | $newRules = array_map(function ($v) use ($fieldRules, $availInput) { |
|
| 228 | list($r, $k, $c) = explode('.', $v); |
|
| 229 | //Fix ResetInput Function! A Headache Implementation! |
|
| 230 | $col = explode(':', $c)[0]; |
|
| 231 | if (array_key_exists($col, $availInput[$k]) && is_array($availInput[$k][$col])) { |
|
| 232 | return array_key_attach_str(preg_replace('/.+/', $fieldRules, $availInput[$k][$col]), $v, ':'); |
|
| 233 | } |
|
| 234 | ||
| 235 | return [$v => $fieldRules]; |
|
| 236 | }, $newColumn); |
|
| 237 | $rules = array_clean_merge($rules, $newRules); |
|
| 238 | ||
| 239 | $newInput = array_map(function ($v) use ($availInput) { |
|
