周海龙 / globalso · 提交

转到一个项目

作者 刘锟
提交 22b75165a1be8d4adcb5dbf5273bc3b689bea8b1 1 个父辈 1e17b4ac

update

内嵌 并排对比
正在显示 1 个修改的文件 包含 22 行增加 和 22 行删除
@@ -412,20 +412,20 @@ class ProjectUpdate extends Command @@ -412,20 +412,20 @@ class ProjectUpdate extends Command
412 $value = Arr::a2s($gallery); 412 $value = Arr::a2s($gallery);
413 } elseif ($extend['type'] == 4) { 413 } elseif ($extend['type'] == 4) {
414 //文件 414 //文件
  415 + $file = [];
415 if (is_array($ve)) { 416 if (is_array($ve)) {
416 - if (isset($ve['title']) || isset($ve['url'])) {  
417 - $file = [  
418 - [  
419 - 'name' => isset($ve['title']) ? $ve['title'] : '',  
420 - 'url' => isset($ve['url']) ? $this->source_download($ve['url'], $project_id, $domain_arr['host'], $web_url_domain, $home_url, 1) : ''  
421 - ] 417 + $file_title = $ve['title'] ?? '';
  418 + $file_url = $ve['url'] ?? '';
  419 + if ($file_url) {
  420 + $file[] = [
  421 + 'name' => $file_title,
  422 + 'url' => $this->source_download($file_url, $project_id, $domain_arr['host'], $web_url_domain, $home_url, 1)
422 ]; 423 ];
423 - } else {  
424 - $file = [];  
425 } 424 }
426 - } else {  
427 - $file = [  
428 - 'name' => 'file' . $id, 425 + } elseif ($ve) {
  426 + $ve_array = explode('/', $ve);
  427 + $file[] = [
  428 + 'name' => end($ve_array),
429 'url' => $this->source_download($ve, $project_id, $domain_arr['host'], $web_url_domain, $home_url, 1) 429 'url' => $this->source_download($ve, $project_id, $domain_arr['host'], $web_url_domain, $home_url, 1)
430 ]; 430 ];
431 } 431 }
@@ -757,20 +757,20 @@ class ProjectUpdate extends Command @@ -757,20 +757,20 @@ class ProjectUpdate extends Command
757 $value = Arr::a2s($gallery); 757 $value = Arr::a2s($gallery);
758 } elseif ($extend['type'] == 4) { 758 } elseif ($extend['type'] == 4) {
759 //文件 759 //文件
  760 + $file = [];
760 if (is_array($ve)) { 761 if (is_array($ve)) {
761 - if (isset($ve['title']) || isset($ve['url'])) {  
762 - $file = [  
763 - [  
764 - 'name' => isset($ve['title']) ? $ve['title'] : '',  
765 - 'url' => isset($ve['url']) ? $this->source_download($ve['url'], $project_id, $domain_arr['host'], $web_url_domain, $home_url, 1) : ''  
766 - ] 762 + $file_title = $ve['title'] ?? '';
  763 + $file_url = $ve['url'] ?? '';
  764 + if ($file_url) {
  765 + $file[] = [
  766 + 'name' => $file_title,
  767 + 'url' => $this->source_download($file_url, $project_id, $domain_arr['host'], $web_url_domain, $home_url, 1)
767 ]; 768 ];
768 - } else {  
769 - $file = [];  
770 } 769 }
771 - } else {  
772 - $file = [  
773 - 'name' => 'file' . $id, 770 + } elseif ($ve) {
  771 + $ve_array = explode('/', $ve);
  772 + $file[] = [
  773 + 'name' => end($ve_array),
774 'url' => $this->source_download($ve, $project_id, $domain_arr['host'], $web_url_domain, $home_url, 1) 774 'url' => $this->source_download($ve, $project_id, $domain_arr['host'], $web_url_domain, $home_url, 1)
775 ]; 775 ];
776 } 776 }