@@ -344,28 +344,28 @@ |
||
| 344 | 344 | |
| 345 | 345 | # en: Solving the associated model data does not display data on the edit page.. |
| 346 | 346 | # zh:解决关联模型数据在编辑页面是没显示数据 |
| 347 | - $arr = explode('.', $this->column); |
|
| 348 | - if(!$this->value && count($arr)>1) { |
|
| 349 | - $oarr = array_get($arr,0); |
|
| 350 | - if($oarr){ |
|
| 347 | + $arr = explode('.', $this->column); |
|
| 348 | + if (!$this->value && count($arr) > 1) { |
|
| 349 | + $oarr = array_get($arr, 0); |
|
| 350 | + if ($oarr) { |
|
| 351 | 351 | $b = str_split($oarr); |
| 352 | - $c=''; |
|
| 353 | - foreach ($b as $key=>$v){ |
|
| 354 | - if( preg_match('/^[A-Z]+$/',$v) ){ |
|
| 355 | - if($c){ |
|
| 352 | + $c = ''; |
|
| 353 | + foreach ($b as $key=>$v) { |
|
| 354 | + if (preg_match('/^[A-Z]+$/', $v)) { |
|
| 355 | + if ($c) { |
|
| 356 | 356 | $c = $c.'_'.strtolower($v); |
| 357 | - }else{ |
|
| 357 | + } else { |
|
| 358 | 358 | $c = $c.strtolower($v); |
| 359 | 359 | } |
| 360 | - }else{ |
|
| 360 | + } else { |
|
| 361 | 361 | $c = $c.$v; |
| 362 | 362 | } |
| 363 | 363 | } |
| 364 | 364 | } |
| 365 | 365 | |
| 366 | - $iarr = array_get( $data, $c); |
|
| 366 | + $iarr = array_get($data, $c); |
|
| 367 | 367 | |
| 368 | - $this->value = is_array( $iarr ) ? array_get( $iarr, array_get( $arr, 1)): null; |
|
| 368 | + $this->value = is_array($iarr) ? array_get($iarr, array_get($arr, 1)) : null; |
|
| 369 | 369 | } |
| 370 | 370 | |
| 371 | 371 | if (isset($this->customFormat) && $this->customFormat instanceof \Closure) { |
@@ -354,10 +354,10 @@ |
||
| 354 | 354 | if( preg_match('/^[A-Z]+$/',$v) ){ |
| 355 | 355 | if($c){ |
| 356 | 356 | $c = $c.'_'.strtolower($v); |
| 357 | - }else{ |
|
| 357 | + } else{ |
|
| 358 | 358 | $c = $c.strtolower($v); |
| 359 | 359 | } |
| 360 | - }else{ |
|
| 360 | + } else{ |
|
| 361 | 361 | $c = $c.$v; |
| 362 | 362 | } |
| 363 | 363 | } |