改进toarray方法的append处理 支持relation.attr方式

改进软删除的关联删除

Author: liu21st

src/model/concern/Conversion.php

@@ -148,7 +148,14 @@ public function toArray(): array
         // 输出额外属性 必须定义获取器
         foreach ($this->getOption('append') as $key => $field) {
             if (is_numeric($key)) {
-                $item[$field] = $this->get($field);
+                if (strpos($field, '.')) {
+                    [$name, $field] = explode('.', $field, 2);
+                    $relation = $this->getRelationData($name, false);
+                    $value    = $relation?->get($field);
+                } else {
+                    $value = $this->get($field);
+                }
+                $item[$field] = $value;
             } else {
                 // 追加关联属性
                 $relation = $this->getRelationData($key, false);

src/model/concern/SoftDelete.php

@@ -16,6 +16,7 @@
 use Closure;
 use think\db\BaseQuery as Query;
 use think\Model;
+use think\model\Collection;
 
 /**
  * 数据软删除
@@ -96,15 +97,23 @@ public function delete(): bool
         $force = $this->isForce();
 
         if ($name && !$force) {
+            foreach ($this->getData() as $name => $val) {
+                if ($val instanceof Model || $val instanceof Collection) {
+                    $relations[$name] = $val;
+                }
+            }
             // 软删除
             $this->exists()->withEvent(false)->save([$name => $this->getDateTime($name)]);
 
             $this->withEvent(true);
-
+            if (!empty($relations)) {
+                // 删除关联数据
+                $this->relationDelete($relations);
+            }
             $this->trigger('AfterDelete');
             $this->exists(false);
             $this->clear();
-            return true;            
+            return true;
         } 
         return parent::delete();
     }